GNU bug report logs - #54910
[PATCH] guix: import: Convert inputs to the new format.

Previous Next

Package: guix-patches;

Reported by: Attila Lendvai <attila <at> lendvai.name>

Date: Wed, 13 Apr 2022 12:32:01 UTC

Severity: normal

Tags: patch

To reply to this bug, email your comments to 54910 AT debbugs.gnu.org.

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

View this report as an mbox folder, status mbox, maintainer mbox


Report forwarded to guix-patches <at> gnu.org:
bug#54910; Package guix-patches. (Wed, 13 Apr 2022 12:32:01 GMT) Full text and rfc822 format available.

Acknowledgement sent to Attila Lendvai <attila <at> lendvai.name>:
New bug report received and forwarded. Copy sent to guix-patches <at> gnu.org. (Wed, 13 Apr 2022 12:32:01 GMT) Full text and rfc822 format available.

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

From: Attila Lendvai <attila <at> lendvai.name>
To: guix-patches <at> gnu.org
Cc: Attila Lendvai <attila <at> lendvai.name>
Subject: [PATCH] guix: import: Convert inputs to the new format.
Date: Wed, 13 Apr 2022 14:30:59 +0200
* guix/import/utils.scm (package-names->package-inputs): Return the simplified format.
(maybe-inputs): Use the simplified format.
---
 guix/import/utils.scm | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/guix/import/utils.scm b/guix/import/utils.scm
index 9cadbb3d5f..40dae55acd 100644
--- a/guix/import/utils.scm
+++ b/guix/import/utils.scm
@@ -268,12 +268,13 @@ (define* (package-names->package-inputs names #:optional (output #f))
 optional OUTPUT, tries to generate a quoted list of inputs, as suitable to
 use in an 'inputs' field of a package definition."
   (define (make-input input version)
-    (cons* input (list 'unquote (string->symbol
-                                 (if version
-                                     (string-append input "-" version)
-                                     input)))
-           (or (and output (list output))
-               '())))
+    (let ((pkg (string->symbol
+                (if version
+                    (string-append input "-" version)
+                    input))))
+      (if output
+          (list pkg output)
+          pkg)))
 
   (map (match-lambda
          ((input version) (make-input input version))
@@ -294,7 +295,7 @@ (define* (maybe-inputs package-names #:optional (output #f)
       (()
        '())
       ((package-inputs ...)
-       `((,field-name (,'quasiquote ,package-inputs)))))))
+       `((,field-name (list ,@package-inputs)))))))
 
 (define* (maybe-native-inputs package-names #:optional (output #f))
   "Same as MAYBE-INPUTS, but for native inputs."
-- 
2.35.1





Information forwarded to guix-patches <at> gnu.org:
bug#54910; Package guix-patches. (Thu, 14 Apr 2022 10:39:02 GMT) Full text and rfc822 format available.

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

From: Ricardo Wurmus <rekado <at> elephly.net>
To: 54910 <at> debbugs.gnu.org
Cc: kuba <at> kadziolka.net, Efraim Flashner <efraim <at> flashner.co.il>
Subject: [PATCH] guix: import: Convert inputs to the new format.
Date: Thu, 14 Apr 2022 12:33:43 +0200
Thanks for the patch!

This looked good to me, so I applied it locally.  I then ran the test
suite and noticed that tests/go.scm and tests/crate.scm have failing
tests.

The failure in tests/go.scm is harmless and can easily be fixed.  But
the failure in tests/crate.scm indicates a real problem, I think.  The
build system expects that inputs are placed in the #:cargo-inputs field
in (arguments …), and this seems to expect old-style labelled inputs.

I don’t know if the build system would work with the new-style plain
lists in the arguments field, so I’m Cc-ing contributors to the build
system.

@Jakub and @Efraim: could you please comment on this?

Thanks in advance!

-- 
Ricardo




Information forwarded to guix-patches <at> gnu.org:
bug#54910; Package guix-patches. (Mon, 23 May 2022 13:38:02 GMT) Full text and rfc822 format available.

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

From: Ludovic Courtès <ludo <at> gnu.org>
To: kuba <at> kadziolka.net,  Efraim Flashner <efraim <at> flashner.co.il>
Cc: Ricardo Wurmus <rekado <at> elephly.net>, 54910 <at> debbugs.gnu.org
Subject: Re: bug#54910: [PATCH] guix: import: Convert inputs to the new format.
Date: Mon, 23 May 2022 15:37:13 +0200
Hey Efraim & Jakub,

Ricardo Wurmus <rekado <at> elephly.net> skribis:

> Thanks for the patch!
>
> This looked good to me, so I applied it locally.  I then ran the test
> suite and noticed that tests/go.scm and tests/crate.scm have failing
> tests.
>
> The failure in tests/go.scm is harmless and can easily be fixed.  But
> the failure in tests/crate.scm indicates a real problem, I think.  The
> build system expects that inputs are placed in the #:cargo-inputs field
> in (arguments …), and this seems to expect old-style labelled inputs.
>
> I don’t know if the build system would work with the new-style plain
> lists in the arguments field, so I’m Cc-ing contributors to the build
> system.
>
> @Jakub and @Efraim: could you please comment on this?

A friendly ping.  :-)

I think it’s important to make sure the current Rust packaging strategy
does not “hold us back”.

Thanks,
Ludo’.




This bug report was last modified 1 year and 310 days ago.

Previous Next


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