diff options
Diffstat (limited to 'gnu/packages/guile.scm')
| -rw-r--r-- | gnu/packages/guile.scm | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index a0ed572cc0..2fd9b711ce 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012-2022 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2012-2023 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014 Cyril Roelandt <tipecaml@gmail.com> ;;; Copyright © 2014, 2016, 2018 David Thompson <davet@gnu.org> ;;; Copyright © 2014, 2017, 2018 Mark H Weaver <mhw@netris.org> @@ -391,19 +391,17 @@ without requiring the source code to be rewritten.") (define-public guile-3.0-latest (package (inherit guile-3.0) - (version "3.0.8") + (version "3.0.9") (source (origin (inherit (package-source guile-3.0)) (uri (string-append "mirror://gnu/guile/guile-" version ".tar.xz")) (sha256 (base32 - "04wagg0zr0sib0w9ly5jm91jplgfigzfgmy8fjdlx07jaq50d9ys")) - (patches (search-patches "guile-cross-compilation.patch" - "guile-continuation-stack-leak.patch")))) + "03bm1mnfc9kkg2ls942a0js7bxrdzmcffgrgg6anwdmjfan2a9hs")))) (arguments (substitute-keyword-arguments (package-arguments guile-3.0) - ;; Guile 3.0.8 is bit-reproducible when built in parallel, thanks to + ;; Guile 3.0.9 is bit-reproducible when built in parallel, thanks to ;; its multi-stage build process for cross-module inlining, except when ;; cross-compiling. ((#:parallel-build? _ #f) @@ -421,7 +419,11 @@ without requiring the source code to be rewritten.") "GUILE_OPTIMIZATIONS = -O1 -Oresolve-primitives -Ocps\n"))))) '()))))))) -(define-public guile-3.0/fixed +;;; The symbol guile-3.0/fixed should be used when guile-3.0 needs fixes +;;; (security or else) and this deprecation could be removed. +(define-deprecated/public-alias guile-3.0/fixed guile-3.0/pinned) + +(define-public guile-3.0/pinned ;; A package of Guile that's rarely changed. It is the one used in the ;; `base' module, and thus changing it entails a full rebuild. (package @@ -453,6 +455,16 @@ without requiring the source code to be rewritten.") (substitute-keyword-arguments (package-arguments guile-3.0) ((#:phases phases '%standard-phases) `(modify-phases ,phases + (add-before 'bootstrap 'set-version + (lambda _ + ;; Tell 'git-version-gen' what version this is, or it will + ;; just pick "UNKNOWN", making it unusable as a replacement + ;; for 'guile-3.0'. XXX: This is inaccurate when using + ;; '--with-branch' but using (package-version this-package) + ;; wouldn't give us a valid version string. + (call-with-output-file ".tarball-version" + (lambda (port) + (display ,version port))))) (add-before 'check 'skip-failing-tests (lambda _ (substitute* "test-suite/standalone/test-out-of-memory" @@ -467,7 +479,8 @@ without requiring the source code to be rewritten.") flex gnu-gettext texinfo - gperf))) + gperf) + (replace "self" this-package))) (synopsis "Development version of GNU Guile")))) (define* (make-guile-readline guile #:optional (name "guile-readline")) |