summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--guix/scripts/shell.scm2
-rw-r--r--tests/guix-shell-export-manifest.sh11
2 files changed, 13 insertions, 0 deletions
diff --git a/guix/scripts/shell.scm b/guix/scripts/shell.scm
index 84776af2f3d..004ed7af2ea 100644
--- a/guix/scripts/shell.scm
+++ b/guix/scripts/shell.scm
@@ -466,6 +466,8 @@ concatenates MANIFESTS, a list of expressions."
466 (filter-map (match-lambda 466 (filter-map (match-lambda
467 (('manifest . file) 467 (('manifest . file)
468 (load-manifest file)) 468 (load-manifest file))
469 (('profile . file)
470 (profile-manifest file))
469 (_ #f)) 471 (_ #f))
470 opts))))) 472 opts)))))
471 (display (G_ "\ 473 (display (G_ "\
diff --git a/tests/guix-shell-export-manifest.sh b/tests/guix-shell-export-manifest.sh
index 05429955b9a..6c42c40f3bf 100644
--- a/tests/guix-shell-export-manifest.sh
+++ b/tests/guix-shell-export-manifest.sh
@@ -46,6 +46,17 @@ cat "$manifest.second"
46 46
47cmp "$manifest" "$manifest.second" 47cmp "$manifest" "$manifest.second"
48 48
49# Manifest for a profile.
50guix shell --bootstrap guile-bootstrap -r "$tmpdir/profile" -- \
51 guile --version
52test -x "$tmpdir/profile/bin/guile"
53guix shell -p "$tmpdir/profile" --export-manifest > "$manifest.second"
54guix shell --export-manifest guile-bootstrap > "$manifest"
55cat "$manifest.second"
56cmp "$manifest" "$manifest.second"
57
58rm "$tmpdir/profile"
59
49# Combining manifests. 60# Combining manifests.
50guix shell --export-manifest -m "$manifest" gash gash-utils \ 61guix shell --export-manifest -m "$manifest" gash gash-utils \
51 > "$manifest.second" 62 > "$manifest.second"