From: "Ludovic Courtès" <ludo@gnu.org>
To: 40770@debbugs.gnu.org
Cc: "Ludovic Courtès" <ludo@gnu.org>
Subject: [bug#40770] [PATCH 4/5] pack: Use a declarative profile.
Date: Wed, 22 Apr 2020 17:08:48 +0200 [thread overview]
Message-ID: <20200422150849.5432-4-ludo@gnu.org> (raw)
In-Reply-To: <20200422150849.5432-1-ludo@gnu.org>
* 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 6d63fb4b90..f3d1b41c6f 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
--
2.26.0
next prev parent reply other threads:[~2020-04-22 15:10 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-22 15:06 [bug#40770] [PATCH 0/5] Add declarative profiles Ludovic Courtès
2020-04-22 15:08 ` [bug#40770] [PATCH 1/5] profiles: Add lowerable <profile> record type Ludovic Courtès
2020-04-22 15:08 ` [bug#40770] [PATCH 2/5] system: 'operating-system-directory-base-entries' uses 'profile' Ludovic Courtès
2020-04-22 15:08 ` [bug#40770] [PATCH 3/5] services: profile: Use a declarative profile Ludovic Courtès
2020-04-22 15:08 ` Ludovic Courtès [this message]
2020-04-22 15:08 ` [bug#40770] [PATCH 5/5] services: system: Initial entries are non-monadic Ludovic Courtès
2020-04-22 17:12 ` [bug#40770] [PATCH 0/5] Add declarative profiles Mathieu Othacehe
2020-04-22 19:46 ` Ludovic Courtès
2020-04-26 20:51 ` bug#40770: " Ludovic Courtès
2020-04-22 19:46 ` [bug#40770] " Christopher Baines
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200422150849.5432-4-ludo@gnu.org \
--to=ludo@gnu.org \
--cc=40770@debbugs.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 external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.