[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/06: shell: Fix '--export-manifest' for cached profiles and when '-p'
From: |
guix-commits |
Subject: |
03/06: shell: Fix '--export-manifest' for cached profiles and when '-p' is used. |
Date: |
Thu, 16 Jun 2022 17:58:42 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 925a57c5d04553ff6c514867348e7d3c5c22ca66
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Thu Jun 16 16:50:41 2022 +0200
shell: Fix '--export-manifest' for cached profiles and when '-p' is used.
Fixes <https://issues.guix.gnu.org/55521>.
* guix/scripts/shell.scm (export-manifest): When computing 'manifest',
honor the 'profile key.
* tests/guix-shell-export-manifest.sh: Add test.
---
guix/scripts/shell.scm | 2 ++
tests/guix-shell-export-manifest.sh | 11 +++++++++++
2 files changed, 13 insertions(+)
diff --git a/guix/scripts/shell.scm b/guix/scripts/shell.scm
index 84776af2f3..004ed7af2e 100644
--- a/guix/scripts/shell.scm
+++ b/guix/scripts/shell.scm
@@ -466,6 +466,8 @@ concatenates MANIFESTS, a list of expressions."
(filter-map (match-lambda
(('manifest . file)
(load-manifest file))
+ (('profile . file)
+ (profile-manifest file))
(_ #f))
opts)))))
(display (G_ "\
diff --git a/tests/guix-shell-export-manifest.sh
b/tests/guix-shell-export-manifest.sh
index 05429955b9..6c42c40f3b 100644
--- a/tests/guix-shell-export-manifest.sh
+++ b/tests/guix-shell-export-manifest.sh
@@ -46,6 +46,17 @@ cat "$manifest.second"
cmp "$manifest" "$manifest.second"
+# Manifest for a profile.
+guix shell --bootstrap guile-bootstrap -r "$tmpdir/profile" -- \
+ guile --version
+test -x "$tmpdir/profile/bin/guile"
+guix shell -p "$tmpdir/profile" --export-manifest > "$manifest.second"
+guix shell --export-manifest guile-bootstrap > "$manifest"
+cat "$manifest.second"
+cmp "$manifest" "$manifest.second"
+
+rm "$tmpdir/profile"
+
# Combining manifests.
guix shell --export-manifest -m "$manifest" gash gash-utils \
> "$manifest.second"
- branch master updated (ab82dd3f58 -> c8803d89fe), guix-commits, 2022/06/16
- 01/06: packages: Change the order of %SUPPORTED-SYSTEMS., guix-commits, 2022/06/16
- 06/06: ui: Improve pager selection logic when less is not installed., guix-commits, 2022/06/16
- 02/06: shell: Do not auto-detect manifest when '-p' is used., guix-commits, 2022/06/16
- 04/06: gnu: hcxtools: Use gexps., guix-commits, 2022/06/16
- 03/06: shell: Fix '--export-manifest' for cached profiles and when '-p' is used.,
guix-commits <=
- 05/06: gnu: hcxtools: Update to 6.2.7., guix-commits, 2022/06/16