GNU bug report logs - #75325
[PATCH rust-team 0/2] Add add-dependencies procedure.

Please note: This is a static page, with minimal formatting, updated once a day.
Click here to see this page with the latest information and nicer formatting.
Package: guix-patches; Reported by: Herman Rimm <herman@HIDDEN>; Keywords: patch; dated Fri, 3 Jan 2025 19:41:02 UTC; Maintainer for guix-patches is guix-patches@HIDDEN.

Message received at 75325 <at> debbugs.gnu.org:


Received: (at 75325) by debbugs.gnu.org; 3 Jan 2025 19:42:05 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Jan 03 14:42:05 2025
Received: from localhost ([127.0.0.1]:52213 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1tTnYb-0004g7-0I
	for submit <at> debbugs.gnu.org; Fri, 03 Jan 2025 14:42:05 -0500
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:39713
 helo=email.rimm.ee)
 by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.84_2) (envelope-from <herman@HIDDEN>) id 1tTnYW-0004ex-0P
 for 75325 <at> debbugs.gnu.org; Fri, 03 Jan 2025 14:42:03 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
 t=1735933306;
 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=ry15AhjqfgWgo+1TFP333BkDCwuqNUZ/HknXo1r8dgE=;
 b=oxIv/mn8GyqaIaP+h1c11es2Ugcb5NyM7CFXvgMC1L66LhYIqIEjBD+OpkRGSLpGdjZrRW
 GKCagpywP7GTAwFWQVTs7CSWXAIxvmJXhi3L3V79xbwf/4Yza3DPihR4g8vA2phYDu8hKu
 Hk3HT1StMs7DFyp2GlD2HVoc5DYofg88A/pOfgNvMWrh5mrgetC4RpttcgEvsnxhLuInW0
 X27IBTTejMJtrxxd4gcJ4OOMUuSoCZsKKivDIrkwpjoqhxy2nDbGce05IP3cwPqTHfZJDs
 Tx73yww57fgBqlMqMNiJvNYbVO1WkS5wIjvnBQDo4CQck3DXNnfcnPesI8zI/Q==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 36c37786
 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO)
 for <75325 <at> debbugs.gnu.org>; Fri, 3 Jan 2025 19:41:46 +0000 (UTC)
From: Herman Rimm <herman@HIDDEN>
To: 75325 <at> debbugs.gnu.org
Subject: [PATCH rust-team 2/2] build-system: cargo: add-dependencies: Silence
 warning.
Date: Fri,  3 Jan 2025 20:40:59 +0100
Message-ID: <2929f9484a26fba24961dfd7fecd4180a7964775.1735932581.git.herman@HIDDEN>
X-Mailer: git-send-email 2.45.2
In-Reply-To: <cover.1735932581.git.herman@HIDDEN>
References: <cover.1735932581.git.herman@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Efraim Flashner <efraim@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 75325
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.0 (-)

* guix/build-system/cargo.scm (add-dependencies): Silence warning.

Change-Id: I8691766fc19073719e75c05eb5bfbce45ffc9b80
---
 guix/build-system/cargo.scm | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/guix/build-system/cargo.scm b/guix/build-system/cargo.scm
