diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2022-02-11 23:17:00 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2022-02-11 23:51:39 +0100 |
| commit | bc1ad69605b6c3e2744694758d63dfc216107a82 (patch) | |
| tree | 5eee850233d5f66a9addded1ef6ee3f69e78adc0 /tests/packages.scm | |
| parent | c334b7c52fe77b68a90b23fbac5c9de7337e607b (diff) | |
| download | guix-patches-bc1ad69605b6c3e2744694758d63dfc216107a82.tar guix-patches-bc1ad69605b6c3e2744694758d63dfc216107a82.tar.gz | |
tests: Pass #:guile to 'computed-file' & co.
Fixes a regression introduced in
af57d1bf6c46f47d82dbc234dde1e16fa8634e9d whereby tests would end up
building the world.
* guix/gexp.scm (mixed-text-file): Add #:guile parameter and honor it.
* tests/gexp.scm ("mixed-text-file"): Pass #:guile to 'mixed-text-file'.
("file-union"): Pass #:guile to 'file-union'.
("lower-object, computed-file"): Pass #:guile to 'computed-file'.
("lower-object, computed-file + grafts"): Likewise.
* tests/packages.scm ("origin->derivation, single file with snippet"):
Likewise.
* tests/profiles.scm ("profile-derivation, ordering & collisions"):
Likewise.
* guix/tests.scm (test-file): Likewise.
Diffstat (limited to 'tests/packages.scm')
| -rw-r--r-- | tests/packages.scm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/packages.scm b/tests/packages.scm index 3506f94f91..55b1c4064f 100644 --- a/tests/packages.scm +++ b/tests/packages.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2012-2022 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be> @@ -716,7 +716,8 @@ (use-modules (guix build utils)) (setenv "PATH" #+bin) (invoke "tar" "xvf" #+out) - (copy-file #+name #$output))))) + (copy-file #+name #$output))) + #:guile %bootstrap-guile)) (drv (run-with-store %store (lower-object f))) (_ (build-derivations %store (list drv)))) (call-with-input-file (derivation->output-path drv) |