diff options
Diffstat (limited to 'sys-apps/nix')
-rw-r--r-- | sys-apps/nix/Manifest | 5 | ||||
-rw-r--r-- | sys-apps/nix/files/nix-1.11.6-systemd.patch | 2 | ||||
-rw-r--r-- | sys-apps/nix/files/nix-2.0-user-path.patch | 10 | ||||
-rw-r--r-- | sys-apps/nix/nix-2.0.ebuild | 133 |
4 files changed, 148 insertions, 2 deletions
diff --git a/sys-apps/nix/Manifest b/sys-apps/nix/Manifest index e05923da612e..849b869179e9 100644 --- a/sys-apps/nix/Manifest +++ b/sys-apps/nix/Manifest @@ -1,10 +1,13 @@ AUX nix-1.11.6-per-user.patch 554 BLAKE2B c56fcbc5154a315cdb87827a4f0aaa2991903f149608ef5168e2b26932802a9d466e41ee673ffbaf23d3ccd0292fce6a8a3d5fe91d4c4aa891cd8a750725ac17 SHA512 ffc6b03ba9fa8a56cdb40caa271582b8648f9539d8abc69251d16356efa64c93902648bae29d06af938383dbf3be110fdaebbbd4af4635c112bb34d1077cb56a AUX nix-1.11.6-respect-CXXFLAGS.patch 164 BLAKE2B ff171c369d1628d530e49520d1655dcc5ad9e342618f9c79dc1feccd1caae594fec82a5ec50a000d0ae57236c8d6bd5fde4baf45f3bdf48f717599b987fd3d6b SHA512 2508d26888050bb4099f1654cee91d44405b00ca4dfdd6c1b1cf0f24e004333b106cc461b306404b1d56f41bb928ed1069536c09f9390b5ba287ca70b9bcb0c6 AUX nix-1.11.6-respect-LDFLAGS.patch 2332 BLAKE2B 83382d89c3ca40404460629f42dcdf447dce57677e1fbe7d4abc40a506397c3962fbbdb38e0e01342380115d011ace02cb10f97219a7ccd3cb92da993a79fc25 SHA512 aefc9b045794038b6513211ecaf18c469b7aa52110fcaa5168a1ca9f9af9b663aa6e90fe27c3c500bf9adc2714a8f73fc5243f3096fabe6bbb7e855e0ae7aa87 -AUX nix-1.11.6-systemd.patch 394 BLAKE2B 9ea08e8edf9833354d33d8f857d0def1f062d3ae4f9baeda03802f4b8c7c99d6a07002137d6674c72eed0337b35be354af83b03a4ee5fff36d2fbb62f5647b3f SHA512 a5f39652c7fd829f11e75b1e3640a218129cac8a47c15a34b0390f51234fda45b7841e43ec6ed441803405483750ee6b82e7c3f918d22222d1e08a79e359c5dd +AUX nix-1.11.6-systemd.patch 394 BLAKE2B 144b5e2c4f55077bb0c722ff71bf0a587f20858c27fe4a3bb9cd44bec159a30122382b7fff3b998478aaa4f93519247708926a6369f9ac2fa1a3d43cc5808a38 SHA512 2c5a701815e1c3091c5568b01d6709a9a227c18967a7c0eff7676f741c87f5082a49842427022991656cac079734741820bb8a895679a65cce657a29df86ddcd +AUX nix-2.0-user-path.patch 390 BLAKE2B 08118fb6664ffe96bccd68596e7aa26fe895a9285d1dabdfe06cfa55c8ab578160f940537cc9ed7ba7ef408d167f23cc914127313bed992baac747f49a9dd054 SHA512 3eab6ae522767bd8c1f2adf6a00544f7fecb698dedff68835a880a7ac533dd4e188661a955f111769525828d761612c49669a36ccf25f16bab6d325313da3232 AUX nix-daemon.initd 369 BLAKE2B bae15823ecd559733ebc8bd6f88314d93dccdf586dafe785ae58ed46949d1329c9bb7da93dc2918e2c0ccd3aacb50e3fdb380c019c85fb09f86575d9c80ce116 SHA512 e5a05a9f5efb179ebf3a98e58435a571e87716166a351045be4cbd19423e426cf11ed9b2eb2df6222d00e43e5d38fbed5da579820f776031e3c70de0206f980d 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 EBUILD nix-1.11.15.ebuild 3097 BLAKE2B ae4fa60ed9ec5100beaa8f5f26cb4f269976f3e9503f1125c8ee4b9900631a8e433b23a543648de0b9229b315c57404ef98c892bb0fd5f2fe4ca88c76f29ff06 SHA512 e7f826e5b8fec2d6ce824981e422a2828a08cb8c4d1ccacfc0d1807e72e3ec7ec6a0b7f2d4b2dba8aa7aaf5c0856261899e52ecce1769d62732bc28be0791498 EBUILD nix-1.11.16.ebuild 3097 BLAKE2B ae4fa60ed9ec5100beaa8f5f26cb4f269976f3e9503f1125c8ee4b9900631a8e433b23a543648de0b9229b315c57404ef98c892bb0fd5f2fe4ca88c76f29ff06 SHA512 e7f826e5b8fec2d6ce824981e422a2828a08cb8c4d1ccacfc0d1807e72e3ec7ec6a0b7f2d4b2dba8aa7aaf5c0856261899e52ecce1769d62732bc28be0791498 +EBUILD nix-2.0.ebuild 3110 BLAKE2B d7930a0e21775cb2d531621f4ce6dbc52a2b7d4a437506bedd19bf34694bed08c99aec4e36b017af283bdf5c3069b757b68a9b45549d3fc42beec59c29aa79de SHA512 234a27599be84a79a035c1c9a7633ba85c36f44e4fd53f104d981bc4795f8ff59de68768e21b722735c760e2a8bbb9714d562a2d13c8be4a0014b4c819ef9d48 MISC metadata.xml 566 BLAKE2B 3891567411993e2864f7e0d6fd158937c0c7075ca92aef2413d28e0aa18e6d51982383d3ee71ab6b926ba6a397c59c3ef84f4a4b7cdd4f103f4256f4693f0cf0 SHA512 93d33392316264e30403abbf79a0bf836ed35f2eaf802f930743cb9f31955f939ac263946b93ee32bba34d2534329d95476e96816d1893747b077b0d9690281c 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 f890ee6f0470..5a77d7c77e5c 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 000000000000..486a05bb5959 --- /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 000000000000..bea6bd1a4240 --- /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 +} |