From eab5731cdf11d4ae8cdf111461d46fd96c5bdd37 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 4 May 2019 12:02:00 +0100 Subject: gentoo resync : 04.05.2019 --- sys-apps/guix/Manifest | 5 +- .../guix/files/guix-0.13.0-default-daemon.patch | 74 ---------- sys-apps/guix/guix-0.15.0.ebuild | 151 -------------------- sys-apps/guix/guix-1.0.0.ebuild | 152 +++++++++++++++++++++ 4 files changed, 154 insertions(+), 228 deletions(-) delete mode 100644 sys-apps/guix/files/guix-0.13.0-default-daemon.patch delete mode 100644 sys-apps/guix/guix-0.15.0.ebuild create mode 100644 sys-apps/guix/guix-1.0.0.ebuild (limited to 'sys-apps/guix') diff --git a/sys-apps/guix/Manifest b/sys-apps/guix/Manifest index c3e5a38579fd..57c8cc9d04ea 100644 --- a/sys-apps/guix/Manifest +++ b/sys-apps/guix/Manifest @@ -1,13 +1,12 @@ -AUX guix-0.13.0-default-daemon.patch 2888 BLAKE2B 8f94b392167691338a9645697bfec6fc9299245f954dcd45ca3460bf627df7a1aef4d72594925b1ce6d8b656b48bfc37b5565932449482ccf8df1d4bb60105ac SHA512 011e047be6634f6e8b8fce46330c42571b505e05b1c5dcae40889bace64c7211af17d48ec4b817f46d3f9bf6109cb7bfce67823fd4add93e707d1aa8fec0dfcd AUX guix-0.16.0-default-daemon.patch 2082 BLAKE2B c60299f9cf2718fb227340acab688206d5453df98b80890e1659d2e477d2a1e9fe1a2d21fb9696ccdb67dd000d094103a38e979de2105023d175cff69a740846 SHA512 69d2089a089bc4718bcdb6f8e5dd17cff8cd07149d8c10182b7cb22d343d8137b368725d7e3d4bc0d380b0eeabe22cae5b3b914ded0cbdac6307bf9d5c898285 AUX guix-daemon.initd 404 BLAKE2B ac539e478e463d862004613321e1f5bab32c371c701ee9f4378d71f34824b4a2831efd665c42969caf84e88eccc9bc1e1c12ff1abc971046ef30fb7cddec4cc1 SHA512 546e322b593cfd71d295b6f19fb336c988f05b1a459ca4b776c6aa129cfdec0004c85aee983cd7536a1bdd14e3edfcb25574b79a76a8134328c72fb1c83c8278 -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 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 -EBUILD guix-0.15.0.ebuild 4074 BLAKE2B eba05270a47fe6fe6babc65cef2b9a399acaba228cae8af571fb0207d89fb64af253b697bd704a64c5947c526341db9bc8fbf6b287054d920ed7261bdee1b9d9 SHA512 bfc4f41e69d6cda77c8c68a85469a6de70dd387a34ec790d4b23439e76ce8358c1d73a2273c2f23d8eb074e04522227b3e2502bb6079b3947a6469825c92623d EBUILD guix-0.16.0.ebuild 4095 BLAKE2B 7f66213e8c2ccfb4f50ecd55e8e028528c87479342fd5dad02b3a6d63dd04133a3419493a4a8ee80d7d2f538720d212d9cbe2059f95b8667a987e882200932b1 SHA512 1ad0bb9251c9b12668c6a345857117aebac6851893c5017db9da4c912fe7b1b367081339f90fa9589c5401598f7e7ad4861df0526458eeaddcd83367fa38ca8f +EBUILD guix-1.0.0.ebuild 4099 BLAKE2B 6972352ba69a95522407debbe30b71a5b7a418a0ceb721390c3987eec72b895281f704b213a891e4ecfb6f6b9be81c1f85a176832be2b5779bfbe0152971adfb SHA512 de5fd8a904bf15bdd3b810ab865e42ac0cca977e3fa1d10df052e27548c20af9cb07e85878c4a344a48337c1f209da7338c4a0f9b66d2ca7da6a5de2fa8e6036 MISC metadata.xml 251 BLAKE2B 9785c4729d0751280d104965bab25a268219a7fee217dcd8c01a5642a13f8abc471a3dff54ae0d34d3cf3dc8267fb483d93bd3b16aa3617e8fa8e9abd1703dfe SHA512 cc2bd3977894946ee4ea5b739cc3998bcd6017b9e7a52aa501409d0988954339a9a22fe751d0a5e967ddac9225d9b23f20b4fb1e2c62ee91d1d23c383d9776dd 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 7a02f7021159..000000000000 --- 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 45aca6b4d2c0..000000000000 --- 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 -} diff --git a/sys-apps/guix/guix-1.0.0.ebuild b/sys-apps/guix/guix-1.0.0.ebuild new file mode 100644 index 000000000000..218eb8858e5d --- /dev/null +++ b/sys-apps/guix/guix-1.0.0.ebuild @@ -0,0 +1,152 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +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/${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_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 +} -- cgit v1.2.3