diff options
| author | John Kehayias <john.kehayias@protonmail.com> | 2023-11-26 11:12:59 -0500 |
|---|---|---|
| committer | John Kehayias <john.kehayias@protonmail.com> | 2023-11-26 11:12:59 -0500 |
| commit | d15ffea6f47a40a9d36f3f32935e63f92e90af03 (patch) | |
| tree | 826b3be17acf0f680e7888b3f7a3eeeaaedded7d /guix/scripts/shell.scm | |
| parent | 8d2a5a36af4c36dfa08c7ee75d7a06ebb7a8225a (diff) | |
| parent | 176440c056fdde6da98b11720989b1ed060ec97c (diff) | |
Merge branch 'master' into mesa-updates
Change-Id: Ide02272218e76dfae6dc9f8748871c8d61704260
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) |