From 265dbe5dbc14c199299496c6db8fce3f76647015 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 21 Sep 2018 18:00:10 +0100 Subject: gentoo resync : 21.09.2018 --- sys-apps/nix/Manifest | 4 +- sys-apps/nix/nix-2.1.1.ebuild | 135 ------------------------------------------ sys-apps/nix/nix-2.1.2.ebuild | 135 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 137 insertions(+), 137 deletions(-) delete mode 100644 sys-apps/nix/nix-2.1.1.ebuild create mode 100644 sys-apps/nix/nix-2.1.2.ebuild (limited to 'sys-apps/nix') diff --git a/sys-apps/nix/Manifest b/sys-apps/nix/Manifest index fc7e60e51530..70b90dbb537e 100644 --- a/sys-apps/nix/Manifest +++ b/sys-apps/nix/Manifest @@ -5,8 +5,8 @@ AUX nix-2.0-user-path.patch 390 BLAKE2B 08118fb6664ffe96bccd68596e7aa26fe895a928 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.1.tar.xz 814812 BLAKE2B 48486e8eb2937fff1e2b39b7ea61eea3ad6ba477229006e31f6efbefcd7839669d1e9533b1b601302a5d4264e2ea261758aff3a79bea616215b22041d32e0469 SHA512 38a5b4013eb60a0088870dd142b2baacabc9f204af07f349d34a529a3130568e260765793162c5a978ee6115fd66019e132c08524af4984e5698535f17fc29bd +DIST nix-2.1.2.tar.xz 816492 BLAKE2B 21365f2f7a88456aa566882780a65cabc190789e8e0f0aa62838bd7c9e2326c59776d78c6eaa4a2836039d02d6899114d5bc236bfadff5a2ef329531873e9e85 SHA512 6d54612f911438d5094c9d41fbf43ba4d8cada1da2b3eddbf7a3309262f9a9e94a2a826bb45247d5766bd6a419456ecdca5a8bebccff12607ebe004328bbc76a EBUILD nix-2.0.2.ebuild 3110 BLAKE2B d7930a0e21775cb2d531621f4ce6dbc52a2b7d4a437506bedd19bf34694bed08c99aec4e36b017af283bdf5c3069b757b68a9b45549d3fc42beec59c29aa79de SHA512 234a27599be84a79a035c1c9a7633ba85c36f44e4fd53f104d981bc4795f8ff59de68768e21b722735c760e2a8bbb9714d562a2d13c8be4a0014b4c819ef9d48 EBUILD nix-2.0.4.ebuild 3110 BLAKE2B d7930a0e21775cb2d531621f4ce6dbc52a2b7d4a437506bedd19bf34694bed08c99aec4e36b017af283bdf5c3069b757b68a9b45549d3fc42beec59c29aa79de SHA512 234a27599be84a79a035c1c9a7633ba85c36f44e4fd53f104d981bc4795f8ff59de68768e21b722735c760e2a8bbb9714d562a2d13c8be4a0014b4c819ef9d48 -EBUILD nix-2.1.1.ebuild 3182 BLAKE2B 9b6a0aac5c73bc3f9dc688eddc6d2b327c80f40c9431f76e285640dfc44dccc603e1d18302ab0f2c5a04a8f679737cb8a702c4682fae4e1bdb58468c22b195bb SHA512 89ed502fdb9472df48ee061541449e087e2630595c3b97053d828ff90d0ab13610c260bc458c94a11857f9d7f7a696f7a702ef36a5ebb931f89996095b549d85 +EBUILD nix-2.1.2.ebuild 3182 BLAKE2B 9b6a0aac5c73bc3f9dc688eddc6d2b327c80f40c9431f76e285640dfc44dccc603e1d18302ab0f2c5a04a8f679737cb8a702c4682fae4e1bdb58468c22b195bb SHA512 89ed502fdb9472df48ee061541449e087e2630595c3b97053d828ff90d0ab13610c260bc458c94a11857f9d7f7a696f7a702ef36a5ebb931f89996095b549d85 MISC metadata.xml 566 BLAKE2B 3891567411993e2864f7e0d6fd158937c0c7075ca92aef2413d28e0aa18e6d51982383d3ee71ab6b926ba6a397c59c3ef84f4a4b7cdd4f103f4256f4693f0cf0 SHA512 93d33392316264e30403abbf79a0bf836ed35f2eaf802f930743cb9f31955f939ac263946b93ee32bba34d2534329d95476e96816d1893747b077b0d9690281c 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 66d217abf098..000000000000 --- 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=( - 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.2.ebuild b/sys-apps/nix/nix-2.1.2.ebuild new file mode 100644 index 000000000000..66d217abf098 --- /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=( + 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 +} -- cgit v1.2.3