[gentoo-commits] repo/gentoo:master commit in: sys-apps/nix/

[Sergei Trofimovich]

commit: e1e6791f142d200b9f4fd79ea1574479a50fc954
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Oct 13 11:56:57 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Oct 13 11:57:27 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1e6791f

sys-apps/nix: add check for USER_NS

nix-daemon uses user namespaces to build derivations
(includeing nix-channel --update).

The error is obwerved and reported by RuZzz.

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-apps/nix/nix-2.3.1.ebuild | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/sys-apps/nix/nix-2.3.1.ebuild b/sys-apps/nix/nix-2.3.1.ebuild
index bbfe27eb976..df8590b23b5 100644
--- a/sys-apps/nix/nix-2.3.1.ebuild
+++ b/sys-apps/nix/nix-2.3.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools flag-o-matic readme.gentoo-r1 user
+inherit autotools flag-o-matic linux-info readme.gentoo-r1 user
 
 DESCRIPTION="A purely functional package manager"
 HOMEPAGE="https://nixos.org/nix;
@@ -65,6 +65,13 @@ Next steps:
nix package manager user manual: http://nixos.org/nix/manual/
 "
 
+pkg_pretend() {
+   # USER_NS is used to run builders in a default setting in linux:
+   # https://nixos.wiki/wiki/Nix#Sandboxing
+   local CONFIG_CHECK="~USER_NS"
+   check_extra_config
+}
+
 pkg_setup() {
enewgroup nixbld
for i in {1..10}; do

[gentoo-commits] repo/gentoo:master commit in: sys-apps/nix/

[Sergei Trofimovich]

commit: 4941639439d99ab7452524f59ac55c6eb4cc7d41
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Thu Oct 10 22:34:40 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Oct 10 22:34:40 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49416394

sys-apps/nix: bump up to 2.3.1

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-apps/nix/Manifest |   1 +
 sys-apps/nix/nix-2.3.1.ebuild | 137 ++
 2 files changed, 138 insertions(+)

diff --git a/sys-apps/nix/Manifest b/sys-apps/nix/Manifest
index 61c8f635ed0..ea731077030 100644
--- a/sys-apps/nix/Manifest
+++ b/sys-apps/nix/Manifest
@@ -1,2 +1,3 @@
 DIST nix-2.2.2.tar.xz 818408 BLAKE2B 
f13bf79596d6292bea9897805421b388241d670f2b36bc13882f610901a9bb9aa1dc977d7a7d9314139791f20be38ca85becf5c4e863b22fc0b39503a7a4a079
 SHA512 
c8b1d5f246c53f13cfa25cba0d0721a2628329c10f67fcccbd9a55279cf475170a105156559d0a62638822a8e972f85e8a58769444d51f94ba15e2af7f90e220
+DIST nix-2.3.1.tar.xz 844608 BLAKE2B 
a5c8e97aad8bd8dea644f8aa04665cc078a69c7203891c469900ca1b1450a5714281209235bcaedbc6f3f128e0c11aff41850f3b0815ef657e13de3364ff0188
 SHA512 
791c377082cf8dd17a24d927caa4127eeb20bd03d479424861928437eb352cb4650beb7f36d92d85ce6a7404f4fbfc5a36a342d09061e88dbafd1b51463eb15f
 DIST nix-2.3.tar.xz 844640 BLAKE2B 
09707ae6c50c118375cdf2469a3ca19fbd940454bb80b7bccd74824deb3e370107acca99d7bf69bc93a168521a8d4928e3ac73fcfe1eeb53801d8e5f18574096
 SHA512 
45cb0c195f220a57cef80ad79def5e65b85588a2fc390f9b5e2ac4309698cc3065a23ee4f836913b642348afb1ee625072538bfedb5b26f9626344bbe784b425

diff --git a/sys-apps/nix/nix-2.3.1.ebuild b/sys-apps/nix/nix-2.3.1.ebuild
new file mode 100644
index 000..bbfe27eb976
--- /dev/null
+++ b/sys-apps/nix/nix-2.3.1.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic readme.gentoo-r1 user
+
+DESCRIPTION="A purely functional package manager"
+HOMEPAGE="https://nixos.org/nix;
+
+SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz;
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+etc-profile +gc doc s3 +sodium"
+
+# sys-apps/busybox is needed for sandbox mount of /bin/sh
+RDEPEND="
+   app-arch/brotli
+   app-arch/bzip2
+   app-arch/xz-utils
+   sys-apps/busybox[static]
+   dev-db/sqlite
+   dev-libs/editline:0=
+   dev-libs/openssl:0=
+   >=dev-libs/boost-1.66:0=[context]
+   net-misc/curl
+   sys-libs/libseccomp
+   sys-libs/zlib
+   gc? ( dev-libs/boehm-gc[cxx] )
+   doc? ( dev-libs/libxml2
+   dev-libs/libxslt
+   app-text/docbook-xsl-stylesheets
+   )
+   s3? ( dev-libs/aws-sdk-cpp )
+   sodium? ( dev-libs/libsodium:0= )
+"
+DEPEND="${RDEPEND}
+   >=sys-devel/bison-2.6
+   >=sys-devel/flex-2.5.35
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-2.3-libpaths.patch
+   "${FILESDIR}"/${PN}-2.3-bootstrap.patch
+)
+
+DISABLE_AUTOFORMATTING=yes
+DOC_CONTENTS=" Quick start user guide on Gentoo:
+
+[as root] enable nix-daemon service:
+   [systemd] # systemctl enable nix-daemon
+   [openrc]  # rc-update add nix-daemon
+[as a user] relogin to get environment and profile update
+[as a user] fetch nixpkgs update:
+   \$ nix-channel --update
+[as a user] install nix packages:
+   \$ nix-env -i mc
+[as a user] configure environment:
+   Somewhere in .bash_profile you might want to set
+   LOCALE_ARCHIVE=\$HOME/.nix-profile/lib/locale/locale-archive
+   but please read https://github.com/NixOS/nixpkgs/issues/21820
+
+Next steps:
+   nix package manager user manual: http://nixos.org/nix/manual/
+"
+
+pkg_setup() {
+   enewgroup nixbld
+   for i in {1..10}; do
+   # we list 'nixbld' twice to
+   # both assign a primary group for user
+   # and add a user to /etc/group
+   enewuser nixbld${i} -1 -1 /var/empty nixbld,nixbld
+   done
+}
+
+src_prepare() {
+   default
+
+   eautoreconf
+}
+
+src_configure() {
+   if ! use s3; then
+   # Disable automagic depend: bug #670256
+   export ac_cv_header_aws_s3_S3Client_h=no
+   fi
+   econf \
+   --localstatedir="${EPREFIX}"/nix/var \
+   $(use_enable gc) \
+   --with-sandbox-shell=/bin/busybox
+}
+
+src_compile() {
+   emake V=1
+}
+
+src_install() {
+   # TODO: emacs highlighter
+   default
+
+   readme.gentoo_create_doc
+
+   # here we use an eager variant of something that
+   # is lazily done by nix-daemon and root nix-env
+
+   # TODO: will need a tweak for prefix
+   keepdir /nix/store
+   fowners root:nixbld /nix/store
+   fperms 1775 /nix/store
+
+   keepdir /nix/var/nix/channel-cache
+   

[gentoo-commits] repo/gentoo:master commit in: sys-apps/nix/

[Sergei Trofimovich]

commit: f53d5f83b77fb8a58656133f97598c7f95e2dcbe
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Thu Oct 10 22:34:55 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Oct 10 22:34:55 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f53d5f83

sys-apps/nix: drop old

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-apps/nix/Manifest |   1 -
 sys-apps/nix/nix-2.2.2.ebuild | 143 --
 2 files changed, 144 deletions(-)

diff --git a/sys-apps/nix/Manifest b/sys-apps/nix/Manifest
index ea731077030..c411e171768 100644
--- a/sys-apps/nix/Manifest
+++ b/sys-apps/nix/Manifest
@@ -1,3 +1,2 @@
-DIST nix-2.2.2.tar.xz 818408 BLAKE2B 
f13bf79596d6292bea9897805421b388241d670f2b36bc13882f610901a9bb9aa1dc977d7a7d9314139791f20be38ca85becf5c4e863b22fc0b39503a7a4a079
 SHA512 
c8b1d5f246c53f13cfa25cba0d0721a2628329c10f67fcccbd9a55279cf475170a105156559d0a62638822a8e972f85e8a58769444d51f94ba15e2af7f90e220
 DIST nix-2.3.1.tar.xz 844608 BLAKE2B 
a5c8e97aad8bd8dea644f8aa04665cc078a69c7203891c469900ca1b1450a5714281209235bcaedbc6f3f128e0c11aff41850f3b0815ef657e13de3364ff0188
 SHA512 
791c377082cf8dd17a24d927caa4127eeb20bd03d479424861928437eb352cb4650beb7f36d92d85ce6a7404f4fbfc5a36a342d09061e88dbafd1b51463eb15f
 DIST nix-2.3.tar.xz 844640 BLAKE2B 
09707ae6c50c118375cdf2469a3ca19fbd940454bb80b7bccd74824deb3e370107acca99d7bf69bc93a168521a8d4928e3ac73fcfe1eeb53801d8e5f18574096
 SHA512 
45cb0c195f220a57cef80ad79def5e65b85588a2fc390f9b5e2ac4309698cc3065a23ee4f836913b642348afb1ee625072538bfedb5b26f9626344bbe784b425

diff --git a/sys-apps/nix/nix-2.2.2.ebuild b/sys-apps/nix/nix-2.2.2.ebuild
deleted file mode 100644
index bf830733800..000
--- a/sys-apps/nix/nix-2.2.2.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic readme.gentoo-r1 user
-
-DESCRIPTION="A purely functional package manager"
-HOMEPAGE="https://nixos.org/nix;
-
-SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz;
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+etc-profile +gc doc s3 +sodium"
-
-# sys-apps/busybox is needed for sandbox mount of /bin/sh
-RDEPEND="
-   app-arch/brotli
-   app-arch/bzip2
-   app-arch/xz-utils
-   sys-apps/busybox[static]
-   dev-db/sqlite
-   dev-libs/editline:0=
-   dev-libs/openssl:0=
-   >=dev-libs/boost-1.66:0=[context]
-   net-misc/curl
-   sys-libs/libseccomp
-   sys-libs/zlib
-   gc? ( dev-libs/boehm-gc[cxx] )
-   doc? ( dev-libs/libxml2
-   dev-libs/libxslt
-   app-text/docbook-xsl-stylesheets
-   )
-   s3? ( dev-libs/aws-sdk-cpp )
-   sodium? ( dev-libs/libsodium:0= )
-"
-DEPEND="${RDEPEND}
-   >=sys-devel/bison-2.6
-   >=sys-devel/flex-2.5.35
-"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-1.11.6-systemd.patch
-   "${FILESDIR}"/${PN}-1.11.6-respect-CXXFLAGS.patch
-   "${FILESDIR}"/${PN}-1.11.6-respect-LDFLAGS.patch
-   "${FILESDIR}"/${PN}-2.0-user-path.patch
-)
-
-DISABLE_AUTOFORMATTING=yes
-DOC_CONTENTS=" Quick start user guide on Gentoo:
-
-[as root] enable nix-daemon service:
-   [systemd] # systemctl enable nix-daemon
-   [openrc]  # rc-update add nix-daemon
-[as a user] relogin to get environment and profile update
-[as a user] fetch nixpkgs update:
-   \$ nix-channel --update
-[as a user] install nix packages:
-   \$ nix-env -i mc
-[as a user] configure environment:
-   Somewhere in .bash_profile you might want to set
-   LOCALE_ARCHIVE=\$HOME/.nix-profile/lib/locale/locale-archive
-   but please read https://github.com/NixOS/nixpkgs/issues/21820
-
-Next steps:
-   nix package manager user manual: http://nixos.org/nix/manual/
-"
-
-pkg_setup() {
-   enewgroup nixbld
-   for i in {1..10}; do
-   # we list 'nixbld' twice to
-   # both assign a primary group for user
-   # and add a user to /etc/group
-   enewuser nixbld${i} -1 -1 /var/empty nixbld,nixbld
-   done
-}
-
-src_prepare() {
-   default
-
-   eautoreconf
-}
-
-src_configure() {
-   if ! use s3; then
-   # Disable automagic depend: bug #670256
-   export ac_cv_header_aws_s3_S3Client_h=no
-   fi
-   econf \
-   --localstatedir="${EPREFIX}"/nix/var \
-   $(use_enable gc) \
-   --with-sandbox-shell=/bin/busybox
-}
-
-src_compile() {
-   local make_vars=(
-   OPTIMIZE=0 # disable hardcoded -O3
-   V=1 # verbose build
-   )
-   emake "${make_vars[@]}"
-}
-
-src_install() {
-   # TODO: emacs highlighter
-   default
-
-   readme.gentoo_create_doc
-
-   # here we use an eager variant of something that
-   # is lazily done by nix-daemon 

[gentoo-commits] repo/gentoo:master commit in: sys-apps/nix/, sys-apps/nix/files/

[Sergei Trofimovich]

commit: d230dd2ca9479868134a2278c8759f03a80e01e7
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Thu Oct 10 22:08:33 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Oct 10 22:08:48 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d230dd2c

sys-apps/nix: fix nix bootstrap, bug #693482

Fix `nix-channel --update` does not work on freshly-installed nix.

`nix-channel --update` does a few main things:
1. fetch new tarball with nix expressions
2. unpack that tarball as part of the build system using
   a shell script derived by unpack-channel.nix.
3. install the result into /nix/store

[2.] fails because tarball unpacking runs in a sandboxed environment
in a container with /nix/store and /bin/sh mounted.

unpack-channel.nix needs bash, tar and xz binaries in PATH.
These are normally provided by bash, tar and xz packages from /nix/store.

Unfortunately bash, tar and xz packages are not yet fetched as we
only have nix installed without nixpkgs tree.

1. we patch unpack-channel.nix to only require 'sh'
2. we use /bin/sh as a static busybox and point nix at it:
   ./configure --with-sandbox-shell=/bin/busybox

Reported-by: Kirill Zaborsky
Closes: https://bugs.gentoo.org/693482
Bug: https://github.com/NixOS/nix/issues/2673
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-apps/nix/files/nix-2.3-bootstrap.patch |  58 
 sys-apps/nix/nix-2.3-r1.ebuild | 138 +
 2 files changed, 196 insertions(+)

diff --git a/sys-apps/nix/files/nix-2.3-bootstrap.patch 
b/sys-apps/nix/files/nix-2.3-bootstrap.patch
new file mode 100644
index 000..fd656e0a1ec
--- /dev/null
+++ b/sys-apps/nix/files/nix-2.3-bootstrap.patch
@@ -0,0 +1,58 @@
+Fix `nix-channel --update` does not work on freshly-installed nix.
+
+# Why it does not work by default
+
+`nix-channel --update` does two main things:
+1. fetch new tarball with nix expressions
+2. unpack that tarball as part of the build system using
+   a shell script derived by unpack-channel.nix.
+3. install the result into /nix/store
+
+
+[2.] fails because tarball unpacking runs in a sandboxed environment
+a container with /nix/store and /bin/sh mounted.
+
+unpack-channel.nix needs bash, tar and xz binaries in PATH.
+These are normally provided by bash, tar and xz packages from /nix/store.
+
+Unfortunately bash, tar and xz packages are not yet fetched as we
+only have nix installed without nixpkgs tree.
+
+# How we get it working
+
+1. we patch unpack-channel.nix to only require 'sh'
+2. we use /bin/sh as a static busybox and point nix at it:
+   ./configure --with-sandbox-shell=/bin/busybox
+
+Bug: https://bugs.gentoo.org/693482
+Bug: https://github.com/NixOS/nix/issues/2673
+--- a/corepkgs/unpack-channel.nix
 b/corepkgs/unpack-channel.nix
+@@ -6,15 +6,9 @@ let
+ ''
+   mkdir $out
+   cd $out
+-  xzpat="\.xz\$"
+-  gzpat="\.gz\$"
+-  if [[ "$src" =~ $xzpat ]]; then
+-${xz} -d < $src | ${tar} xf - ${tarFlags}
+-  elif [[ "$src" =~ $gzpat ]]; then
+-${gzip} -d < $src | ${tar} xf - ${tarFlags}
+-  else
+-${bzip2} -d < $src | ${tar} xf - ${tarFlags}
+-  fi
++
++  tar xf $src
++
+   if [ * != $channelName ]; then
+ mv * $out/$channelName
+   fi
+@@ -26,7 +20,7 @@ in
+ 
+ derivation {
+   system = builtins.currentSystem;
+-  builder = shell;
++  builder = "/bin/sh";
+   args = [ "-e" builder ];
+   inherit name channelName src;
+ 

diff --git a/sys-apps/nix/nix-2.3-r1.ebuild b/sys-apps/nix/nix-2.3-r1.ebuild
new file mode 100644
index 000..30e6c06b944
--- /dev/null
+++ b/sys-apps/nix/nix-2.3-r1.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic readme.gentoo-r1 user
+
+DESCRIPTION="A purely functional package manager"
+HOMEPAGE="https://nixos.org/nix;
+
+SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz;
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+etc-profile +gc doc s3 +sodium"
+
+# sys-apps/busybox is needed for sandbox mount of /bin/sh
+RDEPEND="
+   app-arch/brotli
+   app-arch/bzip2
+   app-arch/xz-utils
+   sys-apps/busybox[static]
+   dev-db/sqlite
+   dev-libs/editline:0=
+   dev-libs/openssl:0=
+   >=dev-libs/boost-1.66:0=[context]
+   net-misc/curl
+   sys-libs/libseccomp
+   sys-libs/zlib
+   gc? ( dev-libs/boehm-gc[cxx] )
+   doc? ( dev-libs/libxml2
+   dev-libs/libxslt
+   app-text/docbook-xsl-stylesheets
+   )
+   s3? ( dev-libs/aws-sdk-cpp )
+   sodium? ( dev-libs/libsodium:0= )
+"
+DEPEND="${RDEPEND}
+   >=sys-devel/bison-2.6
+   >=sys-devel/flex-2.5.35
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-2.0-user-path.patch
+   "${FILESDIR}"/${PN}-2.3-libpaths.patch
+   

[gentoo-commits] repo/gentoo:master commit in: sys-apps/nix/

[Sergei Trofimovich]

commit: 953b3b21db55df987dd8006dcdec19e945294d98
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Fri Sep 20 22:44:21 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Sep 20 22:44:21 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=953b3b21

sys-apps/nix: change 'etc_profile' to 'etc-profile'

Reported-by: Michał Górny
Closes: https://bugs.gentoo.org/695114
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-apps/nix/metadata.xml | 2 +-
 sys-apps/nix/nix-2.2.2.ebuild | 8 
 sys-apps/nix/nix-2.3.ebuild   | 8 
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/sys-apps/nix/metadata.xml b/sys-apps/nix/metadata.xml
index c7035d7472f..ebcafee28da 100644
--- a/sys-apps/nix/metadata.xml
+++ b/sys-apps/nix/metadata.xml
@@ -6,7 +6,7 @@
Sergei Trofimovich


-   Install /etc/profile.d/ entry to 
inject nix support for all users.
+   Install /etc/profile.d/ entry to 
inject nix support for all users.
Enable garbage collection in the Nix expression 
evaluator (use dev-libs/boehm-gc).
Enable Amazon S3 bucket to load and store 
packages (use dev-libs/aws-sdk-cpp).
Use dev-libs/libsodium for 
cryptography

diff --git a/sys-apps/nix/nix-2.2.2.ebuild b/sys-apps/nix/nix-2.2.2.ebuild
index 583f372e75c..bf830733800 100644
--- a/sys-apps/nix/nix-2.2.2.ebuild
+++ b/sys-apps/nix/nix-2.2.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz;
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+etc_profile +gc doc s3 +sodium"
+IUSE="+etc-profile +gc doc s3 +sodium"
 
 # sys-apps/busybox is needed for sandbox mount of /bin/sh
 RDEPEND="
@@ -128,15 +128,15 @@ src_install() {
 
newinitd "${FILESDIR}"/nix-daemon.initd nix-daemon
 
-   if ! use etc_profile; then
+   if ! use etc-profile; then
rm "${ED}"/etc/profile.d/nix.sh || die
rm "${ED}"/etc/profile.d/nix-daemon.sh || die
fi
 }
 
 pkg_postinst() {
-   if ! use etc_profile; then
-   ewarn "${EROOT}/etc/profile.d/nix.sh was removed (due to 
USE=-etc_profile)."
+   if ! use etc-profile; then
+   ewarn "${EROOT}/etc/profile.d/nix.sh was removed (due to 
USE=-etc-profile)."
fi
 
readme.gentoo_print_elog

diff --git a/sys-apps/nix/nix-2.3.ebuild b/sys-apps/nix/nix-2.3.ebuild
index 448e5bbc051..2a368774542 100644
--- a/sys-apps/nix/nix-2.3.ebuild
+++ b/sys-apps/nix/nix-2.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz;
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+etc_profile +gc doc s3 +sodium"
+IUSE="+etc-profile +gc doc s3 +sodium"
 
 # sys-apps/busybox is needed for sandbox mount of /bin/sh
 RDEPEND="
@@ -122,15 +122,15 @@ src_install() {
 
newinitd "${FILESDIR}"/nix-daemon.initd nix-daemon
 
-   if ! use etc_profile; then
+   if ! use etc-profile; then
rm "${ED}"/etc/profile.d/nix.sh || die
rm "${ED}"/etc/profile.d/nix-daemon.sh || die
fi
 }
 
 pkg_postinst() {
-   if ! use etc_profile; then
-   ewarn "${EROOT}/etc/profile.d/nix.sh was removed (due to 
USE=-etc_profile)."
+   if ! use etc-profile; then
+   ewarn "${EROOT}/etc/profile.d/nix.sh was removed (due to 
USE=-etc-profile)."
fi
 
readme.gentoo_print_elog

[gentoo-commits] repo/gentoo:master commit in: sys-apps/nix/files/, sys-apps/nix/

[Sergei Trofimovich]

commit: 7557065fb0a8b03218d6a67eca3771b1ca7382fd
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Sep  7 07:51:52 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Sep  7 08:03:54 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7557065f

sys-apps/nix: bump up to 2.3

Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-apps/nix/Manifest |   1 +
 sys-apps/nix/files/nix-2.3-libpaths.patch |  48 +++
 sys-apps/nix/nix-2.3.ebuild   | 137 ++
 3 files changed, 186 insertions(+)

diff --git a/sys-apps/nix/Manifest b/sys-apps/nix/Manifest
index 0cfbb3a69a1..5f5d2661d76 100644
--- a/sys-apps/nix/Manifest
+++ b/sys-apps/nix/Manifest
@@ -1,3 +1,4 @@
 DIST nix-2.0.4.tar.xz 798352 BLAKE2B 
0eaf7e507c87e5398ab5967e1f2064a5827038bb84208768aa1c1deadc95e44aab922846b728467e3355d1f25e740590c3d1748ec05dfeae6a171952fd941b77
 SHA512 
bce3b3a14269d42648a4935770260c36dab25fde3ebcfed730063d1d139603468e1c30acf15eb0c617fa36a6b39d4ae31ccfd9cba762f631ecac213fd09a
 DIST nix-2.1.3.tar.xz 816396 BLAKE2B 
9627626075841e7f389f5010418fe17569ae69ea07de5ff9a0557df864052cc8b48f2a4dbfe16dffc5dca3fb180f527199f367810899ae9474d00e8fcc00b760
 SHA512 
d22718d23d8960dac7d07739835caa8183f573b303d77613e77314d873c1fe6da1cb0ed78337fe3219a94675307b23132a62ae7d9aa5354707e58400f403524b
 DIST nix-2.2.2.tar.xz 818408 BLAKE2B 
f13bf79596d6292bea9897805421b388241d670f2b36bc13882f610901a9bb9aa1dc977d7a7d9314139791f20be38ca85becf5c4e863b22fc0b39503a7a4a079
 SHA512 
c8b1d5f246c53f13cfa25cba0d0721a2628329c10f67fcccbd9a55279cf475170a105156559d0a62638822a8e972f85e8a58769444d51f94ba15e2af7f90e220
+DIST nix-2.3.tar.xz 844640 BLAKE2B 
09707ae6c50c118375cdf2469a3ca19fbd940454bb80b7bccd74824deb3e370107acca99d7bf69bc93a168521a8d4928e3ac73fcfe1eeb53801d8e5f18574096
 SHA512 
45cb0c195f220a57cef80ad79def5e65b85588a2fc390f9b5e2ac4309698cc3065a23ee4f836913b642348afb1ee625072538bfedb5b26f9626344bbe784b425

diff --git a/sys-apps/nix/files/nix-2.3-libpaths.patch 
b/sys-apps/nix/files/nix-2.3-libpaths.patch
new file mode 100644
index 000..42931e7e8d5
--- /dev/null
+++ b/sys-apps/nix/files/nix-2.3-libpaths.patch
@@ -0,0 +1,48 @@
+Workaround -L path order by passing local library paths before
+systemwide paths to avoid pulling libnixstore.so from system
+instead of locally-built library.
+
+The patch is not perfect because it passes LDFLAGS after local
+libraries but it makes nix link correctly.
+
+Bug: https://github.com/NixOS/nix/issues/3087
+--- a/mk/libraries.mk
 b/mk/libraries.mk
+@@ -91,7 +91,7 @@ define build-library
+ $(1)_PATH := $$(_d)/$$($(1)_NAME).$(SO_EXT)
+ 
+ $$($(1)_PATH): $$($(1)_OBJS) $$(_libs) | $$(_d)/
+-  $$(trace-ld) $(CXX) -o $$(abspath $$@) -shared $$(LDFLAGS) 
$$(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) 
$$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE)) 
$$($(1)_LDFLAGS_UNINSTALLED)
++  $$(trace-ld) $(CXX) -o $$(abspath $$@) -shared $$(foreach lib, 
$$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE)) $$($(1)_LDFLAGS_UNINSTALLED) 
$$(LDFLAGS) $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) 
$$($(1)_LDFLAGS_PROPAGATED)
+ 
+ ifneq ($(OS), Darwin)
+   $(1)_LDFLAGS_USE += -Wl,-rpath,$$(abspath $$(_d))
+@@ -105,7 +105,7 @@ define build-library
+ $$(eval $$(call create-dir, $$($(1)_INSTALL_DIR)))
+ 
+ $$($(1)_INSTALL_PATH): $$($(1)_OBJS) $$(_libs_final) | 
$(DESTDIR)$$($(1)_INSTALL_DIR)/
+-  $$(trace-ld) $(CXX) -o $$@ -shared $$(LDFLAGS) $$(GLOBAL_LDFLAGS) 
$$($(1)_OBJS) $$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) $$(foreach lib, 
$$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED))
++  $$(trace-ld) $(CXX) -o $$@ -shared $$(foreach lib, $$($(1)_LIBS), 
$$($$(lib)_LDFLAGS_USE_INSTALLED)) $$(LDFLAGS) $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) 
$$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED)
+ 
+ $(1)_LDFLAGS_USE_INSTALLED += -L$$(DESTDIR)$$($(1)_INSTALL_DIR) 
-l$$(patsubst lib%,%,$$(strip $$($(1)_NAME)))
+ ifneq ($(OS), Darwin)
+--- a/mk/programs.mk
 b/mk/programs.mk
+@@ -32,7 +32,7 @@ define build-program
+   $$(eval $$(call create-dir, $$(_d)))
+ 
+   $$($(1)_PATH): $$($(1)_OBJS) $$(_libs) | $$(_d)/
+-  $$(trace-ld) $(CXX) -o $$@ $$(LDFLAGS) $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) 
$$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE))
++  $$(trace-ld) $(CXX) -o $$@ $$(foreach lib, $$($(1)_LIBS), 
$$($$(lib)_LDFLAGS_USE)) $$(LDFLAGS) $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) 
$$($(1)_LDFLAGS)
+ 
+   $(1)_INSTALL_DIR ?= $$(bindir)
+   $(1)_INSTALL_PATH := $$($(1)_INSTALL_DIR)/$(1)
+@@ -46,7 +46,7 @@ define build-program
+ _libs_final := $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_INSTALL_PATH))
+ 
+ $(DESTDIR)$$($(1)_INSTALL_PATH): $$($(1)_OBJS) $$(_libs_final) | 
$(DESTDIR)$$($(1)_INSTALL_DIR)/
+-  $$(trace-ld) $(CXX) -o $$@ $$(LDFLAGS) $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) 
$$($(1)_LDFLAGS) 

[gentoo-commits] repo/gentoo:master commit in: sys-apps/nix/

[Sergei Trofimovich]

commit: b10038f9a6499045ae001c99921be6ea81fba4a4
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Sep  7 07:52:26 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Sep  7 08:03:54 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b10038f9

sys-apps/nix: drop old

Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-apps/nix/Manifest |   2 -
 sys-apps/nix/nix-2.0.4.ebuild | 143 --
 sys-apps/nix/nix-2.1.3.ebuild | 142 -
 3 files changed, 287 deletions(-)

diff --git a/sys-apps/nix/Manifest b/sys-apps/nix/Manifest
index 5f5d2661d76..61c8f635ed0 100644
--- a/sys-apps/nix/Manifest
+++ b/sys-apps/nix/Manifest
@@ -1,4 +1,2 @@
-DIST nix-2.0.4.tar.xz 798352 BLAKE2B 
0eaf7e507c87e5398ab5967e1f2064a5827038bb84208768aa1c1deadc95e44aab922846b728467e3355d1f25e740590c3d1748ec05dfeae6a171952fd941b77
 SHA512 
bce3b3a14269d42648a4935770260c36dab25fde3ebcfed730063d1d139603468e1c30acf15eb0c617fa36a6b39d4ae31ccfd9cba762f631ecac213fd09a
-DIST nix-2.1.3.tar.xz 816396 BLAKE2B 
9627626075841e7f389f5010418fe17569ae69ea07de5ff9a0557df864052cc8b48f2a4dbfe16dffc5dca3fb180f527199f367810899ae9474d00e8fcc00b760
 SHA512 
d22718d23d8960dac7d07739835caa8183f573b303d77613e77314d873c1fe6da1cb0ed78337fe3219a94675307b23132a62ae7d9aa5354707e58400f403524b
 DIST nix-2.2.2.tar.xz 818408 BLAKE2B 
f13bf79596d6292bea9897805421b388241d670f2b36bc13882f610901a9bb9aa1dc977d7a7d9314139791f20be38ca85becf5c4e863b22fc0b39503a7a4a079
 SHA512 
c8b1d5f246c53f13cfa25cba0d0721a2628329c10f67fcccbd9a55279cf475170a105156559d0a62638822a8e972f85e8a58769444d51f94ba15e2af7f90e220
 DIST nix-2.3.tar.xz 844640 BLAKE2B 
09707ae6c50c118375cdf2469a3ca19fbd940454bb80b7bccd74824deb3e370107acca99d7bf69bc93a168521a8d4928e3ac73fcfe1eeb53801d8e5f18574096
 SHA512 
45cb0c195f220a57cef80ad79def5e65b85588a2fc390f9b5e2ac4309698cc3065a23ee4f836913b642348afb1ee625072538bfedb5b26f9626344bbe784b425

