From bc1ad69605b6c3e2744694758d63dfc216107a82 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Fri, 11 Feb 2022 23:17:00 +0100 Subject: 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. --- tests/packages.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'tests/packages.scm') 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 +;;; Copyright © 2012-2022 Ludovic Courtès ;;; Copyright © 2018 Jan (janneke) Nieuwenhuizen ;;; Copyright © 2021 Maxim Cournoyer ;;; Copyright © 2021 Maxime Devos @@ -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) -- cgit v1.2.3