diff options
Diffstat (limited to 'sys-apps/guix')
| -rw-r--r-- | sys-apps/guix/Manifest | 6 | ||||
| -rw-r--r-- | sys-apps/guix/files/guix-0.12.0-AR.patch | 8 | ||||
| -rw-r--r-- | sys-apps/guix/files/guix-0.12.0-no-json-crate.patch | 38 | ||||
| -rw-r--r-- | sys-apps/guix/guix-0.14.0.ebuild (renamed from sys-apps/guix/guix-0.12.0-r3.ebuild) | 41 |
4 files changed, 28 insertions, 65 deletions
diff --git a/sys-apps/guix/Manifest b/sys-apps/guix/Manifest index 596fe2008a66..0424a1101175 100644 --- a/sys-apps/guix/Manifest +++ b/sys-apps/guix/Manifest @@ -1,14 +1,12 @@ -AUX guix-0.12.0-AR.patch 245 BLAKE2B 5f73182271233de6f8d857f6c6db1f8a46801f078acfc207d64c1bd97780de78e66b22b84c0249fa3e9b453c893aee3088c8012fd442b665b218fa72d2e33bf8 SHA512 a8249858c77f7e3485d2851bdfd914fe45d0243087558a8155e941925d5b76adb4f9f5f7b380baf865158f2bbc8f3aa8a0d8901ea86baf5c3056ee548216723d -AUX guix-0.12.0-no-json-crate.patch 1234 BLAKE2B 0faa8e597c3b8d983e093b502f0b9a60836923ac0c9a84ba6684e2bfa1e77c221e7dcf34e14fae81c6b7df7c1b238a7134373a5ec2bc9ae37d0fd616a047fc6c SHA512 6c382181a7598ddb889be2cee712ebfe852b422c1f55c1e298658fd0a3270265dfeaff07d07eaf87c3e1fa79c35dc82d1d3e998413f0cabdfdda85ae56ff005d AUX guix-0.13.0-default-daemon.patch 2888 BLAKE2B 8f94b392167691338a9645697bfec6fc9299245f954dcd45ca3460bf627df7a1aef4d72594925b1ce6d8b656b48bfc37b5565932449482ccf8df1d4bb60105ac SHA512 011e047be6634f6e8b8fce46330c42571b505e05b1c5dcae40889bace64c7211af17d48ec4b817f46d3f9bf6109cb7bfce67823fd4add93e707d1aa8fec0dfcd AUX guix-daemon.initd 404 BLAKE2B ac539e478e463d862004613321e1f5bab32c371c701ee9f4378d71f34824b4a2831efd665c42969caf84e88eccc9bc1e1c12ff1abc971046ef30fb7cddec4cc1 SHA512 546e322b593cfd71d295b6f19fb336c988f05b1a459ca4b776c6aa129cfdec0004c85aee983cd7536a1bdd14e3edfcb25574b79a76a8134328c72fb1c83c8278 -DIST guix-0.12.0.tar.gz 15823786 BLAKE2B 96e1156a4ee32ec1500afd5529bade5408f538ea5280817efb1c31b6563e8aeefb554e82e9e4227198bf43e7b440aa062dd31cb607974f22859097e8f072dc84 SHA512 d61cb289d3773977400fa3c49869f30a3feb5e0364368017b9b8eaadee814c5c31897be398d6ff142349337334eb51cb6d0354bee27c0365de69ce1a09e858d3 DIST guix-0.13.0.tar.gz 18490387 BLAKE2B e146f7a414f91076eafebe122c0abd772c1c2a562da015e952f978e97528c099905c1e7157e659633e644cbbd7066feac021550d52cb76d5999ff464fb685f2f SHA512 39d4e627f69850da650448b72008c1b73cbda0286d6b805bb1ea14d72eb49c5f6bdf30755b791a8b9cbb94e91ce8c1f360963250587591ce1a47db457c901daf +DIST guix-0.14.0.tar.gz 19852695 BLAKE2B 257050ebebc35e7d6c82a30c3bb974da3d3eae9ca7c95dd8d98da6c60a68585330e5665b5343738188a058d84217d3c85731492e16afbd80c23771d40725b31c SHA512 635f6131c3ffa1ea5d18500fabc1d9d86d604a5cd3c8134d0f99dc44e171eef5d15f7ffa008c0e0726cf93fd0886afff0e9a5949014545d6919f8e8dba80eb69 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.12.0-r3.ebuild 3445 BLAKE2B 9995e6507e61c40040dfbf5d10d39f8eae83bd6b2b442cd09545ed196a5d77e81111a2ac0170dee4fba9f20a2b6bfde3aad320c93d4b17ac07c4cc4c1537f514 SHA512 a6d02045dff6a3c0b0aa5a778a70af7b14e0163b400107a88d90ab245fac26bd85e645a972e43732fb862d546ce00143af161edce297f86cb72ab147d5ffce12 EBUILD guix-0.13.0-r1.ebuild 3585 BLAKE2B d78dc51abf4be7d3b0558fa9b96fd6696c4f35a83b3b2b28638d8a4de2dfedb8536477e077e5e8f3ecb1e27b95dc2e3e60fe61faad4deb88c922513b1ee3ca5a SHA512 500a6e19aabde2fe9259171a46b4214ab278548e8415e96dd4fcedcc332e30c6aaef58a4b3c2d02c2c40fc1f282fcf1c32e0113de1cbc2a3dc95bbb87a8e640c +EBUILD guix-0.14.0.ebuild 4042 BLAKE2B 292e76d39cb9d2c127c767e06a84a3b12415a72a78d1710c406fad458b227f6a198f1778abe4f23c82df9027e4d81ebf4e4e1965fb3670cfe13219df413c9bab SHA512 ee8a4b8c71f80b939d19d5e53d3f4020e0e797b9851dd3c59c31c725347e6c5775c8ea51d78efab86faee4a083d182d47ccebaedbcb43f930bad6d54e7cc9fe1 MISC metadata.xml 251 BLAKE2B 9785c4729d0751280d104965bab25a268219a7fee217dcd8c01a5642a13f8abc471a3dff54ae0d34d3cf3dc8267fb483d93bd3b16aa3617e8fa8e9abd1703dfe SHA512 cc2bd3977894946ee4ea5b739cc3998bcd6017b9e7a52aa501409d0988954339a9a22fe751d0a5e967ddac9225d9b23f20b4fb1e2c62ee91d1d23c383d9776dd diff --git a/sys-apps/guix/files/guix-0.12.0-AR.patch b/sys-apps/guix/files/guix-0.12.0-AR.patch deleted file mode 100644 index c9c91c20734c..000000000000 --- a/sys-apps/guix/files/guix-0.12.0-AR.patch +++ /dev/null @@ -1,8 +0,0 @@ -diff --git a/config-daemon.ac b/config-daemon.ac -index 056c939..b04deed 100644 ---- a/config-daemon.ac -+++ b/config-daemon.ac -@@ -7,2 +7,3 @@ dnl C++ environment. This macro must be used unconditionnaly. - AC_PROG_CXX -+AM_PROG_AR - AC_LANG([C++]) diff --git a/sys-apps/guix/files/guix-0.12.0-no-json-crate.patch b/sys-apps/guix/files/guix-0.12.0-no-json-crate.patch deleted file mode 100644 index 57b4308a3a89..000000000000 --- a/sys-apps/guix/files/guix-0.12.0-no-json-crate.patch +++ /dev/null @@ -1,38 +0,0 @@ -commit 6023041346c79f7ac4105bba2552a82019fae840 -Author: David Thompson <davet@gnu.org> -Date: Fri Dec 30 14:15:35 2016 -0500 - - import: crate: Do not build when guile-json is not available. - - * Makefile.am (MODULES): Add 'guix/import/crate.scm' and - 'guix/scripts/import/crate.scm' only when HAVE_GUILE_JSON. - -diff --git a/Makefile.am b/Makefile.am -index 15939af12..97629f26e 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -122,7 +122,6 @@ MODULES = \ - guix/import/snix.scm \ - guix/import/cabal.scm \ - guix/import/cran.scm \ -- guix/import/crate.scm \ - guix/import/hackage.scm \ - guix/import/elpa.scm \ - guix/scripts.scm \ -@@ -142,7 +141,6 @@ MODULES = \ - guix/scripts/lint.scm \ - guix/scripts/challenge.scm \ - guix/scripts/import/cran.scm \ -- guix/scripts/import/crate.scm \ - guix/scripts/import/gnu.scm \ - guix/scripts/import/nix.scm \ - guix/scripts/import/hackage.scm \ -@@ -162,6 +160,8 @@ if HAVE_GUILE_JSON - MODULES += \ - guix/import/github.scm \ - guix/import/json.scm \ -+ guix/import/crate.scm \ -+ guix/scripts/import/crate.scm \ - guix/import/pypi.scm \ - guix/scripts/import/pypi.scm \ - guix/import/cpan.scm \ diff --git a/sys-apps/guix/guix-0.12.0-r3.ebuild b/sys-apps/guix/guix-0.14.0.ebuild index 3aea5c64be89..fee128e9630b 100644 --- a/sys-apps/guix/guix-0.12.0-r3.ebuild +++ b/sys-apps/guix/guix-0.14.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -8,8 +8,9 @@ inherit autotools readme.gentoo-r1 user DESCRIPTION="GNU package manager (nix sibling)" HOMEPAGE="https://www.gnu.org/software/guix/" -# taken from gnu/local.mk +# taken from gnu/local.mk and build-aux/download.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" @@ -51,8 +52,11 @@ 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/guile-2:=[regex,networking,threads] + dev-scheme/bytestructures + dev-scheme/guile-git dev-scheme/guile-json + net-libs/gnutls[guile] sys-libs/zlib app-arch/bzip2 dev-db/sqlite @@ -61,12 +65,9 @@ RDEPEND=" DEPEND="${RDEPEND} " -QA_PREBUILT="usr/share/guile/site/2.0/gnu/packages/bootstrap/*" +PATCHES=("${FILESDIR}"/${PN}-0.13.0-default-daemon.patch) -PATCHES=( - "${FILESDIR}"/${P}-no-json-crate.patch - "${FILESDIR}"/${P}-AR.patch -) +QA_PREBUILT="usr/share/guile/site/*/gnu/packages/bootstrap/*" DISABLE_AUTOFORMATTING=yes DOC_CONTENTS="Quick start user guide on Gentoo: @@ -97,18 +98,28 @@ pkg_setup() { done } -src_configure() { - # to be compatible with guix from /gnu/store - econf \ - --localstatedir="${EPREFIX}"/var -} - src_prepare() { copy_boot_guile_binaries default + # build system is very eager to run automake itself: bug #625166 + eautomake + + # 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 +} - eautoreconf +src_configure() { + # to be compatible with guix from /gnu/store + econf \ + --localstatedir="${EPREFIX}"/var } src_compile() { |