diff --git a/sys-apps/nix/nix-2.0.4.ebuild b/sys-apps/nix/nix-2.0.4.ebuild
deleted file mode 100644
index 26192138b60..000
--- a/sys-apps/nix/nix-2.0.4.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic readme.gentoo-r1 user
-
-DESCRIPTION="A purely functional package manager"
-HOMEPAGE="https://nixos.org/nix;
-
-SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz;
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+etc_profile +gc doc s3 +sodium"
-
-RDEPEND="
-   app-arch/brotli
-   app-arch/bzip2
-   app-arch/xz-utils
-   dev-db/sqlite
-   dev-libs/openssl:0=
-   net-misc/curl
-   sys-libs/libseccomp
-   sys-libs/zlib
-   gc? ( dev-libs/boehm-gc[cxx] )
-   doc? ( dev-libs/libxml2
-   dev-libs/libxslt
-   app-text/docbook-xsl-stylesheets
-   )
-   s3? ( dev-libs/aws-sdk-cpp )
-   sodium? ( dev-libs/libsodium:0= )
-"
-DEPEND="${RDEPEND}
-   >=sys-devel/bison-2.6
-   >=sys-devel/flex-2.5.35
-"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-1.11.6-systemd.patch
-   "${FILESDIR}"/${PN}-1.11.6-respect-CXXFLAGS.patch
-   "${FILESDIR}"/${PN}-1.11.6-respect-LDFLAGS.patch
-   "${FILESDIR}"/${PN}-2.0-user-path.patch
-   "${FILESDIR}"/${PN}-2.0.4-bdwgc-8.patch
-)
-
-DISABLE_AUTOFORMATTING=yes
-DOC_CONTENTS=" Quick start user guide on Gentoo:
-
-[as root] enable nix-daemon service:
-   [systemd] # systemctl enable nix-daemon
-   [openrc]  # rc-update add nix-daemon
-[as a user] relogin to get environment and profile update
-[as a user] fetch nixpkgs update:
-   \$ nix-channel --update
-[as a user] install nix packages:
-   \$ nix-env -i mc
-[as a user] configure environment:
-   Somewhere in .bash_profile you might want to set
-   LOCALE_ARCHIVE=\$HOME/.nix-profile/lib/locale/locale-archive
-   but please read https://github.com/NixOS/nixpkgs/issues/21820
-
-Next steps:
-   nix package manager user manual: http://nixos.org/nix/manual/
-"
-
-pkg_setup() {
-   enewgroup nixbld
-   for i in {1..10}; do
-   # we list 'nixbld' twice to
-   # both assign a primary group for user
-   # and add a user to /etc/group
-   enewuser nixbld${i} -1 -1 /var/empty nixbld,nixbld
-   done
-}
-
-src_prepare() {
-   default
-
-   eautoreconf
-}
-
-src_configure() {
-   local econf_args=()
-
-   if ! use s3; then
-   # Disable automagic depend: bug #670256
-   export ac_cv_header_aws_s3_S3Client_h=no
-   fi
-
-   econf \
-   --localstatedir="${EPREFIX}"/nix/var \
-   $(use_enable gc) \
-   "${args[@]}"
-}
-
-src_compile() {
-   local make_vars=(
-   OPTIMIZE=0 # disable hardcoded -O3
-

[gentoo-commits] repo/gentoo:master commit in: sys-apps/nix/

[David Seifert]

commit: cf1744dce5ade001d057d3cd465e363bf1f879c3
Author: David Seifert  gentoo  org>
AuthorDate: Sun Aug 11 11:20:20 2019 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Aug 11 11:20:20 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf1744dc

sys-apps/nix: [QA] Fix missing trailing slash

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: David Seifert  gentoo.org>

 sys-apps/nix/nix-2.1.3.ebuild | 2 +-
 sys-apps/nix/nix-2.2.2.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/nix/nix-2.1.3.ebuild b/sys-apps/nix/nix-2.1.3.ebuild
index 63941c45b19..d6e2b56ec29 100644
--- a/sys-apps/nix/nix-2.1.3.ebuild
+++ b/sys-apps/nix/nix-2.1.3.ebuild
@@ -135,7 +135,7 @@ src_install() {
 
 pkg_postinst() {
if ! use etc_profile; then
-   ewarn "${EROOT}etc/profile.d/nix.sh was removed (due to 
USE=-etc_profile)."
+   ewarn "${EROOT}/etc/profile.d/nix.sh was removed (due to 
USE=-etc_profile)."
fi
 
readme.gentoo_print_elog

diff --git a/sys-apps/nix/nix-2.2.2.ebuild b/sys-apps/nix/nix-2.2.2.ebuild
index f3968e4c5f0..583f372e75c 100644
--- a/sys-apps/nix/nix-2.2.2.ebuild
+++ b/sys-apps/nix/nix-2.2.2.ebuild
@@ -136,7 +136,7 @@ src_install() {
 
 pkg_postinst() {
if ! use etc_profile; then
-   ewarn "${EROOT}etc/profile.d/nix.sh was removed (due to 
USE=-etc_profile)."
+   ewarn "${EROOT}/etc/profile.d/nix.sh was removed (due to 
USE=-etc_profile)."
fi
 
readme.gentoo_print_elog

[gentoo-commits] repo/gentoo:master commit in: sys-apps/nix/

[Sergei Trofimovich]

commit: 15a9d26378e67e3b07d8b26e3388ae43762e7484
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Jun 30 20:34:54 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Jun 30 20:34:54 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15a9d263

sys-apps/nix: restore KEYWORDS as boost 1.70 is unmasked

Package-Manager: Portage-2.3.67, Repoman-2.3.16
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-apps/nix/nix-2.1.3.ebuild| 3 +--
 sys-apps/nix/nix-2.2.1-r1.ebuild | 3 +--
 sys-apps/nix/nix-2.2.2.ebuild| 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/sys-apps/nix/nix-2.1.3.ebuild b/sys-apps/nix/nix-2.1.3.ebuild
index 9c9665bed74..63941c45b19 100644
--- a/sys-apps/nix/nix-2.1.3.ebuild
+++ b/sys-apps/nix/nix-2.1.3.ebuild
@@ -11,8 +11,7 @@ HOMEPAGE="https://nixos.org/nix;
 SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz;
 LICENSE="LGPL-2.1"
 SLOT="0"
-#keywords are blocked by boost-1.66
-#KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+etc_profile +gc doc s3 +sodium"
 
 RDEPEND="

diff --git a/sys-apps/nix/nix-2.2.1-r1.ebuild b/sys-apps/nix/nix-2.2.1-r1.ebuild
index bb49ea11bcf..f3968e4c5f0 100644
--- a/sys-apps/nix/nix-2.2.1-r1.ebuild
+++ b/sys-apps/nix/nix-2.2.1-r1.ebuild
@@ -11,8 +11,7 @@ HOMEPAGE="https://nixos.org/nix;
 SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz;
 LICENSE="LGPL-2.1"
 SLOT="0"
-#keywords are blocked by boost-1.66
-#KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+etc_profile +gc doc s3 +sodium"
 
 # sys-apps/busybox is needed for sandbox mount of /bin/sh

diff --git a/sys-apps/nix/nix-2.2.2.ebuild b/sys-apps/nix/nix-2.2.2.ebuild
index bb49ea11bcf..f3968e4c5f0 100644
--- a/sys-apps/nix/nix-2.2.2.ebuild
+++ b/sys-apps/nix/nix-2.2.2.ebuild
@@ -11,8 +11,7 @@ HOMEPAGE="https://nixos.org/nix;
 SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz;
 LICENSE="LGPL-2.1"
 SLOT="0"
-#keywords are blocked by boost-1.66
-#KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+etc_profile +gc doc s3 +sodium"
 
 # sys-apps/busybox is needed for sandbox mount of /bin/sh

[gentoo-commits] repo/gentoo:master commit in: sys-apps/nix/

[Sergei Trofimovich]

commit: 929bf6999d48d1b19834ea53c775b143f754570e
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Jun 30 20:35:19 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Jun 30 20:35:19 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=929bf699

sys-apps/nix: drop old

Package-Manager: Portage-2.3.67, Repoman-2.3.16
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-apps/nix/Manifest|   2 -
 sys-apps/nix/nix-2.0.2.ebuild| 133 
 sys-apps/nix/nix-2.2.1-r1.ebuild | 143 ---
 3 files changed, 278 deletions(-)

diff --git a/sys-apps/nix/Manifest b/sys-apps/nix/Manifest
index ea46fa320dc..0cfbb3a69a1 100644
--- a/sys-apps/nix/Manifest
+++ b/sys-apps/nix/Manifest
@@ -1,5 +1,3 @@
-DIST nix-2.0.2.tar.xz 796404 BLAKE2B 
0906488bf2c800544c0747a6860ef51f667467f50039f725cf6ec05b8389462fe073bddceba106922a7611fd784b58ed5ca321efba0065b0f424aa53d7620990
 SHA512 
605e2c6dbc814470c25aa4f0aca77bfd11fd6d5c263ef38915cb9b852e77bcff08d515e76de8d929c9eacd02ffeaa5dd5f6b337461d54a1b2648b1fc505c98fa
 DIST nix-2.0.4.tar.xz 798352 BLAKE2B 
0eaf7e507c87e5398ab5967e1f2064a5827038bb84208768aa1c1deadc95e44aab922846b728467e3355d1f25e740590c3d1748ec05dfeae6a171952fd941b77
 SHA512 
bce3b3a14269d42648a4935770260c36dab25fde3ebcfed730063d1d139603468e1c30acf15eb0c617fa36a6b39d4ae31ccfd9cba762f631ecac213fd09a
 DIST nix-2.1.3.tar.xz 816396 BLAKE2B 
9627626075841e7f389f5010418fe17569ae69ea07de5ff9a0557df864052cc8b48f2a4dbfe16dffc5dca3fb180f527199f367810899ae9474d00e8fcc00b760
 SHA512 
d22718d23d8960dac7d07739835caa8183f573b303d77613e77314d873c1fe6da1cb0ed78337fe3219a94675307b23132a62ae7d9aa5354707e58400f403524b
-DIST nix-2.2.1.tar.xz 818648 BLAKE2B 
2e836bd40ea1ee22c308bd287b1ad1e5607729574b5cfe3494fbf017c618d7475d6150a9b97966f1aaea6bcb37b6535db1b2d693f0fedd0598881efe1a8c538e
 SHA512 
42055fcbecc664899203d90d47f85ce2b12987fac6cb776f09dc202d5f3e07a4b2d6a7ee67fe8d6094062dc516dfe42eeb4acc05dfebd31f2b5670c0979bddd4
 DIST nix-2.2.2.tar.xz 818408 BLAKE2B 
f13bf79596d6292bea9897805421b388241d670f2b36bc13882f610901a9bb9aa1dc977d7a7d9314139791f20be38ca85becf5c4e863b22fc0b39503a7a4a079
 SHA512 
c8b1d5f246c53f13cfa25cba0d0721a2628329c10f67fcccbd9a55279cf475170a105156559d0a62638822a8e972f85e8a58769444d51f94ba15e2af7f90e220

diff --git a/sys-apps/nix/nix-2.0.2.ebuild b/sys-apps/nix/nix-2.0.2.ebuild
deleted file mode 100644
index d80a3e75a3e..000
--- a/sys-apps/nix/nix-2.0.2.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic readme.gentoo-r1 user
-
-DESCRIPTION="A purely functional package manager"
-HOMEPAGE="https://nixos.org/nix;
-
-SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz;
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+etc_profile +gc doc +sodium"
-
-RDEPEND="
-   app-arch/brotli
-   app-arch/bzip2
-   app-arch/xz-utils
-   dev-db/sqlite
-   dev-libs/openssl:0=
-   net-misc/curl
-   sys-libs/libseccomp
-   sys-libs/zlib
-   gc? ( dev-libs/boehm-gc[cxx] )
-   doc? ( dev-libs/libxml2
-   dev-libs/libxslt
-   app-text/docbook-xsl-stylesheets
-   )
-   sodium? ( dev-libs/libsodium:0= )
-"
-DEPEND="${RDEPEND}
-   >=sys-devel/bison-2.6
-   >=sys-devel/flex-2.5.35
-"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-1.11.6-systemd.patch
-   "${FILESDIR}"/${PN}-1.11.6-respect-CXXFLAGS.patch
-   "${FILESDIR}"/${PN}-1.11.6-respect-LDFLAGS.patch
-   "${FILESDIR}"/${PN}-2.0-user-path.patch
-)
-
-DISABLE_AUTOFORMATTING=yes
-DOC_CONTENTS=" Quick start user guide on Gentoo:
-
-[as root] enable nix-daemon service:
-   [systemd] # systemctl enable nix-daemon
-   [openrc]  # rc-update add nix-daemon
-[as a user] relogin to get environment and profile update
-[as a user] fetch nixpkgs update:
-   \$ nix-channel --update
-[as a user] install nix packages:
-   \$ nix-env -i mc
-[as a user] configure environment:
-   Somewhere in .bash_profile you might want to set
-   LOCALE_ARCHIVE=\$HOME/.nix-profile/lib/locale/locale-archive
-   but please read https://github.com/NixOS/nixpkgs/issues/21820
-
-Next steps:
-   nix package manager user manual: http://nixos.org/nix/manual/
-"
-
-pkg_setup() {
-   enewgroup nixbld
-   for i in {1..10}; do
-   # we list 'nixbld' twice to
-   # both assign a primary group for user
-   # and add a user to /etc/group
-   enewuser nixbld${i} -1 -1 /var/empty nixbld,nixbld
-   done
-}
-
-src_prepare() {
-   default
-
-   eautoreconf
-}
-
-src_configure() {
-   econf \
-   --localstatedir="${EPREFIX}"/nix/var \
-   $(use_enable gc)
-}
-
-src_compile() {
-   local make_vars=(
-   OPTIMIZE=0 # disable hardcoded 

[gentoo-commits] repo/gentoo:master commit in: sys-apps/nix/

[Sergei Trofimovich]

commit: 7b1e437be906e9d4d47c14ca3c8a1d9baf02b32f
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Wed May 15 07:00:46 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed May 15 07:21:36 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b1e437b

sys-apps/nix: enable USE=sodium by default

USE=sodium allows using binary package cache as-is.

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-apps/nix/nix-2.0.2.ebuild| 4 ++--
 sys-apps/nix/nix-2.0.4.ebuild| 2 +-
 sys-apps/nix/nix-2.1.3.ebuild| 4 ++--
 sys-apps/nix/nix-2.2.1-r1.ebuild | 2 +-
 sys-apps/nix/nix-2.2.2.ebuild| 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/sys-apps/nix/nix-2.0.2.ebuild b/sys-apps/nix/nix-2.0.2.ebuild
index bea6bd1a424..d80a3e75a3e 100644
--- a/sys-apps/nix/nix-2.0.2.ebuild
+++ b/sys-apps/nix/nix-2.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz;
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+etc_profile +gc doc sodium"
+IUSE="+etc_profile +gc doc +sodium"
 
 RDEPEND="
app-arch/brotli

diff --git a/sys-apps/nix/nix-2.0.4.ebuild b/sys-apps/nix/nix-2.0.4.ebuild
index a39c4d53087..26192138b60 100644
--- a/sys-apps/nix/nix-2.0.4.ebuild
+++ b/sys-apps/nix/nix-2.0.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz;
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+etc_profile +gc doc s3 sodium"
+IUSE="+etc_profile +gc doc s3 +sodium"
 
 RDEPEND="
app-arch/brotli

diff --git a/sys-apps/nix/nix-2.1.3.ebuild b/sys-apps/nix/nix-2.1.3.ebuild
index 4eb0d459fc8..9c9665bed74 100644
--- a/sys-apps/nix/nix-2.1.3.ebuild
+++ b/sys-apps/nix/nix-2.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 #keywords are blocked by boost-1.66
 #KEYWORDS="~amd64 ~x86"
-IUSE="+etc_profile +gc doc s3 sodium"
+IUSE="+etc_profile +gc doc s3 +sodium"
 
 RDEPEND="
app-arch/brotli

diff --git a/sys-apps/nix/nix-2.2.1-r1.ebuild b/sys-apps/nix/nix-2.2.1-r1.ebuild
index dfa1ac2e7c6..bb49ea11bcf 100644
--- a/sys-apps/nix/nix-2.2.1-r1.ebuild
+++ b/sys-apps/nix/nix-2.2.1-r1.ebuild
@@ -13,7 +13,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 #keywords are blocked by boost-1.66
 #KEYWORDS="~amd64 ~x86"
-IUSE="+etc_profile +gc doc s3 sodium"
+IUSE="+etc_profile +gc doc s3 +sodium"
 
 # sys-apps/busybox is needed for sandbox mount of /bin/sh
 RDEPEND="

diff --git a/sys-apps/nix/nix-2.2.2.ebuild b/sys-apps/nix/nix-2.2.2.ebuild
index dfa1ac2e7c6..bb49ea11bcf 100644
--- a/sys-apps/nix/nix-2.2.2.ebuild
+++ b/sys-apps/nix/nix-2.2.2.ebuild
@@ -13,7 +13,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 #keywords are blocked by boost-1.66
 #KEYWORDS="~amd64 ~x86"
-IUSE="+etc_profile +gc doc s3 sodium"
+IUSE="+etc_profile +gc doc s3 +sodium"
 
 # sys-apps/busybox is needed for sandbox mount of /bin/sh
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: sys-apps/nix/

[Sergei Trofimovich]

commit: dcda1cf6c7e6970e05402c47f49f8f2670edb4d9
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Fri Apr 26 15:47:32 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Apr 26 15:47:32 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcda1cf6

sys-apps/nix: bump up to 2.2.2

Reported-by: Bernardo Meurer
Closes: https://bugs.gentoo.org/683824
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-apps/nix/Manifest |   1 +
 sys-apps/nix/nix-2.2.2.ebuild | 144 ++
 2 files changed, 145 insertions(+)

diff --git a/sys-apps/nix/Manifest b/sys-apps/nix/Manifest
index f9e694e7dec..ea46fa320dc 100644
--- a/sys-apps/nix/Manifest
+++ b/sys-apps/nix/Manifest
@@ -2,3 +2,4 @@ DIST nix-2.0.2.tar.xz 796404 BLAKE2B 
0906488bf2c800544c0747a6860ef51f667467f5003
 DIST nix-2.0.4.tar.xz 798352 BLAKE2B 
0eaf7e507c87e5398ab5967e1f2064a5827038bb84208768aa1c1deadc95e44aab922846b728467e3355d1f25e740590c3d1748ec05dfeae6a171952fd941b77
 SHA512 
bce3b3a14269d42648a4935770260c36dab25fde3ebcfed730063d1d139603468e1c30acf15eb0c617fa36a6b39d4ae31ccfd9cba762f631ecac213fd09a
 DIST nix-2.1.3.tar.xz 816396 BLAKE2B 
9627626075841e7f389f5010418fe17569ae69ea07de5ff9a0557df864052cc8b48f2a4dbfe16dffc5dca3fb180f527199f367810899ae9474d00e8fcc00b760
 SHA512 
d22718d23d8960dac7d07739835caa8183f573b303d77613e77314d873c1fe6da1cb0ed78337fe3219a94675307b23132a62ae7d9aa5354707e58400f403524b
 DIST nix-2.2.1.tar.xz 818648 BLAKE2B 
2e836bd40ea1ee22c308bd287b1ad1e5607729574b5cfe3494fbf017c618d7475d6150a9b97966f1aaea6bcb37b6535db1b2d693f0fedd0598881efe1a8c538e
 SHA512 
42055fcbecc664899203d90d47f85ce2b12987fac6cb776f09dc202d5f3e07a4b2d6a7ee67fe8d6094062dc516dfe42eeb4acc05dfebd31f2b5670c0979bddd4
+DIST nix-2.2.2.tar.xz 818408 BLAKE2B 
f13bf79596d6292bea9897805421b388241d670f2b36bc13882f610901a9bb9aa1dc977d7a7d9314139791f20be38ca85becf5c4e863b22fc0b39503a7a4a079
 SHA512 
c8b1d5f246c53f13cfa25cba0d0721a2628329c10f67fcccbd9a55279cf475170a105156559d0a62638822a8e972f85e8a58769444d51f94ba15e2af7f90e220

diff --git a/sys-apps/nix/nix-2.2.2.ebuild b/sys-apps/nix/nix-2.2.2.ebuild
new file mode 100644
index 000..dfa1ac2e7c6
--- /dev/null
+++ b/sys-apps/nix/nix-2.2.2.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic readme.gentoo-r1 user
+
+DESCRIPTION="A purely functional package manager"
+HOMEPAGE="https://nixos.org/nix;
+
+SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz;
+LICENSE="LGPL-2.1"
+SLOT="0"
+#keywords are blocked by boost-1.66
+#KEYWORDS="~amd64 ~x86"
+IUSE="+etc_profile +gc doc s3 sodium"
+
+# sys-apps/busybox is needed for sandbox mount of /bin/sh
+RDEPEND="
+   app-arch/brotli
+   app-arch/bzip2
+   app-arch/xz-utils
+   sys-apps/busybox[static]
+   dev-db/sqlite
+   dev-libs/editline:0=
+   dev-libs/openssl:0=
+   >=dev-libs/boost-1.66:0=[context]
+   net-misc/curl
+   sys-libs/libseccomp
+   sys-libs/zlib
+   gc? ( dev-libs/boehm-gc[cxx] )
+   doc? ( dev-libs/libxml2
+   dev-libs/libxslt
+   app-text/docbook-xsl-stylesheets
+   )
+   s3? ( dev-libs/aws-sdk-cpp )
+   sodium? ( dev-libs/libsodium:0= )
+"
+DEPEND="${RDEPEND}
+   >=sys-devel/bison-2.6
+   >=sys-devel/flex-2.5.35
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.11.6-systemd.patch
+   "${FILESDIR}"/${PN}-1.11.6-respect-CXXFLAGS.patch
+   "${FILESDIR}"/${PN}-1.11.6-respect-LDFLAGS.patch
+   "${FILESDIR}"/${PN}-2.0-user-path.patch
+)
+
+DISABLE_AUTOFORMATTING=yes
+DOC_CONTENTS=" Quick start user guide on Gentoo:
+
+[as root] enable nix-daemon service:
+   [systemd] # systemctl enable nix-daemon
+   [openrc]  # rc-update add nix-daemon
+[as a user] relogin to get environment and profile update
+[as a user] fetch nixpkgs update:
+   \$ nix-channel --update
+[as a user] install nix packages:
+   \$ nix-env -i mc
+[as a user] configure environment:
+   Somewhere in .bash_profile you might want to set
+   LOCALE_ARCHIVE=\$HOME/.nix-profile/lib/locale/locale-archive
+   but please read https://github.com/NixOS/nixpkgs/issues/21820
+
+Next steps:
+   nix package manager user manual: http://nixos.org/nix/manual/
+"
+
+pkg_setup() {
+   enewgroup nixbld
+   for i in {1..10}; do
+   # we list 'nixbld' twice to
+   # both assign a primary group for user
+   # and add a user to /etc/group
+   enewuser nixbld${i} -1 -1 /var/empty nixbld,nixbld
+   done
+}
+
+src_prepare() {
+   default
+
+   eautoreconf
+}
+
+src_configure() {
+   if ! use s3; then
+   # Disable automagic depend: bug #670256
+   export ac_cv_header_aws_s3_S3Client_h=no
+   fi
+   econf \
+   

[gentoo-commits] repo/gentoo:master commit in: sys-apps/nix/, sys-apps/nix/files/

[Sergei Trofimovich]

commit: 460014c2d82a53a5db86dd2376cbd7045227cc69
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Mar  9 21:04:43 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Mar  9 21:05:15 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=460014c2

sys-apps/nix: tweak for bdwgc-8, bug #679834

Reported-by: Toralf Förster
Closes: https://bugs.gentoo.org/679834
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-apps/nix/files/nix-2.0.4-bdwgc-8.patch | 12 
 sys-apps/nix/nix-2.0.4.ebuild  |  3 ++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/sys-apps/nix/files/nix-2.0.4-bdwgc-8.patch 
b/sys-apps/nix/files/nix-2.0.4-bdwgc-8.patch
new file mode 100644
index 000..ff37f48e360
--- /dev/null
+++ b/sys-apps/nix/files/nix-2.0.4-bdwgc-8.patch
@@ -0,0 +1,12 @@
+Add a missing library for gdwgc-8
+--- a/configure.ac
 b/configure.ac
+@@ -226,6 +226,8 @@ AC_ARG_ENABLE(gc, AC_HELP_STRING([--enable-gc],
+ if test "$gc" = yes; then
+   PKG_CHECK_MODULES([BDW_GC], [bdw-gc])
+   CXXFLAGS="$BDW_GC_CFLAGS $CXXFLAGS"
++  # a workaround for https://bugs.gentoo.org/679834
++  BDW_GC_LIBS="$BDW_GC_LIBS -lgccpp"
+   AC_DEFINE(HAVE_BOEHMGC, 1, [Whether to use the Boehm garbage collector.])
+ fi
+ 

diff --git a/sys-apps/nix/nix-2.0.4.ebuild b/sys-apps/nix/nix-2.0.4.ebuild
index 965584cf6f0..a39c4d53087 100644
--- a/sys-apps/nix/nix-2.0.4.ebuild
+++ b/sys-apps/nix/nix-2.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -41,6 +41,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.11.6-respect-CXXFLAGS.patch
"${FILESDIR}"/${PN}-1.11.6-respect-LDFLAGS.patch
"${FILESDIR}"/${PN}-2.0-user-path.patch
+   "${FILESDIR}"/${PN}-2.0.4-bdwgc-8.patch
 )
 
 DISABLE_AUTOFORMATTING=yes

[gentoo-commits] repo/gentoo:master commit in: sys-apps/nix/

[Sergei Trofimovich]

commit: 6d35f1c6be54ecda0f93ad1a89e031e625860dc4
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Feb 11 23:20:07 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Feb 11 23:36:15 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d35f1c6

sys-apps/nix: pass static shell into build container

Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-apps/nix/{nix-2.2.1.ebuild => nix-2.2.1-r1.ebuild} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys-apps/nix/nix-2.2.1.ebuild b/sys-apps/nix/nix-2.2.1-r1.ebuild
similarity index 96%
rename from sys-apps/nix/nix-2.2.1.ebuild
rename to sys-apps/nix/nix-2.2.1-r1.ebuild
index 7168bdd8d9a..dfa1ac2e7c6 100644
--- a/sys-apps/nix/nix-2.2.1.ebuild
+++ b/sys-apps/nix/nix-2.2.1-r1.ebuild
@@ -15,10 +15,12 @@ SLOT="0"
 #KEYWORDS="~amd64 ~x86"
 IUSE="+etc_profile +gc doc s3 sodium"
 
+# sys-apps/busybox is needed for sandbox mount of /bin/sh
 RDEPEND="
app-arch/brotli
app-arch/bzip2
app-arch/xz-utils
+   sys-apps/busybox[static]
dev-db/sqlite
dev-libs/editline:0=
dev-libs/openssl:0=
@@ -83,8 +85,6 @@ src_prepare() {
 }
 
 src_configure() {
-   local econf_args=()
-
if ! use s3; then
# Disable automagic depend: bug #670256
export ac_cv_header_aws_s3_S3Client_h=no
@@ -92,7 +92,7 @@ src_configure() {
econf \
--localstatedir="${EPREFIX}"/nix/var \
$(use_enable gc) \
-   "${args[@]}"
+   --with-sandbox-shell=/bin/busybox
 }
 
 src_compile() {

[gentoo-commits] repo/gentoo:master commit in: sys-apps/nix/

[Sergei Trofimovich]

commit: 10d70a4f28e436b2ef7ee730ad593a08c20762f6
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Jan 12 12:47:27 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Jan 12 12:59:26 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10d70a4f

sys-apps/nix: bump up to 2.2.1

Package-Manager: Portage-2.3.55, Repoman-2.3.12
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-apps/nix/Manifest |   1 +
 sys-apps/nix/nix-2.2.1.ebuild | 144 ++
 2 files changed, 145 insertions(+)

diff --git a/sys-apps/nix/Manifest b/sys-apps/nix/Manifest
index 6c22a7b1d43..f9e694e7dec 100644
--- a/sys-apps/nix/Manifest
+++ b/sys-apps/nix/Manifest
@@ -1,3 +1,4 @@
 DIST nix-2.0.2.tar.xz 796404 BLAKE2B 
0906488bf2c800544c0747a6860ef51f667467f50039f725cf6ec05b8389462fe073bddceba106922a7611fd784b58ed5ca321efba0065b0f424aa53d7620990
 SHA512 
605e2c6dbc814470c25aa4f0aca77bfd11fd6d5c263ef38915cb9b852e77bcff08d515e76de8d929c9eacd02ffeaa5dd5f6b337461d54a1b2648b1fc505c98fa
 DIST nix-2.0.4.tar.xz 798352 BLAKE2B 
0eaf7e507c87e5398ab5967e1f2064a5827038bb84208768aa1c1deadc95e44aab922846b728467e3355d1f25e740590c3d1748ec05dfeae6a171952fd941b77
 SHA512 
bce3b3a14269d42648a4935770260c36dab25fde3ebcfed730063d1d139603468e1c30acf15eb0c617fa36a6b39d4ae31ccfd9cba762f631ecac213fd09a
 DIST nix-2.1.3.tar.xz 816396 BLAKE2B 
9627626075841e7f389f5010418fe17569ae69ea07de5ff9a0557df864052cc8b48f2a4dbfe16dffc5dca3fb180f527199f367810899ae9474d00e8fcc00b760
 SHA512 
d22718d23d8960dac7d07739835caa8183f573b303d77613e77314d873c1fe6da1cb0ed78337fe3219a94675307b23132a62ae7d9aa5354707e58400f403524b
+DIST nix-2.2.1.tar.xz 818648 BLAKE2B 
2e836bd40ea1ee22c308bd287b1ad1e5607729574b5cfe3494fbf017c618d7475d6150a9b97966f1aaea6bcb37b6535db1b2d693f0fedd0598881efe1a8c538e
 SHA512 
42055fcbecc664899203d90d47f85ce2b12987fac6cb776f09dc202d5f3e07a4b2d6a7ee67fe8d6094062dc516dfe42eeb4acc05dfebd31f2b5670c0979bddd4

diff --git a/sys-apps/nix/nix-2.2.1.ebuild b/sys-apps/nix/nix-2.2.1.ebuild
new file mode 100644
index 000..7168bdd8d9a
--- /dev/null
+++ b/sys-apps/nix/nix-2.2.1.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic readme.gentoo-r1 user
+
+DESCRIPTION="A purely functional package manager"
+HOMEPAGE="https://nixos.org/nix;
+
+SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz;
+LICENSE="LGPL-2.1"
+SLOT="0"
+#keywords are blocked by boost-1.66
+#KEYWORDS="~amd64 ~x86"
+IUSE="+etc_profile +gc doc s3 sodium"
+
+RDEPEND="
+   app-arch/brotli
+   app-arch/bzip2
+   app-arch/xz-utils
+   dev-db/sqlite
+   dev-libs/editline:0=
+   dev-libs/openssl:0=
+   >=dev-libs/boost-1.66:0=[context]
+   net-misc/curl
+   sys-libs/libseccomp
+   sys-libs/zlib
+   gc? ( dev-libs/boehm-gc[cxx] )
+   doc? ( dev-libs/libxml2
+   dev-libs/libxslt
+   app-text/docbook-xsl-stylesheets
+   )
+   s3? ( dev-libs/aws-sdk-cpp )
+   sodium? ( dev-libs/libsodium:0= )
+"
+DEPEND="${RDEPEND}
+   >=sys-devel/bison-2.6
+   >=sys-devel/flex-2.5.35
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.11.6-systemd.patch
+   "${FILESDIR}"/${PN}-1.11.6-respect-CXXFLAGS.patch
+   "${FILESDIR}"/${PN}-1.11.6-respect-LDFLAGS.patch
+   "${FILESDIR}"/${PN}-2.0-user-path.patch
+)
+
+DISABLE_AUTOFORMATTING=yes
+DOC_CONTENTS=" Quick start user guide on Gentoo:
+
+[as root] enable nix-daemon service:
+   [systemd] # systemctl enable nix-daemon
+   [openrc]  # rc-update add nix-daemon
+[as a user] relogin to get environment and profile update
+[as a user] fetch nixpkgs update:
+   \$ nix-channel --update
+[as a user] install nix packages:
+   \$ nix-env -i mc
+[as a user] configure environment:
+   Somewhere in .bash_profile you might want to set
+   LOCALE_ARCHIVE=\$HOME/.nix-profile/lib/locale/locale-archive
+   but please read https://github.com/NixOS/nixpkgs/issues/21820
+
+Next steps:
+   nix package manager user manual: http://nixos.org/nix/manual/
+"
+
+pkg_setup() {
+   enewgroup nixbld
+   for i in {1..10}; do
+   # we list 'nixbld' twice to
+   # both assign a primary group for user
+   # and add a user to /etc/group
+   enewuser nixbld${i} -1 -1 /var/empty nixbld,nixbld
+   done
+}
+
+src_prepare() {
+   default
+
+   eautoreconf
+}
+
+src_configure() {
+   local econf_args=()
+
+   if ! use s3; then
+   # Disable automagic depend: bug #670256
+   export ac_cv_header_aws_s3_S3Client_h=no
+   fi
+   econf \
+   --localstatedir="${EPREFIX}"/nix/var \
+   $(use_enable gc) \
+   "${args[@]}"
+}
+
+src_compile() {
+   local make_vars=(
+   OPTIMIZE=0 # disable hardcoded -O3
+   

[gentoo-commits] repo/gentoo:master commit in: sys-apps/nix/

[Sergei Trofimovich]

commit: f7baa33d5fef62f96a594cfac8b1e1e86e91c949
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Nov  4 22:49:58 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Nov  4 22:50:17 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7baa33d

sys-apps/nix: add USE=s3 for AWS S3support, bug #670256

Disable automagic autodetection of S3 backend. Does not
fix originally reported build failure in bug #670256 yet.

Reported-by: Toralf Förster
Bug: https://bugs.gentoo.org/670256
Signed-off-by: Sergei Trofimovich  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 sys-apps/nix/metadata.xml |  1 +
 sys-apps/nix/nix-2.0.4.ebuild | 15 ---
 sys-apps/nix/nix-2.1.3.ebuild | 12 ++--
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/sys-apps/nix/metadata.xml b/sys-apps/nix/metadata.xml
index ad64c7e5102..c7035d7472f 100644
--- a/sys-apps/nix/metadata.xml
+++ b/sys-apps/nix/metadata.xml
@@ -8,6 +8,7 @@

Install /etc/profile.d/ entry to 
inject nix support for all users.
Enable garbage collection in the Nix expression 
evaluator (use dev-libs/boehm-gc).
+   Enable Amazon S3 bucket to load and store 
packages (use dev-libs/aws-sdk-cpp).
Use dev-libs/libsodium for 
cryptography

 

diff --git a/sys-apps/nix/nix-2.0.4.ebuild b/sys-apps/nix/nix-2.0.4.ebuild
index bea6bd1a424..965584cf6f0 100644
--- a/sys-apps/nix/nix-2.0.4.ebuild
+++ b/sys-apps/nix/nix-2.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz;
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+etc_profile +gc doc sodium"
+IUSE="+etc_profile +gc doc s3 sodium"
 
 RDEPEND="
app-arch/brotli
@@ -28,6 +28,7 @@ RDEPEND="
dev-libs/libxslt
app-text/docbook-xsl-stylesheets
)
+   s3? ( dev-libs/aws-sdk-cpp )
sodium? ( dev-libs/libsodium:0= )
 "
 DEPEND="${RDEPEND}
@@ -79,9 +80,17 @@ src_prepare() {
 }
 
 src_configure() {
+   local econf_args=()
+
+   if ! use s3; then
+   # Disable automagic depend: bug #670256
+   export ac_cv_header_aws_s3_S3Client_h=no
+   fi
+
econf \
--localstatedir="${EPREFIX}"/nix/var \
-   $(use_enable gc)
+   $(use_enable gc) \
+   "${args[@]}"
 }
 
 src_compile() {

diff --git a/sys-apps/nix/nix-2.1.3.ebuild b/sys-apps/nix/nix-2.1.3.ebuild
index a104f3b883a..4eb0d459fc8 100644
--- a/sys-apps/nix/nix-2.1.3.ebuild
+++ b/sys-apps/nix/nix-2.1.3.ebuild
@@ -13,7 +13,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 #keywords are blocked by boost-1.66
 #KEYWORDS="~amd64 ~x86"
-IUSE="+etc_profile +gc doc sodium"
+IUSE="+etc_profile +gc doc s3 sodium"
 
 RDEPEND="
app-arch/brotli
@@ -30,6 +30,7 @@ RDEPEND="
dev-libs/libxslt
app-text/docbook-xsl-stylesheets
)
+   s3? ( dev-libs/aws-sdk-cpp )
sodium? ( dev-libs/libsodium:0= )
 "
 DEPEND="${RDEPEND}
@@ -81,9 +82,16 @@ src_prepare() {
 }
 
 src_configure() {
+   local econf_args=()
+
+   if ! use s3; then
+   # Disable automagic depend: bug #670256
+   export ac_cv_header_aws_s3_S3Client_h=no
+   fi
econf \
--localstatedir="${EPREFIX}"/nix/var \
-   $(use_enable gc)
+   $(use_enable gc) \
+   "${args[@]}"
 }
 
 src_compile() {

[gentoo-commits] repo/gentoo:master commit in: sys-apps/nix/

[Sergei Trofimovich]

commit: c29aecba85aa89b038778628ac7b62bf042ddd9f
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Tue Oct  2 21:29:05 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue Oct  2 21:29:17 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c29aecba

sys-apps/nix: drop old

Signed-off-by: Sergei Trofimovich  gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11

 sys-apps/nix/Manifest |   1 -
 sys-apps/nix/nix-2.1.2.ebuild | 135 --
 2 files changed, 136 deletions(-)

diff --git a/sys-apps/nix/Manifest b/sys-apps/nix/Manifest
index 11bfeca86d5..6c22a7b1d43 100644
--- a/sys-apps/nix/Manifest
+++ b/sys-apps/nix/Manifest
@@ -1,4 +1,3 @@
 DIST nix-2.0.2.tar.xz 796404 BLAKE2B 
0906488bf2c800544c0747a6860ef51f667467f50039f725cf6ec05b8389462fe073bddceba106922a7611fd784b58ed5ca321efba0065b0f424aa53d7620990
 SHA512 
605e2c6dbc814470c25aa4f0aca77bfd11fd6d5c263ef38915cb9b852e77bcff08d515e76de8d929c9eacd02ffeaa5dd5f6b337461d54a1b2648b1fc505c98fa
 DIST nix-2.0.4.tar.xz 798352 BLAKE2B 
0eaf7e507c87e5398ab5967e1f2064a5827038bb84208768aa1c1deadc95e44aab922846b728467e3355d1f25e740590c3d1748ec05dfeae6a171952fd941b77
 SHA512 
bce3b3a14269d42648a4935770260c36dab25fde3ebcfed730063d1d139603468e1c30acf15eb0c617fa36a6b39d4ae31ccfd9cba762f631ecac213fd09a
-DIST nix-2.1.2.tar.xz 816492 BLAKE2B 
21365f2f7a88456aa566882780a65cabc190789e8e0f0aa62838bd7c9e2326c59776d78c6eaa4a2836039d02d6899114d5bc236bfadff5a2ef329531873e9e85
 SHA512 
6d54612f911438d5094c9d41fbf43ba4d8cada1da2b3eddbf7a3309262f9a9e94a2a826bb45247d5766bd6a419456ecdca5a8bebccff12607ebe004328bbc76a
 DIST nix-2.1.3.tar.xz 816396 BLAKE2B 
9627626075841e7f389f5010418fe17569ae69ea07de5ff9a0557df864052cc8b48f2a4dbfe16dffc5dca3fb180f527199f367810899ae9474d00e8fcc00b760
 SHA512 
d22718d23d8960dac7d07739835caa8183f573b303d77613e77314d873c1fe6da1cb0ed78337fe3219a94675307b23132a62ae7d9aa5354707e58400f403524b

diff --git a/sys-apps/nix/nix-2.1.2.ebuild b/sys-apps/nix/nix-2.1.2.ebuild
deleted file mode 100644
index 66d217abf09..000
--- a/sys-apps/nix/nix-2.1.2.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic readme.gentoo-r1 user
-
-DESCRIPTION="A purely functional package manager"
-HOMEPAGE="https://nixos.org/nix;
-
-SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz;
-LICENSE="LGPL-2.1"
-SLOT="0"
-#keywords are blocked by boost-1.66
-#KEYWORDS="~amd64 ~x86"
-IUSE="+etc_profile +gc doc sodium"
-
-RDEPEND="
-   app-arch/brotli
-   app-arch/bzip2
-   app-arch/xz-utils
-   dev-db/sqlite
-   dev-libs/openssl:0=
-   >=dev-libs/boost-1.66:0=[context]
-   net-misc/curl
-   sys-libs/libseccomp
-   sys-libs/zlib
-   gc? ( dev-libs/boehm-gc[cxx] )
-   doc? ( dev-libs/libxml2
-   dev-libs/libxslt
-   app-text/docbook-xsl-stylesheets
-   )
-   sodium? ( dev-libs/libsodium:0= )
-"
-DEPEND="${RDEPEND}
-   >=sys-devel/bison-2.6
-   >=sys-devel/flex-2.5.35
-"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-1.11.6-systemd.patch
-   "${FILESDIR}"/${PN}-1.11.6-respect-CXXFLAGS.patch
-   "${FILESDIR}"/${PN}-1.11.6-respect-LDFLAGS.patch
-   "${FILESDIR}"/${PN}-2.0-user-path.patch
-)
-
-DISABLE_AUTOFORMATTING=yes
-DOC_CONTENTS=" Quick start user guide on Gentoo:
-
-[as root] enable nix-daemon service:
-   [systemd] # systemctl enable nix-daemon
-   [openrc]  # rc-update add nix-daemon
-[as a user] relogin to get environment and profile update
-[as a user] fetch nixpkgs update:
-   \$ nix-channel --update
-[as a user] install nix packages:
-   \$ nix-env -i mc
-[as a user] configure environment:
-   Somewhere in .bash_profile you might want to set
-   LOCALE_ARCHIVE=\$HOME/.nix-profile/lib/locale/locale-archive
-   but please read https://github.com/NixOS/nixpkgs/issues/21820
-
-Next steps:
-   nix package manager user manual: http://nixos.org/nix/manual/
-"
-
-pkg_setup() {
-   enewgroup nixbld
-   for i in {1..10}; do
-   # we list 'nixbld' twice to
-   # both assign a primary group for user
-   # and add a user to /etc/group
-   enewuser nixbld${i} -1 -1 /var/empty nixbld,nixbld
-   done
-}
-
-src_prepare() {
-   default
-
-   eautoreconf
-}
-
-src_configure() {
-   econf \
-   --localstatedir="${EPREFIX}"/nix/var \
-   $(use_enable gc)
-}
-
-src_compile() {
-   local make_vars=(
-   OPTIMIZE=0 # disable hardcoded -O3
-   V=1 # verbose build
-   )
-   emake "${make_vars[@]}"
-}
-
-src_install() {
-   # TODO: emacs highlighter
-   default
-
-   readme.gentoo_create_doc
-
-   # here we use an eager variant of something that
-   # is lazily done by nix-daemon and root nix-env

[gentoo-commits] repo/gentoo:master commit in: sys-apps/nix/

[Sergei Trofimovich]

commit: c8201ea8137e8eaf93f6819bf1f627c94492c9df
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Tue Oct  2 21:28:49 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue Oct  2 21:29:17 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8201ea8

sys-apps/nix: bump up to 2.1.3

Signed-off-by: Sergei Trofimovich  gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11

 sys-apps/nix/Manifest |   1 +
 sys-apps/nix/nix-2.1.3.ebuild | 135 ++
 2 files changed, 136 insertions(+)

diff --git a/sys-apps/nix/Manifest b/sys-apps/nix/Manifest
index 10ba24314e9..11bfeca86d5 100644
--- a/sys-apps/nix/Manifest
+++ b/sys-apps/nix/Manifest
@@ -1,3 +1,4 @@
 DIST nix-2.0.2.tar.xz 796404 BLAKE2B 
0906488bf2c800544c0747a6860ef51f667467f50039f725cf6ec05b8389462fe073bddceba106922a7611fd784b58ed5ca321efba0065b0f424aa53d7620990
 SHA512 
605e2c6dbc814470c25aa4f0aca77bfd11fd6d5c263ef38915cb9b852e77bcff08d515e76de8d929c9eacd02ffeaa5dd5f6b337461d54a1b2648b1fc505c98fa
 DIST nix-2.0.4.tar.xz 798352 BLAKE2B 
0eaf7e507c87e5398ab5967e1f2064a5827038bb84208768aa1c1deadc95e44aab922846b728467e3355d1f25e740590c3d1748ec05dfeae6a171952fd941b77
 SHA512 
bce3b3a14269d42648a4935770260c36dab25fde3ebcfed730063d1d139603468e1c30acf15eb0c617fa36a6b39d4ae31ccfd9cba762f631ecac213fd09a
 DIST nix-2.1.2.tar.xz 816492 BLAKE2B 
21365f2f7a88456aa566882780a65cabc190789e8e0f0aa62838bd7c9e2326c59776d78c6eaa4a2836039d02d6899114d5bc236bfadff5a2ef329531873e9e85
 SHA512 
6d54612f911438d5094c9d41fbf43ba4d8cada1da2b3eddbf7a3309262f9a9e94a2a826bb45247d5766bd6a419456ecdca5a8bebccff12607ebe004328bbc76a
+DIST nix-2.1.3.tar.xz 816396 BLAKE2B 
9627626075841e7f389f5010418fe17569ae69ea07de5ff9a0557df864052cc8b48f2a4dbfe16dffc5dca3fb180f527199f367810899ae9474d00e8fcc00b760
 SHA512 
d22718d23d8960dac7d07739835caa8183f573b303d77613e77314d873c1fe6da1cb0ed78337fe3219a94675307b23132a62ae7d9aa5354707e58400f403524b

diff --git a/sys-apps/nix/nix-2.1.3.ebuild b/sys-apps/nix/nix-2.1.3.ebuild
new file mode 100644
index 000..a104f3b883a
--- /dev/null
+++ b/sys-apps/nix/nix-2.1.3.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic readme.gentoo-r1 user
+
+DESCRIPTION="A purely functional package manager"
+HOMEPAGE="https://nixos.org/nix;
+
+SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz;
+LICENSE="LGPL-2.1"
+SLOT="0"
+#keywords are blocked by boost-1.66
+#KEYWORDS="~amd64 ~x86"
+IUSE="+etc_profile +gc doc sodium"
+
+RDEPEND="
+   app-arch/brotli
+   app-arch/bzip2
+   app-arch/xz-utils
+   dev-db/sqlite
+   dev-libs/openssl:0=
+   >=dev-libs/boost-1.66:0=[context]
+   net-misc/curl
+   sys-libs/libseccomp
+   sys-libs/zlib
+   gc? ( dev-libs/boehm-gc[cxx] )
+   doc? ( dev-libs/libxml2
+   dev-libs/libxslt
+   app-text/docbook-xsl-stylesheets
+   )
+   sodium? ( dev-libs/libsodium:0= )
+"
+DEPEND="${RDEPEND}
+   >=sys-devel/bison-2.6
+   >=sys-devel/flex-2.5.35
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.11.6-systemd.patch
+   "${FILESDIR}"/${PN}-1.11.6-respect-CXXFLAGS.patch
+   "${FILESDIR}"/${PN}-1.11.6-respect-LDFLAGS.patch
+   "${FILESDIR}"/${PN}-2.0-user-path.patch
+)
+
+DISABLE_AUTOFORMATTING=yes
+DOC_CONTENTS=" Quick start user guide on Gentoo:
+
+[as root] enable nix-daemon service:
+   [systemd] # systemctl enable nix-daemon
+   [openrc]  # rc-update add nix-daemon
+[as a user] relogin to get environment and profile update
+[as a user] fetch nixpkgs update:
+   \$ nix-channel --update
+[as a user] install nix packages:
+   \$ nix-env -i mc
+[as a user] configure environment:
+   Somewhere in .bash_profile you might want to set
+   LOCALE_ARCHIVE=\$HOME/.nix-profile/lib/locale/locale-archive
+   but please read https://github.com/NixOS/nixpkgs/issues/21820
+
+Next steps:
+   nix package manager user manual: http://nixos.org/nix/manual/
+"
+
+pkg_setup() {
+   enewgroup nixbld
+   for i in {1..10}; do
+   # we list 'nixbld' twice to
+   # both assign a primary group for user
+   # and add a user to /etc/group
+   enewuser nixbld${i} -1 -1 /var/empty nixbld,nixbld
+   done
+}
+
+src_prepare() {
+   default
+
+   eautoreconf
+}
+
+src_configure() {
+   econf \
+   --localstatedir="${EPREFIX}"/nix/var \
+   $(use_enable gc)
+}
+
+src_compile() {
+   local make_vars=(
+   OPTIMIZE=0 # disable hardcoded -O3
+   V=1 # verbose build
+   )
+   emake "${make_vars[@]}"
+}
+
+src_install() {
+   # TODO: emacs highlighter
+   default
+
+   readme.gentoo_create_doc
+
+   # here we use an eager variant of something that
+   # is lazily done by nix-daemon and root 

[gentoo-commits] repo/gentoo:master commit in: sys-apps/nix/

[Sergei Trofimovich]

commit: 0baa29acc97a32dd10a04c43f35d1f6122266d0f
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Wed Sep 19 22:58:53 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed Sep 19 22:58:53 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0baa29ac

sys-apps/nix: bump up to 2.1.2

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 sys-apps/nix/Manifest |   2 +
 sys-apps/nix/nix-2.1.2.ebuild | 135 ++
 sys-apps/nix/nix-2.1.ebuild   | 135 ++
 3 files changed, 272 insertions(+)

diff --git a/sys-apps/nix/Manifest b/sys-apps/nix/Manifest
index 21a9f659b37..389a508b0ed 100644
--- a/sys-apps/nix/Manifest
+++ b/sys-apps/nix/Manifest
@@ -1,3 +1,5 @@
 DIST nix-2.0.2.tar.xz 796404 BLAKE2B 
0906488bf2c800544c0747a6860ef51f667467f50039f725cf6ec05b8389462fe073bddceba106922a7611fd784b58ed5ca321efba0065b0f424aa53d7620990
 SHA512 
605e2c6dbc814470c25aa4f0aca77bfd11fd6d5c263ef38915cb9b852e77bcff08d515e76de8d929c9eacd02ffeaa5dd5f6b337461d54a1b2648b1fc505c98fa
 DIST nix-2.0.4.tar.xz 798352 BLAKE2B 
0eaf7e507c87e5398ab5967e1f2064a5827038bb84208768aa1c1deadc95e44aab922846b728467e3355d1f25e740590c3d1748ec05dfeae6a171952fd941b77
 SHA512 
bce3b3a14269d42648a4935770260c36dab25fde3ebcfed730063d1d139603468e1c30acf15eb0c617fa36a6b39d4ae31ccfd9cba762f631ecac213fd09a
 DIST nix-2.1.1.tar.xz 814812 BLAKE2B 
48486e8eb2937fff1e2b39b7ea61eea3ad6ba477229006e31f6efbefcd7839669d1e9533b1b601302a5d4264e2ea261758aff3a79bea616215b22041d32e0469
 SHA512 
38a5b4013eb60a0088870dd142b2baacabc9f204af07f349d34a529a3130568e260765793162c5a978ee6115fd66019e132c08524af4984e5698535f17fc29bd
+DIST nix-2.1.2.tar.xz 816492 BLAKE2B 
21365f2f7a88456aa566882780a65cabc190789e8e0f0aa62838bd7c9e2326c59776d78c6eaa4a2836039d02d6899114d5bc236bfadff5a2ef329531873e9e85
 SHA512 
6d54612f911438d5094c9d41fbf43ba4d8cada1da2b3eddbf7a3309262f9a9e94a2a826bb45247d5766bd6a419456ecdca5a8bebccff12607ebe004328bbc76a
+DIST nix-2.1.tar.xz 814936 BLAKE2B 
36cb7cecadb353aa920c873b24ea9b7c6c70b0048ddd664e89e2b3c1736b0fe8057dab02cbb9dfe5b500eea27f6da0dd00532e301e8f190dd3f4bd3ef02911be
 SHA512 
1eddf73680ff59277cddc4c891f026295274ea9bd68b795cb5d1cf9ff993638b066417923c4a0ca8248da982498dca05abe811477eac31dee77bd2dad860e43c

diff --git a/sys-apps/nix/nix-2.1.2.ebuild b/sys-apps/nix/nix-2.1.2.ebuild
new file mode 100644
index 000..66d217abf09
--- /dev/null
+++ b/sys-apps/nix/nix-2.1.2.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic readme.gentoo-r1 user
+
+DESCRIPTION="A purely functional package manager"
+HOMEPAGE="https://nixos.org/nix;
+
+SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz;
+LICENSE="LGPL-2.1"
+SLOT="0"
+#keywords are blocked by boost-1.66
+#KEYWORDS="~amd64 ~x86"
+IUSE="+etc_profile +gc doc sodium"
+
+RDEPEND="
+   app-arch/brotli
+   app-arch/bzip2
+   app-arch/xz-utils
+   dev-db/sqlite
+   dev-libs/openssl:0=
+   >=dev-libs/boost-1.66:0=[context]
+   net-misc/curl
+   sys-libs/libseccomp
+   sys-libs/zlib
+   gc? ( dev-libs/boehm-gc[cxx] )
+   doc? ( dev-libs/libxml2
+   dev-libs/libxslt
+   app-text/docbook-xsl-stylesheets
+   )
+   sodium? ( dev-libs/libsodium:0= )
+"
+DEPEND="${RDEPEND}
+   >=sys-devel/bison-2.6
+   >=sys-devel/flex-2.5.35
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.11.6-systemd.patch
+   "${FILESDIR}"/${PN}-1.11.6-respect-CXXFLAGS.patch
+   "${FILESDIR}"/${PN}-1.11.6-respect-LDFLAGS.patch
+   "${FILESDIR}"/${PN}-2.0-user-path.patch
+)
+
+DISABLE_AUTOFORMATTING=yes
+DOC_CONTENTS=" Quick start user guide on Gentoo:
+
+[as root] enable nix-daemon service:
+   [systemd] # systemctl enable nix-daemon
+   [openrc]  # rc-update add nix-daemon
+[as a user] relogin to get environment and profile update
+[as a user] fetch nixpkgs update:
+   \$ nix-channel --update
+[as a user] install nix packages:
+   \$ nix-env -i mc
+[as a user] configure environment:
+   Somewhere in .bash_profile you might want to set
+   LOCALE_ARCHIVE=\$HOME/.nix-profile/lib/locale/locale-archive
+   but please read https://github.com/NixOS/nixpkgs/issues/21820
+
+Next steps:
+   nix package manager user manual: http://nixos.org/nix/manual/
+"
+
+pkg_setup() {
+   enewgroup nixbld
+   for i in {1..10}; do
+   # we list 'nixbld' twice to
+   # both assign a primary group for user
+   # and add a user to /etc/group
+   enewuser nixbld${i} -1 -1 /var/empty nixbld,nixbld
+   done
+}
+
+src_prepare() {
+   default
+
+   eautoreconf
+}
+
+src_configure() {
+   econf \
+   --localstatedir="${EPREFIX}"/nix/var \
+   $(use_enable gc)
+}
+
+src_compile() {
+   local make_vars=(
+ 

[gentoo-commits] repo/gentoo:master commit in: sys-apps/nix/

[Sergei Trofimovich]

commit: 72700818c8bc636e4defde306f1ecc7b74140f71
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Wed Sep 19 22:59:10 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed Sep 19 22:59:10 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72700818

sys-apps/nix: drop old

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 sys-apps/nix/Manifest |   2 -
 sys-apps/nix/nix-2.1.1.ebuild | 135 --
 sys-apps/nix/nix-2.1.ebuild   | 135 --
 3 files changed, 272 deletions(-)

diff --git a/sys-apps/nix/Manifest b/sys-apps/nix/Manifest
index 389a508b0ed..10ba24314e9 100644
--- a/sys-apps/nix/Manifest
+++ b/sys-apps/nix/Manifest
@@ -1,5 +1,3 @@
 DIST nix-2.0.2.tar.xz 796404 BLAKE2B 
0906488bf2c800544c0747a6860ef51f667467f50039f725cf6ec05b8389462fe073bddceba106922a7611fd784b58ed5ca321efba0065b0f424aa53d7620990
 SHA512 
605e2c6dbc814470c25aa4f0aca77bfd11fd6d5c263ef38915cb9b852e77bcff08d515e76de8d929c9eacd02ffeaa5dd5f6b337461d54a1b2648b1fc505c98fa
 DIST nix-2.0.4.tar.xz 798352 BLAKE2B 
0eaf7e507c87e5398ab5967e1f2064a5827038bb84208768aa1c1deadc95e44aab922846b728467e3355d1f25e740590c3d1748ec05dfeae6a171952fd941b77
 SHA512 
bce3b3a14269d42648a4935770260c36dab25fde3ebcfed730063d1d139603468e1c30acf15eb0c617fa36a6b39d4ae31ccfd9cba762f631ecac213fd09a
-DIST nix-2.1.1.tar.xz 814812 BLAKE2B 
48486e8eb2937fff1e2b39b7ea61eea3ad6ba477229006e31f6efbefcd7839669d1e9533b1b601302a5d4264e2ea261758aff3a79bea616215b22041d32e0469
 SHA512 
38a5b4013eb60a0088870dd142b2baacabc9f204af07f349d34a529a3130568e260765793162c5a978ee6115fd66019e132c08524af4984e5698535f17fc29bd
 DIST nix-2.1.2.tar.xz 816492 BLAKE2B 
21365f2f7a88456aa566882780a65cabc190789e8e0f0aa62838bd7c9e2326c59776d78c6eaa4a2836039d02d6899114d5bc236bfadff5a2ef329531873e9e85
 SHA512 
6d54612f911438d5094c9d41fbf43ba4d8cada1da2b3eddbf7a3309262f9a9e94a2a826bb45247d5766bd6a419456ecdca5a8bebccff12607ebe004328bbc76a
-DIST nix-2.1.tar.xz 814936 BLAKE2B 
36cb7cecadb353aa920c873b24ea9b7c6c70b0048ddd664e89e2b3c1736b0fe8057dab02cbb9dfe5b500eea27f6da0dd00532e301e8f190dd3f4bd3ef02911be
 SHA512 
1eddf73680ff59277cddc4c891f026295274ea9bd68b795cb5d1cf9ff993638b066417923c4a0ca8248da982498dca05abe811477eac31dee77bd2dad860e43c

diff --git a/sys-apps/nix/nix-2.1.1.ebuild b/sys-apps/nix/nix-2.1.1.ebuild
deleted file mode 100644
index 66d217abf09..000
--- a/sys-apps/nix/nix-2.1.1.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic readme.gentoo-r1 user
-
-DESCRIPTION="A purely functional package manager"
-HOMEPAGE="https://nixos.org/nix;
-
-SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz;
-LICENSE="LGPL-2.1"
-SLOT="0"
-#keywords are blocked by boost-1.66
-#KEYWORDS="~amd64 ~x86"
-IUSE="+etc_profile +gc doc sodium"
-
-RDEPEND="
-   app-arch/brotli
-   app-arch/bzip2
-   app-arch/xz-utils
-   dev-db/sqlite
-   dev-libs/openssl:0=
-   >=dev-libs/boost-1.66:0=[context]
-   net-misc/curl
-   sys-libs/libseccomp
-   sys-libs/zlib
-   gc? ( dev-libs/boehm-gc[cxx] )
-   doc? ( dev-libs/libxml2
-   dev-libs/libxslt
-   app-text/docbook-xsl-stylesheets
-   )
-   sodium? ( dev-libs/libsodium:0= )
-"
-DEPEND="${RDEPEND}
-   >=sys-devel/bison-2.6
-   >=sys-devel/flex-2.5.35
-"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-1.11.6-systemd.patch
-   "${FILESDIR}"/${PN}-1.11.6-respect-CXXFLAGS.patch
-   "${FILESDIR}"/${PN}-1.11.6-respect-LDFLAGS.patch
-   "${FILESDIR}"/${PN}-2.0-user-path.patch
-)
-
-DISABLE_AUTOFORMATTING=yes
-DOC_CONTENTS=" Quick start user guide on Gentoo:
-
-[as root] enable nix-daemon service:
-   [systemd] # systemctl enable nix-daemon
-   [openrc]  # rc-update add nix-daemon
-[as a user] relogin to get environment and profile update
-[as a user] fetch nixpkgs update:
-   \$ nix-channel --update
-[as a user] install nix packages:
-   \$ nix-env -i mc
-[as a user] configure environment:
-   Somewhere in .bash_profile you might want to set
-   LOCALE_ARCHIVE=\$HOME/.nix-profile/lib/locale/locale-archive
-   but please read https://github.com/NixOS/nixpkgs/issues/21820
-
-Next steps:
-   nix package manager user manual: http://nixos.org/nix/manual/
-"
-
-pkg_setup() {
-   enewgroup nixbld
-   for i in {1..10}; do
-   # we list 'nixbld' twice to
-   # both assign a primary group for user
-   # and add a user to /etc/group
-   enewuser nixbld${i} -1 -1 /var/empty nixbld,nixbld
-   done
-}
-
-src_prepare() {
-   default
-
-   eautoreconf
-}
-
-src_configure() {
-   econf \
-   --localstatedir="${EPREFIX}"/nix/var \
-   $(use_enable gc)
-}
-
-src_compile() {
-   local make_vars=(
-  

[gentoo-commits] repo/gentoo:master commit in: sys-apps/nix/

[Sergei Trofimovich]

commit: 88429b419f5b6b1d05c13daf9cd1ae58bf19d4b3
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Thu Sep  6 22:36:34 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Sep  6 22:36:59 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88429b41

sys-apps/nix: bump up to 2.1.1

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 sys-apps/nix/Manifest |   1 +
 sys-apps/nix/nix-2.1.1.ebuild | 135 ++
 2 files changed, 136 insertions(+)

diff --git a/sys-apps/nix/Manifest b/sys-apps/nix/Manifest
index feacc529328..35384101cda 100644
--- a/sys-apps/nix/Manifest
+++ b/sys-apps/nix/Manifest
@@ -1,3 +1,4 @@
 DIST nix-2.0.2.tar.xz 796404 BLAKE2B 
0906488bf2c800544c0747a6860ef51f667467f50039f725cf6ec05b8389462fe073bddceba106922a7611fd784b58ed5ca321efba0065b0f424aa53d7620990
 SHA512 
605e2c6dbc814470c25aa4f0aca77bfd11fd6d5c263ef38915cb9b852e77bcff08d515e76de8d929c9eacd02ffeaa5dd5f6b337461d54a1b2648b1fc505c98fa
 DIST nix-2.0.4.tar.xz 798352 BLAKE2B 
0eaf7e507c87e5398ab5967e1f2064a5827038bb84208768aa1c1deadc95e44aab922846b728467e3355d1f25e740590c3d1748ec05dfeae6a171952fd941b77
 SHA512 
bce3b3a14269d42648a4935770260c36dab25fde3ebcfed730063d1d139603468e1c30acf15eb0c617fa36a6b39d4ae31ccfd9cba762f631ecac213fd09a
+DIST nix-2.1.1.tar.xz 814812 BLAKE2B 
48486e8eb2937fff1e2b39b7ea61eea3ad6ba477229006e31f6efbefcd7839669d1e9533b1b601302a5d4264e2ea261758aff3a79bea616215b22041d32e0469
 SHA512 
38a5b4013eb60a0088870dd142b2baacabc9f204af07f349d34a529a3130568e260765793162c5a978ee6115fd66019e132c08524af4984e5698535f17fc29bd
 DIST nix-2.1.tar.xz 814936 BLAKE2B 
36cb7cecadb353aa920c873b24ea9b7c6c70b0048ddd664e89e2b3c1736b0fe8057dab02cbb9dfe5b500eea27f6da0dd00532e301e8f190dd3f4bd3ef02911be
 SHA512 
1eddf73680ff59277cddc4c891f026295274ea9bd68b795cb5d1cf9ff993638b066417923c4a0ca8248da982498dca05abe811477eac31dee77bd2dad860e43c

diff --git a/sys-apps/nix/nix-2.1.1.ebuild b/sys-apps/nix/nix-2.1.1.ebuild
new file mode 100644
index 000..66d217abf09
--- /dev/null
+++ b/sys-apps/nix/nix-2.1.1.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic readme.gentoo-r1 user
+
+DESCRIPTION="A purely functional package manager"
+HOMEPAGE="https://nixos.org/nix;
+
+SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz;
+LICENSE="LGPL-2.1"
+SLOT="0"
+#keywords are blocked by boost-1.66
+#KEYWORDS="~amd64 ~x86"
+IUSE="+etc_profile +gc doc sodium"
+
+RDEPEND="
+   app-arch/brotli
+   app-arch/bzip2
+   app-arch/xz-utils
+   dev-db/sqlite
+   dev-libs/openssl:0=
+   >=dev-libs/boost-1.66:0=[context]
+   net-misc/curl
+   sys-libs/libseccomp
+   sys-libs/zlib
+   gc? ( dev-libs/boehm-gc[cxx] )
+   doc? ( dev-libs/libxml2
+   dev-libs/libxslt
+   app-text/docbook-xsl-stylesheets
+   )
+   sodium? ( dev-libs/libsodium:0= )
+"
+DEPEND="${RDEPEND}
+   >=sys-devel/bison-2.6
+   >=sys-devel/flex-2.5.35
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.11.6-systemd.patch
+   "${FILESDIR}"/${PN}-1.11.6-respect-CXXFLAGS.patch
+   "${FILESDIR}"/${PN}-1.11.6-respect-LDFLAGS.patch
+   "${FILESDIR}"/${PN}-2.0-user-path.patch
+)
+
+DISABLE_AUTOFORMATTING=yes
+DOC_CONTENTS=" Quick start user guide on Gentoo:
+
+[as root] enable nix-daemon service:
+   [systemd] # systemctl enable nix-daemon
+   [openrc]  # rc-update add nix-daemon
+[as a user] relogin to get environment and profile update
+[as a user] fetch nixpkgs update:
+   \$ nix-channel --update
+[as a user] install nix packages:
+   \$ nix-env -i mc
+[as a user] configure environment:
+   Somewhere in .bash_profile you might want to set
+   LOCALE_ARCHIVE=\$HOME/.nix-profile/lib/locale/locale-archive
+   but please read https://github.com/NixOS/nixpkgs/issues/21820
+
+Next steps:
+   nix package manager user manual: http://nixos.org/nix/manual/
+"
+
+pkg_setup() {
+   enewgroup nixbld
+   for i in {1..10}; do
+   # we list 'nixbld' twice to
+   # both assign a primary group for user
+   # and add a user to /etc/group
+   enewuser nixbld${i} -1 -1 /var/empty nixbld,nixbld
+   done
+}
+
+src_prepare() {
+   default
+
+   eautoreconf
+}
+
+src_configure() {
+   econf \
+   --localstatedir="${EPREFIX}"/nix/var \
+   $(use_enable gc)
+}
+
+src_compile() {
+   local make_vars=(
+   OPTIMIZE=0 # disable hardcoded -O3
+   V=1 # verbose build
+   )
+   emake "${make_vars[@]}"
+}
+
+src_install() {
+   # TODO: emacs highlighter
+   default
+
+   readme.gentoo_create_doc
+
+   # here we use an eager variant of something that
+   # is lazily done by nix-daemon and root nix-env
+
+   # TODO: will need a tweak for 

[gentoo-commits] repo/gentoo:master commit in: sys-apps/nix/

[Sergei Trofimovich]

commit: c7d45ede0a1b55b06d5c1d2b4e49355dcb733d55
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Thu Sep  6 22:36:49 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Sep  6 22:36:59 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7d45ede

sys-apps/nix: drop old

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 sys-apps/nix/Manifest   |   1 -
 sys-apps/nix/nix-2.1.ebuild | 135 
 2 files changed, 136 deletions(-)

diff --git a/sys-apps/nix/Manifest b/sys-apps/nix/Manifest
index 35384101cda..21a9f659b37 100644
--- a/sys-apps/nix/Manifest
+++ b/sys-apps/nix/Manifest
@@ -1,4 +1,3 @@
 DIST nix-2.0.2.tar.xz 796404 BLAKE2B 
0906488bf2c800544c0747a6860ef51f667467f50039f725cf6ec05b8389462fe073bddceba106922a7611fd784b58ed5ca321efba0065b0f424aa53d7620990
 SHA512 
605e2c6dbc814470c25aa4f0aca77bfd11fd6d5c263ef38915cb9b852e77bcff08d515e76de8d929c9eacd02ffeaa5dd5f6b337461d54a1b2648b1fc505c98fa
 DIST nix-2.0.4.tar.xz 798352 BLAKE2B 
0eaf7e507c87e5398ab5967e1f2064a5827038bb84208768aa1c1deadc95e44aab922846b728467e3355d1f25e740590c3d1748ec05dfeae6a171952fd941b77
 SHA512 
bce3b3a14269d42648a4935770260c36dab25fde3ebcfed730063d1d139603468e1c30acf15eb0c617fa36a6b39d4ae31ccfd9cba762f631ecac213fd09a
 DIST nix-2.1.1.tar.xz 814812 BLAKE2B 
48486e8eb2937fff1e2b39b7ea61eea3ad6ba477229006e31f6efbefcd7839669d1e9533b1b601302a5d4264e2ea261758aff3a79bea616215b22041d32e0469
 SHA512 
38a5b4013eb60a0088870dd142b2baacabc9f204af07f349d34a529a3130568e260765793162c5a978ee6115fd66019e132c08524af4984e5698535f17fc29bd
-DIST nix-2.1.tar.xz 814936 BLAKE2B 
36cb7cecadb353aa920c873b24ea9b7c6c70b0048ddd664e89e2b3c1736b0fe8057dab02cbb9dfe5b500eea27f6da0dd00532e301e8f190dd3f4bd3ef02911be
 SHA512 
1eddf73680ff59277cddc4c891f026295274ea9bd68b795cb5d1cf9ff993638b066417923c4a0ca8248da982498dca05abe811477eac31dee77bd2dad860e43c

diff --git a/sys-apps/nix/nix-2.1.ebuild b/sys-apps/nix/nix-2.1.ebuild
deleted file mode 100644
index 66d217abf09..000
--- a/sys-apps/nix/nix-2.1.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic readme.gentoo-r1 user
-
-DESCRIPTION="A purely functional package manager"
-HOMEPAGE="https://nixos.org/nix;
-
-SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz;
-LICENSE="LGPL-2.1"
-SLOT="0"
-#keywords are blocked by boost-1.66
-#KEYWORDS="~amd64 ~x86"
-IUSE="+etc_profile +gc doc sodium"
-
-RDEPEND="
-   app-arch/brotli
-   app-arch/bzip2
-   app-arch/xz-utils
-   dev-db/sqlite
-   dev-libs/openssl:0=
-   >=dev-libs/boost-1.66:0=[context]
-   net-misc/curl
-   sys-libs/libseccomp
-   sys-libs/zlib
-   gc? ( dev-libs/boehm-gc[cxx] )
-   doc? ( dev-libs/libxml2
-   dev-libs/libxslt
-   app-text/docbook-xsl-stylesheets
-   )
-   sodium? ( dev-libs/libsodium:0= )
-"
-DEPEND="${RDEPEND}
-   >=sys-devel/bison-2.6
-   >=sys-devel/flex-2.5.35
-"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-1.11.6-systemd.patch
-   "${FILESDIR}"/${PN}-1.11.6-respect-CXXFLAGS.patch
-   "${FILESDIR}"/${PN}-1.11.6-respect-LDFLAGS.patch
-   "${FILESDIR}"/${PN}-2.0-user-path.patch
-)
-
-DISABLE_AUTOFORMATTING=yes
-DOC_CONTENTS=" Quick start user guide on Gentoo:
-
-[as root] enable nix-daemon service:
-   [systemd] # systemctl enable nix-daemon
-   [openrc]  # rc-update add nix-daemon
-[as a user] relogin to get environment and profile update
-[as a user] fetch nixpkgs update:
-   \$ nix-channel --update
-[as a user] install nix packages:
-   \$ nix-env -i mc
-[as a user] configure environment:
-   Somewhere in .bash_profile you might want to set
-   LOCALE_ARCHIVE=\$HOME/.nix-profile/lib/locale/locale-archive
-   but please read https://github.com/NixOS/nixpkgs/issues/21820
-
-Next steps:
-   nix package manager user manual: http://nixos.org/nix/manual/
-"
-
-pkg_setup() {
-   enewgroup nixbld
-   for i in {1..10}; do
-   # we list 'nixbld' twice to
-   # both assign a primary group for user
-   # and add a user to /etc/group
-   enewuser nixbld${i} -1 -1 /var/empty nixbld,nixbld
-   done
-}
-
-src_prepare() {
-   default
-
-   eautoreconf
-}
-
-src_configure() {
-   econf \
-   --localstatedir="${EPREFIX}"/nix/var \
-   $(use_enable gc)
-}
-
-src_compile() {
-   local make_vars=(
-   OPTIMIZE=0 # disable hardcoded -O3
-   V=1 # verbose build
-   )
-   emake "${make_vars[@]}"
-}
-
-src_install() {
-   # TODO: emacs highlighter
-   default
-
-   readme.gentoo_create_doc
-
-   # here we use an eager variant of something that
-   # is lazily done by nix-daemon and root nix-env
-
-   # TODO: will need a tweak for prefix
-   

[gentoo-commits] repo/gentoo:master commit in: sys-apps/nix/

[Sergei Trofimovich]

commit: 0de6367c771d92bcb28febcb8a1b8574ce43e770
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Tue Sep  4 07:27:33 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue Sep  4 08:19:25 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0de6367c

sys-apps/nix: bump up to 2.1, unkeyworded

No keywords as >=dev-libs/boost-1.66 is not
keyworded in Gentoo. See bug #630754.

Bug: https://bugs.gentoo.org/630754
Package-Manager: Portage-2.3.49, Repoman-2.3.10

 sys-apps/nix/Manifest   |   1 +
 sys-apps/nix/nix-2.1.ebuild | 135 
 2 files changed, 136 insertions(+)

diff --git a/sys-apps/nix/Manifest b/sys-apps/nix/Manifest
index 336623a0ee9..feacc529328 100644
--- a/sys-apps/nix/Manifest
+++ b/sys-apps/nix/Manifest
@@ -1,2 +1,3 @@
 DIST nix-2.0.2.tar.xz 796404 BLAKE2B 
0906488bf2c800544c0747a6860ef51f667467f50039f725cf6ec05b8389462fe073bddceba106922a7611fd784b58ed5ca321efba0065b0f424aa53d7620990
 SHA512 
605e2c6dbc814470c25aa4f0aca77bfd11fd6d5c263ef38915cb9b852e77bcff08d515e76de8d929c9eacd02ffeaa5dd5f6b337461d54a1b2648b1fc505c98fa
 DIST nix-2.0.4.tar.xz 798352 BLAKE2B 
0eaf7e507c87e5398ab5967e1f2064a5827038bb84208768aa1c1deadc95e44aab922846b728467e3355d1f25e740590c3d1748ec05dfeae6a171952fd941b77
 SHA512 
bce3b3a14269d42648a4935770260c36dab25fde3ebcfed730063d1d139603468e1c30acf15eb0c617fa36a6b39d4ae31ccfd9cba762f631ecac213fd09a
+DIST nix-2.1.tar.xz 814936 BLAKE2B 
36cb7cecadb353aa920c873b24ea9b7c6c70b0048ddd664e89e2b3c1736b0fe8057dab02cbb9dfe5b500eea27f6da0dd00532e301e8f190dd3f4bd3ef02911be
 SHA512 
1eddf73680ff59277cddc4c891f026295274ea9bd68b795cb5d1cf9ff993638b066417923c4a0ca8248da982498dca05abe811477eac31dee77bd2dad860e43c

diff --git a/sys-apps/nix/nix-2.1.ebuild b/sys-apps/nix/nix-2.1.ebuild
new file mode 100644
index 000..66d217abf09
--- /dev/null
+++ b/sys-apps/nix/nix-2.1.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic readme.gentoo-r1 user
+
+DESCRIPTION="A purely functional package manager"
+HOMEPAGE="https://nixos.org/nix;
+
+SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz;
+LICENSE="LGPL-2.1"
+SLOT="0"
+#keywords are blocked by boost-1.66
+#KEYWORDS="~amd64 ~x86"
+IUSE="+etc_profile +gc doc sodium"
+
+RDEPEND="
+   app-arch/brotli
+   app-arch/bzip2
+   app-arch/xz-utils
+   dev-db/sqlite
+   dev-libs/openssl:0=
+   >=dev-libs/boost-1.66:0=[context]
+   net-misc/curl
+   sys-libs/libseccomp
+   sys-libs/zlib
+   gc? ( dev-libs/boehm-gc[cxx] )
+   doc? ( dev-libs/libxml2
+   dev-libs/libxslt
+   app-text/docbook-xsl-stylesheets
+   )
+   sodium? ( dev-libs/libsodium:0= )
+"
+DEPEND="${RDEPEND}
+   >=sys-devel/bison-2.6
+   >=sys-devel/flex-2.5.35
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.11.6-systemd.patch
+   "${FILESDIR}"/${PN}-1.11.6-respect-CXXFLAGS.patch
+   "${FILESDIR}"/${PN}-1.11.6-respect-LDFLAGS.patch
+   "${FILESDIR}"/${PN}-2.0-user-path.patch
+)
+
+DISABLE_AUTOFORMATTING=yes
+DOC_CONTENTS=" Quick start user guide on Gentoo:
+
+[as root] enable nix-daemon service:
+   [systemd] # systemctl enable nix-daemon
+   [openrc]  # rc-update add nix-daemon
+[as a user] relogin to get environment and profile update
+[as a user] fetch nixpkgs update:
+   \$ nix-channel --update
+[as a user] install nix packages:
+   \$ nix-env -i mc
+[as a user] configure environment:
+   Somewhere in .bash_profile you might want to set
+   LOCALE_ARCHIVE=\$HOME/.nix-profile/lib/locale/locale-archive
+   but please read https://github.com/NixOS/nixpkgs/issues/21820
+
+Next steps:
+   nix package manager user manual: http://nixos.org/nix/manual/
+"
+
+pkg_setup() {
+   enewgroup nixbld
+   for i in {1..10}; do
+   # we list 'nixbld' twice to
+   # both assign a primary group for user
+   # and add a user to /etc/group
+   enewuser nixbld${i} -1 -1 /var/empty nixbld,nixbld
+   done
+}
+
+src_prepare() {
+   default
+
+   eautoreconf
+}
+
+src_configure() {
+   econf \
+   --localstatedir="${EPREFIX}"/nix/var \
+   $(use_enable gc)
+}
+
+src_compile() {
+   local make_vars=(
+   OPTIMIZE=0 # disable hardcoded -O3
+   V=1 # verbose build
+   )
+   emake "${make_vars[@]}"
+}
+
+src_install() {
+   # TODO: emacs highlighter
+   default
+
+   readme.gentoo_create_doc
+
+   # here we use an eager variant of something that
+   # is lazily done by nix-daemon and root nix-env
+
+   # TODO: will need a tweak for prefix
+   keepdir /nix/store
+   fowners root:nixbld /nix/store
+   fperms 1775 /nix/store
+
+   keepdir /nix/var/nix/channel-cache
+   

[gentoo-commits] repo/gentoo:master commit in: sys-apps/nix/files/

[Sergei Trofimovich]

commit: bacb85aabf5112d77daecf02a1028522b0fa7eb1
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Wed Jul  4 16:29:11 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Jul  6 20:44:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bacb85aa

sys-apps/nix: remove unused patch

 sys-apps/nix/files/nix-1.11.6-per-user.patch | 11 ---
 1 file changed, 11 deletions(-)

diff --git a/sys-apps/nix/files/nix-1.11.6-per-user.patch 
b/sys-apps/nix/files/nix-1.11.6-per-user.patch
deleted file mode 100644
index 9cea685c59a..000
--- a/sys-apps/nix/files/nix-1.11.6-per-user.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-By default created symlink poins to a directory not accessible by user.
-Make a symlink the same way NixOS does symlinking.
-diff --git a/scripts/nix-profile.sh.in b/scripts/nix-profile.sh.in
-index 672d1f0..e3b0978 100644
 a/scripts/nix-profile.sh.in
-+++ b/scripts/nix-profile.sh.in
-@@ -6,3 +6,3 @@ if [ -n "$HOME" ]; then
- echo "creating $NIX_LINK" >&2
--_NIX_DEF_LINK=@localstatedir@/nix/profiles/default
-+_NIX_DEF_LINK=@localstatedir@/nix/profiles/per-user/$USER/profile
- @coreutils@/ln -s "$_NIX_DEF_LINK" "$NIX_LINK"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/nix/

[Sergei Trofimovich]

commit: eeed7c08e1e9b095802eba03e679979071fe39bc
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Fri Jun  8 15:30:57 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Jun  8 15:30:57 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eeed7c08

sys-apps/nix: drop old

Package-Manager: Portage-2.3.38, Repoman-2.3.9

 sys-apps/nix/Manifest   |   4 --
 sys-apps/nix/nix-1.11.15.ebuild | 134 
 sys-apps/nix/nix-1.11.16.ebuild | 134 
 sys-apps/nix/nix-2.0.1.ebuild   | 133 ---
 sys-apps/nix/nix-2.0.ebuild | 133 ---
 5 files changed, 538 deletions(-)

diff --git a/sys-apps/nix/Manifest b/sys-apps/nix/Manifest
index 80b2ea351b1..336623a0ee9 100644
--- a/sys-apps/nix/Manifest
+++ b/sys-apps/nix/Manifest
@@ -1,6 +1,2 @@
-DIST nix-1.11.15.tar.xz 632544 BLAKE2B 
3624c396c67a7c64e2ba16fd500951e6cf1b6f29f31929793072b5dfcdf1ffe40d5645c58d3967dd82d6c8d0bf6e5e2598a0d8d5fc3f82b22ea279a7854b1aca
 SHA512 
449b3c78b74c776215dfbe9d6d09b96d8c6abf996c69c525073df12d0cffb1a2868890d356fbb52c794e2c6f485018756395625e7b170166f7c6f9e2bdd364d9
-DIST nix-1.11.16.tar.xz 632440 BLAKE2B 
0b1966b1445a18616d6ff33e7fa3d1776626872c7cfeb54be4c77b998841db69f1e6aea7638edb21fa67442b953fb1cbaf7752c841d7d21f62dd63885a823834
 SHA512 
164f728c96fc6609134334e61f674961dfc0f02bd2f5d1d7800d2623fe80d896bfd0b7fba0a723b1bfe23663d4c7cf3e419a7c1992d67e80eb3d6b3bdf60a2a8
-DIST nix-2.0.1.tar.xz 796520 BLAKE2B 
bd71d625f08b785b74a31f74e5ecdbca247bf9fc29a5a49a3e7db51c70911c5c200804783b0ee38164e909d3c287d0484fc0d617d11be6ca41531682e8f14cef
 SHA512 
05013a2242b558a2bd3b104b9fdb570ceddf37466e420daf0c81294f9dccdf190472bd32550f00915b1cd1b738576b46c112af39c198cfe5f0121b9f6f2f4d92
 DIST nix-2.0.2.tar.xz 796404 BLAKE2B 
0906488bf2c800544c0747a6860ef51f667467f50039f725cf6ec05b8389462fe073bddceba106922a7611fd784b58ed5ca321efba0065b0f424aa53d7620990
 SHA512 
605e2c6dbc814470c25aa4f0aca77bfd11fd6d5c263ef38915cb9b852e77bcff08d515e76de8d929c9eacd02ffeaa5dd5f6b337461d54a1b2648b1fc505c98fa
 DIST nix-2.0.4.tar.xz 798352 BLAKE2B 
0eaf7e507c87e5398ab5967e1f2064a5827038bb84208768aa1c1deadc95e44aab922846b728467e3355d1f25e740590c3d1748ec05dfeae6a171952fd941b77
 SHA512 
bce3b3a14269d42648a4935770260c36dab25fde3ebcfed730063d1d139603468e1c30acf15eb0c617fa36a6b39d4ae31ccfd9cba762f631ecac213fd09a
-DIST nix-2.0.tar.xz 794084 BLAKE2B 
9596788df6aaad144d408e95f34575bf985849bb57424c7aac4dc1f2f2d846302bf78fc05682ce92fbaf000db04a326f867a76f5963a80b72b63e3678754247f
 SHA512 
4531b4648108019d44521af94f8243936d2df62701395c0c448795f1984d4b5ade2438c92d12e5414d493909811e3bcb902c85539932c7e44d98d4254a2a531d

diff --git a/sys-apps/nix/nix-1.11.15.ebuild b/sys-apps/nix/nix-1.11.15.ebuild
deleted file mode 100644
index d4e616516f7..000
--- a/sys-apps/nix/nix-1.11.15.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic readme.gentoo-r1 user
-
-DESCRIPTION="A purely functional package manager"
-HOMEPAGE="https://nixos.org/nix;
-
-SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz;
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+etc_profile +gc doc sodium"
-
-RDEPEND="
-   app-arch/bzip2
-   app-arch/xz-utils
-   dev-db/sqlite
-   dev-libs/openssl:0=
-   net-misc/curl
-   sys-libs/libseccomp
-   sys-libs/zlib
-   gc? ( dev-libs/boehm-gc[cxx] )
-   doc? ( dev-libs/libxml2
-   dev-libs/libxslt
-   app-text/docbook-xsl-stylesheets
-   )
-   sodium? ( dev-libs/libsodium )
-   dev-lang/perl:=
-   dev-perl/DBD-SQLite
-   dev-perl/WWW-Curl
-   dev-perl/DBI
-"
-DEPEND="${RDEPEND}
-   >=sys-devel/bison-2.6
-   >=sys-devel/flex-2.5.35
-   virtual/perl-ExtUtils-ParseXS
-"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-1.11.6-systemd.patch
-   "${FILESDIR}"/${PN}-1.11.6-per-user.patch
-   "${FILESDIR}"/${PN}-1.11.6-respect-CXXFLAGS.patch
-   "${FILESDIR}"/${PN}-1.11.6-respect-LDFLAGS.patch
-)
-
-DISABLE_AUTOFORMATTING=yes
-DOC_CONTENTS=" Quick start user guide on Gentoo:
-
-[as root] enable nix-daemon service:
-   [systemd] # systemctl enable nix-daemon
-   [openrc]  # rc-update add nix-daemon
-[as a user] relogin to get environment and profile update
-[as a user] fetch nixpkgs update:
-   \$ nix-channel --update
-[as a user] install nix packages:
-   \$ nix-env -i mc
-[as a user] configure environment:
-   Somewhere in .bash_profile you might want to set
-   LOCALE_ARCHIVE=\$HOME/.nix-profile/lib/locale/locale-archive
-   but please read https://github.com/NixOS/nixpkgs/issues/21820
-
-Next steps:
-   nix package manager user manual: http://nixos.org/nix/manual/
-"
-
-pkg_setup() {
-   enewgroup 

[gentoo-commits] repo/gentoo:master commit in: sys-apps/nix/

[Sergei Trofimovich]

commit: fa141dd9c432604e127b69c925a3e37bded47f9a
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Fri Jun  8 15:30:31 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Jun  8 15:30:31 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa141dd9

sys-apps/nix: bump up to 2.0.4

Package-Manager: Portage-2.3.38, Repoman-2.3.9

 sys-apps/nix/Manifest |   1 +
 sys-apps/nix/nix-2.0.4.ebuild | 133 ++
 2 files changed, 134 insertions(+)

diff --git a/sys-apps/nix/Manifest b/sys-apps/nix/Manifest
index 748720b38ab..80b2ea351b1 100644
--- a/sys-apps/nix/Manifest
+++ b/sys-apps/nix/Manifest
@@ -2,4 +2,5 @@ DIST nix-1.11.15.tar.xz 632544 BLAKE2B 
3624c396c67a7c64e2ba16fd500951e6cf1b6f29f
 DIST nix-1.11.16.tar.xz 632440 BLAKE2B 
0b1966b1445a18616d6ff33e7fa3d1776626872c7cfeb54be4c77b998841db69f1e6aea7638edb21fa67442b953fb1cbaf7752c841d7d21f62dd63885a823834
 SHA512 
164f728c96fc6609134334e61f674961dfc0f02bd2f5d1d7800d2623fe80d896bfd0b7fba0a723b1bfe23663d4c7cf3e419a7c1992d67e80eb3d6b3bdf60a2a8
 DIST nix-2.0.1.tar.xz 796520 BLAKE2B 
bd71d625f08b785b74a31f74e5ecdbca247bf9fc29a5a49a3e7db51c70911c5c200804783b0ee38164e909d3c287d0484fc0d617d11be6ca41531682e8f14cef
 SHA512 
05013a2242b558a2bd3b104b9fdb570ceddf37466e420daf0c81294f9dccdf190472bd32550f00915b1cd1b738576b46c112af39c198cfe5f0121b9f6f2f4d92
 DIST nix-2.0.2.tar.xz 796404 BLAKE2B 
0906488bf2c800544c0747a6860ef51f667467f50039f725cf6ec05b8389462fe073bddceba106922a7611fd784b58ed5ca321efba0065b0f424aa53d7620990
 SHA512 
605e2c6dbc814470c25aa4f0aca77bfd11fd6d5c263ef38915cb9b852e77bcff08d515e76de8d929c9eacd02ffeaa5dd5f6b337461d54a1b2648b1fc505c98fa
+DIST nix-2.0.4.tar.xz 798352 BLAKE2B 
0eaf7e507c87e5398ab5967e1f2064a5827038bb84208768aa1c1deadc95e44aab922846b728467e3355d1f25e740590c3d1748ec05dfeae6a171952fd941b77
 SHA512 
bce3b3a14269d42648a4935770260c36dab25fde3ebcfed730063d1d139603468e1c30acf15eb0c617fa36a6b39d4ae31ccfd9cba762f631ecac213fd09a
 DIST nix-2.0.tar.xz 794084 BLAKE2B 
9596788df6aaad144d408e95f34575bf985849bb57424c7aac4dc1f2f2d846302bf78fc05682ce92fbaf000db04a326f867a76f5963a80b72b63e3678754247f
 SHA512 
4531b4648108019d44521af94f8243936d2df62701395c0c448795f1984d4b5ade2438c92d12e5414d493909811e3bcb902c85539932c7e44d98d4254a2a531d

diff --git a/sys-apps/nix/nix-2.0.4.ebuild b/sys-apps/nix/nix-2.0.4.ebuild
new file mode 100644
index 000..bea6bd1a424
--- /dev/null
+++ b/sys-apps/nix/nix-2.0.4.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic readme.gentoo-r1 user
+
+DESCRIPTION="A purely functional package manager"
+HOMEPAGE="https://nixos.org/nix;
+
+SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz;
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+etc_profile +gc doc sodium"
+
+RDEPEND="
+   app-arch/brotli
+   app-arch/bzip2
+   app-arch/xz-utils
+   dev-db/sqlite
+   dev-libs/openssl:0=
+   net-misc/curl
+   sys-libs/libseccomp
+   sys-libs/zlib
+   gc? ( dev-libs/boehm-gc[cxx] )
+   doc? ( dev-libs/libxml2
+   dev-libs/libxslt
+   app-text/docbook-xsl-stylesheets
+   )
+   sodium? ( dev-libs/libsodium:0= )
+"
+DEPEND="${RDEPEND}
+   >=sys-devel/bison-2.6
+   >=sys-devel/flex-2.5.35
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.11.6-systemd.patch
+   "${FILESDIR}"/${PN}-1.11.6-respect-CXXFLAGS.patch
+   "${FILESDIR}"/${PN}-1.11.6-respect-LDFLAGS.patch
+   "${FILESDIR}"/${PN}-2.0-user-path.patch
+)
+
+DISABLE_AUTOFORMATTING=yes
+DOC_CONTENTS=" Quick start user guide on Gentoo:
+
+[as root] enable nix-daemon service:
+   [systemd] # systemctl enable nix-daemon
+   [openrc]  # rc-update add nix-daemon
+[as a user] relogin to get environment and profile update
+[as a user] fetch nixpkgs update:
+   \$ nix-channel --update
+[as a user] install nix packages:
+   \$ nix-env -i mc
+[as a user] configure environment:
+   Somewhere in .bash_profile you might want to set
+   LOCALE_ARCHIVE=\$HOME/.nix-profile/lib/locale/locale-archive
+   but please read https://github.com/NixOS/nixpkgs/issues/21820
+
+Next steps:
+   nix package manager user manual: http://nixos.org/nix/manual/
+"
+
+pkg_setup() {
+   enewgroup nixbld
+   for i in {1..10}; do
+   # we list 'nixbld' twice to
+   # both assign a primary group for user
+   # and add a user to /etc/group
+   enewuser nixbld${i} -1 -1 /var/empty nixbld,nixbld
+   done
+}
+
+src_prepare() {
+   default
+
+   eautoreconf
+}
+
+src_configure() {
+   econf \
+   --localstatedir="${EPREFIX}"/nix/var \
+   $(use_enable gc)
+}
+
+src_compile() {
+   local make_vars=(
+   OPTIMIZE=0 # disable hardcoded -O3
+   V=1 # verbose build

[gentoo-commits] repo/gentoo:master commit in: sys-apps/nix/

[Sergei Trofimovich]

commit: 5dc8fd8eb3b3380b4295482a09dbc2b4e1d9cc6f
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Fri May  4 22:23:59 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri May  4 22:24:20 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5dc8fd8e

sys-apps/nix: bump up to 2.0.2

Package-Manager: Portage-2.3.35, Repoman-2.3.9

 sys-apps/nix/Manifest |   1 +
 sys-apps/nix/nix-2.0.2.ebuild | 133 ++
 2 files changed, 134 insertions(+)

diff --git a/sys-apps/nix/Manifest b/sys-apps/nix/Manifest
index 482b749bcd2..748720b38ab 100644
--- a/sys-apps/nix/Manifest
+++ b/sys-apps/nix/Manifest
@@ -1,4 +1,5 @@
 DIST nix-1.11.15.tar.xz 632544 BLAKE2B 
3624c396c67a7c64e2ba16fd500951e6cf1b6f29f31929793072b5dfcdf1ffe40d5645c58d3967dd82d6c8d0bf6e5e2598a0d8d5fc3f82b22ea279a7854b1aca
 SHA512 
449b3c78b74c776215dfbe9d6d09b96d8c6abf996c69c525073df12d0cffb1a2868890d356fbb52c794e2c6f485018756395625e7b170166f7c6f9e2bdd364d9
 DIST nix-1.11.16.tar.xz 632440 BLAKE2B 
0b1966b1445a18616d6ff33e7fa3d1776626872c7cfeb54be4c77b998841db69f1e6aea7638edb21fa67442b953fb1cbaf7752c841d7d21f62dd63885a823834
 SHA512 
164f728c96fc6609134334e61f674961dfc0f02bd2f5d1d7800d2623fe80d896bfd0b7fba0a723b1bfe23663d4c7cf3e419a7c1992d67e80eb3d6b3bdf60a2a8
 DIST nix-2.0.1.tar.xz 796520 BLAKE2B 
bd71d625f08b785b74a31f74e5ecdbca247bf9fc29a5a49a3e7db51c70911c5c200804783b0ee38164e909d3c287d0484fc0d617d11be6ca41531682e8f14cef
 SHA512 
05013a2242b558a2bd3b104b9fdb570ceddf37466e420daf0c81294f9dccdf190472bd32550f00915b1cd1b738576b46c112af39c198cfe5f0121b9f6f2f4d92
+DIST nix-2.0.2.tar.xz 796404 BLAKE2B 
0906488bf2c800544c0747a6860ef51f667467f50039f725cf6ec05b8389462fe073bddceba106922a7611fd784b58ed5ca321efba0065b0f424aa53d7620990
 SHA512 
605e2c6dbc814470c25aa4f0aca77bfd11fd6d5c263ef38915cb9b852e77bcff08d515e76de8d929c9eacd02ffeaa5dd5f6b337461d54a1b2648b1fc505c98fa
 DIST nix-2.0.tar.xz 794084 BLAKE2B 
9596788df6aaad144d408e95f34575bf985849bb57424c7aac4dc1f2f2d846302bf78fc05682ce92fbaf000db04a326f867a76f5963a80b72b63e3678754247f
 SHA512 
4531b4648108019d44521af94f8243936d2df62701395c0c448795f1984d4b5ade2438c92d12e5414d493909811e3bcb902c85539932c7e44d98d4254a2a531d

diff --git a/sys-apps/nix/nix-2.0.2.ebuild b/sys-apps/nix/nix-2.0.2.ebuild
new file mode 100644
index 000..bea6bd1a424
--- /dev/null
+++ b/sys-apps/nix/nix-2.0.2.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic readme.gentoo-r1 user
+
+DESCRIPTION="A purely functional package manager"
+HOMEPAGE="https://nixos.org/nix;
+
+SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz;
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+etc_profile +gc doc sodium"
+
+RDEPEND="
+   app-arch/brotli
+   app-arch/bzip2
+   app-arch/xz-utils
+   dev-db/sqlite
+   dev-libs/openssl:0=
+   net-misc/curl
+   sys-libs/libseccomp
+   sys-libs/zlib
+   gc? ( dev-libs/boehm-gc[cxx] )
+   doc? ( dev-libs/libxml2
+   dev-libs/libxslt
+   app-text/docbook-xsl-stylesheets
+   )
+   sodium? ( dev-libs/libsodium:0= )
+"
+DEPEND="${RDEPEND}
+   >=sys-devel/bison-2.6
+   >=sys-devel/flex-2.5.35
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.11.6-systemd.patch
+   "${FILESDIR}"/${PN}-1.11.6-respect-CXXFLAGS.patch
+   "${FILESDIR}"/${PN}-1.11.6-respect-LDFLAGS.patch
+   "${FILESDIR}"/${PN}-2.0-user-path.patch
+)
+
+DISABLE_AUTOFORMATTING=yes
+DOC_CONTENTS=" Quick start user guide on Gentoo:
+
+[as root] enable nix-daemon service:
+   [systemd] # systemctl enable nix-daemon
+   [openrc]  # rc-update add nix-daemon
+[as a user] relogin to get environment and profile update
+[as a user] fetch nixpkgs update:
+   \$ nix-channel --update
+[as a user] install nix packages:
+   \$ nix-env -i mc
+[as a user] configure environment:
+   Somewhere in .bash_profile you might want to set
+   LOCALE_ARCHIVE=\$HOME/.nix-profile/lib/locale/locale-archive
+   but please read https://github.com/NixOS/nixpkgs/issues/21820
+
+Next steps:
+   nix package manager user manual: http://nixos.org/nix/manual/
+"
+
+pkg_setup() {
+   enewgroup nixbld
+   for i in {1..10}; do
+   # we list 'nixbld' twice to
+   # both assign a primary group for user
+   # and add a user to /etc/group
+   enewuser nixbld${i} -1 -1 /var/empty nixbld,nixbld
+   done
+}
+
+src_prepare() {
+   default
+
+   eautoreconf
+}
+
+src_configure() {
+   econf \
+   --localstatedir="${EPREFIX}"/nix/var \
+   $(use_enable gc)
+}
+
+src_compile() {
+   local make_vars=(
+   OPTIMIZE=0 # disable hardcoded -O3
+   V=1 # verbose build
+   )
+   emake "${make_vars[@]}"
+}
+
+src_install() {
+   # TODO: 

[gentoo-commits] repo/gentoo:master commit in: sys-apps/nix/

[Sergei Trofimovich]

commit: 3cbb1ad6f664b1ca981dc9b4cf3cf44f645ea406
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Fri Apr 20 22:15:18 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Apr 20 22:15:18 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cbb1ad6

sys-apps/nix: bump up to 2.0.1

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 sys-apps/nix/Manifest |   1 +
 sys-apps/nix/nix-2.0.1.ebuild | 133 ++
 2 files changed, 134 insertions(+)

diff --git a/sys-apps/nix/Manifest b/sys-apps/nix/Manifest
index 89f05d13c91..482b749bcd2 100644
--- a/sys-apps/nix/Manifest
+++ b/sys-apps/nix/Manifest
@@ -1,3 +1,4 @@
 DIST nix-1.11.15.tar.xz 632544 BLAKE2B 
3624c396c67a7c64e2ba16fd500951e6cf1b6f29f31929793072b5dfcdf1ffe40d5645c58d3967dd82d6c8d0bf6e5e2598a0d8d5fc3f82b22ea279a7854b1aca
 SHA512 
449b3c78b74c776215dfbe9d6d09b96d8c6abf996c69c525073df12d0cffb1a2868890d356fbb52c794e2c6f485018756395625e7b170166f7c6f9e2bdd364d9
 DIST nix-1.11.16.tar.xz 632440 BLAKE2B 
0b1966b1445a18616d6ff33e7fa3d1776626872c7cfeb54be4c77b998841db69f1e6aea7638edb21fa67442b953fb1cbaf7752c841d7d21f62dd63885a823834
 SHA512 
164f728c96fc6609134334e61f674961dfc0f02bd2f5d1d7800d2623fe80d896bfd0b7fba0a723b1bfe23663d4c7cf3e419a7c1992d67e80eb3d6b3bdf60a2a8
+DIST nix-2.0.1.tar.xz 796520 BLAKE2B 
bd71d625f08b785b74a31f74e5ecdbca247bf9fc29a5a49a3e7db51c70911c5c200804783b0ee38164e909d3c287d0484fc0d617d11be6ca41531682e8f14cef
 SHA512 
05013a2242b558a2bd3b104b9fdb570ceddf37466e420daf0c81294f9dccdf190472bd32550f00915b1cd1b738576b46c112af39c198cfe5f0121b9f6f2f4d92
 DIST nix-2.0.tar.xz 794084 BLAKE2B 
9596788df6aaad144d408e95f34575bf985849bb57424c7aac4dc1f2f2d846302bf78fc05682ce92fbaf000db04a326f867a76f5963a80b72b63e3678754247f
 SHA512 
4531b4648108019d44521af94f8243936d2df62701395c0c448795f1984d4b5ade2438c92d12e5414d493909811e3bcb902c85539932c7e44d98d4254a2a531d

diff --git a/sys-apps/nix/nix-2.0.1.ebuild b/sys-apps/nix/nix-2.0.1.ebuild
new file mode 100644
index 000..bea6bd1a424
--- /dev/null
+++ b/sys-apps/nix/nix-2.0.1.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic readme.gentoo-r1 user
+
+DESCRIPTION="A purely functional package manager"
+HOMEPAGE="https://nixos.org/nix;
+
+SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz;
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+etc_profile +gc doc sodium"
+
+RDEPEND="
+   app-arch/brotli
+   app-arch/bzip2
+   app-arch/xz-utils
+   dev-db/sqlite
+   dev-libs/openssl:0=
+   net-misc/curl
+   sys-libs/libseccomp
+   sys-libs/zlib
+   gc? ( dev-libs/boehm-gc[cxx] )
+   doc? ( dev-libs/libxml2
+   dev-libs/libxslt
+   app-text/docbook-xsl-stylesheets
+   )
+   sodium? ( dev-libs/libsodium:0= )
+"
+DEPEND="${RDEPEND}
+   >=sys-devel/bison-2.6
+   >=sys-devel/flex-2.5.35
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.11.6-systemd.patch
+   "${FILESDIR}"/${PN}-1.11.6-respect-CXXFLAGS.patch
+   "${FILESDIR}"/${PN}-1.11.6-respect-LDFLAGS.patch
+   "${FILESDIR}"/${PN}-2.0-user-path.patch
+)
+
+DISABLE_AUTOFORMATTING=yes
+DOC_CONTENTS=" Quick start user guide on Gentoo:
+
+[as root] enable nix-daemon service:
+   [systemd] # systemctl enable nix-daemon
+   [openrc]  # rc-update add nix-daemon
+[as a user] relogin to get environment and profile update
+[as a user] fetch nixpkgs update:
+   \$ nix-channel --update
+[as a user] install nix packages:
+   \$ nix-env -i mc
+[as a user] configure environment:
+   Somewhere in .bash_profile you might want to set
+   LOCALE_ARCHIVE=\$HOME/.nix-profile/lib/locale/locale-archive
+   but please read https://github.com/NixOS/nixpkgs/issues/21820
+
+Next steps:
+   nix package manager user manual: http://nixos.org/nix/manual/
+"
+
+pkg_setup() {
+   enewgroup nixbld
+   for i in {1..10}; do
+   # we list 'nixbld' twice to
+   # both assign a primary group for user
+   # and add a user to /etc/group
+   enewuser nixbld${i} -1 -1 /var/empty nixbld,nixbld
+   done
+}
+
+src_prepare() {
+   default
+
+   eautoreconf
+}
+
+src_configure() {
+   econf \
+   --localstatedir="${EPREFIX}"/nix/var \
+   $(use_enable gc)
+}
+
+src_compile() {
+   local make_vars=(
+   OPTIMIZE=0 # disable hardcoded -O3
+   V=1 # verbose build
+   )
+   emake "${make_vars[@]}"
+}
+
+src_install() {
+   # TODO: emacs highlighter
+   default
+
+   readme.gentoo_create_doc
+
+   # here we use an eager variant of something that
+   # is lazily done by nix-daemon and root nix-env
+
+   # TODO: will need a tweak for prefix
+   keepdir /nix/store
+   fowners root:nixbld 

[gentoo-commits] repo/gentoo:master commit in: sys-apps/nix/, sys-apps/nix/files/

[Sergei Trofimovich]

commit: a4eac509af375f8c67e219415b3281c3a457678f
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Thu Feb 22 22:12:06 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Feb 22 22:53:10 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4eac509

sys-apps/nix: bump up to 2.0

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 sys-apps/nix/Manifest   |   1 +
 sys-apps/nix/files/nix-1.11.6-systemd.patch |   2 +-
 sys-apps/nix/files/nix-2.0-user-path.patch  |  10 +++
 sys-apps/nix/nix-2.0.ebuild | 133 
 4 files changed, 145 insertions(+), 1 deletion(-)

diff --git a/sys-apps/nix/Manifest b/sys-apps/nix/Manifest
index 6de2c3842c5..89f05d13c91 100644
--- a/sys-apps/nix/Manifest
+++ b/sys-apps/nix/Manifest
@@ -1,2 +1,3 @@
 DIST nix-1.11.15.tar.xz 632544 BLAKE2B 
3624c396c67a7c64e2ba16fd500951e6cf1b6f29f31929793072b5dfcdf1ffe40d5645c58d3967dd82d6c8d0bf6e5e2598a0d8d5fc3f82b22ea279a7854b1aca
 SHA512 
449b3c78b74c776215dfbe9d6d09b96d8c6abf996c69c525073df12d0cffb1a2868890d356fbb52c794e2c6f485018756395625e7b170166f7c6f9e2bdd364d9
 DIST nix-1.11.16.tar.xz 632440 BLAKE2B 
0b1966b1445a18616d6ff33e7fa3d1776626872c7cfeb54be4c77b998841db69f1e6aea7638edb21fa67442b953fb1cbaf7752c841d7d21f62dd63885a823834
 SHA512 
164f728c96fc6609134334e61f674961dfc0f02bd2f5d1d7800d2623fe80d896bfd0b7fba0a723b1bfe23663d4c7cf3e419a7c1992d67e80eb3d6b3bdf60a2a8
+DIST nix-2.0.tar.xz 794084 BLAKE2B 
9596788df6aaad144d408e95f34575bf985849bb57424c7aac4dc1f2f2d846302bf78fc05682ce92fbaf000db04a326f867a76f5963a80b72b63e3678754247f
 SHA512 
4531b4648108019d44521af94f8243936d2df62701395c0c448795f1984d4b5ade2438c92d12e5414d493909811e3bcb902c85539932c7e44d98d4254a2a531d

diff --git a/sys-apps/nix/files/nix-1.11.6-systemd.patch 
b/sys-apps/nix/files/nix-1.11.6-systemd.patch
index f890ee6f047..5a77d7c77e5 100644
--- a/sys-apps/nix/files/nix-1.11.6-systemd.patch
+++ b/sys-apps/nix/files/nix-1.11.6-systemd.patch
@@ -1,4 +1,4 @@
-Make 'nix-daemon' a goof unit for 'systemctl enable nix-daemon.service'.
+Make 'nix-daemon' a good unit for 'systemctl enable nix-daemon.service'.
 diff --git a/misc/systemd/nix-daemon.service.in 
b/misc/systemd/nix-daemon.service.in
 index 5fc04a3..2565520 100644
 --- a/misc/systemd/nix-daemon.service.in

diff --git a/sys-apps/nix/files/nix-2.0-user-path.patch 
b/sys-apps/nix/files/nix-2.0-user-path.patch
new file mode 100644
index 000..486a05bb595
--- /dev/null
+++ b/sys-apps/nix/files/nix-2.0-user-path.patch
@@ -0,0 +1,10 @@
+On gentoo 'id' is /usr/bin/id while @coreutils@ is /bin.
+diff --git a/scripts/nix-profile.sh.in b/scripts/nix-profile.sh.in
+index a5f5227..1dc5379 100644
+--- a/scripts/nix-profile.sh.in
 b/scripts/nix-profile.sh.in
+@@ -2,3 +2,3 @@ if [ -n "$HOME" ] && [ -n "$USER" ]; then
+ __savedpath="$PATH"
+-export PATH=@coreutils@
++export PATH=@coreutils@:@prefix@/bin:@prefix@/../bin
+ 

diff --git a/sys-apps/nix/nix-2.0.ebuild b/sys-apps/nix/nix-2.0.ebuild
new file mode 100644
index 000..bea6bd1a424
--- /dev/null
+++ b/sys-apps/nix/nix-2.0.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic readme.gentoo-r1 user
+
+DESCRIPTION="A purely functional package manager"
+HOMEPAGE="https://nixos.org/nix;
+
+SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz;
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+etc_profile +gc doc sodium"
+
+RDEPEND="
+   app-arch/brotli
+   app-arch/bzip2
+   app-arch/xz-utils
+   dev-db/sqlite
+   dev-libs/openssl:0=
+   net-misc/curl
+   sys-libs/libseccomp
+   sys-libs/zlib
+   gc? ( dev-libs/boehm-gc[cxx] )
+   doc? ( dev-libs/libxml2
+   dev-libs/libxslt
+   app-text/docbook-xsl-stylesheets
+   )
+   sodium? ( dev-libs/libsodium:0= )
+"
+DEPEND="${RDEPEND}
+   >=sys-devel/bison-2.6
+   >=sys-devel/flex-2.5.35
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.11.6-systemd.patch
+   "${FILESDIR}"/${PN}-1.11.6-respect-CXXFLAGS.patch
+   "${FILESDIR}"/${PN}-1.11.6-respect-LDFLAGS.patch
+   "${FILESDIR}"/${PN}-2.0-user-path.patch
+)
+
+DISABLE_AUTOFORMATTING=yes
+DOC_CONTENTS=" Quick start user guide on Gentoo:
+
+[as root] enable nix-daemon service:
+   [systemd] # systemctl enable nix-daemon
+   [openrc]  # rc-update add nix-daemon
+[as a user] relogin to get environment and profile update
+[as a user] fetch nixpkgs update:
+   \$ nix-channel --update
+[as a user] install nix packages:
+   \$ nix-env -i mc
+[as a user] configure environment:
+   Somewhere in .bash_profile you might want to set
+   LOCALE_ARCHIVE=\$HOME/.nix-profile/lib/locale/locale-archive
+   but please read https://github.com/NixOS/nixpkgs/issues/21820
+
+Next steps:
+   nix package manager user manual: 

[gentoo-commits] repo/gentoo:master commit in: sys-apps/nix/files/, sys-apps/nix/

[Sergei Trofimovich]

commit: bc1aa3e62e2a8c024ffefa5f32cd4a233a05bd93
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Thu Dec 21 08:00:41 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Dec 21 08:01:26 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc1aa3e6

sys-apps/nix: drop old

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 sys-apps/nix/Manifest   |   1 -
 sys-apps/nix/files/nix-1.11.14-glibc-2.26.patch |  16 ---
 sys-apps/nix/nix-1.11.14.ebuild | 135 
 3 files changed, 152 deletions(-)

diff --git a/sys-apps/nix/Manifest b/sys-apps/nix/Manifest
index 216f1c03ae0..6de2c3842c5 100644
--- a/sys-apps/nix/Manifest
+++ b/sys-apps/nix/Manifest
@@ -1,3 +1,2 @@
-DIST nix-1.11.14.tar.xz 632260 BLAKE2B 
5ee239aca547a8918c574dbdc6f1276dff1b66f83c89f85c23f242551a6e6784e2bdc4fcfce327395df7628148409ab13954b6eb78710325bc04c370d401ea82
 SHA512 
48ed17a090a161ad35c8e84652566e527f31586184b8722a5536a6d83eee1e81911b6c4d5f0661f57054db6c47b5d8211f2acf47899fbec72f2c4bf8a5262af5
 DIST nix-1.11.15.tar.xz 632544 BLAKE2B 
3624c396c67a7c64e2ba16fd500951e6cf1b6f29f31929793072b5dfcdf1ffe40d5645c58d3967dd82d6c8d0bf6e5e2598a0d8d5fc3f82b22ea279a7854b1aca
 SHA512 
449b3c78b74c776215dfbe9d6d09b96d8c6abf996c69c525073df12d0cffb1a2868890d356fbb52c794e2c6f485018756395625e7b170166f7c6f9e2bdd364d9
 DIST nix-1.11.16.tar.xz 632440 BLAKE2B 
0b1966b1445a18616d6ff33e7fa3d1776626872c7cfeb54be4c77b998841db69f1e6aea7638edb21fa67442b953fb1cbaf7752c841d7d21f62dd63885a823834
 SHA512 
164f728c96fc6609134334e61f674961dfc0f02bd2f5d1d7800d2623fe80d896bfd0b7fba0a723b1bfe23663d4c7cf3e419a7c1992d67e80eb3d6b3bdf60a2a8

diff --git a/sys-apps/nix/files/nix-1.11.14-glibc-2.26.patch 
b/sys-apps/nix/files/nix-1.11.14-glibc-2.26.patch
deleted file mode 100644
index 44c995e3239..000
--- a/sys-apps/nix/files/nix-1.11.14-glibc-2.26.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-'context' is no more after:
-https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=251287734e89a52da3db682a8241eb6bccc050c9
-
-'ucontext_t' is the new name.
-diff --git a/src/libmain/stack.cc b/src/libmain/stack.cc
-index 41b617d..695aaad 100644
 a/src/libmain/stack.cc
-+++ b/src/libmain/stack.cc
-@@ -22,5 +22,5 @@ static void sigsegvHandler(int signo, siginfo_t * info, void 
* ctx)
- #if defined(__x86_64__) && defined(REG_RSP)
--sp = (char *) ((ucontext *) ctx)->uc_mcontext.gregs[REG_RSP];
-+sp = (char *) ((ucontext_t *) ctx)->uc_mcontext.gregs[REG_RSP];
- #elif defined(REG_ESP)
--sp = (char *) ((ucontext *) ctx)->uc_mcontext.gregs[REG_ESP];
-+sp = (char *) ((ucontext_t *) ctx)->uc_mcontext.gregs[REG_ESP];
- #else

diff --git a/sys-apps/nix/nix-1.11.14.ebuild b/sys-apps/nix/nix-1.11.14.ebuild
deleted file mode 100644
index 55f0dba8e52..000
--- a/sys-apps/nix/nix-1.11.14.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic readme.gentoo-r1 user
-
-DESCRIPTION="A purely functional package manager"
-HOMEPAGE="https://nixos.org/nix;
-
-SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz;
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+etc_profile +gc doc sodium"
-
-RDEPEND="
-   app-arch/bzip2
-   app-arch/xz-utils
-   dev-db/sqlite
-   dev-libs/openssl:0=
-   net-misc/curl
-   sys-libs/libseccomp
-   sys-libs/zlib
-   gc? ( dev-libs/boehm-gc[cxx] )
-   doc? ( dev-libs/libxml2
-   dev-libs/libxslt
-   app-text/docbook-xsl-stylesheets
-   )
-   sodium? ( dev-libs/libsodium )
-   dev-lang/perl:=
-   dev-perl/DBD-SQLite
-   dev-perl/WWW-Curl
-   dev-perl/DBI
-"
-DEPEND="${RDEPEND}
-   >=sys-devel/bison-2.6
-   >=sys-devel/flex-2.5.35
-   virtual/perl-ExtUtils-ParseXS
-"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-1.11.6-systemd.patch
-   "${FILESDIR}"/${PN}-1.11.6-per-user.patch
-   "${FILESDIR}"/${PN}-1.11.6-respect-CXXFLAGS.patch
-   "${FILESDIR}"/${PN}-1.11.6-respect-LDFLAGS.patch
-   "${FILESDIR}"/${PN}-1.11.14-glibc-2.26.patch
-)
-
-DISABLE_AUTOFORMATTING=yes
-DOC_CONTENTS=" Quick start user guide on Gentoo:
-
-[as root] enable nix-daemon service:
-   [systemd] # systemctl enable nix-daemon
-   [openrc]  # rc-update add nix-daemon
-[as a user] relogin to get environment and profile update
-[as a user] fetch nixpkgs update:
-   \$ nix-channel --update
-[as a user] install nix packages:
-   \$ nix-env -i mc
-[as a user] configure environment:
-   Somewhere in .bash_profile you might want to set
-   LOCALE_ARCHIVE=\$HOME/.nix-profile/lib/locale/locale-archive
-   but please read https://github.com/NixOS/nixpkgs/issues/21820
-
-Next steps:
-   nix package manager user manual: http://nixos.org/nix/manual/
-"
-
-pkg_setup() {
-   enewgroup nixbld
-   for i in 

[gentoo-commits] repo/gentoo:master commit in: sys-apps/nix/

[Sergei Trofimovich]

commit: 8248e355e100ddd2d13d122773904f4b90bd6f9e
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Thu Dec 21 07:59:50 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Dec 21 08:01:25 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8248e355

sys-apps/nix: 1.11.16

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 sys-apps/nix/Manifest   |   1 +
 sys-apps/nix/nix-1.11.16.ebuild | 134 
 2 files changed, 135 insertions(+)

diff --git a/sys-apps/nix/Manifest b/sys-apps/nix/Manifest
index 5e188c003aa..216f1c03ae0 100644
--- a/sys-apps/nix/Manifest
+++ b/sys-apps/nix/Manifest
@@ -1,2 +1,3 @@
 DIST nix-1.11.14.tar.xz 632260 BLAKE2B 
5ee239aca547a8918c574dbdc6f1276dff1b66f83c89f85c23f242551a6e6784e2bdc4fcfce327395df7628148409ab13954b6eb78710325bc04c370d401ea82
 SHA512 
48ed17a090a161ad35c8e84652566e527f31586184b8722a5536a6d83eee1e81911b6c4d5f0661f57054db6c47b5d8211f2acf47899fbec72f2c4bf8a5262af5
 DIST nix-1.11.15.tar.xz 632544 BLAKE2B 
3624c396c67a7c64e2ba16fd500951e6cf1b6f29f31929793072b5dfcdf1ffe40d5645c58d3967dd82d6c8d0bf6e5e2598a0d8d5fc3f82b22ea279a7854b1aca
 SHA512 
449b3c78b74c776215dfbe9d6d09b96d8c6abf996c69c525073df12d0cffb1a2868890d356fbb52c794e2c6f485018756395625e7b170166f7c6f9e2bdd364d9
+DIST nix-1.11.16.tar.xz 632440 BLAKE2B 
0b1966b1445a18616d6ff33e7fa3d1776626872c7cfeb54be4c77b998841db69f1e6aea7638edb21fa67442b953fb1cbaf7752c841d7d21f62dd63885a823834
 SHA512 
164f728c96fc6609134334e61f674961dfc0f02bd2f5d1d7800d2623fe80d896bfd0b7fba0a723b1bfe23663d4c7cf3e419a7c1992d67e80eb3d6b3bdf60a2a8

diff --git a/sys-apps/nix/nix-1.11.16.ebuild b/sys-apps/nix/nix-1.11.16.ebuild
new file mode 100644
index 000..d4e616516f7
--- /dev/null
+++ b/sys-apps/nix/nix-1.11.16.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic readme.gentoo-r1 user
+
+DESCRIPTION="A purely functional package manager"
+HOMEPAGE="https://nixos.org/nix;
+
+SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz;
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+etc_profile +gc doc sodium"
+
+RDEPEND="
+   app-arch/bzip2
+   app-arch/xz-utils
+   dev-db/sqlite
+   dev-libs/openssl:0=
+   net-misc/curl
+   sys-libs/libseccomp
+   sys-libs/zlib
+   gc? ( dev-libs/boehm-gc[cxx] )
+   doc? ( dev-libs/libxml2
+   dev-libs/libxslt
+   app-text/docbook-xsl-stylesheets
+   )
+   sodium? ( dev-libs/libsodium )
+   dev-lang/perl:=
+   dev-perl/DBD-SQLite
+   dev-perl/WWW-Curl
+   dev-perl/DBI
+"
+DEPEND="${RDEPEND}
+   >=sys-devel/bison-2.6
+   >=sys-devel/flex-2.5.35
+   virtual/perl-ExtUtils-ParseXS
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.11.6-systemd.patch
+   "${FILESDIR}"/${PN}-1.11.6-per-user.patch
+   "${FILESDIR}"/${PN}-1.11.6-respect-CXXFLAGS.patch
+   "${FILESDIR}"/${PN}-1.11.6-respect-LDFLAGS.patch
+)
+
+DISABLE_AUTOFORMATTING=yes
+DOC_CONTENTS=" Quick start user guide on Gentoo:
+
+[as root] enable nix-daemon service:
+   [systemd] # systemctl enable nix-daemon
+   [openrc]  # rc-update add nix-daemon
+[as a user] relogin to get environment and profile update
+[as a user] fetch nixpkgs update:
+   \$ nix-channel --update
+[as a user] install nix packages:
+   \$ nix-env -i mc
+[as a user] configure environment:
+   Somewhere in .bash_profile you might want to set
+   LOCALE_ARCHIVE=\$HOME/.nix-profile/lib/locale/locale-archive
+   but please read https://github.com/NixOS/nixpkgs/issues/21820
+
+Next steps:
+   nix package manager user manual: http://nixos.org/nix/manual/
+"
+
+pkg_setup() {
+   enewgroup nixbld
+   for i in {1..10}; do
+   # we list 'nixbld' twice to
+   # both assign a primary group for user
+   # and add a user to /etc/group
+   enewuser nixbld${i} -1 -1 /var/empty nixbld,nixbld
+   done
+}
+
+src_prepare() {
+   default
+
+   eautoreconf
+}
+
+src_configure() {
+   econf \
+   --localstatedir="${EPREFIX}"/nix/var \
+   $(use_enable gc)
+}
+
+src_compile() {
+   local make_vars=(
+   OPTIMIZE=0 # disable hardcoded -O3
+   V=1 # verbose build
+   )
+   emake "${make_vars[@]}"
+}
+
+src_install() {
+   # TODO: emacs highlighter
+   default
+
+   readme.gentoo_create_doc
+
+   # here we use an eager variant of something that
+   # is lazily done by nix-daemon and root nix-env
+
+   # TODO: will need a tweak for prefix
+   keepdir /nix/store
+   fowners root:nixbld /nix/store
+   fperms 1775 /nix/store
+
+   keepdir /nix/var/nix/profiles/per-user
+   fperms 1777 /nix/var/nix/profiles/per-user
+
+   # setup 

[gentoo-commits] repo/gentoo:master commit in: sys-apps/nix/files/

[Sergei Trofimovich]

commit: 7517e0d93b740467bcb6b7731ebd9988372aa33e
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Thu Sep 28 18:36:41 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue Oct 17 17:52:07 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7517e0d9

sys-apps/nix: remove unused patches/file

Closes: https://github.com/gentoo/gentoo/pull/5817

 sys-apps/nix/files/60nix-remote-daemon |  1 -
 sys-apps/nix/files/nix-1.11.12-etc-fixes.patch | 24 
 sys-apps/nix/files/nix-1.11.14-etc-fixes.patch |  8 
 3 files changed, 33 deletions(-)

diff --git a/sys-apps/nix/files/60nix-remote-daemon 
b/sys-apps/nix/files/60nix-remote-daemon
deleted file mode 100644
index 626058a94d1..000
--- a/sys-apps/nix/files/60nix-remote-daemon
+++ /dev/null
@@ -1 +0,0 @@
-NIX_REMOTE="daemon"

diff --git a/sys-apps/nix/files/nix-1.11.12-etc-fixes.patch 
b/sys-apps/nix/files/nix-1.11.12-etc-fixes.patch
deleted file mode 100644
index 1973133e22b..000
--- a/sys-apps/nix/files/nix-1.11.12-etc-fixes.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-GNU coreutils has '-c' option for formatted output, not -f.
-Don't spam stderr when directory gets created.
-diff --git a/scripts/nix-profile-daemon.sh.in 
b/scripts/nix-profile-daemon.sh.in
-index 7f46cc6..386f607 100644
 a/scripts/nix-profile-daemon.sh.in
-+++ b/scripts/nix-profile-daemon.sh.in
-@@ -15,3 +15,3 @@ export NIX_PROFILES="@localstatedir@/nix/profiles/default 
$HOME/.nix-profile"
- mkdir -m 0755 -p $NIX_USER_PROFILE_DIR
--if test "$(stat -f '%u' $NIX_USER_PROFILE_DIR)" != "$(id -u)"; then
-+if test "$(stat -c '%u' $NIX_USER_PROFILE_DIR)" != "$(id -u)"; then
- echo "WARNING: bad ownership on $NIX_USER_PROFILE_DIR" >&2
-@@ -37,3 +37,3 @@ if test -w $HOME; then
-   mkdir -m 0755 -p $NIX_USER_GCROOTS_DIR
--  if test "$(stat -f '%u' $NIX_USER_GCROOTS_DIR)" != "$(id -u)"; then
-+  if test "$(stat -c '%u' $NIX_USER_GCROOTS_DIR)" != "$(id -u)"; then
-   echo "WARNING: bad ownership on $NIX_USER_GCROOTS_DIR" >&2
-diff --git a/scripts/nix-profile.sh.in b/scripts/nix-profile.sh.in
-index 4f09b55..e93ef42 100644
 a/scripts/nix-profile.sh.in
-+++ b/scripts/nix-profile.sh.in
-@@ -5,3 +5,2 @@ if [ -n "$HOME" ]; then
- if ! [ -L "$NIX_LINK" ]; then
--echo "creating $NIX_LINK" >&2
- _NIX_DEF_LINK=@localstatedir@/nix/profiles/per-user/$USER/profile

diff --git a/sys-apps/nix/files/nix-1.11.14-etc-fixes.patch 
b/sys-apps/nix/files/nix-1.11.14-etc-fixes.patch
deleted file mode 100644
index 07962838a22..000
--- a/sys-apps/nix/files/nix-1.11.14-etc-fixes.patch
+++ /dev/null
@@ -1,8 +0,0 @@
-diff --git a/scripts/nix-profile.sh.in b/scripts/nix-profile.sh.in
-index 4f09b55..e93ef42 100644
 a/scripts/nix-profile.sh.in
-+++ b/scripts/nix-profile.sh.in
-@@ -5,3 +5,2 @@ if [ -n "$HOME" ]; then
- if ! [ -L "$NIX_LINK" ]; then
--echo "creating $NIX_LINK" >&2
- _NIX_DEF_LINK=@localstatedir@/nix/profiles/per-user/$USER/profile

[gentoo-commits] repo/gentoo:master commit in: sys-apps/nix/

[Sergei Trofimovich]

commit: 766abdcaf28cfb88249c44792fd6f654c3663922
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Fri Sep 15 20:49:20 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Sep 15 20:49:20 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=766abdca

sys-apps/nix: drop old

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 sys-apps/nix/Manifest  |   3 -
 sys-apps/nix/nix-1.11.11.ebuild| 130 ---
 sys-apps/nix/nix-1.11.12-r1.ebuild | 135 -
 sys-apps/nix/nix-1.11.13.ebuild| 135 -
 4 files changed, 403 deletions(-)

diff --git a/sys-apps/nix/Manifest b/sys-apps/nix/Manifest
index 8aa06e86e33..d4dd2c3ef55 100644
--- a/sys-apps/nix/Manifest
+++ b/sys-apps/nix/Manifest
@@ -1,5 +1,2 @@
-DIST nix-1.11.11.tar.xz 625248 SHA256 
f5b9da21fb412e4c35b6e2bc771cfbf4ca44746be5d99868ff29d6e7604760e5 SHA512 
b4652755860637dae0eacab3c536c43bb835614a802fd0bcc606f6140ae3f5c4db312d30ecb20dad62732d47cafb8101a8760b321be5ec4b331f298c59a79e4e
 WHIRLPOOL 
d4d8fc1d868832a9a0ca131bf26cfdd566279be00b56cd40d6e3035935dbdb55d5a77e460e96e77636b60542cd085ccd4e97e15f3c219ddf794b67eb3f3fd2d5
-DIST nix-1.11.12.tar.xz 631940 SHA256 
02e8d85cfc02494fb04c90d8443dfea433639b9f787989b18f54567fd9769dd2 SHA512 
fc2a06841cfa70c2d0b69315b0b8e30530e1b982e8a6b72e8f41c84db4efe7fc89738dce97f356f47d28518860990870fd54eb688704c531ba08231d2a3dd012
 WHIRLPOOL 
b99e213e68cd479f9b6f8104e5f328c9bc409883aa1a88c155acf3f0a49ee95981f1774eff0d803b21182c0a087434a2910a9631dcaa97aae1847697473b27ea
-DIST nix-1.11.13.tar.xz 632224 SHA256 
0913975e262f8069fde6e71a5fae757bb3aef558c51d1711034c525146ea5913 SHA512 
7244b49a7c7416e6ecc7754abcf48028d650510ac27f26701ccc3954660e26ad8b083fdc4ae07de718d3df49ca2a6af3bf3261d537e962a90233f87b13cd1606
 WHIRLPOOL 
a4af739a21e6080fccdfc885c24833e08765fae450fc7833484843f97fee7a4087619f67328075026b55efeda01a9cbf6bf80eb9918bdbbcee96414ee28d363c
 DIST nix-1.11.14.tar.xz 632260 SHA256 
26593c831addf1d40f6b7d131f394cb0f9fbec9e46471369faed16eaa2c4b7e4 SHA512 
48ed17a090a161ad35c8e84652566e527f31586184b8722a5536a6d83eee1e81911b6c4d5f0661f57054db6c47b5d8211f2acf47899fbec72f2c4bf8a5262af5
 WHIRLPOOL 
d6db1f452dd5bb430a0e02644af89a3e648f3f0f898b81b60ef4d7b8c8d7c9498c0992c3c33637eafd3ff1d23f55df3b76e1a1da957a0b7066a88e3eff1c35ef
 DIST nix-1.11.15.tar.xz 632544 SHA256 
d20f20e45d519f54fae5c61d55eadcf53e6d7cdbde9870eeec80d499f9805165 SHA512 
449b3c78b74c776215dfbe9d6d09b96d8c6abf996c69c525073df12d0cffb1a2868890d356fbb52c794e2c6f485018756395625e7b170166f7c6f9e2bdd364d9
 WHIRLPOOL 
740cdd89aa4d10af8e80329a52299c7333a5820ca4b943c4527b8342c60edf07e9bfaad3378546903e052a66155f974df36ee74f6119926714c5b12d9455f2f4

diff --git a/sys-apps/nix/nix-1.11.11.ebuild b/sys-apps/nix/nix-1.11.11.ebuild
deleted file mode 100644
index f8b026b00b9..000
--- a/sys-apps/nix/nix-1.11.11.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic readme.gentoo-r1 user
-
-DESCRIPTION="A purely functional package manager"
-HOMEPAGE="https://nixos.org/nix;
-
-SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz;
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+etc_profile +gc doc sodium"
-
-RDEPEND="
-   app-arch/bzip2
-   app-arch/xz-utils
-   dev-db/sqlite
-   dev-libs/openssl:0=
-   net-misc/curl
-   sys-libs/libseccomp
-   sys-libs/zlib
-   gc? ( dev-libs/boehm-gc[cxx] )
-   doc? ( dev-libs/libxml2
-   dev-libs/libxslt
-   app-text/docbook-xsl-stylesheets
-   )
-   sodium? ( dev-libs/libsodium )
-   dev-lang/perl:=
-   dev-perl/DBD-SQLite
-   dev-perl/WWW-Curl
-   dev-perl/DBI
-"
-DEPEND="${RDEPEND}
-   >=sys-devel/bison-2.6
-   >=sys-devel/flex-2.5.35
-   virtual/perl-ExtUtils-ParseXS
-"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-1.11.6-systemd.patch
-   "${FILESDIR}"/${PN}-1.11.6-per-user.patch
-   "${FILESDIR}"/${PN}-1.11.6-respect-CXXFLAGS.patch
-   "${FILESDIR}"/${PN}-1.11.6-respect-LDFLAGS.patch
-)
-
-DISABLE_AUTOFORMATTING=yes
-DOC_CONTENTS=" Quick start user guide on Gentoo:
-
-[as root] enable nix-daemon service:
-   [systemd] # systemctl enable nix-daemon
-   [openrc]  # rc-update add nix-daemon
-[as a user] relogin to get environment and profile update
-[as a user] fetch nixpkgs update:
-   \$ nix-channel --update
-[as a user] install nix packages:
-   \$ nix-env -i mc
-[as a user] configure environment:
-   Somewhere in .bash_profile you might want to set
-   LOCALE_ARCHIVE=\$HOME/.nix-profile/lib/locale/locale-archive
-   but please read https://github.com/NixOS/nixpkgs/issues/21820
-
-Next steps:
-   nix package manager user manual: http://nixos.org/nix/manual/
-"
-
-pkg_setup() {
-   enewgroup nixbld

[gentoo-commits] repo/gentoo:master commit in: sys-apps/nix/

[Sergei Trofimovich]

commit: 528ec5ed42c888999ebaef931c716d6c01122d9c
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Fri Sep 15 20:49:08 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Sep 15 20:49:08 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=528ec5ed

sys-apps/nix: bump up to 1.11.15

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 sys-apps/nix/Manifest   |   1 +
 sys-apps/nix/nix-1.11.15.ebuild | 134 
 2 files changed, 135 insertions(+)

diff --git a/sys-apps/nix/Manifest b/sys-apps/nix/Manifest
index 3f4fb2cbe9d..8aa06e86e33 100644
--- a/sys-apps/nix/Manifest
+++ b/sys-apps/nix/Manifest
@@ -2,3 +2,4 @@ DIST nix-1.11.11.tar.xz 625248 SHA256 
f5b9da21fb412e4c35b6e2bc771cfbf4ca44746be5
 DIST nix-1.11.12.tar.xz 631940 SHA256 
02e8d85cfc02494fb04c90d8443dfea433639b9f787989b18f54567fd9769dd2 SHA512 
fc2a06841cfa70c2d0b69315b0b8e30530e1b982e8a6b72e8f41c84db4efe7fc89738dce97f356f47d28518860990870fd54eb688704c531ba08231d2a3dd012
 WHIRLPOOL 
b99e213e68cd479f9b6f8104e5f328c9bc409883aa1a88c155acf3f0a49ee95981f1774eff0d803b21182c0a087434a2910a9631dcaa97aae1847697473b27ea
 DIST nix-1.11.13.tar.xz 632224 SHA256 
0913975e262f8069fde6e71a5fae757bb3aef558c51d1711034c525146ea5913 SHA512 
7244b49a7c7416e6ecc7754abcf48028d650510ac27f26701ccc3954660e26ad8b083fdc4ae07de718d3df49ca2a6af3bf3261d537e962a90233f87b13cd1606
 WHIRLPOOL 
a4af739a21e6080fccdfc885c24833e08765fae450fc7833484843f97fee7a4087619f67328075026b55efeda01a9cbf6bf80eb9918bdbbcee96414ee28d363c
 DIST nix-1.11.14.tar.xz 632260 SHA256 
26593c831addf1d40f6b7d131f394cb0f9fbec9e46471369faed16eaa2c4b7e4 SHA512 
48ed17a090a161ad35c8e84652566e527f31586184b8722a5536a6d83eee1e81911b6c4d5f0661f57054db6c47b5d8211f2acf47899fbec72f2c4bf8a5262af5
 WHIRLPOOL 
d6db1f452dd5bb430a0e02644af89a3e648f3f0f898b81b60ef4d7b8c8d7c9498c0992c3c33637eafd3ff1d23f55df3b76e1a1da957a0b7066a88e3eff1c35ef
+DIST nix-1.11.15.tar.xz 632544 SHA256 
d20f20e45d519f54fae5c61d55eadcf53e6d7cdbde9870eeec80d499f9805165 SHA512 
449b3c78b74c776215dfbe9d6d09b96d8c6abf996c69c525073df12d0cffb1a2868890d356fbb52c794e2c6f485018756395625e7b170166f7c6f9e2bdd364d9
 WHIRLPOOL 
740cdd89aa4d10af8e80329a52299c7333a5820ca4b943c4527b8342c60edf07e9bfaad3378546903e052a66155f974df36ee74f6119926714c5b12d9455f2f4

diff --git a/sys-apps/nix/nix-1.11.15.ebuild b/sys-apps/nix/nix-1.11.15.ebuild
new file mode 100644
index 000..d4e616516f7
--- /dev/null
+++ b/sys-apps/nix/nix-1.11.15.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic readme.gentoo-r1 user
+
+DESCRIPTION="A purely functional package manager"
+HOMEPAGE="https://nixos.org/nix;
+
+SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz;
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+etc_profile +gc doc sodium"
+
+RDEPEND="
+   app-arch/bzip2
+   app-arch/xz-utils
+   dev-db/sqlite
+   dev-libs/openssl:0=
+   net-misc/curl
+   sys-libs/libseccomp
+   sys-libs/zlib
+   gc? ( dev-libs/boehm-gc[cxx] )
+   doc? ( dev-libs/libxml2
+   dev-libs/libxslt
+   app-text/docbook-xsl-stylesheets
+   )
+   sodium? ( dev-libs/libsodium )
+   dev-lang/perl:=
+   dev-perl/DBD-SQLite
+   dev-perl/WWW-Curl
+   dev-perl/DBI
+"
+DEPEND="${RDEPEND}
+   >=sys-devel/bison-2.6
+   >=sys-devel/flex-2.5.35
+   virtual/perl-ExtUtils-ParseXS
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.11.6-systemd.patch
+   "${FILESDIR}"/${PN}-1.11.6-per-user.patch
+   "${FILESDIR}"/${PN}-1.11.6-respect-CXXFLAGS.patch
+   "${FILESDIR}"/${PN}-1.11.6-respect-LDFLAGS.patch
+)
+
+DISABLE_AUTOFORMATTING=yes
+DOC_CONTENTS=" Quick start user guide on Gentoo:
+
+[as root] enable nix-daemon service:
+   [systemd] # systemctl enable nix-daemon
+   [openrc]  # rc-update add nix-daemon
+[as a user] relogin to get environment and profile update
+[as a user] fetch nixpkgs update:
+   \$ nix-channel --update
+[as a user] install nix packages:
+   \$ nix-env -i mc
+[as a user] configure environment:
+   Somewhere in .bash_profile you might want to set
+   LOCALE_ARCHIVE=\$HOME/.nix-profile/lib/locale/locale-archive
+   but please read https://github.com/NixOS/nixpkgs/issues/21820
+
+Next steps:
+   nix package manager user manual: http://nixos.org/nix/manual/
+"
+
+pkg_setup() {
+   enewgroup nixbld
+   for i in {1..10}; do
+   # we list 'nixbld' twice to
+   # both assign a primary group for user
+   # and add a user to /etc/group
+   enewuser nixbld${i} -1 -1 /var/empty nixbld,nixbld
+   done
+}
+
+src_prepare() {
+   default
+
+   eautoreconf
+}
+
+src_configure() {
+   econf \
+   --localstatedir="${EPREFIX}"/nix/var \
+   $(use_enable gc)
+}
+

[gentoo-commits] repo/gentoo:master commit in: sys-apps/nix/, sys-apps/nix/files/

[Sergei Trofimovich]

commit: 008dca20d413d75867ec3959cbc6525926c7b9b3
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Thu Aug 31 20:22:15 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Aug 31 20:23:01 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=008dca20

sys-apps/nix: bump up to 1.11.14

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 sys-apps/nix/Manifest   |   1 +
 sys-apps/nix/files/nix-1.11.14-etc-fixes.patch  |   8 ++
 sys-apps/nix/files/nix-1.11.14-glibc-2.26.patch |  16 +++
 sys-apps/nix/nix-1.11.14.ebuild | 135 
 4 files changed, 160 insertions(+)

diff --git a/sys-apps/nix/Manifest b/sys-apps/nix/Manifest
index 7e6ea0a73e8..3f4fb2cbe9d 100644
--- a/sys-apps/nix/Manifest
+++ b/sys-apps/nix/Manifest
@@ -1,3 +1,4 @@
 DIST nix-1.11.11.tar.xz 625248 SHA256 
f5b9da21fb412e4c35b6e2bc771cfbf4ca44746be5d99868ff29d6e7604760e5 SHA512 
b4652755860637dae0eacab3c536c43bb835614a802fd0bcc606f6140ae3f5c4db312d30ecb20dad62732d47cafb8101a8760b321be5ec4b331f298c59a79e4e
 WHIRLPOOL 
d4d8fc1d868832a9a0ca131bf26cfdd566279be00b56cd40d6e3035935dbdb55d5a77e460e96e77636b60542cd085ccd4e97e15f3c219ddf794b67eb3f3fd2d5
 DIST nix-1.11.12.tar.xz 631940 SHA256 
02e8d85cfc02494fb04c90d8443dfea433639b9f787989b18f54567fd9769dd2 SHA512 
fc2a06841cfa70c2d0b69315b0b8e30530e1b982e8a6b72e8f41c84db4efe7fc89738dce97f356f47d28518860990870fd54eb688704c531ba08231d2a3dd012
 WHIRLPOOL 
b99e213e68cd479f9b6f8104e5f328c9bc409883aa1a88c155acf3f0a49ee95981f1774eff0d803b21182c0a087434a2910a9631dcaa97aae1847697473b27ea
 DIST nix-1.11.13.tar.xz 632224 SHA256 
0913975e262f8069fde6e71a5fae757bb3aef558c51d1711034c525146ea5913 SHA512 
7244b49a7c7416e6ecc7754abcf48028d650510ac27f26701ccc3954660e26ad8b083fdc4ae07de718d3df49ca2a6af3bf3261d537e962a90233f87b13cd1606
 WHIRLPOOL 
a4af739a21e6080fccdfc885c24833e08765fae450fc7833484843f97fee7a4087619f67328075026b55efeda01a9cbf6bf80eb9918bdbbcee96414ee28d363c
+DIST nix-1.11.14.tar.xz 632260 SHA256 
26593c831addf1d40f6b7d131f394cb0f9fbec9e46471369faed16eaa2c4b7e4 SHA512 
48ed17a090a161ad35c8e84652566e527f31586184b8722a5536a6d83eee1e81911b6c4d5f0661f57054db6c47b5d8211f2acf47899fbec72f2c4bf8a5262af5
 WHIRLPOOL 
d6db1f452dd5bb430a0e02644af89a3e648f3f0f898b81b60ef4d7b8c8d7c9498c0992c3c33637eafd3ff1d23f55df3b76e1a1da957a0b7066a88e3eff1c35ef

diff --git a/sys-apps/nix/files/nix-1.11.14-etc-fixes.patch 
b/sys-apps/nix/files/nix-1.11.14-etc-fixes.patch
new file mode 100644
index 000..07962838a22
--- /dev/null
+++ b/sys-apps/nix/files/nix-1.11.14-etc-fixes.patch
@@ -0,0 +1,8 @@
+diff --git a/scripts/nix-profile.sh.in b/scripts/nix-profile.sh.in
+index 4f09b55..e93ef42 100644
+--- a/scripts/nix-profile.sh.in
 b/scripts/nix-profile.sh.in
+@@ -5,3 +5,2 @@ if [ -n "$HOME" ]; then
+ if ! [ -L "$NIX_LINK" ]; then
+-echo "creating $NIX_LINK" >&2
+ _NIX_DEF_LINK=@localstatedir@/nix/profiles/per-user/$USER/profile

diff --git a/sys-apps/nix/files/nix-1.11.14-glibc-2.26.patch 
b/sys-apps/nix/files/nix-1.11.14-glibc-2.26.patch
new file mode 100644
index 000..44c995e3239
--- /dev/null
+++ b/sys-apps/nix/files/nix-1.11.14-glibc-2.26.patch
@@ -0,0 +1,16 @@
+'context' is no more after:
+https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=251287734e89a52da3db682a8241eb6bccc050c9
+
+'ucontext_t' is the new name.
+diff --git a/src/libmain/stack.cc b/src/libmain/stack.cc
+index 41b617d..695aaad 100644
+--- a/src/libmain/stack.cc
 b/src/libmain/stack.cc
+@@ -22,5 +22,5 @@ static void sigsegvHandler(int signo, siginfo_t * info, void 
* ctx)
+ #if defined(__x86_64__) && defined(REG_RSP)
+-sp = (char *) ((ucontext *) ctx)->uc_mcontext.gregs[REG_RSP];
++sp = (char *) ((ucontext_t *) ctx)->uc_mcontext.gregs[REG_RSP];
+ #elif defined(REG_ESP)
+-sp = (char *) ((ucontext *) ctx)->uc_mcontext.gregs[REG_ESP];
++sp = (char *) ((ucontext_t *) ctx)->uc_mcontext.gregs[REG_ESP];
+ #else

diff --git a/sys-apps/nix/nix-1.11.14.ebuild b/sys-apps/nix/nix-1.11.14.ebuild
new file mode 100644
index 000..55f0dba8e52
--- /dev/null
+++ b/sys-apps/nix/nix-1.11.14.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic readme.gentoo-r1 user
+
+DESCRIPTION="A purely functional package manager"
+HOMEPAGE="https://nixos.org/nix;
+
+SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz;
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+etc_profile +gc doc sodium"
+
+RDEPEND="
+   app-arch/bzip2
+   app-arch/xz-utils
+   dev-db/sqlite
+   dev-libs/openssl:0=
+   net-misc/curl
+   sys-libs/libseccomp
+   sys-libs/zlib
+   gc? ( dev-libs/boehm-gc[cxx] )
+   doc? ( dev-libs/libxml2
+   dev-libs/libxslt
+   app-text/docbook-xsl-stylesheets
+   )
+   sodium? ( dev-libs/libsodium )
+   

[gentoo-commits] repo/gentoo:master commit in: sys-apps/nix/

[Sergei Trofimovich]

commit: 6945784be039beef553f3353a68c856b7115de96
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Tue Jul 18 20:14:41 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue Jul 18 20:15:17 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6945784b

sys-apps/nix: bump up to 1.11.13

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 sys-apps/nix/Manifest   |   1 +
 sys-apps/nix/nix-1.11.13.ebuild | 135 
 2 files changed, 136 insertions(+)

diff --git a/sys-apps/nix/Manifest b/sys-apps/nix/Manifest
index 2036143fbab..16ebdebdda4 100644
--- a/sys-apps/nix/Manifest
+++ b/sys-apps/nix/Manifest
@@ -1,4 +1,5 @@
 DIST nix-1.11.10.tar.xz 624972 SHA256 
b29a458c2b803bcc07d8b58cd016ca6ad0788a73ca74edaeaebc588961322467 SHA512 
dae5293092f80a723ade12317a7c86a286e4ec19ea4422010b24fbfd9b68d6d3ddbce1af6efe34869dae98a02697afca0bad66c7363c09e54a3da02534a45f14
 WHIRLPOOL 
375becabfb1ef4d779a173fc1c3dc6f1df3a08d7abb4c4320cfa33bf993e458700462ac7f721f5677cc91bf01c09ebea9c6b7a0d86859fcbb627f565e4e46d70
 DIST nix-1.11.11.tar.xz 625248 SHA256 
f5b9da21fb412e4c35b6e2bc771cfbf4ca44746be5d99868ff29d6e7604760e5 SHA512 
b4652755860637dae0eacab3c536c43bb835614a802fd0bcc606f6140ae3f5c4db312d30ecb20dad62732d47cafb8101a8760b321be5ec4b331f298c59a79e4e
 WHIRLPOOL 
d4d8fc1d868832a9a0ca131bf26cfdd566279be00b56cd40d6e3035935dbdb55d5a77e460e96e77636b60542cd085ccd4e97e15f3c219ddf794b67eb3f3fd2d5
 DIST nix-1.11.12.tar.xz 631940 SHA256 
02e8d85cfc02494fb04c90d8443dfea433639b9f787989b18f54567fd9769dd2 SHA512 
fc2a06841cfa70c2d0b69315b0b8e30530e1b982e8a6b72e8f41c84db4efe7fc89738dce97f356f47d28518860990870fd54eb688704c531ba08231d2a3dd012
 WHIRLPOOL 
b99e213e68cd479f9b6f8104e5f328c9bc409883aa1a88c155acf3f0a49ee95981f1774eff0d803b21182c0a087434a2910a9631dcaa97aae1847697473b27ea
+DIST nix-1.11.13.tar.xz 632224 SHA256 
0913975e262f8069fde6e71a5fae757bb3aef558c51d1711034c525146ea5913 SHA512 
7244b49a7c7416e6ecc7754abcf48028d650510ac27f26701ccc3954660e26ad8b083fdc4ae07de718d3df49ca2a6af3bf3261d537e962a90233f87b13cd1606
 WHIRLPOOL 
a4af739a21e6080fccdfc885c24833e08765fae450fc7833484843f97fee7a4087619f67328075026b55efeda01a9cbf6bf80eb9918bdbbcee96414ee28d363c
 DIST nix-1.11.9.tar.xz 623020 SHA256 
0e943e277f37843f9196b0293cc31d828613ad7a328ee77cd5be01935dc6e7e1 SHA512 
1e557d61261f958f7fa94510e88c8d34c8ed7b237427a036cdc461aceff4eb34b8e0cdd859fa14c2e392f9094a489bfc663e3043df8bd22651aa42f809caba97
 WHIRLPOOL 
1bd56f99da5f7ea427c3afc0170f37aa4ffcb58d8f2c3fc4915e08c95f67745a4b7a0943116c1beae2f67155806c7a5c56deadaeaed7ff3ab17d7c59235df580

diff --git a/sys-apps/nix/nix-1.11.13.ebuild b/sys-apps/nix/nix-1.11.13.ebuild
new file mode 100644
index 000..61cf9a2de1c
--- /dev/null
+++ b/sys-apps/nix/nix-1.11.13.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic readme.gentoo-r1 user
+
+DESCRIPTION="A purely functional package manager"
+HOMEPAGE="https://nixos.org/nix;
+
+SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz;
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+etc_profile +gc doc sodium"
+
+RDEPEND="
+   app-arch/bzip2
+   app-arch/xz-utils
+   dev-db/sqlite
+   dev-libs/openssl:0=
+   net-misc/curl
+   sys-libs/libseccomp
+   sys-libs/zlib
+   gc? ( dev-libs/boehm-gc[cxx] )
+   doc? ( dev-libs/libxml2
+   dev-libs/libxslt
+   app-text/docbook-xsl-stylesheets
+   )
+   sodium? ( dev-libs/libsodium )
+   dev-lang/perl:=
+   dev-perl/DBD-SQLite
+   dev-perl/WWW-Curl
+   dev-perl/DBI
+"
+DEPEND="${RDEPEND}
+   >=sys-devel/bison-2.6
+   >=sys-devel/flex-2.5.35
+   virtual/perl-ExtUtils-ParseXS
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.11.6-systemd.patch
+   "${FILESDIR}"/${PN}-1.11.6-per-user.patch
+   "${FILESDIR}"/${PN}-1.11.6-respect-CXXFLAGS.patch
+   "${FILESDIR}"/${PN}-1.11.6-respect-LDFLAGS.patch
+   "${FILESDIR}"/${PN}-1.11.12-etc-fixes.patch
+)
+
+DISABLE_AUTOFORMATTING=yes
+DOC_CONTENTS=" Quick start user guide on Gentoo:
+
+[as root] enable nix-daemon service:
+   [systemd] # systemctl enable nix-daemon
+   [openrc]  # rc-update add nix-daemon
+[as a user] relogin to get environment and profile update
+[as a user] fetch nixpkgs update:
+   \$ nix-channel --update
+[as a user] install nix packages:
+   \$ nix-env -i mc
+[as a user] configure environment:
+   Somewhere in .bash_profile you might want to set
+   LOCALE_ARCHIVE=\$HOME/.nix-profile/lib/locale/locale-archive
+   but please read https://github.com/NixOS/nixpkgs/issues/21820
+
+Next steps:
+   nix package manager user manual: http://nixos.org/nix/manual/
+"
+
+pkg_setup() {
+   enewgroup nixbld
+   for i in {1..10}; do
+   # we list 'nixbld' twice to
+   # both assign 

[gentoo-commits] repo/gentoo:master commit in: sys-apps/nix/

[Sergei Trofimovich]

commit: 85eebb177aea25f8ac8f25b051aba6a77ba63c13
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Tue Jul 18 20:14:56 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue Jul 18 20:15:17 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85eebb17

sys-apps/nix: drop old

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 sys-apps/nix/Manifest   |   2 -
 sys-apps/nix/nix-1.11.10.ebuild | 130 
 sys-apps/nix/nix-1.11.9.ebuild  | 129 ---
 3 files changed, 261 deletions(-)

diff --git a/sys-apps/nix/Manifest b/sys-apps/nix/Manifest
index 16ebdebdda4..7e6ea0a73e8 100644
--- a/sys-apps/nix/Manifest
+++ b/sys-apps/nix/Manifest
@@ -1,5 +1,3 @@
-DIST nix-1.11.10.tar.xz 624972 SHA256 
b29a458c2b803bcc07d8b58cd016ca6ad0788a73ca74edaeaebc588961322467 SHA512 
dae5293092f80a723ade12317a7c86a286e4ec19ea4422010b24fbfd9b68d6d3ddbce1af6efe34869dae98a02697afca0bad66c7363c09e54a3da02534a45f14
 WHIRLPOOL 
375becabfb1ef4d779a173fc1c3dc6f1df3a08d7abb4c4320cfa33bf993e458700462ac7f721f5677cc91bf01c09ebea9c6b7a0d86859fcbb627f565e4e46d70
 DIST nix-1.11.11.tar.xz 625248 SHA256 
f5b9da21fb412e4c35b6e2bc771cfbf4ca44746be5d99868ff29d6e7604760e5 SHA512 
b4652755860637dae0eacab3c536c43bb835614a802fd0bcc606f6140ae3f5c4db312d30ecb20dad62732d47cafb8101a8760b321be5ec4b331f298c59a79e4e
 WHIRLPOOL 
d4d8fc1d868832a9a0ca131bf26cfdd566279be00b56cd40d6e3035935dbdb55d5a77e460e96e77636b60542cd085ccd4e97e15f3c219ddf794b67eb3f3fd2d5
 DIST nix-1.11.12.tar.xz 631940 SHA256 
02e8d85cfc02494fb04c90d8443dfea433639b9f787989b18f54567fd9769dd2 SHA512 
fc2a06841cfa70c2d0b69315b0b8e30530e1b982e8a6b72e8f41c84db4efe7fc89738dce97f356f47d28518860990870fd54eb688704c531ba08231d2a3dd012
 WHIRLPOOL 
b99e213e68cd479f9b6f8104e5f328c9bc409883aa1a88c155acf3f0a49ee95981f1774eff0d803b21182c0a087434a2910a9631dcaa97aae1847697473b27ea
 DIST nix-1.11.13.tar.xz 632224 SHA256 
0913975e262f8069fde6e71a5fae757bb3aef558c51d1711034c525146ea5913 SHA512 
7244b49a7c7416e6ecc7754abcf48028d650510ac27f26701ccc3954660e26ad8b083fdc4ae07de718d3df49ca2a6af3bf3261d537e962a90233f87b13cd1606
 WHIRLPOOL 
a4af739a21e6080fccdfc885c24833e08765fae450fc7833484843f97fee7a4087619f67328075026b55efeda01a9cbf6bf80eb9918bdbbcee96414ee28d363c
-DIST nix-1.11.9.tar.xz 623020 SHA256 
0e943e277f37843f9196b0293cc31d828613ad7a328ee77cd5be01935dc6e7e1 SHA512 
1e557d61261f958f7fa94510e88c8d34c8ed7b237427a036cdc461aceff4eb34b8e0cdd859fa14c2e392f9094a489bfc663e3043df8bd22651aa42f809caba97
 WHIRLPOOL 
1bd56f99da5f7ea427c3afc0170f37aa4ffcb58d8f2c3fc4915e08c95f67745a4b7a0943116c1beae2f67155806c7a5c56deadaeaed7ff3ab17d7c59235df580

diff --git a/sys-apps/nix/nix-1.11.10.ebuild b/sys-apps/nix/nix-1.11.10.ebuild
deleted file mode 100644
index f8b026b00b9..000
--- a/sys-apps/nix/nix-1.11.10.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic readme.gentoo-r1 user
-
-DESCRIPTION="A purely functional package manager"
-HOMEPAGE="https://nixos.org/nix;
-
-SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz;
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+etc_profile +gc doc sodium"
-
-RDEPEND="
-   app-arch/bzip2
-   app-arch/xz-utils
-   dev-db/sqlite
-   dev-libs/openssl:0=
-   net-misc/curl
-   sys-libs/libseccomp
-   sys-libs/zlib
-   gc? ( dev-libs/boehm-gc[cxx] )
-   doc? ( dev-libs/libxml2
-   dev-libs/libxslt
-   app-text/docbook-xsl-stylesheets
-   )
-   sodium? ( dev-libs/libsodium )
-   dev-lang/perl:=
-   dev-perl/DBD-SQLite
-   dev-perl/WWW-Curl
-   dev-perl/DBI
-"
-DEPEND="${RDEPEND}
-   >=sys-devel/bison-2.6
-   >=sys-devel/flex-2.5.35
-   virtual/perl-ExtUtils-ParseXS
-"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-1.11.6-systemd.patch
-   "${FILESDIR}"/${PN}-1.11.6-per-user.patch
-   "${FILESDIR}"/${PN}-1.11.6-respect-CXXFLAGS.patch
-   "${FILESDIR}"/${PN}-1.11.6-respect-LDFLAGS.patch
-)
-
-DISABLE_AUTOFORMATTING=yes
-DOC_CONTENTS=" Quick start user guide on Gentoo:
-
-[as root] enable nix-daemon service:
-   [systemd] # systemctl enable nix-daemon
-   [openrc]  # rc-update add nix-daemon
-[as a user] relogin to get environment and profile update
-[as a user] fetch nixpkgs update:
-   \$ nix-channel --update
-[as a user] install nix packages:
-   \$ nix-env -i mc
-[as a user] configure environment:
-   Somewhere in .bash_profile you might want to set
-   LOCALE_ARCHIVE=\$HOME/.nix-profile/lib/locale/locale-archive
-   but please read https://github.com/NixOS/nixpkgs/issues/21820
-
-Next steps:
-   nix package manager user manual: http://nixos.org/nix/manual/
-"
-
-pkg_setup() {
-   enewgroup nixbld
-   for i in {1..10}; do
-   # we list 'nixbld' twice to
- 

[gentoo-commits] repo/gentoo:master commit in: sys-apps/nix/files/, sys-apps/nix/

[Sergei Trofimovich]

commit: 49ad8d2c53d2f21f4867e147b6ad97cbcb706c79
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Jul 15 11:27:59 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Jul 15 11:29:17 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49ad8d2c

sys-apps/nix: added missing gcroots directory, bug #622658

Fixed two bugs here:
- added missing /nix/var/nix/gcroots/per-user directory
- fixed /etc/profile.d/nix-daemon.sh to use 'stat -c', not 'stat -f'

Reported-by: Toralf Förster
Bug: https://bugs.gentoo.org/622658
Package-Manager: Portage-2.3.6, Repoman-2.3.2

 sys-apps/nix/files/nix-1.11.12-etc-fixes.patch | 24 ++
 .../{nix-1.11.12.ebuild => nix-1.11.12-r1.ebuild}  |  7 ++-
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/sys-apps/nix/files/nix-1.11.12-etc-fixes.patch 
b/sys-apps/nix/files/nix-1.11.12-etc-fixes.patch
new file mode 100644
index 000..1973133e22b
--- /dev/null
+++ b/sys-apps/nix/files/nix-1.11.12-etc-fixes.patch
@@ -0,0 +1,24 @@
+GNU coreutils has '-c' option for formatted output, not -f.
+Don't spam stderr when directory gets created.
+diff --git a/scripts/nix-profile-daemon.sh.in 
b/scripts/nix-profile-daemon.sh.in
+index 7f46cc6..386f607 100644
+--- a/scripts/nix-profile-daemon.sh.in
 b/scripts/nix-profile-daemon.sh.in
+@@ -15,3 +15,3 @@ export NIX_PROFILES="@localstatedir@/nix/profiles/default 
$HOME/.nix-profile"
+ mkdir -m 0755 -p $NIX_USER_PROFILE_DIR
+-if test "$(stat -f '%u' $NIX_USER_PROFILE_DIR)" != "$(id -u)"; then
++if test "$(stat -c '%u' $NIX_USER_PROFILE_DIR)" != "$(id -u)"; then
+ echo "WARNING: bad ownership on $NIX_USER_PROFILE_DIR" >&2
+@@ -37,3 +37,3 @@ if test -w $HOME; then
+   mkdir -m 0755 -p $NIX_USER_GCROOTS_DIR
+-  if test "$(stat -f '%u' $NIX_USER_GCROOTS_DIR)" != "$(id -u)"; then
++  if test "$(stat -c '%u' $NIX_USER_GCROOTS_DIR)" != "$(id -u)"; then
+   echo "WARNING: bad ownership on $NIX_USER_GCROOTS_DIR" >&2
+diff --git a/scripts/nix-profile.sh.in b/scripts/nix-profile.sh.in
+index 4f09b55..e93ef42 100644
+--- a/scripts/nix-profile.sh.in
 b/scripts/nix-profile.sh.in
+@@ -5,3 +5,2 @@ if [ -n "$HOME" ]; then
+ if ! [ -L "$NIX_LINK" ]; then
+-echo "creating $NIX_LINK" >&2
+ _NIX_DEF_LINK=@localstatedir@/nix/profiles/per-user/$USER/profile

diff --git a/sys-apps/nix/nix-1.11.12.ebuild 
b/sys-apps/nix/nix-1.11.12-r1.ebuild
similarity index 91%
rename from sys-apps/nix/nix-1.11.12.ebuild
rename to sys-apps/nix/nix-1.11.12-r1.ebuild
index f8b026b00b9..61cf9a2de1c 100644
--- a/sys-apps/nix/nix-1.11.12.ebuild
+++ b/sys-apps/nix/nix-1.11.12-r1.ebuild
@@ -44,6 +44,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.11.6-per-user.patch
"${FILESDIR}"/${PN}-1.11.6-respect-CXXFLAGS.patch
"${FILESDIR}"/${PN}-1.11.6-respect-LDFLAGS.patch
+   "${FILESDIR}"/${PN}-1.11.12-etc-fixes.patch
 )
 
 DISABLE_AUTOFORMATTING=yes
@@ -113,11 +114,15 @@ src_install() {
keepdir /nix/var/nix/profiles/per-user
fperms 1777 /nix/var/nix/profiles/per-user
 
-   doenvd "${FILESDIR}"/60nix-remote-daemon
+   # setup directories nix-daemon: /etc/profile.d/nix-daemon.sh
+   keepdir /nix/var/nix/gcroots/per-user
+   fperms 1777 /nix/var/nix/gcroots/per-user
+
newinitd "${FILESDIR}"/nix-daemon.initd nix-daemon
 
if ! use etc_profile; then
rm "${ED}"/etc/profile.d/nix.sh || die
+   rm "${ED}"/etc/profile.d/nix-daemon.sh || die
fi
 }
 

[gentoo-commits] repo/gentoo:master commit in: sys-apps/nix/

[Sergei Trofimovich]

commit: cf519df283edf2cb987f1db453251802e1617bc9
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Thu Jul 13 18:42:17 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Jul 13 18:42:49 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf519df2

sys-apps/nix: bump up to 1.11.12

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 sys-apps/nix/Manifest   |   1 +
 sys-apps/nix/nix-1.11.12.ebuild | 130 
 2 files changed, 131 insertions(+)

diff --git a/sys-apps/nix/Manifest b/sys-apps/nix/Manifest
index 33639909bb4..2036143fbab 100644
--- a/sys-apps/nix/Manifest
+++ b/sys-apps/nix/Manifest
@@ -1,3 +1,4 @@
 DIST nix-1.11.10.tar.xz 624972 SHA256 
b29a458c2b803bcc07d8b58cd016ca6ad0788a73ca74edaeaebc588961322467 SHA512 
dae5293092f80a723ade12317a7c86a286e4ec19ea4422010b24fbfd9b68d6d3ddbce1af6efe34869dae98a02697afca0bad66c7363c09e54a3da02534a45f14
 WHIRLPOOL 
375becabfb1ef4d779a173fc1c3dc6f1df3a08d7abb4c4320cfa33bf993e458700462ac7f721f5677cc91bf01c09ebea9c6b7a0d86859fcbb627f565e4e46d70
 DIST nix-1.11.11.tar.xz 625248 SHA256 
f5b9da21fb412e4c35b6e2bc771cfbf4ca44746be5d99868ff29d6e7604760e5 SHA512 
b4652755860637dae0eacab3c536c43bb835614a802fd0bcc606f6140ae3f5c4db312d30ecb20dad62732d47cafb8101a8760b321be5ec4b331f298c59a79e4e
 WHIRLPOOL 
d4d8fc1d868832a9a0ca131bf26cfdd566279be00b56cd40d6e3035935dbdb55d5a77e460e96e77636b60542cd085ccd4e97e15f3c219ddf794b67eb3f3fd2d5
+DIST nix-1.11.12.tar.xz 631940 SHA256 
02e8d85cfc02494fb04c90d8443dfea433639b9f787989b18f54567fd9769dd2 SHA512 
fc2a06841cfa70c2d0b69315b0b8e30530e1b982e8a6b72e8f41c84db4efe7fc89738dce97f356f47d28518860990870fd54eb688704c531ba08231d2a3dd012
 WHIRLPOOL 
b99e213e68cd479f9b6f8104e5f328c9bc409883aa1a88c155acf3f0a49ee95981f1774eff0d803b21182c0a087434a2910a9631dcaa97aae1847697473b27ea
 DIST nix-1.11.9.tar.xz 623020 SHA256 
0e943e277f37843f9196b0293cc31d828613ad7a328ee77cd5be01935dc6e7e1 SHA512 
1e557d61261f958f7fa94510e88c8d34c8ed7b237427a036cdc461aceff4eb34b8e0cdd859fa14c2e392f9094a489bfc663e3043df8bd22651aa42f809caba97
 WHIRLPOOL 
1bd56f99da5f7ea427c3afc0170f37aa4ffcb58d8f2c3fc4915e08c95f67745a4b7a0943116c1beae2f67155806c7a5c56deadaeaed7ff3ab17d7c59235df580

diff --git a/sys-apps/nix/nix-1.11.12.ebuild b/sys-apps/nix/nix-1.11.12.ebuild
new file mode 100644
index 000..f8b026b00b9
--- /dev/null
+++ b/sys-apps/nix/nix-1.11.12.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic readme.gentoo-r1 user
+
+DESCRIPTION="A purely functional package manager"
+HOMEPAGE="https://nixos.org/nix;
+
+SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz;
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+etc_profile +gc doc sodium"
+
+RDEPEND="
+   app-arch/bzip2
+   app-arch/xz-utils
+   dev-db/sqlite
+   dev-libs/openssl:0=
+   net-misc/curl
+   sys-libs/libseccomp
+   sys-libs/zlib
+   gc? ( dev-libs/boehm-gc[cxx] )
+   doc? ( dev-libs/libxml2
+   dev-libs/libxslt
+   app-text/docbook-xsl-stylesheets
+   )
+   sodium? ( dev-libs/libsodium )
+   dev-lang/perl:=
+   dev-perl/DBD-SQLite
+   dev-perl/WWW-Curl
+   dev-perl/DBI
+"
+DEPEND="${RDEPEND}
+   >=sys-devel/bison-2.6
+   >=sys-devel/flex-2.5.35
+   virtual/perl-ExtUtils-ParseXS
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.11.6-systemd.patch
+   "${FILESDIR}"/${PN}-1.11.6-per-user.patch
+   "${FILESDIR}"/${PN}-1.11.6-respect-CXXFLAGS.patch
+   "${FILESDIR}"/${PN}-1.11.6-respect-LDFLAGS.patch
+)
+
+DISABLE_AUTOFORMATTING=yes
+DOC_CONTENTS=" Quick start user guide on Gentoo:
+
+[as root] enable nix-daemon service:
+   [systemd] # systemctl enable nix-daemon
+   [openrc]  # rc-update add nix-daemon
+[as a user] relogin to get environment and profile update
+[as a user] fetch nixpkgs update:
+   \$ nix-channel --update
+[as a user] install nix packages:
+   \$ nix-env -i mc
+[as a user] configure environment:
+   Somewhere in .bash_profile you might want to set
+   LOCALE_ARCHIVE=\$HOME/.nix-profile/lib/locale/locale-archive
+   but please read https://github.com/NixOS/nixpkgs/issues/21820
+
+Next steps:
+   nix package manager user manual: http://nixos.org/nix/manual/
+"
+
+pkg_setup() {
+   enewgroup nixbld
+   for i in {1..10}; do
+   # we list 'nixbld' twice to
+   # both assign a primary group for user
+   # and add a user to /etc/group
+   enewuser nixbld${i} -1 -1 /var/empty nixbld,nixbld
+   done
+}
+
+src_prepare() {
+   default
+
+   eautoreconf
+}
+
+src_configure() {
+   econf \
+   --localstatedir="${EPREFIX}"/nix/var \
+   $(use_enable gc)
+}
+
+src_compile() {
+   local make_vars=(
+   OPTIMIZE=0 # disable hardcoded 

[gentoo-commits] repo/gentoo:master commit in: sys-apps/nix/

[Sergei Trofimovich]

commit: 442fbbb128353be8c05e179cb19e3c7b2c627998
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Jun 19 20:26:33 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Jun 19 20:26:47 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=442fbbb1

sys-apps/nix: bump up to 1.11.11

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 sys-apps/nix/Manifest   |   1 +
 sys-apps/nix/nix-1.11.11.ebuild | 130 
 2 files changed, 131 insertions(+)

diff --git a/sys-apps/nix/Manifest b/sys-apps/nix/Manifest
index d5e73ae5793..33639909bb4 100644
--- a/sys-apps/nix/Manifest
+++ b/sys-apps/nix/Manifest
@@ -1,2 +1,3 @@
 DIST nix-1.11.10.tar.xz 624972 SHA256 
b29a458c2b803bcc07d8b58cd016ca6ad0788a73ca74edaeaebc588961322467 SHA512 
dae5293092f80a723ade12317a7c86a286e4ec19ea4422010b24fbfd9b68d6d3ddbce1af6efe34869dae98a02697afca0bad66c7363c09e54a3da02534a45f14
 WHIRLPOOL 
375becabfb1ef4d779a173fc1c3dc6f1df3a08d7abb4c4320cfa33bf993e458700462ac7f721f5677cc91bf01c09ebea9c6b7a0d86859fcbb627f565e4e46d70
+DIST nix-1.11.11.tar.xz 625248 SHA256 
f5b9da21fb412e4c35b6e2bc771cfbf4ca44746be5d99868ff29d6e7604760e5 SHA512 
b4652755860637dae0eacab3c536c43bb835614a802fd0bcc606f6140ae3f5c4db312d30ecb20dad62732d47cafb8101a8760b321be5ec4b331f298c59a79e4e
 WHIRLPOOL 
d4d8fc1d868832a9a0ca131bf26cfdd566279be00b56cd40d6e3035935dbdb55d5a77e460e96e77636b60542cd085ccd4e97e15f3c219ddf794b67eb3f3fd2d5
 DIST nix-1.11.9.tar.xz 623020 SHA256 
0e943e277f37843f9196b0293cc31d828613ad7a328ee77cd5be01935dc6e7e1 SHA512 
1e557d61261f958f7fa94510e88c8d34c8ed7b237427a036cdc461aceff4eb34b8e0cdd859fa14c2e392f9094a489bfc663e3043df8bd22651aa42f809caba97
 WHIRLPOOL 
1bd56f99da5f7ea427c3afc0170f37aa4ffcb58d8f2c3fc4915e08c95f67745a4b7a0943116c1beae2f67155806c7a5c56deadaeaed7ff3ab17d7c59235df580

diff --git a/sys-apps/nix/nix-1.11.11.ebuild b/sys-apps/nix/nix-1.11.11.ebuild
new file mode 100644
index 000..f8b026b00b9
--- /dev/null
+++ b/sys-apps/nix/nix-1.11.11.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic readme.gentoo-r1 user
+
+DESCRIPTION="A purely functional package manager"
+HOMEPAGE="https://nixos.org/nix;
+
+SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz;
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+etc_profile +gc doc sodium"
+
+RDEPEND="
+   app-arch/bzip2
+   app-arch/xz-utils
+   dev-db/sqlite
+   dev-libs/openssl:0=
+   net-misc/curl
+   sys-libs/libseccomp
+   sys-libs/zlib
+   gc? ( dev-libs/boehm-gc[cxx] )
+   doc? ( dev-libs/libxml2
+   dev-libs/libxslt
+   app-text/docbook-xsl-stylesheets
+   )
+   sodium? ( dev-libs/libsodium )
+   dev-lang/perl:=
+   dev-perl/DBD-SQLite
+   dev-perl/WWW-Curl
+   dev-perl/DBI
+"
+DEPEND="${RDEPEND}
+   >=sys-devel/bison-2.6
+   >=sys-devel/flex-2.5.35
+   virtual/perl-ExtUtils-ParseXS
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.11.6-systemd.patch
+   "${FILESDIR}"/${PN}-1.11.6-per-user.patch
+   "${FILESDIR}"/${PN}-1.11.6-respect-CXXFLAGS.patch
+   "${FILESDIR}"/${PN}-1.11.6-respect-LDFLAGS.patch
+)
+
+DISABLE_AUTOFORMATTING=yes
+DOC_CONTENTS=" Quick start user guide on Gentoo:
+
+[as root] enable nix-daemon service:
+   [systemd] # systemctl enable nix-daemon
+   [openrc]  # rc-update add nix-daemon
+[as a user] relogin to get environment and profile update
+[as a user] fetch nixpkgs update:
+   \$ nix-channel --update
+[as a user] install nix packages:
+   \$ nix-env -i mc
+[as a user] configure environment:
+   Somewhere in .bash_profile you might want to set
+   LOCALE_ARCHIVE=\$HOME/.nix-profile/lib/locale/locale-archive
+   but please read https://github.com/NixOS/nixpkgs/issues/21820
+
+Next steps:
+   nix package manager user manual: http://nixos.org/nix/manual/
+"
+
+pkg_setup() {
+   enewgroup nixbld
+   for i in {1..10}; do
+   # we list 'nixbld' twice to
+   # both assign a primary group for user
+   # and add a user to /etc/group
+   enewuser nixbld${i} -1 -1 /var/empty nixbld,nixbld
+   done
+}
+
+src_prepare() {
+   default
+
+   eautoreconf
+}
+
+src_configure() {
+   econf \
+   --localstatedir="${EPREFIX}"/nix/var \
+   $(use_enable gc)
+}
+
+src_compile() {
+   local make_vars=(
+   OPTIMIZE=0 # disable hardcoded -O3
+   V=1 # verbose build
+   )
+   emake "${make_vars[@]}"
+}
+
+src_install() {
+   # TODO: emacs highlighter
+   default
+
+   readme.gentoo_create_doc
+
+   # here we use an eager variant of something that
+   # is lazily done by nix-daemon and root nix-env
+
+   # TODO: will need a tweak for prefix
+   keepdir 

[gentoo-commits] repo/gentoo:master commit in: sys-apps/nix/

[Sergei Trofimovich]

commit: 344016efa69a2964f1b37677cda0ee1e6d4d22a6
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Jun 12 20:59:00 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Jun 12 21:23:43 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=344016ef

sys-apps/nix: bump up to 1.11.10

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 sys-apps/nix/Manifest   |   1 +
 sys-apps/nix/nix-1.11.10.ebuild | 130 
 2 files changed, 131 insertions(+)

diff --git a/sys-apps/nix/Manifest b/sys-apps/nix/Manifest
index 21321f65d23..d5e73ae5793 100644
--- a/sys-apps/nix/Manifest
+++ b/sys-apps/nix/Manifest
@@ -1 +1,2 @@
+DIST nix-1.11.10.tar.xz 624972 SHA256 
b29a458c2b803bcc07d8b58cd016ca6ad0788a73ca74edaeaebc588961322467 SHA512 
dae5293092f80a723ade12317a7c86a286e4ec19ea4422010b24fbfd9b68d6d3ddbce1af6efe34869dae98a02697afca0bad66c7363c09e54a3da02534a45f14
 WHIRLPOOL 
375becabfb1ef4d779a173fc1c3dc6f1df3a08d7abb4c4320cfa33bf993e458700462ac7f721f5677cc91bf01c09ebea9c6b7a0d86859fcbb627f565e4e46d70
 DIST nix-1.11.9.tar.xz 623020 SHA256 
0e943e277f37843f9196b0293cc31d828613ad7a328ee77cd5be01935dc6e7e1 SHA512 
1e557d61261f958f7fa94510e88c8d34c8ed7b237427a036cdc461aceff4eb34b8e0cdd859fa14c2e392f9094a489bfc663e3043df8bd22651aa42f809caba97
 WHIRLPOOL 
1bd56f99da5f7ea427c3afc0170f37aa4ffcb58d8f2c3fc4915e08c95f67745a4b7a0943116c1beae2f67155806c7a5c56deadaeaed7ff3ab17d7c59235df580

diff --git a/sys-apps/nix/nix-1.11.10.ebuild b/sys-apps/nix/nix-1.11.10.ebuild
new file mode 100644
index 000..f8b026b00b9
--- /dev/null
+++ b/sys-apps/nix/nix-1.11.10.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic readme.gentoo-r1 user
+
+DESCRIPTION="A purely functional package manager"
+HOMEPAGE="https://nixos.org/nix;
+
+SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz;
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+etc_profile +gc doc sodium"
+
+RDEPEND="
+   app-arch/bzip2
+   app-arch/xz-utils
+   dev-db/sqlite
+   dev-libs/openssl:0=
+   net-misc/curl
+   sys-libs/libseccomp
+   sys-libs/zlib
+   gc? ( dev-libs/boehm-gc[cxx] )
+   doc? ( dev-libs/libxml2
+   dev-libs/libxslt
+   app-text/docbook-xsl-stylesheets
+   )
+   sodium? ( dev-libs/libsodium )
+   dev-lang/perl:=
+   dev-perl/DBD-SQLite
+   dev-perl/WWW-Curl
+   dev-perl/DBI
+"
+DEPEND="${RDEPEND}
+   >=sys-devel/bison-2.6
+   >=sys-devel/flex-2.5.35
+   virtual/perl-ExtUtils-ParseXS
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.11.6-systemd.patch
+   "${FILESDIR}"/${PN}-1.11.6-per-user.patch
+   "${FILESDIR}"/${PN}-1.11.6-respect-CXXFLAGS.patch
+   "${FILESDIR}"/${PN}-1.11.6-respect-LDFLAGS.patch
+)
+
+DISABLE_AUTOFORMATTING=yes
+DOC_CONTENTS=" Quick start user guide on Gentoo:
+
+[as root] enable nix-daemon service:
+   [systemd] # systemctl enable nix-daemon
+   [openrc]  # rc-update add nix-daemon
+[as a user] relogin to get environment and profile update
+[as a user] fetch nixpkgs update:
+   \$ nix-channel --update
+[as a user] install nix packages:
+   \$ nix-env -i mc
+[as a user] configure environment:
+   Somewhere in .bash_profile you might want to set
+   LOCALE_ARCHIVE=\$HOME/.nix-profile/lib/locale/locale-archive
+   but please read https://github.com/NixOS/nixpkgs/issues/21820
+
+Next steps:
+   nix package manager user manual: http://nixos.org/nix/manual/
+"
+
+pkg_setup() {
+   enewgroup nixbld
+   for i in {1..10}; do
+   # we list 'nixbld' twice to
+   # both assign a primary group for user
+   # and add a user to /etc/group
+   enewuser nixbld${i} -1 -1 /var/empty nixbld,nixbld
+   done
+}
+
+src_prepare() {
+   default
+
+   eautoreconf
+}
+
+src_configure() {
+   econf \
+   --localstatedir="${EPREFIX}"/nix/var \
+   $(use_enable gc)
+}
+
+src_compile() {
+   local make_vars=(
+   OPTIMIZE=0 # disable hardcoded -O3
+   V=1 # verbose build
+   )
+   emake "${make_vars[@]}"
+}
+
+src_install() {
+   # TODO: emacs highlighter
+   default
+
+   readme.gentoo_create_doc
+
+   # here we use an eager variant of something that
+   # is lazily done by nix-daemon and root nix-env
+
+   # TODO: will need a tweak for prefix
+   keepdir /nix/store
+   fowners root:nixbld /nix/store
+   fperms 1775 /nix/store
+
+   keepdir /nix/var/nix/profiles/per-user
+   fperms 1777 /nix/var/nix/profiles/per-user
+
+   doenvd "${FILESDIR}"/60nix-remote-daemon
+   newinitd "${FILESDIR}"/nix-daemon.initd nix-daemon
+
+   if ! use etc_profile; then
+   rm 

[gentoo-commits] repo/gentoo:master commit in: sys-apps/nix/

[Michał Górny]

commit: 270084e3a13e4f8c76a24760f8dba44be5659aee
Author: kballou  devnulllabs  io>
AuthorDate: Tue Apr 25 17:13:54 2017 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun May  7 13:10:29 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=270084e3

sys-apps/nix: Fix small grammar issues in doc contents

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sys-apps/nix/nix-1.11.9.ebuild | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/sys-apps/nix/nix-1.11.9.ebuild b/sys-apps/nix/nix-1.11.9.ebuild
index 448c3372ce5..c19c57bbdf8 100644
--- a/sys-apps/nix/nix-1.11.9.ebuild
+++ b/sys-apps/nix/nix-1.11.9.ebuild
@@ -51,12 +51,12 @@ DOC_CONTENTS=" Quick start user guide on Gentoo:
 [as root] enable nix-daemon service:
[systemd] # systemctl enable nix-daemon
[openrc]  # rc-update add nix-daemon
-[as an user] relogin to get environment and profile update
-[as an user] fetch nixpkgs update:
+[as a user] relogin to get environment and profile update
+[as a user] fetch nixpkgs update:
\$ nix-channel --update
-[as an user] install nix packages:
+[as a user] install nix packages:
\$ nix-env -i mc
-[as an user] configure environment:
+[as a user] configure environment:
Somewhere in .bash_profile you might want to set
LOCALE_ARCHIVE=\$HOME/.nix-profile/lib/locale/locale-archive
but please read https://github.com/NixOS/nixpkgs/issues/21820
@@ -70,7 +70,7 @@ pkg_setup() {
for i in {1..10}; do
# we list 'nixbld' twice to
# both assign a primary group for user
-   # and add an user to /etc/group
+   # and add a user to /etc/group
enewuser nixbld${i} -1 -1 /var/empty nixbld,nixbld
done
 }
@@ -101,8 +101,8 @@ src_install() {
 
readme.gentoo_create_doc
 
-   # here we an eager variant of something that
-   # is lazily done by  nix-daemo and root nix-env
+   # here we use an eager variant of something that
+   # is lazily done by nix-daemon and root nix-env
 
# TODO: will need a tweak for prefix
keepdir /nix/store

[gentoo-commits] repo/gentoo:master commit in: sys-apps/nix/

[Sergei Trofimovich]

commit: 33a6553f4e40ee52b6154a438f11ab495aabe514
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun May  7 11:19:05 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun May  7 11:21:48 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33a6553f

sys-apps/nix: drop old

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 sys-apps/nix/Manifest |   2 -
 sys-apps/nix/nix-1.11.6-r3.ebuild | 129 --
 sys-apps/nix/nix-1.11.8.ebuild| 129 --
 3 files changed, 260 deletions(-)

diff --git a/sys-apps/nix/Manifest b/sys-apps/nix/Manifest
index 72e08a2e364..21321f65d23 100644
--- a/sys-apps/nix/Manifest
+++ b/sys-apps/nix/Manifest
@@ -1,3 +1 @@
-DIST nix-1.11.6.tar.xz 621796 SHA256 
e729d55a9276756108a56bc1cbe2e182ee2e4be2b59b1c77d5f0e3edd879b2a3 SHA512 
a2d9eed52d6791e0649e3e456c8751ab3055573def110ffbf9645d2106313adf6c3868c0ecd69e5ba95c7a742c6fb92f69722adf7381584f7c2c4efe4b400d65
 WHIRLPOOL 
262ce049d9cf616aaa4d5bd612accee827f04b684d1ee36b3b63bfc2004fb9d1f19e1455196183fc259b81913d318acb519fa79271b4915369780efb8f02200b
-DIST nix-1.11.8.tar.xz 622744 SHA256 
69e0f398affec2a14c47b46fec712906429c85312d5483be43e4c34da4f63f67 SHA512 
4a5031625ab459c2fe99c7b4deb51f7c256d3ac04fde1b7a571880d9aa05716cd9269a6e4f2cf108fa187cfc84524a29fa7efa4881892fba757deba16f912048
 WHIRLPOOL 
cacc9f3557d1051b97045bbf80be92272fbec84b34d0609195495a1d71976e8ca5e57337254b88ee37aab4dcd0511045b9b2f0a8c9b746e0997f450b3f436c9c
 DIST nix-1.11.9.tar.xz 623020 SHA256 
0e943e277f37843f9196b0293cc31d828613ad7a328ee77cd5be01935dc6e7e1 SHA512 
1e557d61261f958f7fa94510e88c8d34c8ed7b237427a036cdc461aceff4eb34b8e0cdd859fa14c2e392f9094a489bfc663e3043df8bd22651aa42f809caba97
 WHIRLPOOL 
1bd56f99da5f7ea427c3afc0170f37aa4ffcb58d8f2c3fc4915e08c95f67745a4b7a0943116c1beae2f67155806c7a5c56deadaeaed7ff3ab17d7c59235df580

diff --git a/sys-apps/nix/nix-1.11.6-r3.ebuild 
b/sys-apps/nix/nix-1.11.6-r3.ebuild
deleted file mode 100644
index 726d3f1b8ad..000
--- a/sys-apps/nix/nix-1.11.6-r3.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic readme.gentoo-r1 user
-
-DESCRIPTION="A purely functional package manager"
-HOMEPAGE="https://nixos.org/nix;
-
-SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz;
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+etc_profile +gc doc sodium"
-
-RDEPEND="
-   app-arch/bzip2
-   app-arch/xz-utils
-   dev-db/sqlite
-   dev-libs/openssl:0=
-   net-misc/curl
-   sys-libs/zlib
-   gc? ( dev-libs/boehm-gc[cxx] )
-   doc? ( dev-libs/libxml2
-   dev-libs/libxslt
-   app-text/docbook-xsl-stylesheets
-   )
-   sodium? ( dev-libs/libsodium )
-   dev-lang/perl:=
-   dev-perl/DBD-SQLite
-   dev-perl/WWW-Curl
-   dev-perl/DBI
-"
-DEPEND="${RDEPEND}
-   >=sys-devel/bison-2.6
-   >=sys-devel/flex-2.5.35
-   virtual/perl-ExtUtils-ParseXS
-"
-
-PATCHES=(
-   "${FILESDIR}"/${P}-systemd.patch
-   "${FILESDIR}"/${P}-per-user.patch
-   "${FILESDIR}"/${P}-respect-CXXFLAGS.patch
-   "${FILESDIR}"/${P}-respect-LDFLAGS.patch
-)
-
-DISABLE_AUTOFORMATTING=yes
-DOC_CONTENTS=" Quick start user guide on Gentoo:
-
-[as root] enable nix-daemon service:
-   [systemd] # systemctl enable nix-daemon
-   [openrc]  # rc-update add nix-daemon
-[as an user] relogin to get environment and profile update
-[as an user] fetch nixpkgs update:
-   \$ nix-channel --update
-[as an user] install nix packages:
-   \$ nix-env -i mc
-[as an user] configure environment:
-   Somewhere in .bash_profile you might want to set
-   LOCALE_ARCHIVE=\$HOME/.nix-profile/lib/locale/locale-archive
-   but please read https://github.com/NixOS/nixpkgs/issues/21820
-
-Next steps:
-   nix package manager user manual: http://nixos.org/nix/manual/
-"
-
-pkg_setup() {
-   enewgroup nixbld
-   for i in {1..10}; do
-   # we list 'nixbld' twice to
-   # both assign a primary group for user
-   # and add an user to /etc/group
-   enewuser nixbld${i} -1 -1 /var/empty nixbld,nixbld
-   done
-}
-
-src_prepare() {
-   default
-
-   eautoreconf
-}
-
-src_configure() {
-   econf \
-   --localstatedir="${EPREFIX}"/nix/var \
-   $(use_enable gc)
-}
-
-src_compile() {
-   local make_vars=(
-   OPTIMIZE=0 # disable hardcoded -O3
-   V=1 # verbose build
-   )
-   emake "${make_vars[@]}"
-}
-
-src_install() {
-   # TODO: emacs highlighter
-   default
-
-   readme.gentoo_create_doc
-
-   # here we an eager variant of something that
-   # is lazily done by  nix-daemo and root nix-env
-
-   # TODO: will need a tweak for prefix
-   

[gentoo-commits] repo/gentoo:master commit in: sys-apps/nix/

[Sergei Trofimovich]

commit: c10e2e859c8cc839af691d217b9f7fc7d04205e2
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun May  7 11:18:41 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun May  7 11:21:48 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c10e2e85

sys-apps/nix: bump up to 1.11.9

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 sys-apps/nix/Manifest  |   1 +
 sys-apps/nix/nix-1.11.9.ebuild | 129 +
 2 files changed, 130 insertions(+)

diff --git a/sys-apps/nix/Manifest b/sys-apps/nix/Manifest
index 6808aa2c57a..72e08a2e364 100644
--- a/sys-apps/nix/Manifest
+++ b/sys-apps/nix/Manifest
@@ -1,2 +1,3 @@
 DIST nix-1.11.6.tar.xz 621796 SHA256 
e729d55a9276756108a56bc1cbe2e182ee2e4be2b59b1c77d5f0e3edd879b2a3 SHA512 
a2d9eed52d6791e0649e3e456c8751ab3055573def110ffbf9645d2106313adf6c3868c0ecd69e5ba95c7a742c6fb92f69722adf7381584f7c2c4efe4b400d65
 WHIRLPOOL 
262ce049d9cf616aaa4d5bd612accee827f04b684d1ee36b3b63bfc2004fb9d1f19e1455196183fc259b81913d318acb519fa79271b4915369780efb8f02200b
 DIST nix-1.11.8.tar.xz 622744 SHA256 
69e0f398affec2a14c47b46fec712906429c85312d5483be43e4c34da4f63f67 SHA512 
4a5031625ab459c2fe99c7b4deb51f7c256d3ac04fde1b7a571880d9aa05716cd9269a6e4f2cf108fa187cfc84524a29fa7efa4881892fba757deba16f912048
 WHIRLPOOL 
cacc9f3557d1051b97045bbf80be92272fbec84b34d0609195495a1d71976e8ca5e57337254b88ee37aab4dcd0511045b9b2f0a8c9b746e0997f450b3f436c9c
+DIST nix-1.11.9.tar.xz 623020 SHA256 
0e943e277f37843f9196b0293cc31d828613ad7a328ee77cd5be01935dc6e7e1 SHA512 
1e557d61261f958f7fa94510e88c8d34c8ed7b237427a036cdc461aceff4eb34b8e0cdd859fa14c2e392f9094a489bfc663e3043df8bd22651aa42f809caba97
 WHIRLPOOL 
1bd56f99da5f7ea427c3afc0170f37aa4ffcb58d8f2c3fc4915e08c95f67745a4b7a0943116c1beae2f67155806c7a5c56deadaeaed7ff3ab17d7c59235df580

diff --git a/sys-apps/nix/nix-1.11.9.ebuild b/sys-apps/nix/nix-1.11.9.ebuild
new file mode 100644
index 000..448c3372ce5
--- /dev/null
+++ b/sys-apps/nix/nix-1.11.9.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic readme.gentoo-r1 user
+
+DESCRIPTION="A purely functional package manager"
+HOMEPAGE="https://nixos.org/nix;
+
+SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz;
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+etc_profile +gc doc sodium"
+
+RDEPEND="
+   app-arch/bzip2
+   app-arch/xz-utils
+   dev-db/sqlite
+   dev-libs/openssl:0=
+   net-misc/curl
+   sys-libs/zlib
+   gc? ( dev-libs/boehm-gc[cxx] )
+   doc? ( dev-libs/libxml2
+   dev-libs/libxslt
+   app-text/docbook-xsl-stylesheets
+   )
+   sodium? ( dev-libs/libsodium )
+   dev-lang/perl:=
+   dev-perl/DBD-SQLite
+   dev-perl/WWW-Curl
+   dev-perl/DBI
+"
+DEPEND="${RDEPEND}
+   >=sys-devel/bison-2.6
+   >=sys-devel/flex-2.5.35
+   virtual/perl-ExtUtils-ParseXS
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.11.6-systemd.patch
+   "${FILESDIR}"/${PN}-1.11.6-per-user.patch
+   "${FILESDIR}"/${PN}-1.11.6-respect-CXXFLAGS.patch
+   "${FILESDIR}"/${PN}-1.11.6-respect-LDFLAGS.patch
+)
+
+DISABLE_AUTOFORMATTING=yes
+DOC_CONTENTS=" Quick start user guide on Gentoo:
+
+[as root] enable nix-daemon service:
+   [systemd] # systemctl enable nix-daemon
+   [openrc]  # rc-update add nix-daemon
+[as an user] relogin to get environment and profile update
+[as an user] fetch nixpkgs update:
+   \$ nix-channel --update
+[as an user] install nix packages:
+   \$ nix-env -i mc
+[as an user] configure environment:
+   Somewhere in .bash_profile you might want to set
+   LOCALE_ARCHIVE=\$HOME/.nix-profile/lib/locale/locale-archive
+   but please read https://github.com/NixOS/nixpkgs/issues/21820
+
+Next steps:
+   nix package manager user manual: http://nixos.org/nix/manual/
+"
+
+pkg_setup() {
+   enewgroup nixbld
+   for i in {1..10}; do
+   # we list 'nixbld' twice to
+   # both assign a primary group for user
+   # and add an user to /etc/group
+   enewuser nixbld${i} -1 -1 /var/empty nixbld,nixbld
+   done
+}
+
+src_prepare() {
+   default
+
+   eautoreconf
+}
+
+src_configure() {
+   econf \
+   --localstatedir="${EPREFIX}"/nix/var \
+   $(use_enable gc)
+}
+
+src_compile() {
+   local make_vars=(
+   OPTIMIZE=0 # disable hardcoded -O3
+   V=1 # verbose build
+   )
+   emake "${make_vars[@]}"
+}
+
+src_install() {
+   # TODO: emacs highlighter
+   default
+
+   readme.gentoo_create_doc
+
+   # here we an eager variant of something that
+   # is lazily done by  nix-daemo and root nix-env
+
+   # TODO: will need a tweak for prefix
+   keepdir /nix/store
+   fowners 

[gentoo-commits] repo/gentoo:master commit in: sys-apps/nix/

[Sergei Trofimovich]

commit: 7238318a7995790e1885780508527caff8125eda
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Apr 17 17:23:10 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Apr 17 17:37:52 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7238318a

sys-apps/nix: bump up to 1.11.8

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 sys-apps/nix/Manifest  |   1 +
 sys-apps/nix/nix-1.11.8.ebuild | 129 +
 2 files changed, 130 insertions(+)

diff --git a/sys-apps/nix/Manifest b/sys-apps/nix/Manifest
index 19f29d8ec52..6808aa2c57a 100644
--- a/sys-apps/nix/Manifest
+++ b/sys-apps/nix/Manifest
@@ -1 +1,2 @@
 DIST nix-1.11.6.tar.xz 621796 SHA256 
e729d55a9276756108a56bc1cbe2e182ee2e4be2b59b1c77d5f0e3edd879b2a3 SHA512 
a2d9eed52d6791e0649e3e456c8751ab3055573def110ffbf9645d2106313adf6c3868c0ecd69e5ba95c7a742c6fb92f69722adf7381584f7c2c4efe4b400d65
 WHIRLPOOL 
262ce049d9cf616aaa4d5bd612accee827f04b684d1ee36b3b63bfc2004fb9d1f19e1455196183fc259b81913d318acb519fa79271b4915369780efb8f02200b
+DIST nix-1.11.8.tar.xz 622744 SHA256 
69e0f398affec2a14c47b46fec712906429c85312d5483be43e4c34da4f63f67 SHA512 
4a5031625ab459c2fe99c7b4deb51f7c256d3ac04fde1b7a571880d9aa05716cd9269a6e4f2cf108fa187cfc84524a29fa7efa4881892fba757deba16f912048
 WHIRLPOOL 
cacc9f3557d1051b97045bbf80be92272fbec84b34d0609195495a1d71976e8ca5e57337254b88ee37aab4dcd0511045b9b2f0a8c9b746e0997f450b3f436c9c

diff --git a/sys-apps/nix/nix-1.11.8.ebuild b/sys-apps/nix/nix-1.11.8.ebuild
new file mode 100644
index 000..448c3372ce5
--- /dev/null
+++ b/sys-apps/nix/nix-1.11.8.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic readme.gentoo-r1 user
+
+DESCRIPTION="A purely functional package manager"
+HOMEPAGE="https://nixos.org/nix;
+
+SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz;
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+etc_profile +gc doc sodium"
+
+RDEPEND="
+   app-arch/bzip2
+   app-arch/xz-utils
+   dev-db/sqlite
+   dev-libs/openssl:0=
+   net-misc/curl
+   sys-libs/zlib
+   gc? ( dev-libs/boehm-gc[cxx] )
+   doc? ( dev-libs/libxml2
+   dev-libs/libxslt
+   app-text/docbook-xsl-stylesheets
+   )
+   sodium? ( dev-libs/libsodium )
+   dev-lang/perl:=
+   dev-perl/DBD-SQLite
+   dev-perl/WWW-Curl
+   dev-perl/DBI
+"
+DEPEND="${RDEPEND}
+   >=sys-devel/bison-2.6
+   >=sys-devel/flex-2.5.35
+   virtual/perl-ExtUtils-ParseXS
+"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-1.11.6-systemd.patch
+   "${FILESDIR}"/${PN}-1.11.6-per-user.patch
+   "${FILESDIR}"/${PN}-1.11.6-respect-CXXFLAGS.patch
+   "${FILESDIR}"/${PN}-1.11.6-respect-LDFLAGS.patch
+)
+
+DISABLE_AUTOFORMATTING=yes
+DOC_CONTENTS=" Quick start user guide on Gentoo:
+
+[as root] enable nix-daemon service:
+   [systemd] # systemctl enable nix-daemon
+   [openrc]  # rc-update add nix-daemon
+[as an user] relogin to get environment and profile update
+[as an user] fetch nixpkgs update:
+   \$ nix-channel --update
+[as an user] install nix packages:
+   \$ nix-env -i mc
+[as an user] configure environment:
+   Somewhere in .bash_profile you might want to set
+   LOCALE_ARCHIVE=\$HOME/.nix-profile/lib/locale/locale-archive
+   but please read https://github.com/NixOS/nixpkgs/issues/21820
+
+Next steps:
+   nix package manager user manual: http://nixos.org/nix/manual/
+"
+
+pkg_setup() {
+   enewgroup nixbld
+   for i in {1..10}; do
+   # we list 'nixbld' twice to
+   # both assign a primary group for user
+   # and add an user to /etc/group
+   enewuser nixbld${i} -1 -1 /var/empty nixbld,nixbld
+   done
+}
+
+src_prepare() {
+   default
+
+   eautoreconf
+}
+
+src_configure() {
+   econf \
+   --localstatedir="${EPREFIX}"/nix/var \
+   $(use_enable gc)
+}
+
+src_compile() {
+   local make_vars=(
+   OPTIMIZE=0 # disable hardcoded -O3
+   V=1 # verbose build
+   )
+   emake "${make_vars[@]}"
+}
+
+src_install() {
+   # TODO: emacs highlighter
+   default
+
+   readme.gentoo_create_doc
+
+   # here we an eager variant of something that
+   # is lazily done by  nix-daemo and root nix-env
+
+   # TODO: will need a tweak for prefix
+   keepdir /nix/store
+   fowners root:nixbld /nix/store
+   fperms 1775 /nix/store
+
+   keepdir /nix/var/nix/profiles/per-user
+   fperms 1777 /nix/var/nix/profiles/per-user
+
+   doenvd "${FILESDIR}"/60nix-remote-daemon
+   newinitd "${FILESDIR}"/nix-daemon.initd nix-daemon
+
+   if ! use etc_profile; then
+   rm "${ED}"/etc/profile.d/nix.sh || die
+   fi

[gentoo-commits] repo/gentoo:master commit in: sys-apps/nix/

[Sergei Trofimovich]

commit: f22aca4bb7c1243701c230bbc750d6618f273517
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Thu Feb  2 21:18:26 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Feb  2 21:18:26 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f22aca4b

sys-apps/nix: drop haskell  g.o maintainer

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sys-apps/nix/metadata.xml | 4 
 1 file changed, 4 deletions(-)

diff --git a/sys-apps/nix/metadata.xml b/sys-apps/nix/metadata.xml
index 3317f9f..ad64c7e 100644
--- a/sys-apps/nix/metadata.xml
+++ b/sys-apps/nix/metadata.xml
@@ -5,10 +5,6 @@
sly...@gentoo.org
Sergei Trofimovich

-   
-   hask...@gentoo.org
-   Gentoo Haskell
-   

Install /etc/profile.d/ entry to 
inject nix support for all users.
Enable garbage collection in the Nix expression 
evaluator (use dev-libs/boehm-gc).

[gentoo-commits] repo/gentoo:master commit in: sys-apps/nix/

[Sergei Trofimovich]

commit: 5050debfedd9ef939113ab1c2e3f0de3be6e15c0
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Wed Feb  1 22:10:46 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed Feb  1 22:18:16 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5050debf

sys-apps/nix: don't hardcode UID/GID for nix internal groups

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sys-apps/nix/nix-1.11.6-r1.ebuild  | 114 -
 .../{nix-1.11.6-r2.ebuild => nix-1.11.6-r3.ebuild} |   4 +-
 2 files changed, 2 insertions(+), 116 deletions(-)

diff --git a/sys-apps/nix/nix-1.11.6-r1.ebuild 
b/sys-apps/nix/nix-1.11.6-r1.ebuild
deleted file mode 100644
index 4553ec6..
--- a/sys-apps/nix/nix-1.11.6-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit readme.gentoo-r1 user
-
-DESCRIPTION="A purely functional package manager"
-HOMEPAGE="https://nixos.org/nix;
-
-SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz;
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+etc_profile +gc doc sodium"
-
-RDEPEND="
-   app-arch/bzip2
-   app-arch/xz-utils
-   dev-db/sqlite
-   dev-libs/openssl:0=
-   net-misc/curl
-   sys-libs/zlib
-   gc? ( dev-libs/boehm-gc )
-   doc? ( dev-libs/libxml2
-   dev-libs/libxslt
-   app-text/docbook-xsl-stylesheets
-   )
-   sodium? ( dev-libs/libsodium )
-   dev-lang/perl:=
-   dev-perl/DBD-SQLite
-   dev-perl/WWW-Curl
-   dev-perl/DBI
-"
-DEPEND="${RDEPEND}
-   >=sys-devel/bison-2.6
-   >=sys-devel/flex-2.5.35
-   virtual/perl-ExtUtils-ParseXS
-"
-
-PATCHES=(
-   "${FILESDIR}"/${P}-systemd.patch
-   "${FILESDIR}"/${P}-per-user.patch
-)
-
-DISABLE_AUTOFORMATTING=yes
-DOC_CONTENTS=" Quick start user guide on Gentoo:
-
-[as root] enable nix-daemon service:
-   [systemd] # systemctl enable nix-daemon
-   [openrc]  # rc-update add nix-daemon
-[as an user] relogin to get environment and profile update
-[as an user] fetch nixpkgs update:
-   \$ nix-channel --update
-[as an user] install nix packages:
-   \$ nix-env -i mc
-[as an user] configure environment:
-   Somewhere in .bash_profile you might want to set
-   LOCALE_ARCHIVE=\$HOME/.nix-profile/lib/locale/locale-archive
-   but please read https://github.com/NixOS/nixpkgs/issues/21820
-
-Next steps:
-   nix package manager user manual: http://nixos.org/nix/manual/
-"
-
-pkg_setup() {
-   enewgroup nixbld 3
-   for i in {1..10}; do
-   # we list 'nixbld' twice to
-   # both assign a primary group for user
-   # and add an user to /etc/group
-   enewuser nixbld${i} $((3 +$i)) -1 /var/empty nixbld,nixbld
-   done
-}
-
-src_configure() {
-   econf \
-   --localstatedir="${EPREFIX}"/nix/var \
-   $(use_enable gc)
-}
-
-src_install() {
-   # TODO: emacs highlighter
-   default
-
-   readme.gentoo_create_doc
-
-   # here we an eager variant of something that
-   # is lazily done by  nix-daemo and root nix-env
-
-   # TODO: will need a tweak for prefix
-   keepdir /nix/store
-   fowners root:nixbld /nix/store
-   fperms 1775 /nix/store
-
-   keepdir /nix/var/nix/profiles/per-user
-   fperms 1777 /nix/var/nix/profiles/per-user
-
-   doenvd "${FILESDIR}"/60nix-remote-daemon
-   newinitd "${FILESDIR}"/nix-daemon.initd nix-daemon
-
-   if ! use etc_profile; then
-   rm "${ED}"/etc/profile.d/nix.sh || die
-   fi
-}
-
-pkg_postinst() {
-   if ! use etc_profile; then
-   ewarn "${EROOT}etc/profile.d/nix.sh was removed (due to 
USE=-etc_profile)."
-   fi
-
-   readme.gentoo_print_elog
-}

diff --git a/sys-apps/nix/nix-1.11.6-r2.ebuild 
b/sys-apps/nix/nix-1.11.6-r3.ebuild
similarity index 96%
rename from sys-apps/nix/nix-1.11.6-r2.ebuild
rename to sys-apps/nix/nix-1.11.6-r3.ebuild
index c9c976b..d7eec9b 100644
--- a/sys-apps/nix/nix-1.11.6-r2.ebuild
+++ b/sys-apps/nix/nix-1.11.6-r3.ebuild
@@ -67,12 +67,12 @@ Next steps:
 "
 
 pkg_setup() {
-   enewgroup nixbld 3
+   enewgroup nixbld
for i in {1..10}; do
# we list 'nixbld' twice to
# both assign a primary group for user
# and add an user to /etc/group
-   enewuser nixbld${i} $((3 +$i)) -1 /var/empty nixbld,nixbld
+   enewuser nixbld${i} -1 -1 /var/empty nixbld,nixbld
done
 }
 

[gentoo-commits] repo/gentoo:master commit in: sys-apps/nix/files/, sys-apps/nix/

[Sergei Trofimovich]

commit: fe992f877f5bc3bee3033b693a6f5a8601d423ca
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon Jan 23 21:24:03 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Jan 23 21:24:03 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe992f87

sys-apps/nix: respect CFLAGS/CXXFLAGS/LDFLAGS, require boehm-gx[cxx]

Thanks to wiselord on freenode/#haskell-by who
noticed missing boehm-gx[cxx] DEPEND.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 .../nix/files/nix-1.11.6-respect-CXXFLAGS.patch|   9 ++
 .../nix/files/nix-1.11.6-respect-LDFLAGS.patch |  36 ++
 sys-apps/nix/nix-1.11.6-r2.ebuild  | 130 +
 3 files changed, 175 insertions(+)

diff --git a/sys-apps/nix/files/nix-1.11.6-respect-CXXFLAGS.patch 
b/sys-apps/nix/files/nix-1.11.6-respect-CXXFLAGS.patch
new file mode 100644
index ..091fdca
--- /dev/null
+++ b/sys-apps/nix/files/nix-1.11.6-respect-CXXFLAGS.patch
@@ -0,0 +1,9 @@
+diff --git a/configure.ac b/configure.ac
+index 3a24053..1b99702 100644
+--- a/configure.ac
 b/configure.ac
+@@ -57,4 +57,2 @@ fi
+ 
+-CFLAGS=
+-CXXFLAGS=
+ AC_PROG_CC

diff --git a/sys-apps/nix/files/nix-1.11.6-respect-LDFLAGS.patch 
b/sys-apps/nix/files/nix-1.11.6-respect-LDFLAGS.patch
new file mode 100644
index ..12c094e
--- /dev/null
+++ b/sys-apps/nix/files/nix-1.11.6-respect-LDFLAGS.patch
@@ -0,0 +1,36 @@
+diff --git a/Makefile.config.in b/Makefile.config.in
+index f0de4da..c82fbfd 100644
+--- a/Makefile.config.in
 b/Makefile.config.in
+@@ -5,2 +5,3 @@ CXX = @CXX@
+ CXXFLAGS = @CXXFLAGS@
++LDFLAGS = @LDFLAGS@
+ HAVE_SODIUM = @HAVE_SODIUM@
+diff --git a/mk/libraries.mk b/mk/libraries.mk
+index 3cd7a53..f7bd015 100644
+--- a/mk/libraries.mk
 b/mk/libraries.mk
+@@ -88,3 +88,3 @@ define build-library
+ $$($(1)_PATH): $$($(1)_OBJS) $$(_libs) | $$(_d)/
+-  $$(trace-ld) $(CXX) -o $$(abspath $$@) -shared $$(GLOBAL_LDFLAGS) 
$$($(1)_OBJS) $$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) $$(foreach lib, 
$$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE)) $$($(1)_LDFLAGS_UNINSTALLED)
++  $$(trace-ld) $(CXX) -o $$(abspath $$@) -shared $$(LDFLAGS) 
$$(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) 
$$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE)) 
$$($(1)_LDFLAGS_UNINSTALLED)
+ 
+@@ -102,3 +102,3 @@ define build-library
+ $$($(1)_INSTALL_PATH): $$($(1)_OBJS) $$(_libs_final) | 
$(DESTDIR)$$($(1)_INSTALL_DIR)/
+-  $$(trace-ld) $(CXX) -o $$@ -shared $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) 
$$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) $$(foreach lib, $$($(1)_LIBS), 
$$($$(lib)_LDFLAGS_USE_INSTALLED))
++  $$(trace-ld) $(CXX) -o $$@ -shared $$(LDFLAGS) $$(GLOBAL_LDFLAGS) 
$$($(1)_OBJS) $$($(1)_LDFLAGS) $$($(1)_LDFLAGS_PROPAGATED) $$(foreach lib, 
$$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED))
+ 
+diff --git a/mk/programs.mk b/mk/programs.mk
+index 3ac6449..f553ce2 100644
+--- a/mk/programs.mk
 b/mk/programs.mk
+@@ -34,3 +34,3 @@ define build-program
+   $$($(1)_PATH): $$($(1)_OBJS) $$(_libs) | $$(_d)/
+-  $$(trace-ld) $(CXX) -o $$@ $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) 
$$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE))
++  $$(trace-ld) $(CXX) -o $$@ $$(LDFLAGS) $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) 
$$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE))
+ 
+@@ -48,3 +48,3 @@ define build-program
+ $(DESTDIR)$$($(1)_INSTALL_PATH): $$($(1)_OBJS) $$(_libs_final) | 
$(DESTDIR)$$($(1)_INSTALL_DIR)/
+-  $$(trace-ld) $(CXX) -o $$@ $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) 
$$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), 
$$($$(lib)_LDFLAGS_USE_INSTALLED))
++  $$(trace-ld) $(CXX) -o $$@ $$(LDFLAGS) $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) 
$$($(1)_LDFLAGS) $$(foreach lib, $$($(1)_LIBS), 
$$($$(lib)_LDFLAGS_USE_INSTALLED))
+ 

