diff options
author | Ricardo Wurmus <rekado@elephly.net> | 2019-08-06 10:07:36 +0200 |
---|---|---|
committer | Ricardo Wurmus <rekado@elephly.net> | 2019-08-06 10:07:36 +0200 |
commit | 378d94e51b00c30b19a39154278d01f1f3c4dbc1 (patch) | |
tree | 0c9ed3a1c1b6db778b05ad03fa8edd91cfb737f4 /gnu/packages/guile.scm | |
parent | d350d5e71434704d147b1252d21e46daf6bb9885 (diff) | |
parent | 6a5198170ed5f10e1eee2e25fc6a39f3f33a40fd (diff) | |
download | guix-patches-378d94e51b00c30b19a39154278d01f1f3c4dbc1.tar guix-patches-378d94e51b00c30b19a39154278d01f1f3c4dbc1.tar.gz |
Merge remote-tracking branch 'origin/master' into wip-texlive
Diffstat (limited to 'gnu/packages/guile.scm')
-rw-r--r-- | gnu/packages/guile.scm | 48 |
1 files changed, 25 insertions, 23 deletions
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index 6e11a13c56..b8a53824b4 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -300,29 +300,27 @@ without requiring the source code to be rewritten.") (define-public guile-next ;; This is the upcoming Guile 3.0, with JIT support. - (let ((commit "6f3357b0df64c4be17e72079864c09a542f1c779") - (revision "1")) - (package - (inherit guile-2.2) - (name "guile-next") - (version "2.9.2") - (source (origin - (inherit (package-source guile-2.2)) - (uri (string-append "ftp://alpha.gnu.org/gnu/guile/guile-" - version ".tar.xz")) - (sha256 - (base32 - "1w358df2wmcyzk2ziqrj2zhwqisaqraqfa3008ay23nf1a7bw0z4")))) - (native-search-paths - (list (search-path-specification - (variable "GUILE_LOAD_PATH") - (files '("share/guile/site/3.0"))) - (search-path-specification - (variable "GUILE_LOAD_COMPILED_PATH") - (files '("lib/guile/3.0/site-ccache" - "share/guile/site/3.0"))))) - (properties '((ftp-server . "alpha.gnu.org") - (upstream-name . "guile")))))) + (package + (inherit guile-2.2) + (name "guile-next") + (version "2.9.3") + (source (origin + (inherit (package-source guile-2.2)) + (uri (string-append "ftp://alpha.gnu.org/gnu/guile/guile-" + version ".tar.xz")) + (sha256 + (base32 + "14990wcpysgw58kij03wbgiggmi5z94jmy7wdcqnn6ny7cimkkgr")))) + (native-search-paths + (list (search-path-specification + (variable "GUILE_LOAD_PATH") + (files '("share/guile/site/3.0"))) + (search-path-specification + (variable "GUILE_LOAD_COMPILED_PATH") + (files '("lib/guile/3.0/site-ccache" + "share/guile/site/3.0"))))) + (properties '((ftp-server . "alpha.gnu.org") + (upstream-name . "guile"))))) (define (make-guile-readline guile) (package @@ -470,6 +468,10 @@ specification. These are the main features: ;; Version 1.2.0 switched to GPLv3+ (from LGPLv3+). (license license:gpl3+))) +(define-public guile-json-1 + ;; This is the 1.x branch of Guile-JSON. + guile-json) + (define-public guile2.2-json (deprecated-package "guile2.2-json" guile-json)) |