From 267379f852f9d6d00c76120963711d54357ba53d Mon Sep 17 00:00:00 2001 From: David Thompson Date: Thu, 15 Feb 2018 20:54:28 -0500 Subject: environment: Add --manifest option. * guix/scripts/environment.scm (show-help, %options): Add -m/--manifest. (options/resolve-packages): Handle manifests. * tests/guix-envronment.sh: Add a test. * doc/guix.texi (Invoking guix environment): Document it. --- guix/scripts/environment.scm | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) (limited to 'guix/scripts/environment.scm') diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm index d2568e6a7d..67da6fc3bf 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 +;;; Copyright © 2014, 2015, 2018 David Thompson ;;; Copyright © 2015, 2016, 2017 Ludovic Courtès ;;; ;;; This file is part of GNU Guix. @@ -141,6 +141,8 @@ (define (show-help) (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 @@ (define %options (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 @@ (define (packages->outputs packages mode) (((? 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 @@ (define (packages->outputs packages mode) ;; 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))) -- cgit v1.2.3