diff options
author | Ludovic Courtès <ludo@gnu.org> | 2019-10-08 11:23:22 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2019-10-08 11:37:07 +0200 |
commit | cf3d1763ede1a329c2bc932c84591ab594bb6c96 (patch) | |
tree | 665f92418f8671474de3815241fb657384463c94 /gnu/packages/guile.scm | |
parent | d57660c54907cc6fba8b0adf6295fd2311ada6cf (diff) | |
parent | 2fa55c72476c73211cbb2d6b29c05a1ad58a6cf9 (diff) |
Merge branch 'core-updates'
Diffstat (limited to 'gnu/packages/guile.scm')
-rw-r--r-- | gnu/packages/guile.scm | 60 |
1 files changed, 16 insertions, 44 deletions
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index ce6c57cd12..49a6e964a3 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -216,7 +216,7 @@ without requiring the source code to be rewritten.") (define-public guile-2.2 (package (inherit guile-2.0) (name "guile") - (version "2.2.4") + (version "2.2.6") (source (origin (method url-fetch) @@ -226,8 +226,10 @@ without requiring the source code to be rewritten.") ".tar.xz")) (sha256 (base32 - "07p3g0v2ba2vlfbfidqzlgbhnzdx46wh2rgc5gszq1mjyx5bks6r")) + "1269ymxm56j1z1lvq1y42rm961f2n7rinm3k6l00p9k52hrpcddk")) (modules '((guix build utils))) + (patches (search-patches + "guile-2.2-skip-oom-test.patch")) ;; Remove the pre-built object files. Instead, build everything ;; from source, at the expense of significantly longer build @@ -245,36 +247,7 @@ without requiring the source code to be rewritten.") (files '("share/guile/site/2.2"))) (search-path-specification (variable "GUILE_LOAD_COMPILED_PATH") - (files '("lib/guile/2.2/site-ccache"))))) - - (arguments - (if (%current-target-system) - (substitute-keyword-arguments (package-arguments guile-2.0) - ((#:phases phases '%standard-phases) - `(modify-phases ,phases - (add-after 'unpack 'sacrifice-elisp-support - (lambda _ - ;; Cross-compiling language/elisp/boot.el fails, so - ;; sacrifice it. See - ;; <https://git.savannah.gnu.org/cgit/guile.git/commit/?h=stable-2.2&id=988aa29238fca862c7e2cb55f15762a69b4c16ce> - ;; for the upstream fix. - (substitute* "module/Makefile.in" - (("language/elisp/boot\\.el") - "\n")) - #t)) - ,@(if (hurd-target?) - `((add-after 'unpack 'allow-madvise-ENOSYS - (lambda _ - ;; Do not warn about ENOSYS on 'madvise'. This is - ;; what Guile commit - ;; 45e4ace6603e00b297e6542362273041aebe7305 does. - ;; TODO: Remove for Guile >= 2.2.5. - (substitute* "libguile/vm.c" - (("perror \\(\"madvise failed\"\\)") - "if (errno != ENOSYS) perror (\"madvised failed\");")) - #t))) - '())))) - (package-arguments guile-2.0))))) + (files '("lib/guile/2.2/site-ccache"))))))) (define-public guile-2.2/fixed ;; A package of Guile 2.2 that's rarely changed. It is the one used @@ -285,18 +258,17 @@ without requiring the source code to be rewritten.") (timeout . 72000) ;20 hours (max-silent-time . 36000))))) ;10 hours (needed on ARM ; when heavily loaded) - -(define-public guile-2.2.6 - (package - (inherit guile-2.2) - (version "2.2.6") - (source (origin - (inherit (package-source guile-2.2)) - (uri (string-append "mirror://gnu/guile/guile-" version - ".tar.xz")) - (sha256 - (base32 - "1269ymxm56j1z1lvq1y42rm961f2n7rinm3k6l00p9k52hrpcddk")))))) +(define-public guile-2.2.4 + (package/inherit + guile-2.2 + (version "2.2.4") + (source (origin + (inherit (package-source guile-2.2)) + (uri (string-append "mirror://gnu/guile/guile-" version + ".tar.xz")) + (sha256 + (base32 + "07p3g0v2ba2vlfbfidqzlgbhnzdx46wh2rgc5gszq1mjyx5bks6r")))))) (define-public guile-next ;; This is the upcoming Guile 3.0, with JIT support. |