GNU bug report logs - #34626
pack: Construct inferior package names correctly.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 34626 in the body.
You can then email your comments to 34626 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Shyam <shyam <at> sykloid.org>
To: guix-patches <at> gnu.org
Subject: pack: Construct inferior package names correctly.
Date: Fri, 22 Feb 2019 23:11:50 -0500

[Message part 1 (text/plain, inline)]

Hello everyone,

This patch fixes a bug where inferior packages' names were not being
constructed correctly when calling `guix pack --relocatable`.

Cheers,

Shyam

[0001-pack-Construct-inferior-package-names-correctly.patch (text/x-patch, attachment)]

Message #10 received at 34626-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Shyam <shyam <at> sykloid.org>
Cc: 34626-done <at> debbugs.gnu.org
Subject: Re: [bug#34626] pack: Construct inferior package names correctly.
Date: Fri, 15 Mar 2019 23:26:13 +0100

[Message part 1 (text/plain, inline)]

Hello,

Shyam <shyam <at> sykloid.org> skribis:

> This patch fixes a bug where inferior packages' names were not being
> constructed correctly when calling `guix pack --relocatable`.

Good catch!

>>From dd2171ce0d074cb6003afdaec353df572ed784a8 Mon Sep 17 00:00:00 2001
> From: "P.C. Shyamshankar" <shyam <at> 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.

Applied with the minor change below.

Thank you, and sorry for the delay!

Ludo’.

[Message part 2 (text/x-patch, inline)]

diff --git a/guix/scripts/pack.scm b/guix/scripts/pack.scm
index e40c2085f7..17a166d9d7 100644
--- a/guix/scripts/pack.scm
+++ b/guix/scripts/pack.scm
@@ -28,7 +28,7 @@
   #:use-module (guix store)
   #:use-module ((guix status) #:select (with-status-verbosity))
   #:use-module (guix grafts)
-  #:use-module (guix inferior)
+  #:autoload   (guix inferior) (inferior-package?)
   #:use-module (guix monads)
   #:use-module (guix modules)
   #:use-module (guix packages)
@@ -593,7 +593,8 @@ please email '~a'~%")
                         ((inferior-package? package)
                          (string-append (inferior-package-name package)
                                         "-"
-                                        (inferior-package-version package))))
+                                        (inferior-package-version package)))
+                        (else "wrapper"))
                   "R")
                  build))
 

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.