index b22b9247a1c..877ebaec135 100644
--- a/guix/build-system/cargo.scm
+++ b/guix/build-system/cargo.scm
@@ -34,6 +34,7 @@ (define-module (guix build-system cargo)
   #:use-module (guix platform)
   #:use-module (guix build-system)
   #:use-module (guix build-system gnu)
+  #:use-module (ice-9 format)
   #:use-module (ice-9 match)
   #:use-module (ice-9 vlist)
   #:use-module (srfi srfi-1)
@@ -51,13 +52,20 @@ (define-module (guix build-system cargo)
 (define* (add-dependencies dependencies)
   "DEPENDENCIES is a list of (crate version features).  It is formatted
 and appendended to Cargo.toml."
-  #~(let ((port (open-file "Cargo.toml" "a")))
-      (format port "
+  (let ((dependencies
+         (map (match-lambda
+                ((crate version ()) (list crate version #f))
+                ((crate version (? pair? features))
+                 (list crate version (format #f "~{~s~^,~}" features)))
+                (dep dep))
+              dependencies)))
+    #~(let ((port (open-file "Cargo.toml" "a")))
+        (format port "
 ~:{[dev-dependencies.~a]
 version = ~s
-~@[features = [~{~s~^,~}]~]~%~}"
-              '#$dependencies)
-      (close port)))
+~@[features = [~a]~]~%~}"
+                '#$dependencies)
+        (close port))))
 
 (define %crate-base-url
   (make-parameter "https://crates.io"))
-- 
2.45.2
Information forwarded to efraim@HIDDEN, guix-patches@HIDDEN:
bug#75325; Package guix-patches. Full text available.

Message received at 75325 <at> debbugs.gnu.org:


Received: (at 75325) by debbugs.gnu.org; 3 Jan 2025 19:42:02 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Jan 03 14:42:02 2025
Received: from localhost ([127.0.0.1]:52211 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1tTnYX-0004fW-55
	for submit <at> debbugs.gnu.org; Fri, 03 Jan 2025 14:42:01 -0500
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:39713
 helo=email.rimm.ee)
 by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.84_2) (envelope-from <herman@HIDDEN>) id 1tTnYU-0004ex-BD
 for 75325 <at> debbugs.gnu.org; Fri, 03 Jan 2025 14:41:59 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
 t=1735933305;
 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=nC0iOnknBYxZ0b1L/RRW/c7/D93NEYxze212LxTlLzg=;
 b=uCHyV9Ol6eA8YlWar2QfU6Gc5DIHcMOz0S3VPo4RrrUHj3MYnU40pqWSxY9ppyB3vvXJxN
 pPHGaDXX4ZqeHON+qkCm6Ra8yYeZTM2ruuAQtmL1nNbefb5KjyRGByp9CHeJ1/LwrgSX1h
 UyLKRcBqbHmtHQadkZBjuf/6dK3+FXEnE4VeM2rSQraYjtq1fLIWyrcwV+t0Wl2vWNU+5y
 gDN6uOzMQDfCI75ctqu14ZMU6dMN9L5Pv+0kI45BaFQqwVfbEn69P+YjSJ6Smm6VgVnkgx
 ZuLoybhLezrUf7lKadNV+92ejNxwBry6msPrbe11n1tQIXvJ9hzB+I0L3ql/qw==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 5fd80de5
 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO)
 for <75325 <at> debbugs.gnu.org>; Fri, 3 Jan 2025 19:41:45 +0000 (UTC)
From: Herman Rimm <herman@HIDDEN>
To: 75325 <at> debbugs.gnu.org
Subject: [PATCH rust-team 1/2] build-system: cargo: Add add-dependencies
 procedure.
Date: Fri,  3 Jan 2025 20:40:58 +0100
Message-ID: <ce89ce8f0b871c0bbe13fe284c3bc72e4c15e3ad.1735932581.git.herman@HIDDEN>
X-Mailer: git-send-email 2.45.2
In-Reply-To: <cover.1735932581.git.herman@HIDDEN>
References: <cover.1735932581.git.herman@HIDDEN>
MIME-Version: 1.0
X-Debbugs-Cc: Efraim Flashner <efraim@HIDDEN>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 75325
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.0 (-)

* guix/build-system/cargo.scm (add-dependencies): Add procedure.

Change-Id: I5385d136697bb6d41a5bd4f6120150f841369a04
---
 guix/build-system/cargo.scm | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/guix/build-system/cargo.scm b/guix/build-system/cargo.scm
index 452f7f78d01..b22b9247a1c 100644
--- a/guix/build-system/cargo.scm
+++ b/guix/build-system/cargo.scm
@@ -6,7 +6,7 @@
 ;;; Copyright © 2019 Ivan Petkov <ivanppetkov@HIDDEN>
 ;;; Copyright © 2020 Jakub Kądziołka <kuba@HIDDEN>
 ;;; Copyright © 2021, 2024 Efraim Flashner <efraim@HIDDEN>
-;;; Copyright © 2024 Herman Rimm <herman@HIDDEN>
+;;; Copyright © 2024-2025 Herman Rimm <herman@HIDDEN>
 ;;; Copyright © 2024 Maxim Cournoyer <maxim.cournoyer@HIDDEN>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -38,7 +38,8 @@ (define-module (guix build-system cargo)
   #:use-module (ice-9 vlist)
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-26)
-  #:export (%cargo-build-system-modules
+  #:export (add-dependencies
+            %cargo-build-system-modules
             %cargo-utils-modules
             cargo-build-system
             %crate-base-url
@@ -46,6 +47,18 @@ (define-module (guix build-system cargo)
             crate-url?
             crate-uri))
 
+;; TODO: Move to (guix build cargo-utils).
+(define* (add-dependencies dependencies)
+  "DEPENDENCIES is a list of (crate version features).  It is formatted
+and appendended to Cargo.toml."
+  #~(let ((port (open-file "Cargo.toml" "a")))
+      (format port "
+~:{[dev-dependencies.~a]
+version = ~s
+~@[features = [~{~s~^,~}]~]~%~}"
+              '#$dependencies)
+      (close port)))
+
 (define %crate-base-url
   (make-parameter "https://crates.io"))
 (define crate-url
-- 
2.45.2
Information forwarded to efraim@HIDDEN, guix-patches@HIDDEN:
bug#75325; Package guix-patches. Full text available.

Message received at submit <at> debbugs.gnu.org:


Received: (at submit) by debbugs.gnu.org; 3 Jan 2025 19:40:06 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Jan 03 14:40:06 2025
Received: from localhost ([127.0.0.1]:52199 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1tTnWf-0004Uf-Kh
	for submit <at> debbugs.gnu.org; Fri, 03 Jan 2025 14:40:05 -0500
Received: from lists.gnu.org ([2001:470:142::17]:58752)
 by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.84_2) (envelope-from <herman@HIDDEN>) id 1tTnWb-0004Tu-3F
 for submit <at> debbugs.gnu.org; Fri, 03 Jan 2025 14:40:04 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <herman@HIDDEN>) id 1tTnWU-00081c-0H
 for guix-patches@HIDDEN; Fri, 03 Jan 2025 14:39:54 -0500
Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]
 helo=email.rimm.ee)
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256)
 (Exim 4.90_1) (envelope-from <herman@HIDDEN>) id 1tTnWJ-0006gL-2d
 for guix-patches@HIDDEN; Fri, 03 Jan 2025 14:39:52 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman;
 t=1735933164;
 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=g7nrFtlazG/2NVM3Lg5pD/1L6h6olZj1tySfjqOnctA=;
 b=ZzTO6IjGrGjAnnwY1oPVnC2OE9rM66a8S+UBUrMJ/1hY4Nh9PglXDgm1YGAkcKgvbNDuXZ
 00jUC0+ucByY3M3VpetRenM1jo8kCHJwb0BY4Md3Aq5ue11WM1q0ZyUgcwB/Lb91XZeOy6
 oVSML280MPweNQYwMqnEVHyzduGezNUopRFIghRj1hcRsimHYaav9RuAleRNZ4B0D/0dV6
 RqcluyWq4y1opeizXsA94MNdc7fixQu2te9PUzxu5zy7fwQe1RFR/WtM0PCWoQMTLKq89/
 Ldo8mtmKhbTWAaDFi+ka32PrJSN2epJwDpeI/rjFjvYFUhRXbiHnw3pTgXAVNg==
Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id d4aa748a
 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO)
 for <guix-patches@HIDDEN>; Fri, 3 Jan 2025 19:39:24 +0000 (UTC)
