01/02: shell: Correct cache key for ‘guix shell -f guix.scm’.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit 762be400984e2e537ecb205acace1d7d541d5f8a
Author: Felix Lechner <felix.lechner@lease-up.com>
AuthorDate: Wed Nov 22 23:08:28 2023 +0100

    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
---
 guix/scripts/shell.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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)))