amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

shell: When using '-D -f', '-D' has no effect on remaining packages.

Browse source 
Fixes <https://issues.guix.gnu.org/52093>.
Reported by Konrad Hinsen <konrad.hinsen@fastmail.net>.

* guix/scripts/shell.scm (%options): In "--file" handler, add call to
'ensure-ad-hoc'.
* tests/guix-shell.sh: Add test.
This commit is contained in:
Ludovic Courtès 2021-12-10 12:26:29 +01:00
parent c879354003
commit 7197710121
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
2 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
guix/scripts/shell.scm
View file

@ -115,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)))