commit: c4446d1bf3b886e7253aaa79ea11e1e89d79d67a Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> AuthorDate: Fri May 3 09:11:28 2019 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Fri May 3 09:14:41 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4446d1b
sys-apps/guix: drop old Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> sys-apps/guix/Manifest | 1 - .../guix/files/guix-0.13.0-default-daemon.patch | 74 ---------- sys-apps/guix/guix-0.15.0.ebuild | 151 --------------------- 3 files changed, 226 deletions(-) diff --git a/sys-apps/guix/Manifest b/sys-apps/guix/Manifest index 28dc1b1ce3a..055e5cf67d2 100644 --- a/sys-apps/guix/Manifest +++ b/sys-apps/guix/Manifest @@ -1,4 +1,3 @@ -DIST guix-0.15.0.tar.gz 22704560 BLAKE2B 6abd50c0436abedaa3a20ba9649ccf8af0efeeac8d975171befb4e9a231be99bfcebed34f08d66b4ddaedfd64a9916f176e96bf810dba3bbc13cc6856828b5be SHA512 5e85ed03cde979d625df11d02d4f2ac7128bd944d11a763754e10a8e980f1eaeb721053fa12547bbc4289b33b3c7818bf992c7bfe79233f3a9555c96b8d52d7f DIST guix-0.16.0.tar.gz 24365691 BLAKE2B 7581f21fc9ccd4813b5e35b6a56980ffcd1ef9b02d5091679c33aaa91edf80acdc2bb9bd1a73acdde71b74d88e990ebbd824267756d9e7b27f94061cfd5a1429 SHA512 fdfa431547a283947147fde67e0dab27361a34caf7862c10659b17f74c63a07e6e834281be48a3dbe05cccd8ef46db5b8a19a6d42668ae2258d696058283724f DIST guix-1.0.0.tar.gz 30707058 BLAKE2B 061aaa7068b2da641a613c36838d9853eeefd6ab6a2d9d9645a86fbeb9a7dcd370cc6a0d2ff45469235c2296edde540471675ed858522dcd6351e853a8617ff8 SHA512 45af6f80d1d4f4a63d00741070904acbb4986241561f52b4e81ce92fcdab6806a9ee10cbabfb6eddf88c4132cf9d678640d3a2c9895f170f8e6cbbf4d2128419 DIST guix-bootstrap-aarch64-linux-20170217-guile-2.0.14.tar.xz.bootstrap 2948976 BLAKE2B 3337e52c2db259af98a6ed0eb418a6cd388e11e09c277c460e14edb7065d0170fd544415ccb72db1b1b2559fe700ce313698aed11846271052460f9af51f499a SHA512 b3a5b457017357dedb71db98ef089ac90ca2b88ec5dbf0cec6c829dff7167c5478797a8d14850dd2d951713632c2859950be6c5eb029e6f6c224eecef97efd27 diff --git a/sys-apps/guix/files/guix-0.13.0-default-daemon.patch b/sys-apps/guix/files/guix-0.13.0-default-daemon.patch deleted file mode 100644 index 7a02f702115..00000000000 --- a/sys-apps/guix/files/guix-0.13.0-default-daemon.patch +++ /dev/null @@ -1,74 +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. -diff --git a/etc/guix-daemon.conf.in b/etc/guix-daemon.conf.in -index 09c70cde3..8f833cb69 100644 ---- a/etc/guix-daemon.conf.in -+++ b/etc/guix-daemon.conf.in -@@ -9,4 +9,4 @@ stop on runlevel [016] - - task - --exec @localstatedir@/guix/profiles/per-user/root/guix-profile/bin/guix-daemon --build-users-group=guixbuild -+exec @bindir@/guix-daemon --build-users-group=guixbuild -diff --git a/etc/guix-daemon.service.in b/etc/guix-daemon.service.in -index 988cf90c0..7a3f02b27 100644 ---- a/etc/guix-daemon.service.in -+++ b/etc/guix-daemon.service.in -@@ -6,7 +6,7 @@ - Description=Build daemon for GNU Guix - - [Service] --ExecStart=@localstatedir@/guix/profiles/per-user/root/guix-profile/bin/guix-daemon --build-users-group=guixbuild -+ExecStart=@bindir@/guix-daemon --build-users-group=guixbuild - Environment=GUIX_LOCPATH=/root/.guix-profile/lib/locale - RemainAfterExit=yes - StandardOutput=syslog -diff --git a/etc/guix-publish.conf.in b/etc/guix-publish.conf.in -index 241c59455..498fa295b 100644 ---- a/etc/guix-publish.conf.in -+++ b/etc/guix-publish.conf.in -@@ -9,4 +9,4 @@ stop on runlevel [016] - - task - --exec @localstatedir@/guix/profiles/per-user/root/guix-profile/bin/guix publish --user=nobody --port=8181 -+exec @bindir@/guix publish --user=nobody --port=8181 -diff --git a/etc/guix-publish.service.in b/etc/guix-publish.service.in -index 8aaf09e3c..fc4e3c21f 100644 ---- a/etc/guix-publish.service.in -+++ b/etc/guix-publish.service.in -@@ -6,7 +6,7 @@ - Description=Publish the GNU Guix store - - [Service] --ExecStart=@localstatedir@/guix/profiles/per-user/root/guix-profile/bin/guix publish --user=nobody --port=8181 -+ExecStart=@bindir@/guix publish --user=nobody --port=8181 - Environment=GUIX_LOCPATH=/root/.guix-profile/lib/locale - RemainAfterExit=yes - StandardOutput=syslog -diff --git a/nix/local.mk b/nix/local.mk -index 9e0c457be..eb70d266f 100644 ---- 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)|' < \ - "$<" > "$@.tmp"; \ - mv "$@.tmp" "$@" - -@@ -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)|' < \ - "$<" > "$@.tmp"; \ - mv "$@.tmp" "$@" - diff --git a/sys-apps/guix/guix-0.15.0.ebuild b/sys-apps/guix/guix-0.15.0.ebuild deleted file mode 100644 index 45aca6b4d2c..00000000000 --- a/sys-apps/guix/guix-0.15.0.ebuild +++ /dev/null @@ -1,151 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools readme.gentoo-r1 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-alpha/${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:=[regex,networking,threads] - dev-scheme/bytestructures - dev-scheme/guile-git - 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.13.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/hydra.gnu.org.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_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. - find "${S}" -name "*.scm" -exec touch {} + || 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 -}