diff --git a/sys-apps/nix/nix-1.11.6-r2.ebuild 
b/sys-apps/nix/nix-1.11.6-r2.ebuild
new file mode 100644
index ..c9c976b
--- /dev/null
+++ b/sys-apps/nix/nix-1.11.6-r2.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools flag-o-matic readme.gentoo-r1 user
+
+DESCRIPTION="A purely functional package manager"
+HOMEPAGE="https://nixos.org/nix;
+
+SRC_URI="http://nixos.org/releases/${PN}/${P}/${P}.tar.xz;
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+etc_profile +gc doc sodium"
+
+RDEPEND="
+   app-arch/bzip2
+   app-arch/xz-utils
+   dev-db/sqlite
+   dev-libs/openssl:0=
+   net-misc/curl
+   sys-libs/zlib
+   gc? ( dev-libs/boehm-gc[cxx] )
+   doc? ( dev-libs/libxml2
+   dev-libs/libxslt
+   app-text/docbook-xsl-stylesheets
+   )
+   sodium? ( dev-libs/libsodium )
+   dev-lang/perl:=
+   dev-perl/DBD-SQLite
+   dev-perl/WWW-Curl
+   dev-perl/DBI
+"
+DEPEND="${RDEPEND}
+   >=sys-devel/bison-2.6
+ 

