nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gnu: Build derivations with Guile 2.2 by default. 

* gnu/packages/guile.scm (guile-2.0/fixed): Remove.
(guile-2.2)[source]: Switch from tar.lz to tar.xz.
(guile-2.2/fixed): New variable.
* gnu/packages/commencement.scm (guile-final): Use GUILE-2.2/FIXED
instead of GUILE-2.2/FIXED.
(canonical-package): Mention 2.2 instead of 2.0.
This commit is contained in:
Ludovic Courtès 2017-04-08 23:10:50 +02:00
parent 27695e22df
commit 34d624cef5
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gnu/packages/commencement.scm
View File

@ -821,7 +821,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
;; This package must be public because other modules refer to it. However, ;; This package must be public because other modules refer to it. However,
;; mark it as hidden so that 'fold-packages' ignores it. ;; mark it as hidden so that 'fold-packages' ignores it.
(package-with-bootstrap-guile (package-with-bootstrap-guile
(package-with-explicit-inputs (hidden-package guile-2.0/fixed) (package-with-explicit-inputs (hidden-package guile-2.2/fixed)
%boot4-inputs %boot4-inputs
(current-source-location) (current-source-location)
#:guile %bootstrap-guile))) #:guile %bootstrap-guile)))
@ -940,7 +940,7 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
the implicit inputs of 'gnu-build-system', return that one, otherwise return the implicit inputs of 'gnu-build-system', return that one, otherwise return
PACKAGE. PACKAGE.
The goal is to avoid duplication in cases like GUILE-FINAL vs. GUILE-2.0, The goal is to avoid duplication in cases like GUILE-FINAL vs. GUILE-2.2,
COREUTILS-FINAL vs. COREUTILS, etc." COREUTILS-FINAL vs. COREUTILS, etc."
;; XXX: This doesn't handle dependencies of the final inputs, such as ;; XXX: This doesn't handle dependencies of the final inputs, such as
;; libunistring, GMP, etc. ;; libunistring, GMP, etc.

23
gnu/packages/guile.scm
View File

@ -209,14 +209,6 @@ without requiring the source code to be rewritten.")
(home-page "https://www.gnu.org/software/guile/") (home-page "https://www.gnu.org/software/guile/")
(license license:lgpl3+))) (license license:lgpl3+)))
(define-public guile-2.0/fixed
;; A package of Guile 2.0 that's rarely changed. It is the one used
;; in the `base' module, and thus changing it entails a full rebuild.
(package
(inherit guile-2.0)
(properties '((hidden? . #t))) ;people should install 'guile-2.0'
(replacement #f)))
(define-public guile-2.2 (define-public guile-2.2
(package (inherit guile-2.0) (package (inherit guile-2.0)
(name "guile") (name "guile")
@ -224,11 +216,14 @@ without requiring the source code to be rewritten.")
(replacement #f) (replacement #f)
(source (origin (source (origin
(method url-fetch) (method url-fetch)
;; Note: we are limited to one of the compression formats
;; supported by the bootstrap binaries, so no lzip here.
(uri (string-append "mirror://gnu/guile/guile-" version (uri (string-append "mirror://gnu/guile/guile-" version
".tar.lz")) ".tar.xz"))
(sha256 (sha256
(base32 (base32
"083vp6754dp4d5pvcy4bqvxq60cayf92v5slf5cgij8bnvixgyvr")) "05dmvhd1y135x7w5qfw4my42cfp6l8bbhjfxvchcc1cbdvzri0f1"))
(modules '((guix build utils))) (modules '((guix build utils)))
;; Remove the pre-built object files. Instead, build everything ;; Remove the pre-built object files. Instead, build everything
@ -247,6 +242,14 @@ without requiring the source code to be rewritten.")
(files '("lib/guile/2.2/site-ccache" (files '("lib/guile/2.2/site-ccache"
"share/guile/site/2.2"))))))) "share/guile/site/2.2")))))))
(define-public guile-2.2/fixed
;; A package of Guile 2.2 that's rarely changed. It is the one used
;; in the `base' module, and thus changing it entails a full rebuild.
(package
(inherit guile-2.2)
(properties '((hidden? . #t))) ;people should install 'guile-2.2'
(replacement #f)))
(define-public guile-next (define-public guile-next
(deprecated-package "guile-next" guile-2.2)) (deprecated-package "guile-next" guile-2.2))