diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2017-04-08 23:10:50 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2017-04-08 23:27:08 +0200 |
| commit | 34d624cef51f0e4eb4e888622b60fc2befe31fa7 (patch) | |
| tree | c75a68670184f4a7275edf82454a213843d537a9 /gnu/packages/guile.scm | |
| parent | 27695e22df089e560995a5bcd503fac8011ead05 (diff) | |
| download | guix-34d624cef51f0e4eb4e888622b60fc2befe31fa7.tar guix-34d624cef51f0e4eb4e888622b60fc2befe31fa7.tar.gz | |
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.
Diffstat (limited to 'gnu/packages/guile.scm')
| -rw-r--r-- | gnu/packages/guile.scm | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 96fc84a960..46e6dea747 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -209,14 +209,6 @@ without requiring the source code to be rewritten.") (home-page "https://www.gnu.org/software/guile/") (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 (package (inherit guile-2.0) (name "guile") @@ -224,11 +216,14 @@ without requiring the source code to be rewritten.") (replacement #f) (source (origin (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 - ".tar.lz")) + ".tar.xz")) (sha256 (base32 - "083vp6754dp4d5pvcy4bqvxq60cayf92v5slf5cgij8bnvixgyvr")) + "05dmvhd1y135x7w5qfw4my42cfp6l8bbhjfxvchcc1cbdvzri0f1")) (modules '((guix build utils))) ;; 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" "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 (deprecated-package "guile-next" guile-2.2)) |