[gentoo-commits] repo/gentoo:master commit in: sys-apps/nix/files/, sys-apps/nix/

[Sergei Trofimovich]

commit: ed44e589ea8f02bfaec53fa41c61c60e2e3785a9
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Tue Jan 17 11:37:12 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue Jan 17 11:37:30 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed44e589

sys-apps/nix: new package, The Purely Functional Package Manager

Nix is a source-based package manager with strong support for
binary packages. It uses multiple tricks to make package
source dependencies robust:

- nix installs every package into it's own --prefix=.
  Example: /nix/store/xsqz79bzclgrgnnlffp3qa0g4wnbcrp1-firefox-50.1.0
- nix builds packages with PATH (and similar) only including explicitly
  listed depends. This eliminates automagic dependency.
- nix tracks full environment where package was built.
  Once environment changes new package needs to be built.

That's how you install firefox just for your current user:

$ nix-env -iA nixpkgs.firefox

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 sys-apps/nix/Manifest|   1 +
 sys-apps/nix/files/60nix-remote-daemon   |   1 +
 sys-apps/nix/files/nix-1.11.6-per-user.patch |  11 +++
 sys-apps/nix/files/nix-1.11.6-systemd.patch  |  10 +++
 sys-apps/nix/files/nix-daemon.initd  |  16 
 sys-apps/nix/metadata.xml|  17 
 sys-apps/nix/nix-1.11.6-r1.ebuild| 114 +++
 7 files changed, 170 insertions(+)

