civodul pushed a commit to branch master
in repository guix.
commit 45c84c8f6f979c84d08b205ed3fb3d6769c4ae3f
Author: Ludovic Courtès <l...@gnu.org>
AuthorDate: Wed Apr 22 16:11:25 2020 +0200
pack: Use a declarative profile.
* guix/scripts/pack.scm (guix-pack): Use a declarative profile instead
of 'profile-derivation'.
---
guix/scripts/pack.scm | 33 ++++++++++++++++-----------------
1 file changed, 16 insertions(+), 17 deletions(-)
diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm
index 6d63fb4..f3d1b41 100644
--- a/guix/scripts/pack.scm
+++ b/guix/scripts/pack.scm
@@ -1071,7 +1071,21 @@ Create a bundle of PACKAGE.\n"))
(localstatedir? (assoc-ref opts 'localstatedir?))
(entry-point (assoc-ref opts 'entry-point))
(profile-name (assoc-ref opts 'profile-name))
- (gc-root (assoc-ref opts 'gc-root)))
+ (gc-root (assoc-ref opts 'gc-root))
+ (profile (profile
+ (content manifest)
+
+ ;; Always produce relative symlinks for
+ ;; Singularity (see
+ ;; <https://bugs.gnu.org/34913>).
+ (relative-symlinks?
+ (or relocatable?
+ (eq? 'squashfs pack-format)))
+
+ (hooks (if bootstrap?
+ '()
+ %default-profile-hooks))
+ (locales? (not bootstrap?)))))
(define (lookup-package package)
(manifest-lookup manifest (manifest-pattern (name package))))
@@ -1085,22 +1099,7 @@ Create a bundle of PACKAGE.\n"))
to your package list.")))
(run-with-store store
- (mlet* %store-monad ((profile (profile-derivation
- manifest
-
- ;; Always produce relative
- ;; symlinks for Singularity (see
- ;;
<https://bugs.gnu.org/34913>).
- #:relative-symlinks?
- (or relocatable?
- (eq? 'squashfs pack-format))
-
- #:hooks (if bootstrap?
- '()
-
%default-profile-hooks)
- #:locales? (not bootstrap?)
- #:target target))
- (drv (build-image name profile
+ (mlet* %store-monad ((drv (build-image name profile
#:target
target
#:compressor
