commit: a0391ae8961ba79b0478753329ed3042b31553c2 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> AuthorDate: Tue Jan 7 07:38:03 2020 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Tue Jan 7 07:39:54 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0391ae8
sys-apps/nix, sys-apps/guix: remove masked package Moved from ::gentoo to into ::nix-guix overlay. Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> profiles/package.mask | 6 - sys-apps/guix/Manifest | 6 - .../guix/files/guix-0.16.0-default-daemon.patch | 46 ------ sys-apps/guix/files/guix-daemon.initd | 15 -- sys-apps/guix/guix-1.0.1-r1.ebuild | 166 --------------------- sys-apps/guix/guix-1.0.1.ebuild | 164 -------------------- sys-apps/guix/metadata.xml | 8 - sys-apps/nix/Manifest | 2 - sys-apps/nix/files/nix-2.0-user-path.patch | 10 -- sys-apps/nix/files/nix-2.3-bootstrap.patch | 58 ------- sys-apps/nix/files/nix-2.3-libpaths.patch | 48 ------ sys-apps/nix/files/nix-daemon.initd | 15 -- sys-apps/nix/metadata.xml | 14 -- sys-apps/nix/nix-2.3-r1.ebuild | 138 ----------------- sys-apps/nix/nix-2.3.1.ebuild | 144 ------------------ sys-apps/nix/nix-2.3.ebuild | 137 ----------------- 16 files changed, 977 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index 1fd7c81a7b0..01aebec3db0 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -748,12 +748,6 @@ app-laptop/nvidiabl # Removal after 2020-01-01 net-wireless/bcm43xx-fwcutter -# Sergei Trofimovich <[email protected]> (2019-11-25) -# Mask for removal from main tree into ::nix-guix overlay. -# Removal in 30 days. -sys-apps/nix -sys-apps/guix - # Lars Wendler <[email protected]> (2019-11-14) # Breaks archives containing relative paths # when being called with --no-absolute-filenames diff --git a/sys-apps/guix/Manifest b/sys-apps/guix/Manifest deleted file mode 100644 index 6d34e6fd4d0..00000000000 --- a/sys-apps/guix/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -DIST guix-1.0.1.tar.gz 31992360 BLAKE2B 84ef9ffba36d72f3a99167e0089a02f54172c9e8dd95e74aa55467383698aba3b26dc38992dc159903608b0623a707065b129b359e83338f5f361ce0e98e6ea4 SHA512 b884a4c6e099bf12bee547f5b247ac1bfb0d10a227712079ca1a857f75c3cf20d40d2c90780a8b486f5ee8e40366de44487d3f8429e570c561a72073506ac588 -DIST guix-bootstrap-aarch64-linux-20170217-guile-2.0.14.tar.xz.bootstrap 2948976 BLAKE2B 3337e52c2db259af98a6ed0eb418a6cd388e11e09c277c460e14edb7065d0170fd544415ccb72db1b1b2559fe700ce313698aed11846271052460f9af51f499a SHA512 b3a5b457017357dedb71db98ef089ac90ca2b88ec5dbf0cec6c829dff7167c5478797a8d14850dd2d951713632c2859950be6c5eb029e6f6c224eecef97efd27 -DIST guix-bootstrap-armhf-linux-20150101-guile-2.0.11.tar.xz.bootstrap 2717576 BLAKE2B b7461803f0b3943ef1c855b02f4eef55ef96479cd453fb7ee11518159deca65f741d9c3384598a2fdb0b05b7a9023fb6983a5a3a6ccc204b0c6ac1328f3203cc SHA512 d546e2c0f676a49af482caae6f5575c7937647a81d37e49ad8be6fe12d58989cb825b5e12f2da28aff4649ee1a198ffb8f4a0beea65835a60aefaa905e87e337 -DIST guix-bootstrap-i686-linux-20131110-guile-2.0.9.tar.xz.bootstrap 2656076 BLAKE2B a2c0c82ac3ba4ff5265a506bbe644dc6a61a38cec243e34e8d3bde2d543a4d7221aa921f57f057eb5379aea4e9fd462f0bee7df7e61e4e6381c93401948a9b11 SHA512 f2b257e5b10dcd7421273d8d04782a2bd733781094dd963bf5bd8294604dbd158ea25cbc383a227edce84de968a962ec834226ebdd137a2e1857e2191bfada8c -DIST guix-bootstrap-mips64el-linux-20131110-guile-2.0.9.tar.xz.bootstrap 2734180 BLAKE2B 8ac6d9cfb59b1e2214c112fa7bfe865966cd06cb0214f360dc337a54e16cb59e4e3aa6da0662a52e6bceedfbb2a9ebb0eb62fe08491e5761912e2ee17b7ecd48 SHA512 8c4be098a31f63d56e7d35c174ce4095ba8317662c365d44c005980b38ba499461926754a4659e699ab271bb841c9da514f1a36b812d881c212a5f12177d73c0 -DIST guix-bootstrap-x86_64-linux-20131110-guile-2.0.9.tar.xz.bootstrap 2885996 BLAKE2B c16595fcb821468d5d293201046642dd4f0b149bb5e64f7b784f29f513ce26243b9747a8eefee3128e813a9b4b27a6a60a1693706b3fcb8cbb238fb4ad6e56c1 SHA512 96efc583f42f6c7647bc026e2d2a96d603e7bea12ca02f6bcc65e819b9966082ac4c9f7e42f64536ff42a988e4766e695d87a82c73dd97d80745975a05badb23 diff --git a/sys-apps/guix/files/guix-0.16.0-default-daemon.patch b/sys-apps/guix/files/guix-0.16.0-default-daemon.patch deleted file mode 100644 index cc2b56e0913..00000000000 --- a/sys-apps/guix/files/guix-0.16.0-default-daemon.patch +++ /dev/null @@ -1,46 +0,0 @@ -Don't require user to create profile manually even before guix-daemon runs. - -Default install should provide working basic environment. - -Revert "build: Don't embed absolute paths in .service and .conf service files." -This reverts commit 613d0895b92c677e0639d5e77c55043e38e020c8. ---- a/etc/guix-daemon.conf.in -+++ b/etc/guix-daemon.conf.in -@@ -9,1 +9,1 @@ stop on runlevel [016] --exec @localstatedir@/guix/profiles/per-user/root/current-guix/bin/guix-daemon --build-users-group=guixbuild -+exec @bindir@/guix-daemon --build-users-group=guixbuild ---- a/etc/guix-daemon.service.in -+++ b/etc/guix-daemon.service.in -@@ -6,1 +6,1 @@ --ExecStart=@localstatedir@/guix/profiles/per-user/root/current-guix/bin/guix-daemon --build-users-group=guixbuild -+ExecStart=@bindir@/guix-daemon --build-users-group=guixbuild ---- a/etc/guix-publish.conf.in -+++ b/etc/guix-publish.conf.in -@@ -9,1 +9,1 @@ stop on runlevel [016] --exec @localstatedir@/guix/profiles/per-user/root/current-guix/bin/guix publish --user=nobody --port=8181 -+exec @bindir@/guix publish --user=nobody --port=8181 ---- a/etc/guix-publish.service.in -+++ b/etc/guix-publish.service.in -@@ -6,1 +6,1 @@ --ExecStart=@localstatedir@/guix/profiles/per-user/root/current-guix/bin/guix publish --user=nobody --port=8181 -+ExecStart=@bindir@/guix publish --user=nobody --port=8181 ---- a/nix/local.mk -+++ b/nix/local.mk -@@ -190,7 +190,7 @@ nodist_systemdservice_DATA = etc/guix-daemon.service etc/guix-publish.service - etc/guix-%.service: etc/guix-%.service.in \ - $(top_builddir)/config.status - $(AM_V_GEN)$(MKDIR_P) "`dirname $@`"; \ -- $(SED) -e 's|@''localstatedir''@|$(localstatedir)|' < \ -+ $(SED) -e 's|@''bindir''@|$(bindir)|' < \ - "$<" > "[email protected]"; \ - mv "[email protected]" "$@" - -@@ -201,7 +201,7 @@ nodist_upstartjob_DATA = etc/guix-daemon.conf etc/guix-publish.conf - etc/guix-%.conf: etc/guix-%.conf.in \ - $(top_builddir)/config.status - $(AM_V_GEN)$(MKDIR_P) "`dirname $@`"; \ -- $(SED) -e 's|@''localstatedir''@|$(localstatedir)|' < \ -+ $(SED) -e 's|@''bindir''@|$(bindir)|' < \ - "$<" > "[email protected]"; \ - mv "[email protected]" "$@" - diff --git a/sys-apps/guix/files/guix-daemon.initd b/sys-apps/guix/files/guix-daemon.initd deleted file mode 100644 index f819fb20c37..00000000000 --- a/sys-apps/guix/files/guix-daemon.initd +++ /dev/null @@ -1,15 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -start() { - ebegin "Starting ${SVCNAME}" - start-stop-daemon --start --quiet --background --exec /usr/bin/guix-daemon -- --build-users-group=guixbuild - eend ${?} -} - -stop() { - ebegin "Stopping ${SVCNAME}" - start-stop-daemon --stop --quiet --exec /usr/bin/guix-daemon - eend ${?} -} diff --git a/sys-apps/guix/guix-1.0.1-r1.ebuild b/sys-apps/guix/guix-1.0.1-r1.ebuild deleted file mode 100644 index 0ab61861e61..00000000000 --- a/sys-apps/guix/guix-1.0.1-r1.ebuild +++ /dev/null @@ -1,166 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools linux-info readme.gentoo-r1 systemd user - -DESCRIPTION="GNU package manager (nix sibling)" -HOMEPAGE="https://www.gnu.org/software/guix/"; - -# taken from gnu/local.mk and gnu/packages/bootstrap.scm -BOOT_GUILE=( - "aarch64-linux 20170217 guile-2.0.14.tar.xz" - "armhf-linux 20150101 guile-2.0.11.tar.xz" - "i686-linux 20131110 guile-2.0.9.tar.xz" - "mips64el-linux 20131110 guile-2.0.9.tar.xz" - "x86_64-linux 20131110 guile-2.0.9.tar.xz" -) - -binary_src_uris() { - local system_date_guilep uri - for system_date_guilep in "${BOOT_GUILE[@]}"; do - # $1 $2 $3 - # "armhf-linux 20150101 guile-2.0.11.tar.xz" - set -- ${system_date_guilep} - uri="mirror://gnu-alpha/${PN}/bootstrap/$1/$2/$3" - # ${uri} -> guix-bootstrap-armhf-linux-20150101-guile-2.0.11.tar.xz.bootstrap - echo "${uri} -> guix-bootstrap-$1-$2-$3.bootstrap" - done -} - -# copy bootstrap binaries from DISTDIR to ${S} -copy_boot_guile_binaries() { - local system_date_guilep - for system_date_guilep in "${BOOT_GUILE[@]}"; do - # $1 $2 $3 - # "armhf-linux 20150101 guile-2.0.11.tar.xz" - set -- ${system_date_guilep} - cp "${DISTDIR}"/guix-bootstrap-$1-$2-$3.bootstrap gnu/packages/bootstrap/$1/$3 || die - done -} - -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz - $(binary_src_uris)" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RESTRICT=test # complains about size of config.log and refuses to start tests - -RDEPEND=" - dev-libs/libgcrypt:0= - >=dev-scheme/guile-2.2:=[regex,networking,threads] - dev-scheme/bytestructures - dev-scheme/guile-gcrypt - >=dev-scheme/guile-git-0.2.0 - dev-scheme/guile-json - dev-scheme/guile-sqlite3 - net-libs/gnutls[guile] - sys-libs/zlib - app-arch/bzip2 - dev-db/sqlite -" - -DEPEND="${RDEPEND} -" - -PATCHES=("${FILESDIR}"/${PN}-0.16.0-default-daemon.patch) - -QA_PREBUILT="usr/share/guile/site/*/gnu/packages/bootstrap/*" - -DISABLE_AUTOFORMATTING=yes -DOC_CONTENTS="Quick start user guide on Gentoo: - -[as root] allow binary substitution to be downloaded (optional) - # guix archive --authorize < /usr/share/guix/ci.guix.info.pub -[as root] enable guix-daemon service: - [systemd] # systemctl enable guix-daemon - [openrc] # rc-update add guix-daemon -[as a user] ln -sf /var/guix/profiles/per-user/\$USER/guix-profile \$HOME/.guix-profile -[as a user] install guix packages: - \$ guix package -i hello -[as a user] configure environment: - Somewhere in .bash_profile you might want to set - export GUIX_LOCPATH=\$HOME/.guix-profile/lib/locale - -Next steps: - guix package manager user manual: https://www.gnu.org/software/guix/manual/guix.html -" - -pkg_pretend() { - # USER_NS is used to run builders in a default setting in linux - # and for 'guix environment --container'. - local CONFIG_CHECK="~USER_NS" - check_extra_config -} - -pkg_setup() { - enewgroup guixbuild - for i in {1..10}; do - # we list 'guixbuild' twice to - # both assign a primary group for user - # and add a user to /etc/group - # 'kvm' is used to make 'guix system vm <system.scm>' - # work by default: bug #699642 - enewuser guixbuilder${i} -1 -1 /var/empty guixbuild,guixbuild,kvm - done -} - -src_prepare() { - copy_boot_guile_binaries - - default - # build system is very eager to run automake itself: bug #625166 - eautoreconf - - # guile is trying to avoid recompilation by checking if file - # /usr/lib64/guile/2.2/site-ccache/guix/modules.go - # is newer than - # guix/modules.scm - # In case it is instead of using 'guix/modules.scm' guile - # loads system one (from potentially older version of guix). - # To work it around we bump last modification timestamp of - # '*.scm' files. - # http://debbugs.gnu.org/cgi/bugreport.cgi?bug=38112 - find "${S}" -name "*.scm" -exec touch {} + || die - - # Gentoo stores systemd unit files in lib, never in lib64: bug #689772 - sed -i nix/local.mk \ - -e 's|systemdservicedir = $(libdir)/systemd/system|systemdservicedir = '"$(systemd_get_systemunitdir)"'|' || die -} - -src_configure() { - # to be compatible with guix from /gnu/store - econf \ - --localstatedir="${EPREFIX}"/var -} - -src_compile() { - # guile occasionally fails with 'bad address' - emake -j1 -} - -src_install() { - # TODO: emacs highlighter - default - - readme.gentoo_create_doc - - keepdir /etc/guix - # TODO: will need a tweak for prefix - keepdir /gnu/store - fowners root:guixbuild /gnu/store - fperms 1775 /gnu/store - - keepdir /var/guix/profiles/per-user - fperms 1777 /var/guix/profiles/per-user - - newinitd "${FILESDIR}"/guix-daemon.initd guix-daemon -} - -pkg_postinst() { - readme.gentoo_print_elog -} diff --git a/sys-apps/guix/guix-1.0.1.ebuild b/sys-apps/guix/guix-1.0.1.ebuild deleted file mode 100644 index 309d371d09c..00000000000 --- a/sys-apps/guix/guix-1.0.1.ebuild +++ /dev/null @@ -1,164 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools linux-info readme.gentoo-r1 systemd user - -DESCRIPTION="GNU package manager (nix sibling)" -HOMEPAGE="https://www.gnu.org/software/guix/"; - -# taken from gnu/local.mk and gnu/packages/bootstrap.scm -BOOT_GUILE=( - "aarch64-linux 20170217 guile-2.0.14.tar.xz" - "armhf-linux 20150101 guile-2.0.11.tar.xz" - "i686-linux 20131110 guile-2.0.9.tar.xz" - "mips64el-linux 20131110 guile-2.0.9.tar.xz" - "x86_64-linux 20131110 guile-2.0.9.tar.xz" -) - -binary_src_uris() { - local system_date_guilep uri - for system_date_guilep in "${BOOT_GUILE[@]}"; do - # $1 $2 $3 - # "armhf-linux 20150101 guile-2.0.11.tar.xz" - set -- ${system_date_guilep} - uri="mirror://gnu-alpha/${PN}/bootstrap/$1/$2/$3" - # ${uri} -> guix-bootstrap-armhf-linux-20150101-guile-2.0.11.tar.xz.bootstrap - echo "${uri} -> guix-bootstrap-$1-$2-$3.bootstrap" - done -} - -# copy bootstrap binaries from DISTDIR to ${S} -copy_boot_guile_binaries() { - local system_date_guilep - for system_date_guilep in "${BOOT_GUILE[@]}"; do - # $1 $2 $3 - # "armhf-linux 20150101 guile-2.0.11.tar.xz" - set -- ${system_date_guilep} - cp "${DISTDIR}"/guix-bootstrap-$1-$2-$3.bootstrap gnu/packages/bootstrap/$1/$3 || die - done -} - -SRC_URI="mirror://gnu/${PN}/${P}.tar.gz - $(binary_src_uris)" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RESTRICT=test # complains about size of config.log and refuses to start tests - -RDEPEND=" - dev-libs/libgcrypt:0= - >=dev-scheme/guile-2.2:=[regex,networking,threads] - dev-scheme/bytestructures - dev-scheme/guile-gcrypt - >=dev-scheme/guile-git-0.2.0 - dev-scheme/guile-json - dev-scheme/guile-sqlite3 - net-libs/gnutls[guile] - sys-libs/zlib - app-arch/bzip2 - dev-db/sqlite -" - -DEPEND="${RDEPEND} -" - -PATCHES=("${FILESDIR}"/${PN}-0.16.0-default-daemon.patch) - -QA_PREBUILT="usr/share/guile/site/*/gnu/packages/bootstrap/*" - -DISABLE_AUTOFORMATTING=yes -DOC_CONTENTS="Quick start user guide on Gentoo: - -[as root] allow binary substitution to be downloaded (optional) - # guix archive --authorize < /usr/share/guix/ci.guix.info.pub -[as root] enable guix-daemon service: - [systemd] # systemctl enable guix-daemon - [openrc] # rc-update add guix-daemon -[as a user] ln -sf /var/guix/profiles/per-user/\$USER/guix-profile \$HOME/.guix-profile -[as a user] install guix packages: - \$ guix package -i hello -[as a user] configure environment: - Somewhere in .bash_profile you might want to set - export GUIX_LOCPATH=\$HOME/.guix-profile/lib/locale - -Next steps: - guix package manager user manual: https://www.gnu.org/software/guix/manual/guix.html -" - -pkg_pretend() { - # USER_NS is used to run builders in a default setting in linux - # and for 'guix environment --container'. - local CONFIG_CHECK="~USER_NS" - check_extra_config -} - -pkg_setup() { - enewgroup guixbuild - for i in {1..10}; do - # we list 'guixbuild' twice to - # both assign a primary group for user - # and add a user to /etc/group - enewuser guixbuilder${i} -1 -1 /var/empty guixbuild,guixbuild - done -} - -src_prepare() { - copy_boot_guile_binaries - - default - # build system is very eager to run automake itself: bug #625166 - eautoreconf - - # guile is trying to avoid recompilation by checking if file - # /usr/lib64/guile/2.2/site-ccache/guix/modules.go - # is newer than - # guix/modules.scm - # In case it is instead of using 'guix/modules.scm' guile - # loads system one (from potentially older version of guix). - # To work it around we bump last modification timestamp of - # '*.scm' files. - # http://debbugs.gnu.org/cgi/bugreport.cgi?bug=38112 - find "${S}" -name "*.scm" -exec touch {} + || die - - # Gentoo stores systemd unit files in lib, never in lib64: bug #689772 - sed -i nix/local.mk \ - -e 's|systemdservicedir = $(libdir)/systemd/system|systemdservicedir = '"$(systemd_get_systemunitdir)"'|' || die -} - -src_configure() { - # to be compatible with guix from /gnu/store - econf \ - --localstatedir="${EPREFIX}"/var -} - -src_compile() { - # guile occasionally fails with 'bad address' - emake -j1 -} - -src_install() { - # TODO: emacs highlighter - default - - readme.gentoo_create_doc - - keepdir /etc/guix - # TODO: will need a tweak for prefix - keepdir /gnu/store - fowners root:guixbuild /gnu/store - fperms 1775 /gnu/store - - keepdir /var/guix/profiles/per-user - fperms 1777 /var/guix/profiles/per-user - - newinitd "${FILESDIR}"/guix-daemon.initd guix-daemon -} - -pkg_postinst() { - readme.gentoo_print_elog -} diff --git a/sys-apps/guix/metadata.xml b/sys-apps/guix/metadata.xml deleted file mode 100644 index c5298995d2d..00000000000 --- a/sys-apps/guix/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="person"> - <email>[email protected]</email> - <name>Sergei Trofimovich</name> - </maintainer> -</pkgmetadata> diff --git a/sys-apps/nix/Manifest b/sys-apps/nix/Manifest deleted file mode 100644 index c411e171768..00000000000 --- a/sys-apps/nix/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -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/files/nix-2.0-user-path.patch b/sys-apps/nix/files/nix-2.0-user-path.patch deleted file mode 100644 index 486a05bb595..00000000000 --- a/sys-apps/nix/files/nix-2.0-user-path.patch +++ /dev/null @@ -1,10 +0,0 @@ -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/files/nix-2.3-bootstrap.patch b/sys-apps/nix/files/nix-2.3-bootstrap.patch deleted file mode 100644 index fd656e0a1ec..00000000000 --- a/sys-apps/nix/files/nix-2.3-bootstrap.patch +++ /dev/null @@ -1,58 +0,0 @@ -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/files/nix-2.3-libpaths.patch b/sys-apps/nix/files/nix-2.3-libpaths.patch deleted file mode 100644 index 42931e7e8d5..00000000000 --- a/sys-apps/nix/files/nix-2.3-libpaths.patch +++ /dev/null @@ -1,48 +0,0 @@ -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) $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED)) -+ $$(trace-ld) $(CXX) -o $$@ $$(foreach lib, $$($(1)_LIBS), $$($$(lib)_LDFLAGS_USE_INSTALLED)) $$(LDFLAGS) $$(GLOBAL_LDFLAGS) $$($(1)_OBJS) $$($(1)_LDFLAGS) - - else - diff --git a/sys-apps/nix/files/nix-daemon.initd b/sys-apps/nix/files/nix-daemon.initd deleted file mode 100644 index 1fd42734c0a..00000000000 --- a/sys-apps/nix/files/nix-daemon.initd +++ /dev/null @@ -1,15 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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 deleted file mode 100644 index ebcafee28da..00000000000 --- a/sys-apps/nix/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="person"> - <email>[email protected]</email> - <name>Sergei Trofimovich</name> - </maintainer> - <use> - <flag name="etc-profile">Install /etc/profile.d/ entry to inject nix support for all users.</flag> - <flag name="gc">Enable garbage collection in the Nix expression evaluator (use <pkg>dev-libs/boehm-gc</pkg>).</flag> - <flag name="s3">Enable Amazon S3 bucket to load and store packages (use <pkg>dev-libs/aws-sdk-cpp</pkg>).</flag> - <flag name="sodium">Use <pkg>dev-libs/libsodium</pkg> for cryptography</flag> - </use> -</pkgmetadata> diff --git a/sys-apps/nix/nix-2.3-r1.ebuild b/sys-apps/nix/nix-2.3-r1.ebuild deleted file mode 100644 index 30e6c06b944..00000000000 --- a/sys-apps/nix/nix-2.3-r1.ebuild +++ /dev/null @@ -1,138 +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}-2.0-user-path.patch - "${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 - 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.3.1.ebuild b/sys-apps/nix/nix-2.3.1.ebuild deleted file mode 100644 index df8590b23b5..00000000000 --- a/sys-apps/nix/nix-2.3.1.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 linux-info 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_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 - # 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 - 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.3.ebuild b/sys-apps/nix/nix-2.3.ebuild deleted file mode 100644 index 2a368774542..00000000000 --- a/sys-apps/nix/nix-2.3.ebuild +++ /dev/null @@ -1,137 +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}-2.0-user-path.patch - "${FILESDIR}"/${PN}-2.3-libpaths.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 - 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 -}
