From: Shyam <shyam@sykloid.org>
To: 34626@debbugs.gnu.org
Subject: [bug#34626] pack: Construct inferior package names correctly.
Date: Fri, 22 Feb 2019 23:11:50 -0500 [thread overview]
Message-ID: <f265653b-50de-49f5-9bbe-095a04b5c192@www.fastmail.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 164 bytes --]
Hello everyone,
This patch fixes a bug where inferior packages' names were not being
constructed correctly when calling `guix pack --relocatable`.
Cheers,
Shyam
[-- Attachment #2: 0001-pack-Construct-inferior-package-names-correctly.patch --]
[-- Type: text/x-patch, Size: 1596 bytes --]
From dd2171ce0d074cb6003afdaec353df572ed784a8 Mon Sep 17 00:00:00 2001
From: "P.C. Shyamshankar" <shyam@sykloid.org>
Date: Fri, 22 Feb 2019 22:38:47 -0500
Subject: [PATCH] pack: Construct inferior package names correctly.
* guix/scripts/pack.scm: 'wrapped-package' now correctly constructs full
names of inferior packages, allowing relocatable packs.
---
guix/scripts/pack.scm | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm
index b19a4ae1b..181a82696 100644
--- a/guix/scripts/pack.scm
+++ b/guix/scripts/pack.scm
@@ -28,6 +28,7 @@
#:use-module (guix store)
#:use-module (guix status)
#:use-module (guix grafts)
+ #:use-module (guix inferior)
#:use-module (guix monads)
#:use-module (guix modules)
#:use-module (guix packages)
@@ -570,7 +571,14 @@ please email '~a'~%")
(find-files #$(file-append package "/sbin"))
(find-files #$(file-append package "/libexec")))))))
- (computed-file (string-append (package-full-name package "-") "R")
+ (computed-file (string-append
+ (cond ((package? package)
+ (package-full-name package "-"))
+ ((inferior-package? package)
+ (string-append (inferior-package-name package)
+ "-"
+ (inferior-package-version package))))
+ "R")
build))
(define (map-manifest-entries proc manifest)
--
2.20.1
next reply other threads:[~2019-02-23 5:24 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-23 4:11 Shyam [this message]
2019-03-15 22:26 ` bug#34626: pack: Construct inferior package names correctly 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f265653b-50de-49f5-9bbe-095a04b5c192@www.fastmail.com \
--to=shyam@sykloid.org \
--cc=34626@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.