From patchwork Wed Nov 20 13:44:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 16169 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2A62017794; Wed, 20 Nov 2019 13:50:10 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id DB54317792 for ; Wed, 20 Nov 2019 13:50:09 +0000 (GMT) Received: from localhost ([::1]:58264 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iXQMz-0001t2-E0 for patchwork@mira.cbaines.net; Wed, 20 Nov 2019 08:50:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43676) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iXQJ2-0000Lu-9Z for guix-patches@gnu.org; Wed, 20 Nov 2019 08:46:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iXQJ1-0007YG-4H for guix-patches@gnu.org; Wed, 20 Nov 2019 08:46:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:40339) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iXQJ0-0007Xz-34 for guix-patches@gnu.org; Wed, 20 Nov 2019 08:46:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1iXQIz-0007GP-TH for guix-patches@gnu.org; Wed, 20 Nov 2019 08:46:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#38301] [PATCH 1/4] environment: Document that '--manifest' can be repeated. References: <20191120134213.30753-1-ludo@gnu.org> In-Reply-To: <20191120134213.30753-1-ludo@gnu.org> Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 20 Nov 2019 13:46:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 38301 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 38301@debbugs.gnu.org Cc: Konrad Hinsen , Pierre Neidhardt , Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 38301-submit@debbugs.gnu.org id=B38301.157425751327842 (code B ref 38301); Wed, 20 Nov 2019 13:46:01 +0000 Received: (at 38301) by debbugs.gnu.org; 20 Nov 2019 13:45:13 +0000 Received: from localhost ([127.0.0.1]:49154 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iXQID-0007Ez-CV for submit@debbugs.gnu.org; Wed, 20 Nov 2019 08:45:13 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34367) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1iXQI3-0007Di-Jh for 38301@debbugs.gnu.org; Wed, 20 Nov 2019 08:45:03 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]:40446) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1iXQHy-0006cA-4h; Wed, 20 Nov 2019 08:44:58 -0500 Received: from wifi-eduroam-20-234.siege.inria.fr ([128.93.20.234]:51574 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1iXQHx-0006Bu-Og; Wed, 20 Nov 2019 08:44:57 -0500 From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Wed, 20 Nov 2019 14:44:34 +0100 Message-Id: <20191120134437.30881-1-ludo@gnu.org> X-Mailer: git-send-email 2.24.0 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * 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 a7ac6ff464..443d5bd71f 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 fb1c1a022d..2faf38df06 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" <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 \