From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:51654) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gxPnM-0006uE-Cm for guix-patches@gnu.org; Sat, 23 Feb 2019 00:24:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gxPnJ-0005b3-Tx for guix-patches@gnu.org; Sat, 23 Feb 2019 00:24:16 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:35199) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gxPn8-0005Qr-Cv for guix-patches@gnu.org; Sat, 23 Feb 2019 00:24:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gxPn8-0003sq-5B for guix-patches@gnu.org; Sat, 23 Feb 2019 00:24:02 -0500 Subject: [bug#34626] pack: Construct inferior package names correctly. Resent-Message-ID: Received: from eggs.gnu.org ([209.51.188.92]:53980) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gxOcd-0007dC-7p for guix-patches@gnu.org; Fri, 22 Feb 2019 23:09:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gxOcc-0008Pj-Ah for guix-patches@gnu.org; Fri, 22 Feb 2019 23:09:07 -0500 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:35831) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gxOcb-000883-9A for guix-patches@gnu.org; Fri, 22 Feb 2019 23:09:06 -0500 Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id 9265D21AB8 for ; Fri, 22 Feb 2019 23:08:52 -0500 (EST) Message-Id: Date: Fri, 22 Feb 2019 23:11:50 -0500 From: Shyam Content-Type: multipart/mixed; boundary=21b9f81e42084174b157c73e00575bee List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 34626@debbugs.gnu.org --21b9f81e42084174b157c73e00575bee Content-Type: text/plain Hello everyone, This patch fixes a bug where inferior packages' names were not being constructed correctly when calling `guix pack --relocatable`. Cheers, Shyam --21b9f81e42084174b157c73e00575bee Content-Disposition: attachment;filename="0001-pack-Construct-inferior-package-names-correctly.patch" Content-Type: text/x-patch; name="0001-pack-Construct-inferior-package-names-correctly.patch" Content-Transfer-Encoding: 7BIT >From dd2171ce0d074cb6003afdaec353df572ed784a8 Mon Sep 17 00:00:00 2001 From: "P.C. Shyamshankar" 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 --21b9f81e42084174b157c73e00575bee--