TakeV/guix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gnu: guix: Include the aarch64 bootstrap Guile.

Browse source 
* gnu/packages/package-management.scm (boot-guile-uri): Add case for aarch64.
(guix-0.12.0)[arguments] <copy-bootstrap-guile>: Handle aarch64.
[inputs]: Add "boot-guile/aarch64".
This commit is contained in:
Ludovic Courtès 2017-03-30 23:04:03 +02:00
parent 84157bb8bf
commit aef81a81b8
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -56,13 +56,18 @@ (define-module (gnu packages package-management)
(define (boot-guile-uri arch) (define (boot-guile-uri arch)
"Return the URI for the bootstrap Guile tarball for ARCH." "Return the URI for the bootstrap Guile tarball for ARCH."
(if (string=? "armhf" arch) (cond ((string=? "armhf" arch)
(string-append "http://alpha.gnu.org/gnu/guix/bootstrap/" (string-append "http://alpha.gnu.org/gnu/guix/bootstrap/"
arch "-linux" arch "-linux"
"/20150101/guile-2.0.11.tar.xz") "/20150101/guile-2.0.11.tar.xz"))
(string-append "http://alpha.gnu.org/gnu/guix/bootstrap/" ((string=? "aarch64" arch)
arch "-linux" (let ((suffix "/bootstrap/aarch64-linux/20170217/guile-2.0.14.tar.xz"))
"/20131110/guile-2.0.9.tar.xz"))) (list (string-append "http://alpha.gnu.org/gnu/guix" suffix)
(string-append "http://flashner.co.il/guix" suffix))))
(else
(string-append "http://alpha.gnu.org/gnu/guix/bootstrap/"
arch "-linux"
"/20131110/guile-2.0.9.tar.xz"))))
(define-public guix-0.12.0 (define-public guix-0.12.0
(package (package
@ -92,9 +97,9 @@ (define-public guix-0.12.0
'configure '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) (define (boot-guile-version arch)
(if (string=? "armhf" arch) (cond ((string=? "armhf" arch) "2.0.11")
"2.0.11" ((string=? "aarch64" arch) "2.0.14")
"2.0.9")) (else "2.0.9")))
(define (copy arch) (define (copy arch)
(let ((guile (assoc-ref inputs (let ((guile (assoc-ref inputs
@ -105,12 +110,14 @@ (define (copy arch)
"/guile-" "/guile-"
(boot-guile-version arch) (boot-guile-version arch)
".tar.xz"))) ".tar.xz")))
(mkdir-p (dirname target)) ;XXX: eventually unneeded
(copy-file guile target))) (copy-file guile target)))
(copy "i686") (copy "i686")
(copy "x86_64") (copy "x86_64")
(copy "mips64el") (copy "mips64el")
(copy "armhf") (copy "armhf")
(copy "aarch64")
#t)) #t))
(add-after (add-after
'unpack 'disable-container-tests 'unpack 'disable-container-tests
@ -192,7 +199,11 @@ (define (copy arch)
("boot-guile/armhf" ("boot-guile/armhf"
,(boot-guile "armhf" ,(boot-guile "armhf"
(base32 (base32
"1mi3brl7l58aww34rawhvja84xc7l1b4hmwdmc36fp9q9mfx0lg5")))))) "1mi3brl7l58aww34rawhvja84xc7l1b4hmwdmc36fp9q9mfx0lg5")))
("boot-guile/aarch64"
,(boot-guile "aarch64"
(base32
"1giy2aprjmn5fp9c4s9r125fljw4wv6ixy5739i5bffw4jgr0f9r"))))))
(propagated-inputs (propagated-inputs
`(("gnutls" ,gnutls) ;for 'guix download' & co. `(("gnutls" ,gnutls) ;for 'guix download' & co.
("guile-json" ,guile-json) ("guile-json" ,guile-json)