diff options
| author | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2024-01-21 09:59:52 +0100 |
|---|---|---|
| committer | Liliana Marie Prikler <liliana.prikler@gmail.com> | 2024-01-21 09:59:55 +0100 |
| commit | ff1ec930e5baa00b483f1ce43fa8bec18c797c03 (patch) | |
| tree | 1c102408d5d79e12b70fe81f97602d3856ed334e /guix/scripts/shell.scm | |
| parent | 60c97924e9519361494aaf0686e28eb831a42315 (diff) | |
| parent | c7f937cfdd9a08bad81705fe731e9fa5937cf562 (diff) | |
| download | guix-ff1ec930e5baa00b483f1ce43fa8bec18c797c03.tar guix-ff1ec930e5baa00b483f1ce43fa8bec18c797c03.tar.gz | |
Merge branch 'master' into emacs-team
Diffstat (limited to 'guix/scripts/shell.scm')
| -rw-r--r-- | guix/scripts/shell.scm | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/guix/scripts/shell.scm b/guix/scripts/shell.scm index 10ea110fee..0584a7e018 100644 --- a/guix/scripts/shell.scm +++ b/guix/scripts/shell.scm @@ -399,9 +399,16 @@ return #f and #f." ((('nesting? . #t) . rest) (loop rest system file (append specs '("nested guix")))) ((('load . ('package candidate)) . rest) + ;; This is 'guix shell -D -f guix.scm'. (if (and (not file) (null? specs)) (loop rest system candidate specs) (values #f #f))) + ((('load . ('ad-hoc-package candidate)) . rest) + ;; When running 'guix shell -f guix.scm', one typically expects + ;; 'guix.scm' to be evaluated every time because it may contain + ;; references like (local-file "." #:recursive? #t). Thus, disable + ;; caching. + (values #f #f)) ((('manifest . candidate) . rest) (if (and (not file) (null? specs)) (loop rest system candidate specs) |