me
/
guix
Archived
1
0
Fork 0
Code

shell: '--export-manifest -D x -D y' generates a valid manifest. 

* guix/scripts/shell.scm (manifest->code*): Add missing 'list' in
generated 'concatenate-manifests' call.
* tests/guix-shell-export-manifest.sh: Add test.
Ludovic Courtès 2022-05-31 09:47:42 +02:00
parent 572bc6d7bd
commit 2acc83daa5
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
guix/scripts/shell.scm
View File

@ -410,7 +410,7 @@ concatenates MANIFESTS, a list of expressions."
(if (null? (manifest-entries manifest)) (if (null? (manifest-entries manifest))
(match extra-manifests (match extra-manifests
((one) one) ((one) one)
(lst `(concatenate-manifests ,@extra-manifests))) (lst `(concatenate-manifests (list ,@extra-manifests))))
(match (manifest->code manifest (match (manifest->code manifest
#:entry-package-version #:entry-package-version
manifest-entry-version-prefix) manifest-entry-version-prefix)

5
tests/guix-shell-export-manifest.sh
View File

@ -69,6 +69,11 @@ guix build -m "$manifest" -d | \
guix build -m "$manifest" -d | \ guix build -m "$manifest" -d | \
grep "$(guix build git -d)" grep "$(guix build git -d)"
guix shell --export-manifest -D guile -D python-itsdangerous > "$manifest"
guix build -m "$manifest" -d | grep "$(guix build libffi -d)"
guix build -m "$manifest" -d | \
grep "$(guix build -e '(@ (gnu packages python) python)' -d)"
# Test various combinations to make sure generated code uses interfaces # Test various combinations to make sure generated code uses interfaces
# correctly. # correctly.
for options in \ for options in \