diff --git a/sys-apps/nix/Manifest b/sys-apps/nix/Manifest
new file mode 100644
index ..19f29d8
--- /dev/null
+++ b/sys-apps/nix/Manifest
@@ -0,0 +1 @@
+DIST nix-1.11.6.tar.xz 621796 SHA256 
e729d55a9276756108a56bc1cbe2e182ee2e4be2b59b1c77d5f0e3edd879b2a3 SHA512 
a2d9eed52d6791e0649e3e456c8751ab3055573def110ffbf9645d2106313adf6c3868c0ecd69e5ba95c7a742c6fb92f69722adf7381584f7c2c4efe4b400d65
 WHIRLPOOL 
262ce049d9cf616aaa4d5bd612accee827f04b684d1ee36b3b63bfc2004fb9d1f19e1455196183fc259b81913d318acb519fa79271b4915369780efb8f02200b

diff --git a/sys-apps/nix/files/60nix-remote-daemon 
b/sys-apps/nix/files/60nix-remote-daemon
new file mode 100644
index ..626058a
--- /dev/null
+++ b/sys-apps/nix/files/60nix-remote-daemon
@@ -0,0 +1 @@
+NIX_REMOTE="daemon"

diff --git a/sys-apps/nix/files/nix-1.11.6-per-user.patch 
b/sys-apps/nix/files/nix-1.11.6-per-user.patch
new file mode 100644
index ..9cea685
--- /dev/null
+++ b/sys-apps/nix/files/nix-1.11.6-per-user.patch
@@ -0,0 +1,11 @@
+By default created symlink poins to a directory not accessible by user.
+Make a symlink the same way NixOS does symlinking.
+diff --git a/scripts/nix-profile.sh.in b/scripts/nix-profile.sh.in
+index 672d1f0..e3b0978 100644
+--- a/scripts/nix-profile.sh.in
 b/scripts/nix-profile.sh.in
