diff options
| -rw-r--r-- | guix/scripts/shell.scm | 2 | ||||
| -rw-r--r-- | tests/guix-shell-export-manifest.sh | 11 |
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 | ||
| 47 | cmp "$manifest" "$manifest.second" | 47 | cmp "$manifest" "$manifest.second" |
| 48 | 48 | ||
| 49 | # Manifest for a profile. | ||
| 50 | guix shell --bootstrap guile-bootstrap -r "$tmpdir/profile" -- \ | ||
| 51 | guile --version | ||
| 52 | test -x "$tmpdir/profile/bin/guile" | ||
| 53 | guix shell -p "$tmpdir/profile" --export-manifest > "$manifest.second" | ||
| 54 | guix shell --export-manifest guile-bootstrap > "$manifest" | ||
| 55 | cat "$manifest.second" | ||
| 56 | cmp "$manifest" "$manifest.second" | ||
| 57 | |||
| 58 | rm "$tmpdir/profile" | ||
| 59 | |||
| 49 | # Combining manifests. | 60 | # Combining manifests. |
| 50 | guix shell --export-manifest -m "$manifest" gash gash-utils \ | 61 | guix shell --export-manifest -m "$manifest" gash gash-utils \ |
| 51 | > "$manifest.second" | 62 | > "$manifest.second" |
