GNU logs - #70923, boring messages

Message sent to guix-patches@HIDDEN:

Subject: [bug#70923] [PATCH 00/13] Add (guix import utils) procedures.
Resent-From: Herman Rimm <herman@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 13 May 2024 20:00:02 +0000
Resent-Message-ID: <handler.70923.B.1715630400525 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: 70923 <at> debbugs.gnu.org
From: Herman Rimm <herman@HIDDEN>
Date: Mon, 13 May 2024 21:59:13 +0200
Message-ID: <cover.1715627497.git.herman@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=81.205.150.117; envelope-from=herman@HIDDEN;
 helo=email.rimm.ee
X-Spam_score_int: 12
X-Spam_score: 1.2
X-Spam_bar: +
X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1,
 DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_PBL=3.335, SPF_HELO_NONE=0.001,
 SPF_PASS=-0.001, TVD_RCVD_IP=0.001 autolearn=no autolearn_force=no
X-Spam_action: no action
X-Spam-Score: -1.4 (-)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -2.4 (--)

Hello,

All but one importers (cran) now use procedures from (guix import utils)
to create the package inputs and arguments fields.  I also made the
cargo build-system compatible with the new style of inputs.

[PATCH 02/13] and [PATCH 03/13] are based on commits from [bug#49531]
which were merged into the core-updates branch in January: [1] and [2]
respectively.  The series is based on the master branch because I do not
think emitting and parsing the new style of cargo inputs is a major
change.  I can prepare a patch series for core-updates based on [1] if
needed though.

For once I remove more lines of code than I add, yay!

Cheers,
Herman

[1]: 49a85411b2af0e324e3b70839acea2720e855b32
[2]: 71ef0d2216890c29cb77c7b3e2af4ce3b629d7b8

Herman Rimm (10):
  build-system: cargo: Accept unlabeled #:cargo-inputs.
  tests: elm: Adjust to new-style package inputs.
  import: utils: Add 'maybe-upstream-inputs' procedure.
  import: pypi: Use 'maybe-list-field' procedure.
  import: elpa: Use maybe-propagated-inputs procedure.
  import: hackage: Use 'maybe-list-field' procedure.
  import: cran: Use 'maybe-list-field' procedure.
  import: cpan: Use 'maybe-upstream-inputs' procedure.
  import: egg: Use maybe-*inputs procedures.
  import: hexpm: Use (guix import utils) 'maybe-inputs' procedure.

Sarah Morgensen (3):
  import: utils: Emit new-style package inputs.
  tests: go: Adjust to new-style package inputs.
  import: crate: Emit new-style package inputs.

 guix/build-system/cargo.scm |  12 +++-
 guix/import/cpan.scm        |  22 ++-----
 guix/import/cran.scm        |  35 +++++------
 guix/import/crate.scm       |  54 ++++++----------
 guix/import/egg.scm         |  38 +++---------
 guix/import/elpa.scm        |   9 +--
 guix/import/hackage.scm     |  38 ++++--------
 guix/import/hexpm.scm       |  20 ++----
 guix/import/pypi.scm        |  20 ++----
 guix/import/utils.scm       |  67 ++++++++++++--------
 tests/crate.scm             | 119 +++++++++++++++---------------------
 tests/elm.scm               |   4 +-
 tests/go.scm                |   2 +-
 tests/hackage.scm           |  13 ++--
 14 files changed, 182 insertions(+), 271 deletions(-)

base-commit: 2793a79117d244b9e8fd48a8c3477f33f425210a
-- 
2.41.0

Message sent:

Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-Mailer: MIME-tools 5.505 (Entity 5.505)
Content-Type: text/plain; charset=utf-8
X-Loop: help-debbugs@HIDDEN
From: help-debbugs@HIDDEN (GNU bug Tracking System)
To: Herman Rimm <herman@HIDDEN>
Subject: bug#70923: Acknowledgement ([PATCH 00/13] Add (guix import utils)
 procedures.)
Message-ID: <handler.70923.B.1715630400525.ack <at> debbugs.gnu.org>
References: <cover.1715627497.git.herman@HIDDEN>
X-Gnu-PR-Message: ack 70923
X-Gnu-PR-Package: guix-patches
X-Gnu-PR-Keywords: patch
Reply-To: 70923 <at> debbugs.gnu.org
Date: Mon, 13 May 2024 20:00:02 +0000

Thank you for filing a new bug report with debbugs.gnu.org.

This is an automatically generated reply to let you know your message
has been received.

Your message is being forwarded to the package maintainers and other
interested parties for their attention; they will reply in due course.

Your message has been sent to the package maintainer(s):
 guix-patches@HIDDEN

If you wish to submit further information on this problem, please
send it to 70923 <at> debbugs.gnu.org.

Please do not send mail to help-debbugs@HIDDEN unless you wish
to report a problem with the Bug-tracking system.

--=20
70923: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D70923
GNU Bug Tracking System
Contact help-debbugs@HIDDEN with problems

Message sent to efraim@HIDDEN, guix-patches@HIDDEN:

Subject: [bug#70923] [PATCH 01/13] build-system: cargo: Accept unlabeled #:cargo-inputs.
Resent-From: Herman Rimm <herman@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: efraim@HIDDEN, guix-patches@HIDDEN
Resent-Date: Mon, 13 May 2024 20:09:02 +0000
Resent-Message-ID: <handler.70923.B70923.1715630916929 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: 70923 <at> debbugs.gnu.org
Cc: Efraim Flashner <efraim@HIDDEN>
From: Herman Rimm <herman@HIDDEN>
Date: Mon, 13 May 2024 22:07:58 +0200
Message-ID: <a6c9c6b0754eb8cafaefcc75f5119714bfcdb0d3.1715627497.git.herman@HIDDEN>
In-Reply-To: <cover.1715627497.git.herman@HIDDEN>
References: <cover.1715627497.git.herman@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: list
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>

 Content preview:  * guix/build-system/cargo.scm (crate-closure): Match unlabeled
    inputs. Change-Id: Iae421281fa08d09ddd1e5d2da2864f0093d97cd1 --- guix/build-system/cargo.scm
    | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) 

 Content analysis details:   (2.6 points, 10.0 required)

  pts rule name              description
 ---- ---------------------- --------------------------------------------------
  3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
                             [81.205.150.117 listed in zen.spamhaus.org]
  0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
 -1.0 MAILING_LIST_MULTI     Multiple indicators imply a widely-seen list
                             manager

* guix/build-system/cargo.scm (crate-closure): Match unlabeled inputs.

Change-Id: Iae421281fa08d09ddd1e5d2da2864f0093d97cd1
---
 guix/build-system/cargo.scm | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/guix/build-system/cargo.scm b/guix/build-system/cargo.scm
index c029cc1dda..a918e25e7a 100644
--- a/guix/build-system/cargo.scm
+++ b/guix/build-system/cargo.scm
@@ -234,7 +234,17 @@ (define (crate-closure inputs)
        (if (null? propagated)
            (reverse result)
            (loop (reverse (concatenate propagated)) result '() #f seen)))
-      (((and input (label (? package? package))) rest ...)
+      (((? package? package) rest ...)
+       (if (and (not first?) (seen? seen package))
+           (loop rest result propagated first? seen)
+           (loop rest
+                 (cons (list (package-name package) package) result)
+                 (cons (package-cargo-inputs package)
+                       propagated)
+                 first?
+                 (vhash-consq package package seen))))
+      ;; Match inputs with explicit labels for backward compatibility.
+      (((and input (_ (? package? package))) rest ...)
        (if (and (not first?) (seen? seen package))
            (loop rest result propagated first? seen)
            (loop rest
-- 
2.41.0

Message sent to guix-patches@HIDDEN:

Subject: [bug#70923] [PATCH 02/13] import: utils: Emit new-style package inputs.
Resent-From: Herman Rimm <herman@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 13 May 2024 20:09:02 +0000
Resent-Message-ID: <handler.70923.B70923.1715630921969 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: 70923 <at> debbugs.gnu.org
Cc: Sarah Morgensen <iskarian@HIDDEN>
From: Herman Rimm <herman@HIDDEN>
Date: Mon, 13 May 2024 22:07:59 +0200
Message-ID: <691df95b12c7f51c2c8ed5e0d495cb96cf3c7aa5.1715627497.git.herman@HIDDEN>
In-Reply-To: <cover.1715627497.git.herman@HIDDEN>
References: <cover.1715627497.git.herman@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Precedence: list
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
 
 Content preview:  From: Sarah Morgensen <iskarian@HIDDEN> * guix/import/utils.scm
    (package-names->package-inputs)[make-input]: Return new-style package inputs.
    (maybe-list-field): Add procedure, which wraps BODY in 'list' instead of
   'quasiquote'. (maybe-pack [...] 
 
 Content analysis details:   (2.6 points, 10.0 required)
 
  pts rule name              description
 ---- ---------------------- --------------------------------------------------
  3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
                             [81.205.150.117 listed in zen.spamhaus.org]
  0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
 -1.0 MAILING_LIST_MULTI     Multiple indicators imply a widely-seen list
                             manager

From: Sarah Morgensen <iskarian@HIDDEN>

* guix/import/utils.scm (package-names->package-inputs)[make-input]:
Return new-style package inputs.
(maybe-list-field): Add procedure, which wraps BODY in 'list' instead of
'quasiquote'.
(maybe-packages-field): Add procedure.
(maybe-inputs): Use maybe-packages-field.
(maybe-native-inputs): Use maybe-packages-field.
(maybe-propagated-inputs): Use maybe-packages-field.

Change-Id: I66588f4c822d507ddbaf465a268bfb71af8a7ecd
---
 guix/import/utils.scm | 58 ++++++++++++++++++++++++-------------------
 1 file changed, 33 insertions(+), 25 deletions(-)

diff --git a/guix/import/utils.scm b/guix/import/utils.scm
index 09a01cf315..1bbab916c4 100644
--- a/guix/import/utils.scm
+++ b/guix/import/utils.scm
@@ -13,6 +13,7 @@
 ;;; Copyright © 2022 Alice Brenon <alice.brenon@HIDDEN>
 ;;; Copyright © 2022 Kyle Meyer <kyle@HIDDEN>
 ;;; Copyright © 2022 Philip McGrath <philip@HIDDEN>
+;;; Copyright © 2024 Herman Rimm <herman@HIDDEN>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -65,6 +66,8 @@ (define-module (guix import utils)
             guix-hash-url
 
             package-names->package-inputs
+            maybe-list-field
+            maybe-packages-field
             maybe-inputs
             maybe-native-inputs
             maybe-propagated-inputs
@@ -409,41 +412,46 @@ (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 ((symbol (string->symbol
+                    (if version
+                        (string-append input "-" version)
+                        input))))
+      (if output
+          (list symbol output)
+          symbol)))
 
   (map (match-lambda
          ((input version) (make-input input version))
          (input (make-input input #f)))
        names))
 
-(define* (maybe-inputs package-names #:optional (output #f)
-                       #:key (type #f))
-  "Given a list of PACKAGE-NAMES, tries to generate the 'inputs' field of a
-package definition.  TYPE can be used to specify the type of the inputs;
-either the 'native or 'propagated symbols are accepted.  Left unspecified, the
-snippet generated is for regular inputs."
-  (let ((field-name (match type
-                      ('native 'native-inputs)
-                      ('propagated 'propagated-inputs)
-                      (_ 'inputs))))
-    (match (package-names->package-inputs package-names output)
-      (()
-       '())
-      ((package-inputs ...)
-       `((,field-name (,'quasiquote ,package-inputs)))))))
+(define* (maybe-list-field type body)
+  "Generates the TYPE field of a package definition if its value, BODY,
+is a non-empty list."
+  (match body
+    (()
+     '())
+    ((? list?)
+     (list (list type (cons 'list body))))))
+
+(define* (maybe-packages-field type package-names
+                               #:optional (output #f))
+  "Given a list of PACKAGE-NAMES, tries to generate the TYPE field of a
+package definition."
+  (maybe-list-field type
+    (package-names->package-inputs package-names output)))
+
+(define* (maybe-inputs package-names #:optional (output #f))
+  "MAYBE-PACKAGES-FIELD for inputs."
+  (maybe-packages-field 'inputs package-names output))
 
 (define* (maybe-native-inputs package-names #:optional (output #f))
-  "Same as MAYBE-INPUTS, but for native inputs."
-  (maybe-inputs package-names output #:type 'native))
+  "MAYBE-PACKAGES-FIELD for native inputs."
+  (maybe-packages-field 'native-inputs package-names output))
 
 (define* (maybe-propagated-inputs package-names #:optional (output #f))
-  "Same as MAYBE-INPUTS, but for propagated inputs."
-  (maybe-inputs package-names output #:type 'propagated))
+  "MAYBE-PACKAGES-FIELD for propagated inputs."
+  (maybe-packages-field 'propagated-inputs package-names output))
 
 (define* (package->definition guix-package #:optional append-version?/string)
   "If APPEND-VERSION?/STRING is #t, append the package's major+minor version.
-- 
2.41.0

Message sent to cox.katherine.e+guix@HIDDEN, sharlatanus@HIDDEN, guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#70923] [PATCH 03/13] tests: go: Adjust to new-style package inputs.
Resent-From: Herman Rimm <herman@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: cox.katherine.e+guix@HIDDEN, sharlatanus@HIDDEN, guix-patches@HIDDEN
Resent-Date: Mon, 13 May 2024 20:09:03 +0000
Resent-Message-ID: <handler.70923.B70923.1715630922990 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70923
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 70923 <at> debbugs.gnu.org
Cc: Sarah Morgensen <iskarian@HIDDEN>, Katherine Cox-Buday <cox.katherine.e+guix@HIDDEN>, Sharlatan Hellseher <sharlatanus@HIDDEN>
X-Debbugs-Original-Xcc: Katherine Cox-Buday <cox.katherine.e+guix@HIDDEN>, Sharlatan Hellseher <sharlatanus@HIDDEN>
Received: via spool by 70923-submit <at> debbugs.gnu.org id=B70923.1715630922990
          (code B ref 70923); Mon, 13 May 2024 20:09:03 +0000
Received: (at 70923) by debbugs.gnu.org; 13 May 2024 20:08:42 +0000
Received: from localhost ([127.0.0.1]:34588 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1s6byT-0000FZ-3u
	for submit <at> debbugs.gnu.org; Mon, 13 May 2024 16:08:41 -0400
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:47157
 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <herman@HIDDEN>) id 1s6byP-0000Ek-Ck
 for 70923 <at> debbugs.gnu.org; Mon, 13 May 2024 16:08:37 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
 t=1715630907;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc:cc:mime-version:mime-version:
 content-transfer-encoding:content-transfer-encoding:
 in-reply-to:in-reply-to:references:references;
 bh=B7OBHl2BUxzlmsCaUb+oxJwIiSx8hwswd6LQKpGYGtY=;
 b=T95eG1QsAunK/H9z8DeiAX2XymjFJHgJdqy06vDZWjl757UPQ2toGpflXnj3AtWv4VsUup
 CxrgbLw0pXqEpPO4ZjIR0LIouzV2afYpButxA7hGfYzhZE3LbLaTgt+U7nk6lehmhqCYYR
 XJlk4bwNpC5xlWAiV8J+wj/MLGsTjF3kaBZkf/cidD/IQq6jFiHcGutMsh3vjgh1tf1QYl
 lVb6RPcf7ArEgd7AFjz4C+kXrOAGw9WdEyDYOV2vT4eNEQPqLlE7NB7rRl602bF7Ao3WAZ
 7AdT0S8SiGkAhOxnqT7efhnCsTlDf2Y3YDw3ZFEUEfHcJiVZQGAMCHGu1Q+L9A==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id b79c0a30
 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); 
 Mon, 13 May 2024 20:08:26 +0000 (UTC)
From: Herman Rimm <herman@HIDDEN>
Date: Mon, 13 May 2024 22:08:00 +0200
Message-ID: <5e4fd3fd23307151ae51b1406a9554aa17ea1844.1715627497.git.herman@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1715627497.git.herman@HIDDEN>
References: <cover.1715627497.git.herman@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 3.6 (+++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 Content preview: From: Sarah Morgensen <iskarian@HIDDEN> * tests/go.scm
 ("go-module->guix-package"):
 Use new-style for propagated-inputs. Change-Id:
 Id6341bfb2d92c7f1d7fb85e46d38748584e5fabe
 --- tests/go.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 
 Content analysis details:   (3.6 points, 10.0 required)
 pts rule name              description
 ---- ---------------------- --------------------------------------------------
 3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
 [81.205.150.117 listed in zen.spamhaus.org]
 0.0 TVD_RCVD_IP            Message was received from an IP address
 0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 2.6 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 
 Content preview:  From: Sarah Morgensen <iskarian@HIDDEN> * tests/go.scm ("go-module->guix-package"):
    Use new-style for propagated-inputs. Change-Id: Id6341bfb2d92c7f1d7fb85e46d38748584e5fabe
    --- tests/go.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 
 
 Content analysis details:   (2.6 points, 10.0 required)
 
  pts rule name              description
 ---- ---------------------- --------------------------------------------------
  3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
                             [81.205.150.117 listed in zen.spamhaus.org]
  0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
 -1.0 MAILING_LIST_MULTI     Multiple indicators imply a widely-seen list
                             manager

From: Sarah Morgensen <iskarian@HIDDEN>

* tests/go.scm ("go-module->guix-package"): Use new-style for
propagated-inputs.

Change-Id: Id6341bfb2d92c7f1d7fb85e46d38748584e5fabe
---
 tests/go.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/go.scm b/tests/go.scm
index d2e8846b30..f925c485c1 100644
--- a/tests/go.scm
+++ b/tests/go.scm
@@ -389,7 +389,7 @@ (define (mock-http-get testcase)
      (arguments
       (list #:import-path "github.com/go-check/check"))
      (propagated-inputs
-      `(("go-github-com-kr-pretty" ,go-github-com-kr-pretty)))
+      (list go-github-com-kr-pretty))
      (home-page "https://github.com/go-check/check")
      (synopsis "Instructions")
      (description "Package check is a rich testing extension for Go's testing \
-- 
2.41.0

Message sent to guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#70923] [PATCH 04/13] tests: elm: Adjust to new-style package inputs.
Resent-From: Herman Rimm <herman@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 13 May 2024 20:09:03 +0000
Resent-Message-ID: <handler.70923.B70923.1715630922999 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70923
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 70923 <at> debbugs.gnu.org
Received: via spool by 70923-submit <at> debbugs.gnu.org id=B70923.1715630922999
          (code B ref 70923); Mon, 13 May 2024 20:09:03 +0000
Received: (at 70923) by debbugs.gnu.org; 13 May 2024 20:08:42 +0000
Received: from localhost ([127.0.0.1]:34592 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1s6byT-0000Fv-UK
	for submit <at> debbugs.gnu.org; Mon, 13 May 2024 16:08:42 -0400
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:47157
 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <herman@HIDDEN>) id 1s6byQ-0000Ek-1h
 for 70923 <at> debbugs.gnu.org; Mon, 13 May 2024 16:08:38 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
 t=1715630907;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc:mime-version:mime-version:
 content-transfer-encoding:content-transfer-encoding:
 in-reply-to:in-reply-to:references:references;
 bh=1VHukPkZyplAjDWr9oFR+gPVhDuw9REWtF9PuIn7/zY=;
 b=RzWK8Qw3eKLnqvujsRJw8h/xK6loJdh08xjbHF36QGpN2sVsrWVuTGY/ZD/Swc2lF1ns7o
 cpYPvXcOqCKzICW3pSsCQj7Lwsdod38oH62zMxYjKUytUPhV9TVbwSHUkoFW1xAzTRLl+w
 T60vxfefR9lsQ4+/1jHFHosqkzxK4iWs5jV4S0+BneJf4QUvooid5GEy4EQpF8T6NjvJrR
 Kt1dw0Fj3HKD1RZ6KbwZVVLmQoXJCX2Jf+mCjEtib6anZwyMT2AJAURon1ToGnW0w4DB1U
 UVB0fGWtuFnFiJh1TpQI7zRUdbt3LZIYYF+dGUItki/lkcq+EmUPJDuLRIAwyw==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 46970706
 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO)
 for <70923 <at> debbugs.gnu.org>; Mon, 13 May 2024 20:08:27 +0000 (UTC)
From: Herman Rimm <herman@HIDDEN>
Date: Mon, 13 May 2024 22:08:01 +0200
Message-ID: <6616ae10b267f38a3cfa8aaef9fc0bd0f913fd30.1715627497.git.herman@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1715627497.git.herman@HIDDEN>
References: <cover.1715627497.git.herman@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 3.6 (+++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 Content preview: * tests/elm.scm ("elm-recursive-import \"elm-guix/demo\""):
 Use the new-style for inputs and propagated-inputs. Change-Id:
 Iae05b5e9f9b6a73cb2d08bb3b0f73df9004f83ac
 --- tests/elm.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
 Content analysis details:   (3.6 points, 10.0 required)
 pts rule name              description
 ---- ---------------------- --------------------------------------------------
 3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
 [81.205.150.117 listed in zen.spamhaus.org]
 0.0 TVD_RCVD_IP            Message was received from an IP address
 0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 2.6 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 
 Content preview:  * tests/elm.scm ("elm-recursive-import \"elm-guix/demo\""):
    Use the new-style for inputs and propagated-inputs. Change-Id: Iae05b5e9f9b6a73cb2d08bb3b0f73df9004f83ac
    --- tests/elm.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
    
 
 Content analysis details:   (2.6 points, 10.0 required)
 
  pts rule name              description
 ---- ---------------------- --------------------------------------------------
  3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
                             [81.205.150.117 listed in zen.spamhaus.org]
  0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
 -1.0 MAILING_LIST_MULTI     Multiple indicators imply a widely-seen list
                             manager

* tests/elm.scm ("elm-recursive-import \"elm-guix/demo\""): Use
the new-style for inputs and propagated-inputs.

Change-Id: Iae05b5e9f9b6a73cb2d08bb3b0f73df9004f83ac
---
 tests/elm.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/elm.scm b/tests/elm.scm
index c30623da03..2cdeab96fb 100644
--- a/tests/elm.scm
+++ b/tests/elm.scm
@@ -250,9 +250,9 @@ (define (directory-sha256 directory)
                          (base32 ,(? string? hash))))
                 (build-system elm-build-system)
                 (propagated-inputs
-                 ,'`(("elm-core" ,elm-core)))
+                 (list elm-core))
                 (inputs
-                 ,'`(("elm-json" ,elm-json)))
+                 (list elm-json))
                 (home-page
                  "https://package.elm-lang.org/packages/elm-guix/demo/3.0.0")
                 (synopsis "A test for `(guix import elm)`")
-- 
2.41.0

Message sent to guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#70923] [PATCH 06/13] import: utils: Add 'maybe-upstream-inputs' procedure.
Resent-From: Herman Rimm <herman@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 13 May 2024 20:09:04 +0000
Resent-Message-ID: <handler.70923.B70923.17156309281034 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70923
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 70923 <at> debbugs.gnu.org
Received: via spool by 70923-submit <at> debbugs.gnu.org id=B70923.17156309281034
          (code B ref 70923); Mon, 13 May 2024 20:09:04 +0000
Received: (at 70923) by debbugs.gnu.org; 13 May 2024 20:08:48 +0000
Received: from localhost ([127.0.0.1]:34600 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1s6bya-0000Gb-DG
	for submit <at> debbugs.gnu.org; Mon, 13 May 2024 16:08:48 -0400
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:40155
 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <herman@HIDDEN>) id 1s6byR-0000El-OK
 for 70923 <at> debbugs.gnu.org; Mon, 13 May 2024 16:08:40 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
 t=1715630908;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc:mime-version:mime-version:
 content-transfer-encoding:content-transfer-encoding:
 in-reply-to:in-reply-to:references:references;
 bh=fb1CJEEtcRxSwB70WqNuwiVWepplRUzyPYeWO8oYJFg=;
 b=dTUWCo2wMXbwP/QyPxjiovDGN91n/Dggnix1bSPmBHu6LevfLgCqk9SamCvJ9vwHb4GuM0
 KJWQLjEzY9l+1AV2Ob0S6NbQqft840PRyszoTqMoRRl3mczH2iZUA+0CfIadkTFxZOD+6S
 ZDCbgixLT65DOvNCiw5fN7dqgBJQ6UIcQHjHobV/ZKADIsr8VGjFRqHaJmpvBpdqLz9okR
 QmJqpTxbpMbvAG4/7725F/pUXxUQfqptSV0MMMUWChG+YQpuRgnQ7opbjBmxcmxRtliGae
 PaRIapMHuM2SFsp2D1t8LjfvMDoTZDW4ksr39N6EYU9rz+KvpJFs6cmoniqi5w==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 334a0344
 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO)
 for <70923 <at> debbugs.gnu.org>; Mon, 13 May 2024 20:08:28 +0000 (UTC)
From: Herman Rimm <herman@HIDDEN>
Date: Mon, 13 May 2024 22:08:03 +0200
Message-ID: <162a6f222e11f72a5eaa8246c4f03c494f0440ca.1715627497.git.herman@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1715627497.git.herman@HIDDEN>
References: <cover.1715627497.git.herman@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 3.6 (+++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 Content preview: * guix/import/utils.scm (maybe-upstream-inputs): Add
 procedure.
 Change-Id: Ib8a80216d512c0373e55e4f27e1ef2a7c1fb854a --- guix/import/utils.scm
 | 9 +++++++++ 1 file changed,
 9 insertions(+) diff --git a/guix/import/utils.scm
 b/guix/import/utils.scm index 1bbab916c4..98080dd0a0 100644 ---
 a/guix/import/utils.scm
 +++ b/guix/import/utils.scm @@ -45,6 +45,7 @@ (define-module (guix import
 uti [...] 
 Content analysis details:   (3.6 points, 10.0 required)
 pts rule name              description
 ---- ---------------------- --------------------------------------------------
 3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
 [81.205.150.117 listed in zen.spamhaus.org]
 0.0 TVD_RCVD_IP            Message was received from an IP address
 0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 2.6 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 
 Content preview:  * guix/import/utils.scm (maybe-upstream-inputs): Add procedure.
    Change-Id: Ib8a80216d512c0373e55e4f27e1ef2a7c1fb854a --- guix/import/utils.scm
    | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/guix/import/utils.scm
    b/guix/import/utils.scm index 1bbab916c4..98080dd0a0 100644 --- a/guix/import/utils.scm
    +++ b/guix/import/utils.scm @@ -45,6 +45,7 @@ (define-module (guix import
    uti [...] 
 
 Content analysis details:   (2.6 points, 10.0 required)
 
  pts rule name              description
 ---- ---------------------- --------------------------------------------------
  3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
                             [81.205.150.117 listed in zen.spamhaus.org]
  0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
 -1.0 MAILING_LIST_MULTI     Multiple indicators imply a widely-seen list
                             manager

* guix/import/utils.scm (maybe-upstream-inputs): Add procedure.

Change-Id: Ib8a80216d512c0373e55e4f27e1ef2a7c1fb854a
---
 guix/import/utils.scm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/guix/import/utils.scm b/guix/import/utils.scm
index 1bbab916c4..98080dd0a0 100644
--- a/guix/import/utils.scm
+++ b/guix/import/utils.scm
@@ -45,6 +45,7 @@ (define-module (guix import utils)
   #:use-module (guix download)
   #:use-module (guix sets)
   #:use-module ((guix ui) #:select (fill-paragraph))
+  #:use-module (guix upstream)
   #:use-module (gnu packages)
   #:autoload   (ice-9 control) (let/ec)
   #:use-module (ice-9 match)
@@ -71,6 +72,7 @@ (define-module (guix import utils)
             maybe-inputs
             maybe-native-inputs
             maybe-propagated-inputs
+            maybe-upstream-inputs
             package->definition
 
             spdx-string->license
@@ -453,6 +455,13 @@ (define* (maybe-propagated-inputs package-names #:optional (output #f))
   "MAYBE-PACKAGES-FIELD for propagated inputs."
   (maybe-packages-field 'propagated-inputs package-names output))
 
+(define* (maybe-upstream-inputs type upstream-inputs)
+  "Given a list of UPSTREAM-NAMES, tries to generate the TYPE field of a
+package definition."
+  (maybe-list-field type
+    (map (compose string->symbol upstream-input-downstream-name)
+         upstream-inputs)))
+
 (define* (package->definition guix-package #:optional append-version?/string)
   "If APPEND-VERSION?/STRING is #t, append the package's major+minor version.
 If it is the symbol 'full, append the package's complete version.  If
-- 
2.41.0

Message sent to efraim@HIDDEN, guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#70923] [PATCH 05/13] import: crate: Emit new-style package inputs.
Resent-From: Herman Rimm <herman@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: efraim@HIDDEN, guix-patches@HIDDEN
Resent-Date: Mon, 13 May 2024 20:09:04 +0000
Resent-Message-ID: <handler.70923.B70923.17156309291041 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70923
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 70923 <at> debbugs.gnu.org
Cc: Sarah Morgensen <iskarian@HIDDEN>, Efraim Flashner <efraim@HIDDEN>
X-Debbugs-Original-Xcc: Efraim Flashner <efraim@HIDDEN>
Received: via spool by 70923-submit <at> debbugs.gnu.org id=B70923.17156309291041
          (code B ref 70923); Mon, 13 May 2024 20:09:04 +0000
Received: (at 70923) by debbugs.gnu.org; 13 May 2024 20:08:49 +0000
Received: from localhost ([127.0.0.1]:34602 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1s6bya-0000Gd-PM
	for submit <at> debbugs.gnu.org; Mon, 13 May 2024 16:08:49 -0400
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:47157
 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <herman@HIDDEN>) id 1s6byQ-0000Ek-TB
 for 70923 <at> debbugs.gnu.org; Mon, 13 May 2024 16:08:40 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
 t=1715630907;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc:cc:mime-version:mime-version:content-type:content-type:
 content-transfer-encoding:content-transfer-encoding:
 in-reply-to:in-reply-to:references:references;
 bh=Ff5xJe8LhMQnTeulI9egnKlKA9FKEEOZPQSdr1khMAQ=;
 b=bSmWVxam2WbXRNgNagb5aoztXi9g111ehphalA8/Js8kfVnzl5ZqpZqys+yR4khujt3yII
 adThBGtisc/ZWfRAQZaBBDQZgf2ZUQZKQukh+HVSjQOoCT3YoyVTn/9oGSMEABJkjHh13F
 gnXY5Eur7XaAv2f7BJhmZ+WrwTI46sLxXf/tdbShOxh/tYmdqEapEAq8C9GjmT5OXPY6By
 28njUV1gIDTNvCVjyIRm75S2lM52TtPzPgOjR7ki90P5oBTGpRyA9bCdAXsdKVBkIOPYMI
 INOskC4tf2foZVbyBZG0iWieJN5J8b++qBW5oap2l36IMrSG4gBCRdDgrT8z7A==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id df555c22
 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); 
 Mon, 13 May 2024 20:08:27 +0000 (UTC)
From: Herman Rimm <herman@HIDDEN>
Date: Mon, 13 May 2024 22:08:02 +0200
Message-ID: <c8a62db4b34bb7d9a70a39c83c95ef23f77d38c9.1715627497.git.herman@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1715627497.git.herman@HIDDEN>
References: <cover.1715627497.git.herman@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: 3.6 (+++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 Content preview: From: Sarah Morgensen <iskarian@HIDDEN> *
 guix/import/crate.scm
 (maybe-cargo-inputs, maybe-cargo-development-inputs, maybe-arguments): Delete
 procedures. (make-crate-sexp): Add 'unwrap' procedure,
 use with maybe-packages-field and fix inden [...] 
 Content analysis details:   (3.6 points, 10.0 required)
 pts rule name              description
 ---- ---------------------- --------------------------------------------------
 3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
 [81.205.150.117 listed in zen.spamhaus.org]
 0.0 TVD_RCVD_IP            Message was received from an IP address
 0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
 0.0 T_FILL_THIS_FORM_SHORT Fill in a short form with personal
 information
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 2.6 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 
 Content preview:  From: Sarah Morgensen <iskarian@HIDDEN> * guix/import/crate.scm
    (maybe-cargo-inputs, maybe-cargo-development-inputs, maybe-arguments): Delete
    procedures. (make-crate-sexp): Add 'unwrap' procedure, use with maybe-packages-field
    and fix inden [...] 
 
 Content analysis details:   (2.6 points, 10.0 required)
 
  pts rule name              description
 ---- ---------------------- --------------------------------------------------
  3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
                             [81.205.150.117 listed in zen.spamhaus.org]
  0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
 -1.0 MAILING_LIST_MULTI     Multiple indicators imply a widely-seen list
                             manager

From: Sarah Morgensen <iskarian@HIDDEN>

* guix/import/crate.scm (maybe-cargo-inputs,
maybe-cargo-development-inputs, maybe-arguments): Delete procedures.
(make-crate-sexp): Add 'unwrap' procedure, use with maybe-packages-field
and fix indentation.
* tests/crate.scm: Adjust accordingly.

Change-Id: Ie8debd2553a338c3c623162b843e0a9827314074
---
 guix/import/crate.scm |  54 +++++++------------
 tests/crate.scm       | 119 +++++++++++++++++-------------------------
 2 files changed, 68 insertions(+), 105 deletions(-)

diff --git a/guix/import/crate.scm b/guix/import/crate.scm
index 7a25b2243c..760c5f0de4 100644
--- a/guix/import/crate.scm
+++ b/guix/import/crate.scm
@@ -7,6 +7,8 @@
 ;;; Copyright © 2023 Simon Tournier <zimon.toutoune@HIDDEN>
 ;;; Copyright © 2023, 2024 Efraim Flashner <efraim@HIDDEN>
 ;;; Copyright © 2023, 2024 David Elsing <david.elsing@HIDDEN>
+;;; Copyright © 2021 Sarah Morgensen <iskarian@HIDDEN>
+;;; Copyright © 2024 Herman Rimm <herman@HIDDEN>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -141,27 +143,6 @@ (define (crate-version-dependencies version)
 ;;; Converting crates to Guix packages.
 ;;;
 
-(define (maybe-cargo-inputs package-names)
-  (match (package-names->package-inputs package-names)
-    (()
-     '())
-    ((package-inputs ...)
-     `(#:cargo-inputs ,package-inputs))))
-
-(define (maybe-cargo-development-inputs package-names)
-  (match (package-names->package-inputs package-names)
-    (()
-     '())
-    ((package-inputs ...)
-     `(#:cargo-development-inputs ,package-inputs))))
-
-(define (maybe-arguments arguments)
-  (match arguments
-    (()
-     '())
-    ((args ...)
-     `((arguments (,'quasiquote ,args))))))
-
 (define (version->semver-prefix version)
   "Return the version up to and including the first non-zero part"
   (first
@@ -185,8 +166,14 @@ (define* (make-crate-sexp #:key name version cargo-inputs cargo-development-inpu
 
   (let* ((port (http-fetch (crate-uri name version)))
          (guix-name (crate-name->package-name name))
-         (cargo-inputs (format-inputs cargo-inputs))
-         (cargo-development-inputs (format-inputs cargo-development-inputs))
+         (unwrap (match-lambda
+                   ((lst) lst)
+                   (() '())))
+         (cargo-inputs (maybe-packages-field '#:cargo-inputs
+                         (format-inputs cargo-inputs)))
+         (cargo-development-inputs
+           (maybe-packages-field '#:cargo-development-inputs
+             (format-inputs cargo-development-inputs)))
          (pkg `(package
                    (name ,guix-name)
                    (version ,version)
@@ -204,12 +191,12 @@ (define* (make-crate-sexp #:key name version cargo-inputs cargo-development-inpu
                          `((properties '((crate-version-yanked? . #t))))
                          '())
                    (build-system cargo-build-system)
-                   ,@(maybe-arguments (append (if build?
-                                                 '()
-                                                 '(#:skip-build? #t))
-                                              (maybe-cargo-inputs cargo-inputs)
-                                              (maybe-cargo-development-inputs
-                                                cargo-development-inputs)))
+                   ,@(maybe-list-field 'arguments
+                       (append (if build?
+                                   '()
+                                   '(#:skip-build? #t))
+                               (unwrap cargo-inputs)
+                               (unwrap cargo-development-inputs)))
                    (home-page ,home-page)
                    (synopsis ,synopsis)
                    (description ,(beautify-description description))
@@ -218,11 +205,10 @@ (define* (make-crate-sexp #:key name version cargo-inputs cargo-development-inpu
                                (#f #f)
                                ((license) license)
                                (_ `(list ,@license)))))))
-         (close-port port)
-         (package->definition pkg
-                              (if yanked?
-                                  (string-append version "-yanked")
-                                  (version->semver-prefix version)))))
+    (close-port port)
+    (package->definition pkg (if yanked?
+                                 (string-append version "-yanked")
+                                 (version->semver-prefix version)))))
 
 (define (string->license string)
   (filter-map (lambda (license)
diff --git a/tests/crate.scm b/tests/crate.scm
index ce2f08aade..7651a5b5bb 100644
--- a/tests/crate.scm
+++ b/tests/crate.scm
@@ -5,6 +5,8 @@
 ;;; Copyright © 2020 Martin Becze <mjbecze@HIDDEN>
 ;;; Copyright © 2023 Efraim Flashner <efraim@HIDDEN>
 ;;; Copyright © 2023 David Elsing <david.elsing@HIDDEN>
+;;; Copyright © 2021 Sarah Morgensen <iskarian@HIDDEN>
+;;; Copyright © 2024 Herman Rimm <herman@HIDDEN>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -497,10 +499,10 @@ (define have-guile-semver?
                            (?  string? hash)))))
                       (build-system 'cargo-build-system)
                       (arguments
-                       ('quasiquote
-                        (#:skip-build? #t
+                       (list
+                         #:skip-build? #t
                          #:cargo-inputs
-                         (("rust-leaf-alice" ('unquote 'rust-leaf-alice-0.7))))))
+                         (list rust-leaf-alice-0.7)))
                       (home-page "http://example.com")
                       (synopsis "summary")
                       (description "summary")
@@ -589,7 +591,7 @@ (define have-guile-semver?
                      (?  string? hash)))))
                 (build-system cargo-build-system)
                 (arguments
-                 ('quasiquote (#:skip-build? #t)))
+                 (list #:skip-build? #t))
                 (home-page "http://example.com")
                 (synopsis "summary")
                 (description "summary")
@@ -608,7 +610,7 @@ (define have-guile-semver?
                     (base32
                      (?  string? hash)))))
                 (build-system cargo-build-system)
-                (arguments ('quasiquote (#:skip-build? #t)))
+                (arguments (list #:skip-build? #t))
                 (home-page "http://example.com")
                 (synopsis "summary")
                 (description "summary")
@@ -627,7 +629,7 @@ (define have-guile-semver?
                     (base32
                      (?  string? hash)))))
                 (build-system cargo-build-system)
-                (arguments ('quasiquote (#:skip-build? #t)))
+                (arguments (list #:skip-build? #t))
                 (home-page "http://example.com")
                 (synopsis "summary")
                 (description "summary")
@@ -647,10 +649,9 @@ (define have-guile-semver?
                      (?  string? hash)))))
                 (build-system cargo-build-system)
                 (arguments
-                 ('quasiquote (#:skip-build? #t
-                               #:cargo-inputs
-                               (("rust-leaf-bob"
-                                 ('unquote rust-leaf-bob-3))))))
+                 (list #:skip-build? #t
+                       #:cargo-inputs
+                       (list rust-leaf-bob-3)))
                 (home-page "http://example.com")
                 (synopsis "summary")
                 (description "summary")
@@ -670,14 +671,11 @@ (define have-guile-semver?
                      (?  string? hash)))))
                 (build-system cargo-build-system)
                 (arguments
-                 ('quasiquote (#:skip-build? #t
-                               #:cargo-inputs
-                               (("rust-intermediate-b"
-                                 ('unquote rust-intermediate-b-1))
-                                ("rust-leaf-alice"
-                                 ('unquote 'rust-leaf-alice-0.7))
-                                ("rust-leaf-bob"
-                                 ('unquote rust-leaf-bob-3))))))
+                 (list #:skip-build? #t
+                       #:cargo-inputs
+                       (list rust-intermediate-b-1
+                             rust-leaf-alice-0.7
+                             rust-leaf-bob-3)))
                 (home-page "http://example.com")
                 (synopsis "summary")
                 (description "summary")
@@ -697,18 +695,13 @@ (define have-guile-semver?
                      (?  string? hash)))))
                 (build-system cargo-build-system)
                 (arguments
-                 ('quasiquote (#:cargo-inputs
-                               (("rust-intermediate-a"
-                                 ('unquote rust-intermediate-a-1))
-                                ("rust-intermediate-b"
-                                 ('unquote rust-intermediate-b-1))
-                                ("rust-leaf-alice"
-                                 ('unquote 'rust-leaf-alice-0.7))
-                                ("rust-leaf-bob"
-                                 ('unquote rust-leaf-bob-3)))
-                               #:cargo-development-inputs
-                               (("rust-intermediate-c"
-                                 ('unquote rust-intermediate-c-1))))))
+                 (list #:cargo-inputs
+                       (list rust-intermediate-a-1
+                             rust-intermediate-b-1
+                             rust-leaf-alice-0.7
+                             rust-leaf-bob-3)
+                       #:cargo-development-inputs
+                       ((list rust-intermediate-c-1))))
                 (home-page "http://example.com")
                 (synopsis "summary")
                 (description "summary")
@@ -735,9 +728,8 @@ (define have-guile-semver?
                      (?  string? hash)))))
                 (build-system cargo-build-system)
                 (arguments
-                 ('quasiquote (#:cargo-development-inputs
-                               (("rust-leaf-alice"
-                                 ('unquote rust-leaf-alice-0.7))))))
+                 (list #:cargo-development-inputs
+                       (list rust-leaf-alice-0.7)))
                 (home-page "http://example.com")
                 (synopsis "summary")
                 (description "summary")
@@ -793,9 +785,8 @@ (define have-guile-semver?
                      (?  string? hash)))))
                 (build-system cargo-build-system)
                 (arguments
-                 ('quasiquote (#:cargo-inputs
-                               (("rust-leaf-bob"
-                                 ('unquote rust-leaf-bob-3))))))
+                 (list #:cargo-inputs
+                       (list rust-leaf-bob-3)))
                 (home-page "http://example.com")
                 (synopsis "summary")
                 (description "summary")
@@ -815,13 +806,10 @@ (define have-guile-semver?
                      (?  string? hash)))))
                 (build-system cargo-build-system)
                 (arguments
-                 ('quasiquote (#:cargo-inputs
-                               (("rust-intermediate-b"
-                                 ('unquote rust-intermediate-b-1))
-                                ("rust-leaf-alice"
-                                 ('unquote 'rust-leaf-alice-0.7))
-                                ("rust-leaf-bob"
-                                 ('unquote rust-leaf-bob-3))))))
+                 (list #:cargo-inputs
+                       (list rust-intermediate-b-1
+                             rust-leaf-alice-0.7
+                             rust-leaf-bob-3)))
                 (home-page "http://example.com")
                 (synopsis "summary")
                 (description "summary")
@@ -841,18 +829,13 @@ (define have-guile-semver?
                      (?  string? hash)))))
                 (build-system cargo-build-system)
                 (arguments
-                 ('quasiquote (#:cargo-inputs
-                               (("rust-intermediate-a"
-                                 ('unquote rust-intermediate-a-1))
-                                ("rust-intermediate-b"
-                                 ('unquote rust-intermediate-b-1))
-                                ("rust-leaf-alice"
-                                 ('unquote 'rust-leaf-alice-0.7))
-                                ("rust-leaf-bob"
-                                 ('unquote rust-leaf-bob-3)))
-                               #:cargo-development-inputs
-                               (("rust-intermediate-c"
-                                 ('unquote rust-intermediate-c-1))))))
+                 (list #:cargo-inputs
+                       (list rust-intermediate-a-1
+                             rust-intermediate-b-1
+                             rust-leaf-alice-0.7
+                             rust-leaf-bob-3)
+                       #:cargo-development-inputs
+                       (list rust-intermediate-c-1)))
                 (home-page "http://example.com")
                 (synopsis "summary")
                 (description "summary")
@@ -962,14 +945,11 @@ (define rust-leaf-bob-3.0.2-yanked
                  (?  string? hash)))))
             (build-system cargo-build-system)
             (arguments
-             ('quasiquote (#:cargo-inputs
-                           (("rust-leaf-bob"
-                             ('unquote 'rust-leaf-bob-3)))
-                           #:cargo-development-inputs
-                           (("rust-leaf-bob"
-                             ('unquote 'rust-leaf-bob-3.0.2-yanked))
-                            ("rust-leaf-bob"
-                             ('unquote 'rust-leaf-bob-4.0.0-yanked))))))
+             (list #:cargo-inputs
+                   (list rust-leaf-bob-3)
+                   #:cargo-development-inputs
+                   (list rust-leaf-bob-3.0.2-yanked
+                         rust-leaf-bob-4.0.0-yanked)))
             (home-page "http://example.com")
             (synopsis "summary")
             (description "summary")
@@ -1093,14 +1073,11 @@ (define rust-leaf-bob-3.0.2-yanked
                      (?  string? hash)))))
                 (build-system cargo-build-system)
                 (arguments
-                 ('quasiquote (#:cargo-inputs
-                               (("rust-leaf-bob"
-                                 ('unquote 'rust-leaf-bob-3)))
-                               #:cargo-development-inputs
-                               (("rust-leaf-bob"
-                                 ('unquote 'rust-leaf-bob-3.0.2-yanked))
-                                ("rust-leaf-bob"
-                                 ('unquote 'rust-leaf-bob-4.0.0-yanked))))))
+                 (list #:cargo-inputs
+                       (list rust-leaf-bob-3)
+                       #:cargo-development-inputs
+                       (list rust-leaf-bob-3.0.2-yanked
+                             rust-leaf-bob-4.0.0-yanked)))
                 (home-page "http://example.com")
                 (synopsis "summary")
                 (description "summary")
-- 
2.41.0

Message sent to lars@HIDDEN, marius@HIDDEN, me@HIDDEN, sharlatanus@HIDDEN, tanguy@HIDDEN, jgart@HIDDEN, guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#70923] [PATCH 07/13] import: pypi: Use 'maybe-list-field' procedure.
Resent-From: Herman Rimm <herman@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: lars@HIDDEN, marius@HIDDEN, me@HIDDEN, sharlatanus@HIDDEN, tanguy@HIDDEN, jgart@HIDDEN, guix-patches@HIDDEN
Resent-Date: Mon, 13 May 2024 20:09:05 +0000
Resent-Message-ID: <handler.70923.B70923.17156309301048 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70923
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 70923 <at> debbugs.gnu.org
Cc: Lars-Dominik Braun <lars@HIDDEN>, Marius Bakke <marius@HIDDEN>, Munyoki Kilyungi <me@HIDDEN>, Sharlatan Hellseher <sharlatanus@HIDDEN>, Tanguy Le Carrour <tanguy@HIDDEN>, jgart <jgart@HIDDEN>
X-Debbugs-Original-Xcc: Lars-Dominik Braun <lars@HIDDEN>, Marius Bakke <marius@HIDDEN>, Munyoki Kilyungi <me@HIDDEN>, Sharlatan Hellseher <sharlatanus@HIDDEN>, Tanguy Le Carrour <tanguy@HIDDEN>, jgart <jgart@HIDDEN>
Received: via spool by 70923-submit <at> debbugs.gnu.org id=B70923.17156309301048
          (code B ref 70923); Mon, 13 May 2024 20:09:05 +0000
Received: (at 70923) by debbugs.gnu.org; 13 May 2024 20:08:50 +0000
Received: from localhost ([127.0.0.1]:34604 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1s6byb-0000Gk-Ik
	for submit <at> debbugs.gnu.org; Mon, 13 May 2024 16:08:49 -0400
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:40155
 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <herman@HIDDEN>) id 1s6byS-0000El-FQ
 for 70923 <at> debbugs.gnu.org; Mon, 13 May 2024 16:08:41 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
 t=1715630908;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc:mime-version:mime-version:
 content-transfer-encoding:content-transfer-encoding:
 in-reply-to:in-reply-to:references:references;
 bh=pH3pRQt5rbzAbELGmuU6ZPWRrvwMLSQwgZ/NvpmyxDY=;
 b=I4PkSSXQyR65/ueXn3mj6wGJCRWp1DJ3uK6aRdpx8q4M04SiumJ+et2qnXBTfPlcAhO2gm
 rWBqRwkZNNk5Oe0ZAhgdjoTZ4OT8DFXLhOx6dhabUwa2XkaAzfuh8dra4Js/6Ca1O3KmRa
 +ML3lHx/vxpU80Yr8lTdiCNLn2/roZH6TRegjJHPW6sLADks6xN7JEPnl9r/SgITotGEhh
 oUPzvNrwu4nsScmn55b0a+aZnSruS9xS2Qxv6YBT/VIXd+CeTUpIoiKsHls7ZaOBs6e61Z
 xXtXexVMHbS6wuSJ7xhjxhHlaY+fcrE0PhMPpStT4w7UZSbyVBuVpe+k7RrIEQ==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id c83447e8
 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO)
 for <70923 <at> debbugs.gnu.org>; Mon, 13 May 2024 20:08:28 +0000 (UTC)
From: Herman Rimm <herman@HIDDEN>
Date: Mon, 13 May 2024 22:08:04 +0200
Message-ID: <210d22fd9d577748a23093df1e162a36373688a6.1715627497.git.herman@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1715627497.git.herman@HIDDEN>
References: <cover.1715627497.git.herman@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 3.6 (+++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 Content preview: * guix/import/pypi.scm (maybe-inputs): Delete procedure.
 (make-pypi-sexp):
 Use 'maybe-list-field' and 'maybe-upstream-inputs' procedures. ---
 guix/import/pypi.scm | 20 ++++ 1 file chan [...] 
 Content analysis details:   (3.6 points, 10.0 required)
 pts rule name              description
 ---- ---------------------- --------------------------------------------------
 3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
 [81.205.150.117 listed in zen.spamhaus.org]
 0.0 TVD_RCVD_IP            Message was received from an IP address
 0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 2.6 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 
 Content preview:  * guix/import/pypi.scm (maybe-inputs): Delete procedure. (make-pypi-sexp):
    Use 'maybe-list-field' and 'maybe-upstream-inputs' procedures. --- guix/import/pypi.scm
    | 20 ++++ 1 file chan [...] 
 
 Content analysis details:   (2.6 points, 10.0 required)
 
  pts rule name              description
 ---- ---------------------- --------------------------------------------------
  3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
                             [81.205.150.117 listed in zen.spamhaus.org]
  0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
 -1.0 MAILING_LIST_MULTI     Multiple indicators imply a widely-seen list
                             manager

* guix/import/pypi.scm (maybe-inputs): Delete procedure.
(make-pypi-sexp): Use 'maybe-list-field' and 'maybe-upstream-inputs'
procedures.
---
 guix/import/pypi.scm | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm
index 6719fde330..c46f8897b9 100644
--- a/guix/import/pypi.scm
+++ b/guix/import/pypi.scm
@@ -201,18 +201,6 @@ (define (wheel-url->extracted-directory wheel-url)
     ((name version _ ...)
      (string-append name "-" version ".dist-info"))))
 
-(define (maybe-inputs package-inputs input-type)
-  "Given a list of PACKAGE-INPUTS, tries to generate the 'inputs' field of a
-package definition.  INPUT-TYPE, a symbol, is used to populate the name of
-the input field."
-  (match package-inputs
-    (()
-     '())
-    ((package-inputs ...)
-     `((,input-type (list ,@(map (compose string->symbol
-                                          upstream-input-downstream-name)
-                                 package-inputs)))))))
-
 (define %requirement-name-regexp
   ;; Regexp to match the requirement name in a requirement specification.
 
@@ -538,10 +526,10 @@ (define* (make-pypi-sexp pypi-package
                             bytevector->nix-base32-string)))))
         ,@(maybe-upstream-name name)
         (build-system pyproject-build-system)
-        ,@(maybe-inputs (upstream-source-propagated-inputs source)
-                        'propagated-inputs)
-        ,@(maybe-inputs (upstream-source-native-inputs source)
-                        'native-inputs)
+        ,@(maybe-upstream-inputs 'propagated-inputs
+            (upstream-source-propagated-inputs source))
+        ,@(maybe-upstream-inputs 'native-inputs
+            (upstream-source-native-inputs source))
         (home-page ,(project-info-home-page info))
         (synopsis ,(project-info-summary info))
         (description ,(beautify-description
-- 
2.41.0

Message sent to andrew@HIDDEN, cox.katherine.e+guix@HIDDEN, liliana.prikler@HIDDEN, guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#70923] [PATCH 08/13] import: elpa: Use maybe-propagated-inputs procedure.
Resent-From: Herman Rimm <herman@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: andrew@HIDDEN, cox.katherine.e+guix@HIDDEN, liliana.prikler@HIDDEN, guix-patches@HIDDEN
Resent-Date: Mon, 13 May 2024 20:09:05 +0000
Resent-Message-ID: <handler.70923.B70923.17156309301055 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70923
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 70923 <at> debbugs.gnu.org
Cc: Andrew Tropin <andrew@HIDDEN>, Katherine Cox-Buday <cox.katherine.e+guix@HIDDEN>, Liliana Marie Prikler <liliana.prikler@HIDDEN>
X-Debbugs-Original-Xcc: Andrew Tropin <andrew@HIDDEN>, Katherine Cox-Buday <cox.katherine.e+guix@HIDDEN>, Liliana Marie Prikler <liliana.prikler@HIDDEN>
Received: via spool by 70923-submit <at> debbugs.gnu.org id=B70923.17156309301055
          (code B ref 70923); Mon, 13 May 2024 20:09:05 +0000
Received: (at 70923) by debbugs.gnu.org; 13 May 2024 20:08:50 +0000
Received: from localhost ([127.0.0.1]:34606 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1s6byb-0000Gr-U6
	for submit <at> debbugs.gnu.org; Mon, 13 May 2024 16:08:50 -0400
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:47157
 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <herman@HIDDEN>) id 1s6byT-0000Ek-2B
 for 70923 <at> debbugs.gnu.org; Mon, 13 May 2024 16:08:41 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
 t=1715630908;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc:mime-version:mime-version:
 content-transfer-encoding:content-transfer-encoding:
 in-reply-to:in-reply-to:references:references;
 bh=e3J/lM7prB3MIu8Ixg3uXxBUOdkLtWQ3DSupBHJQ8nc=;
 b=PWAhFwyzQ9W03STALCLgsGS+stGXCA7/Ck/uM9axiNCtU6eRobE4nxyBc73pMeK9A42DRZ
 zqXwUZCQo4eiLI42gHOK8eRX/IbpgEWmtOoDbbjQ3gTq0GhbZHA+oJgXWr0kYlQczM4Dxk
 ORRljpuuaAY9h1t2QR9+1tGr8QmHIpOsWbrTA2zFXFICGIBukiEqjnjHjDr3PQvLyCTRkR
 NZ/0Dz/RvLgXvcj7mJ/fOGKBVjiqQ/qVwEPNegjsGMPDBCI4RtjmYHkqs9dqWvYtS6jVxa
 YkoltXk1h9TD+kUc+1BqgBMvYTjE5YTZ7MaGIcvHlP+NB8YbU94cha5Qkf8aPA==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 22a02ee3
 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO)
 for <70923 <at> debbugs.gnu.org>; Mon, 13 May 2024 20:08:28 +0000 (UTC)
From: Herman Rimm <herman@HIDDEN>
Date: Mon, 13 May 2024 22:08:05 +0200
Message-ID: <e044fef16bc6a3d5afd0a2b0722a518eb06a6a78.1715627497.git.herman@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1715627497.git.herman@HIDDEN>
References: <cover.1715627497.git.herman@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 3.6 (+++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 Content preview: * guix/import/elpa.scm (maybe-inputs): Delete procedure.
 (elpa-package->sexp):
 Use maybe-propagated-inputs procedure. Change-Id:
 I9b40e9d387311f5dbbb079938733bf945a1a6ee6
 --- guix/import/elpa.scm | 9 +-------- 1 file changed, 1 insertion(+), 8
 deletions(-) 
 Content analysis details:   (3.6 points, 10.0 required)
 pts rule name              description
 ---- ---------------------- --------------------------------------------------
 3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
 [81.205.150.117 listed in zen.spamhaus.org]
 0.0 TVD_RCVD_IP            Message was received from an IP address
 0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 2.6 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 
 Content preview:  * guix/import/elpa.scm (maybe-inputs): Delete procedure. (elpa-package->sexp):
    Use maybe-propagated-inputs procedure. Change-Id: I9b40e9d387311f5dbbb079938733bf945a1a6ee6
    --- guix/import/elpa.scm | 9 +-------- 1 file changed, 1 insertion(+), 8
   deletions(-) 
 
 Content analysis details:   (2.6 points, 10.0 required)
 
  pts rule name              description
 ---- ---------------------- --------------------------------------------------
  3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
                             [81.205.150.117 listed in zen.spamhaus.org]
  0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
 -1.0 MAILING_LIST_MULTI     Multiple indicators imply a widely-seen list
                             manager

* guix/import/elpa.scm (maybe-inputs): Delete procedure.
(elpa-package->sexp): Use maybe-propagated-inputs procedure.

Change-Id: I9b40e9d387311f5dbbb079938733bf945a1a6ee6
---
 guix/import/elpa.scm | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/guix/import/elpa.scm b/guix/import/elpa.scm
index d1855b3698..0072500155 100644
--- a/guix/import/elpa.scm
+++ b/guix/import/elpa.scm
@@ -358,13 +358,6 @@ (define* (elpa-package->sexp pkg #:optional license repo)
     (map (compose string->symbol elpa-name->package-name)
          dependencies-names))
 
-  (define (maybe-inputs input-type inputs)
-    (match inputs
-      (()
-       '())
-      ((inputs ...)
-       (list (list input-type `(list ,@inputs))))))
-
   (define melpa-source
     (melpa-recipe->origin melpa-recipe))
 
@@ -385,7 +378,7 @@ (define* (elpa-package->sexp pkg #:optional license repo)
                                 (file-hash* tarball #:recursive? #false))
                                "failed to download package")))))))
       (build-system emacs-build-system)
-      ,@(maybe-inputs 'propagated-inputs dependencies)
+      ,@(maybe-propagated-inputs dependencies)
       ,@(if melpa-source
             (melpa-recipe->maybe-arguments melpa-recipe)
             '())
-- 
2.41.0

Message sent to rekado@HIDDEN, guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#70923] [PATCH 10/13] import: cran: Use 'maybe-list-field' procedure.
Resent-From: Herman Rimm <herman@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: rekado@HIDDEN, guix-patches@HIDDEN
Resent-Date: Mon, 13 May 2024 20:09:05 +0000
Resent-Message-ID: <handler.70923.B70923.17156309301062 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70923
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 70923 <at> debbugs.gnu.org
Cc: Ricardo Wurmus <rekado@HIDDEN>
X-Debbugs-Original-Xcc: Ricardo Wurmus <rekado@HIDDEN>
Received: via spool by 70923-submit <at> debbugs.gnu.org id=B70923.17156309301062
          (code B ref 70923); Mon, 13 May 2024 20:09:05 +0000
Received: (at 70923) by debbugs.gnu.org; 13 May 2024 20:08:50 +0000
Received: from localhost ([127.0.0.1]:34608 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1s6byc-0000Gy-AE
	for submit <at> debbugs.gnu.org; Mon, 13 May 2024 16:08:50 -0400
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:47157
 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <herman@HIDDEN>) id 1s6byT-0000Ek-VR
 for 70923 <at> debbugs.gnu.org; Mon, 13 May 2024 16:08:42 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
 t=1715630910;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc:mime-version:mime-version:
 content-transfer-encoding:content-transfer-encoding:
 in-reply-to:in-reply-to:references:references;
 bh=wnNXWoqw8IXmozIC7cZTKfI2/v13ivYKrtK9YRoDSSM=;
 b=WF6q/JK609lRt15ZRHbtoMrx7eYBxU0Dl61wVp/OGMh+aguXl/NI1t29YuGozr4gvPdcca
 ia095ILB6SEClx8MdYIjoGcKXOJDM8ClFOTdfdWEl2CqWDw0XCO1ocLO3b0JHrjFjsgvVG
 ArZ80srvJh8Tyu7raa5BEvQ0i2aohkzvLA0IOl48wBZqvq78y+wyNFs6HNbRVqiSOKUv7+
 P0hpg0TskbFZIgQ2s2EElREy+0avEwDQ47bRreSc2hrgRlvAHjmduzOa+EdH0f5Ed+VO9t
 phd6x0womG+5qPcuiAXqwMGBTqviPnMc2F0AyyJoPk6A1OVGjSW0w4DQzjS+yg==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 4f50ec2c
 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO)
 for <70923 <at> debbugs.gnu.org>; Mon, 13 May 2024 20:08:30 +0000 (UTC)
From: Herman Rimm <herman@HIDDEN>
Date: Mon, 13 May 2024 22:08:07 +0200
Message-ID: <dfe6ea71b8f3c8252e34887ab965e54745a47e3d.1715627497.git.herman@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1715627497.git.herman@HIDDEN>
References: <cover.1715627497.git.herman@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 3.6 (+++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 Content preview:  * guix/import/cran.scm (format-inputs): Delete procedure.
 (maybe-inputs): Use 'maybe-list-field' procedure. Change-Id:
 I5148afcebdac1f7fa0f8cce9e82e8cebb56c36c8
 --- guix/import/cran.scm | 35 +++++++++++++++ 1 file changed, 15 insertions(+),
 20 deletions(-) 
 Content analysis details:   (3.6 points, 10.0 required)
 pts rule name              description
 ---- ---------------------- --------------------------------------------------
 3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
 [81.205.150.117 listed in zen.spamhaus.org]
 0.0 TVD_RCVD_IP            Message was received from an IP address
 0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 2.6 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 
 Content preview:  * guix/import/cran.scm (format-inputs): Delete procedure.
   (maybe-inputs): Use 'maybe-list-field' procedure. Change-Id: I5148afcebdac1f7fa0f8cce9e82e8cebb56c36c8
    --- guix/import/cran.scm | 35 +++++++++++++++ 1 file changed, 15 insertions(+),
    20 deletions(-) 
 
 Content analysis details:   (2.6 points, 10.0 required)
 
  pts rule name              description
 ---- ---------------------- --------------------------------------------------
  3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
                             [81.205.150.117 listed in zen.spamhaus.org]
  0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
 -1.0 MAILING_LIST_MULTI     Multiple indicators imply a widely-seen list
                             manager

* guix/import/cran.scm (format-inputs): Delete procedure.
(maybe-inputs): Use 'maybe-list-field' procedure.

Change-Id: I5148afcebdac1f7fa0f8cce9e82e8cebb56c36c8
---
 guix/import/cran.scm | 35 +++++++++++++++--------------------
 1 file changed, 15 insertions(+), 20 deletions(-)

diff --git a/guix/import/cran.scm b/guix/import/cran.scm
index 6ae00cae96..70ee3eb9ec 100644
--- a/guix/import/cran.scm
+++ b/guix/import/cran.scm
@@ -85,21 +85,6 @@ (define-module (guix import cran)
 (define %input-style
   (make-parameter 'variable)) ; or 'specification
 
-(define (format-inputs inputs)
-  "Generate a sorted list of package inputs from a list of upstream inputs."
-  (map (lambda (input)
-         (case (%input-style)
-           ((specification)
-            `(specification->package ,(upstream-input-downstream-name input)))
-           (else
-            ((compose string->symbol
-                       upstream-input-downstream-name)
-             input))))
-       (sort inputs
-             (lambda (a b)
-               (string-ci<? (upstream-input-name a)
-                            (upstream-input-name b))))))
-
 (define (string->licenses license-string license-prefix)
   (let ((licenses
          (map string-trim-both
@@ -188,11 +173,21 @@ (define (description->alist description)
 (define* (maybe-inputs package-inputs #:optional (input-type 'inputs))
   "Given a list of PACKAGE-INPUTS, tries to generate the TYPE field of a
 package definition."
-  (match package-inputs
-    (()
-     '())
-    ((package-inputs ...)
-     `((,input-type (list ,@(format-inputs package-inputs)))))))
+  (define (format-input input)
+    (case (%input-style)
+      ((specification)
+       `(specification->package ,(upstream-input-downstream-name input)))
+      (else
+       ((compose string->symbol
+                  upstream-input-downstream-name)
+        input))))
+
+  (define (upstream-input-name<? i1 i2)
+    (string-ci<? (upstream-input-name i1)
+                 (upstream-input-name i2)))
+
+  (maybe-list-field input-type
+    (map format-input (sort package-inputs upstream-input-name<?))))
 
 (define %cran-url "https://cloud.r-project.org/web/packages/")
 (define %cran-canonical-url "https://cran.r-project.org/package=")
-- 
2.41.0

Message sent to lars@HIDDEN, guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#70923] [PATCH 09/13] import: hackage: Use 'maybe-list-field' procedure.
Resent-From: Herman Rimm <herman@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: lars@HIDDEN, guix-patches@HIDDEN
Resent-Date: Mon, 13 May 2024 20:09:06 +0000
Resent-Message-ID: <handler.70923.B70923.17156309311068 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70923
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 70923 <at> debbugs.gnu.org
Cc: Lars-Dominik Braun <lars@HIDDEN>
X-Debbugs-Original-Xcc: Lars-Dominik Braun <lars@HIDDEN>
Received: via spool by 70923-submit <at> debbugs.gnu.org id=B70923.17156309311068
          (code B ref 70923); Mon, 13 May 2024 20:09:06 +0000
Received: (at 70923) by debbugs.gnu.org; 13 May 2024 20:08:51 +0000
Received: from localhost ([127.0.0.1]:34610 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1s6byc-0000H5-Mu
	for submit <at> debbugs.gnu.org; Mon, 13 May 2024 16:08:51 -0400
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:40155
 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <herman@HIDDEN>) id 1s6byT-0000El-Oh
 for 70923 <at> debbugs.gnu.org; Mon, 13 May 2024 16:08:42 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
 t=1715630909;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc:mime-version:mime-version:
 content-transfer-encoding:content-transfer-encoding:
 in-reply-to:in-reply-to:references:references;
 bh=W1jjOVuFEqbOXqt6pNDpfdoVNmqoORyHmgzPO2+tA1g=;
 b=TOrdiOe+yzfmLaw3n/HhpOWdPCnV+fVl6vmxYO3nw57Kq/ixB3ielsaketBDmQt6X9CQ8V
 IjK5rUgvnzzQnaXLj4/OFk1L14Z7i1+N6EJUswObEd8T4B+b7SR3ovZWido+Z10epISSGz
 csB6gf62ZV7K1/yG55Tk5UQ/Mp0QzRJLhtQfeU99onJme0O/VlTB37KiQvp2F2DSjJkNYb
 9W3WKpA5JiwiETzv6LZCAW/CqPdRUgWbnjYM5dTqP8HLeGjbPN9Z8odwdONaCpV4NLOwlj
 ZV8kDMJnIMT1hQcGklE8pGRLO154WWqgq20BJ0OryVTkR0aZc9xwXLUzEkWPXw==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id fdc2625e
 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO)
 for <70923 <at> debbugs.gnu.org>; Mon, 13 May 2024 20:08:29 +0000 (UTC)
From: Herman Rimm <herman@HIDDEN>
Date: Mon, 13 May 2024 22:08:06 +0200
Message-ID: <42bfac7c486b9dd94633eddb348cb97c3a47bd43.1715627497.git.herman@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1715627497.git.herman@HIDDEN>
References: <cover.1715627497.git.herman@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 3.6 (+++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 Content preview:  * guix/import/hackage.scm (maybe-inputs, maybe-arguments):
 Delete procedures. (hackage-module->sexp): Use 'maybe-list-field' and
 'maybe-upstream-inputs'
 procedures. * tests/hackage.scm: Fix whitespace [...] 
 Content analysis details:   (3.6 points, 10.0 required)
 pts rule name              description
 ---- ---------------------- --------------------------------------------------
 3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
 [81.205.150.117 listed in zen.spamhaus.org]
 0.0 TVD_RCVD_IP            Message was received from an IP address
 0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 2.6 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 
 Content preview:  * guix/import/hackage.scm (maybe-inputs, maybe-arguments):
    Delete procedures. (hackage-module->sexp): Use 'maybe-list-field' and 'maybe-upstream-inputs'
    procedures. * tests/hackage.scm: Fix whitespace [...] 
 
 Content analysis details:   (2.6 points, 10.0 required)
 
  pts rule name              description
 ---- ---------------------- --------------------------------------------------
  3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
                             [81.205.150.117 listed in zen.spamhaus.org]
  0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
 -1.0 MAILING_LIST_MULTI     Multiple indicators imply a widely-seen list
                             manager

* guix/import/hackage.scm (maybe-inputs, maybe-arguments): Delete
procedures.
(hackage-module->sexp): Use 'maybe-list-field' and
'maybe-upstream-inputs' procedures.
* tests/hackage.scm: Fix whitespace and replace 'quasiquote' with
'list'.

Change-Id: I4fe39ff84c9f6a677f810d9e4fe751d762973757
---
 guix/import/hackage.scm | 38 +++++++++++---------------------------
 tests/hackage.scm       | 13 +++++++------
 2 files changed, 18 insertions(+), 33 deletions(-)

diff --git a/guix/import/hackage.scm b/guix/import/hackage.scm
index 79a51d3300..e90f3c932f 100644
--- a/guix/import/hackage.scm
+++ b/guix/import/hackage.scm
@@ -288,26 +288,6 @@ (define* (hackage-module->sexp cabal cabal-hash
                           #:include-test-dependencies?
                           include-test-dependencies?))
 
-  (define (maybe-inputs input-type inputs)
-    (match inputs
-      (()
-       '())
-      ((inputs ...)
-       (list (list input-type
-                   `(list ,@(map (compose string->symbol
-                                          upstream-input-downstream-name)
-                                 inputs)))))))
-
-  (define (maybe-arguments)
-    (match (append (if (not include-test-dependencies?)
-                       '(#:tests? #f)
-                       '())
-                   (if (not (string-null? revision))
-                       `(#:cabal-revision (,revision ,cabal-hash))
-                       '()))
-      (() '())
-      (args `((arguments (,'quasiquote ,args))))))
-
   (let ((tarball (with-store store
                    (download-to-store store source-url))))
     (values
@@ -324,13 +304,17 @@ (define* (hackage-module->sexp cabal cabal-hash
                          "failed to download tar archive")))))
         (build-system haskell-build-system)
         (properties '((upstream-name . ,name)))
-        ,@(maybe-inputs 'inputs
-                        (filter (upstream-input-type-predicate 'regular)
-                                inputs))
-        ,@(maybe-inputs 'native-inputs
-                        (filter (upstream-input-type-predicate 'native)
-                                inputs))
-        ,@(maybe-arguments)
+        ,@(maybe-upstream-inputs 'inputs
+            (filter (upstream-input-type-predicate 'regular) inputs))
+        ,@(maybe-upstream-inputs 'native-inputs
+            (filter (upstream-input-type-predicate 'native) inputs))
+        ,@(maybe-list-field 'arguments
+            (append (if (not include-test-dependencies?)
+                        '(#:tests? #f)
+                        '())
+                    (if (not (string-null? revision))
+                        `(#:cabal-revision '(,revision ,cabal-hash))
+                        '())))
         (home-page ,(cabal-package-home-page cabal))
         (synopsis ,(cabal-package-synopsis cabal))
         (description ,(beautify-description (cabal-package-description cabal)))
diff --git a/tests/hackage.scm b/tests/hackage.scm
index 403f587c41..f6d91515e2 100644
--- a/tests/hackage.scm
+++ b/tests/hackage.scm
@@ -67,7 +67,7 @@ (define test-cabal-3
   if impl(ghc>=7.2&&<7.6)
     Build-depends: ghc-b
   if impl(ghc == 7.8)
-    Build-depends: 
+    Build-depends:
       HTTP       >= 4000.2.5 && < 4000.3,
       mtl        >= 2.0      && < 3
 ")
@@ -86,7 +86,7 @@ (define test-cabal-4
   if impl(ghc>=7.2&&<7.6)
     Build-depends: ghc-b
   if impl(ghc == 7.8)
-    Build-depends: 
+    Build-depends:
       HTTP       >= 4000.2.5 && < 4000.3,
       mtl        >= 2.0      && < 3
 ")
@@ -101,7 +101,7 @@ (define test-cabal-5
 license: BSD3
 library
   if impl(ghc == 7.8)
-    Build-depends: 
+    Build-depends:
       HTTP       >= 4000.2.5 && < 4000.3,
   if impl(ghc -any)
     Build-depends: mtl        >= 2.0      && < 3
@@ -126,7 +126,7 @@ (define test-cabal-6
   if impl(ghc>=7.2&&<7.6)
     Build-depends: ghc-b
   if impl(ghc == 7.8)
-    Build-depends: 
+    Build-depends:
       HTTP       >= 4000.2.5 && < 4000.3,
       mtl        >= 2.0      && < 3
 ")
@@ -524,8 +524,9 @@ (define-package-matcher match-ghc-foo-revision
     ('properties '(quote ((upstream-name . "foo"))))
     ('inputs ('list 'ghc-http))
     ('arguments
-     ('quasiquote
-      ('#:cabal-revision
+     ('list
+      '#:cabal-revision
+      ('quote
        ("2" "0xxd88fb659f0krljidbvvmkh9ppjnx83j0nqzx8whcg4n5qbyng"))))
     ('home-page "http://test.org")
     ('synopsis (? string?))
-- 
2.41.0

Message sent to guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#70923] [PATCH 12/13] import: egg: Use maybe-*inputs procedures.
Resent-From: Herman Rimm <herman@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 13 May 2024 20:09:06 +0000
Resent-Message-ID: <handler.70923.B70923.17156309311076 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70923
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 70923 <at> debbugs.gnu.org
Received: via spool by 70923-submit <at> debbugs.gnu.org id=B70923.17156309311076
          (code B ref 70923); Mon, 13 May 2024 20:09:06 +0000
Received: (at 70923) by debbugs.gnu.org; 13 May 2024 20:08:51 +0000
Received: from localhost ([127.0.0.1]:34612 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1s6byd-0000HG-6s
	for submit <at> debbugs.gnu.org; Mon, 13 May 2024 16:08:51 -0400
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:40155
 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <herman@HIDDEN>) id 1s6byV-0000El-2x
 for 70923 <at> debbugs.gnu.org; Mon, 13 May 2024 16:08:43 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
 t=1715630911;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc:mime-version:mime-version:
 content-transfer-encoding:content-transfer-encoding:
 in-reply-to:in-reply-to:references:references;
 bh=Y20UxH4guLHcJDBhGNKEctif8qP5qD6WUna8b2wwO/o=;
 b=lQHIe26C2KaPsK/7EGpShc+Sq8PqpfjVVBl35qkDPY4OJ27gIt0jujy52DYBXc+RpiO40d
 RqThnVV3wyZG+nWZeUadvKHRAXtSm277FgNRAOtEGh+bJTd5Cd+MrOWcO+95j0OJ+iCh53
 50FP3eMaw5HP28IgcDvEybnxxgJ+DKfLHj2V0qfZoo7XeRkE5ae+uPJnt6L6ttmh3wsT+m
 FE/v3qhWsUgPwQmx90vHCM35uJCFiqBWkcsPkPM6SLSEJFlX2MCe7HzR/SFbhkd5FmQQuw
 9Kl8HeydK4FW44JY527Va+5fpwu1ba9z7JVBgsCiX7sPi98q0usSO6UCLMrezw==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 66963c72
 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO)
 for <70923 <at> debbugs.gnu.org>; Mon, 13 May 2024 20:08:31 +0000 (UTC)
From: Herman Rimm <herman@HIDDEN>
Date: Mon, 13 May 2024 22:08:09 +0200
Message-ID: <b76a96469519cc553524c0d18f13c32992d39838.1715627497.git.herman@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1715627497.git.herman@HIDDEN>
References: <cover.1715627497.git.herman@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 3.6 (+++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 Content preview: * guix/import/egg.scm (maybe-inputs): Delete procedure.
 (egg-parse-dependency):
 Simplify procedure to return strings. (egg->guix-package): Use maybe-*inputs
 procedures. Change-Id: Ib0a3f5b6f02912c847defd02ba7675d80005279b ---
 guix/import/egg.scm
 | 38 ++++++++++ 1 file changed, 10 insertions(+), 28 deletions(-) 
 Content analysis details:   (3.6 points, 10.0 required)
 pts rule name              description
 ---- ---------------------- --------------------------------------------------
 3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
 [81.205.150.117 listed in zen.spamhaus.org]
 0.0 TVD_RCVD_IP            Message was received from an IP address
 0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 2.6 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 
 Content preview:  * guix/import/egg.scm (maybe-inputs): Delete procedure. (egg-parse-dependency):
    Simplify procedure to return strings. (egg->guix-package): Use maybe-*inputs
    procedures. Change-Id: Ib0a3f5b6f02912c847defd02ba7675d80005279b --- guix/import/egg.scm
    | 38 ++++++++++ 1 file changed, 10 insertions(+), 28 deletions(-) 
 
 Content analysis details:   (2.6 points, 10.0 required)
 
  pts rule name              description
 ---- ---------------------- --------------------------------------------------
  3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
                             [81.205.150.117 listed in zen.spamhaus.org]
  0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
 -1.0 MAILING_LIST_MULTI     Multiple indicators imply a widely-seen list
                             manager

* guix/import/egg.scm (maybe-inputs): Delete procedure.
(egg-parse-dependency): Simplify procedure to return strings.
(egg->guix-package): Use maybe-*inputs procedures.

Change-Id: Ib0a3f5b6f02912c847defd02ba7675d80005279b
---
 guix/import/egg.scm | 38 ++++++++++----------------------------
 1 file changed, 10 insertions(+), 28 deletions(-)

diff --git a/guix/import/egg.scm b/guix/import/egg.scm
index e3bc158475..60e1eef156 100644
--- a/guix/import/egg.scm
+++ b/guix/import/egg.scm
@@ -229,23 +229,14 @@ (define* (egg->guix-package name version #:key (file #f) (source #f)
                           (else char)))
                       (maybe-symbol->string name)))
 
-        (define* (egg-parse-dependency name #:key (system? #f))
-          (define extract-name
-            (match-lambda
-              ((name version) name)
-              (name name)))
-
-          (define (prettify-name name)
+        (define* (egg-parse-dependency dependency #:key (system? #f))
+          (let ((name (match dependency
+                        ((name version) name)
+                        (name name))))
             (if system?
                 (prettify-system-dependency name)
-                (maybe-symbol->string name)))
-          
-          (let ((name (prettify-name (extract-name name))))
-            ;; Dependencies are sometimes specified as symbols and sometimes
-            ;; as strings
-            (string->symbol (string-append
-                             (if system? "" package-name-prefix)
-                             name))))
+                (string-append package-name-prefix
+                               (maybe-symbol->string name)))))
 
         (define egg-propagated-inputs
           (let ((dependencies (assoc-ref egg-content 'dependencies)))
@@ -277,15 +268,6 @@ (define* (egg->guix-package name version #:key (file #f) (source #f)
                               test+build-dependencies))
               (() '()))))
 
-        ;; Copied from (guix import hackage).
-        (define (maybe-inputs input-type inputs)
-          (match inputs
-            (()
-             '())
-            ((inputs ...)
-             (list (list input-type
-                         `(list ,@inputs))))))
-
         (values
          `(package
             (name ,(egg-name->guix-name name))
@@ -303,16 +285,16 @@ (define* (egg->guix-package name version #:key (file #f) (source #f)
                                    "failed to download tar archive"))))))
             (build-system chicken-build-system)
             (arguments ,(list 'quasiquote (list #:egg-name name)))
-            ,@(maybe-inputs 'native-inputs egg-native-inputs)
-            ,@(maybe-inputs 'inputs egg-inputs)
-            ,@(maybe-inputs 'propagated-inputs egg-propagated-inputs)
+            ,@(maybe-native-inputs egg-native-inputs)
+            ,@(maybe-inputs egg-inputs)
+            ,@(maybe-propagated-inputs egg-propagated-inputs)
             (home-page ,egg-home-page)
             (synopsis ,egg-synopsis)
             (description #f)
             (license ,egg-licenses))
          (filter (lambda (name)
                    (not (member name '("srfi-4"))))
-                 (map (compose guix-name->egg-name symbol->string)
+                 (map guix-name->egg-name
                       (append egg-propagated-inputs
                               egg-native-inputs)))))))
 
-- 
2.41.0

Message sent to guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#70923] [PATCH 11/13] import: cpan: Use 'maybe-upstream-inputs' procedure.
Resent-From: Herman Rimm <herman@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 13 May 2024 20:09:07 +0000
Resent-Message-ID: <handler.70923.B70923.17156309321083 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70923
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 70923 <at> debbugs.gnu.org
Received: via spool by 70923-submit <at> debbugs.gnu.org id=B70923.17156309321083
          (code B ref 70923); Mon, 13 May 2024 20:09:07 +0000
Received: (at 70923) by debbugs.gnu.org; 13 May 2024 20:08:52 +0000
Received: from localhost ([127.0.0.1]:34614 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1s6byd-0000HJ-Iv
	for submit <at> debbugs.gnu.org; Mon, 13 May 2024 16:08:51 -0400
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:47157
 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <herman@HIDDEN>) id 1s6byV-0000Ek-1J
 for 70923 <at> debbugs.gnu.org; Mon, 13 May 2024 16:08:43 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
 t=1715630911;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc:mime-version:mime-version:
 content-transfer-encoding:content-transfer-encoding:
 in-reply-to:in-reply-to:references:references;
 bh=awy7nNUIOA3lPBhPahfxqd1CYsW/hpOe8hVUr25QuSI=;
 b=iEdRfCXGmlSISvZzeSjoczRNeVF8ChPXLOlYfg9bNVQEIp4gdUqsU8bdG4t9DkvpQ9P4WB
 0oWWyPibuOHwq+2F2hvJjYLBdqrD9ADsCg7VKBvTNeop21mUYTSoJIzJAbfUCqmkfa8Tos
 83eJawaa0yJUSTOlAkKD38K8NAyFPFn9xzWwcdLsLMiPHmahRFoxmhBuRxaebQT6Dl3FfH
 ij8w+cDEUKzObnZQMCVfmI8BZ5DFka0axkbaD2FHwYFv9hPXdtQ3Ac4drQ3r5XqyxQRbht
 YB+qRp53tBHXhjelu5j4BySOhRhtbMTN3KhzF4rGvVZ1VTyksfG/aClIWOnNOQ==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 81689f89
 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO)
 for <70923 <at> debbugs.gnu.org>; Mon, 13 May 2024 20:08:31 +0000 (UTC)
From: Herman Rimm <herman@HIDDEN>
Date: Mon, 13 May 2024 22:08:08 +0200
Message-ID: <40e6e376621412e26b576fc8aab96caa78274a52.1715627497.git.herman@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1715627497.git.herman@HIDDEN>
References: <cover.1715627497.git.herman@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 3.6 (+++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 Content preview: * guix/import/cpan.scm (maybe-inputs): Delete procedure.
 (cpan-module->sexp):
 Use 'maybe-upstream-inputs' procedure. Change-Id:
 I4fa99da62d81f02c2998ad96f5ea81e27df071cd
 --- guix/import/cpan.scm | 22 ++++++ 1 file changed, 6 insertions(+), 16
 deletions(-) 
 Content analysis details:   (3.6 points, 10.0 required)
 pts rule name              description
 ---- ---------------------- --------------------------------------------------
 3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
 [81.205.150.117 listed in zen.spamhaus.org]
 0.0 TVD_RCVD_IP            Message was received from an IP address
 0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 2.6 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 
 Content preview:  * guix/import/cpan.scm (maybe-inputs): Delete procedure. (cpan-module->sexp):
    Use 'maybe-upstream-inputs' procedure. Change-Id: I4fa99da62d81f02c2998ad96f5ea81e27df071cd
    --- guix/import/cpan.scm | 22 ++++++ 1 file changed, 6 insertions(+), 16
   deletions(-) 
 
 Content analysis details:   (2.6 points, 10.0 required)
 
  pts rule name              description
 ---- ---------------------- --------------------------------------------------
  3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
                             [81.205.150.117 listed in zen.spamhaus.org]
  0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
 -1.0 MAILING_LIST_MULTI     Multiple indicators imply a widely-seen list
                             manager

* guix/import/cpan.scm (maybe-inputs): Delete procedure.
(cpan-module->sexp): Use 'maybe-upstream-inputs' procedure.

Change-Id: I4fa99da62d81f02c2998ad96f5ea81e27df071cd
---
 guix/import/cpan.scm | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/guix/import/cpan.scm b/guix/import/cpan.scm
index b87736eef6..55c616314b 100644
--- a/guix/import/cpan.scm
+++ b/guix/import/cpan.scm
@@ -37,7 +37,8 @@ (define-module (guix import cpan)
   #:use-module (guix utils)
   #:use-module (guix base32)
   #:use-module ((guix download) #:select (download-to-store url-fetch))
-  #:use-module ((guix import utils) #:select (factorize-uri))
+  #:use-module ((guix import utils) #:select (factorize-uri
+                                              maybe-upstream-inputs))
   #:use-module (guix import json)
   #:use-module (guix packages)
   #:use-module (guix upstream)
@@ -275,15 +276,6 @@ (define (cpan-module->sexp release)
   (define version (cpan-release-version release))
   (define source-url (cpan-source-url release))
 
-  (define (maybe-inputs input-type inputs)
-    (match inputs
-      (()
-       '())
-      ((inputs ...)
-       `((,input-type (list ,@(map (compose string->symbol
-                                            upstream-input-downstream-name)
-                                   inputs)))))))
-
   (let ((tarball (with-store store
                    (download-to-store store source-url)))
         (inputs (cpan-module-inputs release)))
@@ -297,12 +289,10 @@ (define (cpan-module->sexp release)
                   (base32
                    ,(bytevector->nix-base32-string (file-sha256 tarball))))))
        (build-system perl-build-system)
-       ,@(maybe-inputs 'native-inputs
-                       (filter (upstream-input-type-predicate 'native)
-                               inputs))
-       ,@(maybe-inputs 'propagated-inputs
-                       (filter (upstream-input-type-predicate 'propagated)
-                               inputs))
+       ,@(maybe-upstream-inputs 'native-inputs
+           (filter (upstream-input-type-predicate 'native) inputs))
+       ,@(maybe-upstream-inputs 'propagated-inputs
+           (filter (upstream-input-type-predicate 'propagated) inputs))
        (home-page ,(cpan-home name))
        (synopsis ,(cpan-release-abstract release))
        (description fill-in-yourself!)
-- 
2.41.0

Message sent to guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#70923] [PATCH 13/13] import: hexpm: Use (guix import utils) 'maybe-inputs' procedure.
Resent-From: Herman Rimm <herman@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 13 May 2024 20:09:07 +0000
Resent-Message-ID: <handler.70923.B70923.17156309321089 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70923
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 70923 <at> debbugs.gnu.org
Received: via spool by 70923-submit <at> debbugs.gnu.org id=B70923.17156309321089
          (code B ref 70923); Mon, 13 May 2024 20:09:07 +0000
Received: (at 70923) by debbugs.gnu.org; 13 May 2024 20:08:52 +0000
Received: from localhost ([127.0.0.1]:34616 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1s6byd-0000HS-Uy
	for submit <at> debbugs.gnu.org; Mon, 13 May 2024 16:08:52 -0400
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:40155
 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <herman@HIDDEN>) id 1s6byV-0000El-VA
 for 70923 <at> debbugs.gnu.org; Mon, 13 May 2024 16:08:44 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
 t=1715630911;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc:mime-version:mime-version:
 content-transfer-encoding:content-transfer-encoding:
 in-reply-to:in-reply-to:references:references;
 bh=HyR5PK2cfYqYmon0Hl6NRwSvAbm69M7OeUL35K8vuL4=;
 b=Gb+s+rxk+58AxRBr3wMbzkXAmJmqdfSZWftUyWiL5n89bW4NxLjnqdcUZ3762CaaAW8SSO
 xftsxgsvt/NOcCmUoS/ay0AJcKMT/EebqZoWsptIWX6vOJ8A2W2eg64zc/ukZlt2Sn5aCU
 jie2AJiiFe682dxlQ47ZPKHQCxwyLcKl+aQ9hirOELdjwsBUcRq8XITfN0VEbMvQ1Xe0sa
 mZ7Km2HJcqB5dIjYAYe+bpKLFL/RxPLE96y8vQBSdt0HLTppAKmyJ8as1YWKYFPMpBytza
 JRDvFzkiUWfWWoMCMDlVfDAWSr1lgAE1PG+zxZVxPkXip8gZP/1/FNVDnZGjJQ==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id c705f68a
 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO)
 for <70923 <at> debbugs.gnu.org>; Mon, 13 May 2024 20:08:31 +0000 (UTC)
From: Herman Rimm <herman@HIDDEN>
Date: Mon, 13 May 2024 22:08:10 +0200
Message-ID: <65ea14e719d9219414bc635feee982b8e4857a5a.1715627497.git.herman@HIDDEN>
X-Mailer: git-send-email 2.41.0
In-Reply-To: <cover.1715627497.git.herman@HIDDEN>
References: <cover.1715627497.git.herman@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 3.6 (+++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 Content preview:  * guix/import/hexpm.scm (maybe-inputs): Delete procedure.
 (dependencies->package-names): Return strings instead of symbols.
 (make-hexpm-sexp):
 Use 'maybe-inputs' from (guix import utils). Change-Id:
 Ie7a8a630a3a9d4859453d49fdee42aa560e27f17
 --- guix/import/hexpm.scm | 20 ++++ 1 file changed, 4 insertions(+),
 16 deletions(-)
 Content analysis details:   (3.6 points, 10.0 required)
 pts rule name              description
 ---- ---------------------- --------------------------------------------------
 3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
 [81.205.150.117 listed in zen.spamhaus.org]
 0.0 TVD_RCVD_IP            Message was received from an IP address
 0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
 0.0 T_FILL_THIS_FORM_SHORT Fill in a short form with personal
 information
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 2.6 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 
 Content preview:  * guix/import/hexpm.scm (maybe-inputs): Delete procedure.
   (dependencies->package-names): Return strings instead of symbols. (make-hexpm-sexp):
    Use 'maybe-inputs' from (guix import utils). Change-Id: Ie7a8a630a3a9d4859453d49fdee42aa560e27f17
    --- guix/import/hexpm.scm | 20 ++++ 1 file changed, 4 insertions(+), 16 deletions(-)
    
 
 Content analysis details:   (2.6 points, 10.0 required)
 
  pts rule name              description
 ---- ---------------------- --------------------------------------------------
  3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
                             [81.205.150.117 listed in zen.spamhaus.org]
  0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
 -1.0 MAILING_LIST_MULTI     Multiple indicators imply a widely-seen list
                             manager

* guix/import/hexpm.scm (maybe-inputs): Delete procedure.
(dependencies->package-names): Return strings instead of symbols.
(make-hexpm-sexp): Use 'maybe-inputs' from (guix import utils).

Change-Id: Ie7a8a630a3a9d4859453d49fdee42aa560e27f17
---
 guix/import/hexpm.scm | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/guix/import/hexpm.scm b/guix/import/hexpm.scm
index 71a54ba973..af7a96efb0 100644
--- a/guix/import/hexpm.scm
+++ b/guix/import/hexpm.scm
@@ -153,26 +153,14 @@ (define (lookup-hexpm-release version*)
 ;;; Converting hex.pm packages to Guix packages.
 ;;;
 
-(define (maybe-inputs package-inputs input-type)
-  "Given a list of PACKAGE-INPUTS, tries to generate the 'inputs' field of a
-package definition.  INPUT-TYPE, a symbol, is used to populate the name of
-the input field."
-  (match package-inputs
-    (()
-     '())
-    ((package-inputs ...)
-     `((,input-type (list ,@package-inputs))))))
-
 (define (dependencies->package-names names)
-  "Given a list of hexpm package NAMES, returns a list of guix package names
-as symbols."
+  "Given a list of hexpm package NAMES, returns a list of guix package
+names."
   ;; TODO: Base name on language of dependency.
   ;; The language used for implementing the dependency is not know without
   ;; recursing the dependencies.  So for now assume more packages are based on
   ;; Erlang and prefix all dependencies with "erlang-" (the default).
-  (map string->symbol
-       (map hexpm-name->package-name
-            (sort names string-ci<?))))
+  (map hexpm-name->package-name (sort names string-ci<?)))
 
 (define* (make-hexpm-sexp #:key name version tarball-url
                           home-page synopsis description license
@@ -194,7 +182,7 @@ (define* (make-hexpm-sexp #:key name version tarball-url
                    (uri (hexpm-uri ,name version))
                    (sha256 (base32 ,(guix-hash-url temp)))))
          (build-system ,build-system)
-         ,@(maybe-inputs (dependencies->package-names dependencies) 'inputs)
+         ,@(maybe-inputs (dependencies->package-names dependencies))
          (synopsis ,synopsis)
          (description ,(beautify-description description))
          (home-page ,(match home-page
-- 
2.41.0

Message sent to guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#70923] [PATCH v2 01/12] build-system: cargo: Accept unlabeled #:cargo-inputs.
References: <cover.1715627497.git.herman@HIDDEN>
In-Reply-To: <cover.1715627497.git.herman@HIDDEN>
Resent-From: Herman Rimm <herman@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Wed, 04 Sep 2024 20:36:01 +0000
Resent-Message-ID: <handler.70923.B70923.172548210620329 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70923
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 70923 <at> debbugs.gnu.org
Received: via spool by 70923-submit <at> debbugs.gnu.org id=B70923.172548210620329
          (code B ref 70923); Wed, 04 Sep 2024 20:36:01 +0000
Received: (at 70923) by debbugs.gnu.org; 4 Sep 2024 20:35:06 +0000
Received: from localhost ([127.0.0.1]:35448 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1slwiX-0005Hi-Vn
	for submit <at> debbugs.gnu.org; Wed, 04 Sep 2024 16:35:06 -0400
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:39573
 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <herman@HIDDEN>) id 1slwiU-0005Gz-NI
 for 70923 <at> debbugs.gnu.org; Wed, 04 Sep 2024 16:35:04 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
 t=1725482029;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc:mime-version:mime-version:content-type:content-type:
 content-transfer-encoding:content-transfer-encoding;
 bh=ei/xDBVjakCQxc0+XQPJqy2knjiNOwQQAWuNs81w8Pk=;
 b=McvrFc0shp92bcryKcaqpiemH5vnf6ICR6TnjH5v04L6HtbNnRkcXtVEvHd6nE6x2qXiat
 heLvSwDIVd9M4knidVD6NOGCW0kqobH88fSqS00kb3s9Qo10YxV4mKeI5/WN1CRzYjcMdN
 J2e6ABVJiVtUFoOah28hM2lBXkLt4wTcwE3esZtssZPfBBX3zkHvBEzxQv1zfGKnY21+Uu
 wrW4BeM8oIdQ39ConeJmxHk0VucKPkg+10E0345jxXmLZ2FLVefM+Ci3pKr0/qGzo1KnK6
 51KHWHQ6dWanpGySyN6gx0NrI0SyxY9tGKY6d0esSZ0VlC/xuwvzAV6brKFvww==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 9798ca85
 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO)
 for <70923 <at> debbugs.gnu.org>; Wed, 4 Sep 2024 20:33:49 +0000 (UTC)
From: Herman Rimm <herman@HIDDEN>
Date: Wed,  4 Sep 2024 22:32:55 +0200
Message-ID: <20240904203309.23715-1-herman@HIDDEN>
X-Mailer: git-send-email 2.45.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: 3.6 (+++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 Content preview: * guix/build-system/cargo.scm (crate-closure): Match
 unlabeled
 inputs. Change-Id: Iae421281fa08d09ddd1e5d2da2864f0093d97cd1 ---
 guix/build-system/cargo.scm
 | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) 
 Content analysis details:   (3.6 points, 10.0 required)
 pts rule name              description
 ---- ---------------------- --------------------------------------------------
 0.0 TVD_RCVD_IP            Message was received from an IP address
 0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
 [81.205.150.117 listed in zen.spamhaus.org]
 -0.0 SPF_PASS               SPF: sender matches SPF record
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 2.6 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 
 Content preview:  * guix/build-system/cargo.scm (crate-closure): Match unlabeled
    inputs. Change-Id: Iae421281fa08d09ddd1e5d2da2864f0093d97cd1 --- guix/build-system/cargo.scm
    | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) 
 
 Content analysis details:   (2.6 points, 10.0 required)
 
  pts rule name              description
 ---- ---------------------- --------------------------------------------------
  3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
                             [81.205.150.117 listed in zen.spamhaus.org]
  0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
 -1.0 MAILING_LIST_MULTI     Multiple indicators imply a widely-seen list
                             manager

* guix/build-system/cargo.scm (crate-closure): Match unlabeled inputs.

Change-Id: Iae421281fa08d09ddd1e5d2da2864f0093d97cd1
---
 guix/build-system/cargo.scm | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/guix/build-system/cargo.scm b/guix/build-system/cargo.scm
index 658a2e525e..2e3061c0e8 100644
--- a/guix/build-system/cargo.scm
+++ b/guix/build-system/cargo.scm
@@ -6,6 +6,7 @@
 ;;; Copyright © 2019 Ivan Petkov <ivanppetkov@HIDDEN>
 ;;; Copyright © 2020 Jakub Kądziołka <kuba@HIDDEN>
 ;;; Copyright © 2021 Efraim Flashner <efraim@HIDDEN>
+;;; Copyright © 2024 Herman Rimm <herman@HIDDEN>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -234,11 +235,14 @@ (define (seen? seen item)
        (if (null? propagated)
            (reverse result)
            (loop (reverse (concatenate propagated)) result '() #f seen)))
-      (((and input (label (? package? package))) rest ...)
+      ;; Match inputs with labels for backward compatibility.
+      (((or (_ (? package? package))
+            (? package? package))
+        rest ...)
        (if (and (not first?) (seen? seen package))
            (loop rest result propagated first? seen)
            (loop rest
-                 (cons input result)
+                 (cons package result)
                  (cons (package-cargo-inputs package)
                        propagated)
                  first?
@@ -296,8 +300,8 @@ (define (expand-crate-sources cargo-inputs cargo-development-inputs)
   something that can always be extended or reworked in the future)."
   (filter-map
     (match-lambda
-      ((label (? package? p))
-       (list label (package-source p)))
+      ((? package? p)
+       (list (package-name p) (package-source p)))
       ((label input)
        (list label input)))
     (crate-closure (append cargo-inputs cargo-development-inputs))))
-- 
2.45.2

Message sent to guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#70923] [PATCH v2 02/12] import: utils: Emit new-style inputs from maybe-*inputs procedures.
Resent-From: Herman Rimm <herman@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Wed, 04 Sep 2024 20:36:02 +0000
Resent-Message-ID: <handler.70923.B70923.172548210820344 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70923
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 70923 <at> debbugs.gnu.org
Received: via spool by 70923-submit <at> debbugs.gnu.org id=B70923.172548210820344
          (code B ref 70923); Wed, 04 Sep 2024 20:36:02 +0000
Received: (at 70923) by debbugs.gnu.org; 4 Sep 2024 20:35:08 +0000
Received: from localhost ([127.0.0.1]:35451 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1slwiZ-0005Hw-JE
	for submit <at> debbugs.gnu.org; Wed, 04 Sep 2024 16:35:08 -0400
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:39573
 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <herman@HIDDEN>) id 1slwiW-0005Gz-GK
 for 70923 <at> debbugs.gnu.org; Wed, 04 Sep 2024 16:35:05 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
 t=1725482029;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc:mime-version:mime-version:content-type:content-type:
 content-transfer-encoding:content-transfer-encoding:
 in-reply-to:in-reply-to:references:references;
 bh=cPSaT7NnKA6puFOYtWZdCuViwzBnzCpYHCVjSMnVlok=;
 b=huQAI2fldu7P33+V1nDRmsVGUlrv1sQCqEvsTeVCDSPv56AP0iMEwW3zFtzhd5bh+cENNF
 DGfcUkWuLdXcIqkixmto1x+XGGtlIgHKlvAOspvwYLlypKYgMhxrhhkwU/+4YjaJ+cchbI
 bnBpA6Rxw1rM79RP6HYEhpt8er45xl1D35PkmgtV7nG7zhfa1ddRtm9y6FLktU/yVMNSVQ
 8RkMOdVFn+4S+AbHsQGIVLGk+657YdxBB3qMg7/nFGak5HZQ/MmtJEFVUQdwItUjBowYut
 mka/F6lNSkr+xtUEriuovFCbFYIdeiAUnGk8FwkNYuKwUUOIINvxIcc+Z3E/Gw==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id a891a05b
 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO)
 for <70923 <at> debbugs.gnu.org>; Wed, 4 Sep 2024 20:33:49 +0000 (UTC)
From: Herman Rimm <herman@HIDDEN>
Date: Wed,  4 Sep 2024 22:32:56 +0200
Message-ID: <20240904203309.23715-2-herman@HIDDEN>
X-Mailer: git-send-email 2.45.2
In-Reply-To: <20240904203309.23715-1-herman@HIDDEN>
References: <20240904203309.23715-1-herman@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: 3.6 (+++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 Content preview: * guix/import/utils.scm
 (package-names->package-inputs)[make-input]:
 Refactor. (maybe-list-field): Add procedure, which wraps BODY in 'list' instead
 of 'quasiquote'. (maybe-packages-field): Add proced [...] 
 Content analysis details:   (3.6 points, 10.0 required)
 pts rule name              description
 ---- ---------------------- --------------------------------------------------
 3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
 [81.205.150.117 listed in zen.spamhaus.org]
 0.0 TVD_RCVD_IP            Message was received from an IP address
 0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 2.6 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 
 Content preview:  * guix/import/utils.scm (package-names->package-inputs)[make-input]:
    Refactor. (maybe-list-field): Add procedure, which wraps BODY in 'list' instead
    of 'quasiquote'. (maybe-packages-field): Add proced [...] 
 
 Content analysis details:   (2.6 points, 10.0 required)
 
  pts rule name              description
 ---- ---------------------- --------------------------------------------------
  3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
                             [81.205.150.117 listed in zen.spamhaus.org]
  0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
 -1.0 MAILING_LIST_MULTI     Multiple indicators imply a widely-seen list
                             manager

* guix/import/utils.scm (package-names->package-inputs)[make-input]:
Refactor.
(maybe-list-field): Add procedure, which wraps BODY in 'list' instead of
'quasiquote'.
(maybe-packages-field): Add procedure.
(maybe-inputs, maybe-native-inputs, maybe-propagated-inputs): Use
maybe-packages-field.

Change-Id: I66588f4c822d507ddbaf465a268bfb71af8a7ecd
---
 guix/import/utils.scm | 54 +++++++++++++++++++++++++------------------
 1 file changed, 31 insertions(+), 23 deletions(-)

diff --git a/guix/import/utils.scm b/guix/import/utils.scm
index b7756fcc40..75bef1e9c7 100644
--- a/guix/import/utils.scm
+++ b/guix/import/utils.scm
@@ -13,6 +13,7 @@
 ;;; Copyright © 2022 Alice Brenon <alice.brenon@HIDDEN>
 ;;; Copyright © 2022 Kyle Meyer <kyle@HIDDEN>
 ;;; Copyright © 2022 Philip McGrath <philip@HIDDEN>
+;;; Copyright © 2024 Herman Rimm <herman@HIDDEN>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -65,6 +66,8 @@ (define-module (guix import utils)
             guix-hash-url
 
             package-names->package-inputs
+            maybe-list-field
+            maybe-packages-field
             maybe-inputs
             maybe-native-inputs
             maybe-propagated-inputs
@@ -418,39 +421,44 @@ (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)
-    (let ((name (if version (string-append input "-" version) input)))
-      (if output
-          (list (string->symbol name) output)
-          (string->symbol name))))
+    (let ((symbol (string->symbol
+                    (if version
+                        (string-append input "-" version)
+                        input))))
+      (if output (list symbol output) symbol)))
 
   (map (match-lambda
          ((input version) (make-input input version))
          (input (make-input input #f)))
        names))
 
-(define* (maybe-inputs package-names #:optional (output #f)
-                       #:key (type #f))
-  "Given a list of PACKAGE-NAMES, tries to generate the 'inputs' field of a
-package definition.  TYPE can be used to specify the type of the inputs;
-either the 'native or 'propagated symbols are accepted.  Left unspecified, the
-snippet generated is for regular inputs."
-  (let ((field-name (match type
-                      ('native 'native-inputs)
-                      ('propagated 'propagated-inputs)
-                      (_ 'inputs))))
-    (match (package-names->package-inputs package-names output)
-      (()
-       '())
-      ((package-inputs ...)
-       `((,field-name (list ,@package-inputs)))))))
+(define* (maybe-list-field type body)
+  "Generates the TYPE field of a package definition if its value, BODY,
+is a non-empty list."
+  (match body
+    (()
+     '())
+    ((? list?)
+     (list (list type (cons 'list body))))))
+
+(define* (maybe-packages-field type package-names
+                               #:optional (output #f))
+  "Given a list of PACKAGE-NAMES, tries to generate the TYPE field of a
+package definition."
+  (maybe-list-field type
+    (package-names->package-inputs package-names output)))
+
+(define* (maybe-inputs package-names #:optional (output #f))
+  "MAYBE-PACKAGES-FIELD for inputs."
+  (maybe-packages-field 'inputs package-names output))
 
 (define* (maybe-native-inputs package-names #:optional (output #f))
-  "Same as MAYBE-INPUTS, but for native inputs."
-  (maybe-inputs package-names output #:type 'native))
+  "MAYBE-PACKAGES-FIELD for native inputs."
+  (maybe-packages-field 'native-inputs package-names output))
 
 (define* (maybe-propagated-inputs package-names #:optional (output #f))
-  "Same as MAYBE-INPUTS, but for propagated inputs."
-  (maybe-inputs package-names output #:type 'propagated))
+  "MAYBE-PACKAGES-FIELD for propagated inputs."
+  (maybe-packages-field 'propagated-inputs package-names output))
 
 (define* (package->definition guix-package #:optional append-version?/string)
   "If APPEND-VERSION?/STRING is #t, append the package's major+minor version.
-- 
2.45.2

Message sent to guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#70923] [PATCH v2 03/12] tests: elm: Adjust to new-style package inputs.
Resent-From: Herman Rimm <herman@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Wed, 04 Sep 2024 20:36:02 +0000
Resent-Message-ID: <handler.70923.B70923.172548210820350 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70923
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 70923 <at> debbugs.gnu.org
Received: via spool by 70923-submit <at> debbugs.gnu.org id=B70923.172548210820350
          (code B ref 70923); Wed, 04 Sep 2024 20:36:02 +0000
Received: (at 70923) by debbugs.gnu.org; 4 Sep 2024 20:35:08 +0000
Received: from localhost ([127.0.0.1]:35454 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1slwia-0005I5-9v
	for submit <at> debbugs.gnu.org; Wed, 04 Sep 2024 16:35:08 -0400
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:39573
 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <herman@HIDDEN>) id 1slwiX-0005Gz-Ln
 for 70923 <at> debbugs.gnu.org; Wed, 04 Sep 2024 16:35:06 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
 t=1725482029;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc:mime-version:mime-version:
 content-transfer-encoding:content-transfer-encoding:
 in-reply-to:in-reply-to:references:references;
 bh=t/LWhhq1rnPAe9+q10MJYBXhWFXapjkfNjDI8/TLAPw=;
 b=nGYLDJ4fRc3ZM29Fw4RdFYm82KV9ogSpTZkal0+sEJ01KwDg6CJX8A77SLdvTqceTiSi6i
 vxeKDsk0hUs4zOopqso76Ws8Oug4XMZiF5zoESRpn2kqx/YvoBV5Kp/E7cHoF+KZ3OsYpp
 qqKkop5kDDrPDEqlUmHlMX8CZ6rI4L9UiN07fHZ1QO6DgyYDg45iIOGP34Dy9vXERhh57z
 ycqU9FxwNWONx4rlBD2O0mSw8Ufjzvu+ERvSp3iGfUYAVY00fbeoP+BE6p3d5SZmPGeU4U
 3WNFB1UI918VZ/CcbXfJHJ+2B7iJntfMgrUqtXOVB4fA/j6WGPjDtd81pwHSCA==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id fb2d40e0
 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO)
 for <70923 <at> debbugs.gnu.org>; Wed, 4 Sep 2024 20:33:49 +0000 (UTC)
From: Herman Rimm <herman@HIDDEN>
Date: Wed,  4 Sep 2024 22:32:57 +0200
Message-ID: <20240904203309.23715-3-herman@HIDDEN>
X-Mailer: git-send-email 2.45.2
In-Reply-To: <20240904203309.23715-1-herman@HIDDEN>
References: <20240904203309.23715-1-herman@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 3.6 (+++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 Content preview: * tests/elm.scm (elm-recursive-import "elm-guix/demo"): Use
 the new-style for inputs and propagated-inputs. Change-Id:
 Iae05b5e9f9b6a73cb2d08bb3b0f73df9004f83ac
 --- tests/elm.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
 Content analysis details:   (3.6 points, 10.0 required)
 pts rule name              description
 ---- ---------------------- --------------------------------------------------
 3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
 [81.205.150.117 listed in zen.spamhaus.org]
 0.0 TVD_RCVD_IP            Message was received from an IP address
 0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 2.6 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 
 Content preview:  * tests/elm.scm (elm-recursive-import "elm-guix/demo"): Use
    the new-style for inputs and propagated-inputs. Change-Id: Iae05b5e9f9b6a73cb2d08bb3b0f73df9004f83ac
    --- tests/elm.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
    
 
 Content analysis details:   (2.6 points, 10.0 required)
 
  pts rule name              description
 ---- ---------------------- --------------------------------------------------
  3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
                             [81.205.150.117 listed in zen.spamhaus.org]
  0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
 -1.0 MAILING_LIST_MULTI     Multiple indicators imply a widely-seen list
                             manager

* tests/elm.scm (elm-recursive-import "elm-guix/demo"): Use
the new-style for inputs and propagated-inputs.

Change-Id: Iae05b5e9f9b6a73cb2d08bb3b0f73df9004f83ac
---
 tests/elm.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/elm.scm b/tests/elm.scm
index 48d3eb4b01..7de2168665 100644
--- a/tests/elm.scm
+++ b/tests/elm.scm
@@ -250,9 +250,9 @@ (define elm-guix-demo-dir
                          (base32 ,(? string? hash))))
                 (build-system elm-build-system)
                 (propagated-inputs
-                 ,'`(("elm-core" ,elm-core)))
+                 (list elm-core))
                 (inputs
-                 ,'`(("elm-json" ,elm-json)))
+                 (list elm-json))
                 (home-page
                  "https://package.elm-lang.org/packages/elm-guix/demo/3.0.0")
                 (synopsis "A test for `(guix import elm)`")
-- 
2.45.2

Message sent to guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#70923] [PATCH v2 04/12] import: crate: Use (guix import utils) procedures.
Resent-From: Herman Rimm <herman@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Wed, 04 Sep 2024 20:36:03 +0000
Resent-Message-ID: <handler.70923.B70923.172548211120393 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70923
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 70923 <at> debbugs.gnu.org
Received: via spool by 70923-submit <at> debbugs.gnu.org id=B70923.172548211120393
          (code B ref 70923); Wed, 04 Sep 2024 20:36:03 +0000
Received: (at 70923) by debbugs.gnu.org; 4 Sep 2024 20:35:11 +0000
Received: from localhost ([127.0.0.1]:35460 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1slwic-0005Ij-M2
	for submit <at> debbugs.gnu.org; Wed, 04 Sep 2024 16:35:11 -0400
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:39573
 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <herman@HIDDEN>) id 1slwiY-0005Gz-IP
 for 70923 <at> debbugs.gnu.org; Wed, 04 Sep 2024 16:35:07 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
 t=1725482030;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc:mime-version:mime-version:content-type:content-type:
 content-transfer-encoding:content-transfer-encoding:
 in-reply-to:in-reply-to:references:references;
 bh=QiC3UDVHbx9fWiQfqberKhSIpxhkzzL5SMAviswQB74=;
 b=Y3MgRbWSaLNyBGyfG8lFumWYch0qPPA4m5x57KhjJp63p2p1j9OemB65D/ahGj8OQrOwg2
 zubm8VpPSOwBV68Djix2dWvDkb/ZqZgfWagfR+xPgEfeP9aHtyp7Qn0LSLCny5ZzuRTaD8
 bvwP8EYLPTodIm6WT0PiH7489WxifccxR6bmUCBQGYsm6djMhr0yyxl2zgBK11ifbXQveH
 5KE4yDNszpF1nyCWvm3XdV1UzcBiF4FR2GyACkA1rGt/4t+0LmxSV97vO0xF+F+0SY54W4
 OCijVqqYlMgeGbclvRvaH4UPtmbQTq5Idb4HAqrRB0BrcaC40DxDbwYEGCb3CQ==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id a9133544
 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO)
 for <70923 <at> debbugs.gnu.org>; Wed, 4 Sep 2024 20:33:50 +0000 (UTC)
From: Herman Rimm <herman@HIDDEN>
Date: Wed,  4 Sep 2024 22:32:58 +0200
Message-ID: <20240904203309.23715-4-herman@HIDDEN>
X-Mailer: git-send-email 2.45.2
In-Reply-To: <20240904203309.23715-1-herman@HIDDEN>
References: <20240904203309.23715-1-herman@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: 3.6 (+++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 Content preview:  * guix/import/crate.scm (maybe-cargo-inputs,
 maybe-cargo-development-inputs, 
 maybe-arguments): Delete procedures. (make-crate-sexp): Add 'unwrap' procedure,
 use with maybe-packages-field and fix inden [...] 
 Content analysis details:   (3.6 points, 10.0 required)
 pts rule name              description
 ---- ---------------------- --------------------------------------------------
 3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
 [81.205.150.117 listed in zen.spamhaus.org]
 0.0 TVD_RCVD_IP            Message was received from an IP address
 0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
 0.0 T_FILL_THIS_FORM_SHORT Fill in a short form with personal
 information
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 2.6 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 
 Content preview:  * guix/import/crate.scm (maybe-cargo-inputs, maybe-cargo-development-inputs,
    maybe-arguments): Delete procedures. (make-crate-sexp): Add 'unwrap' procedure,
    use with maybe-packages-field and fix inden [...] 
 
 Content analysis details:   (2.6 points, 10.0 required)
 
  pts rule name              description
 ---- ---------------------- --------------------------------------------------
  3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
                             [81.205.150.117 listed in zen.spamhaus.org]
  0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
 -1.0 MAILING_LIST_MULTI     Multiple indicators imply a widely-seen list
                             manager

* guix/import/crate.scm (maybe-cargo-inputs,
maybe-cargo-development-inputs, maybe-arguments): Delete procedures.
(make-crate-sexp): Add 'unwrap' procedure, use with maybe-packages-field
and fix indentation.
* tests/crate.scm: Replace quasiquotes with list procedures.
---
 guix/import/crate.scm | 53 +++++++++---------------
 tests/crate.scm       | 94 +++++++++++++++++++++----------------------
 2 files changed, 66 insertions(+), 81 deletions(-)

diff --git a/guix/import/crate.scm b/guix/import/crate.scm
index 263c2a8b16..e451ebee68 100644
--- a/guix/import/crate.scm
+++ b/guix/import/crate.scm
@@ -8,6 +8,7 @@
 ;;; Copyright © 2023 Simon Tournier <zimon.toutoune@HIDDEN>
 ;;; Copyright © 2023, 2024 Efraim Flashner <efraim@HIDDEN>
 ;;; Copyright © 2023, 2024 David Elsing <david.elsing@HIDDEN>
+;;; Copyright © 2024 Herman Rimm <herman@HIDDEN>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -159,27 +160,6 @@ (define (make-input input version)
          (input (make-input input #f)))
        names))
 
-(define (maybe-cargo-inputs package-names)
-  (match (package-names->package-inputs package-names)
-    (()
-     '())
-    ((package-inputs ...)
-     `(#:cargo-inputs (,'unquote (list ,@package-inputs))))))
-
-(define (maybe-cargo-development-inputs package-names)
-  (match (package-names->package-inputs package-names)
-    (()
-     '())
-    ((package-inputs ...)
-     `(#:cargo-development-inputs (,'unquote (list ,@package-inputs))))))
-
-(define (maybe-arguments arguments)
-  (match arguments
-    (()
-     '())
-    ((args ...)
-     `((arguments (,'quasiquote ,args))))))
-
 (define (version->semver-prefix version)
   "Return the version up to and including the first non-zero part"
   (first
@@ -203,8 +183,14 @@ (define (format-inputs inputs)
 
   (let* ((port (http-fetch (crate-uri name version)))
          (guix-name (crate-name->package-name name))
-         (cargo-inputs (format-inputs cargo-inputs))
-         (cargo-development-inputs (format-inputs cargo-development-inputs))
+         (unwrap (match-lambda
+                   ((lst) lst)
+                   (() '())))
+         (cargo-inputs (maybe-packages-field '#:cargo-inputs
+                         (format-inputs cargo-inputs)))
+         (cargo-development-inputs
+           (maybe-packages-field '#:cargo-development-inputs
+             (format-inputs cargo-development-inputs)))
          (description (beautify-description description))
          (pkg `(package
                    (name ,guix-name)
@@ -223,12 +209,12 @@ (define (format-inputs inputs)
                          `((properties '((crate-version-yanked? . #t))))
                          '())
                    (build-system cargo-build-system)
-                   ,@(maybe-arguments (append (if build?
-                                                 '()
-                                                 '(#:skip-build? #t))
-                                              (maybe-cargo-inputs cargo-inputs)
-                                              (maybe-cargo-development-inputs
-                                                cargo-development-inputs)))
+                   ,@(maybe-list-field 'arguments
+                       (append (if build?
+                                   '()
+                                   '(#:skip-build? #t))
+                               (unwrap cargo-inputs)
+                               (unwrap cargo-development-inputs)))
                    (home-page ,home-page)
                    (synopsis ,(beautify-synopsis synopsis))
                    (description ,(if (string-prefix? "This" description)
@@ -240,11 +226,10 @@ (define (format-inputs inputs)
                                (#f #f)
                                ((license) license)
                                (_ `(list ,@license)))))))
-         (close-port port)
-         (package->definition pkg
-                              (if yanked?
-                                  (string-append version "-yanked")
-                                  (version->semver-prefix version)))))
+    (close-port port)
+    (package->definition pkg (if yanked?
+                                 (string-append version "-yanked")
+                                 (version->semver-prefix version)))))
 
 (define (string->license string)
   (filter-map (lambda (license)
diff --git a/tests/crate.scm b/tests/crate.scm
index 63643c2728..95c93712a9 100644
--- a/tests/crate.scm
+++ b/tests/crate.scm
@@ -6,6 +6,7 @@
 ;;; Copyright © 2021 Sarah Morgensen <iskarian@HIDDEN>
 ;;; Copyright © 2023 Efraim Flashner <efraim@HIDDEN>
 ;;; Copyright © 2023 David Elsing <david.elsing@HIDDEN>
+;;; Copyright © 2024 Herman Rimm <herman@HIDDEN>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -498,10 +499,10 @@ (define have-guile-semver?
                            (?  string? hash)))))
                       (build-system 'cargo-build-system)
                       (arguments
-                       ('quasiquote
-                        (#:skip-build? #t
+                       (list
+                         #:skip-build? #t
                          #:cargo-inputs
-                         ('unquote (list rust-leaf-alice-0.7)))))
+                         (list rust-leaf-alice-0.7)))
                       (home-page "http://example.com")
                       (synopsis "summary")
                       (description "This package provides summary.")
@@ -590,7 +591,7 @@ (define have-guile-semver?
                      (?  string? hash)))))
                 (build-system cargo-build-system)
                 (arguments
-                 ('quasiquote (#:skip-build? #t)))
+                 (list #:skip-build? #t))
                 (home-page "http://example.com")
                 (synopsis "summary")
                 (description "This package provides summary.")
@@ -609,7 +610,7 @@ (define-public 'rust-leaf-alice-0.7
                     (base32
                      (? string? hash)))))
                 (build-system cargo-build-system)
-                (arguments ('quasiquote (#:skip-build? #t)))
+                (arguments (list #:skip-build? #t))
                 (home-page "http://example.com")
                 (synopsis "summary")
                 (description "This package provides summary.")
@@ -628,7 +629,7 @@ (define-public 'rust-leaf-bob-3
                     (base32
                      (?  string? hash)))))
                 (build-system cargo-build-system)
-                (arguments ('quasiquote (#:skip-build? #t)))
+                (arguments (list #:skip-build? #t))
                 (home-page "http://example.com")
                 (synopsis "summary")
                 (description "This package provides summary.")
@@ -648,9 +649,9 @@ (define-public 'rust-intermediate-b-1
                      (?  string? hash)))))
                 (build-system cargo-build-system)
                 (arguments
-                 ('quasiquote (#:skip-build? #t
-                               #:cargo-inputs
-                               ('unquote (list rust-leaf-bob-3)))))
+                 (list #:skip-build? #t
+                       #:cargo-inputs
+                       (list rust-leaf-bob-3)))
                 (home-page "http://example.com")
                 (synopsis "summary")
                 (description "This package provides summary.")
@@ -670,11 +671,11 @@ (define-public 'rust-intermediate-a-1
                      (?  string? hash)))))
                 (build-system cargo-build-system)
                 (arguments
-                 ('quasiquote (#:skip-build? #t
-                               #:cargo-inputs
-                               ('unquote (list rust-intermediate-b-1
-                                               rust-leaf-alice-0.7
-                                               rust-leaf-bob-3)))))
+                 (list #:skip-build? #t
+                       #:cargo-inputs
+                       (list rust-intermediate-b-1
+                             rust-leaf-alice-0.7
+                             rust-leaf-bob-3)))
                 (home-page "http://example.com")
                 (synopsis "summary")
                 (description "This package provides summary.")
@@ -694,13 +695,13 @@ (define-public 'rust-root-1
                      (?  string? hash)))))
                 (build-system cargo-build-system)
                 (arguments
-                 ('quasiquote (#:cargo-inputs
-                               ('unquote (list rust-intermediate-a-1
-                                               rust-intermediate-b-1
-                                               rust-leaf-alice-0.7
-                                               rust-leaf-bob-3))
-                               #:cargo-development-inputs
-                               ('unquote (list rust-intermediate-c-1)))))
+                 (list #:cargo-inputs
+                       (list rust-intermediate-a-1
+                             rust-intermediate-b-1
+                             rust-leaf-alice-0.7
+                             rust-leaf-bob-3)
+                       #:cargo-development-inputs
+                       ((list rust-intermediate-c-1))))
                 (home-page "http://example.com")
                 (synopsis "summary")
                 (description "This package provides summary.")
@@ -727,8 +728,8 @@ (define-public 'rust-root-1
                      (?  string? hash)))))
                 (build-system cargo-build-system)
                 (arguments
-                 ('quasiquote (#:cargo-development-inputs
-                               ('unquote (list rust-leaf-alice-0.7)))))
+                 (list #:cargo-development-inputs
+                       (list rust-leaf-alice-0.7)))
                 (home-page "http://example.com")
                 (synopsis "summary")
                 (description "This package provides summary.")
@@ -784,9 +785,8 @@ (define-public 'rust-intermediate-b-1
                      (?  string? hash)))))
                 (build-system cargo-build-system)
                 (arguments
-                 ('quasiquote (#:cargo-inputs
-                               (("rust-leaf-bob"
-                                 ('unquote rust-leaf-bob-3))))))
+                 (list #:cargo-inputs
+                       (list rust-leaf-bob-3)))
                 (home-page "http://example.com")
                 (synopsis "summary")
                 (description "This package provides summary.")
@@ -806,10 +806,10 @@ (define-public 'rust-intermediate-a-1
                      (?  string? hash)))))
                 (build-system cargo-build-system)
                 (arguments
-                 ('quasiquote (#:cargo-inputs
-                               ('unquote (list rust-intermediate-b-1
-                                               rust-leaf-alice-0.7
-                                               rust-leaf-bob-3)))))
+                 (list #:cargo-inputs
+                       (list rust-intermediate-b-1
+                             rust-leaf-alice-0.7
+                             rust-leaf-bob-3)))
                 (home-page "http://example.com")
                 (synopsis "summary")
                 (description "This package provides summary.")
@@ -829,13 +829,13 @@ (define-public 'rust-root-1
                      (?  string? hash)))))
                 (build-system cargo-build-system)
                 (arguments
-                 ('quasiquote (#:cargo-inputs
-                               ('unquote (list rust-intermediate-a-1
-                                               rust-intermediate-b-1
-                                               rust-leaf-alice-0.7
-                                               rust-leaf-bob-3))
-                               #:cargo-development-inputs
-                               ('unquote (list rust-intermediate-c-1)))))
+                 (list #:cargo-inputs
+                       (list rust-intermediate-a-1
+                             rust-intermediate-b-1
+                             rust-leaf-alice-0.7
+                             rust-leaf-bob-3)
+                       #:cargo-development-inputs
+                       (list rust-intermediate-c-1)))
                 (home-page "http://example.com")
                 (synopsis "summary")
                 (description "This package provides summary.")
@@ -945,11 +945,11 @@ (define rust-leaf-bob-3.0.2-yanked
                  (?  string? hash)))))
             (build-system cargo-build-system)
             (arguments
-             ('quasiquote (#:cargo-inputs
-                           ('unquote (list rust-leaf-bob-3))
-                           #:cargo-development-inputs
-                           ('unquote (list rust-leaf-bob-3.0.2-yanked
-                                           rust-leaf-bob-4.0.0-yanked)))))
+             (list #:cargo-inputs
+                   (list rust-leaf-bob-3)
+                   #:cargo-development-inputs
+                   (list rust-leaf-bob-3.0.2-yanked
+                         rust-leaf-bob-4.0.0-yanked)))
             (home-page "http://example.com")
             (synopsis "summary")
             (description "This package provides summary.")
@@ -1073,11 +1073,11 @@ (define-public 'rust-bar-1
                      (?  string? hash)))))
                 (build-system cargo-build-system)
                 (arguments
-                 ('quasiquote (#:cargo-inputs
-                               ('unquote (list rust-leaf-bob-3))
-                               #:cargo-development-inputs
-                               ('unquote (list rust-leaf-bob-3.0.2-yanked
-                                               rust-leaf-bob-4.0.0-yanked)))))
+                 (list #:cargo-inputs
+                       (list rust-leaf-bob-3)
+                       #:cargo-development-inputs
+                       (list rust-leaf-bob-3.0.2-yanked
+                             rust-leaf-bob-4.0.0-yanked)))
                 (home-page "http://example.com")
                 (synopsis "summary")
                 (description "This package provides summary.")
-- 
2.45.2

Message sent to guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#70923] [PATCH v2 05/12] import: utils: Add maybe-upstream-inputs.
Resent-From: Herman Rimm <herman@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Wed, 04 Sep 2024 20:36:03 +0000
Resent-Message-ID: <handler.70923.B70923.172548211220407 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70923
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 70923 <at> debbugs.gnu.org
Received: via spool by 70923-submit <at> debbugs.gnu.org id=B70923.172548211220407
          (code B ref 70923); Wed, 04 Sep 2024 20:36:03 +0000
Received: (at 70923) by debbugs.gnu.org; 4 Sep 2024 20:35:12 +0000
Received: from localhost ([127.0.0.1]:35464 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1slwid-0005It-OX
	for submit <at> debbugs.gnu.org; Wed, 04 Sep 2024 16:35:12 -0400
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:45431
 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <herman@HIDDEN>) id 1slwiZ-0005HS-Uv
 for 70923 <at> debbugs.gnu.org; Wed, 04 Sep 2024 16:35:08 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
 t=1725482030;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc:mime-version:mime-version:
 content-transfer-encoding:content-transfer-encoding:
 in-reply-to:in-reply-to:references:references;
 bh=6cCjuoNzuIVEc6VnjP7+AEPBNeJC/hx4q8a9DzLyBRw=;
 b=R1NVpvF2k25Vweaas6b5ChBMC2oarAEQe+i2v5rOQxHYv++LALf7+m8BbpDOO8f+8qCoQO
 w374uxAaKQBXVlMaIPbM6J44gkeAcypny/yQn6E42FDjB6DKABna6TM121IJIc+8y/D8LY
 bPIqetbh2PGeiwbVIe0Rt1wiSe9AWMTujFMpLlFvkYlu+lxt+DAazyWewYWbPHmQdCS/xS
 422XfZHFxsI2Y+QN6GASsPZhqIeMIXlqD8EY8hnw5S3T0zqDHdFisFeM8W36V+w4Bv/B+P
 vES0I94zqxjClgVGyfQ9m1tHNGxSIEiQ+bfurT/y5J+05W8Bu+s6oPy4IEcVjQ==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 994117ba
 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO)
 for <70923 <at> debbugs.gnu.org>; Wed, 4 Sep 2024 20:33:50 +0000 (UTC)
From: Herman Rimm <herman@HIDDEN>
Date: Wed,  4 Sep 2024 22:32:59 +0200
Message-ID: <20240904203309.23715-5-herman@HIDDEN>
X-Mailer: git-send-email 2.45.2
In-Reply-To: <20240904203309.23715-1-herman@HIDDEN>
References: <20240904203309.23715-1-herman@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 3.6 (+++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 Content preview: * guix/import/utils.scm (maybe-upstream-inputs): Add
 procedure.
 Change-Id: Ib8a80216d512c0373e55e4f27e1ef2a7c1fb854a --- guix/import/utils.scm
 | 9 +++++++++ 1 file changed,
 9 insertions(+) diff --git a/guix/import/utils.scm
 b/guix/import/utils.scm index 75bef1e9c7..152ae07a92 100644 ---
 a/guix/import/utils.scm
 +++ b/guix/import/utils.scm @@ -45,6 +45,7 @@ (define-module (guix import
 uti [...] 
 Content analysis details:   (3.6 points, 10.0 required)
 pts rule name              description
 ---- ---------------------- --------------------------------------------------
 3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
 [81.205.150.117 listed in zen.spamhaus.org]
 0.0 TVD_RCVD_IP            Message was received from an IP address
 0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 2.6 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 
 Content preview:  * guix/import/utils.scm (maybe-upstream-inputs): Add procedure.
    Change-Id: Ib8a80216d512c0373e55e4f27e1ef2a7c1fb854a --- guix/import/utils.scm
    | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/guix/import/utils.scm
    b/guix/import/utils.scm index 75bef1e9c7..152ae07a92 100644 --- a/guix/import/utils.scm
    +++ b/guix/import/utils.scm @@ -45,6 +45,7 @@ (define-module (guix import
    uti [...] 
 
 Content analysis details:   (2.6 points, 10.0 required)
 
  pts rule name              description
 ---- ---------------------- --------------------------------------------------
  3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
                             [81.205.150.117 listed in zen.spamhaus.org]
  0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
 -1.0 MAILING_LIST_MULTI     Multiple indicators imply a widely-seen list
                             manager

* guix/import/utils.scm (maybe-upstream-inputs): Add procedure.

Change-Id: Ib8a80216d512c0373e55e4f27e1ef2a7c1fb854a
---
 guix/import/utils.scm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/guix/import/utils.scm b/guix/import/utils.scm
index 75bef1e9c7..152ae07a92 100644
--- a/guix/import/utils.scm
+++ b/guix/import/utils.scm
@@ -45,6 +45,7 @@ (define-module (guix import utils)
   #:use-module (guix download)
   #:use-module (guix sets)
   #:use-module ((guix ui) #:select (fill-paragraph))
+  #:use-module (guix upstream)
   #:use-module (gnu packages)
   #:autoload   (ice-9 control) (let/ec)
   #:use-module (ice-9 match)
@@ -71,6 +72,7 @@ (define-module (guix import utils)
             maybe-inputs
             maybe-native-inputs
             maybe-propagated-inputs
+            maybe-upstream-inputs
             package->definition
 
             spdx-string->license
@@ -460,6 +462,13 @@ (define* (maybe-propagated-inputs package-names #:optional (output #f))
   "MAYBE-PACKAGES-FIELD for propagated inputs."
   (maybe-packages-field 'propagated-inputs package-names output))
 
+(define* (maybe-upstream-inputs type upstream-inputs)
+  "Given a list of UPSTREAM-NAMES, tries to generate the TYPE field of a
+package definition."
+  (maybe-list-field type
+    (map (compose string->symbol upstream-input-downstream-name)
+         upstream-inputs)))
+
 (define* (package->definition guix-package #:optional append-version?/string)
   "If APPEND-VERSION?/STRING is #t, append the package's major+minor version.
 If it is the symbol 'full, append the package's complete version.  If
-- 
2.45.2

Message sent to guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#70923] [PATCH v2 06/12] import: pypi: Use maybe-upstream-inputs.
Resent-From: Herman Rimm <herman@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Wed, 04 Sep 2024 20:36:04 +0000
Resent-Message-ID: <handler.70923.B70923.172548211320420 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70923
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 70923 <at> debbugs.gnu.org
Received: via spool by 70923-submit <at> debbugs.gnu.org id=B70923.172548211320420
          (code B ref 70923); Wed, 04 Sep 2024 20:36:04 +0000
Received: (at 70923) by debbugs.gnu.org; 4 Sep 2024 20:35:13 +0000
Received: from localhost ([127.0.0.1]:35467 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1slwie-0005J7-IH
	for submit <at> debbugs.gnu.org; Wed, 04 Sep 2024 16:35:13 -0400
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:39573
 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <herman@HIDDEN>) id 1slwia-0005Gz-5J
 for 70923 <at> debbugs.gnu.org; Wed, 04 Sep 2024 16:35:09 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
 t=1725482030;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc:mime-version:mime-version:content-type:content-type:
 content-transfer-encoding:content-transfer-encoding:
 in-reply-to:in-reply-to:references:references;
 bh=/AK9eTdS64Z9nrsdwFYM2YldrUkxhxp9VVn+7EMUaO0=;
 b=Rmbzcuz0lOuKnYczETqltBDokFEAK9ZZQXlCthe1Md1x2Dbmx3XHhdgc4+uvHTwXoVOZwI
 mVjO8HaFX5bcaORjNL9muIvZ+4p8k91H9uUVUWFPiiRexHIoqexpkVihjLKjbc3QeabLIB
 0fUxD5xOGtVBCYADcPR98Hqo/QPawTadwSMgCT8G+ofKceS/ZfEaj8BUImtsua00o1DMsx
 jRFALP6oogGSQOy+MmPWMZiODTo7SUfexzqN3cmlT2YnLBRJ/OxVBfR01BENjmkBd6gds+
 ZS09fYGT1VISpkc1zLP0gZbI9LsAGOctfuIq8jUcW05Map43HpKfzDru7nqiFQ==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 7330e8e2
 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO)
 for <70923 <at> debbugs.gnu.org>; Wed, 4 Sep 2024 20:33:50 +0000 (UTC)
From: Herman Rimm <herman@HIDDEN>
Date: Wed,  4 Sep 2024 22:33:00 +0200
Message-ID: <20240904203309.23715-6-herman@HIDDEN>
X-Mailer: git-send-email 2.45.2
In-Reply-To: <20240904203309.23715-1-herman@HIDDEN>
References: <20240904203309.23715-1-herman@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: 3.6 (+++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 Content preview: * guix/import/pypi.scm (maybe-inputs): Delete procedure.
 (make-pypi-sexp):
 Use maybe-upstream-inputs procedure. --- guix/import/pypi.scm | 21 +++++
 1 file changed, 5 insertions(+), 16 [...] 
 Content analysis details:   (3.6 points, 10.0 required)
 pts rule name              description
 ---- ---------------------- --------------------------------------------------
 3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
 [81.205.150.117 listed in zen.spamhaus.org]
 0.0 TVD_RCVD_IP            Message was received from an IP address
 0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 2.6 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 
 Content preview:  * guix/import/pypi.scm (maybe-inputs): Delete procedure. (make-pypi-sexp):
    Use maybe-upstream-inputs procedure. --- guix/import/pypi.scm | 21 +++++
   1 file changed, 5 insertions(+), 16 [...] 
 
 Content analysis details:   (2.6 points, 10.0 required)
 
  pts rule name              description
 ---- ---------------------- --------------------------------------------------
  3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
                             [81.205.150.117 listed in zen.spamhaus.org]
  0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
 -1.0 MAILING_LIST_MULTI     Multiple indicators imply a widely-seen list
                             manager

* guix/import/pypi.scm (maybe-inputs): Delete procedure.
(make-pypi-sexp): Use maybe-upstream-inputs procedure.
---
 guix/import/pypi.scm | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm
index 7b9f54a200..a98fdfa604 100644
--- a/guix/import/pypi.scm
+++ b/guix/import/pypi.scm
@@ -14,6 +14,7 @@
 ;;; Copyright © 2022 Vivien Kraus <vivien@HIDDEN>
 ;;; Copyright © 2021 Simon Tournier <zimon.toutoune@HIDDEN>
 ;;; Copyright © 2022 Hartmut Goebel <h.goebel@HIDDEN>
+;;; Copyright © 2024 Herman Rimm <herman@HIDDEN>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -201,18 +202,6 @@ (define (wheel-url->extracted-directory wheel-url)
     ((name version _ ...)
      (string-append name "-" version ".dist-info"))))
 
-(define (maybe-inputs package-inputs input-type)
-  "Given a list of PACKAGE-INPUTS, tries to generate the 'inputs' field of a
-package definition.  INPUT-TYPE, a symbol, is used to populate the name of
-the input field."
-  (match package-inputs
-    (()
-     '())
-    ((package-inputs ...)
-     `((,input-type (list ,@(map (compose string->symbol
-                                          upstream-input-downstream-name)
-                                 package-inputs)))))))
-
 (define %requirement-name-regexp
   ;; Regexp to match the requirement name in a requirement specification.
 
@@ -538,10 +527,10 @@ (define (maybe-upstream-name name)
                             bytevector->nix-base32-string)))))
         ,@(maybe-upstream-name name)
         (build-system pyproject-build-system)
-        ,@(maybe-inputs (upstream-source-propagated-inputs source)
-                        'propagated-inputs)
-        ,@(maybe-inputs (upstream-source-native-inputs source)
-                        'native-inputs)
+        ,@(maybe-upstream-inputs 'propagated-inputs
+            (upstream-source-propagated-inputs source))
+        ,@(maybe-upstream-inputs 'native-inputs
+            (upstream-source-native-inputs source))
         (home-page ,(project-info-home-page info))
         (synopsis ,(project-info-summary info))
         (description ,(and=> (non-empty-string-or-false
-- 
2.45.2

Message sent to guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#70923] [PATCH v2 07/12] import: elpa: Use maybe-propagated-inputse.
Resent-From: Herman Rimm <herman@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Wed, 04 Sep 2024 20:36:04 +0000
Resent-Message-ID: <handler.70923.B70923.172548211320426 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70923
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 70923 <at> debbugs.gnu.org
Received: via spool by 70923-submit <at> debbugs.gnu.org id=B70923.172548211320426
          (code B ref 70923); Wed, 04 Sep 2024 20:36:04 +0000
Received: (at 70923) by debbugs.gnu.org; 4 Sep 2024 20:35:13 +0000
Received: from localhost ([127.0.0.1]:35469 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1slwif-0005JI-4K
	for submit <at> debbugs.gnu.org; Wed, 04 Sep 2024 16:35:13 -0400
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:45431
 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <herman@HIDDEN>) id 1slwia-0005HS-UT
 for 70923 <at> debbugs.gnu.org; Wed, 04 Sep 2024 16:35:09 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
 t=1725482030;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc:mime-version:mime-version:
 content-transfer-encoding:content-transfer-encoding:
 in-reply-to:in-reply-to:references:references;
 bh=2DBS+ts1h90L6KFd2hnWGrJSPm7juhhDnA43G4Lqm6Q=;
 b=D9/Ire8Q0YuwmmB7zGfCZJka2t0Etwo/n/yulSMsvYSQp+XjaBkfXFRch3+fG9oa9QM3LP
 oSY1blIfc4iJAz4b287Xh1VmAPv0Gp193+vnWtRnsRBqSmRpNv18AL4HphHPs7jzQv33GY
 DpF+iwGLWl8ODsvpcx9VjTcNskoePALQ+ChrrGUAhCucu3xt6qVM0xWTYQ11pR9JbbYl/d
 atcooGz6ARamYG0j6yU3lSsk7mLUWPTutNkNhKMzQmeLzx105zQ25qyH14ckBDmmV5Yf+y
 hvYgBnTaxzp5SOCt2D0oSSHTTasKP5IEJFtT7IreIBj+o57QBRhNsK8CM32N3w==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 7e41babf
 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO)
 for <70923 <at> debbugs.gnu.org>; Wed, 4 Sep 2024 20:33:50 +0000 (UTC)
From: Herman Rimm <herman@HIDDEN>
Date: Wed,  4 Sep 2024 22:33:01 +0200
Message-ID: <20240904203309.23715-7-herman@HIDDEN>
X-Mailer: git-send-email 2.45.2
In-Reply-To: <20240904203309.23715-1-herman@HIDDEN>
References: <20240904203309.23715-1-herman@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 3.6 (+++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 Content preview: * guix/import/elpa.scm (maybe-inputs): Delete procedure.
 (elpa-package->sexp):
 Use maybe-propagated-inputs procedure. Change-Id:
 I9b40e9d387311f5dbbb079938733bf945a1a6ee6
 --- guix/import/elpa.scm | 9 +-------- 1 file changed, 1 insertion(+), 8
 deletions(-) 
 Content analysis details:   (3.6 points, 10.0 required)
 pts rule name              description
 ---- ---------------------- --------------------------------------------------
 3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
 [81.205.150.117 listed in zen.spamhaus.org]
 0.0 TVD_RCVD_IP            Message was received from an IP address
 0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 2.6 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 
 Content preview:  * guix/import/elpa.scm (maybe-inputs): Delete procedure. (elpa-package->sexp):
    Use maybe-propagated-inputs procedure. Change-Id: I9b40e9d387311f5dbbb079938733bf945a1a6ee6
    --- guix/import/elpa.scm | 9 +-------- 1 file changed, 1 insertion(+), 8
   deletions(-) 
 
 Content analysis details:   (2.6 points, 10.0 required)
 
  pts rule name              description
 ---- ---------------------- --------------------------------------------------
  3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
                             [81.205.150.117 listed in zen.spamhaus.org]
  0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
 -1.0 MAILING_LIST_MULTI     Multiple indicators imply a widely-seen list
                             manager

* guix/import/elpa.scm (maybe-inputs): Delete procedure.
(elpa-package->sexp): Use maybe-propagated-inputs procedure.

Change-Id: I9b40e9d387311f5dbbb079938733bf945a1a6ee6
---
 guix/import/elpa.scm | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/guix/import/elpa.scm b/guix/import/elpa.scm
index 46b6dc98a2..9ade189a8a 100644
--- a/guix/import/elpa.scm
+++ b/guix/import/elpa.scm
@@ -359,13 +359,6 @@ (define dependencies
     (map (compose string->symbol elpa-name->package-name)
          dependencies-names))
 
-  (define (maybe-inputs input-type inputs)
-    (match inputs
-      (()
-       '())
-      ((inputs ...)
-       (list (list input-type `(list ,@inputs))))))
-
   (define melpa-source
     (melpa-recipe->origin melpa-recipe))
 
@@ -386,7 +379,7 @@ (define melpa-source
                                 (file-hash* tarball #:recursive? #false))
                                "failed to download package")))))))
       (build-system emacs-build-system)
-      ,@(maybe-inputs 'propagated-inputs dependencies)
+      ,@(maybe-propagated-inputs dependencies)
       ,@(if melpa-source
             (melpa-recipe->maybe-arguments melpa-recipe)
             '())
-- 
2.45.2

Message sent to guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#70923] [PATCH v2 08/12] import: hackage: Use maybe-list-field.
Resent-From: Herman Rimm <herman@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Wed, 04 Sep 2024 20:36:05 +0000
Resent-Message-ID: <handler.70923.B70923.172548211520436 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70923
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 70923 <at> debbugs.gnu.org
Received: via spool by 70923-submit <at> debbugs.gnu.org id=B70923.172548211520436
          (code B ref 70923); Wed, 04 Sep 2024 20:36:05 +0000
Received: (at 70923) by debbugs.gnu.org; 4 Sep 2024 20:35:15 +0000
Received: from localhost ([127.0.0.1]:35471 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1slwig-0005JW-E6
	for submit <at> debbugs.gnu.org; Wed, 04 Sep 2024 16:35:14 -0400
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:39573
 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <herman@HIDDEN>) id 1slwib-0005Gz-My
 for 70923 <at> debbugs.gnu.org; Wed, 04 Sep 2024 16:35:10 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
 t=1725482031;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc:mime-version:mime-version:content-type:content-type:
 content-transfer-encoding:content-transfer-encoding:
 in-reply-to:in-reply-to:references:references;
 bh=Djta66uxxsj0vwMa6XTJ9i3VT1z0qwghGJk31o3s5Iw=;
 b=KjP3Tiy58QYSfQi1aCvMDj/DASbdVxXKV+tdnBxk/3xyQI7I+RyE41sTGowf4z6sc85dmc
 UlX1t0BA/w84c9paRzhmIP0rPoAyhU54ZNiIaPyfl/DIM9du9PwZ58fSzQbSM0uEZydqzR
 +oaPqnta2at245xDpuc7qwD14KawwpKHUkItNByT21E3X9AYlyIl4Rq/LJdx/0lp5a7o2s
 0NSbQThWqaA3pM73P5LSHlpay/sHyQwNFHWq96k+8rkdNJT16+fVN1yunqRXfSqKpk3jnf
 luSP3VbJsBNot7w0I4hHmmYRVpr7B8n+UPOuxM0Bx2tJnEF/MlfukqV4qM1nMg==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id a2168be9
 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO)
 for <70923 <at> debbugs.gnu.org>; Wed, 4 Sep 2024 20:33:51 +0000 (UTC)
From: Herman Rimm <herman@HIDDEN>
Date: Wed,  4 Sep 2024 22:33:02 +0200
Message-ID: <20240904203309.23715-8-herman@HIDDEN>
X-Mailer: git-send-email 2.45.2
In-Reply-To: <20240904203309.23715-1-herman@HIDDEN>
References: <20240904203309.23715-1-herman@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: 3.6 (+++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 Content preview:  * guix/import/hackage.scm (maybe-inputs, maybe-arguments):
 Delete procedures. (hackage-module->sexp): Use maybe-list-field and
 maybe-upstream-inputs
 procedures. * tests/hackage.scm: Fix whitespace and [...] 
 Content analysis details:   (3.6 points, 10.0 required)
 pts rule name              description
 ---- ---------------------- --------------------------------------------------
 3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
 [81.205.150.117 listed in zen.spamhaus.org]
 0.0 TVD_RCVD_IP            Message was received from an IP address
 0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 2.6 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 
 Content preview:  * guix/import/hackage.scm (maybe-inputs, maybe-arguments):
    Delete procedures. (hackage-module->sexp): Use maybe-list-field and maybe-upstream-inputs
    procedures. * tests/hackage.scm: Fix whitespace and [...] 
 
 Content analysis details:   (2.6 points, 10.0 required)
 
  pts rule name              description
 ---- ---------------------- --------------------------------------------------
  3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
                             [81.205.150.117 listed in zen.spamhaus.org]
  0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
 -1.0 MAILING_LIST_MULTI     Multiple indicators imply a widely-seen list
                             manager

* guix/import/hackage.scm (maybe-inputs, maybe-arguments): Delete
procedures.
(hackage-module->sexp): Use maybe-list-field and maybe-upstream-inputs
procedures.
* tests/hackage.scm: Fix whitespace and replace quasiquote with list.

Change-Id: I4fe39ff84c9f6a677f810d9e4fe751d762973757
---
 guix/import/hackage.scm | 39 ++++++++++++---------------------------
 tests/hackage.scm       | 13 +++++++------
 2 files changed, 19 insertions(+), 33 deletions(-)

diff --git a/guix/import/hackage.scm b/guix/import/hackage.scm
index 79a51d3300..bd3bed146e 100644
--- a/guix/import/hackage.scm
+++ b/guix/import/hackage.scm
@@ -9,6 +9,7 @@
 ;;; Copyright © 2019 Simon Tournier <zimon.toutoune@HIDDEN>
 ;;; Copyright © 2022 Hartmut Goebel <h.goebel@HIDDEN>
 ;;; Copyright © 2023-2024 Ludovic Courtès <ludo@HIDDEN>
+;;; Copyright © 2024 Herman Rimm <herman@HIDDEN>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -288,26 +289,6 @@ (define inputs
                           #:include-test-dependencies?
                           include-test-dependencies?))
 
-  (define (maybe-inputs input-type inputs)
-    (match inputs
-      (()
-       '())
-      ((inputs ...)
-       (list (list input-type
-                   `(list ,@(map (compose string->symbol
-                                          upstream-input-downstream-name)
-                                 inputs)))))))
-
-  (define (maybe-arguments)
-    (match (append (if (not include-test-dependencies?)
-                       '(#:tests? #f)
-                       '())
-                   (if (not (string-null? revision))
-                       `(#:cabal-revision (,revision ,cabal-hash))
-                       '()))
-      (() '())
-      (args `((arguments (,'quasiquote ,args))))))
-
   (let ((tarball (with-store store
                    (download-to-store store source-url))))
     (values
@@ -324,13 +305,17 @@ (define (maybe-arguments)
                          "failed to download tar archive")))))
         (build-system haskell-build-system)
         (properties '((upstream-name . ,name)))
-        ,@(maybe-inputs 'inputs
-                        (filter (upstream-input-type-predicate 'regular)
-                                inputs))
-        ,@(maybe-inputs 'native-inputs
-                        (filter (upstream-input-type-predicate 'native)
-                                inputs))
-        ,@(maybe-arguments)
+        ,@(maybe-upstream-inputs 'inputs
+            (filter (upstream-input-type-predicate 'regular) inputs))
+        ,@(maybe-upstream-inputs 'native-inputs
+            (filter (upstream-input-type-predicate 'native) inputs))
+        ,@(maybe-list-field 'arguments
+            (append (if (not include-test-dependencies?)
+                        '(#:tests? #f)
+                        '())
+                    (if (not (string-null? revision))
+                        `(#:cabal-revision '(,revision ,cabal-hash))
+                        '())))
         (home-page ,(cabal-package-home-page cabal))
         (synopsis ,(cabal-package-synopsis cabal))
         (description ,(beautify-description (cabal-package-description cabal)))
diff --git a/tests/hackage.scm b/tests/hackage.scm
index 403f587c41..f6d91515e2 100644
--- a/tests/hackage.scm
+++ b/tests/hackage.scm
@@ -67,7 +67,7 @@ (define test-cabal-3
   if impl(ghc>=7.2&&<7.6)
     Build-depends: ghc-b
   if impl(ghc == 7.8)
-    Build-depends: 
+    Build-depends:
       HTTP       >= 4000.2.5 && < 4000.3,
       mtl        >= 2.0      && < 3
 ")
@@ -86,7 +86,7 @@ (define test-cabal-4
   if impl(ghc>=7.2&&<7.6)
     Build-depends: ghc-b
   if impl(ghc == 7.8)
-    Build-depends: 
+    Build-depends:
       HTTP       >= 4000.2.5 && < 4000.3,
       mtl        >= 2.0      && < 3
 ")
@@ -101,7 +101,7 @@ (define test-cabal-5
 license: BSD3
 library
   if impl(ghc == 7.8)
-    Build-depends: 
+    Build-depends:
       HTTP       >= 4000.2.5 && < 4000.3,
   if impl(ghc -any)
     Build-depends: mtl        >= 2.0      && < 3
@@ -126,7 +126,7 @@ (define test-cabal-6
   if impl(ghc>=7.2&&<7.6)
     Build-depends: ghc-b
   if impl(ghc == 7.8)
-    Build-depends: 
+    Build-depends:
       HTTP       >= 4000.2.5 && < 4000.3,
       mtl        >= 2.0      && < 3
 ")
@@ -524,8 +524,9 @@ (define-package-matcher match-ghc-foo-revision
     ('properties '(quote ((upstream-name . "foo"))))
     ('inputs ('list 'ghc-http))
     ('arguments
-     ('quasiquote
-      ('#:cabal-revision
+     ('list
+      '#:cabal-revision
+      ('quote
        ("2" "0xxd88fb659f0krljidbvvmkh9ppjnx83j0nqzx8whcg4n5qbyng"))))
     ('home-page "http://test.org")
     ('synopsis (? string?))
-- 
2.45.2

Message sent to guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#70923] [PATCH v2 09/12] import: cran: Refactor format-inputs and use maybe-list-field.
Resent-From: Herman Rimm <herman@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Wed, 04 Sep 2024 20:36:05 +0000
Resent-Message-ID: <handler.70923.B70923.172548211520445 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70923
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 70923 <at> debbugs.gnu.org
Received: via spool by 70923-submit <at> debbugs.gnu.org id=B70923.172548211520445
          (code B ref 70923); Wed, 04 Sep 2024 20:36:05 +0000
Received: (at 70923) by debbugs.gnu.org; 4 Sep 2024 20:35:15 +0000
Received: from localhost ([127.0.0.1]:35473 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1slwig-0005JZ-UD
	for submit <at> debbugs.gnu.org; Wed, 04 Sep 2024 16:35:15 -0400
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:45431
 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <herman@HIDDEN>) id 1slwib-0005HS-Q9
 for 70923 <at> debbugs.gnu.org; Wed, 04 Sep 2024 16:35:10 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
 t=1725482031;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc:mime-version:mime-version:content-type:content-type:
 content-transfer-encoding:content-transfer-encoding:
 in-reply-to:in-reply-to:references:references;
 bh=vrJ+37BkyyeUR0PVGNLav5TKtzlwQIHZ9Fm4yb6OMnw=;
 b=gD9GmUXWkjR80u6PE57sH7zPxPM9aoezAjtEHwq/bJmrR5pWwXHvxwjwkox5mClTb8foTw
 DUn0U87A1DtJ0g87gMAfD67WIMoNqwjbrIWmYgh40qFZWCa4iR+zpF7LxVaeTco/PVebnN
 U2bp9QrXp9oQ3KzWg0/tRnusxlFk4Um/JiJn+NBTFXotOtTdMnQKXbq9vYydjU/ZDA2M4F
 Xf6H/dw4hIGchJnnUIkSTYO2M5fIMUYf4FvNgJyGY9XwzMY1w8UTUqCE/UmDAGBEo9YVMs
 MfHYbOAkF8ka9PxvVgcnpkVNEXj8bADDj12Bwa6yZ4Oz9+LPiYqfAYrwZjLcOg==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 4b6d1ba7
 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO)
 for <70923 <at> debbugs.gnu.org>; Wed, 4 Sep 2024 20:33:51 +0000 (UTC)
From: Herman Rimm <herman@HIDDEN>
Date: Wed,  4 Sep 2024 22:33:03 +0200
Message-ID: <20240904203309.23715-9-herman@HIDDEN>
X-Mailer: git-send-email 2.45.2
In-Reply-To: <20240904203309.23715-1-herman@HIDDEN>
References: <20240904203309.23715-1-herman@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: 3.6 (+++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 Content preview: * guix/import/cran.scm (format-inputs): Split and move
 procedure
 ... (maybe-inputs): ... to here, and use maybe-list-field procedure. Change-Id:
 I5148afcebdac1f7fa0f8cce9e82e8cebb56c36c8 --- guix/import/cran.scm | 36
 ++++++++++++++++
 1 file changed, 16 insertions(+), 20 deletions(-) 
 Content analysis details:   (3.6 points, 10.0 required)
 pts rule name              description
 ---- ---------------------- --------------------------------------------------
 3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
 [81.205.150.117 listed in zen.spamhaus.org]
 0.0 TVD_RCVD_IP            Message was received from an IP address
 0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 2.6 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 
 Content preview:  * guix/import/cran.scm (format-inputs): Split and move procedure
    ... (maybe-inputs): ... to here, and use maybe-list-field procedure. Change-Id:
    I5148afcebdac1f7fa0f8cce9e82e8cebb56c36c8 --- guix/import/cran.scm | 36 ++++++++++++++++
    1 file changed, 16 insertions(+), 20 deletions(-) 
 
 Content analysis details:   (2.6 points, 10.0 required)
 
  pts rule name              description
 ---- ---------------------- --------------------------------------------------
  3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
                             [81.205.150.117 listed in zen.spamhaus.org]
  0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
 -1.0 MAILING_LIST_MULTI     Multiple indicators imply a widely-seen list
                             manager

* guix/import/cran.scm (format-inputs): Split and move procedure ...
(maybe-inputs): ... to here, and use maybe-list-field procedure.

Change-Id: I5148afcebdac1f7fa0f8cce9e82e8cebb56c36c8
---
 guix/import/cran.scm | 36 ++++++++++++++++--------------------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/guix/import/cran.scm b/guix/import/cran.scm
index 6ae00cae96..bdac059053 100644
--- a/guix/import/cran.scm
+++ b/guix/import/cran.scm
@@ -6,6 +6,7 @@
 ;;; Copyright © 2021 Sarah Morgensen <iskarian@HIDDEN>
 ;;; Copyright © 2021 Simon Tournier <zimon.toutoune@HIDDEN>
 ;;; Copyright © 2022 Hartmut Goebel <h.goebel@HIDDEN>
+;;; Copyright © 2024 Herman Rimm <herman@HIDDEN>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -85,21 +86,6 @@ (define-module (guix import cran)
 (define %input-style
   (make-parameter 'variable)) ; or 'specification
 
-(define (format-inputs inputs)
-  "Generate a sorted list of package inputs from a list of upstream inputs."
-  (map (lambda (input)
-         (case (%input-style)
-           ((specification)
-            `(specification->package ,(upstream-input-downstream-name input)))
-           (else
-            ((compose string->symbol
-                       upstream-input-downstream-name)
-             input))))
-       (sort inputs
-             (lambda (a b)
-               (string-ci<? (upstream-input-name a)
-                            (upstream-input-name b))))))
-
 (define (string->licenses license-string license-prefix)
   (let ((licenses
          (map string-trim-both
@@ -188,11 +174,21 @@ (define (description->alist description)
 (define* (maybe-inputs package-inputs #:optional (input-type 'inputs))
   "Given a list of PACKAGE-INPUTS, tries to generate the TYPE field of a
 package definition."
-  (match package-inputs
-    (()
-     '())
-    ((package-inputs ...)
-     `((,input-type (list ,@(format-inputs package-inputs)))))))
+  (define (format-input input)
+    (case (%input-style)
+      ((specification)
+       `(specification->package ,(upstream-input-downstream-name input)))
+      (else
+       ((compose string->symbol
+                  upstream-input-downstream-name)
+        input))))
+
+  (define (upstream-input-name<? i1 i2)
+    (string-ci<? (upstream-input-name i1)
+                 (upstream-input-name i2)))
+
+  (maybe-list-field input-type
+    (map format-input (sort package-inputs upstream-input-name<?))))
 
 (define %cran-url "https://cloud.r-project.org/web/packages/")
 (define %cran-canonical-url "https://cran.r-project.org/package=")
-- 
2.45.2

Message sent to guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#70923] [PATCH v2 10/12] import: cpan: Use maybe-upstream-inputs.
Resent-From: Herman Rimm <herman@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Wed, 04 Sep 2024 20:36:06 +0000
Resent-Message-ID: <handler.70923.B70923.172548211620452 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70923
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 70923 <at> debbugs.gnu.org
Received: via spool by 70923-submit <at> debbugs.gnu.org id=B70923.172548211620452
          (code B ref 70923); Wed, 04 Sep 2024 20:36:06 +0000
Received: (at 70923) by debbugs.gnu.org; 4 Sep 2024 20:35:16 +0000
Received: from localhost ([127.0.0.1]:35475 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1slwih-0005Ji-ED
	for submit <at> debbugs.gnu.org; Wed, 04 Sep 2024 16:35:15 -0400
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:39573
 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <herman@HIDDEN>) id 1slwic-0005Gz-J2
 for 70923 <at> debbugs.gnu.org; Wed, 04 Sep 2024 16:35:11 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
 t=1725482031;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc:mime-version:mime-version:content-type:content-type:
 content-transfer-encoding:content-transfer-encoding:
 in-reply-to:in-reply-to:references:references;
 bh=7jhRtdAZBpb6qUAb5To9EPJseUKAuNIn6Gin9X6tnFg=;
 b=qYJOtUdnYDMt+8spgYgO4hu96BpuAnWVlQWleGZcdYLcliY+5N55Xu+C6QCfCWd+3vRXjh
 887BaLyX0lzg3nQxXJM0tZHa+bco8ZK7Wld3OCRDUmE6W+IEqEmeIxJqQhXawIlrzeg2uh
 BOM0PmF0kJ9D+g9b7AAPkoPq87sPGBJLvrLgjhjbD3CUJXPoaoetkTdVAfwtMfS8oGZL9i
 f96a4NAeTIjuea0r6ST8Wv9hpiCcKNQYlSYsCg8hYqlWY6qd16tzLTRpqi9MZT5//6YvNH
 HVNjAoASff2x0T8oRNgRJjXEhMtPrA7YvfMjgJj+emVN1152IuMgn0gnwEEbJQ==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 4b7181a1
 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO)
 for <70923 <at> debbugs.gnu.org>; Wed, 4 Sep 2024 20:33:51 +0000 (UTC)
From: Herman Rimm <herman@HIDDEN>
Date: Wed,  4 Sep 2024 22:33:04 +0200
Message-ID: <20240904203309.23715-10-herman@HIDDEN>
X-Mailer: git-send-email 2.45.2
In-Reply-To: <20240904203309.23715-1-herman@HIDDEN>
References: <20240904203309.23715-1-herman@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: 3.6 (+++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 Content preview: * guix/import/cpan.scm (maybe-inputs): Delete procedure.
 (cpan-module->sexp):
 Use maybe-upstream-inputs procedure. Change-Id:
 I4fa99da62d81f02c2998ad96f5ea81e27df071cd
 --- guix/import/cpan.scm | 23 +++++++ 1 file changed, 7 insertions(+), 16
 deletions(-) 
 Content analysis details:   (3.6 points, 10.0 required)
 pts rule name              description
 ---- ---------------------- --------------------------------------------------
 3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
 [81.205.150.117 listed in zen.spamhaus.org]
 0.0 TVD_RCVD_IP            Message was received from an IP address
 0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 2.6 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 
 Content preview:  * guix/import/cpan.scm (maybe-inputs): Delete procedure. (cpan-module->sexp):
    Use maybe-upstream-inputs procedure. Change-Id: I4fa99da62d81f02c2998ad96f5ea81e27df071cd
    --- guix/import/cpan.scm | 23 +++++++ 1 file changed, 7 insertions(+), 16
    deletions(-) 
 
 Content analysis details:   (2.6 points, 10.0 required)
 
  pts rule name              description
 ---- ---------------------- --------------------------------------------------
  3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
                             [81.205.150.117 listed in zen.spamhaus.org]
  0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
 -1.0 MAILING_LIST_MULTI     Multiple indicators imply a widely-seen list
                             manager

* guix/import/cpan.scm (maybe-inputs): Delete procedure.
(cpan-module->sexp): Use maybe-upstream-inputs procedure.

Change-Id: I4fa99da62d81f02c2998ad96f5ea81e27df071cd
---
 guix/import/cpan.scm | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/guix/import/cpan.scm b/guix/import/cpan.scm
index b87736eef6..611ea63eba 100644
--- a/guix/import/cpan.scm
+++ b/guix/import/cpan.scm
@@ -5,6 +5,7 @@
 ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@HIDDEN>
 ;;; Copyright © 2020, 2021, 2023 Ludovic Courtès <ludo@HIDDEN>
 ;;; Copyright © 2022 Hartmut Goebel <h.goebel@HIDDEN>
+;;; Copyright © 2024 Herman Rimm <herman@HIDDEN>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -37,7 +38,8 @@ (define-module (guix import cpan)
   #:use-module (guix utils)
   #:use-module (guix base32)
   #:use-module ((guix download) #:select (download-to-store url-fetch))
-  #:use-module ((guix import utils) #:select (factorize-uri))
+  #:use-module ((guix import utils) #:select (factorize-uri
+                                              maybe-upstream-inputs))
   #:use-module (guix import json)
   #:use-module (guix packages)
   #:use-module (guix upstream)
@@ -275,15 +277,6 @@ (define name
   (define version (cpan-release-version release))
   (define source-url (cpan-source-url release))
 
-  (define (maybe-inputs input-type inputs)
-    (match inputs
-      (()
-       '())
-      ((inputs ...)
-       `((,input-type (list ,@(map (compose string->symbol
-                                            upstream-input-downstream-name)
-                                   inputs)))))))
-
   (let ((tarball (with-store store
                    (download-to-store store source-url)))
         (inputs (cpan-module-inputs release)))
@@ -297,12 +290,10 @@ (define (maybe-inputs input-type inputs)
                   (base32
                    ,(bytevector->nix-base32-string (file-sha256 tarball))))))
        (build-system perl-build-system)
-       ,@(maybe-inputs 'native-inputs
-                       (filter (upstream-input-type-predicate 'native)
-                               inputs))
-       ,@(maybe-inputs 'propagated-inputs
-                       (filter (upstream-input-type-predicate 'propagated)
-                               inputs))
+       ,@(maybe-upstream-inputs 'native-inputs
+           (filter (upstream-input-type-predicate 'native) inputs))
+       ,@(maybe-upstream-inputs 'propagated-inputs
+           (filter (upstream-input-type-predicate 'propagated) inputs))
        (home-page ,(cpan-home name))
        (synopsis ,(cpan-release-abstract release))
        (description fill-in-yourself!)
-- 
2.45.2

Message sent to guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#70923] [PATCH v2 11/12] import: egg: Use maybe-*inputs procedures.
Resent-From: Herman Rimm <herman@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Wed, 04 Sep 2024 20:36:06 +0000
Resent-Message-ID: <handler.70923.B70923.172548211620459 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70923
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 70923 <at> debbugs.gnu.org
Received: via spool by 70923-submit <at> debbugs.gnu.org id=B70923.172548211620459
          (code B ref 70923); Wed, 04 Sep 2024 20:36:06 +0000
Received: (at 70923) by debbugs.gnu.org; 4 Sep 2024 20:35:16 +0000
Received: from localhost ([127.0.0.1]:35477 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1slwih-0005Jp-Ti
	for submit <at> debbugs.gnu.org; Wed, 04 Sep 2024 16:35:16 -0400
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:45431
 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <herman@HIDDEN>) id 1slwic-0005HS-NQ
 for 70923 <at> debbugs.gnu.org; Wed, 04 Sep 2024 16:35:12 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
 t=1725482031;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc:mime-version:mime-version:content-type:content-type:
 content-transfer-encoding:content-transfer-encoding:
 in-reply-to:in-reply-to:references:references;
 bh=y0HbsMJyWggxDYoep2jVhJsCjxyUnoBt0dZD1UDF5ZM=;
 b=uVS2xLlZfcwMlouiXiV012qL8Wd8AkR9SkUCOoKLv2Yw7kNCHp2ZBUR2PXv165L35VkBm5
 uOX4Wp1n63jICFvc6n4nR/jlzkxl79kHP4THLky1glVgAoHOul4jzBn3TOMG4nsChRgzIT
 1XVUqgnRkDezfKXbHFRTkj3tgj9/LoFVUTR4VQs6Q/WLZe7Nie3byV2UJ6FJyBhlzG9Eyj
 CFJTgpW877AKRJPVO/K+tkh45oiDB9Lz1/JPSwGiEOfyCgFldvtci4Ev/RgJ9q+sivuDwn
 5bZbl2VfszXsGfTcWdl4ArufYQluJzkIQbbBFCyf/U+V29iQ6Z2KFAE+lIl0ww==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id e8ea673a
 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO)
 for <70923 <at> debbugs.gnu.org>; Wed, 4 Sep 2024 20:33:51 +0000 (UTC)
From: Herman Rimm <herman@HIDDEN>
Date: Wed,  4 Sep 2024 22:33:05 +0200
Message-ID: <20240904203309.23715-11-herman@HIDDEN>
X-Mailer: git-send-email 2.45.2
In-Reply-To: <20240904203309.23715-1-herman@HIDDEN>
References: <20240904203309.23715-1-herman@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: 3.6 (+++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 Content preview: * guix/import/egg.scm (maybe-inputs): Delete procedure.
 (egg-parse-dependency):
 Simplify procedure to return strings. (egg->guix-package): Use maybe-*inputs
 procedures. Change-Id: Ib0a3f5b6f02912c847defd02ba7675d80005279b ---
 guix/import/egg.scm
 | 39 +++++++++++ 1 file changed, 11 insertions(+), 28 deletions(-) 
 Content analysis details:   (3.6 points, 10.0 required)
 pts rule name              description
 ---- ---------------------- --------------------------------------------------
 3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
 [81.205.150.117 listed in zen.spamhaus.org]
 0.0 TVD_RCVD_IP            Message was received from an IP address
 0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 2.6 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 
 Content preview:  * guix/import/egg.scm (maybe-inputs): Delete procedure. (egg-parse-dependency):
    Simplify procedure to return strings. (egg->guix-package): Use maybe-*inputs
    procedures. Change-Id: Ib0a3f5b6f02912c847defd02ba7675d80005279b --- guix/import/egg.scm
    | 39 +++++++++++ 1 file changed, 11 insertions(+), 28 deletions(-) 
 
 Content analysis details:   (2.6 points, 10.0 required)
 
  pts rule name              description
 ---- ---------------------- --------------------------------------------------
  3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
                             [81.205.150.117 listed in zen.spamhaus.org]
  0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
 -1.0 MAILING_LIST_MULTI     Multiple indicators imply a widely-seen list
                             manager

* guix/import/egg.scm (maybe-inputs): Delete procedure.
(egg-parse-dependency): Simplify procedure to return strings.
(egg->guix-package): Use maybe-*inputs procedures.

Change-Id: Ib0a3f5b6f02912c847defd02ba7675d80005279b
---
 guix/import/egg.scm | 39 +++++++++++----------------------------
 1 file changed, 11 insertions(+), 28 deletions(-)

diff --git a/guix/import/egg.scm b/guix/import/egg.scm
index e3bc158475..97d09a7c9d 100644
--- a/guix/import/egg.scm
+++ b/guix/import/egg.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2021 Tobias Geerinckx-Rice <me@HIDDEN>
 ;;; Copyright © 2021 Sarah Morgensen <iskarian@HIDDEN>
 ;;; Copyright © 2022 Hartmut Goebel <h.goebel@HIDDEN>
+;;; Copyright © 2024 Herman Rimm <herman@HIDDEN>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -229,23 +230,14 @@ (define (prettify-system-dependency name)
                           (else char)))
                       (maybe-symbol->string name)))
 
-        (define* (egg-parse-dependency name #:key (system? #f))
-          (define extract-name
-            (match-lambda
-              ((name version) name)
-              (name name)))
-
-          (define (prettify-name name)
+        (define* (egg-parse-dependency dependency #:key (system? #f))
+          (let ((name (match dependency
+                        ((name version) name)
+                        (name name))))
             (if system?
                 (prettify-system-dependency name)
-                (maybe-symbol->string name)))
-          
-          (let ((name (prettify-name (extract-name name))))
-            ;; Dependencies are sometimes specified as symbols and sometimes
-            ;; as strings
-            (string->symbol (string-append
-                             (if system? "" package-name-prefix)
-                             name))))
+                (string-append package-name-prefix
+                               (maybe-symbol->string name)))))
 
         (define egg-propagated-inputs
           (let ((dependencies (assoc-ref egg-content 'dependencies)))
@@ -277,15 +269,6 @@ (define egg-native-inputs
                               test+build-dependencies))
               (() '()))))
 
-        ;; Copied from (guix import hackage).
-        (define (maybe-inputs input-type inputs)
-          (match inputs
-            (()
-             '())
-            ((inputs ...)
-             (list (list input-type
-                         `(list ,@inputs))))))
-
         (values
          `(package
             (name ,(egg-name->guix-name name))
@@ -303,16 +286,16 @@ (define (maybe-inputs input-type inputs)
                                    "failed to download tar archive"))))))
             (build-system chicken-build-system)
             (arguments ,(list 'quasiquote (list #:egg-name name)))
-            ,@(maybe-inputs 'native-inputs egg-native-inputs)
-            ,@(maybe-inputs 'inputs egg-inputs)
-            ,@(maybe-inputs 'propagated-inputs egg-propagated-inputs)
+            ,@(maybe-native-inputs egg-native-inputs)
+            ,@(maybe-inputs egg-inputs)
+            ,@(maybe-propagated-inputs egg-propagated-inputs)
             (home-page ,egg-home-page)
             (synopsis ,egg-synopsis)
             (description #f)
             (license ,egg-licenses))
          (filter (lambda (name)
                    (not (member name '("srfi-4"))))
-                 (map (compose guix-name->egg-name symbol->string)
+                 (map guix-name->egg-name
                       (append egg-propagated-inputs
                               egg-native-inputs)))))))
 
-- 
2.45.2

Message sent to guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#70923] [PATCH v2 12/12] import: hexpm: Use maybe-inputs.
Resent-From: Herman Rimm <herman@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Wed, 04 Sep 2024 20:36:07 +0000
Resent-Message-ID: <handler.70923.B70923.172548211620467 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70923
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 70923 <at> debbugs.gnu.org
Received: via spool by 70923-submit <at> debbugs.gnu.org id=B70923.172548211620467
          (code B ref 70923); Wed, 04 Sep 2024 20:36:07 +0000
Received: (at 70923) by debbugs.gnu.org; 4 Sep 2024 20:35:16 +0000
Received: from localhost ([127.0.0.1]:35479 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1slwii-0005Jw-CV
	for submit <at> debbugs.gnu.org; Wed, 04 Sep 2024 16:35:16 -0400
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:39573
 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <herman@HIDDEN>) id 1slwid-0005Gz-Lh
 for 70923 <at> debbugs.gnu.org; Wed, 04 Sep 2024 16:35:12 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
 t=1725482032;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc:mime-version:mime-version:content-type:content-type:
 content-transfer-encoding:content-transfer-encoding:
 in-reply-to:in-reply-to:references:references;
 bh=Jd5WR4+yNK0SJoDuM6HP4wtVaCkzB8p8rFcIE4xxNlQ=;
 b=UBYLqm/ETxNBjPFAH2WjYywhtXa5wBA0fjLVx8yO/XolHeuTtUikPAyw5U2d4nZVkypdME
 e0P7bMKbaBQk3NbSrsVRUy/H0DrJefDo3NI9zWalYir2XH0kRNoyaTQc/8iR1D26Ws1XNB
 VTjFUIY4w5GXdzHYXhvrO7d45oHNQ4MgQn2LpNYhn2Fh3o2ckqWWZf2o/LZTxy+UnKpMT2
 PKdtLvbk1NlTKntqhZXC2x1/xOC2svc8MH4rRhygNe99cj/4GkbsCz2oYBZdGo2xu55K96
 yZ5AByRT0o8mNXH+y238HQ4Sz5oK5JK9ahrk+0mYwLGXslQBQbKyIj/HLq9+TQ==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id e3e3baff
 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO)
 for <70923 <at> debbugs.gnu.org>; Wed, 4 Sep 2024 20:33:52 +0000 (UTC)
From: Herman Rimm <herman@HIDDEN>
Date: Wed,  4 Sep 2024 22:33:06 +0200
Message-ID: <20240904203309.23715-12-herman@HIDDEN>
X-Mailer: git-send-email 2.45.2
In-Reply-To: <20240904203309.23715-1-herman@HIDDEN>
References: <20240904203309.23715-1-herman@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: 3.6 (+++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 Content preview:  * guix/import/hexpm.scm (maybe-inputs): Delete procedure.
 (dependencies->package-names): Adjust description and return strings.
 (make-hexpm-sexp): Use maybe-inputs procedure. Change-Id:
 Ie7a8a630a3a9d4859453d49fdee42aa560e27f17
 --- guix/import/hexpm.scm | 29 +++++++++ 1 file changed, 9 insertions(+),
 20 deletions(-) 
 Content analysis details:   (3.6 points, 10.0 required)
 pts rule name              description
 ---- ---------------------- --------------------------------------------------
 3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
 [81.205.150.117 listed in zen.spamhaus.org]
 0.0 TVD_RCVD_IP            Message was received from an IP address
 0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
 0.0 T_FILL_THIS_FORM_SHORT Fill in a short form with personal
 information
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 2.6 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 
 Content preview:  * guix/import/hexpm.scm (maybe-inputs): Delete procedure.
   (dependencies->package-names): Adjust description and return strings. (make-hexpm-sexp):
    Use maybe-inputs procedure. Change-Id: Ie7a8a630a3a9d4859453d49fdee42aa560e27f17
    --- guix/import/hexpm.scm | 29 +++++++++ 1 file changed, 9 insertions(+),
    20 deletions(-) 
 
 Content analysis details:   (2.6 points, 10.0 required)
 
  pts rule name              description
 ---- ---------------------- --------------------------------------------------
  3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
                             [81.205.150.117 listed in zen.spamhaus.org]
  0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
 -1.0 MAILING_LIST_MULTI     Multiple indicators imply a widely-seen list
                             manager

* guix/import/hexpm.scm (maybe-inputs): Delete procedure.
(dependencies->package-names): Adjust description and return strings.
(make-hexpm-sexp): Use maybe-inputs procedure.

Change-Id: Ie7a8a630a3a9d4859453d49fdee42aa560e27f17
---
 guix/import/hexpm.scm | 29 +++++++++--------------------
 1 file changed, 9 insertions(+), 20 deletions(-)

diff --git a/guix/import/hexpm.scm b/guix/import/hexpm.scm
index 71a54ba973..aa857facbc 100644
--- a/guix/import/hexpm.scm
+++ b/guix/import/hexpm.scm
@@ -5,6 +5,7 @@
 ;;; Copyright © 2019 Martin Becze <mjbecze@HIDDEN>
 ;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@HIDDEN>
 ;;; Copyright © 2020-2022 Hartmut Goebel <h.goebel@HIDDEN>
+;;; Copyright © 2024 Herman Rimm <herman@HIDDEN>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -153,26 +154,14 @@ (define (lookup-hexpm-release version*)
 ;;; Converting hex.pm packages to Guix packages.
 ;;;
 
-(define (maybe-inputs package-inputs input-type)
-  "Given a list of PACKAGE-INPUTS, tries to generate the 'inputs' field of a
-package definition.  INPUT-TYPE, a symbol, is used to populate the name of
-the input field."
-  (match package-inputs
-    (()
-     '())
-    ((package-inputs ...)
-     `((,input-type (list ,@package-inputs))))))
-
 (define (dependencies->package-names names)
-  "Given a list of hexpm package NAMES, returns a list of guix package names
-as symbols."
-  ;; TODO: Base name on language of dependency.
-  ;; The language used for implementing the dependency is not know without
-  ;; recursing the dependencies.  So for now assume more packages are based on
-  ;; Erlang and prefix all dependencies with "erlang-" (the default).
-  (map string->symbol
-       (map hexpm-name->package-name
-            (sort names string-ci<?))))
+  "Given NAMES, a list of hexpm dependencies, return a list of guix
+package names."
+  ;; TODO: Base name on the programming language of the dependency.
+  ;; The language used for implementing the dependency can only be known
+  ;; by traversing the dependencies.  So for now assume packages are
+  ;; based on Erlang, and prefix dependencies with "erlang-" by default.
+  (map hexpm-name->package-name (sort names string-ci<?)))
 
 (define* (make-hexpm-sexp #:key name version tarball-url
                           home-page synopsis description license
@@ -194,7 +183,7 @@ (define* (make-hexpm-sexp #:key name version tarball-url
                    (uri (hexpm-uri ,name version))
                    (sha256 (base32 ,(guix-hash-url temp)))))
          (build-system ,build-system)
-         ,@(maybe-inputs (dependencies->package-names dependencies) 'inputs)
+         ,@(maybe-inputs (dependencies->package-names dependencies))
          (synopsis ,synopsis)
          (description ,(beautify-description description))
          (home-page ,(match home-page
-- 
2.45.2

Message sent to guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#70923] [PATCH v3 00/11] Add (guix import utils) procedures.
References: <cover.1715627497.git.herman@HIDDEN>
In-Reply-To: <cover.1715627497.git.herman@HIDDEN>
Resent-From: Herman Rimm <herman@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Tue, 24 Sep 2024 20:22:02 +0000
Resent-Message-ID: <handler.70923.B70923.172720928019266 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70923
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 70923 <at> debbugs.gnu.org
Received: via spool by 70923-submit <at> debbugs.gnu.org id=B70923.172720928019266
          (code B ref 70923); Tue, 24 Sep 2024 20:22:02 +0000
Received: (at 70923) by debbugs.gnu.org; 24 Sep 2024 20:21:20 +0000
Received: from localhost ([127.0.0.1]:38489 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1stC2B-00050g-SC
	for submit <at> debbugs.gnu.org; Tue, 24 Sep 2024 16:21:20 -0400
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:37373
 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <herman@HIDDEN>) id 1stC29-00050F-Ja
 for 70923 <at> debbugs.gnu.org; Tue, 24 Sep 2024 16:21:18 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
 t=1727208844;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc:mime-version:mime-version:
 content-transfer-encoding:content-transfer-encoding;
 bh=mHNbDCRTR0X2vWIf/zIA8nPvmnA3GfimsS4JycMiVuw=;
 b=YjNgE/xkuNv5VMCYOWwg2eylq30ggI/hasMDr7BnsUVcWU6hy/3+I/H2kL/mZuASBtWR/j
 p0ZLc7+sCz9YCSVgrHNKL04k9RD5zAXMoH8gZwJwhdV+CJQtirP/6RIUNdQBnSC03Qbwvw
 njM3dWIJdXAnQZRD1YYDcU3otpenJBhdUXMQeLcwM1nPxXwHcKJdnXzGCQb+tHwhobtGpN
 bl0T6yVzDhFaWSXJ6RqMAIQIlAhTjtAD4WDgg8ZJwYjYox3tKFuLIcsyeeQnLVQ88qysax
 BzBKqgcKByERovNkVz11bBtFvBqGRBPRXD0VwuLY4pmZcGsIz3uFZZ8zoWMDSA==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 6d884761
 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO)
 for <70923 <at> debbugs.gnu.org>; Tue, 24 Sep 2024 20:14:04 +0000 (UTC)
From: Herman Rimm <herman@HIDDEN>
Date: Tue, 24 Sep 2024 22:13:06 +0200
Message-ID: <cover.1727207512.git.herman@HIDDEN>
X-Mailer: git-send-email 2.45.2
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 3.5 (+++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 Content preview:  Hello, The fix for #72939 reverts the commit for which I had
 provided a modified version in the first revision of this series. It does
 not introduce the bug in #72939. Also, revision v2 of this series would [...]
 Content analysis details:   (3.5 points, 10.0 required)
 pts rule name              description
 ---- ---------------------- --------------------------------------------------
 3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
 [81.205.150.117 listed in zen.spamhaus.org]
 0.0 TVD_RCVD_IP            Message was received from an IP address
 -0.0 SPF_PASS               SPF: sender matches SPF record
 0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 T_SCC_BODY_TEXT_LINE   No description available.
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 2.5 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 
 Content preview:  Hello, The fix for #72939 reverts the commit for which I had
    provided a modified version in the first revision of this series. It does
    not introduce the bug in #72939. Also, revision v2 of this series would [...]
    
 
 Content analysis details:   (2.5 points, 10.0 required)
 
  pts rule name              description
 ---- ---------------------- --------------------------------------------------
  3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
                             [81.205.150.117 listed in zen.spamhaus.org]
 -0.0 SPF_PASS               SPF: sender matches SPF record
  0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 T_SCC_BODY_TEXT_LINE   No description available.
 -1.0 MAILING_LIST_MULTI     Multiple indicators imply a widely-seen list
                             manager

Hello,

The fix for #72939 reverts the commit for which I had provided a
modified version in the first revision of this series.  It does not
introduce the bug in #72939.  Also, revision v2 of this series would
have fixed that bug.  I assume that unfortunately, once again, I had not
CC'ed any maintainers the second revision.  Now, I have created a third
revision, two patches fewer than the first.  One commit had adjusted
tests/go.scm to the new-style inputs, which a remaining commit from the
same series as the reverted commit does instead.  The other commit fixed
tests/elm.scm, but now 7979001c58fcadd98bae09781c495f0a462d6e04 does
that instead.  Hopefully this revision does get reviewed, or (re)starts
some discussion.

Cheers,
Herman

Herman Rimm (9):
  build-system: cargo: Accept unlabeled #:cargo-inputs.
  import: utils: Add 'maybe-upstream-inputs' procedure.
  import: pypi: Use 'maybe-list-field' procedure.
  import: elpa: Use maybe-propagated-inputs procedure.
  import: hackage: Use 'maybe-list-field' procedure.
  import: cran: Use 'maybe-list-field' procedure.
  import: cpan: Use 'maybe-upstream-inputs' procedure.
  import: egg: Use maybe-*inputs procedures.
  import: hexpm: Use (guix import utils) 'maybe-inputs' procedure.

Sarah Morgensen (2):
  import: utils: Emit new-style package inputs.
  import: crate: Emit new-style package inputs.

 guix/build-system/cargo.scm |  12 ++--
 guix/import/cpan.scm        |  23 +++----
 guix/import/cran.scm        |  36 +++++------
 guix/import/crate.scm       |  51 ++++++----------
 guix/import/egg.scm         |  39 ++++--------
 guix/import/elpa.scm        |   9 +--
 guix/import/hackage.scm     |  39 ++++--------
 guix/import/hexpm.scm       |  29 +++------
 guix/import/pypi.scm        |  21 ++-----
 guix/import/utils.scm       |  61 +++++++++++-------
 tests/crate.scm             | 119 +++++++++++++++---------------------
 tests/hackage.scm           |  13 ++--
 12 files changed, 180 insertions(+), 272 deletions(-)


base-commit: 3ac69c1a757430d6dfdd37eb948ba1d6967967cc
-- 
2.45.2

Message sent to efraim@HIDDEN, guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#70923] [PATCH v3 01/11] build-system: cargo: Accept unlabeled #:cargo-inputs.
Resent-From: Herman Rimm <herman@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: efraim@HIDDEN, guix-patches@HIDDEN
Resent-Date: Tue, 24 Sep 2024 20:22:03 +0000
Resent-Message-ID: <handler.70923.B70923.172720928419297 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70923
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 70923 <at> debbugs.gnu.org
Cc: Efraim Flashner <efraim@HIDDEN>
X-Debbugs-Original-Xcc: Efraim Flashner <efraim@HIDDEN>
Received: via spool by 70923-submit <at> debbugs.gnu.org id=B70923.172720928419297
          (code B ref 70923); Tue, 24 Sep 2024 20:22:03 +0000
Received: (at 70923) by debbugs.gnu.org; 24 Sep 2024 20:21:24 +0000
Received: from localhost ([127.0.0.1]:38494 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1stC2F-000512-Ad
	for submit <at> debbugs.gnu.org; Tue, 24 Sep 2024 16:21:23 -0400
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:37373
 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <herman@HIDDEN>) id 1stC2A-00050F-B1
 for 70923 <at> debbugs.gnu.org; Tue, 24 Sep 2024 16:21:19 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
 t=1727208844;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc:mime-version:mime-version:content-type:content-type:
 content-transfer-encoding:content-transfer-encoding:
 in-reply-to:in-reply-to:references:references;
 bh=PLXxgB+Ns3CX0w+wN615sREAl/GGOCCzcIUFd9+skMA=;
 b=diFaJysOgdryCF/LWFV5+wi7b7PZ1fsqM3X/T8jH/IKOsnrydD1HPgq1Arl63WNCnK6mF8
 QDKPVkUVM9Rbl2q6eUJqF4x+m77YGaTBAQjw01X6RS+Ot1BgI7yp64Dwiza1+QG9i5550v
 TKyCvLR0ocepf8edfSPITWxNZMRspWWIGjcwdENBIxADVHZmh7lELeAvr5uclxXwCj3eZ7
 4lEvMPcSc0NsiLthXNIOb+H5oQ20h0waB3w1PlNiQokFtNx7SjuNJQU78PfeZhhlsP8Mse
 8YfEZD1T06AmmTPPgiGcqQipnPvlaAdDkv5nBU3WcopYF20V30y8uKt0mjG1Og==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id f9d71bc0
 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO)
 for <70923 <at> debbugs.gnu.org>; Tue, 24 Sep 2024 20:14:04 +0000 (UTC)
From: Herman Rimm <herman@HIDDEN>
Date: Tue, 24 Sep 2024 22:13:07 +0200
Message-ID: <368720732ff9491a4ab81657c4691f79ee2c9d5b.1727207512.git.herman@HIDDEN>
X-Mailer: git-send-email 2.45.2
In-Reply-To: <cover.1727207512.git.herman@HIDDEN>
References: <cover.1727207512.git.herman@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: 3.5 (+++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 Content preview: * guix/build-system/cargo.scm (crate-closure): Match
 unlabeled
 inputs. Change-Id: Iae421281fa08d09ddd1e5d2da2864f0093d97cd1 ---
 guix/build-system/cargo.scm
 | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) 
 Content analysis details:   (3.5 points, 10.0 required)
 pts rule name              description
 ---- ---------------------- --------------------------------------------------
 3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
 [81.205.150.117 listed in zen.spamhaus.org]
 0.0 TVD_RCVD_IP            Message was received from an IP address
 -0.0 SPF_PASS               SPF: sender matches SPF record
 0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 T_SCC_BODY_TEXT_LINE   No description available.
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 2.5 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 
 Content preview:  * guix/build-system/cargo.scm (crate-closure): Match unlabeled
    inputs. Change-Id: Iae421281fa08d09ddd1e5d2da2864f0093d97cd1 --- guix/build-system/cargo.scm
    | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) 
 
 Content analysis details:   (2.5 points, 10.0 required)
 
  pts rule name              description
 ---- ---------------------- --------------------------------------------------
  3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
                             [81.205.150.117 listed in zen.spamhaus.org]
 -0.0 SPF_PASS               SPF: sender matches SPF record
  0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 T_SCC_BODY_TEXT_LINE   No description available.
 -1.0 MAILING_LIST_MULTI     Multiple indicators imply a widely-seen list
                             manager

* guix/build-system/cargo.scm (crate-closure): Match unlabeled inputs.

Change-Id: Iae421281fa08d09ddd1e5d2da2864f0093d97cd1
---
 guix/build-system/cargo.scm | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/guix/build-system/cargo.scm b/guix/build-system/cargo.scm
index 658a2e525e..2e3061c0e8 100644
--- a/guix/build-system/cargo.scm
+++ b/guix/build-system/cargo.scm
@@ -6,6 +6,7 @@
 ;;; Copyright © 2019 Ivan Petkov <ivanppetkov@HIDDEN>
 ;;; Copyright © 2020 Jakub Kądziołka <kuba@HIDDEN>
 ;;; Copyright © 2021 Efraim Flashner <efraim@HIDDEN>
+;;; Copyright © 2024 Herman Rimm <herman@HIDDEN>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -234,11 +235,14 @@ (define (crate-closure inputs)
        (if (null? propagated)
            (reverse result)
            (loop (reverse (concatenate propagated)) result '() #f seen)))
-      (((and input (label (? package? package))) rest ...)
+      ;; Match inputs with labels for backward compatibility.
+      (((or (_ (? package? package))
+            (? package? package))
+        rest ...)
        (if (and (not first?) (seen? seen package))
            (loop rest result propagated first? seen)
            (loop rest
-                 (cons input result)
+                 (cons package result)
                  (cons (package-cargo-inputs package)
                        propagated)
                  first?
@@ -296,8 +300,8 @@ (define (expand-crate-sources cargo-inputs cargo-development-inputs)
   something that can always be extended or reworked in the future)."
   (filter-map
     (match-lambda
-      ((label (? package? p))
-       (list label (package-source p)))
+      ((? package? p)
+       (list (package-name p) (package-source p)))
       ((label input)
        (list label input)))
     (crate-closure (append cargo-inputs cargo-development-inputs))))
-- 
2.45.2

Message sent to efraim@HIDDEN, guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#70923] [PATCH v3 03/11] import: crate: Emit new-style package inputs.
Resent-From: Herman Rimm <herman@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: efraim@HIDDEN, guix-patches@HIDDEN
Resent-Date: Tue, 24 Sep 2024 20:22:03 +0000
Resent-Message-ID: <handler.70923.B70923.172720928519320 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70923
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 70923 <at> debbugs.gnu.org
Cc: Sarah Morgensen <iskarian@HIDDEN>, Efraim Flashner <efraim@HIDDEN>
X-Debbugs-Original-Xcc: Efraim Flashner <efraim@HIDDEN>
Received: via spool by 70923-submit <at> debbugs.gnu.org id=B70923.172720928519320
          (code B ref 70923); Tue, 24 Sep 2024 20:22:03 +0000
Received: (at 70923) by debbugs.gnu.org; 24 Sep 2024 20:21:25 +0000
Received: from localhost ([127.0.0.1]:38496 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1stC2F-00051E-Sw
	for submit <at> debbugs.gnu.org; Tue, 24 Sep 2024 16:21:25 -0400
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:37373
 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <herman@HIDDEN>) id 1stC2B-00050F-Hx
 for 70923 <at> debbugs.gnu.org; Tue, 24 Sep 2024 16:21:20 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
 t=1727208846;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc:cc:mime-version:mime-version:content-type:content-type:
 content-transfer-encoding:content-transfer-encoding:
 in-reply-to:in-reply-to:references:references;
 bh=e2rD280szrADz7Y/sQErNDxVRn/suHoq5qL7mSASXI4=;
 b=iGdj9AQcT7fbhgP9ChMfy8TA+/sbCNozJLPmF0HV1uWkVCdV8/hVXkHg08gXqbO4hOPzsR
 vAsa9e9WHnF57FOz7PRDMMAWjjODO66gvfFNqBFf1TquTlviAxTTOe+EHbUMpdBfzPdpKg
 YllhAr3oQcp757VhetdsXHlH+tlbZK6oF9l0DTqRIX8tSJrdeKnjmwP2wTCwqq0Vg5TpDS
 Ly0WfkN8U2Vl5E8sKu7vNzoeZGoamd+hKglw5nsh+yzJANXMljYM5hZ5WohQegUeuBe2Hd
 dwzTLoxmFkDL7pXKoMmm92+ZzF6j2qdRMnF1ZNlBS+LKB6lvIQKIZnjpoLWXEw==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 00329269
 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); 
 Tue, 24 Sep 2024 20:14:05 +0000 (UTC)
From: Herman Rimm <herman@HIDDEN>
Date: Tue, 24 Sep 2024 22:13:09 +0200
Message-ID: <a8da5c9ad4c8dea79bd332ae25f3d042204a74a0.1727207512.git.herman@HIDDEN>
X-Mailer: git-send-email 2.45.2
In-Reply-To: <cover.1727207512.git.herman@HIDDEN>
References: <cover.1727207512.git.herman@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: 3.6 (+++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 Content preview: From: Sarah Morgensen <iskarian@HIDDEN> *
 guix/import/crate.scm
 (maybe-cargo-inputs, maybe-cargo-development-inputs, maybe-arguments): Delete
 procedures. (make-crate-sexp): Add 'unwrap' procedure,
 use with maybe-packages-field and fix inden [...] 
 Content analysis details:   (3.6 points, 10.0 required)
 pts rule name              description
 ---- ---------------------- --------------------------------------------------
 3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
 [81.205.150.117 listed in zen.spamhaus.org]
 0.0 TVD_RCVD_IP            Message was received from an IP address
 -0.0 SPF_PASS               SPF: sender matches SPF record
 0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 T_SCC_BODY_TEXT_LINE   No description available.
 0.0 T_FILL_THIS_FORM_SHORT Fill in a short form with personal
 information
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 2.5 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 
 Content preview:  From: Sarah Morgensen <iskarian@HIDDEN> * guix/import/crate.scm
    (maybe-cargo-inputs, maybe-cargo-development-inputs, maybe-arguments): Delete
    procedures. (make-crate-sexp): Add 'unwrap' procedure, use with maybe-packages-field
    and fix inden [...] 
 
 Content analysis details:   (2.5 points, 10.0 required)
 
  pts rule name              description
 ---- ---------------------- --------------------------------------------------
  3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
                             [81.205.150.117 listed in zen.spamhaus.org]
 -0.0 SPF_PASS               SPF: sender matches SPF record
  0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 T_SCC_BODY_TEXT_LINE   No description available.
 -1.0 MAILING_LIST_MULTI     Multiple indicators imply a widely-seen list
                             manager

From: Sarah Morgensen <iskarian@HIDDEN>

* guix/import/crate.scm (maybe-cargo-inputs,
maybe-cargo-development-inputs, maybe-arguments): Delete procedures.
(make-crate-sexp): Add 'unwrap' procedure, use with maybe-packages-field
and fix indentation.
* tests/crate.scm: Adjust accordingly.

Change-Id: Ie8debd2553a338c3c623162b843e0a9827314074
---
 guix/import/crate.scm |  51 ++++++------------
 tests/crate.scm       | 119 +++++++++++++++++-------------------------
 2 files changed, 65 insertions(+), 105 deletions(-)

diff --git a/guix/import/crate.scm b/guix/import/crate.scm
index 84c178ea3e..5110e6124f 100644
--- a/guix/import/crate.scm
+++ b/guix/import/crate.scm
@@ -7,6 +7,7 @@
 ;;; Copyright © 2023 Simon Tournier <zimon.toutoune@HIDDEN>
 ;;; Copyright © 2023, 2024 Efraim Flashner <efraim@HIDDEN>
 ;;; Copyright © 2023, 2024 David Elsing <david.elsing@HIDDEN>
+;;; Copyright © 2024 Herman Rimm <herman@HIDDEN>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -158,27 +159,6 @@ (define* (package-names->package-inputs names #:optional (output #f))
          (input (make-input input #f)))
        names))
 
-(define (maybe-cargo-inputs package-names)
-  (match (package-names->package-inputs package-names)
-    (()
-     '())
-    ((package-inputs ...)
-     `(#:cargo-inputs ,package-inputs))))
-
-(define (maybe-cargo-development-inputs package-names)
-  (match (package-names->package-inputs package-names)
-    (()
-     '())
-    ((package-inputs ...)
-     `(#:cargo-development-inputs ,package-inputs))))
-
-(define (maybe-arguments arguments)
-  (match arguments
-    (()
-     '())
-    ((args ...)
-     `((arguments (,'quasiquote ,args))))))
-
 (define (version->semver-prefix version)
   "Return the version up to and including the first non-zero part"
   (first
@@ -202,8 +182,14 @@ (define* (make-crate-sexp #:key name version cargo-inputs cargo-development-inpu
 
   (let* ((port (http-fetch (crate-uri name version)))
          (guix-name (crate-name->package-name name))
-         (cargo-inputs (format-inputs cargo-inputs))
-         (cargo-development-inputs (format-inputs cargo-development-inputs))
+         (unwrap (match-lambda
+                   ((lst) lst)
+                   (() '())))
+         (cargo-inputs (maybe-packages-field '#:cargo-inputs
+                         (format-inputs cargo-inputs)))
+         (cargo-development-inputs
+           (maybe-packages-field '#:cargo-development-inputs
+             (format-inputs cargo-development-inputs)))
          (description (beautify-description description))
          (pkg `(package
                    (name ,guix-name)
@@ -222,12 +208,10 @@ (define* (make-crate-sexp #:key name version cargo-inputs cargo-development-inpu
                          `((properties '((crate-version-yanked? . #t))))
                          '())
                    (build-system cargo-build-system)
-                   ,@(maybe-arguments (append (if build?
-                                                 '()
-                                                 '(#:skip-build? #t))
-                                              (maybe-cargo-inputs cargo-inputs)
-                                              (maybe-cargo-development-inputs
-                                                cargo-development-inputs)))
+                   ,@(maybe-list-field 'arguments
+                       (append (if build? '() '(#:skip-build? #t))
+                               (unwrap cargo-inputs)
+                               (unwrap cargo-development-inputs)))
                    (home-page ,home-page)
                    (synopsis ,(beautify-synopsis synopsis))
                    (description ,(if (string-prefix? "This" description)
@@ -239,11 +223,10 @@ (define* (make-crate-sexp #:key name version cargo-inputs cargo-development-inpu
                                (#f #f)
                                ((license) license)
                                (_ `(list ,@license)))))))
-         (close-port port)
-         (package->definition pkg
-                              (if yanked?
-                                  (string-append version "-yanked")
-                                  (version->semver-prefix version)))))
+    (close-port port)
+    (package->definition pkg (if yanked?
+                                 (string-append version "-yanked")
+                                 (version->semver-prefix version)))))
 
 (define (string->license string)
   (filter-map (lambda (license)
diff --git a/tests/crate.scm b/tests/crate.scm
index 5b4ad08c3c..8e3da2e72c 100644
--- a/tests/crate.scm
+++ b/tests/crate.scm
@@ -5,6 +5,8 @@
 ;;; Copyright © 2020 Martin Becze <mjbecze@HIDDEN>
 ;;; Copyright © 2023 Efraim Flashner <efraim@HIDDEN>
 ;;; Copyright © 2023 David Elsing <david.elsing@HIDDEN>
+;;; Copyright © 2021 Sarah Morgensen <iskarian@HIDDEN>
+;;; Copyright © 2024 Herman Rimm <herman@HIDDEN>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -497,10 +499,10 @@ (define have-guile-semver?
                            (?  string? hash)))))
                       (build-system 'cargo-build-system)
                       (arguments
-                       ('quasiquote
-                        (#:skip-build? #t
+                       (list
+                         #:skip-build? #t
                          #:cargo-inputs
-                         (("rust-leaf-alice" ('unquote 'rust-leaf-alice-0.7))))))
+                         (list rust-leaf-alice-0.7)))
                       (home-page "http://example.com")
                       (synopsis "summary")
                       (description "This package provides summary.")
@@ -589,7 +591,7 @@ (define have-guile-semver?
                      (?  string? hash)))))
                 (build-system cargo-build-system)
                 (arguments
-                 ('quasiquote (#:skip-build? #t)))
+                 (list #:skip-build? #t))
                 (home-page "http://example.com")
                 (synopsis "summary")
                 (description "This package provides summary.")
@@ -608,7 +610,7 @@ (define have-guile-semver?
                     (base32
                      (?  string? hash)))))
                 (build-system cargo-build-system)
-                (arguments ('quasiquote (#:skip-build? #t)))
+                (arguments (list #:skip-build? #t))
                 (home-page "http://example.com")
                 (synopsis "summary")
                 (description "This package provides summary.")
@@ -627,7 +629,7 @@ (define have-guile-semver?
                     (base32
                      (?  string? hash)))))
                 (build-system cargo-build-system)
-                (arguments ('quasiquote (#:skip-build? #t)))
+                (arguments (list #:skip-build? #t))
                 (home-page "http://example.com")
                 (synopsis "summary")
                 (description "This package provides summary.")
@@ -647,10 +649,9 @@ (define have-guile-semver?
                      (?  string? hash)))))
                 (build-system cargo-build-system)
                 (arguments
-                 ('quasiquote (#:skip-build? #t
-                               #:cargo-inputs
-                               (("rust-leaf-bob"
-                                 ('unquote rust-leaf-bob-3))))))
+                 (list #:skip-build? #t
+                       #:cargo-inputs
+                       (list rust-leaf-bob-3)))
                 (home-page "http://example.com")
                 (synopsis "summary")
                 (description "This package provides summary.")
@@ -670,14 +671,11 @@ (define have-guile-semver?
                      (?  string? hash)))))
                 (build-system cargo-build-system)
                 (arguments
-                 ('quasiquote (#:skip-build? #t
-                               #:cargo-inputs
-                               (("rust-intermediate-b"
-                                 ('unquote rust-intermediate-b-1))
-                                ("rust-leaf-alice"
-                                 ('unquote 'rust-leaf-alice-0.7))
-                                ("rust-leaf-bob"
-                                 ('unquote rust-leaf-bob-3))))))
+                 (list #:skip-build? #t
+                       #:cargo-inputs
+                       (list rust-intermediate-b-1
+                             rust-leaf-alice-0.7
+                             rust-leaf-bob-3)))
                 (home-page "http://example.com")
                 (synopsis "summary")
                 (description "This package provides summary.")
@@ -697,18 +695,13 @@ (define have-guile-semver?
                      (?  string? hash)))))
                 (build-system cargo-build-system)
                 (arguments
-                 ('quasiquote (#:cargo-inputs
-                               (("rust-intermediate-a"
-                                 ('unquote rust-intermediate-a-1))
-                                ("rust-intermediate-b"
-                                 ('unquote rust-intermediate-b-1))
-                                ("rust-leaf-alice"
-                                 ('unquote 'rust-leaf-alice-0.7))
-                                ("rust-leaf-bob"
-                                 ('unquote rust-leaf-bob-3)))
-                               #:cargo-development-inputs
-                               (("rust-intermediate-c"
-                                 ('unquote rust-intermediate-c-1))))))
+                 (list #:cargo-inputs
+                       (list rust-intermediate-a-1
+                             rust-intermediate-b-1
+                             rust-leaf-alice-0.7
+                             rust-leaf-bob-3)
+                       #:cargo-development-inputs
+                       ((list rust-intermediate-c-1))))
                 (home-page "http://example.com")
                 (synopsis "summary")
                 (description "This package provides summary.")
@@ -735,9 +728,8 @@ (define have-guile-semver?
                      (?  string? hash)))))
                 (build-system cargo-build-system)
                 (arguments
-                 ('quasiquote (#:cargo-development-inputs
-                               (("rust-leaf-alice"
-                                 ('unquote rust-leaf-alice-0.7))))))
+                 (list #:cargo-development-inputs
+                       (list rust-leaf-alice-0.7)))
                 (home-page "http://example.com")
                 (synopsis "summary")
                 (description "This package provides summary.")
@@ -793,9 +785,8 @@ (define have-guile-semver?
                      (?  string? hash)))))
                 (build-system cargo-build-system)
                 (arguments
-                 ('quasiquote (#:cargo-inputs
-                               (("rust-leaf-bob"
-                                 ('unquote rust-leaf-bob-3))))))
+                 (list #:cargo-inputs
+                       (list rust-leaf-bob-3)))
                 (home-page "http://example.com")
                 (synopsis "summary")
                 (description "This package provides summary.")
@@ -815,13 +806,10 @@ (define have-guile-semver?
                      (?  string? hash)))))
                 (build-system cargo-build-system)
                 (arguments
-                 ('quasiquote (#:cargo-inputs
-                               (("rust-intermediate-b"
-                                 ('unquote rust-intermediate-b-1))
-                                ("rust-leaf-alice"
-                                 ('unquote 'rust-leaf-alice-0.7))
-                                ("rust-leaf-bob"
-                                 ('unquote rust-leaf-bob-3))))))
+                 (list #:cargo-inputs
+                       (list rust-intermediate-b-1
+                             rust-leaf-alice-0.7
+                             rust-leaf-bob-3)))
                 (home-page "http://example.com")
                 (synopsis "summary")
                 (description "This package provides summary.")
@@ -841,18 +829,13 @@ (define have-guile-semver?
                      (?  string? hash)))))
                 (build-system cargo-build-system)
                 (arguments
-                 ('quasiquote (#:cargo-inputs
-                               (("rust-intermediate-a"
-                                 ('unquote rust-intermediate-a-1))
-                                ("rust-intermediate-b"
-                                 ('unquote rust-intermediate-b-1))
-                                ("rust-leaf-alice"
-                                 ('unquote 'rust-leaf-alice-0.7))
-                                ("rust-leaf-bob"
-                                 ('unquote rust-leaf-bob-3)))
-                               #:cargo-development-inputs
-                               (("rust-intermediate-c"
-                                 ('unquote rust-intermediate-c-1))))))
+                 (list #:cargo-inputs
+                       (list rust-intermediate-a-1
+                             rust-intermediate-b-1
+                             rust-leaf-alice-0.7
+                             rust-leaf-bob-3)
+                       #:cargo-development-inputs
+                       (list rust-intermediate-c-1)))
                 (home-page "http://example.com")
                 (synopsis "summary")
                 (description "This package provides summary.")
@@ -962,14 +945,11 @@ (define rust-leaf-bob-3.0.2-yanked
                  (?  string? hash)))))
             (build-system cargo-build-system)
             (arguments
-             ('quasiquote (#:cargo-inputs
-                           (("rust-leaf-bob"
-                             ('unquote 'rust-leaf-bob-3)))
-                           #:cargo-development-inputs
-                           (("rust-leaf-bob"
-                             ('unquote 'rust-leaf-bob-3.0.2-yanked))
-                            ("rust-leaf-bob"
-                             ('unquote 'rust-leaf-bob-4.0.0-yanked))))))
+             (list #:cargo-inputs
+                   (list rust-leaf-bob-3)
+                   #:cargo-development-inputs
+                   (list rust-leaf-bob-3.0.2-yanked
+                         rust-leaf-bob-4.0.0-yanked)))
             (home-page "http://example.com")
             (synopsis "summary")
             (description "This package provides summary.")
@@ -1093,14 +1073,11 @@ (define rust-leaf-bob-3.0.2-yanked
                      (?  string? hash)))))
                 (build-system cargo-build-system)
                 (arguments
-                 ('quasiquote (#:cargo-inputs
-                               (("rust-leaf-bob"
-                                 ('unquote 'rust-leaf-bob-3)))
-                               #:cargo-development-inputs
-                               (("rust-leaf-bob"
-                                 ('unquote 'rust-leaf-bob-3.0.2-yanked))
-                                ("rust-leaf-bob"
-                                 ('unquote 'rust-leaf-bob-4.0.0-yanked))))))
+                 (list #:cargo-inputs
+                       (list rust-leaf-bob-3)
+                       #:cargo-development-inputs
+                       (list rust-leaf-bob-3.0.2-yanked
+                             rust-leaf-bob-4.0.0-yanked)))
                 (home-page "http://example.com")
                 (synopsis "summary")
                 (description "This package provides summary.")
-- 
2.45.2

Message sent to guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#70923] [PATCH v3 02/11] import: utils: Emit new-style package inputs.
Resent-From: Herman Rimm <herman@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Tue, 24 Sep 2024 20:22:04 +0000
Resent-Message-ID: <handler.70923.B70923.172720928719339 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70923
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 70923 <at> debbugs.gnu.org
Cc: Sarah Morgensen <iskarian@HIDDEN>
Received: via spool by 70923-submit <at> debbugs.gnu.org id=B70923.172720928719339
          (code B ref 70923); Tue, 24 Sep 2024 20:22:04 +0000
Received: (at 70923) by debbugs.gnu.org; 24 Sep 2024 20:21:27 +0000
Received: from localhost ([127.0.0.1]:38501 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1stC2H-00051Z-Et
	for submit <at> debbugs.gnu.org; Tue, 24 Sep 2024 16:21:26 -0400
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:37373
 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <herman@HIDDEN>) id 1stC2C-00050F-VG
 for 70923 <at> debbugs.gnu.org; Tue, 24 Sep 2024 16:21:22 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
 t=1727208845;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc:cc:mime-version:mime-version:content-type:content-type:
 content-transfer-encoding:content-transfer-encoding:
 in-reply-to:in-reply-to:references:references;
 bh=afbMubt9LidZxOOyGfUEUMlVliWU5sOoy7FfjG+uatQ=;
 b=guk9BEfRXSpGOrERsi/0lOAyRmXyc2lbs915ZyAZ2vqsLgEIGWspN/3HAPgSTx92GuE2+G
 R6OOS3UxI7RW7o4nBbtbCoRTALZ0m/amPSakCO5xHRx5NO1fiazpw5ZOqVMxqHEt88WDQT
 I3r2c94mOqexkHe4LQ7xxvkpA1q7waRTSsc2z7+mjkgGHf/tOUcid95szT5sqDu6ehhHYR
 c2t4t73a+ajhRMSqjguce7Gph5NDOSof6iVngkWLvYUhZR9lc+x/9xcMFE0BTv1AWw4S1z
 yU8HazauPHj9PCHbNtGF9fokiklfg8RUmLVAvjNymdlqBugn/iRyb7eXTVOhew==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id b16b5ee3
 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); 
 Tue, 24 Sep 2024 20:14:05 +0000 (UTC)
From: Herman Rimm <herman@HIDDEN>
Date: Tue, 24 Sep 2024 22:13:08 +0200
Message-ID: <3776de27f3b8917f8d3272ba167ebfe5ce707a5c.1727207512.git.herman@HIDDEN>
X-Mailer: git-send-email 2.45.2
In-Reply-To: <cover.1727207512.git.herman@HIDDEN>
References: <cover.1727207512.git.herman@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: 3.5 (+++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 Content preview: From: Sarah Morgensen <iskarian@HIDDEN> *
 guix/import/utils.scm
 (package-names->package-inputs)[make-input]: Return new-style package inputs.
 (maybe-list-field): Add procedure, which wraps BODY in 'list' instead of
 'quasiquote'. (maybe-pack [...] 
 Content analysis details:   (3.5 points, 10.0 required)
 pts rule name              description
 ---- ---------------------- --------------------------------------------------
 3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
 [81.205.150.117 listed in zen.spamhaus.org]
 0.0 TVD_RCVD_IP            Message was received from an IP address
 -0.0 SPF_PASS               SPF: sender matches SPF record
 0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 T_SCC_BODY_TEXT_LINE   No description available.
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 2.5 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 
 Content preview:  From: Sarah Morgensen <iskarian@HIDDEN> * guix/import/utils.scm
    (package-names->package-inputs)[make-input]: Return new-style package inputs.
    (maybe-list-field): Add procedure, which wraps BODY in 'list' instead of
   'quasiquote'. (maybe-pack [...] 
 
 Content analysis details:   (2.5 points, 10.0 required)
 
  pts rule name              description
 ---- ---------------------- --------------------------------------------------
  3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
                             [81.205.150.117 listed in zen.spamhaus.org]
 -0.0 SPF_PASS               SPF: sender matches SPF record
  0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 T_SCC_BODY_TEXT_LINE   No description available.
 -1.0 MAILING_LIST_MULTI     Multiple indicators imply a widely-seen list
                             manager

From: Sarah Morgensen <iskarian@HIDDEN>

* guix/import/utils.scm (package-names->package-inputs)[make-input]:
Return new-style package inputs.
(maybe-list-field): Add procedure, which wraps BODY in 'list' instead of
'quasiquote'.
(maybe-packages-field): Add procedure.
(maybe-inputs): Use maybe-packages-field.
(maybe-native-inputs): Use maybe-packages-field.
(maybe-propagated-inputs): Use maybe-packages-field.

Change-Id: I66588f4c822d507ddbaf465a268bfb71af8a7ecd
---
 guix/import/utils.scm | 52 +++++++++++++++++++++++++------------------
 1 file changed, 30 insertions(+), 22 deletions(-)

diff --git a/guix/import/utils.scm b/guix/import/utils.scm
index b7756fcc40..88a1db4a88 100644
--- a/guix/import/utils.scm
+++ b/guix/import/utils.scm
@@ -13,6 +13,7 @@
 ;;; Copyright © 2022 Alice Brenon <alice.brenon@HIDDEN>
 ;;; Copyright © 2022 Kyle Meyer <kyle@HIDDEN>
 ;;; Copyright © 2022 Philip McGrath <philip@HIDDEN>
+;;; Copyright © 2024 Herman Rimm <herman@HIDDEN>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -65,6 +66,8 @@ (define-module (guix import utils)
             guix-hash-url
 
             package-names->package-inputs
+            maybe-list-field
+            maybe-packages-field
             maybe-inputs
             maybe-native-inputs
             maybe-propagated-inputs
@@ -418,39 +421,44 @@ (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)
-    (let ((name (if version (string-append input "-" version) input)))
+    (let ((symbol (string->symbol
+                    (if version
+                        (string-append input "-" version)
+                        input))))
       (if output
-          (list (string->symbol name) output)
-          (string->symbol name))))
+          (list symbol output)
+          symbol)))
 
   (map (match-lambda
          ((input version) (make-input input version))
          (input (make-input input #f)))
        names))
 
-(define* (maybe-inputs package-names #:optional (output #f)
-                       #:key (type #f))
-  "Given a list of PACKAGE-NAMES, tries to generate the 'inputs' field of a
-package definition.  TYPE can be used to specify the type of the inputs;
-either the 'native or 'propagated symbols are accepted.  Left unspecified, the
-snippet generated is for regular inputs."
-  (let ((field-name (match type
-                      ('native 'native-inputs)
-                      ('propagated 'propagated-inputs)
-                      (_ 'inputs))))
-    (match (package-names->package-inputs package-names output)
-      (()
-       '())
-      ((package-inputs ...)
-       `((,field-name (list ,@package-inputs)))))))
+(define* (maybe-list-field type body)
+  "Generates the TYPE field of a package definition if its value, BODY,
+is a non-empty list."
+  (match body
+    (() '())
+    ((? list?) (list (list type (cons 'list body))))))
+
+(define* (maybe-packages-field type package-names
+                               #:optional (output #f))
+  "Given a list of PACKAGE-NAMES, tries to generate the TYPE field of a
+package definition."
+  (maybe-list-field type
+    (package-names->package-inputs package-names output)))
+
+(define* (maybe-inputs package-names #:optional (output #f))
+  "MAYBE-PACKAGES-FIELD for inputs."
+  (maybe-packages-field 'inputs package-names output))
 
 (define* (maybe-native-inputs package-names #:optional (output #f))
-  "Same as MAYBE-INPUTS, but for native inputs."
-  (maybe-inputs package-names output #:type 'native))
+  "MAYBE-PACKAGES-FIELD for native inputs."
+  (maybe-packages-field 'native-inputs package-names output))
 
 (define* (maybe-propagated-inputs package-names #:optional (output #f))
-  "Same as MAYBE-INPUTS, but for propagated inputs."
-  (maybe-inputs package-names output #:type 'propagated))
+  "MAYBE-PACKAGES-FIELD for propagated inputs."
+  (maybe-packages-field 'propagated-inputs package-names output))
 
 (define* (package->definition guix-package #:optional append-version?/string)
   "If APPEND-VERSION?/STRING is #t, append the package's major+minor version.
-- 
2.45.2

Message sent to guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#70923] [PATCH v3 04/11] import: utils: Add 'maybe-upstream-inputs' procedure.
Resent-From: Herman Rimm <herman@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Tue, 24 Sep 2024 20:22:04 +0000
Resent-Message-ID: <handler.70923.B70923.172720929519376 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70923
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 70923 <at> debbugs.gnu.org
Received: via spool by 70923-submit <at> debbugs.gnu.org id=B70923.172720929519376
          (code B ref 70923); Tue, 24 Sep 2024 20:22:04 +0000
Received: (at 70923) by debbugs.gnu.org; 24 Sep 2024 20:21:35 +0000
Received: from localhost ([127.0.0.1]:38506 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1stC2Q-00052S-Qv
	for submit <at> debbugs.gnu.org; Tue, 24 Sep 2024 16:21:35 -0400
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:46027
 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <herman@HIDDEN>) id 1stC2E-00050O-RS
 for 70923 <at> debbugs.gnu.org; Tue, 24 Sep 2024 16:21:23 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
 t=1727208846;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc:mime-version:mime-version:
 content-transfer-encoding:content-transfer-encoding:
 in-reply-to:in-reply-to:references:references;
 bh=bwZ2NDv9IuCIBfNNduwNmOqVzTT1OA4PEArXn7ttrF8=;
 b=oILVroHZ6fRthPc7uoMzA0JTuQ/cOs9Cvj5ml6QIOjzmt3Mf6bENxrvwggzn4mfmOxLWFp
 QdnkkgpWxk5AVwPnzq/VwdQNmQxiGP67pqPxe0hRwJdBod4Wc3hp+1BGxiepxKdxR1CnmN
 Zb/dnURRKS3d/lkiUmzQ9DBLaRljBZnTnK6UmKxA3o5UV1fQh2lIvwNyA6xeOkAueVZ9IK
 DGZgNCpwsMtWYB43J470oEhaa0i4/RLXtSooDHatvJP9RvawDuoQIg85pdxq0+yz78G9ie
 VTEFJw/wiwJAkZ/VroqfvWq7ca7kNr4+Fe2Mqv+g/yyAvqPrIAdqgV8HDGufIQ==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 04374a2f
 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO)
 for <70923 <at> debbugs.gnu.org>; Tue, 24 Sep 2024 20:14:06 +0000 (UTC)
From: Herman Rimm <herman@HIDDEN>
Date: Tue, 24 Sep 2024 22:13:10 +0200
Message-ID: <3e09ff0327c2cb53598bce0f94bd39b9cb7937f7.1727207512.git.herman@HIDDEN>
X-Mailer: git-send-email 2.45.2
In-Reply-To: <cover.1727207512.git.herman@HIDDEN>
References: <cover.1727207512.git.herman@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 3.5 (+++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 Content preview: * guix/import/utils.scm (maybe-upstream-inputs): Add
 procedure.
 Change-Id: Ib8a80216d512c0373e55e4f27e1ef2a7c1fb854a --- guix/import/utils.scm
 | 9 +++++++++ 1 file changed,
 9 insertions(+) diff --git a/guix/import/utils.scm
 b/guix/import/utils.scm index 88a1db4a88..6d62b64433 100644 ---
 a/guix/import/utils.scm
 +++ b/guix/import/utils.scm @@ -45,6 +45,7 @@ (define-module (guix import
 uti [...] 
 Content analysis details:   (3.5 points, 10.0 required)
 pts rule name              description
 ---- ---------------------- --------------------------------------------------
 3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
 [81.205.150.117 listed in zen.spamhaus.org]
 0.0 TVD_RCVD_IP            Message was received from an IP address
 -0.0 SPF_PASS               SPF: sender matches SPF record
 0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 T_SCC_BODY_TEXT_LINE   No description available.
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 2.5 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 
 Content preview:  * guix/import/utils.scm (maybe-upstream-inputs): Add procedure.
    Change-Id: Ib8a80216d512c0373e55e4f27e1ef2a7c1fb854a --- guix/import/utils.scm
    | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/guix/import/utils.scm
    b/guix/import/utils.scm index 88a1db4a88..6d62b64433 100644 --- a/guix/import/utils.scm
    +++ b/guix/import/utils.scm @@ -45,6 +45,7 @@ (define-module (guix import
    uti [...] 
 
 Content analysis details:   (2.5 points, 10.0 required)
 
  pts rule name              description
 ---- ---------------------- --------------------------------------------------
  3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
                             [81.205.150.117 listed in zen.spamhaus.org]
 -0.0 SPF_PASS               SPF: sender matches SPF record
  0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 T_SCC_BODY_TEXT_LINE   No description available.
 -1.0 MAILING_LIST_MULTI     Multiple indicators imply a widely-seen list
                             manager

* guix/import/utils.scm (maybe-upstream-inputs): Add procedure.

Change-Id: Ib8a80216d512c0373e55e4f27e1ef2a7c1fb854a
---
 guix/import/utils.scm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/guix/import/utils.scm b/guix/import/utils.scm
index 88a1db4a88..6d62b64433 100644
--- a/guix/import/utils.scm
+++ b/guix/import/utils.scm
@@ -45,6 +45,7 @@ (define-module (guix import utils)
   #:use-module (guix download)
   #:use-module (guix sets)
   #:use-module ((guix ui) #:select (fill-paragraph))
+  #:use-module (guix upstream)
   #:use-module (gnu packages)
   #:autoload   (ice-9 control) (let/ec)
   #:use-module (ice-9 match)
@@ -71,6 +72,7 @@ (define-module (guix import utils)
             maybe-inputs
             maybe-native-inputs
             maybe-propagated-inputs
+            maybe-upstream-inputs
             package->definition
 
             spdx-string->license
@@ -460,6 +462,13 @@ (define* (maybe-propagated-inputs package-names #:optional (output #f))
   "MAYBE-PACKAGES-FIELD for propagated inputs."
   (maybe-packages-field 'propagated-inputs package-names output))
 
+(define* (maybe-upstream-inputs type upstream-inputs)
+  "Given a list of UPSTREAM-NAMES, tries to generate the TYPE field of a
+package definition."
+  (maybe-list-field type
+    (map (compose string->symbol upstream-input-downstream-name)
+         upstream-inputs)))
+
 (define* (package->definition guix-package #:optional append-version?/string)
   "If APPEND-VERSION?/STRING is #t, append the package's major+minor version.
 If it is the symbol 'full, append the package's complete version.  If
-- 
2.45.2

Message sent to lars@HIDDEN, marius@HIDDEN, me@HIDDEN, sharlatanus@HIDDEN, tanguy@HIDDEN, jgart@HIDDEN, guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#70923] [PATCH v3 05/11] import: pypi: Use 'maybe-list-field' procedure.
Resent-From: Herman Rimm <herman@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: lars@HIDDEN, marius@HIDDEN, me@HIDDEN, sharlatanus@HIDDEN, tanguy@HIDDEN, jgart@HIDDEN, guix-patches@HIDDEN
Resent-Date: Tue, 24 Sep 2024 20:22:05 +0000
Resent-Message-ID: <handler.70923.B70923.172720929919392 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70923
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 70923 <at> debbugs.gnu.org
Cc: Lars-Dominik Braun <lars@HIDDEN>, Marius Bakke <marius@HIDDEN>, Munyoki Kilyungi <me@HIDDEN>, Sharlatan Hellseher <sharlatanus@HIDDEN>, Tanguy Le Carrour <tanguy@HIDDEN>, jgart <jgart@HIDDEN>
X-Debbugs-Original-Xcc: Lars-Dominik Braun <lars@HIDDEN>, Marius Bakke <marius@HIDDEN>, Munyoki Kilyungi <me@HIDDEN>, Sharlatan Hellseher <sharlatanus@HIDDEN>, Tanguy Le Carrour <tanguy@HIDDEN>, jgart <jgart@HIDDEN>
Received: via spool by 70923-submit <at> debbugs.gnu.org id=B70923.172720929919392
          (code B ref 70923); Tue, 24 Sep 2024 20:22:05 +0000
Received: (at 70923) by debbugs.gnu.org; 24 Sep 2024 20:21:39 +0000
Received: from localhost ([127.0.0.1]:38508 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1stC2V-00052f-58
	for submit <at> debbugs.gnu.org; Tue, 24 Sep 2024 16:21:39 -0400
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:37373
 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <herman@HIDDEN>) id 1stC2E-00050F-TW
 for 70923 <at> debbugs.gnu.org; Tue, 24 Sep 2024 16:21:23 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
 t=1727208846;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc:mime-version:mime-version:content-type:content-type:
 content-transfer-encoding:content-transfer-encoding:
 in-reply-to:in-reply-to:references:references;
 bh=4mDVhUQiS/kTiBFbsxiWrC3jCC+6QYxmfOifyMbMUio=;
 b=bHI56Eoh1jshd4BKqOS7W/c4q6bpOIq0iNRPHXMO5uLHfGiv6ZB3MbDAx5h+uDr4nhhYk6
 auTcMQgzQD6DDf72SU/V+MqB8xYK5L8mU+I74Iy+vnzVyKIHJY54gbwH9T0kK8lXizQSRL
 KUxDTky2EymsKiy8chXlLuSI4XpisNdVsUDD9Upxz08sB5zWIuh0cY9E5NLt7o4cfq1lyX
 E/wR02BG/Ndod2/X8QulrUlqr8ssGeFY7/wOYMBETrprrp+38SX9NSjHS//rcR38+aCip+
 fPXWu0OUAI4kkFVvazZ2tkqFVyzax64OVGWlaxZ8Copuy6up/nOI1sv7/hmdCw==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id b1f56cec
 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO)
 for <70923 <at> debbugs.gnu.org>; Tue, 24 Sep 2024 20:14:06 +0000 (UTC)
From: Herman Rimm <herman@HIDDEN>
Date: Tue, 24 Sep 2024 22:13:11 +0200
Message-ID: <386fffa725214f9b75995caf3c4f9780f2ee2340.1727207512.git.herman@HIDDEN>
X-Mailer: git-send-email 2.45.2
In-Reply-To: <cover.1727207512.git.herman@HIDDEN>
References: <cover.1727207512.git.herman@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: 3.5 (+++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 Content preview: * guix/import/pypi.scm (maybe-inputs): Delete procedure.
 (make-pypi-sexp):
 Use 'maybe-list-field' and 'maybe-upstream-inputs' procedures. ---
 guix/import/pypi.scm | 21 +++++ 1 file cha [...] 
 Content analysis details:   (3.5 points, 10.0 required)
 pts rule name              description
 ---- ---------------------- --------------------------------------------------
 3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
 [81.205.150.117 listed in zen.spamhaus.org]
 0.0 TVD_RCVD_IP            Message was received from an IP address
 -0.0 SPF_PASS               SPF: sender matches SPF record
 0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 T_SCC_BODY_TEXT_LINE   No description available.
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 2.5 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 
 Content preview:  * guix/import/pypi.scm (maybe-inputs): Delete procedure. (make-pypi-sexp):
    Use 'maybe-list-field' and 'maybe-upstream-inputs' procedures. --- guix/import/pypi.scm
    | 21 +++++ 1 file cha [...] 
 
 Content analysis details:   (2.5 points, 10.0 required)
 
  pts rule name              description
 ---- ---------------------- --------------------------------------------------
  3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
                             [81.205.150.117 listed in zen.spamhaus.org]
 -0.0 SPF_PASS               SPF: sender matches SPF record
  0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 T_SCC_BODY_TEXT_LINE   No description available.
 -1.0 MAILING_LIST_MULTI     Multiple indicators imply a widely-seen list
                             manager

* guix/import/pypi.scm (maybe-inputs): Delete procedure.
(make-pypi-sexp): Use 'maybe-list-field' and 'maybe-upstream-inputs'
procedures.
---
 guix/import/pypi.scm | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm
index 7b9f54a200..a98fdfa604 100644
--- a/guix/import/pypi.scm
+++ b/guix/import/pypi.scm
@@ -14,6 +14,7 @@
 ;;; Copyright © 2022 Vivien Kraus <vivien@HIDDEN>
 ;;; Copyright © 2021 Simon Tournier <zimon.toutoune@HIDDEN>
 ;;; Copyright © 2022 Hartmut Goebel <h.goebel@HIDDEN>
+;;; Copyright © 2024 Herman Rimm <herman@HIDDEN>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -201,18 +202,6 @@ (define (wheel-url->extracted-directory wheel-url)
     ((name version _ ...)
      (string-append name "-" version ".dist-info"))))
 
-(define (maybe-inputs package-inputs input-type)
-  "Given a list of PACKAGE-INPUTS, tries to generate the 'inputs' field of a
-package definition.  INPUT-TYPE, a symbol, is used to populate the name of
-the input field."
-  (match package-inputs
-    (()
-     '())
-    ((package-inputs ...)
-     `((,input-type (list ,@(map (compose string->symbol
-                                          upstream-input-downstream-name)
-                                 package-inputs)))))))
-
 (define %requirement-name-regexp
   ;; Regexp to match the requirement name in a requirement specification.
 
@@ -538,10 +527,10 @@ (define* (make-pypi-sexp pypi-package
                             bytevector->nix-base32-string)))))
         ,@(maybe-upstream-name name)
         (build-system pyproject-build-system)
-        ,@(maybe-inputs (upstream-source-propagated-inputs source)
-                        'propagated-inputs)
-        ,@(maybe-inputs (upstream-source-native-inputs source)
-                        'native-inputs)
+        ,@(maybe-upstream-inputs 'propagated-inputs
+            (upstream-source-propagated-inputs source))
+        ,@(maybe-upstream-inputs 'native-inputs
+            (upstream-source-native-inputs source))
         (home-page ,(project-info-home-page info))
         (synopsis ,(project-info-summary info))
         (description ,(and=> (non-empty-string-or-false
-- 
2.45.2

Message sent to andrew@HIDDEN, cox.katherine.e+guix@HIDDEN, liliana.prikler@HIDDEN, guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#70923] [PATCH v3 06/11] import: elpa: Use maybe-propagated-inputs procedure.
Resent-From: Herman Rimm <herman@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: andrew@HIDDEN, cox.katherine.e+guix@HIDDEN, liliana.prikler@HIDDEN, guix-patches@HIDDEN
Resent-Date: Tue, 24 Sep 2024 20:22:05 +0000
Resent-Message-ID: <handler.70923.B70923.172720930019399 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70923
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 70923 <at> debbugs.gnu.org
Cc: Andrew Tropin <andrew@HIDDEN>, Katherine Cox-Buday <cox.katherine.e+guix@HIDDEN>, Liliana Marie Prikler <liliana.prikler@HIDDEN>
X-Debbugs-Original-Xcc: Andrew Tropin <andrew@HIDDEN>, Katherine Cox-Buday <cox.katherine.e+guix@HIDDEN>, Liliana Marie Prikler <liliana.prikler@HIDDEN>
Received: via spool by 70923-submit <at> debbugs.gnu.org id=B70923.172720930019399
          (code B ref 70923); Tue, 24 Sep 2024 20:22:05 +0000
Received: (at 70923) by debbugs.gnu.org; 24 Sep 2024 20:21:40 +0000
Received: from localhost ([127.0.0.1]:38510 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1stC2V-00052j-N6
	for submit <at> debbugs.gnu.org; Tue, 24 Sep 2024 16:21:39 -0400
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:46027
 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <herman@HIDDEN>) id 1stC2F-00050O-MO
 for 70923 <at> debbugs.gnu.org; Tue, 24 Sep 2024 16:21:24 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
 t=1727208847;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc:mime-version:mime-version:
 content-transfer-encoding:content-transfer-encoding:
 in-reply-to:in-reply-to:references:references;
 bh=UclAUoKx8KFBtJItdylumB2m7pEbRhbwnbdV7dy+JQo=;
 b=FKApJPubc8Q9xcT6M0xon8tipdDcuchxJ2dxRSxZSvA2fTp/DQUzh+XR0+RdrZUE9cvpqQ
 sgEWirJCwFEMsVbFKeAZj5jGCoW7J+WBKadEedsaR7LvNe7JJdI0BFzmDdDm8rKMupC0+H
 rUvN9kfjeb/ubsrPmg+10qh9r5fgpsI9w7sJTunvrtJbFDrmFMJvVrh1tnK7gfuYzGsqom
 0s5rnrQFRxgtICr1L7fQk21us2IXrqLCuaPMYeu9TxK5KlR+vUOCGntHRt9LJQSDGaWAtc
 rvhuexmME1uUOMyiwiPVwRaux38alRHkd51SA4ingQy0bZ34q/KNB/RrSweajw==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 7e5fa0c1
 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO)
 for <70923 <at> debbugs.gnu.org>; Tue, 24 Sep 2024 20:14:07 +0000 (UTC)
From: Herman Rimm <herman@HIDDEN>
Date: Tue, 24 Sep 2024 22:13:12 +0200
Message-ID: <251731aef2570f6caa96044b760a77dd97a1f336.1727207512.git.herman@HIDDEN>
X-Mailer: git-send-email 2.45.2
In-Reply-To: <cover.1727207512.git.herman@HIDDEN>
References: <cover.1727207512.git.herman@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 3.5 (+++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 Content preview: * guix/import/elpa.scm (maybe-inputs): Delete procedure.
 (elpa-package->sexp):
 Use maybe-propagated-inputs procedure. Change-Id:
 I9b40e9d387311f5dbbb079938733bf945a1a6ee6
 --- guix/import/elpa.scm | 9 +-------- 1 file changed, 1 insertion(+), 8
 deletions(-) 
 Content analysis details:   (3.5 points, 10.0 required)
 pts rule name              description
 ---- ---------------------- --------------------------------------------------
 3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
 [81.205.150.117 listed in zen.spamhaus.org]
 0.0 TVD_RCVD_IP            Message was received from an IP address
 -0.0 SPF_PASS               SPF: sender matches SPF record
 0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 T_SCC_BODY_TEXT_LINE   No description available.
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 2.5 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 
 Content preview:  * guix/import/elpa.scm (maybe-inputs): Delete procedure. (elpa-package->sexp):
    Use maybe-propagated-inputs procedure. Change-Id: I9b40e9d387311f5dbbb079938733bf945a1a6ee6
    --- guix/import/elpa.scm | 9 +-------- 1 file changed, 1 insertion(+), 8
   deletions(-) 
 
 Content analysis details:   (2.5 points, 10.0 required)
 
  pts rule name              description
 ---- ---------------------- --------------------------------------------------
  3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
                             [81.205.150.117 listed in zen.spamhaus.org]
 -0.0 SPF_PASS               SPF: sender matches SPF record
  0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 T_SCC_BODY_TEXT_LINE   No description available.
 -1.0 MAILING_LIST_MULTI     Multiple indicators imply a widely-seen list
                             manager

* guix/import/elpa.scm (maybe-inputs): Delete procedure.
(elpa-package->sexp): Use maybe-propagated-inputs procedure.

Change-Id: I9b40e9d387311f5dbbb079938733bf945a1a6ee6
---
 guix/import/elpa.scm | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/guix/import/elpa.scm b/guix/import/elpa.scm
index 46b6dc98a2..9ade189a8a 100644
--- a/guix/import/elpa.scm
+++ b/guix/import/elpa.scm
@@ -359,13 +359,6 @@ (define* (elpa-package->sexp pkg #:optional license repo)
     (map (compose string->symbol elpa-name->package-name)
          dependencies-names))
 
-  (define (maybe-inputs input-type inputs)
-    (match inputs
-      (()
-       '())
-      ((inputs ...)
-       (list (list input-type `(list ,@inputs))))))
-
   (define melpa-source
     (melpa-recipe->origin melpa-recipe))
 
@@ -386,7 +379,7 @@ (define* (elpa-package->sexp pkg #:optional license repo)
                                 (file-hash* tarball #:recursive? #false))
                                "failed to download package")))))))
       (build-system emacs-build-system)
-      ,@(maybe-inputs 'propagated-inputs dependencies)
+      ,@(maybe-propagated-inputs dependencies)
       ,@(if melpa-source
             (melpa-recipe->maybe-arguments melpa-recipe)
             '())
-- 
2.45.2

Message sent to laurent.gatto@HIDDEN, rekado@HIDDEN, zimon.toutoune@HIDDEN, guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#70923] [PATCH v3 08/11] import: cran: Use 'maybe-list-field' procedure.
Resent-From: Herman Rimm <herman@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: laurent.gatto@HIDDEN, rekado@HIDDEN, zimon.toutoune@HIDDEN, guix-patches@HIDDEN
Resent-Date: Tue, 24 Sep 2024 20:22:06 +0000
Resent-Message-ID: <handler.70923.B70923.172720930019407 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70923
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 70923 <at> debbugs.gnu.org
Cc: Laurent Gatto <laurent.gatto@HIDDEN>, Ricardo Wurmus <rekado@HIDDEN>, Simon Tournier <zimon.toutoune@HIDDEN>
X-Debbugs-Original-Xcc: Laurent Gatto <laurent.gatto@HIDDEN>, Ricardo Wurmus <rekado@HIDDEN>, Simon Tournier <zimon.toutoune@HIDDEN>
Received: via spool by 70923-submit <at> debbugs.gnu.org id=B70923.172720930019407
          (code B ref 70923); Tue, 24 Sep 2024 20:22:06 +0000
Received: (at 70923) by debbugs.gnu.org; 24 Sep 2024 20:21:40 +0000
Received: from localhost ([127.0.0.1]:38512 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1stC2W-00052q-1F
	for submit <at> debbugs.gnu.org; Tue, 24 Sep 2024 16:21:40 -0400
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:37373
 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <herman@HIDDEN>) id 1stC2G-00050F-2x
 for 70923 <at> debbugs.gnu.org; Tue, 24 Sep 2024 16:21:24 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
 t=1727208848;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc:mime-version:mime-version:content-type:content-type:
 content-transfer-encoding:content-transfer-encoding:
 in-reply-to:in-reply-to:references:references;
 bh=wJ6dOQ9TXf0jcitHGpVL5Dy+F+nbHc5iyfWGbro6toY=;
 b=IE3bJFShcdYCNvD35vZZxYsT8e/GEW5/sV6SzQFZizxUSwm3ejNUbPKDmBIV6QnxGTcOXv
 BKzylEXGR2YFk5CBzFF7uQ9jmquiBhSSz6iQZI6Ts9nPB9SDBYjjqzMyrqD2YuDdzm27o1
 z9LfeMgm8KXdiQr9wZiafC4q4Y5OuggclbNclWaOz9o0ZszNxfHKKONlgmi91XCNJq+VAG
 PcA4zVzkyolaQH00yoO83WCR6lIAG6PcTSImYZywpULcNS0XBfoTB78qraq08zq8NkGlsD
 rZUX+kZO7Qc2XcYaTKc04zN75F6y+ezSu/9agX1KBknL0ojv5+tOXa4p6+PO+A==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 8bebb0f6
 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO)
 for <70923 <at> debbugs.gnu.org>; Tue, 24 Sep 2024 20:14:08 +0000 (UTC)
From: Herman Rimm <herman@HIDDEN>
Date: Tue, 24 Sep 2024 22:13:14 +0200
Message-ID: <c07cec66e016bc360978425f9aeb0974077e3140.1727207512.git.herman@HIDDEN>
X-Mailer: git-send-email 2.45.2
In-Reply-To: <cover.1727207512.git.herman@HIDDEN>
References: <cover.1727207512.git.herman@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: 3.5 (+++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 Content preview:  * guix/import/cran.scm (format-inputs): Delete procedure.
 (maybe-inputs): Use 'maybe-list-field' procedure. Change-Id:
 I5148afcebdac1f7fa0f8cce9e82e8cebb56c36c8
 --- guix/import/cran.scm | 36 ++++++++++++++++ 1 file changed, 16 insertions(+),
 20 deletions(-) 
 Content analysis details:   (3.5 points, 10.0 required)
 pts rule name              description
 ---- ---------------------- --------------------------------------------------
 3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
 [81.205.150.117 listed in zen.spamhaus.org]
 0.0 TVD_RCVD_IP            Message was received from an IP address
 -0.0 SPF_PASS               SPF: sender matches SPF record
 0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 T_SCC_BODY_TEXT_LINE   No description available.
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 2.5 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 
 Content preview:  * guix/import/cran.scm (format-inputs): Delete procedure.
   (maybe-inputs): Use 'maybe-list-field' procedure. Change-Id: I5148afcebdac1f7fa0f8cce9e82e8cebb56c36c8
    --- guix/import/cran.scm | 36 ++++++++++++++++ 1 file changed, 16 insertions(+),
    20 deletions(-) 
 
 Content analysis details:   (2.5 points, 10.0 required)
 
  pts rule name              description
 ---- ---------------------- --------------------------------------------------
  3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
                             [81.205.150.117 listed in zen.spamhaus.org]
 -0.0 SPF_PASS               SPF: sender matches SPF record
  0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 T_SCC_BODY_TEXT_LINE   No description available.
 -1.0 MAILING_LIST_MULTI     Multiple indicators imply a widely-seen list
                             manager

* guix/import/cran.scm (format-inputs): Delete procedure.
(maybe-inputs): Use 'maybe-list-field' procedure.

Change-Id: I5148afcebdac1f7fa0f8cce9e82e8cebb56c36c8
---
 guix/import/cran.scm | 36 ++++++++++++++++--------------------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/guix/import/cran.scm b/guix/import/cran.scm
index 6ae00cae96..bdac059053 100644
--- a/guix/import/cran.scm
+++ b/guix/import/cran.scm
@@ -6,6 +6,7 @@
 ;;; Copyright © 2021 Sarah Morgensen <iskarian@HIDDEN>
 ;;; Copyright © 2021 Simon Tournier <zimon.toutoune@HIDDEN>
 ;;; Copyright © 2022 Hartmut Goebel <h.goebel@HIDDEN>
+;;; Copyright © 2024 Herman Rimm <herman@HIDDEN>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -85,21 +86,6 @@ (define-module (guix import cran)
 (define %input-style
   (make-parameter 'variable)) ; or 'specification
 
-(define (format-inputs inputs)
-  "Generate a sorted list of package inputs from a list of upstream inputs."
-  (map (lambda (input)
-         (case (%input-style)
-           ((specification)
-            `(specification->package ,(upstream-input-downstream-name input)))
-           (else
-            ((compose string->symbol
-                       upstream-input-downstream-name)
-             input))))
-       (sort inputs
-             (lambda (a b)
-               (string-ci<? (upstream-input-name a)
-                            (upstream-input-name b))))))
-
 (define (string->licenses license-string license-prefix)
   (let ((licenses
          (map string-trim-both
@@ -188,11 +174,21 @@ (define (description->alist description)
 (define* (maybe-inputs package-inputs #:optional (input-type 'inputs))
   "Given a list of PACKAGE-INPUTS, tries to generate the TYPE field of a
 package definition."
-  (match package-inputs
-    (()
-     '())
-    ((package-inputs ...)
-     `((,input-type (list ,@(format-inputs package-inputs)))))))
+  (define (format-input input)
+    (case (%input-style)
+      ((specification)
+       `(specification->package ,(upstream-input-downstream-name input)))
+      (else
+       ((compose string->symbol
+                  upstream-input-downstream-name)
+        input))))
+
+  (define (upstream-input-name<? i1 i2)
+    (string-ci<? (upstream-input-name i1)
+                 (upstream-input-name i2)))
+
+  (maybe-list-field input-type
+    (map format-input (sort package-inputs upstream-input-name<?))))
 
 (define %cran-url "https://cloud.r-project.org/web/packages/")
 (define %cran-canonical-url "https://cran.r-project.org/package=")
-- 
2.45.2

Message sent to lars@HIDDEN, guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#70923] [PATCH v3 07/11] import: hackage: Use 'maybe-list-field' procedure.
Resent-From: Herman Rimm <herman@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: lars@HIDDEN, guix-patches@HIDDEN
Resent-Date: Tue, 24 Sep 2024 20:22:06 +0000
Resent-Message-ID: <handler.70923.B70923.172720930119414 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70923
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 70923 <at> debbugs.gnu.org
Cc: Lars-Dominik Braun <lars@HIDDEN>
X-Debbugs-Original-Xcc: Lars-Dominik Braun <lars@HIDDEN>
Received: via spool by 70923-submit <at> debbugs.gnu.org id=B70923.172720930119414
          (code B ref 70923); Tue, 24 Sep 2024 20:22:06 +0000
Received: (at 70923) by debbugs.gnu.org; 24 Sep 2024 20:21:41 +0000
Received: from localhost ([127.0.0.1]:38514 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1stC2W-00052y-Jr
	for submit <at> debbugs.gnu.org; Tue, 24 Sep 2024 16:21:41 -0400
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:46027
 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <herman@HIDDEN>) id 1stC2G-00050O-Qs
 for 70923 <at> debbugs.gnu.org; Tue, 24 Sep 2024 16:21:25 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
 t=1727208848;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc:mime-version:mime-version:content-type:content-type:
 content-transfer-encoding:content-transfer-encoding:
 in-reply-to:in-reply-to:references:references;
 bh=dlBIGYu7E2jdqyAbbokT6hcWccFWlrSC5x5u0LmTyp4=;
 b=klnretGRuhrvtne6g4GxxeXD2aKItwitFTleL5qrKcwMbrXyTwmx/hsjLv3ZN+zs9yNSGm
 0Y7ELrPyNji5H0ool+ZEaUZvdkPNBHC89RjklFnhvr/F3WLabC9ruKDJ9KuLQ0X/gqMvH+
 6j1cZBfDlK8/eu+zlIyXtCLkYmHLn7B1TJ8DAiQ/JaJD7FGbr8dyLnznOiyYXJH6IOu3w/
 tu0Nl3obhVRpzRx6GdoeR5Hcva37nt4PC4VN2LtZthhTZkR61Ts/7M+uASBo+IjWZs1az2
 0ORPipatAH6Bciuutcy4pDuTjv9V5HdnTWX3oot+QT9JNQoDb0tKtzgwqbazBw==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id c97d0f43
 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO)
 for <70923 <at> debbugs.gnu.org>; Tue, 24 Sep 2024 20:14:08 +0000 (UTC)
From: Herman Rimm <herman@HIDDEN>
Date: Tue, 24 Sep 2024 22:13:13 +0200
Message-ID: <1bc3fa4669d55efc9bf5c7fdf97efc39b03fab23.1727207512.git.herman@HIDDEN>
X-Mailer: git-send-email 2.45.2
In-Reply-To: <cover.1727207512.git.herman@HIDDEN>
References: <cover.1727207512.git.herman@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: 3.5 (+++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 Content preview:  * guix/import/hackage.scm (maybe-inputs, maybe-arguments):
 Delete procedures. (hackage-module->sexp): Use 'maybe-list-field' and
 'maybe-upstream-inputs'
 procedures. * tests/hackage.scm: Fix whitespace [...] 
 Content analysis details:   (3.5 points, 10.0 required)
 pts rule name              description
 ---- ---------------------- --------------------------------------------------
 3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
 [81.205.150.117 listed in zen.spamhaus.org]
 0.0 TVD_RCVD_IP            Message was received from an IP address
 -0.0 SPF_PASS               SPF: sender matches SPF record
 0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 T_SCC_BODY_TEXT_LINE   No description available.
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 2.5 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 
 Content preview:  * guix/import/hackage.scm (maybe-inputs, maybe-arguments):
    Delete procedures. (hackage-module->sexp): Use 'maybe-list-field' and 'maybe-upstream-inputs'
    procedures. * tests/hackage.scm: Fix whitespace [...] 
 
 Content analysis details:   (2.5 points, 10.0 required)
 
  pts rule name              description
 ---- ---------------------- --------------------------------------------------
  3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
                             [81.205.150.117 listed in zen.spamhaus.org]
 -0.0 SPF_PASS               SPF: sender matches SPF record
  0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 T_SCC_BODY_TEXT_LINE   No description available.
 -1.0 MAILING_LIST_MULTI     Multiple indicators imply a widely-seen list
                             manager

* guix/import/hackage.scm (maybe-inputs, maybe-arguments): Delete
procedures.
(hackage-module->sexp): Use 'maybe-list-field' and
'maybe-upstream-inputs' procedures.
* tests/hackage.scm: Fix whitespace and replace 'quasiquote' with
'list'.

Change-Id: I4fe39ff84c9f6a677f810d9e4fe751d762973757
---
 guix/import/hackage.scm | 39 ++++++++++++---------------------------
 tests/hackage.scm       | 13 +++++++------
 2 files changed, 19 insertions(+), 33 deletions(-)

diff --git a/guix/import/hackage.scm b/guix/import/hackage.scm
index 79a51d3300..bd3bed146e 100644
--- a/guix/import/hackage.scm
+++ b/guix/import/hackage.scm
@@ -9,6 +9,7 @@
 ;;; Copyright © 2019 Simon Tournier <zimon.toutoune@HIDDEN>
 ;;; Copyright © 2022 Hartmut Goebel <h.goebel@HIDDEN>
 ;;; Copyright © 2023-2024 Ludovic Courtès <ludo@HIDDEN>
+;;; Copyright © 2024 Herman Rimm <herman@HIDDEN>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -288,26 +289,6 @@ (define* (hackage-module->sexp cabal cabal-hash
                           #:include-test-dependencies?
                           include-test-dependencies?))
 
-  (define (maybe-inputs input-type inputs)
-    (match inputs
-      (()
-       '())
-      ((inputs ...)
-       (list (list input-type
-                   `(list ,@(map (compose string->symbol
-                                          upstream-input-downstream-name)
-                                 inputs)))))))
-
-  (define (maybe-arguments)
-    (match (append (if (not include-test-dependencies?)
-                       '(#:tests? #f)
-                       '())
-                   (if (not (string-null? revision))
-                       `(#:cabal-revision (,revision ,cabal-hash))
-                       '()))
-      (() '())
-      (args `((arguments (,'quasiquote ,args))))))
-
   (let ((tarball (with-store store
                    (download-to-store store source-url))))
     (values
@@ -324,13 +305,17 @@ (define* (hackage-module->sexp cabal cabal-hash
                          "failed to download tar archive")))))
         (build-system haskell-build-system)
         (properties '((upstream-name . ,name)))
-        ,@(maybe-inputs 'inputs
-                        (filter (upstream-input-type-predicate 'regular)
-                                inputs))
-        ,@(maybe-inputs 'native-inputs
-                        (filter (upstream-input-type-predicate 'native)
-                                inputs))
-        ,@(maybe-arguments)
+        ,@(maybe-upstream-inputs 'inputs
+            (filter (upstream-input-type-predicate 'regular) inputs))
+        ,@(maybe-upstream-inputs 'native-inputs
+            (filter (upstream-input-type-predicate 'native) inputs))
+        ,@(maybe-list-field 'arguments
+            (append (if (not include-test-dependencies?)
+                        '(#:tests? #f)
+                        '())
+                    (if (not (string-null? revision))
+                        `(#:cabal-revision '(,revision ,cabal-hash))
+                        '())))
         (home-page ,(cabal-package-home-page cabal))
         (synopsis ,(cabal-package-synopsis cabal))
         (description ,(beautify-description (cabal-package-description cabal)))
diff --git a/tests/hackage.scm b/tests/hackage.scm
index 403f587c41..f6d91515e2 100644
--- a/tests/hackage.scm
+++ b/tests/hackage.scm
@@ -67,7 +67,7 @@ (define test-cabal-3
   if impl(ghc>=7.2&&<7.6)
     Build-depends: ghc-b
   if impl(ghc == 7.8)
-    Build-depends: 
+    Build-depends:
       HTTP       >= 4000.2.5 && < 4000.3,
       mtl        >= 2.0      && < 3
 ")
@@ -86,7 +86,7 @@ (define test-cabal-4
   if impl(ghc>=7.2&&<7.6)
     Build-depends: ghc-b
   if impl(ghc == 7.8)
-    Build-depends: 
+    Build-depends:
       HTTP       >= 4000.2.5 && < 4000.3,
       mtl        >= 2.0      && < 3
 ")
@@ -101,7 +101,7 @@ (define test-cabal-5
 license: BSD3
 library
   if impl(ghc == 7.8)
-    Build-depends: 
+    Build-depends:
       HTTP       >= 4000.2.5 && < 4000.3,
   if impl(ghc -any)
     Build-depends: mtl        >= 2.0      && < 3
@@ -126,7 +126,7 @@ (define test-cabal-6
   if impl(ghc>=7.2&&<7.6)
     Build-depends: ghc-b
   if impl(ghc == 7.8)
-    Build-depends: 
+    Build-depends:
       HTTP       >= 4000.2.5 && < 4000.3,
       mtl        >= 2.0      && < 3
 ")
@@ -524,8 +524,9 @@ (define-package-matcher match-ghc-foo-revision
     ('properties '(quote ((upstream-name . "foo"))))
     ('inputs ('list 'ghc-http))
     ('arguments
-     ('quasiquote
-      ('#:cabal-revision
+     ('list
+      '#:cabal-revision
+      ('quote
        ("2" "0xxd88fb659f0krljidbvvmkh9ppjnx83j0nqzx8whcg4n5qbyng"))))
     ('home-page "http://test.org")
     ('synopsis (? string?))
-- 
2.45.2

Message sent to guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#70923] [PATCH v3 09/11] import: cpan: Use 'maybe-upstream-inputs' procedure.
Resent-From: Herman Rimm <herman@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Tue, 24 Sep 2024 20:22:07 +0000
Resent-Message-ID: <handler.70923.B70923.172720930119422 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70923
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 70923 <at> debbugs.gnu.org
Received: via spool by 70923-submit <at> debbugs.gnu.org id=B70923.172720930119422
          (code B ref 70923); Tue, 24 Sep 2024 20:22:07 +0000
Received: (at 70923) by debbugs.gnu.org; 24 Sep 2024 20:21:41 +0000
Received: from localhost ([127.0.0.1]:38516 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1stC2X-000535-4Z
	for submit <at> debbugs.gnu.org; Tue, 24 Sep 2024 16:21:41 -0400
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:37373
 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <herman@HIDDEN>) id 1stC2H-00050F-8H
 for 70923 <at> debbugs.gnu.org; Tue, 24 Sep 2024 16:21:26 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
 t=1727208849;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc:mime-version:mime-version:content-type:content-type:
 content-transfer-encoding:content-transfer-encoding:
 in-reply-to:in-reply-to:references:references;
 bh=B55v1uxYlYKoU4ZUaomkSGCoc+WRrqq9U3l4wmyQcXo=;
 b=K7xG4Syj5StyzBvRBU40nMC2ui9eRcsEwKSqCiNm6v34OZkG0TS9R7vgWDE/lnoTOUaGXt
 jspVUOdor4Lbw0UW4ewNi6dNOGHScyz4eq9v+xNE3l0atJR6Uaaj/s69eveGAB4vp4RCvj
 CD8eyF/3ZGAruc2WhIw9D8PhCylEfOo7WHJmXW9YLMdWTJrctmu1eIQ6SGxQWWPGxKjT3o
 3pjTP20RFOjd5IgjhNbsFRD2ufjA7hGUh5b+tdgxvSsq5qVLl9K5HurUvvE1aqIEjIZ0zD
 Jmm8zFrI79kp3kFxxfCB17Sa8LwmAPa2PWRXdBHJq/igAdfA+NKqYJyvYON2hg==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 576da104
 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO)
 for <70923 <at> debbugs.gnu.org>; Tue, 24 Sep 2024 20:14:09 +0000 (UTC)
From: Herman Rimm <herman@HIDDEN>
Date: Tue, 24 Sep 2024 22:13:15 +0200
Message-ID: <bce53aae8d24b2df015c481a4fb6ab76d70f68b4.1727207512.git.herman@HIDDEN>
X-Mailer: git-send-email 2.45.2
In-Reply-To: <cover.1727207512.git.herman@HIDDEN>
References: <cover.1727207512.git.herman@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: 3.5 (+++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 Content preview: * guix/import/cpan.scm (maybe-inputs): Delete procedure.
 (cpan-module->sexp):
 Use 'maybe-upstream-inputs' procedure. Change-Id:
 I4fa99da62d81f02c2998ad96f5ea81e27df071cd
 --- guix/import/cpan.scm | 23 +++++++ 1 file changed, 7 insertions(+), 16
 deletions(-) 
 Content analysis details:   (3.5 points, 10.0 required)
 pts rule name              description
 ---- ---------------------- --------------------------------------------------
 3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
 [81.205.150.117 listed in zen.spamhaus.org]
 0.0 TVD_RCVD_IP            Message was received from an IP address
 -0.0 SPF_PASS               SPF: sender matches SPF record
 0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 T_SCC_BODY_TEXT_LINE   No description available.
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 2.5 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 
 Content preview:  * guix/import/cpan.scm (maybe-inputs): Delete procedure. (cpan-module->sexp):
    Use 'maybe-upstream-inputs' procedure. Change-Id: I4fa99da62d81f02c2998ad96f5ea81e27df071cd
    --- guix/import/cpan.scm | 23 +++++++ 1 file changed, 7 insertions(+), 16
    deletions(-) 
 
 Content analysis details:   (2.5 points, 10.0 required)
 
  pts rule name              description
 ---- ---------------------- --------------------------------------------------
  3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
                             [81.205.150.117 listed in zen.spamhaus.org]
 -0.0 SPF_PASS               SPF: sender matches SPF record
  0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 T_SCC_BODY_TEXT_LINE   No description available.
 -1.0 MAILING_LIST_MULTI     Multiple indicators imply a widely-seen list
                             manager

* guix/import/cpan.scm (maybe-inputs): Delete procedure.
(cpan-module->sexp): Use 'maybe-upstream-inputs' procedure.

Change-Id: I4fa99da62d81f02c2998ad96f5ea81e27df071cd
---
 guix/import/cpan.scm | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/guix/import/cpan.scm b/guix/import/cpan.scm
index b87736eef6..611ea63eba 100644
--- a/guix/import/cpan.scm
+++ b/guix/import/cpan.scm
@@ -5,6 +5,7 @@
 ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@HIDDEN>
 ;;; Copyright © 2020, 2021, 2023 Ludovic Courtès <ludo@HIDDEN>
 ;;; Copyright © 2022 Hartmut Goebel <h.goebel@HIDDEN>
+;;; Copyright © 2024 Herman Rimm <herman@HIDDEN>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -37,7 +38,8 @@ (define-module (guix import cpan)
   #:use-module (guix utils)
   #:use-module (guix base32)
   #:use-module ((guix download) #:select (download-to-store url-fetch))
-  #:use-module ((guix import utils) #:select (factorize-uri))
+  #:use-module ((guix import utils) #:select (factorize-uri
+                                              maybe-upstream-inputs))
   #:use-module (guix import json)
   #:use-module (guix packages)
   #:use-module (guix upstream)
@@ -275,15 +277,6 @@ (define (cpan-module->sexp release)
   (define version (cpan-release-version release))
   (define source-url (cpan-source-url release))
 
-  (define (maybe-inputs input-type inputs)
-    (match inputs
-      (()
-       '())
-      ((inputs ...)
-       `((,input-type (list ,@(map (compose string->symbol
-                                            upstream-input-downstream-name)
-                                   inputs)))))))
-
   (let ((tarball (with-store store
                    (download-to-store store source-url)))
         (inputs (cpan-module-inputs release)))
@@ -297,12 +290,10 @@ (define (cpan-module->sexp release)
                   (base32
                    ,(bytevector->nix-base32-string (file-sha256 tarball))))))
        (build-system perl-build-system)
-       ,@(maybe-inputs 'native-inputs
-                       (filter (upstream-input-type-predicate 'native)
-                               inputs))
-       ,@(maybe-inputs 'propagated-inputs
-                       (filter (upstream-input-type-predicate 'propagated)
-                               inputs))
+       ,@(maybe-upstream-inputs 'native-inputs
+           (filter (upstream-input-type-predicate 'native) inputs))
+       ,@(maybe-upstream-inputs 'propagated-inputs
+           (filter (upstream-input-type-predicate 'propagated) inputs))
        (home-page ,(cpan-home name))
        (synopsis ,(cpan-release-abstract release))
        (description fill-in-yourself!)
-- 
2.45.2

Message sent to guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#70923] [PATCH v3 10/11] import: egg: Use maybe-*inputs procedures.
Resent-From: Herman Rimm <herman@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Tue, 24 Sep 2024 20:22:07 +0000
Resent-Message-ID: <handler.70923.B70923.172720930219429 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70923
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 70923 <at> debbugs.gnu.org
Received: via spool by 70923-submit <at> debbugs.gnu.org id=B70923.172720930219429
          (code B ref 70923); Tue, 24 Sep 2024 20:22:07 +0000
Received: (at 70923) by debbugs.gnu.org; 24 Sep 2024 20:21:42 +0000
Received: from localhost ([127.0.0.1]:38518 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1stC2X-00053D-Pb
	for submit <at> debbugs.gnu.org; Tue, 24 Sep 2024 16:21:42 -0400
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:46027
 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <herman@HIDDEN>) id 1stC2I-00050O-2s
 for 70923 <at> debbugs.gnu.org; Tue, 24 Sep 2024 16:21:27 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
 t=1727208849;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc:mime-version:mime-version:content-type:content-type:
 content-transfer-encoding:content-transfer-encoding:
 in-reply-to:in-reply-to:references:references;
 bh=XgKaiBbrkegb86oywPNncySntyWL1aTaSE3fR+S3DnA=;
 b=UZj6L+a+/heVkrUQvqJ7rhrdMD9SWfykF3fqlaFgyJy1gDhuqUsW3970V5avQlsDx7W1UP
 f3jsoZWvsIq8rQSMgOJuOYbr5xS4iDabH77QCC12uiHUg3433xyKqUhINGALIsOdpA+UBZ
 HmaA09qqxjcjXFrWs0EsGpkYkk+Q93xb4uF5cozkjbzPovwkLtgR9H3oGq8hAmxTZxvoTI
 6OmyfOAA/CVLAlS5No/bCZZXBWL7TU33nVYtjnNyFSzdtzgIGhhsY2S+4BQflJToQox6Im
 jo1jpEJE3p0j3IQUDDE/fEwJ9dojF/zyIysiiGxE90I4iZtOkPAcTf3UBcV/vg==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id df04a8e7
 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO)
 for <70923 <at> debbugs.gnu.org>; Tue, 24 Sep 2024 20:14:09 +0000 (UTC)
From: Herman Rimm <herman@HIDDEN>
Date: Tue, 24 Sep 2024 22:13:16 +0200
Message-ID: <4bb46928e59df2b38889d6f82c60bd08419d9605.1727207512.git.herman@HIDDEN>
X-Mailer: git-send-email 2.45.2
In-Reply-To: <cover.1727207512.git.herman@HIDDEN>
References: <cover.1727207512.git.herman@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: 3.5 (+++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 Content preview: * guix/import/egg.scm (maybe-inputs): Delete procedure.
 (egg-parse-dependency):
 Simplify procedure to return strings. (egg->guix-package): Use maybe-*inputs
 procedures. Change-Id: Ib0a3f5b6f02912c847defd02ba7675d80005279b ---
 guix/import/egg.scm
 | 39 +++++++++++ 1 file changed, 11 insertions(+), 28 deletions(-) 
 Content analysis details:   (3.5 points, 10.0 required)
 pts rule name              description
 ---- ---------------------- --------------------------------------------------
 3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
 [81.205.150.117 listed in zen.spamhaus.org]
 0.0 TVD_RCVD_IP            Message was received from an IP address
 -0.0 SPF_PASS               SPF: sender matches SPF record
 0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 T_SCC_BODY_TEXT_LINE   No description available.
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 2.5 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 
 Content preview:  * guix/import/egg.scm (maybe-inputs): Delete procedure. (egg-parse-dependency):
    Simplify procedure to return strings. (egg->guix-package): Use maybe-*inputs
    procedures. Change-Id: Ib0a3f5b6f02912c847defd02ba7675d80005279b --- guix/import/egg.scm
    | 39 +++++++++++ 1 file changed, 11 insertions(+), 28 deletions(-) 
 
 Content analysis details:   (2.5 points, 10.0 required)
 
  pts rule name              description
 ---- ---------------------- --------------------------------------------------
  3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
                             [81.205.150.117 listed in zen.spamhaus.org]
 -0.0 SPF_PASS               SPF: sender matches SPF record
  0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 T_SCC_BODY_TEXT_LINE   No description available.
 -1.0 MAILING_LIST_MULTI     Multiple indicators imply a widely-seen list
                             manager

* guix/import/egg.scm (maybe-inputs): Delete procedure.
(egg-parse-dependency): Simplify procedure to return strings.
(egg->guix-package): Use maybe-*inputs procedures.

Change-Id: Ib0a3f5b6f02912c847defd02ba7675d80005279b
---
 guix/import/egg.scm | 39 +++++++++++----------------------------
 1 file changed, 11 insertions(+), 28 deletions(-)

diff --git a/guix/import/egg.scm b/guix/import/egg.scm
index e3bc158475..97d09a7c9d 100644
--- a/guix/import/egg.scm
+++ b/guix/import/egg.scm
@@ -3,6 +3,7 @@
 ;;; Copyright © 2021 Tobias Geerinckx-Rice <me@HIDDEN>
 ;;; Copyright © 2021 Sarah Morgensen <iskarian@HIDDEN>
 ;;; Copyright © 2022 Hartmut Goebel <h.goebel@HIDDEN>
+;;; Copyright © 2024 Herman Rimm <herman@HIDDEN>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -229,23 +230,14 @@ (define* (egg->guix-package name version #:key (file #f) (source #f)
                           (else char)))
                       (maybe-symbol->string name)))
 
-        (define* (egg-parse-dependency name #:key (system? #f))
-          (define extract-name
-            (match-lambda
-              ((name version) name)
-              (name name)))
-
-          (define (prettify-name name)
+        (define* (egg-parse-dependency dependency #:key (system? #f))
+          (let ((name (match dependency
+                        ((name version) name)
+                        (name name))))
             (if system?
                 (prettify-system-dependency name)
-                (maybe-symbol->string name)))
-          
-          (let ((name (prettify-name (extract-name name))))
-            ;; Dependencies are sometimes specified as symbols and sometimes
-            ;; as strings
-            (string->symbol (string-append
-                             (if system? "" package-name-prefix)
-                             name))))
+                (string-append package-name-prefix
+                               (maybe-symbol->string name)))))
 
         (define egg-propagated-inputs
           (let ((dependencies (assoc-ref egg-content 'dependencies)))
@@ -277,15 +269,6 @@ (define* (egg->guix-package name version #:key (file #f) (source #f)
                               test+build-dependencies))
               (() '()))))
 
-        ;; Copied from (guix import hackage).
-        (define (maybe-inputs input-type inputs)
-          (match inputs
-            (()
-             '())
-            ((inputs ...)
-             (list (list input-type
-                         `(list ,@inputs))))))
-
         (values
          `(package
             (name ,(egg-name->guix-name name))
@@ -303,16 +286,16 @@ (define* (egg->guix-package name version #:key (file #f) (source #f)
                                    "failed to download tar archive"))))))
             (build-system chicken-build-system)
             (arguments ,(list 'quasiquote (list #:egg-name name)))
-            ,@(maybe-inputs 'native-inputs egg-native-inputs)
-            ,@(maybe-inputs 'inputs egg-inputs)
-            ,@(maybe-inputs 'propagated-inputs egg-propagated-inputs)
+            ,@(maybe-native-inputs egg-native-inputs)
+            ,@(maybe-inputs egg-inputs)
+            ,@(maybe-propagated-inputs egg-propagated-inputs)
             (home-page ,egg-home-page)
             (synopsis ,egg-synopsis)
             (description #f)
             (license ,egg-licenses))
          (filter (lambda (name)
                    (not (member name '("srfi-4"))))
-                 (map (compose guix-name->egg-name symbol->string)
+                 (map guix-name->egg-name
                       (append egg-propagated-inputs
                               egg-native-inputs)))))))
 
-- 
2.45.2

Message sent to guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#70923] [PATCH v3 11/11] import: hexpm: Use (guix import utils) 'maybe-inputs' procedure.
Resent-From: Herman Rimm <herman@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Tue, 24 Sep 2024 20:22:08 +0000
Resent-Message-ID: <handler.70923.B70923.172720930219436 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70923
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 70923 <at> debbugs.gnu.org
Received: via spool by 70923-submit <at> debbugs.gnu.org id=B70923.172720930219436
          (code B ref 70923); Tue, 24 Sep 2024 20:22:08 +0000
Received: (at 70923) by debbugs.gnu.org; 24 Sep 2024 20:21:42 +0000
Received: from localhost ([127.0.0.1]:38520 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1stC2Y-00053K-9L
	for submit <at> debbugs.gnu.org; Tue, 24 Sep 2024 16:21:42 -0400
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:37373
 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <herman@HIDDEN>) id 1stC2I-00050F-I6
 for 70923 <at> debbugs.gnu.org; Tue, 24 Sep 2024 16:21:27 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
 t=1727208850;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc:mime-version:mime-version:content-type:content-type:
 content-transfer-encoding:content-transfer-encoding:
 in-reply-to:in-reply-to:references:references;
 bh=G02zETCO6gOJfw16zyqQcrRjpzZ0CeiIi9EudVkPeAw=;
 b=opkMWHBmcXiTo9R2vdxzOgyWc+24uDbye1PNxPlv6U3yCDsRe6wDpxpeIwjRc1ws2vEFPx
 mLwzBUTw0/115AH43/FlJpqFa2wjONFAI3V58ZZOVy51m+SQan6GrIudx7ZUL2chqgspho
 2/Ktc4H0faeLUcX3nUl8qU8VGDqDjW+XGt9hNiknE4oP99TjWjVH3PMMrZUtfxtLq9Fdyr
 4Gmhog1lUPAjv0boijRgt5bqFSl1kf/mP6db2QWwLqjJQJ2iYbLCynAMBQZF17Qq4psM3r
 kxLocx6B4CXy34b2SmXJJXOhxSGQOXOKqHDTpElBCsqxqCe50x6hnbwujVc+ZQ==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id c24bfa08
 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO)
 for <70923 <at> debbugs.gnu.org>; Tue, 24 Sep 2024 20:14:10 +0000 (UTC)
From: Herman Rimm <herman@HIDDEN>
Date: Tue, 24 Sep 2024 22:13:17 +0200
Message-ID: <c5eae4ecd12f8465f296e268d04222f851f043bc.1727207512.git.herman@HIDDEN>
X-Mailer: git-send-email 2.45.2
In-Reply-To: <cover.1727207512.git.herman@HIDDEN>
References: <cover.1727207512.git.herman@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: 3.6 (+++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 Content preview:  * guix/import/hexpm.scm (maybe-inputs): Delete procedure.
 (dependencies->package-names): Return strings instead of symbols.
 (make-hexpm-sexp):
 Use 'maybe-inputs' from (guix import utils). Change-Id:
 Ie7a8a630a3a9d4859453d49fdee42aa560e27f17
 --- guix/import/hexpm.scm | 29 +++++++++ 1 file changed, 9 insertions(+),
 20 deletions(-) 
 Content analysis details:   (3.6 points, 10.0 required)
 pts rule name              description
 ---- ---------------------- --------------------------------------------------
 3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
 [81.205.150.117 listed in zen.spamhaus.org]
 0.0 TVD_RCVD_IP            Message was received from an IP address
 -0.0 SPF_PASS               SPF: sender matches SPF record
 0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 T_SCC_BODY_TEXT_LINE   No description available.
 0.0 T_FILL_THIS_FORM_SHORT Fill in a short form with personal
 information
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 2.5 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 
 Content preview:  * guix/import/hexpm.scm (maybe-inputs): Delete procedure.
   (dependencies->package-names): Return strings instead of symbols. (make-hexpm-sexp):
    Use 'maybe-inputs' from (guix import utils). Change-Id: Ie7a8a630a3a9d4859453d49fdee42aa560e27f17
    --- guix/import/hexpm.scm | 29 +++++++++ 1 file changed, 9 insertions(+),
    20 deletions(-) 
 
 Content analysis details:   (2.5 points, 10.0 required)
 
  pts rule name              description
 ---- ---------------------- --------------------------------------------------
  3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
                             [81.205.150.117 listed in zen.spamhaus.org]
 -0.0 SPF_PASS               SPF: sender matches SPF record
  0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 T_SCC_BODY_TEXT_LINE   No description available.
 -1.0 MAILING_LIST_MULTI     Multiple indicators imply a widely-seen list
                             manager

* guix/import/hexpm.scm (maybe-inputs): Delete procedure.
(dependencies->package-names): Return strings instead of symbols.
(make-hexpm-sexp): Use 'maybe-inputs' from (guix import utils).

Change-Id: Ie7a8a630a3a9d4859453d49fdee42aa560e27f17
---
 guix/import/hexpm.scm | 29 +++++++++--------------------
 1 file changed, 9 insertions(+), 20 deletions(-)

diff --git a/guix/import/hexpm.scm b/guix/import/hexpm.scm
index 71a54ba973..a7d74e24c3 100644
--- a/guix/import/hexpm.scm
+++ b/guix/import/hexpm.scm
@@ -5,6 +5,7 @@
 ;;; Copyright © 2019 Martin Becze <mjbecze@HIDDEN>
 ;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@HIDDEN>
 ;;; Copyright © 2020-2022 Hartmut Goebel <h.goebel@HIDDEN>
+;;; Copyright © 2024 Herman Rimm <herman@HIDDEN>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -153,26 +154,14 @@ (define (lookup-hexpm-release version*)
 ;;; Converting hex.pm packages to Guix packages.
 ;;;
 
-(define (maybe-inputs package-inputs input-type)
-  "Given a list of PACKAGE-INPUTS, tries to generate the 'inputs' field of a
-package definition.  INPUT-TYPE, a symbol, is used to populate the name of
-the input field."
-  (match package-inputs
-    (()
-     '())
-    ((package-inputs ...)
-     `((,input-type (list ,@package-inputs))))))
-
 (define (dependencies->package-names names)
-  "Given a list of hexpm package NAMES, returns a list of guix package names
-as symbols."
-  ;; TODO: Base name on language of dependency.
-  ;; The language used for implementing the dependency is not know without
-  ;; recursing the dependencies.  So for now assume more packages are based on
-  ;; Erlang and prefix all dependencies with "erlang-" (the default).
-  (map string->symbol
-       (map hexpm-name->package-name
-            (sort names string-ci<?))))
+  "Given a list of hexpm package NAMES, returns a list of guix package
+names."
+  ;; TODO: Base name on the programming language of the dependency.
+  ;; The language used for implementing the dependency can only be known
+  ;; by traversing the dependencies.  So for now assume packages are
+  ;; based on Erlang, and prefix dependencies with "erlang-" by default.
+  (map hexpm-name->package-name (sort names string-ci<?)))
 
 (define* (make-hexpm-sexp #:key name version tarball-url
                           home-page synopsis description license
@@ -194,7 +183,7 @@ (define* (make-hexpm-sexp #:key name version tarball-url
                    (uri (hexpm-uri ,name version))
                    (sha256 (base32 ,(guix-hash-url temp)))))
          (build-system ,build-system)
-         ,@(maybe-inputs (dependencies->package-names dependencies) 'inputs)
+         ,@(maybe-inputs (dependencies->package-names dependencies))
          (synopsis ,synopsis)
          (description ,(beautify-description description))
          (home-page ,(match home-page
-- 
2.45.2

Message sent to efraim@HIDDEN, guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#70923] [PATCH v4 01/11] build-system: cargo: Accept unlabeled #:cargo-inputs.
References: <cover.1715627497.git.herman@HIDDEN>
In-Reply-To: <cover.1715627497.git.herman@HIDDEN>
Resent-From: Herman Rimm <herman@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: efraim@HIDDEN, guix-patches@HIDDEN
Resent-Date: Mon, 09 Dec 2024 20:00:02 +0000
Resent-Message-ID: <handler.70923.B70923.17337743678203 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70923
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 70923 <at> debbugs.gnu.org
Cc: Efraim Flashner <efraim@HIDDEN>
X-Debbugs-Original-Xcc: Efraim Flashner <efraim@HIDDEN>
Received: via spool by 70923-submit <at> debbugs.gnu.org id=B70923.17337743678203
          (code B ref 70923); Mon, 09 Dec 2024 20:00:02 +0000
Received: (at 70923) by debbugs.gnu.org; 9 Dec 2024 19:59:27 +0000
Received: from localhost ([127.0.0.1]:55726 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1tKjuc-00027t-JY
	for submit <at> debbugs.gnu.org; Mon, 09 Dec 2024 14:59:26 -0500
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:59135
 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <herman@HIDDEN>) id 1tKjuX-00027N-NN
 for 70923 <at> debbugs.gnu.org; Mon, 09 Dec 2024 14:59:21 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
 t=1733774348;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc:mime-version:mime-version:content-type:content-type:
 content-transfer-encoding:content-transfer-encoding;
 bh=0Di93yy8Gn0ccmgADGHtanVps1ZA9snHbZkD327+loc=;
 b=g6KRXvJ0gjyXau70Fp3hdfB+DEdu4nihS4yJBkm9L8zAoRKqmQSrz/d0NAwFTcrj5vAP87
 41mRkA1Gy8VULvdadBoyhUDiVQxar8lTVCZe9u9c+bOFJdv53vi8eGvQyJf6fc8Mxemhzr
 n7bACcxYLSEaPHb4EtiM28ACGlco3AJ+ukKRHmhnZhH0A0kv5qyCOAJhEqyNqVe4hHMBex
 8cybjVCx/rMfSYrKP6LEwsvrDKJuqQ4JElI/SQHwKaiRK3cyfi6O9mi/ySzIQJLuuDtFfa
 hzaA7nV/CfcAJhExbgTqGxpIzubbQVc5bAijjvJSPbUxM3sj+ep4nqRyCq2oJQ==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 64c933bf
 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO)
 for <70923 <at> debbugs.gnu.org>; Mon, 9 Dec 2024 19:59:08 +0000 (UTC)
From: Herman Rimm <herman@HIDDEN>
Date: Mon,  9 Dec 2024 20:58:05 +0100
Message-ID: <4b8cde409e17e4b9ab7ef591eff605b88235fb0a.1733774143.git.herman@HIDDEN>
X-Mailer: git-send-email 2.45.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: 3.6 (+++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 Content preview: * guix/build-system/cargo.scm (crate-closure): Match
 unlabeled
 inputs. Change-Id: Iae421281fa08d09ddd1e5d2da2864f0093d97cd1 ---
 guix/build-system/cargo.scm
 | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) 
 Content analysis details:   (3.6 points, 10.0 required)
 pts rule name              description
 ---- ---------------------- --------------------------------------------------
 0.0 TVD_RCVD_IP            Message was received from an IP address
 0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE:
 The query to Validity was blocked.  See
 https://knowledge.validity.com/hc/en-us/articles/20961730681243
 for more information.
 [81.205.150.117 listed in sa-trusted.bondedsender.org]
 3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
 [81.205.150.117 listed in zen.spamhaus.org]
 0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The
 query to Validity was blocked.  See
 https://knowledge.validity.com/hc/en-us/articles/20961730681243
 for more information.
 [81.205.150.117 listed in bl.score.senderscore.com]
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 2.6 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 
 Content preview:  * guix/build-system/cargo.scm (crate-closure): Match unlabeled
    inputs. Change-Id: Iae421281fa08d09ddd1e5d2da2864f0093d97cd1 --- guix/build-system/cargo.scm
    | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) 
 
 Content analysis details:   (2.6 points, 10.0 required)
 
  pts rule name              description
 ---- ---------------------- --------------------------------------------------
  0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE:
                             The query to Validity was blocked.  See
                             https://knowledge.validity.com/hc/en-us/articles/20961730681243
                              for more information.
                             [81.205.150.117 listed in sa-accredit.habeas.com]
  3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
                             [81.205.150.117 listed in zen.spamhaus.org]
  0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The
                             query to Validity was blocked.  See
                             https://knowledge.validity.com/hc/en-us/articles/20961730681243
                              for more information.
                            [81.205.150.117 listed in bl.score.senderscore.com]
  0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
 -1.0 MAILING_LIST_MULTI     Multiple indicators imply a widely-seen list
                             manager

* guix/build-system/cargo.scm (crate-closure): Match unlabeled inputs.

Change-Id: Iae421281fa08d09ddd1e5d2da2864f0093d97cd1
---
 guix/build-system/cargo.scm | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/guix/build-system/cargo.scm b/guix/build-system/cargo.scm
index 658a2e525e..2e3061c0e8 100644
--- a/guix/build-system/cargo.scm
+++ b/guix/build-system/cargo.scm
@@ -6,6 +6,7 @@
 ;;; Copyright © 2019 Ivan Petkov <ivanppetkov@HIDDEN>
 ;;; Copyright © 2020 Jakub Kądziołka <kuba@HIDDEN>
 ;;; Copyright © 2021 Efraim Flashner <efraim@HIDDEN>
+;;; Copyright © 2024 Herman Rimm <herman@HIDDEN>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -234,11 +235,14 @@ (define (crate-closure inputs)
        (if (null? propagated)
            (reverse result)
            (loop (reverse (concatenate propagated)) result '() #f seen)))
-      (((and input (label (? package? package))) rest ...)
+      ;; Match inputs with labels for backward compatibility.
+      (((or (_ (? package? package))
+            (? package? package))
+        rest ...)
        (if (and (not first?) (seen? seen package))
            (loop rest result propagated first? seen)
            (loop rest
-                 (cons input result)
+                 (cons package result)
                  (cons (package-cargo-inputs package)
                        propagated)
                  first?
@@ -296,8 +300,8 @@ (define (expand-crate-sources cargo-inputs cargo-development-inputs)
   something that can always be extended or reworked in the future)."
   (filter-map
     (match-lambda
-      ((label (? package? p))
-       (list label (package-source p)))
+      ((? package? p)
+       (list (package-name p) (package-source p)))
       ((label input)
        (list label input)))
     (crate-closure (append cargo-inputs cargo-development-inputs))))

base-commit: a5a540d71331fd43fd53e23eb49102c55462c28f
-- 
2.45.2

Message sent to guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#70923] [PATCH v4 02/11] import: utils: Emit new-style package inputs.
Resent-From: Herman Rimm <herman@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 09 Dec 2024 20:00:03 +0000
Resent-Message-ID: <handler.70923.B70923.17337743688221 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70923
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 70923 <at> debbugs.gnu.org
Cc: Sarah Morgensen <iskarian@HIDDEN>
Received: via spool by 70923-submit <at> debbugs.gnu.org id=B70923.17337743688221
          (code B ref 70923); Mon, 09 Dec 2024 20:00:03 +0000
Received: (at 70923) by debbugs.gnu.org; 9 Dec 2024 19:59:28 +0000
Received: from localhost ([127.0.0.1]:55730 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1tKjug-00028G-LU
	for submit <at> debbugs.gnu.org; Mon, 09 Dec 2024 14:59:28 -0500
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:59135
 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <herman@HIDDEN>) id 1tKjub-00027N-TO
 for 70923 <at> debbugs.gnu.org; Mon, 09 Dec 2024 14:59:23 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
 t=1733774349;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc:cc:mime-version:mime-version:content-type:content-type:
 content-transfer-encoding:content-transfer-encoding:
 in-reply-to:in-reply-to:references:references;
 bh=8tA04GO47F3PXiip0PSkXsaT7TUZa/1VHE/4svheeoI=;
 b=pBX2LkESErU5X8mYEfvmbLFXK1rYC21k7A6nCnsq2wjr2BROSDPyeRDNyRiSLg50jNvjUn
 Qao3H7nuywAoh9aohhsiJnQWrT7X50NtlBsackXgXP2IS/S7gPGjQ5xFt3vcIAMg5OJMV6
 0C9KbeEV48//+sCKdw65j+49y/6tpcrd7aMKBkIO/2MvgRLprZ9MlwxY+/qahxxBr7BDJj
 4cpcQmGxewpj4UVaVLLphVGn8X0TcNO428drih8t+2hXai/1RDO+h+Cqrw2m0DA80jY2qy
 fL/TNWRa0QEG75BtWZcseaRb0JxUsq+mJQBPbk1OE8FSfr+phdHbkdbI/Is+kg==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 20a99d11
 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); 
 Mon, 9 Dec 2024 19:59:08 +0000 (UTC)
From: Herman Rimm <herman@HIDDEN>
Date: Mon,  9 Dec 2024 20:58:06 +0100
Message-ID: <9e86317f85773cce9744113feb6f96fa5c462b4e.1733774143.git.herman@HIDDEN>
X-Mailer: git-send-email 2.45.2
In-Reply-To: <4b8cde409e17e4b9ab7ef591eff605b88235fb0a.1733774143.git.herman@HIDDEN>
References: <4b8cde409e17e4b9ab7ef591eff605b88235fb0a.1733774143.git.herman@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: 3.6 (+++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 Content preview: From: Sarah Morgensen <iskarian@HIDDEN> *
 guix/import/utils.scm
 (package-names->package-inputs)[make-input]: Return new-style package inputs.
 (maybe-list-field): Add procedure, which wraps BODY in 'list' instead of
 'quasiquote'. (maybe-pack [...] 
 Content analysis details:   (3.6 points, 10.0 required)
 pts rule name              description
 ---- ---------------------- --------------------------------------------------
 0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE:
 The query to Validity was blocked.  See
 https://knowledge.validity.com/hc/en-us/articles/20961730681243
 for more information.
 [81.205.150.117 listed in sa-accredit.habeas.com]
 3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
 [81.205.150.117 listed in zen.spamhaus.org]
 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The
 query to Validity was blocked.  See
 https://knowledge.validity.com/hc/en-us/articles/20961730681243
 for more information.
 [81.205.150.117 listed in bl.score.senderscore.com]
 0.0 TVD_RCVD_IP            Message was received from an IP address
 0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 2.6 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 
 Content preview:  From: Sarah Morgensen <iskarian@HIDDEN> * guix/import/utils.scm
    (package-names->package-inputs)[make-input]: Return new-style package inputs.
    (maybe-list-field): Add procedure, which wraps BODY in 'list' instead of
   'quasiquote'. (maybe-pack [...] 
 
 Content analysis details:   (2.6 points, 10.0 required)
 
  pts rule name              description
 ---- ---------------------- --------------------------------------------------
  0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE:
                             The query to Validity was blocked.  See
                             https://knowledge.validity.com/hc/en-us/articles/20961730681243
                              for more information.
                             [81.205.150.117 listed in sa-accredit.habeas.com]
  3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
                             [81.205.150.117 listed in zen.spamhaus.org]
  0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The
                             query to Validity was blocked.  See
                             https://knowledge.validity.com/hc/en-us/articles/20961730681243
                              for more information.
                            [81.205.150.117 listed in bl.score.senderscore.com]
  0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
 -1.0 MAILING_LIST_MULTI     Multiple indicators imply a widely-seen list
                             manager

From: Sarah Morgensen <iskarian@HIDDEN>

* guix/import/utils.scm (package-names->package-inputs)[make-input]:
Return new-style package inputs.
(maybe-list-field): Add procedure, which wraps BODY in 'list' instead of
'quasiquote'.
(maybe-packages-field): Add procedure.
(maybe-inputs): Use maybe-packages-field.
(maybe-native-inputs): Use maybe-packages-field.
(maybe-propagated-inputs): Use maybe-packages-field.

Change-Id: I66588f4c822d507ddbaf465a268bfb71af8a7ecd
---
 guix/import/utils.scm | 52 +++++++++++++++++++++++++------------------
 1 file changed, 30 insertions(+), 22 deletions(-)

diff --git a/guix/import/utils.scm b/guix/import/utils.scm
index ccf18a7bf9..4eab790645 100644
--- a/guix/import/utils.scm
+++ b/guix/import/utils.scm
@@ -13,6 +13,7 @@
 ;;; Copyright © 2022 Alice Brenon <alice.brenon@HIDDEN>
 ;;; Copyright © 2022 Kyle Meyer <kyle@HIDDEN>
 ;;; Copyright © 2022 Philip McGrath <philip@HIDDEN>
+;;; Copyright © 2024 Herman Rimm <herman@HIDDEN>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -65,6 +66,8 @@ (define-module (guix import utils)
             guix-hash-url
 
             package-names->package-inputs
+            maybe-list-field
+            maybe-packages-field
             maybe-inputs
             maybe-native-inputs
             maybe-propagated-inputs
@@ -425,39 +428,44 @@ (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)
-    (let ((name (if version (string-append input "-" version) input)))
+    (let ((symbol (string->symbol
+                    (if version
+                        (string-append input "-" version)
+                        input))))
       (if output
-          (list (string->symbol name) output)
-          (string->symbol name))))
+          (list symbol output)
+          symbol)))
 
   (map (match-lambda
          ((input version) (make-input input version))
          (input (make-input input #f)))
        names))
 
-(define* (maybe-inputs package-names #:optional (output #f)
-                       #:key (type #f))
-  "Given a list of PACKAGE-NAMES, tries to generate the 'inputs' field of a
-package definition.  TYPE can be used to specify the type of the inputs;
-either the 'native or 'propagated symbols are accepted.  Left unspecified, the
-snippet generated is for regular inputs."
-  (let ((field-name (match type
-                      ('native 'native-inputs)
-                      ('propagated 'propagated-inputs)
-                      (_ 'inputs))))
-    (match (package-names->package-inputs package-names output)
-      (()
-       '())
-      ((package-inputs ...)
-       `((,field-name (list ,@package-inputs)))))))
+(define* (maybe-list-field type body)
+  "Generates the TYPE field of a package definition if its value, BODY,
+is a non-empty list."
+  (match body
+    (() '())
+    ((? list?) (list (list type (cons 'list body))))))
+
+(define* (maybe-packages-field type package-names
+                               #:optional (output #f))
+  "Given a list of PACKAGE-NAMES, tries to generate the TYPE field of a
+package definition."
+  (maybe-list-field type
+    (package-names->package-inputs package-names output)))
+
+(define* (maybe-inputs package-names #:optional (output #f))
+  "MAYBE-PACKAGES-FIELD for inputs."
+  (maybe-packages-field 'inputs package-names output))
 
 (define* (maybe-native-inputs package-names #:optional (output #f))
-  "Same as MAYBE-INPUTS, but for native inputs."
-  (maybe-inputs package-names output #:type 'native))
+  "MAYBE-PACKAGES-FIELD for native inputs."
+  (maybe-packages-field 'native-inputs package-names output))
 
 (define* (maybe-propagated-inputs package-names #:optional (output #f))
-  "Same as MAYBE-INPUTS, but for propagated inputs."
-  (maybe-inputs package-names output #:type 'propagated))
+  "MAYBE-PACKAGES-FIELD for propagated inputs."
+  (maybe-packages-field 'propagated-inputs package-names output))
 
 (define* (package->definition guix-package #:optional append-version?/string)
   "If APPEND-VERSION?/STRING is #t, append the package's major+minor version.
-- 
2.45.2

Message sent to guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#70923] [PATCH v4 04/11] import: utils: Add 'maybe-upstream-inputs' procedure.
Resent-From: Herman Rimm <herman@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 09 Dec 2024 20:00:04 +0000
Resent-Message-ID: <handler.70923.B70923.17337743718261 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70923
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 70923 <at> debbugs.gnu.org
Received: via spool by 70923-submit <at> debbugs.gnu.org id=B70923.17337743718261
          (code B ref 70923); Mon, 09 Dec 2024 20:00:04 +0000
Received: (at 70923) by debbugs.gnu.org; 9 Dec 2024 19:59:31 +0000
Received: from localhost ([127.0.0.1]:55739 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1tKjul-000299-9t
	for submit <at> debbugs.gnu.org; Mon, 09 Dec 2024 14:59:31 -0500
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:59135
 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <herman@HIDDEN>) id 1tKjud-00027N-Gd
 for 70923 <at> debbugs.gnu.org; Mon, 09 Dec 2024 14:59:27 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
 t=1733774352;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc:mime-version:mime-version:
 content-transfer-encoding:content-transfer-encoding:
 in-reply-to:in-reply-to:references:references;
 bh=MygAlkEdwJyZ9EbltGmd2aEWfafC4P0ynchUAA1T3Mk=;
 b=IYkZNK00uwtv8FypxTC6PrIctp6qz3hOnxG6zLgUsGrFDqPeny3pF5VOrgtqFWzl76QUIF
 U0bgNh9RQ+yCybini18/apBHJ9kuzzfKCzYZKQzkyjZG7SuNmRPxhI9lTLq6md5/Ax81AB
 rpBw0m7I2SwXDDoGeRk3MLyJa7XkB9NxCOrykyuM81wD5PNOWX893BSwMszWdpu4f5UtCY
 ooV6/YNyxt+hoQ26Uao5wjSVQ/+d9c89G69AmMb5gCeZciaKmS80TkxC56v57BmrtBWCxP
 qAhBdOdDK7CBPJlPZVXibGe1/B8zqb1HSZ9ER2yowhLvGwiBBDfmUvOXnOIxSg==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id e1e57fbe
 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO)
 for <70923 <at> debbugs.gnu.org>; Mon, 9 Dec 2024 19:59:12 +0000 (UTC)
From: Herman Rimm <herman@HIDDEN>
Date: Mon,  9 Dec 2024 20:58:08 +0100
Message-ID: <7fd481409247d1124171d1f8a5a549f6e4d92f46.1733774143.git.herman@HIDDEN>
X-Mailer: git-send-email 2.45.2
In-Reply-To: <4b8cde409e17e4b9ab7ef591eff605b88235fb0a.1733774143.git.herman@HIDDEN>
References: <4b8cde409e17e4b9ab7ef591eff605b88235fb0a.1733774143.git.herman@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 3.6 (+++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 Content preview: * guix/import/utils.scm (maybe-upstream-inputs): Add
 procedure.
 Change-Id: Ib8a80216d512c0373e55e4f27e1ef2a7c1fb854a --- guix/import/utils.scm
 | 9 +++++++++ 1 file changed,
 9 insertions(+) diff --git a/guix/import/utils.scm
 b/guix/import/utils.scm index 4eab790645..9544fbf00f 100644 ---
 a/guix/import/utils.scm
 +++ b/guix/import/utils.scm @@ -45,6 +45,7 @@ (define-module (guix import
 uti [...] 
 Content analysis details:   (3.6 points, 10.0 required)
 pts rule name              description
 ---- ---------------------- --------------------------------------------------
 0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE:
 The query to Validity was blocked.  See
 https://knowledge.validity.com/hc/en-us/articles/20961730681243
 for more information.
 [81.205.150.117 listed in sa-accredit.habeas.com]
 3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
 [81.205.150.117 listed in zen.spamhaus.org]
 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The
 query to Validity was blocked.  See
 https://knowledge.validity.com/hc/en-us/articles/20961730681243
 for more information.
 [81.205.150.117 listed in bl.score.senderscore.com]
 0.0 TVD_RCVD_IP            Message was received from an IP address
 0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 2.6 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 
 Content preview:  * guix/import/utils.scm (maybe-upstream-inputs): Add procedure.
    Change-Id: Ib8a80216d512c0373e55e4f27e1ef2a7c1fb854a --- guix/import/utils.scm
    | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/guix/import/utils.scm
    b/guix/import/utils.scm index 4eab790645..9544fbf00f 100644 --- a/guix/import/utils.scm
    +++ b/guix/import/utils.scm @@ -45,6 +45,7 @@ (define-module (guix import
    uti [...] 
 
 Content analysis details:   (2.6 points, 10.0 required)
 
  pts rule name              description
 ---- ---------------------- --------------------------------------------------
  0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE:
                             The query to Validity was blocked.  See
                             https://knowledge.validity.com/hc/en-us/articles/20961730681243
                              for more information.
                             [81.205.150.117 listed in sa-accredit.habeas.com]
  3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
                             [81.205.150.117 listed in zen.spamhaus.org]
  0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The
                             query to Validity was blocked.  See
                             https://knowledge.validity.com/hc/en-us/articles/20961730681243
                              for more information.
                            [81.205.150.117 listed in bl.score.senderscore.com]
  0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
 -1.0 MAILING_LIST_MULTI     Multiple indicators imply a widely-seen list
                             manager

* guix/import/utils.scm (maybe-upstream-inputs): Add procedure.

Change-Id: Ib8a80216d512c0373e55e4f27e1ef2a7c1fb854a
---
 guix/import/utils.scm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/guix/import/utils.scm b/guix/import/utils.scm
index 4eab790645..9544fbf00f 100644
--- a/guix/import/utils.scm
+++ b/guix/import/utils.scm
@@ -45,6 +45,7 @@ (define-module (guix import utils)
   #:use-module (guix download)
   #:use-module (guix sets)
   #:use-module ((guix ui) #:select (fill-paragraph))
+  #:use-module (guix upstream)
   #:use-module (gnu packages)
   #:autoload   (ice-9 control) (let/ec)
   #:use-module (ice-9 match)
@@ -71,6 +72,7 @@ (define-module (guix import utils)
             maybe-inputs
             maybe-native-inputs
             maybe-propagated-inputs
+            maybe-upstream-inputs
             package->definition
 
             spdx-string->license
@@ -467,6 +469,13 @@ (define* (maybe-propagated-inputs package-names #:optional (output #f))
   "MAYBE-PACKAGES-FIELD for propagated inputs."
   (maybe-packages-field 'propagated-inputs package-names output))
 
+(define* (maybe-upstream-inputs type upstream-inputs)
+  "Given a list of UPSTREAM-NAMES, tries to generate the TYPE field of a
+package definition."
+  (maybe-list-field type
+    (map (compose string->symbol upstream-input-downstream-name)
+         upstream-inputs)))
+
 (define* (package->definition guix-package #:optional append-version?/string)
   "If APPEND-VERSION?/STRING is #t, append the package's major+minor version.
 If it is the symbol 'full, append the package's complete version.  If
-- 
2.45.2

Message sent to efraim@HIDDEN, guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#70923] [PATCH v4 03/11] import: crate: Emit new-style package inputs.
Resent-From: Herman Rimm <herman@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: efraim@HIDDEN, guix-patches@HIDDEN
Resent-Date: Mon, 09 Dec 2024 20:00:06 +0000
Resent-Message-ID: <handler.70923.B70923.17337743738278 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70923
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 70923 <at> debbugs.gnu.org
Cc: Sarah Morgensen <iskarian@HIDDEN>, Efraim Flashner <efraim@HIDDEN>
X-Debbugs-Original-Xcc: Efraim Flashner <efraim@HIDDEN>
Received: via spool by 70923-submit <at> debbugs.gnu.org id=B70923.17337743738278
          (code B ref 70923); Mon, 09 Dec 2024 20:00:06 +0000
Received: (at 70923) by debbugs.gnu.org; 9 Dec 2024 19:59:33 +0000
Received: from localhost ([127.0.0.1]:55741 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1tKjul-00029H-QA
	for submit <at> debbugs.gnu.org; Mon, 09 Dec 2024 14:59:32 -0500
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:60445
 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <herman@HIDDEN>) id 1tKjuc-00027f-VO
 for 70923 <at> debbugs.gnu.org; Mon, 09 Dec 2024 14:59:28 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
 t=1733774350;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc:cc:mime-version:mime-version:content-type:content-type:
 content-transfer-encoding:content-transfer-encoding:
 in-reply-to:in-reply-to:references:references;
 bh=siEzEy2+sOm2s5tzCgbAlxWx4lbB2CU8F4juSsxsuTo=;
 b=g5CbU97UsmVimCKX/r4E6gQjN99cM3fF54hVgUqu8V26fW8x3KCJ+uQfSek/zkSZ5olNOZ
 2rCBu9ZWwPbpAU/e+Yyr1kXfQbt6TwzSr0ojUKooYYkoX0UR3GMYPHYDdmvjYHZnI3CcFB
 8P4m/ZRjR0RZHUzjajgceTve2tDxugZm4h8eaSLg9hRjjqk4Y7zHPTKHfT7wS82Q2skL6x
 S0JIIiY5qHyjoRtzAw2slW715guuIUJuR1dcUhjpVSskj/cluf8jlcHiXQIZ8sxKMEEYTC
 yF98ieXuW38YwBzx7DVqLfsjhmHhsxjNFEHf1KhddTOMqmsRDuW0aMT3X/maaA==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id c97487a3
 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); 
 Mon, 9 Dec 2024 19:59:10 +0000 (UTC)
From: Herman Rimm <herman@HIDDEN>
Date: Mon,  9 Dec 2024 20:58:07 +0100
Message-ID: <019ad22bc42e58a41beb87b89237f8457874682d.1733774143.git.herman@HIDDEN>
X-Mailer: git-send-email 2.45.2
In-Reply-To: <4b8cde409e17e4b9ab7ef591eff605b88235fb0a.1733774143.git.herman@HIDDEN>
References: <4b8cde409e17e4b9ab7ef591eff605b88235fb0a.1733774143.git.herman@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: 3.6 (+++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 Content preview: From: Sarah Morgensen <iskarian@HIDDEN> *
 guix/import/crate.scm
 (maybe-cargo-inputs, maybe-cargo-development-inputs, maybe-arguments): Delete
 procedures. (make-crate-sexp): Add 'unwrap' procedure,
 use with maybe-packages-field and fix inden [...] 
 Content analysis details:   (3.6 points, 10.0 required)
 pts rule name              description
 ---- ---------------------- --------------------------------------------------
 0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE:
 The query to Validity was blocked.  See
 https://knowledge.validity.com/hc/en-us/articles/20961730681243
 for more information.
 [81.205.150.117 listed in sa-accredit.habeas.com]
 3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
 [81.205.150.117 listed in zen.spamhaus.org]
 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The
 query to Validity was blocked.  See
 https://knowledge.validity.com/hc/en-us/articles/20961730681243
 for more information.
 [81.205.150.117 listed in bl.score.senderscore.com]
 0.0 TVD_RCVD_IP            Message was received from an IP address
 0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
 0.0 T_FILL_THIS_FORM_SHORT Fill in a short form with personal
 information
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 2.6 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 
 Content preview:  From: Sarah Morgensen <iskarian@HIDDEN> * guix/import/crate.scm
    (maybe-cargo-inputs, maybe-cargo-development-inputs, maybe-arguments): Delete
    procedures. (make-crate-sexp): Add 'unwrap' procedure, use with maybe-packages-field
    and fix inden [...] 
 
 Content analysis details:   (2.6 points, 10.0 required)
 
  pts rule name              description
 ---- ---------------------- --------------------------------------------------
  0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE:
                             The query to Validity was blocked.  See
                             https://knowledge.validity.com/hc/en-us/articles/20961730681243
                              for more information.
                             [81.205.150.117 listed in sa-accredit.habeas.com]
  3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
                             [81.205.150.117 listed in zen.spamhaus.org]
  0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The
                             query to Validity was blocked.  See
                             https://knowledge.validity.com/hc/en-us/articles/20961730681243
                              for more information.
                            [81.205.150.117 listed in bl.score.senderscore.com]
  0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
 -1.0 MAILING_LIST_MULTI     Multiple indicators imply a widely-seen list
                             manager

From: Sarah Morgensen <iskarian@HIDDEN>

* guix/import/crate.scm (maybe-cargo-inputs,
maybe-cargo-development-inputs, maybe-arguments): Delete procedures.
(make-crate-sexp): Add 'unwrap' procedure, use with maybe-packages-field
and fix indentation.
* tests/crate.scm: Adjust accordingly.

Change-Id: Ie8debd2553a338c3c623162b843e0a9827314074
---
 guix/import/crate.scm |  51 ++++++------------
 tests/crate.scm       | 119 +++++++++++++++++-------------------------
 2 files changed, 65 insertions(+), 105 deletions(-)

diff --git a/guix/import/crate.scm b/guix/import/crate.scm
index 5996571cda..962159f16e 100644
--- a/guix/import/crate.scm
+++ b/guix/import/crate.scm
@@ -7,6 +7,7 @@
 ;;; Copyright © 2023 Simon Tournier <zimon.toutoune@HIDDEN>
 ;;; Copyright © 2023, 2024 Efraim Flashner <efraim@HIDDEN>
 ;;; Copyright © 2023, 2024 David Elsing <david.elsing@HIDDEN>
+;;; Copyright © 2024 Herman Rimm <herman@HIDDEN>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -158,27 +159,6 @@ (define* (package-names->package-inputs names #:optional (output #f))
          (input (make-input input #f)))
        names))
 
-(define (maybe-cargo-inputs package-names)
-  (match (package-names->package-inputs package-names)
-    (()
-     '())
-    ((package-inputs ...)
-     `(#:cargo-inputs ,package-inputs))))
-
-(define (maybe-cargo-development-inputs package-names)
-  (match (package-names->package-inputs package-names)
-    (()
-     '())
-    ((package-inputs ...)
-     `(#:cargo-development-inputs ,package-inputs))))
-
-(define (maybe-arguments arguments)
-  (match arguments
-    (()
-     '())
-    ((args ...)
-     `((arguments (,'quasiquote ,args))))))
-
 (define (version->semver-prefix version)
   "Return the version up to and including the first non-zero part"
   (first
@@ -202,8 +182,14 @@ (define* (make-crate-sexp #:key name version cargo-inputs cargo-development-inpu
 
   (let* ((port (http-fetch (crate-uri name version)))
          (guix-name (crate-name->package-name name))
-         (cargo-inputs (format-inputs cargo-inputs))
-         (cargo-development-inputs (format-inputs cargo-development-inputs))
+         (unwrap (match-lambda
+                   ((lst) lst)
+                   (() '())))
+         (cargo-inputs (maybe-packages-field '#:cargo-inputs
+                         (format-inputs cargo-inputs)))
+         (cargo-development-inputs
+           (maybe-packages-field '#:cargo-development-inputs
+             (format-inputs cargo-development-inputs)))
          (description (beautify-description description))
          (pkg `(package
                    (name ,guix-name)
@@ -222,12 +208,10 @@ (define* (make-crate-sexp #:key name version cargo-inputs cargo-development-inpu
                          `((properties '((crate-version-yanked? . #t))))
                          '())
                    (build-system cargo-build-system)
-                   ,@(maybe-arguments (append (if build?
-                                                 '()
-                                                 '(#:skip-build? #t))
-                                              (maybe-cargo-inputs cargo-inputs)
-                                              (maybe-cargo-development-inputs
-                                                cargo-development-inputs)))
+                   ,@(maybe-list-field 'arguments
+                       (append (if build? '() '(#:skip-build? #t))
+                               (unwrap cargo-inputs)
+                               (unwrap cargo-development-inputs)))
                    (home-page ,home-page)
                    (synopsis ,(beautify-synopsis synopsis))
                    (description ,(if (string-prefix? "This" description)
@@ -239,11 +223,10 @@ (define* (make-crate-sexp #:key name version cargo-inputs cargo-development-inpu
                                (#f #f)
                                ((license) license)
                                (_ `(list ,@license)))))))
-         (close-port port)
-         (package->definition pkg
-                              (if yanked?
-                                  (string-append version "-yanked")
-                                  (version->semver-prefix version)))))
+    (close-port port)
+    (package->definition pkg (if yanked?
+                                 (string-append version "-yanked")
+                                 (version->semver-prefix version)))))
 
 (define (string->license string)
   (filter-map (lambda (license)
diff --git a/tests/crate.scm b/tests/crate.scm
index 5b4ad08c3c..8e3da2e72c 100644
--- a/tests/crate.scm
+++ b/tests/crate.scm
@@ -5,6 +5,8 @@
 ;;; Copyright © 2020 Martin Becze <mjbecze@HIDDEN>
 ;;; Copyright © 2023 Efraim Flashner <efraim@HIDDEN>
 ;;; Copyright © 2023 David Elsing <david.elsing@HIDDEN>
+;;; Copyright © 2021 Sarah Morgensen <iskarian@HIDDEN>
+;;; Copyright © 2024 Herman Rimm <herman@HIDDEN>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -497,10 +499,10 @@ (define have-guile-semver?
                            (?  string? hash)))))
                       (build-system 'cargo-build-system)
                       (arguments
-                       ('quasiquote
-                        (#:skip-build? #t
+                       (list
+                         #:skip-build? #t
                          #:cargo-inputs
-                         (("rust-leaf-alice" ('unquote 'rust-leaf-alice-0.7))))))
+                         (list rust-leaf-alice-0.7)))
                       (home-page "http://example.com")
                       (synopsis "summary")
                       (description "This package provides summary.")
@@ -589,7 +591,7 @@ (define have-guile-semver?
                      (?  string? hash)))))
                 (build-system cargo-build-system)
                 (arguments
-                 ('quasiquote (#:skip-build? #t)))
+                 (list #:skip-build? #t))
                 (home-page "http://example.com")
                 (synopsis "summary")
                 (description "This package provides summary.")
@@ -608,7 +610,7 @@ (define have-guile-semver?
                     (base32
                      (?  string? hash)))))
                 (build-system cargo-build-system)
-                (arguments ('quasiquote (#:skip-build? #t)))
+                (arguments (list #:skip-build? #t))
                 (home-page "http://example.com")
                 (synopsis "summary")
                 (description "This package provides summary.")
@@ -627,7 +629,7 @@ (define have-guile-semver?
                     (base32
                      (?  string? hash)))))
                 (build-system cargo-build-system)
-                (arguments ('quasiquote (#:skip-build? #t)))
+                (arguments (list #:skip-build? #t))
                 (home-page "http://example.com")
                 (synopsis "summary")
                 (description "This package provides summary.")
@@ -647,10 +649,9 @@ (define have-guile-semver?
                      (?  string? hash)))))
                 (build-system cargo-build-system)
                 (arguments
-                 ('quasiquote (#:skip-build? #t
-                               #:cargo-inputs
-                               (("rust-leaf-bob"
-                                 ('unquote rust-leaf-bob-3))))))
+                 (list #:skip-build? #t
+                       #:cargo-inputs
+                       (list rust-leaf-bob-3)))
                 (home-page "http://example.com")
                 (synopsis "summary")
                 (description "This package provides summary.")
@@ -670,14 +671,11 @@ (define have-guile-semver?
                      (?  string? hash)))))
                 (build-system cargo-build-system)
                 (arguments
-                 ('quasiquote (#:skip-build? #t
-                               #:cargo-inputs
-                               (("rust-intermediate-b"
-                                 ('unquote rust-intermediate-b-1))
-                                ("rust-leaf-alice"
-                                 ('unquote 'rust-leaf-alice-0.7))
-                                ("rust-leaf-bob"
-                                 ('unquote rust-leaf-bob-3))))))
+                 (list #:skip-build? #t
+                       #:cargo-inputs
+                       (list rust-intermediate-b-1
+                             rust-leaf-alice-0.7
+                             rust-leaf-bob-3)))
                 (home-page "http://example.com")
                 (synopsis "summary")
                 (description "This package provides summary.")
@@ -697,18 +695,13 @@ (define have-guile-semver?
                      (?  string? hash)))))
                 (build-system cargo-build-system)
                 (arguments
-                 ('quasiquote (#:cargo-inputs
-                               (("rust-intermediate-a"
-                                 ('unquote rust-intermediate-a-1))
-                                ("rust-intermediate-b"
-                                 ('unquote rust-intermediate-b-1))
-                                ("rust-leaf-alice"
-                                 ('unquote 'rust-leaf-alice-0.7))
-                                ("rust-leaf-bob"
-                                 ('unquote rust-leaf-bob-3)))
-                               #:cargo-development-inputs
-                               (("rust-intermediate-c"
-                                 ('unquote rust-intermediate-c-1))))))
+                 (list #:cargo-inputs
+                       (list rust-intermediate-a-1
+                             rust-intermediate-b-1
+                             rust-leaf-alice-0.7
+                             rust-leaf-bob-3)
+                       #:cargo-development-inputs
+                       ((list rust-intermediate-c-1))))
                 (home-page "http://example.com")
                 (synopsis "summary")
                 (description "This package provides summary.")
@@ -735,9 +728,8 @@ (define have-guile-semver?
                      (?  string? hash)))))
                 (build-system cargo-build-system)
                 (arguments
-                 ('quasiquote (#:cargo-development-inputs
-                               (("rust-leaf-alice"
-                                 ('unquote rust-leaf-alice-0.7))))))
+                 (list #:cargo-development-inputs
+                       (list rust-leaf-alice-0.7)))
                 (home-page "http://example.com")
                 (synopsis "summary")
                 (description "This package provides summary.")
@@ -793,9 +785,8 @@ (define have-guile-semver?
                      (?  string? hash)))))
                 (build-system cargo-build-system)
                 (arguments
-                 ('quasiquote (#:cargo-inputs
-                               (("rust-leaf-bob"
-                                 ('unquote rust-leaf-bob-3))))))
+                 (list #:cargo-inputs
+                       (list rust-leaf-bob-3)))
                 (home-page "http://example.com")
                 (synopsis "summary")
                 (description "This package provides summary.")
@@ -815,13 +806,10 @@ (define have-guile-semver?
                      (?  string? hash)))))
                 (build-system cargo-build-system)
                 (arguments
-                 ('quasiquote (#:cargo-inputs
-                               (("rust-intermediate-b"
-                                 ('unquote rust-intermediate-b-1))
-                                ("rust-leaf-alice"
-                                 ('unquote 'rust-leaf-alice-0.7))
-                                ("rust-leaf-bob"
-                                 ('unquote rust-leaf-bob-3))))))
+                 (list #:cargo-inputs
+                       (list rust-intermediate-b-1
+                             rust-leaf-alice-0.7
+                             rust-leaf-bob-3)))
                 (home-page "http://example.com")
                 (synopsis "summary")
                 (description "This package provides summary.")
@@ -841,18 +829,13 @@ (define have-guile-semver?
                      (?  string? hash)))))
                 (build-system cargo-build-system)
                 (arguments
-                 ('quasiquote (#:cargo-inputs
-                               (("rust-intermediate-a"
-                                 ('unquote rust-intermediate-a-1))
-                                ("rust-intermediate-b"
-                                 ('unquote rust-intermediate-b-1))
-                                ("rust-leaf-alice"
-                                 ('unquote 'rust-leaf-alice-0.7))
-                                ("rust-leaf-bob"
-                                 ('unquote rust-leaf-bob-3)))
-                               #:cargo-development-inputs
-                               (("rust-intermediate-c"
-                                 ('unquote rust-intermediate-c-1))))))
+                 (list #:cargo-inputs
+                       (list rust-intermediate-a-1
+                             rust-intermediate-b-1
+                             rust-leaf-alice-0.7
+                             rust-leaf-bob-3)
+                       #:cargo-development-inputs
+                       (list rust-intermediate-c-1)))
                 (home-page "http://example.com")
                 (synopsis "summary")
                 (description "This package provides summary.")
@@ -962,14 +945,11 @@ (define rust-leaf-bob-3.0.2-yanked
                  (?  string? hash)))))
             (build-system cargo-build-system)
             (arguments
-             ('quasiquote (#:cargo-inputs
-                           (("rust-leaf-bob"
-                             ('unquote 'rust-leaf-bob-3)))
-                           #:cargo-development-inputs
-                           (("rust-leaf-bob"
-                             ('unquote 'rust-leaf-bob-3.0.2-yanked))
-                            ("rust-leaf-bob"
-                             ('unquote 'rust-leaf-bob-4.0.0-yanked))))))
+             (list #:cargo-inputs
+                   (list rust-leaf-bob-3)
+                   #:cargo-development-inputs
+                   (list rust-leaf-bob-3.0.2-yanked
+                         rust-leaf-bob-4.0.0-yanked)))
             (home-page "http://example.com")
             (synopsis "summary")
             (description "This package provides summary.")
@@ -1093,14 +1073,11 @@ (define rust-leaf-bob-3.0.2-yanked
                      (?  string? hash)))))
                 (build-system cargo-build-system)
                 (arguments
-                 ('quasiquote (#:cargo-inputs
-                               (("rust-leaf-bob"
-                                 ('unquote 'rust-leaf-bob-3)))
-                               #:cargo-development-inputs
-                               (("rust-leaf-bob"
-                                 ('unquote 'rust-leaf-bob-3.0.2-yanked))
-                                ("rust-leaf-bob"
-                                 ('unquote 'rust-leaf-bob-4.0.0-yanked))))))
+                 (list #:cargo-inputs
+                       (list rust-leaf-bob-3)
+                       #:cargo-development-inputs
+                       (list rust-leaf-bob-3.0.2-yanked
+                             rust-leaf-bob-4.0.0-yanked)))
                 (home-page "http://example.com")
                 (synopsis "summary")
                 (description "This package provides summary.")
-- 
2.45.2

Message sent to andrew@HIDDEN, cox.katherine.e+guix@HIDDEN, liliana.prikler@HIDDEN, guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#70923] [PATCH v4 06/11] import: elpa: Use maybe-propagated-inputs procedure.
Resent-From: Herman Rimm <herman@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: andrew@HIDDEN, cox.katherine.e+guix@HIDDEN, liliana.prikler@HIDDEN, guix-patches@HIDDEN
Resent-Date: Mon, 09 Dec 2024 20:00:07 +0000
Resent-Message-ID: <handler.70923.B70923.17337743738289 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70923
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 70923 <at> debbugs.gnu.org
Cc: Andrew Tropin <andrew@HIDDEN>, Katherine Cox-Buday <cox.katherine.e+guix@HIDDEN>, Liliana Marie Prikler <liliana.prikler@HIDDEN>
X-Debbugs-Original-Xcc: Andrew Tropin <andrew@HIDDEN>, Katherine Cox-Buday <cox.katherine.e+guix@HIDDEN>, Liliana Marie Prikler <liliana.prikler@HIDDEN>
Received: via spool by 70923-submit <at> debbugs.gnu.org id=B70923.17337743738289
          (code B ref 70923); Mon, 09 Dec 2024 20:00:07 +0000
Received: (at 70923) by debbugs.gnu.org; 9 Dec 2024 19:59:33 +0000
Received: from localhost ([127.0.0.1]:55743 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1tKjum-00029Y-V2
	for submit <at> debbugs.gnu.org; Mon, 09 Dec 2024 14:59:33 -0500
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:59135
 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <herman@HIDDEN>) id 1tKjuh-00027N-Pt
 for 70923 <at> debbugs.gnu.org; Mon, 09 Dec 2024 14:59:28 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
 t=1733774353;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc:mime-version:mime-version:
 content-transfer-encoding:content-transfer-encoding:
 in-reply-to:in-reply-to:references:references;
 bh=UclAUoKx8KFBtJItdylumB2m7pEbRhbwnbdV7dy+JQo=;
 b=q4M+h2AeJn8UheFe9KCuSRC6ihYxEMM7Hb8WD0b4TITj71MumEjq7ffhxpZ860dVuGW4Aw
 dz2e2ZXS6/29G7+fLJwrwCxcdmTmUDu5dg7ZKSYobZihTdipIyIN8UKqYrjM6TOtUMRWXv
 1WsLUXojPx2Gw4OvsMa8U6baVV5qwRtjeJ4UxoIDYLSkAiqLRi60ppFW6qYuvAmPmoC+Nk
 Khphs4DYI7NfWFbSpeCQQDSZB/R114NmEezoaJoZfVHBSuf5/IjKqo+IHuuyDuY6xI+q9j
 YJ6hyLyaoy/0lIqpvLjwdK1QksgH4M7QWk8HEa6Tu9Mdjg+c9rsNd0d5GW3kKA==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 76e2644a
 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO)
 for <70923 <at> debbugs.gnu.org>; Mon, 9 Dec 2024 19:59:13 +0000 (UTC)
From: Herman Rimm <herman@HIDDEN>
Date: Mon,  9 Dec 2024 20:58:10 +0100
Message-ID: <1aa9a745e91fbe39f93034965451562d429e9674.1733774143.git.herman@HIDDEN>
X-Mailer: git-send-email 2.45.2
In-Reply-To: <4b8cde409e17e4b9ab7ef591eff605b88235fb0a.1733774143.git.herman@HIDDEN>
References: <4b8cde409e17e4b9ab7ef591eff605b88235fb0a.1733774143.git.herman@HIDDEN>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 3.6 (+++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 Content preview: * guix/import/elpa.scm (maybe-inputs): Delete procedure.
 (elpa-package->sexp):
 Use maybe-propagated-inputs procedure. Change-Id:
 I9b40e9d387311f5dbbb079938733bf945a1a6ee6
 --- guix/import/elpa.scm | 9 +-------- 1 file changed, 1 insertion(+), 8
 deletions(-) 
 Content analysis details:   (3.6 points, 10.0 required)
 pts rule name              description
 ---- ---------------------- --------------------------------------------------
 0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE:
 The query to Validity was blocked.  See
 https://knowledge.validity.com/hc/en-us/articles/20961730681243
 for more information.
 [81.205.150.117 listed in sa-accredit.habeas.com]
 3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
 [81.205.150.117 listed in zen.spamhaus.org]
 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The
 query to Validity was blocked.  See
 https://knowledge.validity.com/hc/en-us/articles/20961730681243
 for more information.
 [81.205.150.117 listed in bl.score.senderscore.com]
 0.0 TVD_RCVD_IP            Message was received from an IP address
 0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 2.6 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 
 Content preview:  * guix/import/elpa.scm (maybe-inputs): Delete procedure. (elpa-package->sexp):
    Use maybe-propagated-inputs procedure. Change-Id: I9b40e9d387311f5dbbb079938733bf945a1a6ee6
    --- guix/import/elpa.scm | 9 +-------- 1 file changed, 1 insertion(+), 8
   deletions(-) 
 
 Content analysis details:   (2.6 points, 10.0 required)
 
  pts rule name              description
 ---- ---------------------- --------------------------------------------------
  0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE:
                             The query to Validity was blocked.  See
                             https://knowledge.validity.com/hc/en-us/articles/20961730681243
                              for more information.
                             [81.205.150.117 listed in sa-accredit.habeas.com]
  3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
                             [81.205.150.117 listed in zen.spamhaus.org]
  0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The
                             query to Validity was blocked.  See
                             https://knowledge.validity.com/hc/en-us/articles/20961730681243
                              for more information.
                            [81.205.150.117 listed in bl.score.senderscore.com]
  0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
 -1.0 MAILING_LIST_MULTI     Multiple indicators imply a widely-seen list
                             manager

* guix/import/elpa.scm (maybe-inputs): Delete procedure.
(elpa-package->sexp): Use maybe-propagated-inputs procedure.

Change-Id: I9b40e9d387311f5dbbb079938733bf945a1a6ee6
---
 guix/import/elpa.scm | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/guix/import/elpa.scm b/guix/import/elpa.scm
index 46b6dc98a2..9ade189a8a 100644
--- a/guix/import/elpa.scm
+++ b/guix/import/elpa.scm
@@ -359,13 +359,6 @@ (define* (elpa-package->sexp pkg #:optional license repo)
     (map (compose string->symbol elpa-name->package-name)
          dependencies-names))
 
-  (define (maybe-inputs input-type inputs)
-    (match inputs
-      (()
-       '())
-      ((inputs ...)
-       (list (list input-type `(list ,@inputs))))))
-
   (define melpa-source
     (melpa-recipe->origin melpa-recipe))
 
@@ -386,7 +379,7 @@ (define* (elpa-package->sexp pkg #:optional license repo)
                                 (file-hash* tarball #:recursive? #false))
                                "failed to download package")))))))
       (build-system emacs-build-system)
-      ,@(maybe-inputs 'propagated-inputs dependencies)
+      ,@(maybe-propagated-inputs dependencies)
       ,@(if melpa-source
             (melpa-recipe->maybe-arguments melpa-recipe)
             '())
-- 
2.45.2

Message sent to lars@HIDDEN, guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#70923] [PATCH v4 07/11] import: hackage: Use 'maybe-list-field' procedure.
Resent-From: Herman Rimm <herman@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: lars@HIDDEN, guix-patches@HIDDEN
Resent-Date: Mon, 09 Dec 2024 20:00:08 +0000
Resent-Message-ID: <handler.70923.B70923.17337743748303 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70923
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 70923 <at> debbugs.gnu.org
Cc: Lars-Dominik Braun <lars@HIDDEN>
X-Debbugs-Original-Xcc: Lars-Dominik Braun <lars@HIDDEN>
Received: via spool by 70923-submit <at> debbugs.gnu.org id=B70923.17337743748303
          (code B ref 70923); Mon, 09 Dec 2024 20:00:08 +0000
Received: (at 70923) by debbugs.gnu.org; 9 Dec 2024 19:59:34 +0000
Received: from localhost ([127.0.0.1]:55745 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1tKjun-00029e-Be
	for submit <at> debbugs.gnu.org; Mon, 09 Dec 2024 14:59:34 -0500
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:60445
 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <herman@HIDDEN>) id 1tKjui-00027f-AV
 for 70923 <at> debbugs.gnu.org; Mon, 09 Dec 2024 14:59:29 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
 t=1733774353;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc:mime-version:mime-version:content-type:content-type:
 content-transfer-encoding:content-transfer-encoding:
 in-reply-to:in-reply-to:references:references;
 bh=pnj1p+jLMJn0WKwS//Xpf8WBiWHD7UqsxX1NXy1pQk8=;
 b=P7aTjJpKM3MmctxBkBvUvbqvpbt+kr7KMOGTeNJFedN1Qrv1bYChT07b490/qfLkX/HBBf
 SzJxVwSKbslE6euuRM91ahSk9+cVZ7BdLcNL8TCpQYLHwDfUUaLyVGggJ/EifizsXpfDko
 9aVnPflEK1/cc/s8b4uKcZ4J0twgno0oH6UnZxIuqlwt7/kNwkXLgn+/Io4HeAYzYtQ65d
 6f+Ljty2y7ti0+oY0gzZa87zpqsgHiJguC5Hc2AGcsgdrOVPMwRLBg8qBDwPqPDn1mOZ98
 0rtCxREcO8gl2jFZImm/SdmlheP5VsW42pNoKnH/JfJ37v4x5ZcUSdjGV+deOA==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 5fd9c6b6
 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO)
 for <70923 <at> debbugs.gnu.org>; Mon, 9 Dec 2024 19:59:13 +0000 (UTC)
From: Herman Rimm <herman@HIDDEN>
Date: Mon,  9 Dec 2024 20:58:11 +0100
Message-ID: <b436b901f754530977075111b92fa564766829f3.1733774143.git.herman@HIDDEN>
X-Mailer: git-send-email 2.45.2
In-Reply-To: <4b8cde409e17e4b9ab7ef591eff605b88235fb0a.1733774143.git.herman@HIDDEN>
References: <4b8cde409e17e4b9ab7ef591eff605b88235fb0a.1733774143.git.herman@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: 3.6 (+++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 Content preview:  * guix/import/hackage.scm (maybe-inputs, maybe-arguments):
 Delete procedures. (hackage-module->sexp): Use 'maybe-list-field' and
 'maybe-upstream-inputs'
 procedures. * tests/hackage.scm: Fix whitespace [...] 
 Content analysis details:   (3.6 points, 10.0 required)
 pts rule name              description
 ---- ---------------------- --------------------------------------------------
 0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE:
 The query to Validity was blocked.  See
 https://knowledge.validity.com/hc/en-us/articles/20961730681243
 for more information.
 [81.205.150.117 listed in sa-accredit.habeas.com]
 3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
 [81.205.150.117 listed in zen.spamhaus.org]
 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The
 query to Validity was blocked.  See
 https://knowledge.validity.com/hc/en-us/articles/20961730681243
 for more information.
 [81.205.150.117 listed in bl.score.senderscore.com]
 0.0 TVD_RCVD_IP            Message was received from an IP address
 0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 2.6 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 
 Content preview:  * guix/import/hackage.scm (maybe-inputs, maybe-arguments):
    Delete procedures. (hackage-module->sexp): Use 'maybe-list-field' and 'maybe-upstream-inputs'
    procedures. * tests/hackage.scm: Fix whitespace [...] 
 
 Content analysis details:   (2.6 points, 10.0 required)
 
  pts rule name              description
 ---- ---------------------- --------------------------------------------------
  0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE:
                             The query to Validity was blocked.  See
                             https://knowledge.validity.com/hc/en-us/articles/20961730681243
                              for more information.
                             [81.205.150.117 listed in sa-accredit.habeas.com]
  3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
                             [81.205.150.117 listed in zen.spamhaus.org]
  0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The
                             query to Validity was blocked.  See
                             https://knowledge.validity.com/hc/en-us/articles/20961730681243
                              for more information.
                            [81.205.150.117 listed in bl.score.senderscore.com]
  0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
 -1.0 MAILING_LIST_MULTI     Multiple indicators imply a widely-seen list
                             manager

* guix/import/hackage.scm (maybe-inputs, maybe-arguments): Delete
procedures.
(hackage-module->sexp): Use 'maybe-list-field' and
'maybe-upstream-inputs' procedures.
* tests/hackage.scm: Fix whitespace and replace 'quasiquote' with
'list'.

Change-Id: I4fe39ff84c9f6a677f810d9e4fe751d762973757
---
 guix/import/hackage.scm | 39 ++++++++++++---------------------------
 tests/hackage.scm       | 13 +++++++------
 2 files changed, 19 insertions(+), 33 deletions(-)

diff --git a/guix/import/hackage.scm b/guix/import/hackage.scm
index 422887d435..99dfb84b7d 100644
--- a/guix/import/hackage.scm
+++ b/guix/import/hackage.scm
@@ -10,6 +10,7 @@
 ;;; Copyright © 2022 Hartmut Goebel <h.goebel@HIDDEN>
 ;;; Copyright © 2023-2024 Ludovic Courtès <ludo@HIDDEN>
 ;;; Copyright © 2024 Nicolas Graves <ngraves@HIDDEN>
+;;; Copyright © 2024 Herman Rimm <herman@HIDDEN>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -290,26 +291,6 @@ (define* (hackage-module->sexp cabal cabal-hash
                           #:include-test-dependencies?
                           include-test-dependencies?))
 
-  (define (maybe-inputs input-type inputs)
-    (match inputs
-      (()
-       '())
-      ((inputs ...)
-       (list (list input-type
-                   `(list ,@(map (compose string->symbol
-                                          upstream-input-downstream-name)
-                                 inputs)))))))
-
-  (define (maybe-arguments)
-    (match (append (if (not include-test-dependencies?)
-                       '(#:tests? #f)
-                       '())
-                   (if (not (string-null? revision))
-                       `(#:cabal-revision (,revision ,cabal-hash))
-                       '()))
-      (() '())
-      (args `((arguments (,'quasiquote ,args))))))
-
   (let ((tarball (with-store store
                    (download-to-store store source-url))))
     (values
@@ -326,13 +307,17 @@ (define* (hackage-module->sexp cabal cabal-hash
                          "failed to download tar archive")))))
         (build-system haskell-build-system)
         (properties '((upstream-name . ,name)))
-        ,@(maybe-inputs 'inputs
-                        (filter (upstream-input-type-predicate 'regular)
-                                inputs))
-        ,@(maybe-inputs 'native-inputs
-                        (filter (upstream-input-type-predicate 'native)
-                                inputs))
-        ,@(maybe-arguments)
+        ,@(maybe-upstream-inputs 'inputs
+            (filter (upstream-input-type-predicate 'regular) inputs))
+        ,@(maybe-upstream-inputs 'native-inputs
+            (filter (upstream-input-type-predicate 'native) inputs))
+        ,@(maybe-list-field 'arguments
+            (append (if (not include-test-dependencies?)
+                        '(#:tests? #f)
+                        '())
+                    (if (not (string-null? revision))
+                        `(#:cabal-revision '(,revision ,cabal-hash))
+                        '())))
         (home-page ,(cabal-package-home-page cabal))
         (synopsis ,(cabal-package-synopsis cabal))
         (description ,(beautify-description (cabal-package-description cabal)))
diff --git a/tests/hackage.scm b/tests/hackage.scm
index 403f587c41..f6d91515e2 100644
--- a/tests/hackage.scm
+++ b/tests/hackage.scm
@@ -67,7 +67,7 @@ (define test-cabal-3
   if impl(ghc>=7.2&&<7.6)
     Build-depends: ghc-b
   if impl(ghc == 7.8)
-    Build-depends: 
+    Build-depends:
       HTTP       >= 4000.2.5 && < 4000.3,
       mtl        >= 2.0      && < 3
 ")
@@ -86,7 +86,7 @@ (define test-cabal-4
   if impl(ghc>=7.2&&<7.6)
     Build-depends: ghc-b
   if impl(ghc == 7.8)
-    Build-depends: 
+    Build-depends:
       HTTP       >= 4000.2.5 && < 4000.3,
       mtl        >= 2.0      && < 3
 ")
@@ -101,7 +101,7 @@ (define test-cabal-5
 license: BSD3
 library
   if impl(ghc == 7.8)
-    Build-depends: 
+    Build-depends:
       HTTP       >= 4000.2.5 && < 4000.3,
   if impl(ghc -any)
     Build-depends: mtl        >= 2.0      && < 3
@@ -126,7 +126,7 @@ (define test-cabal-6
   if impl(ghc>=7.2&&<7.6)
     Build-depends: ghc-b
   if impl(ghc == 7.8)
-    Build-depends: 
+    Build-depends:
       HTTP       >= 4000.2.5 && < 4000.3,
       mtl        >= 2.0      && < 3
 ")
@@ -524,8 +524,9 @@ (define-package-matcher match-ghc-foo-revision
     ('properties '(quote ((upstream-name . "foo"))))
     ('inputs ('list 'ghc-http))
     ('arguments
-     ('quasiquote
-      ('#:cabal-revision
+     ('list
+      '#:cabal-revision
+      ('quote
        ("2" "0xxd88fb659f0krljidbvvmkh9ppjnx83j0nqzx8whcg4n5qbyng"))))
     ('home-page "http://test.org")
     ('synopsis (? string?))
-- 
2.45.2

Message sent to laurent.gatto@HIDDEN, rekado@HIDDEN, zimon.toutoune@HIDDEN, guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#70923] [PATCH v4 08/11] import: cran: Use 'maybe-list-field' procedure.
Resent-From: Herman Rimm <herman@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: laurent.gatto@HIDDEN, rekado@HIDDEN, zimon.toutoune@HIDDEN, guix-patches@HIDDEN
Resent-Date: Mon, 09 Dec 2024 20:00:09 +0000
Resent-Message-ID: <handler.70923.B70923.17337743748313 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70923
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 70923 <at> debbugs.gnu.org
Cc: Laurent Gatto <laurent.gatto@HIDDEN>, Ricardo Wurmus <rekado@HIDDEN>, Simon Tournier <zimon.toutoune@HIDDEN>
X-Debbugs-Original-Xcc: Laurent Gatto <laurent.gatto@HIDDEN>, Ricardo Wurmus <rekado@HIDDEN>, Simon Tournier <zimon.toutoune@HIDDEN>
Received: via spool by 70923-submit <at> debbugs.gnu.org id=B70923.17337743748313
          (code B ref 70923); Mon, 09 Dec 2024 20:00:09 +0000
Received: (at 70923) by debbugs.gnu.org; 9 Dec 2024 19:59:34 +0000
Received: from localhost ([127.0.0.1]:55747 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1tKjuo-00029q-7c
	for submit <at> debbugs.gnu.org; Mon, 09 Dec 2024 14:59:34 -0500
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:59135
 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <herman@HIDDEN>) id 1tKjuj-00027N-2j
 for 70923 <at> debbugs.gnu.org; Mon, 09 Dec 2024 14:59:29 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
 t=1733774354;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc:mime-version:mime-version:content-type:content-type:
 content-transfer-encoding:content-transfer-encoding:
 in-reply-to:in-reply-to:references:references;
 bh=ZytxbSK1TYQpLSbGcarDC0TjIBoZKLwRsW6sQQUuZ6E=;
 b=TzVixyhia3sFmKIHtZts+puAmtZmpXEFn1kN2xrDLERWJm7NTEuQLFR9tbxa9yhTooOF1L
 RyjmHlqGE/43RoSgHRIHPtEfoYDqK/s7NBKfmr+I3Sk0+zFLDZLbS+MDfK0HHvRyksiSH6
 FeuTA3Vch7uSp0KV5/bQR9ruQli79pDe6jQz3+hQbgwseDU9hr2ULhSuElBPaGwItPZzEV
 rAi2fKVkz1JlIBkcyYdVrBGVAg5A3we2fq8Q/gdziBYNWozpF1+r5HBcorr0vl+NRlPYSv
 85ZDaQH961Wd5SWq5BWk1RFevh0tswXXh3zTMOvQmvmB5CmWTymAkXGcgySZWw==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 429f0fb9
 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO)
 for <70923 <at> debbugs.gnu.org>; Mon, 9 Dec 2024 19:59:14 +0000 (UTC)
From: Herman Rimm <herman@HIDDEN>
Date: Mon,  9 Dec 2024 20:58:12 +0100
Message-ID: <ffca10726eee00287a2f7470651c867486fae72a.1733774143.git.herman@HIDDEN>
X-Mailer: git-send-email 2.45.2
In-Reply-To: <4b8cde409e17e4b9ab7ef591eff605b88235fb0a.1733774143.git.herman@HIDDEN>
References: <4b8cde409e17e4b9ab7ef591eff605b88235fb0a.1733774143.git.herman@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: 3.6 (+++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 Content preview:  * guix/import/cran.scm (format-inputs): Delete procedure.
 (maybe-inputs): Use 'maybe-list-field' procedure. Change-Id:
 I5148afcebdac1f7fa0f8cce9e82e8cebb56c36c8
 --- guix/import/cran.scm | 36 ++++++++++++++++ 1 file changed, 16 insertions(+),
 20 deletions(-) 
 Content analysis details:   (3.6 points, 10.0 required)
 pts rule name              description
 ---- ---------------------- --------------------------------------------------
 0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE:
 The query to Validity was blocked.  See
 https://knowledge.validity.com/hc/en-us/articles/20961730681243
 for more information.
 [81.205.150.117 listed in sa-accredit.habeas.com]
 3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
 [81.205.150.117 listed in zen.spamhaus.org]
 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The
 query to Validity was blocked.  See
 https://knowledge.validity.com/hc/en-us/articles/20961730681243
 for more information.
 [81.205.150.117 listed in bl.score.senderscore.com]
 0.0 TVD_RCVD_IP            Message was received from an IP address
 0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 2.6 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 
 Content preview:  * guix/import/cran.scm (format-inputs): Delete procedure.
   (maybe-inputs): Use 'maybe-list-field' procedure. Change-Id: I5148afcebdac1f7fa0f8cce9e82e8cebb56c36c8
    --- guix/import/cran.scm | 36 ++++++++++++++++ 1 file changed, 16 insertions(+),
    20 deletions(-) 
 
 Content analysis details:   (2.6 points, 10.0 required)
 
  pts rule name              description
 ---- ---------------------- --------------------------------------------------
  0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE:
                             The query to Validity was blocked.  See
                             https://knowledge.validity.com/hc/en-us/articles/20961730681243
                              for more information.
                             [81.205.150.117 listed in sa-accredit.habeas.com]
  3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
                             [81.205.150.117 listed in zen.spamhaus.org]
  0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The
                             query to Validity was blocked.  See
                             https://knowledge.validity.com/hc/en-us/articles/20961730681243
                              for more information.
                            [81.205.150.117 listed in bl.score.senderscore.com]
  0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
 -1.0 MAILING_LIST_MULTI     Multiple indicators imply a widely-seen list
                             manager

* guix/import/cran.scm (format-inputs): Delete procedure.
(maybe-inputs): Use 'maybe-list-field' procedure.

Change-Id: I5148afcebdac1f7fa0f8cce9e82e8cebb56c36c8
---
 guix/import/cran.scm | 36 ++++++++++++++++--------------------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/guix/import/cran.scm b/guix/import/cran.scm
index fe69cb87f7..11843703ac 100644
--- a/guix/import/cran.scm
+++ b/guix/import/cran.scm
@@ -6,6 +6,7 @@
 ;;; Copyright © 2021 Sarah Morgensen <iskarian@HIDDEN>
 ;;; Copyright © 2021 Simon Tournier <zimon.toutoune@HIDDEN>
 ;;; Copyright © 2022 Hartmut Goebel <h.goebel@HIDDEN>
+;;; Copyright © 2024 Herman Rimm <herman@HIDDEN>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -86,21 +87,6 @@ (define-module (guix import cran)
 (define %input-style
   (make-parameter 'variable)) ; or 'specification
 
-(define (format-inputs inputs)
-  "Generate a sorted list of package inputs from a list of upstream inputs."
-  (map (lambda (input)
-         (case (%input-style)
-           ((specification)
-            `(specification->package ,(upstream-input-downstream-name input)))
-           (else
-            ((compose string->symbol
-                       upstream-input-downstream-name)
-             input))))
-       (sort inputs
-             (lambda (a b)
-               (string-ci<? (upstream-input-name a)
-                            (upstream-input-name b))))))
-
 (define (string->licenses license-string license-prefix)
   (let ((licenses
          (map string-trim-both
@@ -189,11 +175,21 @@ (define (description->alist description)
 (define* (maybe-inputs package-inputs #:optional (input-type 'inputs))
   "Given a list of PACKAGE-INPUTS, tries to generate the TYPE field of a
 package definition."
-  (match package-inputs
-    (()
-     '())
-    ((package-inputs ...)
-     `((,input-type (list ,@(format-inputs package-inputs)))))))
+  (define (format-input input)
+    (case (%input-style)
+      ((specification)
+       `(specification->package ,(upstream-input-downstream-name input)))
+      (else
+       ((compose string->symbol
+                  upstream-input-downstream-name)
+        input))))
+
+  (define (upstream-input-name<? i1 i2)
+    (string-ci<? (upstream-input-name i1)
+                 (upstream-input-name i2)))
+
+  (maybe-list-field input-type
+    (map format-input (sort package-inputs upstream-input-name<?))))
 
 (define %cran-url "https://cloud.r-project.org/web/packages/")
 (define %cran-canonical-url "https://cran.r-project.org/package=")
-- 
2.45.2

Message sent to guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#70923] [PATCH v4 09/11] import: cpan: Use 'maybe-upstream-inputs' procedure.
Resent-From: Herman Rimm <herman@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 09 Dec 2024 20:00:09 +0000
Resent-Message-ID: <handler.70923.B70923.17337743758322 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70923
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 70923 <at> debbugs.gnu.org
Received: via spool by 70923-submit <at> debbugs.gnu.org id=B70923.17337743758322
          (code B ref 70923); Mon, 09 Dec 2024 20:00:09 +0000
Received: (at 70923) by debbugs.gnu.org; 9 Dec 2024 19:59:35 +0000
Received: from localhost ([127.0.0.1]:55749 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1tKjuo-0002A1-Ov
	for submit <at> debbugs.gnu.org; Mon, 09 Dec 2024 14:59:35 -0500
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:60445
 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <herman@HIDDEN>) id 1tKjuj-00027f-Ma
 for 70923 <at> debbugs.gnu.org; Mon, 09 Dec 2024 14:59:30 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
 t=1733774354;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc:mime-version:mime-version:content-type:content-type:
 content-transfer-encoding:content-transfer-encoding:
 in-reply-to:in-reply-to:references:references;
 bh=LKGXZOAZQm/HBzMrUMNTcnJ7X4/orZqyPz52qLi35gQ=;
 b=r8UQL69laODd6Bd0KnhGr6D0c/bARDoTMhA/oPGox5UESH6X09z4aNmaaIVOznfLaZZ5e5
 +sQJLmh0m+zc7PW7URZ7wTOGM5xF+irYQjD/K7ppwUPtB5Yb59+ExjYq1zrYknEGnDEByd
 LlSwSMOQILaHFGsbOsf58cYuVAFFE0ww/Oudv397X1o4/3+PJNaMnO75U5V5tvPdiMNn1P
 Xl8bQAgMUCcbg1HE3y2UJrmHb6qb8JLGjTkF8nIMmD+EPceCfyEMvkL0UEU5CoGWvzpqw4
 6W3mK8YU6E2Yr1In6qAiqfW/o8CKTjW70NTPD8qpQhS1KehEw8ERpek8r7IXLA==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 77e07663
 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO)
 for <70923 <at> debbugs.gnu.org>; Mon, 9 Dec 2024 19:59:14 +0000 (UTC)
From: Herman Rimm <herman@HIDDEN>
Date: Mon,  9 Dec 2024 20:58:13 +0100
Message-ID: <f56be2988f28396b31e63eed1360d7d6a6826410.1733774143.git.herman@HIDDEN>
X-Mailer: git-send-email 2.45.2
In-Reply-To: <4b8cde409e17e4b9ab7ef591eff605b88235fb0a.1733774143.git.herman@HIDDEN>
References: <4b8cde409e17e4b9ab7ef591eff605b88235fb0a.1733774143.git.herman@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: 3.6 (+++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 Content preview: * guix/import/cpan.scm (maybe-inputs): Delete procedure.
 (cpan-module->sexp):
 Use 'maybe-upstream-inputs' procedure. Change-Id:
 I4fa99da62d81f02c2998ad96f5ea81e27df071cd
 --- guix/import/cpan.scm | 25 ++++++++ 1 file changed, 8 insertions(+), 17
 deletions(-) 
 Content analysis details:   (3.6 points, 10.0 required)
 pts rule name              description
 ---- ---------------------- --------------------------------------------------
 0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE:
 The query to Validity was blocked.  See
 https://knowledge.validity.com/hc/en-us/articles/20961730681243
 for more information.
 [81.205.150.117 listed in sa-accredit.habeas.com]
 3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
 [81.205.150.117 listed in zen.spamhaus.org]
 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The
 query to Validity was blocked.  See
 https://knowledge.validity.com/hc/en-us/articles/20961730681243
 for more information.
 [81.205.150.117 listed in bl.score.senderscore.com]
 0.0 TVD_RCVD_IP            Message was received from an IP address
 0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 2.6 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 
 Content preview:  * guix/import/cpan.scm (maybe-inputs): Delete procedure. (cpan-module->sexp):
    Use 'maybe-upstream-inputs' procedure. Change-Id: I4fa99da62d81f02c2998ad96f5ea81e27df071cd
    --- guix/import/cpan.scm | 25 ++++++++ 1 file changed, 8 insertions(+), 17
    deletions(-) 
 
 Content analysis details:   (2.6 points, 10.0 required)
 
  pts rule name              description
 ---- ---------------------- --------------------------------------------------
  0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE:
                             The query to Validity was blocked.  See
                             https://knowledge.validity.com/hc/en-us/articles/20961730681243
                              for more information.
                             [81.205.150.117 listed in sa-accredit.habeas.com]
  3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
                             [81.205.150.117 listed in zen.spamhaus.org]
  0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The
                             query to Validity was blocked.  See
                             https://knowledge.validity.com/hc/en-us/articles/20961730681243
                              for more information.
                            [81.205.150.117 listed in bl.score.senderscore.com]
  0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
 -1.0 MAILING_LIST_MULTI     Multiple indicators imply a widely-seen list
                             manager

* guix/import/cpan.scm (maybe-inputs): Delete procedure.
(cpan-module->sexp): Use 'maybe-upstream-inputs' procedure.

Change-Id: I4fa99da62d81f02c2998ad96f5ea81e27df071cd
---
 guix/import/cpan.scm | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/guix/import/cpan.scm b/guix/import/cpan.scm
index 85e5e69098..e26cc85491 100644
--- a/guix/import/cpan.scm
+++ b/guix/import/cpan.scm
@@ -5,6 +5,7 @@
 ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice <me@HIDDEN>
 ;;; Copyright © 2020, 2021, 2023 Ludovic Courtès <ludo@HIDDEN>
 ;;; Copyright © 2022 Hartmut Goebel <h.goebel@HIDDEN>
+;;; Copyright © 2024 Herman Rimm <herman@HIDDEN>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -37,8 +38,9 @@ (define-module (guix import cpan)
   #:use-module (guix utils)
   #:use-module (guix base32)
   #:use-module ((guix download) #:select (download-to-store url-fetch))
-  #:use-module ((guix import utils)
-                #:select (factorize-uri recursive-import))
+  #:use-module ((guix import utils) #:select (factorize-uri
+                                              maybe-upstream-inputs
+                                              recursive-import))
   #:use-module (guix import json)
   #:use-module (guix packages)
   #:use-module (guix upstream)
@@ -277,15 +279,6 @@ (define (cpan-module->sexp release)
   (define version (cpan-release-version release))
   (define source-url (cpan-source-url release))
 
-  (define (maybe-inputs input-type inputs)
-    (match inputs
-      (()
-       '())
-      ((inputs ...)
-       `((,input-type (list ,@(map (compose string->symbol
-                                            upstream-input-downstream-name)
-                                   inputs)))))))
-
   (let* ((tarball (with-store store
                    (download-to-store store source-url)))
          (inputs (cpan-module-inputs release))
@@ -300,12 +293,10 @@ (define (cpan-module->sexp release)
                           (base32
                             ,(bytevector->nix-base32-string (file-sha256 tarball))))))
               (build-system perl-build-system)
-              ,@(maybe-inputs 'native-inputs
-                              (filter (upstream-input-type-predicate 'native)
-                                      inputs))
-              ,@(maybe-inputs 'propagated-inputs
-                              (filter (upstream-input-type-predicate 'propagated)
-                                      inputs))
+              ,@(maybe-upstream-inputs 'native-inputs
+                  (filter (upstream-input-type-predicate 'native) inputs))
+              ,@(maybe-upstream-inputs 'propagated-inputs
+                  (filter (upstream-input-type-predicate 'propagated) inputs))
               (home-page ,(cpan-home name))
               (synopsis ,(cpan-release-abstract release))
               (description fill-in-yourself!)
-- 
2.45.2

Message sent to guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#70923] [PATCH v4 10/11] import: egg: Use maybe-*inputs procedures.
Resent-From: Herman Rimm <herman@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 09 Dec 2024 20:00:10 +0000
Resent-Message-ID: <handler.70923.B70923.17337743768329 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70923
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 70923 <at> debbugs.gnu.org
Received: via spool by 70923-submit <at> debbugs.gnu.org id=B70923.17337743768329
          (code B ref 70923); Mon, 09 Dec 2024 20:00:10 +0000
Received: (at 70923) by debbugs.gnu.org; 9 Dec 2024 19:59:36 +0000
Received: from localhost ([127.0.0.1]:55751 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1tKjup-0002AD-E1
	for submit <at> debbugs.gnu.org; Mon, 09 Dec 2024 14:59:35 -0500
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:59135
 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <herman@HIDDEN>) id 1tKjuk-00027N-6S
 for 70923 <at> debbugs.gnu.org; Mon, 09 Dec 2024 14:59:30 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
 t=1733774355;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc:mime-version:mime-version:content-type:content-type:
 content-transfer-encoding:content-transfer-encoding:
 in-reply-to:in-reply-to:references:references;
 bh=vbd9YSMArsYiTOpR2bVjbynh1n769novSpr3gLT1zpo=;
 b=ZxAazH3RHczTLZC1WAxBnHgSkJWX4Rr1XiLBOI4fJwEnKnzpyDpCfQaf63L+2ssaXQcei0
 OPqIq0jkgX14a1ot+Jghg4M/1izSCYmCF5bYDLBrIFhv4AcinzJvtE6VFLJKi98zN1Gx5h
 RjDs4lQiKIBd7EHHJ5hdBfv4wRI2gsJxoFTV+jBs1M1PaDOLIFs2apP0BGzgxR53gYHo5W
 g3ntAl/QssXz17HZUEaFx7M4QJ/cWgAzzJcLYV1dzgu8G6Y/c8iPrOtINqRpLsWtuKSU6f
 IH01ZopjALafZGcBs4TkWa8npIKW5Kzgm19TXt7gyXt2uVA6FHXmjpPcFH9yZQ==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 492b301e
 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO)
 for <70923 <at> debbugs.gnu.org>; Mon, 9 Dec 2024 19:59:15 +0000 (UTC)
From: Herman Rimm <herman@HIDDEN>
Date: Mon,  9 Dec 2024 20:58:14 +0100
Message-ID: <889b96cf8b0b08a11e116f67b836f9efd209b9e9.1733774143.git.herman@HIDDEN>
X-Mailer: git-send-email 2.45.2
In-Reply-To: <4b8cde409e17e4b9ab7ef591eff605b88235fb0a.1733774143.git.herman@HIDDEN>
References: <4b8cde409e17e4b9ab7ef591eff605b88235fb0a.1733774143.git.herman@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: 3.6 (+++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 Content preview: * guix/import/egg.scm (maybe-inputs): Delete procedure.
 (egg-parse-dependency):
 Simplify procedure to return strings. (egg->guix-package): Use maybe-*inputs
 procedures. Change-Id: Ib0a3f5b6f02912c847defd02ba7675d80005279b ---
 guix/import/egg.scm
 | 39 +++++++++++ 1 file changed, 11 insertions(+), 28 deletions(-) 
 Content analysis details:   (3.6 points, 10.0 required)
 pts rule name              description
 ---- ---------------------- --------------------------------------------------
 3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
 [81.205.150.117 listed in zen.spamhaus.org]
 0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE:
 The query to Validity was blocked.  See
 https://knowledge.validity.com/hc/en-us/articles/20961730681243
 for more information.
 [81.205.150.117 listed in sa-trusted.bondedsender.org]
 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The
 query to Validity was blocked.  See
 https://knowledge.validity.com/hc/en-us/articles/20961730681243
 for more information.
 [81.205.150.117 listed in bl.score.senderscore.com]
 0.0 TVD_RCVD_IP            Message was received from an IP address
 0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 2.6 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 
 Content preview:  * guix/import/egg.scm (maybe-inputs): Delete procedure. (egg-parse-dependency):
    Simplify procedure to return strings. (egg->guix-package): Use maybe-*inputs
    procedures. Change-Id: Ib0a3f5b6f02912c847defd02ba7675d80005279b --- guix/import/egg.scm
    | 39 +++++++++++ 1 file changed, 11 insertions(+), 28 deletions(-) 
 
 Content analysis details:   (2.6 points, 10.0 required)
 
  pts rule name              description
 ---- ---------------------- --------------------------------------------------
  0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE:
                             The query to Validity was blocked.  See
                             https://knowledge.validity.com/hc/en-us/articles/20961730681243
                              for more information.
                             [81.205.150.117 listed in sa-accredit.habeas.com]
  3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
                             [81.205.150.117 listed in zen.spamhaus.org]
  0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The
                             query to Validity was blocked.  See
                             https://knowledge.validity.com/hc/en-us/articles/20961730681243
                              for more information.
                            [81.205.150.117 listed in bl.score.senderscore.com]
  0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
 -1.0 MAILING_LIST_MULTI     Multiple indicators imply a widely-seen list
                             manager

* guix/import/egg.scm (maybe-inputs): Delete procedure.
(egg-parse-dependency): Simplify procedure to return strings.
(egg->guix-package): Use maybe-*inputs procedures.

Change-Id: Ib0a3f5b6f02912c847defd02ba7675d80005279b
---
 guix/import/egg.scm | 39 +++++++++++----------------------------
 1 file changed, 11 insertions(+), 28 deletions(-)

diff --git a/guix/import/egg.scm b/guix/import/egg.scm
index a87de1453e..049c45257e 100644
--- a/guix/import/egg.scm
+++ b/guix/import/egg.scm
@@ -4,6 +4,7 @@
 ;;; Copyright © 2021 Sarah Morgensen <iskarian@HIDDEN>
 ;;; Copyright © 2022 Hartmut Goebel <h.goebel@HIDDEN>
 ;;; Copyright © 2024 Ekaitz Zarraga <ekaitz@HIDDEN>
+;;; Copyright © 2024 Herman Rimm <herman@HIDDEN>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -230,23 +231,14 @@ (define* (egg->guix-package name version #:key (file #f) (source #f)
                           (else char)))
                       (maybe-symbol->string name)))
 
-        (define* (egg-parse-dependency name #:key (system? #f))
-          (define extract-name
-            (match-lambda
-              ((name version) name)
-              (name name)))
-
-          (define (prettify-name name)
+        (define* (egg-parse-dependency dependency #:key (system? #f))
+          (let ((name (match dependency
+                        ((name version) name)
+                        (name name))))
             (if system?
                 (prettify-system-dependency name)
-                (maybe-symbol->string name)))
-
-          (let ((name (prettify-name (extract-name name))))
-            ;; Dependencies are sometimes specified as symbols and sometimes
-            ;; as strings
-            (string->symbol (string-append
-                             (if system? "" package-name-prefix)
-                             name))))
+                (string-append package-name-prefix
+                               (maybe-symbol->string name)))))
 
         (define egg-propagated-inputs
           (let ((dependencies (assoc-ref egg-content 'dependencies)))
@@ -278,15 +270,6 @@ (define* (egg->guix-package name version #:key (file #f) (source #f)
                               test+build-dependencies))
               (() '()))))
 
-        ;; Copied from (guix import hackage).
-        (define (maybe-inputs input-type inputs)
-          (match inputs
-            (()
-             '())
-            ((inputs ...)
-             (list (list input-type
-                         `(list ,@inputs))))))
-
         (values
          `(package
             (name ,(egg-name->guix-name name))
@@ -304,16 +287,16 @@ (define* (egg->guix-package name version #:key (file #f) (source #f)
                                    "failed to download tar archive"))))))
             (build-system chicken-build-system)
             (arguments ,(list 'quasiquote (list #:egg-name name)))
-            ,@(maybe-inputs 'native-inputs egg-native-inputs)
-            ,@(maybe-inputs 'inputs egg-inputs)
-            ,@(maybe-inputs 'propagated-inputs egg-propagated-inputs)
+            ,@(maybe-native-inputs egg-native-inputs)
+            ,@(maybe-inputs egg-inputs)
+            ,@(maybe-propagated-inputs egg-propagated-inputs)
             (home-page ,egg-home-page)
             (synopsis ,egg-synopsis)
             (description #f)
             (license ,egg-licenses))
          (filter (lambda (name)
                    (not (member name '("srfi-4"))))
-                 (map (compose guix-name->egg-name symbol->string)
+                 (map guix-name->egg-name
                       (append egg-propagated-inputs
                               egg-native-inputs)))))))
 
-- 
2.45.2

Message sent to guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#70923] [PATCH v4 11/11] import: hexpm: Use (guix import utils) 'maybe-inputs' procedure.
Resent-From: Herman Rimm <herman@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 09 Dec 2024 20:00:11 +0000
Resent-Message-ID: <handler.70923.B70923.17337743768339 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70923
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 70923 <at> debbugs.gnu.org
Received: via spool by 70923-submit <at> debbugs.gnu.org id=B70923.17337743768339
          (code B ref 70923); Mon, 09 Dec 2024 20:00:11 +0000
Received: (at 70923) by debbugs.gnu.org; 9 Dec 2024 19:59:36 +0000
Received: from localhost ([127.0.0.1]:55753 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1tKjup-0002AK-Vw
	for submit <at> debbugs.gnu.org; Mon, 09 Dec 2024 14:59:36 -0500
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:60445
 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <herman@HIDDEN>) id 1tKjuk-00027f-Rm
 for 70923 <at> debbugs.gnu.org; Mon, 09 Dec 2024 14:59:31 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
 t=1733774357;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc:mime-version:mime-version:content-type:content-type:
 content-transfer-encoding:content-transfer-encoding:
 in-reply-to:in-reply-to:references:references;
 bh=G02zETCO6gOJfw16zyqQcrRjpzZ0CeiIi9EudVkPeAw=;
 b=KyQx2SOXwguMe2ibmYGNoCjKCfhKfNm+TC7189AuM78oR+9u6AzSl6/2ehTcmwISpVvh5y
 FTpSHzRhv7Dl7Z7uUnvzJXLskWNcOGp0zjP+zBNlE/01EsHpzfegwAZLzOyYvBrUdPT0Nt
 lEaNVVA42FZL0YpC486DcPEdmzKP9pFbY0VZTCUWfzIffZYq+CQnVmi8iiCls/Vef+h2oW
 Qf5jNUPwUgyUIOWifrO3kiDuXTN91BTnMDckf0YQhjvZTnwk6Na/e27HcXAKE2lnv+A+DS
 hM6Z2kJCiF2r7yCZbLpPLRl5MkM4xD5Z2Tq2dULfmgz5NoZTHRXTT4rLrb+Amw==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 9b7d8033
 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO)
 for <70923 <at> debbugs.gnu.org>; Mon, 9 Dec 2024 19:59:17 +0000 (UTC)
From: Herman Rimm <herman@HIDDEN>
Date: Mon,  9 Dec 2024 20:58:15 +0100
Message-ID: <5cee288aa6676f609297e7599a9f121886d8d6a7.1733774143.git.herman@HIDDEN>
X-Mailer: git-send-email 2.45.2
In-Reply-To: <4b8cde409e17e4b9ab7ef591eff605b88235fb0a.1733774143.git.herman@HIDDEN>
References: <4b8cde409e17e4b9ab7ef591eff605b88235fb0a.1733774143.git.herman@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: 3.6 (+++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 Content preview:  * guix/import/hexpm.scm (maybe-inputs): Delete procedure.
 (dependencies->package-names): Return strings instead of symbols.
 (make-hexpm-sexp):
 Use 'maybe-inputs' from (guix import utils). Change-Id:
 Ie7a8a630a3a9d4859453d49fdee42aa560e27f17
 --- guix/import/hexpm.scm | 29 +++++++++ 1 file changed, 9 insertions(+),
 20 deletions(-) 
 Content analysis details:   (3.6 points, 10.0 required)
 pts rule name              description
 ---- ---------------------- --------------------------------------------------
 0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE:
 The query to Validity was blocked.  See
 https://knowledge.validity.com/hc/en-us/articles/20961730681243
 for more information.
 [81.205.150.117 listed in sa-accredit.habeas.com]
 3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
 [81.205.150.117 listed in zen.spamhaus.org]
 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The
 query to Validity was blocked.  See
 https://knowledge.validity.com/hc/en-us/articles/20961730681243
 for more information.
 [81.205.150.117 listed in bl.score.senderscore.com]
 0.0 TVD_RCVD_IP            Message was received from an IP address
 0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
 0.0 T_FILL_THIS_FORM_SHORT Fill in a short form with personal
 information
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 2.6 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 
 Content preview:  * guix/import/hexpm.scm (maybe-inputs): Delete procedure.
   (dependencies->package-names): Return strings instead of symbols. (make-hexpm-sexp):
    Use 'maybe-inputs' from (guix import utils). Change-Id: Ie7a8a630a3a9d4859453d49fdee42aa560e27f17
    --- guix/import/hexpm.scm | 29 +++++++++ 1 file changed, 9 insertions(+),
    20 deletions(-) 
 
 Content analysis details:   (2.6 points, 10.0 required)
 
  pts rule name              description
 ---- ---------------------- --------------------------------------------------
  0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE:
                             The query to Validity was blocked.  See
                             https://knowledge.validity.com/hc/en-us/articles/20961730681243
                              for more information.
                             [81.205.150.117 listed in sa-accredit.habeas.com]
  3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
                             [81.205.150.117 listed in zen.spamhaus.org]
  0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The
                             query to Validity was blocked.  See
                             https://knowledge.validity.com/hc/en-us/articles/20961730681243
                              for more information.
                            [81.205.150.117 listed in bl.score.senderscore.com]
  0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
 -1.0 MAILING_LIST_MULTI     Multiple indicators imply a widely-seen list
                             manager

* guix/import/hexpm.scm (maybe-inputs): Delete procedure.
(dependencies->package-names): Return strings instead of symbols.
(make-hexpm-sexp): Use 'maybe-inputs' from (guix import utils).

Change-Id: Ie7a8a630a3a9d4859453d49fdee42aa560e27f17
---
 guix/import/hexpm.scm | 29 +++++++++--------------------
 1 file changed, 9 insertions(+), 20 deletions(-)

diff --git a/guix/import/hexpm.scm b/guix/import/hexpm.scm
index 71a54ba973..a7d74e24c3 100644
--- a/guix/import/hexpm.scm
+++ b/guix/import/hexpm.scm
@@ -5,6 +5,7 @@
 ;;; Copyright © 2019 Martin Becze <mjbecze@HIDDEN>
 ;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@HIDDEN>
 ;;; Copyright © 2020-2022 Hartmut Goebel <h.goebel@HIDDEN>
+;;; Copyright © 2024 Herman Rimm <herman@HIDDEN>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -153,26 +154,14 @@ (define (lookup-hexpm-release version*)
 ;;; Converting hex.pm packages to Guix packages.
 ;;;
 
-(define (maybe-inputs package-inputs input-type)
-  "Given a list of PACKAGE-INPUTS, tries to generate the 'inputs' field of a
-package definition.  INPUT-TYPE, a symbol, is used to populate the name of
-the input field."
-  (match package-inputs
-    (()
-     '())
-    ((package-inputs ...)
-     `((,input-type (list ,@package-inputs))))))
-
 (define (dependencies->package-names names)
-  "Given a list of hexpm package NAMES, returns a list of guix package names
-as symbols."
-  ;; TODO: Base name on language of dependency.
-  ;; The language used for implementing the dependency is not know without
-  ;; recursing the dependencies.  So for now assume more packages are based on
-  ;; Erlang and prefix all dependencies with "erlang-" (the default).
-  (map string->symbol
-       (map hexpm-name->package-name
-            (sort names string-ci<?))))
+  "Given a list of hexpm package NAMES, returns a list of guix package
+names."
+  ;; TODO: Base name on the programming language of the dependency.
+  ;; The language used for implementing the dependency can only be known
+  ;; by traversing the dependencies.  So for now assume packages are
+  ;; based on Erlang, and prefix dependencies with "erlang-" by default.
+  (map hexpm-name->package-name (sort names string-ci<?)))
 
 (define* (make-hexpm-sexp #:key name version tarball-url
                           home-page synopsis description license
@@ -194,7 +183,7 @@ (define* (make-hexpm-sexp #:key name version tarball-url
                    (uri (hexpm-uri ,name version))
                    (sha256 (base32 ,(guix-hash-url temp)))))
          (build-system ,build-system)
-         ,@(maybe-inputs (dependencies->package-names dependencies) 'inputs)
+         ,@(maybe-inputs (dependencies->package-names dependencies))
          (synopsis ,synopsis)
          (description ,(beautify-description description))
          (home-page ,(match home-page
-- 
2.45.2

Message sent to lars@HIDDEN, marius@HIDDEN, me@HIDDEN, sharlatanus@HIDDEN, tanguy@HIDDEN, jgart@HIDDEN, guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#70923] [PATCH v4 05/11] import: pypi: Use 'maybe-list-field' procedure.
Resent-From: Herman Rimm <herman@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: lars@HIDDEN, marius@HIDDEN, me@HIDDEN, sharlatanus@HIDDEN, tanguy@HIDDEN, jgart@HIDDEN, guix-patches@HIDDEN
Resent-Date: Mon, 09 Dec 2024 20:00:12 +0000
Resent-Message-ID: <handler.70923.B70923.17337743778345 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70923
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 70923 <at> debbugs.gnu.org
Cc: Lars-Dominik Braun <lars@HIDDEN>, Marius Bakke <marius@HIDDEN>, Munyoki Kilyungi <me@HIDDEN>, Sharlatan Hellseher <sharlatanus@HIDDEN>, Tanguy Le Carrour <tanguy@HIDDEN>, jgart <jgart@HIDDEN>
X-Debbugs-Original-Xcc: Lars-Dominik Braun <lars@HIDDEN>, Marius Bakke <marius@HIDDEN>, Munyoki Kilyungi <me@HIDDEN>, Sharlatan Hellseher <sharlatanus@HIDDEN>, Tanguy Le Carrour <tanguy@HIDDEN>, jgart <jgart@HIDDEN>
Received: via spool by 70923-submit <at> debbugs.gnu.org id=B70923.17337743778345
          (code B ref 70923); Mon, 09 Dec 2024 20:00:12 +0000
Received: (at 70923) by debbugs.gnu.org; 9 Dec 2024 19:59:37 +0000
Received: from localhost ([127.0.0.1]:55755 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1tKjuq-0002AS-MR
	for submit <at> debbugs.gnu.org; Mon, 09 Dec 2024 14:59:37 -0500
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:57961
 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <herman@HIDDEN>) id 1tKjuh-00027s-Pt
 for 70923 <at> debbugs.gnu.org; Mon, 09 Dec 2024 14:59:31 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
 t=1733774352;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc:mime-version:mime-version:content-type:content-type:
 content-transfer-encoding:content-transfer-encoding:
 in-reply-to:in-reply-to:references:references;
 bh=4mDVhUQiS/kTiBFbsxiWrC3jCC+6QYxmfOifyMbMUio=;
 b=h9SFkDKIPrAHJzqvTr1ULhRPPiyvCciPNwdvz9VUKUbrOd/+Utx0HbS/1eTcrIIsai+Pow
 3pt6EwartTHryfdzobrYsSmnADWdBL9mu5sfou/EwgG5w5sL3vi7TheKIsuPNU0kSvEekx
 hDbINfgedru1TRpwrPGYNozN0ambZ4YPh7XmyB67x88y9m0Kt241qGMbth5GoBZb8z+fQ5
 tmL2n24vd6ffxGguQbGZ0sxWloodynVhkWzvvfgZpQq7SOhih7dvD7hmajBfAbH7qUG7eF
 gBsSVoAZWG3BqYsSQ0qmk+QO7BZhcF62wQhqJ1z2Zerhb9ZmGgB77e5ux7PvBg==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 8d064f23
 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO)
 for <70923 <at> debbugs.gnu.org>; Mon, 9 Dec 2024 19:59:12 +0000 (UTC)
From: Herman Rimm <herman@HIDDEN>
Date: Mon,  9 Dec 2024 20:58:09 +0100
Message-ID: <edc5d31b7f0378fc7fed8f64e7a4d23b28ab76d3.1733774143.git.herman@HIDDEN>
X-Mailer: git-send-email 2.45.2
In-Reply-To: <4b8cde409e17e4b9ab7ef591eff605b88235fb0a.1733774143.git.herman@HIDDEN>
References: <4b8cde409e17e4b9ab7ef591eff605b88235fb0a.1733774143.git.herman@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: 3.6 (+++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 Content preview: * guix/import/pypi.scm (maybe-inputs): Delete procedure.
 (make-pypi-sexp):
 Use 'maybe-list-field' and 'maybe-upstream-inputs' procedures. ---
 guix/import/pypi.scm | 21 +++++ 1 file cha [...] 
 Content analysis details:   (3.6 points, 10.0 required)
 pts rule name              description
 ---- ---------------------- --------------------------------------------------
 0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE:
 The query to Validity was blocked.  See
 https://knowledge.validity.com/hc/en-us/articles/20961730681243
 for more information.
 [81.205.150.117 listed in sa-accredit.habeas.com]
 3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
 [81.205.150.117 listed in zen.spamhaus.org]
 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The
 query to Validity was blocked.  See
 https://knowledge.validity.com/hc/en-us/articles/20961730681243
 for more information.
 [81.205.150.117 listed in bl.score.senderscore.com]
 0.0 TVD_RCVD_IP            Message was received from an IP address
 0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 2.6 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 
 Content preview:  * guix/import/pypi.scm (maybe-inputs): Delete procedure. (make-pypi-sexp):
    Use 'maybe-list-field' and 'maybe-upstream-inputs' procedures. --- guix/import/pypi.scm
    | 21 +++++ 1 file cha [...] 
 
 Content analysis details:   (2.6 points, 10.0 required)
 
  pts rule name              description
 ---- ---------------------- --------------------------------------------------
  0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE:
                             The query to Validity was blocked.  See
                             https://knowledge.validity.com/hc/en-us/articles/20961730681243
                              for more information.
                             [81.205.150.117 listed in sa-accredit.habeas.com]
  3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
                             [81.205.150.117 listed in zen.spamhaus.org]
  0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The
                             query to Validity was blocked.  See
                             https://knowledge.validity.com/hc/en-us/articles/20961730681243
                              for more information.
                            [81.205.150.117 listed in bl.score.senderscore.com]
  0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
 -1.0 MAILING_LIST_MULTI     Multiple indicators imply a widely-seen list
                             manager

* guix/import/pypi.scm (maybe-inputs): Delete procedure.
(make-pypi-sexp): Use 'maybe-list-field' and 'maybe-upstream-inputs'
procedures.
---
 guix/import/pypi.scm | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm
index 7b9f54a200..a98fdfa604 100644
--- a/guix/import/pypi.scm
+++ b/guix/import/pypi.scm
@@ -14,6 +14,7 @@
 ;;; Copyright © 2022 Vivien Kraus <vivien@HIDDEN>
 ;;; Copyright © 2021 Simon Tournier <zimon.toutoune@HIDDEN>
 ;;; Copyright © 2022 Hartmut Goebel <h.goebel@HIDDEN>
+;;; Copyright © 2024 Herman Rimm <herman@HIDDEN>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -201,18 +202,6 @@ (define (wheel-url->extracted-directory wheel-url)
     ((name version _ ...)
      (string-append name "-" version ".dist-info"))))
 
-(define (maybe-inputs package-inputs input-type)
-  "Given a list of PACKAGE-INPUTS, tries to generate the 'inputs' field of a
-package definition.  INPUT-TYPE, a symbol, is used to populate the name of
-the input field."
-  (match package-inputs
-    (()
-     '())
-    ((package-inputs ...)
-     `((,input-type (list ,@(map (compose string->symbol
-                                          upstream-input-downstream-name)
-                                 package-inputs)))))))
-
 (define %requirement-name-regexp
   ;; Regexp to match the requirement name in a requirement specification.
 
@@ -538,10 +527,10 @@ (define* (make-pypi-sexp pypi-package
                             bytevector->nix-base32-string)))))
         ,@(maybe-upstream-name name)
         (build-system pyproject-build-system)
-        ,@(maybe-inputs (upstream-source-propagated-inputs source)
-                        'propagated-inputs)
-        ,@(maybe-inputs (upstream-source-native-inputs source)
-                        'native-inputs)
+        ,@(maybe-upstream-inputs 'propagated-inputs
+            (upstream-source-propagated-inputs source))
+        ,@(maybe-upstream-inputs 'native-inputs
+            (upstream-source-native-inputs source))
         (home-page ,(project-info-home-page info))
         (synopsis ,(project-info-summary info))
         (description ,(and=> (non-empty-string-or-false
-- 
2.45.2

Message sent to guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#70923] [PATCH v4 01/11] build-system: cargo: Accept unlabeled #:cargo-inputs.
Resent-From: Efraim Flashner <efraim@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Tue, 10 Dec 2024 15:43:02 +0000
Resent-Message-ID: <handler.70923.B70923.173384535630663 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70923
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: Herman Rimm <herman@HIDDEN>
Cc: 70923 <at> debbugs.gnu.org
Received: via spool by 70923-submit <at> debbugs.gnu.org id=B70923.173384535630663
          (code B ref 70923); Tue, 10 Dec 2024 15:43:02 +0000
Received: (at 70923) by debbugs.gnu.org; 10 Dec 2024 15:42:36 +0000
Received: from localhost ([127.0.0.1]:59145 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1tL2Nf-0007yO-6l
	for submit <at> debbugs.gnu.org; Tue, 10 Dec 2024 10:42:36 -0500
Received: from mail-wm1-f46.google.com ([209.85.128.46]:46458)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <efraim.flashner@HIDDEN>) id 1tL2Nd-0007yA-E0
 for 70923 <at> debbugs.gnu.org; Tue, 10 Dec 2024 10:42:34 -0500
Received: by mail-wm1-f46.google.com with SMTP id
 5b1f17b1804b1-434a766b475so55128895e9.1
 for <70923 <at> debbugs.gnu.org>; Tue, 10 Dec 2024 07:42:33 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=gmail.com; s=20230601; t=1733845293; x=1734450093; darn=debbugs.gnu.org;
 h=in-reply-to:content-disposition:mime-version:references
 :mail-followup-to:message-id:subject:cc:to:from:date:sender:from:to
 :cc:subject:date:message-id:reply-to;
 bh=bC0P2f9nxXmIuiSzzJoFiv45i6exRQvnfWO0wayVWYo=;
 b=D1Paf0nL0z/L9bffc1xRCd08ThxjKleut/Dt8TslBxwNIBbyJARb6uoYlF27NKzq02
 JI03rz/eRIQfq0G9EwNC1hs00gA8qiL3S9TZskxhH6pf48NoumD+qqTznUCH1yV9/22r
 K0Oj9SgsdTzuUOCey9MttHhZtPvF75kKblv9cHdUP1+xxGMz3PSojW6jmrbxNTbNTFqm
 wsc9LIvfyvZvSCj7YG50pa3m5lgHwgt2ouItSvrbjGxRY7VqgZbSTg099p6cApHQ1M18
 p931HCi+3KmO/zfMozoSJCWpIu/JxruxbTMD7/pXdWLhsOrEnXMD+7O0I+yvTAT5ZrRF
 vWNw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20230601; t=1733845293; x=1734450093;
 h=in-reply-to:content-disposition:mime-version:references
 :mail-followup-to:message-id:subject:cc:to:from:date:sender
 :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to;
 bh=bC0P2f9nxXmIuiSzzJoFiv45i6exRQvnfWO0wayVWYo=;
 b=GoWlIT/5UGdIfRL/fQR5hLWO7+ah/uX/So4979r8Ej4fSW+4IfGYjGytf0KBrbmr59
 1dpI4dcN0vqCgqB8Si55UXAIs91jsIQy4EOOkvDx30jDqFwexjL6sxRSZlZZ/j5xePJE
 KLaN6mi3C6bI6BRZFos7W3DNP1FDiQZ9cRnxrCRWevy6MVSMzppiOKpL6raOAIKilcLP
 noKSzJujLxXOFXe1Jrh0KMZ7SqcCsdSig4PsHeEew+h1PYiHc4NpTf42AisVGHkD0k4b
 uJxey6Qwq6AreTaiD55n7rK1gq3eJ/uBiQJul1MyF8OhBTuFY2wYfLowBzsXWt6ENMdW
 iI0w==
X-Gm-Message-State: AOJu0Ywz8orCf9uZD6Q6b151rPj48LJ39UhNQxaDNJjSUMZW8mHdbQ+t
 E6GbNE+F0HAht8S4+1WsxWQBf6ZbsNfiEqmO8IUEWoA1Nz7Ks8U5EO8xz6Xw
X-Gm-Gg: ASbGnctaaq1//DIAlKDva00bMfGZ+GZpTi1WGriDGQxtxBKZU5+TwJCiXUF7VXvBwON
 SKxcEHsFCpXKJsimwycG3TKSDYW69jHAEfBscS17WsDq1EKW4NPr8v6+8QTZ1mCiHhmNW2R14tf
 SRUcmK2WpAUJ3zbGyKnI3qZ5d1Onc5nh5XxILd/ffN+UwdI2/MU+8/+B/oXUpgohVaDsEj02zRG
 LqpEZHSz0uXHXbeA1FoNvIqmqgShOXkVwzyxwmtFnBy01WgE9hSSg==
X-Google-Smtp-Source: AGHT+IGnx2mi2dHwKNqoKRVL7kDK0Hgrl+t4Pf2MRg4yz0mtKNvogxfhanfuu3PFWdliSMMpiGj8OA==
X-Received: by 2002:a05:600c:1d01:b0:434:a684:9b1 with SMTP id
 5b1f17b1804b1-434fff6f5dfmr44703555e9.4.1733845290932; 
 Tue, 10 Dec 2024 07:41:30 -0800 (PST)
Received: from localhost ([31.210.180.118]) by smtp.gmail.com with ESMTPSA id
 ffacd0b85a97d-38636c919e5sm10233804f8f.18.2024.12.10.07.41.29
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Tue, 10 Dec 2024 07:41:30 -0800 (PST)
Date: Tue, 10 Dec 2024 17:41:27 +0200
From: Efraim Flashner <efraim@HIDDEN>
Message-ID: <Z1hhJyHUOEx6GClQ@3900XT>
Mail-Followup-To: Efraim Flashner <efraim@HIDDEN>,
 Herman Rimm <herman@HIDDEN>, 70923 <at> debbugs.gnu.org
References: <cover.1715627497.git.herman@HIDDEN>
 <4b8cde409e17e4b9ab7ef591eff605b88235fb0a.1733774143.git.herman@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
 protocol="application/pgp-signature"; boundary="gGyXW5Mk1u60rtap"
Content-Disposition: inline
In-Reply-To: <4b8cde409e17e4b9ab7ef591eff605b88235fb0a.1733774143.git.herman@HIDDEN>
X-PGP-Key-ID: 0x41AAE7DCCA3D8351
X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc
X-PGP-Fingerprint: A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
X-Spam-Score: 0.3 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.7 (/)


--gGyXW5Mk1u60rtap
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

I've applied this one for now to the rust-team branch since it'll cause
a rebuild if applied to master.

I tried out the patches for the importer too, but I think with the
changes it needs the input from some other teams too?

On Mon, Dec 09, 2024 at 08:58:05PM +0100, Herman Rimm wrote:
> * guix/build-system/cargo.scm (crate-closure): Match unlabeled inputs.
>=20
> Change-Id: Iae421281fa08d09ddd1e5d2da2864f0093d97cd1
> ---
>  guix/build-system/cargo.scm | 12 ++++++++----
>  1 file changed, 8 insertions(+), 4 deletions(-)
>=20
> diff --git a/guix/build-system/cargo.scm b/guix/build-system/cargo.scm
> index 658a2e525e..2e3061c0e8 100644
> --- a/guix/build-system/cargo.scm
> +++ b/guix/build-system/cargo.scm
> @@ -6,6 +6,7 @@
>  ;;; Copyright =C2=A9 2019 Ivan Petkov <ivanppetkov@HIDDEN>
>  ;;; Copyright =C2=A9 2020 Jakub K=C4=85dzio=C5=82ka <kuba@HIDDEN>
>  ;;; Copyright =C2=A9 2021 Efraim Flashner <efraim@HIDDEN>
> +;;; Copyright =C2=A9 2024 Herman Rimm <herman@HIDDEN>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -234,11 +235,14 @@ (define (crate-closure inputs)
>         (if (null? propagated)
>             (reverse result)
>             (loop (reverse (concatenate propagated)) result '() #f seen)))
> -      (((and input (label (? package? package))) rest ...)
> +      ;; Match inputs with labels for backward compatibility.
> +      (((or (_ (? package? package))
> +            (? package? package))
> +        rest ...)
>         (if (and (not first?) (seen? seen package))
>             (loop rest result propagated first? seen)
>             (loop rest
> -                 (cons input result)
> +                 (cons package result)
>                   (cons (package-cargo-inputs package)
>                         propagated)
>                   first?
> @@ -296,8 +300,8 @@ (define (expand-crate-sources cargo-inputs cargo-deve=
lopment-inputs)
>    something that can always be extended or reworked in the future)."
>    (filter-map
>      (match-lambda
> -      ((label (? package? p))
> -       (list label (package-source p)))
> +      ((? package? p)
> +       (list (package-name p) (package-source p)))
>        ((label input)
>         (list label input)))
>      (crate-closure (append cargo-inputs cargo-development-inputs))))
>=20
> base-commit: a5a540d71331fd43fd53e23eb49102c55462c28f
> --=20
> 2.45.2
>=20
>=20
>=20

--=20
Efraim Flashner   <efraim@HIDDEN>   =D7=90=D7=A4=D7=A8=D7=99=D7=9D =
=D7=A4=D7=9C=D7=A9=D7=A0=D7=A8
GPG key =3D A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

--gGyXW5Mk1u60rtap
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAABCAAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmdYYScACgkQQarn3Mo9
g1GR7g/+MqpHDQFNX7+bvh9DutJhSNs9ib7/cNJfmqEi0JUC/Fh4CFQj2i9+Uvtw
6JUCW6X5L5p0wE8fQs4RVgsDsOPx0P7Qd9MoVKF12GIJSuhupUyMDiW+5iEu9Zq+
kRqQTYkM9qnvZ5WAGIikZvZw/Bu3440hffDTFWEFL696g0KAJr4x7GXwd0TfwrRP
qfmUjKGvpnkobqMUqx9P/mu7zAczNDVQge1tRGFDLOQZr8aiaIMnoRbA3bWLunst
LjDXIRhbhyns+rWpwACT0GiVIb88oydWAhT1wnjPwm4DsQhrs2bz6UUI9Dythpgh
4pzCXc3zrV9cDQklejIp54KcN07LdFGe1L2zPUQkxn41rvoDTwL555TuKW72Ne78
qkp6FZIckeWBjZJ+caRB7NuSIHOEVYnPZqz+Z8WJVlhZ5FJSSjeTB2txqK/VR1rJ
WLKCZUXJb6N+Z7Ur8jealQjEWd+CkDkDilfuzhEJx2X6D7nx7usWY0GpWar4b8st
5JNUpyv3tzVcCbv7WcraCqVor4lW1WI/SzOPdKbGJxnZe+tx+8nOX4YX+U11gMDp
mwdN0TXhLbDbr9ZkAEhQjFeNfWUqDXoo7/m6EcoShjkmNqrJRV2kbAp5cad5+6OW
bdlFO/eGYsFea7WsQNV4RW7SsvaTrMiV5kqQpJyjqO6tSuBIUT0=
=IchR
-----END PGP SIGNATURE-----

--gGyXW5Mk1u60rtap--

Message sent to guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#70923] [PATCH v4 07/11] import: hackage: Use 'maybe-list-field' procedure.
Resent-From: Lars-Dominik Braun <lars@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Tue, 10 Dec 2024 17:36:02 +0000
Resent-Message-ID: <handler.70923.B70923.17338521405516 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70923
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: Herman Rimm <herman@HIDDEN>
Cc: 70923 <at> debbugs.gnu.org
Received: via spool by 70923-submit <at> debbugs.gnu.org id=B70923.17338521405516
          (code B ref 70923); Tue, 10 Dec 2024 17:36:02 +0000
Received: (at 70923) by debbugs.gnu.org; 10 Dec 2024 17:35:40 +0000
Received: from localhost ([127.0.0.1]:59465 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1tL496-0001Qu-6r
	for submit <at> debbugs.gnu.org; Tue, 10 Dec 2024 12:35:40 -0500
Received: from mout-p-202.mailbox.org ([80.241.56.172]:59822)
 by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <lars@HIDDEN>) id 1tL493-0001QQ-ER
 for 70923 <at> debbugs.gnu.org; Tue, 10 Dec 2024 12:35:38 -0500
Received: from smtp2.mailbox.org (smtp2.mailbox.org [10.196.197.2])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
 (No client certificate requested)
 by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4Y75V95Sdmz9spX;
 Tue, 10 Dec 2024 18:35:29 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6xq.net; s=MBO0001;
 t=1733852129;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc:cc:mime-version:mime-version:content-type:content-type:
 in-reply-to:in-reply-to:references:references;
 bh=G+DjdtPyWCAP7GERZo4/nzhTtZatbejZ66NT/oSCbeA=;
 b=xLFU3prlHPsbagwVB8H4E7/LXHWhf3lu7zLAOqXwu7Qkv02QYAdGbrr518g5iHCquDw0zZ
 KLTWpUf2EIKFHYnJ/miXQ7QBlL/V1XFEMAUhw2K/nrN3Jo4+KYbsX0h/WDZAWR6aJZkxLw
 4jS0VKVAQFah384Wqg7taGRznKh07+oEb6IUUDfzbNU95o3z1hGPvHw2pS9mN6Yh2C1XJw
 BV4kyMZuVf0vLtmUPpVHrxvWjCKSg2IPcSj96E8WlAMm8Secs6baZEYjxcoeCTaPRwaPFN
 vwp5A4zY/rqJf86DDnZn0cWVdFsUQhgWDP9zMCAMxe0tRddaXlEZGH/DH4+NKQ==
Date: Tue, 10 Dec 2024 18:35:26 +0100
From: Lars-Dominik Braun <lars@HIDDEN>
Message-ID: <Z1h73vwqQ2oIprUj@HIDDEN>
References: <4b8cde409e17e4b9ab7ef591eff605b88235fb0a.1733774143.git.herman@HIDDEN>
 <b436b901f754530977075111b92fa564766829f3.1733774143.git.herman@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <b436b901f754530977075111b92fa564766829f3.1733774143.git.herman@HIDDEN>
X-Spam-Score: -0.7 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

Hi,

> --- a/tests/hackage.scm
> +++ b/tests/hackage.scm
> @@ -67,7 +67,7 @@ (define test-cabal-3
>    if impl(ghc>=7.2&&<7.6)
>      Build-depends: ghc-b
>    if impl(ghc == 7.8)
> -    Build-depends: 
> +    Build-depends:
>        HTTP       >= 4000.2.5 && < 4000.3,
>        mtl        >= 2.0      && < 3
>  ")
> @@ -86,7 +86,7 @@ (define test-cabal-4
>    if impl(ghc>=7.2&&<7.6)
>      Build-depends: ghc-b
>    if impl(ghc == 7.8)
> -    Build-depends: 
> +    Build-depends:
>        HTTP       >= 4000.2.5 && < 4000.3,
>        mtl        >= 2.0      && < 3
>  ")
> @@ -101,7 +101,7 @@ (define test-cabal-5
>  license: BSD3
>  library
>    if impl(ghc == 7.8)
> -    Build-depends: 
> +    Build-depends:
>        HTTP       >= 4000.2.5 && < 4000.3,
>    if impl(ghc -any)
>      Build-depends: mtl        >= 2.0      && < 3
> @@ -126,7 +126,7 @@ (define test-cabal-6
>    if impl(ghc>=7.2&&<7.6)
>      Build-depends: ghc-b
>    if impl(ghc == 7.8)
> -    Build-depends: 
> +    Build-depends:
>        HTTP       >= 4000.2.5 && < 4000.3,
>        mtl        >= 2.0      && < 3
>  ")

why are these changes to the tests required? Having a space after the
colon is legal as far as I know.

Lars

Message sent to guix-patches@HIDDEN:

X-Loop: help-debbugs@HIDDEN
Subject: [bug#70923] [PATCH v4 07/11] import: hackage: Use 'maybe-list-field' procedure.
Resent-From: Herman Rimm <herman@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Thu, 12 Dec 2024 21:36:02 +0000
Resent-Message-ID: <handler.70923.B70923.17340393409243 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 70923
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: Lars-Dominik Braun <lars@HIDDEN>
Cc: 70923 <at> debbugs.gnu.org
Received: via spool by 70923-submit <at> debbugs.gnu.org id=B70923.17340393409243
          (code B ref 70923); Thu, 12 Dec 2024 21:36:02 +0000
Received: (at 70923) by debbugs.gnu.org; 12 Dec 2024 21:35:40 +0000
Received: from localhost ([127.0.0.1]:40669 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1tLqqS-0002Oz-4n
	for submit <at> debbugs.gnu.org; Thu, 12 Dec 2024 16:35:40 -0500
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:45459
 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2)
 (envelope-from <herman@HIDDEN>) id 1tLqqP-0002Oc-5a
 for 70923 <at> debbugs.gnu.org; Thu, 12 Dec 2024 16:35:38 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
 t=1734039328;
 h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
 to:to:cc:cc:mime-version:mime-version:content-type:content-type:
 in-reply-to:in-reply-to:references:references;
 bh=y5BGSeQ+yKtPAnZVsMbZFC2b9UONUazaS/PqOwTxPDY=;
 b=I2dZTS9Kpmzzqga4gL928RuooaspkexP/E6vJwVIXuXJNYXOjWteSlG3IsxPfI2YEp/xtB
 XzQafEDB/No9OGc3DAoYsQsv39cfIXMTsY9CLulXQ//A/6Yj82Ofum4EbuOSmZ4ODa54YF
 3tlknQ/dGmR2QQv6VKrd9Uhe4xhAl/NSPoxZ9rk/b8uonVb2PcgKjfyvmPmGNsY4cTdsFH
 i0bOJ2UXOFiyLt1syT3COp0P2HuJLNkpik0s/IWCVyJ3HfpLfEJPq65H8w6rzOLFRZajfr
 YQmuD0UMkNJB4x7SXKpbUpmxqFbT5A6a9Muiumhz76yUU54NzbElFQRqZLzfDQ==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 319fdf58
 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); 
 Thu, 12 Dec 2024 21:35:28 +0000 (UTC)
Date: Thu, 12 Dec 2024 22:34:48 +0100
From: Herman Rimm <herman@HIDDEN>
Message-ID: <vnzypep2s7hmjbmcduphjtbgqaj6rmukq2drn6hkhqgppiboq2@5b3ml2vxlu3x>
References: <4b8cde409e17e4b9ab7ef591eff605b88235fb0a.1733774143.git.herman@HIDDEN>
 <b436b901f754530977075111b92fa564766829f3.1733774143.git.herman@HIDDEN>
 <Z1h73vwqQ2oIprUj@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <Z1h73vwqQ2oIprUj@HIDDEN>
X-Spam-Score: 3.6 (+++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 Content preview:  Hello, On Tue, Dec 10, 2024 at 06:35:26PM +0100, Lars-Dominik
 Braun wrote: > why are these changes to the tests required? Having a space
 after the > colon is legal as far as I know. Removing the trailing whitespace
 is not required. It doesn't change the test results. 
 Content analysis details:   (3.6 points, 10.0 required)
 pts rule name              description
 ---- ---------------------- --------------------------------------------------
 0.0 TVD_RCVD_IP            Message was received from an IP address
 0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The
 query to Validity was blocked.  See
 https://knowledge.validity.com/hc/en-us/articles/20961730681243
 for more information.
 [81.205.150.117 listed in bl.score.senderscore.com]
 3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
 [81.205.150.117 listed in zen.spamhaus.org]
 0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE:
 The query to Validity was blocked.  See
 https://knowledge.validity.com/hc/en-us/articles/20961730681243
 for more information.
 [81.205.150.117 listed in sa-trusted.bondedsender.org]
 0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 2.6 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
 has NOT identified this incoming email as spam.  The original
 message has been attached to this so you can view it or label
 similar future email.  If you have any questions, see
 the administrator of that system for details.
 
 Content preview:  Hello, On Tue, Dec 10, 2024 at 06:35:26PM +0100, Lars-Dominik
    Braun wrote: > why are these changes to the tests required? Having a space
    after the > colon is legal as far as I know. Removing the trailing whitespace
    is not required. It doesn't change the test results. 
 
 Content analysis details:   (2.6 points, 10.0 required)
 
  pts rule name              description
 ---- ---------------------- --------------------------------------------------
  0.0 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED RBL: ADMINISTRATOR NOTICE:
                             The query to Validity was blocked.  See
                             https://knowledge.validity.com/hc/en-us/articles/20961730681243
                              for more information.
                             [81.205.150.117 listed in sa-accredit.habeas.com]
  3.6 RCVD_IN_PBL            RBL: Received via a relay in Spamhaus PBL
                             [81.205.150.117 listed in zen.spamhaus.org]
  0.0 RCVD_IN_VALIDITY_RPBL_BLOCKED RBL: ADMINISTRATOR NOTICE: The
                             query to Validity was blocked.  See
                             https://knowledge.validity.com/hc/en-us/articles/20961730681243
                              for more information.
                            [81.205.150.117 listed in bl.score.senderscore.com]
  0.0 SPF_HELO_NONE          SPF: HELO does not publish an SPF Record
 -0.0 SPF_PASS               SPF: sender matches SPF record
 -1.0 MAILING_LIST_MULTI     Multiple indicators imply a widely-seen list
                             manager

Hello,

On Tue, Dec 10, 2024 at 06:35:26PM +0100, Lars-Dominik Braun wrote:
> why are these changes to the tests required? Having a space after the
> colon is legal as far as I know.

Removing the trailing whitespace is not required.  It doesn't change the
test results.

Cheers,
Herman

Last modified: Sun, 12 Jan 2025 05:45:02 UTC

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