From: Herman Rimm <herman@HIDDEN>
To: guix-patches@HIDDEN
Subject: [PATCH rust-team 0/2] Add add-dependencies procedure.
Date: Fri,  3 Jan 2025 20:38:41 +0100
Message-ID: <cover.1735932581.git.herman@HIDDEN>
X-Mailer: git-send-email 2.45.2
MIME-Version: 1.0
X-Debbugs-Cc: Efraim Flashner <efraim@HIDDEN>
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: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 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_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001,
 SPF_HELO_NONE=0.001, SPF_PASS=-0.001,
 TVD_RCVD_IP=0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 0.9 (/)
X-Debbugs-Envelope-To: submit
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.1 (/)

Hello,

(parameterize ((current-warning-port (%make-void-port "w"))) ...) does
not silence the warning emitted by the format.

Cheers,
Herman

Herman Rimm (2):
  build-system: cargo: Add add-dependencies procedure.
  build-system: cargo: add-dependencies: Silence warning.

 guix/build-system/cargo.scm | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)


base-commit: 5f92f009a19c1a5a8b7df5a7bcb1e1f283a953f8
-- 
2.45.2
Acknowledgement sent to Herman Rimm <herman@HIDDEN>:
New bug report received and forwarded. Copy sent to efraim@HIDDEN, guix-patches@HIDDEN. Full text available.
Report forwarded to efraim@HIDDEN, guix-patches@HIDDEN:
bug#75325; Package guix-patches. Full text available.
Please note: This is a static page, with minimal formatting, updated once a day.
Click here to see this page with the latest information and nicer formatting.
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.