commit:     a4eac509af375f8c67e219415b3281c3a457678f
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 22 22:12:06 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Thu Feb 22 22:53:10 2018 +0000
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 00000000000..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 00000000000..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: 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
+       fperms 0777         /nix/var/nix/channel-cache
+
+       keepdir             /nix/var/nix/profiles/per-user
+       fperms 1777         /nix/var/nix/profiles/per-user
+
+       # 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
+}
+
+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
+}

Reply via email to