ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-23 11:09:41 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: guix: Update snapshot to bdf0c64.

Browse source 
* gnu/packages/package-management.scm (guix): Update to bdf0c64.
[arguments] <copy-bootstrap-guile>: Move after 'check' phase.  Rewrite
to use "guix download" and to intern only one or two tarballs.
[inputs]: Remove "boot-guile/*".  Add "boot-guile" and, optionally,
"boot-guile/i686".
This commit is contained in:
Ludovic Courtès 2018-02-19 00:06:23 +01:00
parent 37084ba561
commit 5912791655
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 29 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
gnu/packages/package-management.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015, 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2017 Muriithi Frederick Muriuki <fredmanglis@gmail.com> ;;; Copyright © 2017 Muriithi Frederick Muriuki <fredmanglis@gmail.com>
;;; Copyright © 2017 Oleg Pykhalov <go.wigust@gmail.com> ;;; Copyright © 2017 Oleg Pykhalov <go.wigust@gmail.com>
@ -92,8 +92,8 @@ (define-public guix
;; Note: the 'update-guix-package.scm' script expects this definition to ;; Note: the 'update-guix-package.scm' script expects this definition to
;; start precisely like this. ;; start precisely like this.
(let ((version "0.14.0") (let ((version "0.14.0")
(commit "bc880f9d668448b95ae1c1d3761e61c4c514955b") (commit "bdf0c644dafbce2a532161f04e9bf88c9310e081")
(revision 8)) (revision 9))
(package (package
(name "guix") (name "guix")
@ -109,7 +109,7 @@ (define-public guix
(commit commit))) (commit commit)))
(sha256 (sha256
(base32 (base32
"0v4jr22cwajyndknfj0dy9brfvs6sgv0ansr76n4giybmsay28w4")) "1lmkgg4c38jkd1dk9cbh3zamyrh5vml8w8445hn8wq5c3mjj2n01"))
(file-name (string-append "guix-" version "-checkout")))) (file-name (string-append "guix-" version "-checkout"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
@ -156,31 +156,27 @@ (define-public guix
(display ,version port))) (display ,version port)))
(zero? (system* "sh" "bootstrap")))) (zero? (system* "sh" "bootstrap"))))
(add-before (add-before 'check 'copy-bootstrap-guile
'configure 'copy-bootstrap-guile
(lambda* (#:key system inputs #:allow-other-keys) (lambda* (#:key system inputs #:allow-other-keys)
(define (boot-guile-version arch) ;; Copy the bootstrap guile tarball in the store used
(cond ((string=? "armhf" arch) "2.0.11") ;; by the test suite.
((string=? "aarch64" arch) "2.0.14") (define (intern tarball)
(else "2.0.9"))) (let ((base (strip-store-file-name tarball)))
(copy-file tarball base)
(invoke "./test-env" "guix" "download"
(string-append "file://" (getcwd)
"/" base))
(delete-file base)))
(define (copy arch)
(let ((guile (assoc-ref inputs
(string-append "boot-guile/"
arch)))
(target (string-append "gnu/packages/bootstrap/"
arch "-linux/"
"/guile-"
(boot-guile-version arch)
".tar.xz")))
(mkdir-p (dirname target)) ;XXX: eventually unneeded
(copy-file guile target)))
(copy "i686") (intern (assoc-ref inputs "boot-guile"))
(copy "x86_64")
(copy "mips64el") ;; On x86_64 some tests need the i686 Guile.
(copy "armhf") ,@(if (and (not (%current-target-system))
(copy "aarch64") (string=? (%current-system)
"x86_64-linux"))
'((intern (assoc-ref inputs "boot-guile/i686")))
'())
#t)) #t))
(add-after 'unpack 'disable-failing-tests (add-after 'unpack 'disable-failing-tests
;; XXX FIXME: These tests fail within the build container. ;; XXX FIXME: These tests fail within the build container.
@ -258,11 +254,13 @@ (define (copy arch)
("libgcrypt" ,libgcrypt) ("libgcrypt" ,libgcrypt)
("guile" ,guile-2.2) ("guile" ,guile-2.2)
("boot-guile/i686" ,(bootstrap-guile-origin "i686-linux")) ;; Many tests rely on the 'guile-bootstrap' package, which is why we
("boot-guile/x86_64" ,(bootstrap-guile-origin "x86_64-linux")) ;; have it here.
("boot-guile/mips64el" ,(bootstrap-guile-origin "mips64el-linux")) ("boot-guile" ,(bootstrap-guile-origin (%current-system)))
("boot-guile/armhf" ,(bootstrap-guile-origin "armhf-linux")) ,@(if (and (not (%current-target-system))
("boot-guile/aarch64" ,(bootstrap-guile-origin "aarch64-linux")))) (string=? (%current-system) "x86_64-linux"))
`(("boot-guile/i686" ,(bootstrap-guile-origin "i686-linux")))
'())))
(propagated-inputs (propagated-inputs
`(("gnutls" ,gnutls) `(("gnutls" ,gnutls)
("guile-json" ,guile-json) ("guile-json" ,guile-json)