[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
11/13: environment: Export 'load-manifest'.
From: |
guix-commits |
Subject: |
11/13: environment: Export 'load-manifest'. |
Date: |
Mon, 4 Apr 2022 17:13:24 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 6fed836a6f9b8fb63ba067d0523942119687ce0b
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Thu Mar 31 12:12:20 2022 +0200
environment: Export 'load-manifest'.
* guix/scripts/environment.scm (load-manifest): New procedure.
(options/resolve-packages): Use it.
---
guix/scripts/environment.scm | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm
index ec071402f4..07b54cd89b 100644
--- a/guix/scripts/environment.scm
+++ b/guix/scripts/environment.scm
@@ -56,6 +56,7 @@
#:use-module (srfi srfi-37)
#:use-module (srfi srfi-98)
#:export (assert-container-features
+ load-manifest
guix-environment
guix-environment*
show-environment-options-help
@@ -285,6 +286,11 @@ use '--preserve' instead~%"))
(_ memo)))
'() alist))
+(define (load-manifest file) ;TODO: factorize
+ "Load the user-profile manifest (Scheme code) from FILE and return it."
+ (let ((user-module (make-user-module '((guix profiles) (gnu)))))
+ (load* file user-module)))
+
(define (options/resolve-packages store opts)
"Return OPTS with package specification strings replaced by manifest entries
for the corresponding packages."
@@ -331,8 +337,7 @@ for the corresponding packages."
(let ((module (make-user-module '())))
(packages->outputs (load* file module) mode)))
(('manifest . file)
- (let ((module (make-user-module '((guix profiles) (gnu)))))
- (manifest-entries (load* file module))))
+ (manifest-entries (load-manifest file)))
(_ '()))
opts)
manifest-entry=?)))
- branch master updated (345f79b2cf -> b1e7e64f35), guix-commits, 2022/04/04
- 02/13: gnu: gtk: Update to 4.6.1., guix-commits, 2022/04/04
- 01/13: gnu: pango 1.50: Add version 1.50.4., guix-commits, 2022/04/04
- 03/13: gnu: Add fcitx5-gtk4., guix-commits, 2022/04/04
- 08/13: services: Add 'log-cleanup' service to '%base-services' for build logs., guix-commits, 2022/04/04
- 07/13: services: Add 'log-cleanup-service-type'., guix-commits, 2022/04/04
- 04/13: gnu: gtkmm: Update to 4.6.1., guix-commits, 2022/04/04
- 05/13: gnu: libmediainfo: Update to 22.03., guix-commits, 2022/04/04
- 06/13: gnu: mediainfo: Update to 22.03., guix-commits, 2022/04/04
- 09/13: gnu: Add parole., guix-commits, 2022/04/04
- 11/13: environment: Export 'load-manifest'.,
guix-commits <=
- 12/13: shell: Add '--export-manifest'., guix-commits, 2022/04/04
- 13/13: news: Add entry about 'guix shell --export-manifest'., guix-commits, 2022/04/04
- 10/13: packages: Add 'package-unique-version-prefix'., guix-commits, 2022/04/04