+@@ -6,3 +6,3 @@ if [ -n "$HOME" ]; then
+ echo "creating $NIX_LINK" >&2
+-_NIX_DEF_LINK=@localstatedir@/nix/profiles/default
++_NIX_DEF_LINK=@localstatedir@/nix/profiles/per-user/$USER/profile
+ @coreutils@/ln -s "$_NIX_DEF_LINK" "$NIX_LINK"

diff --git a/sys-apps/nix/files/nix-1.11.6-systemd.patch 
b/sys-apps/nix/files/nix-1.11.6-systemd.patch
new file mode 100644
index ..f890ee6
--- /dev/null
+++ b/sys-apps/nix/files/nix-1.11.6-systemd.patch
@@ -0,0 +1,10 @@
+Make 'nix-daemon' a goof unit for 'systemctl enable nix-daemon.service'.
+diff --git a/misc/systemd/nix-daemon.service.in 
b/misc/systemd/nix-daemon.service.in
+index 5fc04a3..2565520 100644
+--- a/misc/systemd/nix-daemon.service.in
 b/misc/systemd/nix-daemon.service.in
+@@ -9 +9,4 @@ ExecStart=@@bindir@/nix-daemon nix-daemon --daemon
+ KillMode=process
++
++[Install]
++WantedBy=multi-user.target

