From: ludo@gnu.org (Ludovic Courtès)
To: Konrad Hinsen <konrad.hinsen@fastmail.net>
Cc: 30409@debbugs.gnu.org
Subject: [bug#30409] [PATCH 1/2] guix: Add option --manifest to guix pack
Date: Thu, 15 Feb 2018 15:19:04 +0100 [thread overview]
Message-ID: <87eflm9vzb.fsf@gnu.org> (raw)
In-Reply-To: <m13729njel.fsf@ordinateur-de-catherine--konrad.home> (Konrad Hinsen's message of "Fri, 9 Feb 2018 20:33:12 +0100")
[-- Attachment #1: Type: text/plain, Size: 568 bytes --]
Hi Konrad,
Konrad Hinsen <konrad.hinsen@fastmail.net> skribis:
> * guix/scripts/pack.scm: Extend the way the manifest for the archive
> contents is created. If the --manifest option is given, read the
> manifest from the provided file. Otherwise, create the manifest from
> a package list as before. Check if both a manifest file and a package list
> were given, which is an error.
Awesome! I took the liberty to make the changes below (let me know if
anything’s amiss!), and adjusted the commit log to match our
conventions.
Thanks,
Ludo’.
[-- Attachment #2: Type: text/x-patch, Size: 1672 bytes --]
diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm
index f772083c6..a1b839e9a 100644
--- a/guix/scripts/pack.scm
+++ b/guix/scripts/pack.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2015, 2017 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2017 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2018 Konrad Hinsen <konrad.hinsen@fastmail.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -347,6 +348,9 @@ Create a bundle of PACKAGE.\n"))
-C, --compression=TOOL compress using TOOL--e.g., \"lzip\""))
(display (G_ "
-S, --symlink=SPEC create symlinks to the profile according to SPEC"))
+ (display (G_ "
+ -m, --manifest=FILE create a new profile generation with the manifest
+ from FILE"))
(display (G_ "
--localstatedir include /var/guix in the resulting pack"))
(newline)
@@ -383,12 +387,12 @@ Create a bundle of PACKAGE.\n"))
(manifest-file (assoc-ref opts 'manifest)))
(cond
((and manifest-file (not (null? packages)))
- (leave (G_ "both a manifest and a package list were given")))
+ (leave (G_ "both a manifest and a package list were given~%")))
(manifest-file
- (let ((user-module (make-user-module '((guix profiles) (gnu)))))
+ (let ((user-module (make-user-module '((guix profiles) (gnu)))))
(load* manifest-file user-module)))
(else (packages->manifest packages)))))
-
+
(with-error-handling
(parameterize ((%graft? (assoc-ref opts 'graft?)))
(let* ((dry-run? (assoc-ref opts 'dry-run?))
next prev parent reply other threads:[~2018-02-15 14:20 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-09 19:33 [bug#30409] [PATCH 1/2] guix: Add option --manifest to guix pack Konrad Hinsen
2018-02-15 14:19 ` Ludovic Courtès [this message]
2018-02-15 19:19 ` Konrad Hinsen
2018-02-15 21:24 ` bug#30409: " Ludovic Courtès
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=87eflm9vzb.fsf@gnu.org \
--to=ludo@gnu.org \
--cc=30409@debbugs.gnu.org \
--cc=konrad.hinsen@fastmail.net \
/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).