diff options
| author | Mathieu Othacehe <othacehe@gnu.org> | 2021-12-10 21:49:25 +0100 |
|---|---|---|
| committer | Mathieu Othacehe <othacehe@gnu.org> | 2021-12-10 21:49:25 +0100 |
| commit | 32750e8c3ed38df4cafb39cffa878c6851abc899 (patch) | |
| tree | dcf40b321c3b492bd1d00244c78f72160e66a554 /guix/scripts | |
| parent | 6104071e483095f9fea9700e0317e84f64102ae2 (diff) | |
| parent | e1e32303129c5aedc7236d5cc854d6b72ad35daf (diff) | |
| download | guix-patches-32750e8c3ed38df4cafb39cffa878c6851abc899.tar guix-patches-32750e8c3ed38df4cafb39cffa878c6851abc899.tar.gz | |
Merge remote-tracking branch 'signed/master' into core-updates
Diffstat (limited to 'guix/scripts')
| -rw-r--r-- | guix/scripts/environment.scm | 2 | ||||
| -rw-r--r-- | guix/scripts/shell.scm | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm index 821f20e2f2..510cee727f 100644 --- a/guix/scripts/environment.scm +++ b/guix/scripts/environment.scm @@ -567,7 +567,7 @@ command name." (_ #t))) (match (scandir (string-append profile "/bin") not-dot?) - (() #f) + ((or #f ()) #f) (available (match command ((executable _ ...) diff --git a/guix/scripts/shell.scm b/guix/scripts/shell.scm index bd62803cb1..546639818f 100644 --- a/guix/scripts/shell.scm +++ b/guix/scripts/shell.scm @@ -52,8 +52,7 @@ interactive shell in that environment.\n")) (display (G_ " -D, --development include the development inputs of the next package")) (display (G_ " - -f, --file=FILE create environment for the package that the code within - FILE evaluates to")) + -f, --file=FILE add to the environment the package FILE evaluates to")) (display (G_ " -q inhibit loading of 'guix.scm' and 'manifest.scm'")) (display (G_ " @@ -116,7 +115,7 @@ interactive shell in that environment.\n")) (option '(#\f "file") #t #f (lambda (opt name arg result) (alist-cons 'load (tag-package-arg result arg) - result))) + (ensure-ad-hoc result)))) (option '(#\q) #f #f (lambda (opt name arg result) (alist-cons 'explicit-loading? #t result))) |