diff options
| author | Felix Lechner <felix.lechner@lease-up.com> | 2023-11-22 23:08:28 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2023-11-22 23:55:12 +0100 |
| commit | 762be400984e2e537ecb205acace1d7d541d5f8a (patch) | |
| tree | e5e9a2afef4f44a74c13e567aebe52d288d8aa2c | |
| parent | 5e8e9bcd25e7bfe945e6e31778e156b796bbc131 (diff) | |
| download | guix-762be400984e2e537ecb205acace1d7d541d5f8a.tar.gz guix-762be400984e2e537ecb205acace1d7d541d5f8a.zip | |
shell: Correct cache key for ‘guix shell -f guix.scm’.
Partially fixes <https://issues.guix.gnu.org/64858>.
Fixes a bug whereby ‘guix shell -f guix.scm’ would use the same cache
key as ‘guix shell’ in an empty directory (meaning: no packages
specified) and would ignore the mtime of ‘guix.scm’.
* guix/scripts/shell.scm (profile-cached-gc-root): In ‘load’ case,
recognize both the ‘package’ and ‘ad-hoc-package’ tags.
Co-authored-by: Ludovic Courtès <ludo@gnu.org>
Change-Id: Ice6d0ac43e1dc6bb335a17963364c2cc6bcd076d
| -rw-r--r-- | guix/scripts/shell.scm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/guix/scripts/shell.scm b/guix/scripts/shell.scm index 10ea110fee..ef22cd60e6 100644 --- a/guix/scripts/shell.scm +++ b/guix/scripts/shell.scm @@ -398,7 +398,7 @@ return #f and #f." (values #f #f))) ((('nesting? . #t) . rest) (loop rest system file (append specs '("nested guix")))) - ((('load . ('package candidate)) . rest) + ((('load . (_ candidate)) . rest) (if (and (not file) (null? specs)) (loop rest system candidate specs) (values #f #f))) |