diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2026-02-24 15:15:53 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2026-05-10 17:01:07 +0200 |
| commit | 94ae360ab4039afc8c942e77ba495705850c1e65 (patch) | |
| tree | ad42cd7d964ed0e3a82b7ae2711d748473d4cfd4 /tests | |
| parent | a6f6e6c7b3354a2138b7573b352a4fa3bc6a10be (diff) | |
ui: ‘load*’ takes a list of modules to import.
* guix/ui.scm (load*): Change ‘module’ to ‘imports’. Define ‘user-module’.
* guix/scripts/build.scm (options->things-to-build): Update to new ‘load*’
calling convention.
* guix/scripts/deploy.scm (load-source-file): Likewise.
* guix/scripts/environment.scm (load-manifest)
(options/resolve-packages): Likewise.
* guix/scripts/home.scm (process-action): Likewise.
(%user-module): Rename to…
(%user-modules): … this, and change to a list of module names.
* guix/scripts/pack.scm (guix-pack): Update ‘load*’ calls.
* guix/scripts/package.scm (load-manifest, %options): Likewise.
* guix/scripts/pull.scm (channel-list): Likewise.
* guix/scripts/refresh.scm (packages-from-manifest): Likewise.
* guix/scripts/system.scm (%user-module): Rename to…
(%user-modules): … this, and change to a list of module names.
(read-operating-system): Adjust accordingly.
(process-action): Likewise.
* guix/scripts/weather.scm (load-manifest): Likewise.
* tests/gexp.scm ("local-file, relative file name, within gexp, compiled"):
Likewise.
Change-Id: Ic838e66719d89de556ac0872c3ce0c8ff6de8790
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/gexp.scm | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tests/gexp.scm b/tests/gexp.scm index ddb9904fef0..bc75d479b44 100644 --- a/tests/gexp.scm +++ b/tests/gexp.scm | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | ;;; GNU Guix --- Functional package management for GNU | 1 | ;;; GNU Guix --- Functional package management for GNU |
| 2 | ;;; Copyright © 2014-2025 Ludovic Courtès <ludo@gnu.org> | 2 | ;;; Copyright © 2014-2026 Ludovic Courtès <ludo@gnu.org> |
| 3 | ;;; Copyright © 2021-2022 Maxime Devos <maximedevos@telenet.be> | 3 | ;;; Copyright © 2021-2022 Maxime Devos <maximedevos@telenet.be> |
| 4 | ;;; Copyright © 2026 David Elsing <david.elsing@posteo.net> | 4 | ;;; Copyright © 2026 David Elsing <david.elsing@posteo.net> |
| 5 | ;;; | 5 | ;;; |
| @@ -281,11 +281,10 @@ | |||
| 281 | (basename file) "\" \"t.scm\"))") | 281 | (basename file) "\" \"t.scm\"))") |
| 282 | port))) | 282 | port))) |
| 283 | 283 | ||
| 284 | (let* ((interned (add-to-store %store "t.scm" #f "sha256" file)) | 284 | (let* ((interned (add-to-store %store "t.scm" #f "sha256" file))) |
| 285 | (module (make-fresh-user-module))) | ||
| 286 | (module-use! module (resolve-interface '(guix gexp))) | 285 | (module-use! module (resolve-interface '(guix gexp))) |
| 287 | (equal? `(this file is ,interned) | 286 | (equal? `(this file is ,interned) |
| 288 | (gexp->sexp* (load* file module)))))) | 287 | (gexp->sexp* (load* file '())))))) |
| 289 | 288 | ||
| 290 | (test-assertm "local-file, #:select?" | 289 | (test-assertm "local-file, #:select?" |
| 291 | (mlet* %store-monad ((select? -> (lambda (file stat) | 290 | (mlet* %store-monad ((select? -> (lambda (file stat) |
