From 762be400984e2e537ecb205acace1d7d541d5f8a Mon Sep 17 00:00:00 2001 From: Felix Lechner Date: Wed, 22 Nov 2023 23:08:28 +0100 Subject: shell: Correct cache key for ‘guix shell -f guix.scm’. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Partially fixes . 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 Change-Id: Ice6d0ac43e1dc6bb335a17963364c2cc6bcd076d --- guix/scripts/shell.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'guix/scripts') 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))) -- cgit v1.2.3