[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/08: environment: Document that '--manifest' can be repeated.
From: |
guix-commits |
Subject: |
04/08: environment: Document that '--manifest' can be repeated. |
Date: |
Fri, 22 Nov 2019 09:13:56 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit d76df98fa59166c0c9f71ca41d664857d93e136d
Author: Ludovic Courtès <address@hidden>
Date: Wed Nov 20 10:02:01 2019 +0100
environment: Document that '--manifest' can be repeated.
* tests/guix-environment.sh: Test 'guix environment' with two '-m' options.
* doc/guix.texi (Invoking guix environment): Explain that '-m' can be
passed multiple times.
---
doc/guix.texi | 3 ++-
tests/guix-environment.sh | 23 +++++++++++++++++++++++
2 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index 1fec43a..0dc49c3 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -4802,7 +4802,8 @@ As an example, @var{file} might contain a definition like
this
@item --manifest=@var{file}
@itemx -m @var{file}
Create an environment for the packages contained in the manifest object
-returned by the Scheme code in @var{file}.
+returned by the Scheme code in @var{file}. This option can be repeated
+several times, in which case the manifests are concatenated.
This is similar to the same-named option in @command{guix package}
(@pxref{profile-manifest, @option{--manifest}}) and uses the same
diff --git a/tests/guix-environment.sh b/tests/guix-environment.sh
index fb1c1a0..2faf38d 100644
--- a/tests/guix-environment.sh
+++ b/tests/guix-environment.sh
@@ -84,6 +84,29 @@ echo "(use-modules (guix profiles) (gnu packages bootstrap))
guix environment --bootstrap --manifest=$tmpdir/manifest.scm --pure \
-- "$SHELL" -c 'test -f "$GUIX_ENVIRONMENT/bin/guile"'
+# Make sure '--manifest' can be specified multiple times.
+cat > "$tmpdir/manifest2.scm" <<EOF
+(use-modules (guix) (guix profiles)
+ (guix build-system trivial)
+ (gnu packages bootstrap))
+
+(packages->manifest
+ (list (package
+ (inherit %bootstrap-guile)
+ (name "eliug")
+ (build-system trivial-build-system)
+ (arguments
+ (quasiquote
+ (#:guile ,%bootstrap-guile
+ #:builder
+ (begin
+ (mkdir %output)
+ (mkdir (string-append %output "/eliug")))))))))
+EOF
+guix environment --bootstrap -m "$tmpdir/manifest.scm" \
+ -m "$tmpdir/manifest2.scm" --pure \
+ -- "$SHELL" -c 'test -f "$GUIX_ENVIRONMENT/bin/guile" && test -d
"$GUIX_ENVIRONMENT/eliug"'
+
# Make sure '-r' works as expected.
rm -f "$gcroot"
expected="`guix environment --bootstrap --ad-hoc guile-bootstrap \
- branch master updated (4e2e84d -> cf87919), guix-commits, 2019/11/22
- 03/08: import: texlive: Handle multi-license packages., guix-commits, 2019/11/22
- 01/08: substitute: Don't fetch /nix-cache-info., guix-commits, 2019/11/22
- 02/08: daemon: GC displays how much it has collected., guix-commits, 2019/11/22
- 07/08: pack: Allow multiple '--manifest' options., guix-commits, 2019/11/22
- 05/08: profiles: Add 'concatenate-manifests'., guix-commits, 2019/11/22
- 08/08: gnu: libseccomp: Fix build on AArch64., guix-commits, 2019/11/22
- 04/08: environment: Document that '--manifest' can be repeated.,
guix-commits <=
- 06/08: package: Allow multiple '--manifest' options., guix-commits, 2019/11/22