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

gnu: guix: Update snapshot.

Browse source 
* gnu/packages/package-management.scm (boot-guile-uri): New procedure.
  (guix-0.8): Add "boot-guile/armhf" input.  Update
  'copy-bootstrap-guile' phase to handle it.
  (guix-devel): Update snapshot.
This commit is contained in:
Ludovic Courtès 2015-01-27 10:17:28 +01:00
parent a795477b20
commit 39de700c6f
1 changed files with 27 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -40,6 +40,16 @@ (define-module (gnu packages package-management)
#:use-module (gnu packages openssl) #:use-module (gnu packages openssl)
#:use-module (gnu packages bdw-gc)) #:use-module (gnu packages bdw-gc))
(define (boot-guile-uri arch)
"Return the URI for the bootstrap Guile tarball for ARCH."
(if (string=? "armhf" arch)
(string-append "http://alpha.gnu.org/gnu/guix/bootstrap/"
arch "-linux"
"/20150101/guile-2.0.11.tar.xz")
(string-append "http://alpha.gnu.org/gnu/guix/bootstrap/"
arch "-linux"
"/20131110/guile-2.0.9.tar.xz")))
(define-public guix-0.8 (define-public guix-0.8
(package (package
(name "guix") (name "guix")
@ -62,18 +72,26 @@ (define-public guix-0.8
#:phases (alist-cons-before #:phases (alist-cons-before
'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)
(if (string=? "armhf" arch)
"2.0.11"
"2.0.9"))
(define (copy arch) (define (copy arch)
(let ((guile (assoc-ref inputs (let ((guile (assoc-ref inputs
(string-append "boot-guile/" (string-append "boot-guile/"
arch))) arch)))
(target (string-append "gnu/packages/bootstrap/" (target (string-append "gnu/packages/bootstrap/"
arch "-linux/" arch "-linux/"
"/guile-2.0.9.tar.xz"))) "/guile-"
(boot-guile-version arch)
".tar.xz")))
(copy-file guile target))) (copy-file guile target)))
(copy "i686") (copy "i686")
(copy "x86_64") (copy "x86_64")
(copy "mips64el") (copy "mips64el")
(copy "armhf")
#t) #t)
%standard-phases))) %standard-phases)))
(native-inputs `(("pkg-config" ,pkg-config) (native-inputs `(("pkg-config" ,pkg-config)
@ -82,10 +100,7 @@ (define (copy arch)
(let ((boot-guile (lambda (arch hash) (let ((boot-guile (lambda (arch hash)
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (boot-guile-uri arch))
"http://alpha.gnu.org/gnu/guix/bootstrap/"
arch "-linux"
"/20131110/guile-2.0.9.tar.xz"))
(sha256 hash))))) (sha256 hash)))))
`(("bzip2" ,bzip2) `(("bzip2" ,bzip2)
("gzip" ,gzip) ("gzip" ,gzip)
@ -105,7 +120,11 @@ (define (copy arch)
("boot-guile/mips64el" ("boot-guile/mips64el"
,(boot-guile "mips64el" ,(boot-guile "mips64el"
(base32 (base32
"0fzp93lvi0hn54acc0fpvhc7bvl0yc853k62l958cihk03q80ilr")))))) "0fzp93lvi0hn54acc0fpvhc7bvl0yc853k62l958cihk03q80ilr")))
("boot-guile/armhf"
,(boot-guile "armhf"
(base32
"1mi3brl7l58aww34rawhvja84xc7l1b4hmwdmc36fp9q9mfx0lg5"))))))
(home-page "http://www.gnu.org/software/guix") (home-page "http://www.gnu.org/software/guix")
(synopsis "Functional package manager for installed software packages and versions") (synopsis "Functional package manager for installed software packages and versions")
(description (description
@ -118,7 +137,7 @@ (define (copy arch)
(define guix-devel (define guix-devel
;; Development version of Guix. ;; Development version of Guix.
(let ((commit "4655005")) (let ((commit "4ad8789"))
(package (inherit guix-0.8) (package (inherit guix-0.8)
(version (string-append "0.8." commit)) (version (string-append "0.8." commit))
(source (origin (source (origin
@ -128,7 +147,7 @@ (define guix-devel
(commit commit))) (commit commit)))
(sha256 (sha256
(base32 (base32
"04dmmnr88mwpsl0mmv03hpllyinn9cs4mmly8k0jm2acwnsni3ii")))) "058gf7fg5k8ldchz63j5ssqr2lx8dn1wa1rllg7krrfr6g8abi34"))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments guix-0.8) (substitute-keyword-arguments (package-arguments guix-0.8)
((#:phases phases) ((#:phases phases)