diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2022-02-11 15:58:56 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2022-02-11 17:28:00 +0100 |
| commit | af57d1bf6c46f47d82dbc234dde1e16fa8634e9d (patch) | |
| tree | 50984bad3a8c2e356b20321ec74f96a642505ce5 /gnu | |
| parent | c1539e1385e2287c5f6eb0a69efdb1d539fe15f5 (diff) | |
| download | guix-af57d1bf6c46f47d82dbc234dde1e16fa8634e9d.tar.gz | |
gexp: <computed-file> does not honor (%guile-for-build).
* guix/gexp.scm (computed-file-compiler): Default to (default-guile). That way, lowering of <computed-file> is not affected by the '%guile-for-build' parameter. (file-union): Add #:guile parameter and honor it. * gnu/packages/ruby.scm (ruby-tzinfo-data): Pass #:guile to 'file-union'.
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/ruby.scm | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index b242aa8295..121948b4fc 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2014, 2015 Pjotr Prins <pjotr.guix@thebird.nl> -;;; Copyright © 2014, 2015, 2016, 2017, 2021 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2014-2017, 2021-2022 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014, 2015 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2014, 2015 David Thompson <davet@gnu.org> ;;; Copyright © 2015, 2019 Ricardo Wurmus <rekado@elephly.net> @@ -5717,7 +5717,14 @@ aware transformations between times in different time zones.") (uri "https://data.iana.org/time-zones/releases/tzcode2021a.tar.gz.asc") (sha256 (base32 - "1qhlj4lr810s47s1lwcvv1sgvg2sflf98w4sbg1lc8wzv5qxxv7g"))))))))) + "1qhlj4lr810s47s1lwcvv1sgvg2sflf98w4sbg1lc8wzv5qxxv7g"))))) + + ;; XXX: Explicitly depend on 'guile-final', which was previously + ;; implied via the '%guile-for-build' fluid but not explicit. + ;; TODO: Remove this argument on the next rebuild cycle. + #:guile (module-ref (resolve-interface + '(gnu packages commencement)) + 'guile-final))))) (synopsis "Data from the IANA Time Zone database") (description "This library provides @code{TZInfo::Data}, which contains data from the |