diff --git a/sys-apps/nix/files/nix-daemon.initd 
b/sys-apps/nix/files/nix-daemon.initd
new file mode 100644
index ..1a384bd
--- /dev/null
+++ b/sys-apps/nix/files/nix-daemon.initd
@@ -0,0 +1,16 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+start() {
+   ebegin "Starting ${SVCNAME}"
+   start-stop-daemon --start --quiet --background --exec 
/usr/bin/nix-daemon
+   eend ${?}
+}
+
+stop() {
+   ebegin "Stopping ${SVCNAME}"
+   start-stop-daemon --stop --quiet --exec /usr/bin/nix-daemon
+   eend ${?}
+}

diff --git a/sys-apps/nix/metadata.xml b/sys-apps/nix/metadata.xml
new file mode 100644
index ..3317f9f
--- /dev/null
+++ b/sys-apps/nix/metadata.xml
@@ -0,0 +1,17 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   sly...@gentoo.org
+   Sergei Trofimovich
+   
+   
+   hask...@gentoo.org
+   Gentoo Haskell
+   
+   
+   Install /etc/profile.d/ entry to 
inject nix support for all users.
+   Enable garbage collection in the Nix expression 
evaluator (use dev-libs/boehm-gc).
+   Use dev-libs/libsodium for 
cryptography
+   
+

diff --git