diff options
Diffstat (limited to 'sys-apps/nix')
-rw-r--r-- | sys-apps/nix/Manifest | 8 | ||||
-rw-r--r-- | sys-apps/nix/nix-2.0.2.ebuild | 133 | ||||
-rw-r--r-- | sys-apps/nix/nix-2.1.3.ebuild | 3 | ||||
-rw-r--r-- | sys-apps/nix/nix-2.2.1-r1.ebuild | 144 | ||||
-rw-r--r-- | sys-apps/nix/nix-2.2.2.ebuild | 3 |
5 files changed, 4 insertions, 287 deletions
diff --git a/sys-apps/nix/Manifest b/sys-apps/nix/Manifest index 3e68c6456859..7b3df60e39bc 100644 --- a/sys-apps/nix/Manifest +++ b/sys-apps/nix/Manifest @@ -4,14 +4,10 @@ AUX nix-1.11.6-systemd.patch 394 BLAKE2B 144b5e2c4f55077bb0c722ff71bf0a587f20858 AUX nix-2.0-user-path.patch 390 BLAKE2B 08118fb6664ffe96bccd68596e7aa26fe895a9285d1dabdfe06cfa55c8ab578160f940537cc9ed7ba7ef408d167f23cc914127313bed992baac747f49a9dd054 SHA512 3eab6ae522767bd8c1f2adf6a00544f7fecb698dedff68835a880a7ac533dd4e188661a955f111769525828d761612c49669a36ccf25f16bab6d325313da3232 AUX nix-2.0.4-bdwgc-8.patch 421 BLAKE2B 2aafeee37b282d890dfd54dc958f708bb09e86d50904ea71be9b02b88d05075076f4406d77c0b566b67ecc98c53a445726eb0f14834e7cebabf21544ff194e8f SHA512 04166538207f644b1ceb552b58742dcfa36ed759792a1e5f5d6c2acb31c089b88e406ce1a063288a00988cffb6790fe000cfa00ddd6aaf5d48d515893e41676f AUX nix-daemon.initd 369 BLAKE2B bae15823ecd559733ebc8bd6f88314d93dccdf586dafe785ae58ed46949d1329c9bb7da93dc2918e2c0ccd3aacb50e3fdb380c019c85fb09f86575d9c80ce116 SHA512 e5a05a9f5efb179ebf3a98e58435a571e87716166a351045be4cbd19423e426cf11ed9b2eb2df6222d00e43e5d38fbed5da579820f776031e3c70de0206f980d -DIST nix-2.0.2.tar.xz 796404 BLAKE2B 0906488bf2c800544c0747a6860ef51f667467f50039f725cf6ec05b8389462fe073bddceba106922a7611fd784b58ed5ca321efba0065b0f424aa53d7620990 SHA512 605e2c6dbc814470c25aa4f0aca77bfd11fd6d5c263ef38915cb9b852e77bcff08d515e76de8d929c9eacd02ffeaa5dd5f6b337461d54a1b2648b1fc505c98fa DIST nix-2.0.4.tar.xz 798352 BLAKE2B 0eaf7e507c87e5398ab5967e1f2064a5827038bb84208768aa1c1deadc95e44aab922846b728467e3355d1f25e740590c3d1748ec05dfeae6a171952fd941b77 SHA512 bce3b3a14269d42648a4935770260c36dab25fde3ebcfed730063d1d139603468e1c30acf15eb0cffff617fa36a6b39d4ae31ccfd9cba762f631ecac213fd09a 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 -EBUILD nix-2.0.2.ebuild 3108 BLAKE2B c851572277ed003beff435f4b7f39307f3cbf59c8f25bb321e8b1b373394dd860161bd10545c8de601db26fad4267722b4b6736b5cd461034373a53ef2a36f94 SHA512 04da6f828e118fee9e0c9fdbb4567c60d44a0025c02390812ecf8784d8d5167038e5298f1bd5a4358dda8c8a0c75049d17b8b4615c8e71bfe0ed22bed3c4d929 EBUILD nix-2.0.4.ebuild 3330 BLAKE2B 908f86afd6e5518fa58f03bb7a6c787d2c9b5710cffe347f82f4a312b0f9ac5f208eb4826c81bf4d166ee660c808456225ec7a03657075ca695822df5d4ef524 SHA512 be8d0e99571543417654f11c0ff89c2b4f6747c561b15933a825242737bd9f90424ae4b2258396114db43c98b712caec5a0aa269b754d8ec14d270a1ada7355d -EBUILD nix-2.1.3.ebuild 3360 BLAKE2B 942be3f686b741d56afcb4d7cf4748827347ebd76fde893145c7a4811ac188843093cce4e475833cca39296eeefdeaa17bf031ac175123f0ad0ed2400c675599 SHA512 04bba3ffbe8c326a48bf80a806562a3864100a4c5c99d6da26cd74eded47b49a8641e05f3b50229872964decd610025774bbf24f75ec534e345fe408c94563aa -EBUILD nix-2.2.1-r1.ebuild 3465 BLAKE2B 24d6d7a43120dda06a8a5390bdcd58320bace6507e37d3cc642d7ece763d99b7581b628a7da0266c6db30698544c9fe1c728174af55442a14b00de8d1b14656d SHA512 8ffc869dc124999d2fede51a5a782120f464110d8483fe5db062507713059d6fae17257b8c053c25873362a38b087c5be03f5fac2d9651b36cec042e84fffb9a -EBUILD nix-2.2.2.ebuild 3465 BLAKE2B 24d6d7a43120dda06a8a5390bdcd58320bace6507e37d3cc642d7ece763d99b7581b628a7da0266c6db30698544c9fe1c728174af55442a14b00de8d1b14656d SHA512 8ffc869dc124999d2fede51a5a782120f464110d8483fe5db062507713059d6fae17257b8c053c25873362a38b087c5be03f5fac2d9651b36cec042e84fffb9a +EBUILD nix-2.1.3.ebuild 3323 BLAKE2B 00105412ee3b024f918601fe37bbf9f98998bf796ceeb4093e8c4f0c8d86e18644a5aeead31242a0f58cf8cf71bce389e9db53d11386cb612a9e2bef1d9713dc SHA512 75579aea4a3f229047af42df717ff147e3918c4cc5f30a09de2399554d1b6caaad4afe8d4649ff4ec4b5fb22c0ab2a496cf888ea024631111528d69271ec0888 +EBUILD nix-2.2.2.ebuild 3428 BLAKE2B b01ef5533dbf1842da86621d9b5a029315e54b470c684829e37bd3786cb70c2499cbf071f59c644c129e1dc46159b7736c4eaa8104e007a97751ba3c47d6b60e SHA512 53c243290541dd1a297b8abf8c81664d3ad12a7d0d9077f61b6bb8f8cf689e40b313204fd88001a27e47b6d908bf795759414522557d62c996a96efd4d13b725 MISC metadata.xml 681 BLAKE2B 53ec9e4c35af4d73756dabebcc9d0423c3708c24e085d35ec589334971d2b76b40408793b5202d625043fe3bd23399a457b7cae4eea665156e2ba3c0d60fc292 SHA512 b473a72e96cc53eeca793b60acd627ebafb918a05fc328126d3a3f32fe8f09d95ebd4643c17f27a69ac64c0b3bee87f6c0818b0316ab2e5e7158999adc8e8a94 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 d80a3e75a3e0..000000000000 --- 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 -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 -} diff --git a/sys-apps/nix/nix-2.1.3.ebuild b/sys-apps/nix/nix-2.1.3.ebuild index 9c9665bed748..63941c45b198 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 deleted file mode 100644 index bb49ea11bcf3..000000000000 --- a/sys-apps/nix/nix-2.2.1-r1.ebuild +++ /dev/null @@ -1,144 +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 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 \ - --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 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 -} diff --git a/sys-apps/nix/nix-2.2.2.ebuild b/sys-apps/nix/nix-2.2.2.ebuild index bb49ea11bcf3..f3968e4c5f04 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 |