diff options
author | David Elsing <david.elsing@posteo.net> | 2025-03-04 20:33:08 +0000 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2025-03-05 00:28:49 +0100 |
commit | 30e51cb6b42e86f9f94d6380f69a1020ee99ff39 (patch) | |
tree | 6bcf2847774381f7c3a102c1a0ae143ee97d9879 /etc/manifests/system-tests.scm | |
parent | 749eb1a2dd9fdf63a71f223b3f6756d9cb5940e6 (diff) |
gexp: ‘with-parameters’ properly handles ‘%graft?’.
Fixes <https://issues.guix.gnu.org/75879>.
* .dir-locals.el (scheme-mode): Remove mparameterize indentation rules.
Add state-parameterize and store-parameterize indentation rules.
* etc/manifests/system-tests.scm (test-for-current-guix): Replace
mparameterize with store-parameterize.
* etc/manifests/time-travel.scm (guix-instance-compiler): Likewise.
* gnu/tests.scm (compile-system-test): Likewise.
* guix/gexp.scm (compile-parameterized): Use state-call-with-parameters.
* guix/monads.scm (mparameterize): Remove macro.
(state-call-with-parameters): New procedure.
(state-parameterize): New macro.
* guix/store.scm (store-parameterize): New macro.
* tests/gexp.scm ("with-parameters for %graft?"): New test.
* tests/monads.scm ("mparameterize"): Remove test.
("state-parameterize"): New test.
Co-authored-by: Ludovic Courtès <ludo@gnu.org>
Change-Id: I0c74066ca3f37072815b073fb3039925488a9645
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'etc/manifests/system-tests.scm')
-rw-r--r-- | etc/manifests/system-tests.scm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/manifests/system-tests.scm b/etc/manifests/system-tests.scm index 4e16c53dcf..430f507520 100644 --- a/etc/manifests/system-tests.scm +++ b/etc/manifests/system-tests.scm @@ -53,7 +53,7 @@ instance." (map (lambda (test) (system-test (inherit test) - (value (mparameterize %store-monad ((current-guix-package guix)) + (value (store-parameterize ((current-guix-package guix)) (system-test-value test))))) (match (getenv "TESTS") (#f |