[arch-commits] Commit in nix/repos/community-x86_64 (14 files)
George Rawlinson
grawlinson at archlinux.org
Mon Jul 5 23:58:34 UTC 2021
Date: Monday, July 5, 2021 @ 23:58:34
Author: grawlinson
Revision: 972502
archrelease: copy trunk to community-x86_64
Added:
nix/repos/community-x86_64/PKGBUILD
(from rev 972501, nix/trunk/PKGBUILD)
nix/repos/community-x86_64/nix.conf
(from rev 972501, nix/trunk/nix.conf)
nix/repos/community-x86_64/nix.install
(from rev 972501, nix/trunk/nix.install)
nix/repos/community-x86_64/sysusers.conf
(from rev 972501, nix/trunk/sysusers.conf)
nix/repos/community-x86_64/tmpfiles.conf
(from rev 972501, nix/trunk/tmpfiles.conf)
nix/repos/community-x86_64/user.environment.conf
(from rev 972501, nix/trunk/user.environment.conf)
nix/repos/community-x86_64/user.tmpfiles.conf
(from rev 972501, nix/trunk/user.tmpfiles.conf)
Deleted:
nix/repos/community-x86_64/PKGBUILD
nix/repos/community-x86_64/nix.conf
nix/repos/community-x86_64/nix.install
nix/repos/community-x86_64/sysusers.conf
nix/repos/community-x86_64/tmpfiles.conf
nix/repos/community-x86_64/user.environment.conf
nix/repos/community-x86_64/user.tmpfiles.conf
-----------------------+
PKGBUILD | 146 +++++++++++++++++++++++-------------------------
nix.conf | 18 ++---
nix.install | 18 ++---
sysusers.conf | 54 ++++++++---------
tmpfiles.conf | 8 +-
user.environment.conf | 6 -
user.tmpfiles.conf | 10 +--
7 files changed, 127 insertions(+), 133 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-07-05 23:56:42 UTC (rev 972501)
+++ PKGBUILD 2021-07-05 23:58:34 UTC (rev 972502)
@@ -1,76 +0,0 @@
-# Maintainer: George Rawlinson <grawlinson at archlinux.org>
-
-pkgname=nix
-pkgver=2.3.13
-pkgrel=3
-pkgdesc="A purely functional package manager"
-arch=('x86_64')
-url="https://nixos.org/nix"
-license=('LGPL')
-depends=(
- 'boost'
- 'brotli'
- 'bzip2'
- 'curl'
- 'editline'
- 'gc'
- 'libseccomp'
- 'libsodium'
- 'openssl'
- 'sqlite'
-)
-provides=(
- 'libnixutil.so'
- 'libnixstore.so'
- 'libnixmain.so'
- 'libnixexpr.so'
-)
-backup=("etc/$pkgname/$pkgname.conf")
-install="$pkgname.install"
-source=(
- "https://nixos.org/releases/nix/nix-$pkgver/nix-$pkgver.tar.xz"
- 'nix.conf'
- 'sysusers.conf'
- 'tmpfiles.conf'
- 'user.environment.conf'
- 'user.tmpfiles.conf'
-)
-sha256sums=('7034647cb4fcfeff54134d22a0443ec4eccba8f1bc902f9ef1e6b447c5c46118'
- 'cf3c7a3a24ac0f553b6fd8ba6adb8f1375d8675911af12c4db94918a799f688e'
- 'cf6caa02e0b5224332c5945ba6fa08b1517802898290e6c2eb96046cad9598d8'
- 'f078cb60bdd549e9cb3b9af3dfacd33e1b7f16a7e7c02904f50f08bfc8c0d952'
- 'e45e45394a119a4ef2046a4a39403dda2df2af820c2d116763031c4689fc5717'
- 'c353524861487ef7f7e862bdaaa70e2a3a29e08d2ee31947ebf9e01237c5c50d')
-
-build () {
- cd "$pkgname-$pkgver"
- CXXFLAGS='-D_GLIBCXX_USE_CXX11_ABI=0' \
- ./configure \
- --prefix=/usr \
- --libexecdir="/usr/lib/$pkgname" \
- --sysconfdir=/etc \
- --localstatedir=/nix/var \
- --enable-gc
- make
-}
-
-package() {
- # systemd integration
- install -vDm644 tmpfiles.conf "$pkgdir/usr/lib/tmpfiles.d/$pkgname-daemon.conf"
- install -vDm644 sysusers.conf "$pkgdir/usr/lib/sysusers.d/$pkgname-daemon.conf"
- install -vDm644 user.tmpfiles.conf "$pkgdir/usr/share/user-tmpfiles.d/$pkgname-daemon.conf"
- install -vDm644 user.environment.conf "$pkgdir/usr/lib/environment.d/$pkgname-daemon.conf"
-
- # configuration
- install -vDm644 nix.conf -t "$pkgdir/etc/$pkgname"
-
- # package
- cd "$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
-
- # remove unused files
- rm -rf "$pkgdir/etc/init"
-
- # license
- install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
Copied: nix/repos/community-x86_64/PKGBUILD (from rev 972501, nix/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-07-05 23:58:34 UTC (rev 972502)
@@ -0,0 +1,70 @@
+# Maintainer: George Rawlinson <grawlinson at archlinux.org>
+
+pkgname=nix
+pkgver=2.3.13
+pkgrel=4
+pkgdesc="A purely functional package manager"
+arch=('x86_64')
+url="https://nixos.org/nix"
+license=('LGPL')
+depends=(
+ 'boost'
+ 'brotli'
+ 'bzip2'
+ 'curl'
+ 'editline'
+ 'gc'
+ 'libseccomp'
+ 'libsodium'
+ 'openssl'
+ 'sqlite'
+)
+backup=("etc/$pkgname/$pkgname.conf")
+install="$pkgname.install"
+source=(
+ "https://nixos.org/releases/nix/nix-$pkgver/nix-$pkgver.tar.xz"
+ 'nix.conf'
+ 'sysusers.conf'
+ 'tmpfiles.conf'
+ 'user.environment.conf'
+ 'user.tmpfiles.conf'
+)
+sha256sums=('7034647cb4fcfeff54134d22a0443ec4eccba8f1bc902f9ef1e6b447c5c46118'
+ 'cf3c7a3a24ac0f553b6fd8ba6adb8f1375d8675911af12c4db94918a799f688e'
+ 'cf6caa02e0b5224332c5945ba6fa08b1517802898290e6c2eb96046cad9598d8'
+ 'f078cb60bdd549e9cb3b9af3dfacd33e1b7f16a7e7c02904f50f08bfc8c0d952'
+ 'e45e45394a119a4ef2046a4a39403dda2df2af820c2d116763031c4689fc5717'
+ 'c353524861487ef7f7e862bdaaa70e2a3a29e08d2ee31947ebf9e01237c5c50d')
+
+build () {
+ cd "$pkgname-$pkgver"
+ CXXFLAGS='-D_GLIBCXX_USE_CXX11_ABI=0' \
+ ./configure \
+ --prefix=/usr \
+ --libexecdir="/usr/lib/$pkgname" \
+ --sysconfdir=/etc \
+ --localstatedir=/nix/var \
+ --enable-gc
+ make
+}
+
+package() {
+ # systemd integration
+ install -vDm644 tmpfiles.conf "$pkgdir/usr/lib/tmpfiles.d/$pkgname-daemon.conf"
+ install -vDm644 sysusers.conf "$pkgdir/usr/lib/sysusers.d/$pkgname-daemon.conf"
+ install -vDm644 user.tmpfiles.conf "$pkgdir/usr/share/user-tmpfiles.d/$pkgname-daemon.conf"
+ install -vDm644 user.environment.conf "$pkgdir/usr/lib/environment.d/$pkgname-daemon.conf"
+
+ # configuration
+ install -vDm644 nix.conf -t "$pkgdir/etc/$pkgname"
+
+ # package
+ cd "$pkgname-$pkgver"
+ make DESTDIR="$pkgdir" install
+
+ # remove unused files
+ rm -rf "$pkgdir/etc/init"
+
+ # license
+ install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
Deleted: nix.conf
===================================================================
--- nix.conf 2021-07-05 23:56:42 UTC (rev 972501)
+++ nix.conf 2021-07-05 23:58:34 UTC (rev 972502)
@@ -1,9 +0,0 @@
-#
-# https://nixos.org/manual/nix/stable/#sec-conf-file
-#
-
-# Unix group containing the Nix build user accounts
-build-users-group = nixbld
-
-# Disable sandbox
-# sandbox = false
Copied: nix/repos/community-x86_64/nix.conf (from rev 972501, nix/trunk/nix.conf)
===================================================================
--- nix.conf (rev 0)
+++ nix.conf 2021-07-05 23:58:34 UTC (rev 972502)
@@ -0,0 +1,9 @@
+#
+# https://nixos.org/manual/nix/stable/#sec-conf-file
+#
+
+# Unix group containing the Nix build user accounts
+build-users-group = nixbld
+
+# Disable sandbox
+# sandbox = false
Deleted: nix.install
===================================================================
--- nix.install 2021-07-05 23:56:42 UTC (rev 972501)
+++ nix.install 2021-07-05 23:58:34 UTC (rev 972502)
@@ -1,9 +0,0 @@
-post_install() {
- cat <<EOF
-
-Nix is installed but is not configured.
-
-To access Nix's daemon socket, users must be a member of the group 'nix-users'.
-
-EOF
-}
Copied: nix/repos/community-x86_64/nix.install (from rev 972501, nix/trunk/nix.install)
===================================================================
--- nix.install (rev 0)
+++ nix.install 2021-07-05 23:58:34 UTC (rev 972502)
@@ -0,0 +1,9 @@
+post_install() {
+ cat <<EOF
+
+Nix is installed but is not configured.
+
+To access Nix's daemon socket, users must be a member of the group 'nix-users'.
+
+EOF
+}
Deleted: sysusers.conf
===================================================================
--- sysusers.conf 2021-07-05 23:56:42 UTC (rev 972501)
+++ sysusers.conf 2021-07-05 23:58:34 UTC (rev 972502)
@@ -1,27 +0,0 @@
-# Group for Nix users
-g nix-users
-
-# Users & Group for Nix package builder
-g nixbld
-u nixbld01 -:nixbld "Nix builder 01"
-u nixbld02 -:nixbld "Nix builder 02"
-u nixbld03 -:nixbld "Nix builder 03"
-u nixbld04 -:nixbld "Nix builder 04"
-u nixbld05 -:nixbld "Nix builder 05"
-u nixbld06 -:nixbld "Nix builder 06"
-u nixbld07 -:nixbld "Nix builder 07"
-u nixbld08 -:nixbld "Nix builder 08"
-u nixbld09 -:nixbld "Nix builder 09"
-u nixbld10 -:nixbld "Nix builder 10"
-
-# Ensure users belong to group ...
-m nixbld01 nixbld
-m nixbld02 nixbld
-m nixbld03 nixbld
-m nixbld04 nixbld
-m nixbld05 nixbld
-m nixbld06 nixbld
-m nixbld07 nixbld
-m nixbld08 nixbld
-m nixbld09 nixbld
-m nixbld10 nixbld
Copied: nix/repos/community-x86_64/sysusers.conf (from rev 972501, nix/trunk/sysusers.conf)
===================================================================
--- sysusers.conf (rev 0)
+++ sysusers.conf 2021-07-05 23:58:34 UTC (rev 972502)
@@ -0,0 +1,27 @@
+# Group for Nix users
+g nix-users
+
+# Users & Group for Nix package builder
+g nixbld
+u nixbld01 -:nixbld "Nix builder 01"
+u nixbld02 -:nixbld "Nix builder 02"
+u nixbld03 -:nixbld "Nix builder 03"
+u nixbld04 -:nixbld "Nix builder 04"
+u nixbld05 -:nixbld "Nix builder 05"
+u nixbld06 -:nixbld "Nix builder 06"
+u nixbld07 -:nixbld "Nix builder 07"
+u nixbld08 -:nixbld "Nix builder 08"
+u nixbld09 -:nixbld "Nix builder 09"
+u nixbld10 -:nixbld "Nix builder 10"
+
+# Ensure users belong to group ...
+m nixbld01 nixbld
+m nixbld02 nixbld
+m nixbld03 nixbld
+m nixbld04 nixbld
+m nixbld05 nixbld
+m nixbld06 nixbld
+m nixbld07 nixbld
+m nixbld08 nixbld
+m nixbld09 nixbld
+m nixbld10 nixbld
Deleted: tmpfiles.conf
===================================================================
--- tmpfiles.conf 2021-07-05 23:56:42 UTC (rev 972501)
+++ tmpfiles.conf 2021-07-05 23:58:34 UTC (rev 972502)
@@ -1,4 +0,0 @@
-d /nix/var/nix/daemon-socket 770 root nix-users
-e! /nix/var/nix/daemon-socket - - - 0
-d /nix/var/nix/gcroots/per-user 1777
-d /nix/var/nix/profiles/per-user 1777
Copied: nix/repos/community-x86_64/tmpfiles.conf (from rev 972501, nix/trunk/tmpfiles.conf)
===================================================================
--- tmpfiles.conf (rev 0)
+++ tmpfiles.conf 2021-07-05 23:58:34 UTC (rev 972502)
@@ -0,0 +1,4 @@
+d /nix/var/nix/daemon-socket 770 root nix-users
+e! /nix/var/nix/daemon-socket - - - 0
+d /nix/var/nix/gcroots/per-user 1777
+d /nix/var/nix/profiles/per-user 1777
Deleted: user.environment.conf
===================================================================
--- user.environment.conf 2021-07-05 23:56:42 UTC (rev 972501)
+++ user.environment.conf 2021-07-05 23:58:34 UTC (rev 972502)
@@ -1,3 +0,0 @@
-NIX_REMOTE=daemon
-PATH="$HOME/.nix-profile/bin:/nix/var/nix/profiles/default/bin:$PATH"
-NIX_PATH="nixpkgs=/nix/var/nix/profiles/per-user/$USER/channels/nixpkgs:/nix/var/nix/profiles/per-user/$USER/channels"
Copied: nix/repos/community-x86_64/user.environment.conf (from rev 972501, nix/trunk/user.environment.conf)
===================================================================
--- user.environment.conf (rev 0)
+++ user.environment.conf 2021-07-05 23:58:34 UTC (rev 972502)
@@ -0,0 +1,3 @@
+NIX_REMOTE=daemon
+PATH="$HOME/.nix-profile/bin:/nix/var/nix/profiles/default/bin:$PATH"
+NIX_PATH="nixpkgs=/nix/var/nix/profiles/per-user/$USER/channels/nixpkgs:/nix/var/nix/profiles/per-user/$USER/channels"
Deleted: user.tmpfiles.conf
===================================================================
--- user.tmpfiles.conf 2021-07-05 23:56:42 UTC (rev 972501)
+++ user.tmpfiles.conf 2021-07-05 23:58:34 UTC (rev 972502)
@@ -1,5 +0,0 @@
-d %h/.nix-defexpr
-L %h/.nix-defexpr/channels_root - - - - /nix/var/nix/profiles/per-user/root/channels
-d /nix/var/nix/profiles/per-user/%u 0755
-L %h/.nix-profile - - - - /nix/var/nix/profiles/per-user/%u/profile
-d /nix/var/nix/gcroots/per-user/%u 0755
Copied: nix/repos/community-x86_64/user.tmpfiles.conf (from rev 972501, nix/trunk/user.tmpfiles.conf)
===================================================================
--- user.tmpfiles.conf (rev 0)
+++ user.tmpfiles.conf 2021-07-05 23:58:34 UTC (rev 972502)
@@ -0,0 +1,5 @@
+d %h/.nix-defexpr
+L %h/.nix-defexpr/channels_root - - - - /nix/var/nix/profiles/per-user/root/channels
+d /nix/var/nix/profiles/per-user/%u 0755
+L %h/.nix-profile - - - - /nix/var/nix/profiles/per-user/%u/profile
+d /nix/var/nix/gcroots/per-user/%u 0755
More information about the arch-commits
mailing list