From: "Thompson, David" <dthompson2@worcester.edu>
To: "Ludovic Courtès" <ludo@gnu.org>
Cc: 30480@debbugs.gnu.org
Subject: [bug#30480] [PATCH] environment: Add --manifest option.
Date: Tue, 20 Feb 2018 22:25:00 -0500 [thread overview]
Message-ID: <CAJ=RwfYEOc0MbjbXbwAwie_kM2LOSqgDOr11Hg9SeKSf4ve2NA@mail.gmail.com> (raw)
In-Reply-To: <87r2pgekv2.fsf@gnu.org>
[-- Attachment #1: Type: text/plain, Size: 1978 bytes --]
Hey Ludo,
On Mon, Feb 19, 2018 at 4:21 PM, Ludovic Courtès <ludo@gnu.org> wrote:
> Hi David!
>
> "Thompson, David" <dthompson2@worcester.edu> skribis:
>
>> In my lurkings I've seen people wondering why `guix environment`
>> doesn't work with manifests. The answer is simply: I never thought to
>> add it. This patch fixes that. The implementation is kind of
>> interesting and might seem a little silly to people that know how
>> manifests work. In order to support manifests with minimal code and
>> make --manifest compose with other options I simply decompile the
>> manifest back into a list of package/output tuples. That means in the
>> case of `guix environment --manifest=foo.scm` the manifest is created,
>> decompiled, and a new manifest created from that. Seems redundant!
>> The advantage is that since --manifest composes with all the other
>> ways to specify packages we can do absolutely bonkers things like
>> `guix environment guile --ad-hoc ruby --manifest=foo.scm
>> --manifest=bar.scm --load=frob.scm --expression='(@ (gnu packages
>> python) python)'`. More realistically you'd use it to throw in an
>> extra package or two with --ad-hoc.
>
> Indeed, that makes a lot of sense. I wondered about doing that for
> ‘guix pack’ as well, it turns out to be more shenanigans than we’d like.
>
>> From 47e0cf3bef26791c72222175899790a46c49af45 Mon Sep 17 00:00:00 2001
>> From: David Thompson <dthompson2@worcester.edu>
>> Date: Thu, 15 Feb 2018 20:54:28 -0500
>> Subject: [PATCH] environment: Add --manifest option.
>>
>> * guix/scripts/environment.scm (show-help, %options): Add -m/--manifest.
>> (options/resolve-packages): Handle manifests.
>> * doc/guix.texi (Invoking guix environment): Document it.
>
> Could you add an example in tests/guix-environment.sh that uses a
> manifest with the “guile-bootstrap” package for instance?
>
> OK with this change! :-)
Is this what you had in mind?
- Dave
[-- Attachment #2: 0001-environment-Add-manifest-option.patch --]
[-- Type: text/x-patch, Size: 4825 bytes --]
From e6d0a82e5250d51e50cd05241261a460a71dbd37 Mon Sep 17 00:00:00 2001
From: David Thompson <dthompson2@worcester.edu>
Date: Thu, 15 Feb 2018 20:54:28 -0500
Subject: [PATCH] environment: Add --manifest option.
* guix/scripts/environment.scm (show-help, %options): Add -m/--manifest.
(options/resolve-packages): Handle manifests.
* doc/guix.texi (Invoking guix environment): Document it.
---
doc/guix.texi | 9 +++++++++
guix/scripts/environment.scm | 22 +++++++++++++++++++++-
tests/guix-environment.sh | 9 +++++++++
3 files changed, 39 insertions(+), 1 deletion(-)
diff --git a/doc/guix.texi b/doc/guix.texi
index 7ed39ff13..16a352c8b 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -7231,6 +7231,15 @@ As an example, @var{file} might contain a definition like this
@verbatiminclude environment-gdb.scm
@end example
+@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}.
+
+This is similar to the same-named option in @command{guix package}
+(@pxref{profile-manifest, @option{--manifest}}) and uses the same
+manifest files.
+
@item --ad-hoc
Include all specified packages in the resulting environment, as if an
@i{ad hoc} package were defined with them as inputs. This option is
diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm
index d2568e6a7..67da6fc3b 100644
--- a/guix/scripts/environment.scm
+++ b/guix/scripts/environment.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2014, 2015 David Thompson <davet@gnu.org>
+;;; Copyright © 2014, 2015, 2018 David Thompson <davet@gnu.org>
;;; Copyright © 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
@@ -141,6 +141,8 @@ COMMAND or an interactive shell in that environment.\n"))
(display (G_ "
-l, --load=FILE create environment for the package that the code within
FILE evaluates to"))
+ (display (G_ "
+ -m, --manifest=FILE create environment with the manifest from FILE"))
(display (G_ "
--ad-hoc include all specified packages in the environment instead
of only their inputs"))
@@ -220,6 +222,11 @@ COMMAND or an interactive shell in that environment.\n"))
(alist-cons 'expression
(tag-package-arg result arg)
result)))
+ (option '(#\m "manifest") #t #f
+ (lambda (opt name arg result)
+ (alist-cons 'manifest
+ arg
+ result)))
(option '("ad-hoc") #f #f
(lambda (opt name arg result)
(alist-cons 'ad-hoc? #t result)))
@@ -286,6 +293,16 @@ packages."
(((? package-or-package+output?) ...) ; many packages
(map (cut package->output <> mode) packages))))
+ (define (manifest->outputs manifest)
+ (map (lambda (entry)
+ (cons 'ad-hoc-package ; manifests are implicitly ad-hoc
+ (if (package? (manifest-entry-item entry))
+ (list (manifest-entry-item entry)
+ (manifest-entry-output entry))
+ ;; Direct store paths have no output.
+ (list (manifest-entry-item entry)))))
+ (manifest-entries manifest)))
+
(compact
(append-map (match-lambda
(('package mode (? string? spec))
@@ -299,6 +316,9 @@ packages."
;; Add all the outputs of the package defined in FILE.
(let ((module (make-user-module '())))
(packages->outputs (load* file module) mode)))
+ (('manifest . file)
+ (let ((module (make-user-module '())))
+ (manifest->outputs (load* file module))))
(_ '(#f)))
opts)))
diff --git a/tests/guix-environment.sh b/tests/guix-environment.sh
index bf5ca17fa..b44aca099 100644
--- a/tests/guix-environment.sh
+++ b/tests/guix-environment.sh
@@ -62,6 +62,15 @@ fi
guix environment --bootstrap --ad-hoc guile-bootstrap --pure \
-- "$SHELL" -c 'test -f "$GUIX_ENVIRONMENT/bin/guile"'
+# Make sure 'GUIX_ENVIRONMENT' points to the profile when building from a
+# manifest.
+echo "(use-modules (guix profiles) (gnu packages bootstrap))
+
+(packages->manifest (list %bootstrap-guile))
+" > $tmpdir/manifest.scm
+guix environment --bootstrap --manifest=$tmpdir/manifest.scm --pure \
+ -- "$SHELL" -c 'test -f "$GUIX_ENVIRONMENT/bin/guile"'
+
# Make sure '-r' works as expected.
rm -f "$gcroot"
expected="`guix environment --bootstrap --ad-hoc guile-bootstrap \
--
2.16.1
next prev parent reply other threads:[~2018-02-21 3:26 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-16 2:12 [bug#30480] [PATCH] environment: Add --manifest option Thompson, David
2018-02-16 5:58 ` Jan Nieuwenhuizen
2018-02-19 21:21 ` Ludovic Courtès
2018-02-21 3:25 ` Thompson, David [this message]
2018-02-21 22:10 ` Ludovic Courtès
2018-02-22 3:17 ` Thompson, David
2018-02-22 6:47 ` bug#30480: " Leo Famulari
2018-02-22 9:15 ` [bug#30480] " Andreas Enge
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAJ=RwfYEOc0MbjbXbwAwie_kM2LOSqgDOr11Hg9SeKSf4ve2NA@mail.gmail.com' \
--to=dthompson2@worcester.edu \
--cc=30480@debbugs.gnu.org \
--cc=ludo@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).