From unknown Thu Aug 21 14:54:43 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#49566 <49566@debbugs.gnu.org> To: bug#49566 <49566@debbugs.gnu.org> Subject: Status: [PATCH core-updates 0/4] import: {egg, gem, opam, hackage}: Emit new-style package inputs. Reply-To: bug#49566 <49566@debbugs.gnu.org> Date: Thu, 21 Aug 2025 21:54:43 +0000 retitle 49566 [PATCH core-updates 0/4] import: {egg, gem, opam, hackage}: E= mit new-style package inputs. reassign 49566 guix-patches submitter 49566 Sarah Morgensen severity 49566 normal tag 49566 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Wed Jul 14 21:28:36 2021 Received: (at submit) by debbugs.gnu.org; 15 Jul 2021 01:28:36 +0000 Received: from localhost ([127.0.0.1]:46145 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m3qB2-0003L0-A1 for submit@debbugs.gnu.org; Wed, 14 Jul 2021 21:28:36 -0400 Received: from lists.gnu.org ([209.51.188.17]:51880) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m3qAz-0003Ks-Pk for submit@debbugs.gnu.org; Wed, 14 Jul 2021 21:28:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44862) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3qAy-0008DZ-B0 for guix-patches@gnu.org; Wed, 14 Jul 2021 21:28:33 -0400 Received: from out2.migadu.com ([2001:41d0:2:aacc::]:63007) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3qAv-0005RG-SI for guix-patches@gnu.org; Wed, 14 Jul 2021 21:28:31 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mgsn.dev; s=key1; t=1626312505; 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=8+E2woge5DCQ4pirT/vI6GCk7B46H+XhkhSSg2ySH5c=; b=dZ/fVeTGsG/fEu28o0rTualnsZKHaOEn9MzzYwTxIfDzX2nJ1959O7CvC+8idLY7QvQ7P7 K5vv/J9wEyU3jD/AEnWQZSpHTxH3uC2s+QTMIpr1p5FigdjrdM4ZzcvU+F479WtIxKF+l6 saW0uE8N17+moIW8/BR10qa6QHdxEPY= From: Sarah Morgensen To: guix-patches@gnu.org Subject: [PATCH core-updates 0/4] import: {egg, gem, opam, hackage}: Emit new-style package inputs. Date: Wed, 14 Jul 2021 18:28:22 -0700 Message-Id: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: iskarian@mgsn.dev Received-SPF: pass client-ip=2001:41d0:2:aacc::; envelope-from=iskarian@mgsn.dev; helo=out2.migadu.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.4 (--) Hello Guix, Together with [0] this should take care of updating all the importers to new-style package inputs. These are all standalone edits. Tests pass but I did not manually verify importing. [0] https://issues.guix.gnu.org/49531 -- Sarah Morgensen (4): import: egg: Emit new-style package inputs. import: gem: Emit new-style package inputs. import: opam: Emit new-style package inputs. import: hackage: Emit new-style package inputs. guix/import/egg.scm | 14 ++++++-------- guix/import/gem.scm | 8 ++------ guix/import/hackage.scm | 11 +++++------ guix/import/opam.scm | 11 +++++------ tests/egg.scm | 27 +++++++-------------------- tests/gem.scm | 15 ++++----------- tests/hackage.scm | 18 +++++------------- tests/opam.scm | 10 +++------- 8 files changed, 37 insertions(+), 77 deletions(-) base-commit: 8456581375cf03c46005d00907f8fdd1f5615f1e -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Jul 14 21:40:44 2021 Received: (at 49566) by debbugs.gnu.org; 15 Jul 2021 01:40:44 +0000 Received: from localhost ([127.0.0.1]:46152 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m3qMm-0003dE-Dv for submit@debbugs.gnu.org; Wed, 14 Jul 2021 21:40:44 -0400 Received: from out2.migadu.com ([188.165.223.204]:24349) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m3qMj-0003cx-Cd for 49566@debbugs.gnu.org; Wed, 14 Jul 2021 21:40:43 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mgsn.dev; s=key1; t=1626313239; 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=RjsKkhwIZDE8c765gH+ISy/GkmhWRNLnB96WaDLiUdY=; b=Om0LaBI0NoEuCz4GbPovbGrMk8ZSqvFDTqHZ1C7wIh7LS3J8z34WlHbDL+DZtQlZ+Sph71 UYxqwWze6zibfSeqtX+2JJV8m/N0fWtCulQiVgInd0FzEXY9oRDHZMDGMuCcxhyZPTMEIW AwLJ39fWU6eFCRc4vIIZVMAscmSq7LE= From: Sarah Morgensen To: 49566@debbugs.gnu.org Subject: [PATCH core-updates 1/4] import: egg: Emit new-style package inputs. Date: Wed, 14 Jul 2021 18:40:34 -0700 Message-Id: <7b10494282bee565b4231c7bc3340128eb62e654.1626311767.git.iskarian@mgsn.dev> In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: iskarian@mgsn.dev X-Spam-Score: 2.0 (++) 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 (egg->guix-package): Generate dependency list from a list of symbols. [egg-parse-dependency]: Return a list of symbols. [maybe-inputs]: Wrap INPUTS in 'list' instead of 'quasiquo [...] Content analysis details: (2.0 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_MSPIKE_H4 RBL: Very Good reputation (+4) [188.165.223.204 listed in wl.mailspike.net] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: yoctocell.xyz (xyz)] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-Debbugs-Envelope-To: 49566 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) * guix/import/egg.scm (egg->guix-package): Generate dependency list from a list of symbols. [egg-parse-dependency]: Return a list of symbols. [maybe-inputs]: Wrap INPUTS in 'list' instead of 'quasiquote'. * tests/egg.scm (match-chicken-foo): Adjust accordingly. --- guix/import/egg.scm | 14 ++++++-------- tests/egg.scm | 27 +++++++-------------------- 2 files changed, 13 insertions(+), 28 deletions(-) diff --git a/guix/import/egg.scm b/guix/import/egg.scm index 107894ddcf..86b54ff56f 100644 --- a/guix/import/egg.scm +++ b/guix/import/egg.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2021 Xinglu Chen ;;; Copyright © 2021 Tobias Geerinckx-Rice +;;; Copyright © 2021 Sarah Morgensen ;;; ;;; This file is part of GNU Guix. ;;; @@ -246,12 +247,9 @@ not work." (let ((name (prettify-name (extract-name name)))) ;; Dependencies are sometimes specified as symbols and sometimes ;; as strings - (list (string-append (if system? "" package-name-prefix) - name) - (list 'unquote - (string->symbol (string-append - (if system? "" package-name-prefix) - name)))))) + (string->symbol (string-append + (if system? "" package-name-prefix) + name)))) (define egg-propagated-inputs (let ((dependencies (assoc-ref egg-content 'dependencies))) @@ -290,7 +288,7 @@ not work." '()) ((inputs ...) (list (list input-type - (list 'quasiquote inputs)))))) + `(list ,@inputs)))))) (values `(package @@ -318,7 +316,7 @@ not work." (license ,egg-licenses)) (filter (lambda (name) (not (member name '("srfi-4")))) - (map (compose guix-name->egg-name first) + (map (compose guix-name->egg-name symbol->string) (append egg-propagated-inputs egg-native-inputs))))))) diff --git a/tests/egg.scm b/tests/egg.scm index 0884d8d429..9e45a42443 100644 --- a/tests/egg.scm +++ b/tests/egg.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2021 Xinglu Chen +;;; Copyright © 2021 Sarah Morgensen ;;; ;;; This file is part of GNU Guix. ;;; @@ -86,16 +87,9 @@ ('build-system 'chicken-build-system) ('arguments ('quasiquote ('#:egg-name "foo"))) ('native-inputs - ('quasiquote - (("chicken-test" ('unquote chicken-test)) - ("chicken-srfi-1" ('unquote chicken-srfi-1)) - ("chicken-begin-syntax" ('unquote chicken-begin-syntax))))) - ('inputs - ('quasiquote - (("libgit2" ('unquote libgit2))))) - ('propagated-inputs - ('quasiquote - (("chicken-datatype" ('unquote chicken-datatype))))) + ('list 'chicken-test 'chicken-srfi-1 'chicken-begin-syntax)) + ('inputs ('list 'libgit2)) + ('propagated-inputs ('list 'chicken-datatype)) ('home-page "https://wiki.call-cc.org/egg/foo") ('synopsis "Example egg") ('description #f) @@ -108,16 +102,9 @@ ('source (? file-like? source)) ('build-system 'chicken-build-system) ('arguments ('quasiquote ('#:egg-name "bar"))) - ('native-inputs - ('quasiquote - (("chicken-test" ('unquote chicken-test)) - ("chicken-begin-syntax" ('unquote chicken-begin-syntax))))) - ('inputs - ('quasiquote - (("libgit2" ('unquote libgit2))))) - ('propagated-inputs - ('quasiquote - (("chicken-datatype" ('unquote chicken-datatype))))) + ('native-inputs ('list 'chicken-test 'chicken-begin-syntax)) + ('inputs ('list 'libgit2)) + ('propagated-inputs ('list 'chicken-datatype)) ('home-page "https://wiki.call-cc.org/egg/bar") ('synopsis "Example egg") ('description #f) -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Jul 14 21:40:45 2021 Received: (at 49566) by debbugs.gnu.org; 15 Jul 2021 01:40:45 +0000 Received: from localhost ([127.0.0.1]:46154 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m3qMm-0003dH-PX for submit@debbugs.gnu.org; Wed, 14 Jul 2021 21:40:45 -0400 Received: from out2.migadu.com ([188.165.223.204]:24359) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m3qMk-0003d2-MB for 49566@debbugs.gnu.org; Wed, 14 Jul 2021 21:40:43 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mgsn.dev; s=key1; t=1626313241; 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=sR5o54/LQhFp0rrUwzo2OOV1wUj64rulCXi5eHQqryA=; b=G8vgEOy5SjCvUvQHvfm61o2CgPW9g236TtXg6v8rmJ5dVB0ekqwpvCeLS6YfUdp4yV54B2 oHDmjBKMlo6gu/dyYQ1LThZ2rHV3JvXmGxPSwxXMSq48OOVvBeQrFngQDJlE0P4I/iupt+ MZdo4ZPULGjvU9ZhXSg/xGAAw1jl+os= From: Sarah Morgensen To: 49566@debbugs.gnu.org Subject: [PATCH core-updates 2/4] import: gem: Emit new-style package inputs. Date: Wed, 14 Jul 2021 18:40:35 -0700 Message-Id: <5f1fb3483c5ecef2a77cafdc195ef791c1423c20.1626311767.git.iskarian@mgsn.dev> In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: iskarian@mgsn.dev X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 49566 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * guix/import/gem.scm (make-gem-sexp): Wrap inputs in 'list' instead of 'quasiquote'. * tests/gem.scm ("gem->guix-package") ("gem-recursive-import"): Adjust accordingly. --- guix/import/gem.scm | 8 ++------ tests/gem.scm | 15 ++++----------- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/guix/import/gem.scm b/guix/import/gem.scm index 418d716be6..0e5bb7e635 100644 --- a/guix/import/gem.scm +++ b/guix/import/gem.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2018 Oleg Pykhalov ;;; Copyright © 2020, 2021 Ludovic Courtès ;;; Copyright © 2020 Martin Becze +;;; Copyright © 2021 Sarah Morgensen ;;; ;;; This file is part of GNU Guix. ;;; @@ -110,12 +111,7 @@ VERSION, HASH, HOME-PAGE, DESCRIPTION, DEPENDENCIES, and LICENSES." ,@(if (null? dependencies) '() `((propagated-inputs - (,'quasiquote - ,(map (lambda (name) - `(,name - (,'unquote - ,(string->symbol name)))) - dependencies))))) + (list ,@(map string->symbol dependencies))))) (synopsis ,synopsis) (description ,description) (home-page ,home-page) diff --git a/tests/gem.scm b/tests/gem.scm index 751bba656f..c8fe15398e 100644 --- a/tests/gem.scm +++ b/tests/gem.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2015 David Thompson ;;; Copyright © 2016 Ricardo Wurmus ;;; Copyright © 2018 Oleg Pykhalov +;;; Copyright © 2021 Sarah Morgensen ;;; ;;; This file is part of GNU Guix. ;;; @@ -93,10 +94,7 @@ ('base32 "1a270mlajhrmpqbhxcqjqypnvgrq4pgixpv3w9gwp1wrrapnwrzk")))) ('build-system 'ruby-build-system) - ('propagated-inputs - ('quasiquote - (("bundler" ('unquote 'bundler)) - ("ruby-bar" ('unquote 'ruby-bar))))) + ('propagated-inputs ('list 'bundler 'ruby-bar)) ('synopsis "A cool gem") ('description "This package provides a cool gem") ('home-page "https://example.com") @@ -132,9 +130,7 @@ ('base32 "1a270mlajhrmpqbhxcqjqypnvgrq4pgixpv3w9gwp1wrrapnwrzk")))) ('build-system 'ruby-build-system) - ('propagated-inputs - ('quasiquote - (('"bundler" ('unquote 'bundler))))) + ('propagated-inputs ('list 'bundler)) ('synopsis "Another cool gem") ('description "Another cool gem") ('home-page "https://example.com") @@ -165,10 +161,7 @@ ('base32 "1a270mlajhrmpqbhxcqjqypnvgrq4pgixpv3w9gwp1wrrapnwrzk")))) ('build-system 'ruby-build-system) - ('propagated-inputs - ('quasiquote - (("bundler" ('unquote 'bundler)) - ("ruby-bar" ('unquote 'ruby-bar))))) + ('propagated-inputs ('list 'bundler 'ruby-bar)) ('synopsis "A cool gem") ('description "This package provides a cool gem") ('home-page "https://example.com") -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Jul 14 21:40:51 2021 Received: (at 49566) by debbugs.gnu.org; 15 Jul 2021 01:40:51 +0000 Received: from localhost ([127.0.0.1]:46158 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m3qMt-0003dl-4o for submit@debbugs.gnu.org; Wed, 14 Jul 2021 21:40:51 -0400 Received: from out2.migadu.com ([188.165.223.204]:24401) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m3qMp-0003dW-QT for 49566@debbugs.gnu.org; Wed, 14 Jul 2021 21:40:49 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mgsn.dev; s=key1; t=1626313246; 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=w1E7+L731Vb/EOueS6jKmKCgWm/oUzPP+eYbhSLt7aY=; b=YM/PknUTRWAxsLSuTRH2XbTpr+1cGUw+cZV3LHzO5dk1baih6xpv10tL9Tict7k3hAzH83 x0oCC4Yt8zKRBrmkApunOdE8qWrcEyGxuNuH5fOgvHG2arQRXwEsm/Y2tCGIMaWo1TY1Qp o8p2AIRXVJTbKfa5YfWI3wtMjL+vnno= From: Sarah Morgensen To: 49566@debbugs.gnu.org Subject: [PATCH core-updates 4/4] import: hackage: Emit new-style package inputs. Date: Wed, 14 Jul 2021 18:40:37 -0700 Message-Id: <66fc4a13098b1d7658175e9b966f4f579ac55b15.1626311767.git.iskarian@mgsn.dev> In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: iskarian@mgsn.dev X-Spam-Score: 2.0 (++) 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 (hackage-module->sexp)[dependencies] [native-dependencies]: Make into a list of symbols. [maybe-inputs]: Wrap INPUTS in 'list' instead of 'quasiquote'. * tests/hackage.scm (m [...] Content analysis details: (2.0 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_MSPIKE_H4 RBL: Very Good reputation (+4) [188.165.223.204 listed in wl.mailspike.net] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: yoctocell.xyz (xyz)] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-Debbugs-Envelope-To: 49566 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) * guix/import/hackage.scm (hackage-module->sexp)[dependencies] [native-dependencies]: Make into a list of symbols. [maybe-inputs]: Wrap INPUTS in 'list' instead of 'quasiquote'. * tests/hackage.scm (match-ghc-foo) (match-ghc-foo-6) (match-ghc-foo-revision): Adjust accordingly. --- guix/import/hackage.scm | 11 +++++------ tests/hackage.scm | 18 +++++------------- 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/guix/import/hackage.scm b/guix/import/hackage.scm index f94a1e7087..7c6d9d0a22 100644 --- a/guix/import/hackage.scm +++ b/guix/import/hackage.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2018 Ricardo Wurmus ;;; Copyright © 2019 Robert Vollmert ;;; Copyright © 2021 Xinglu Chen +;;; Copyright © 2021 Sarah Morgensen ;;; ;;; This file is part of GNU Guix. ;;; @@ -265,14 +266,12 @@ the hash of the Cabal file." hackage-dependencies)) (define dependencies - (map (lambda (name) - (list name (list 'unquote (string->symbol name)))) + (map string->symbol (map hackage-name->package-name hackage-dependencies))) (define native-dependencies - (map (lambda (name) - (list name (list 'unquote (string->symbol name)))) + (map string->symbol (map hackage-name->package-name hackage-native-dependencies))) @@ -282,8 +281,8 @@ the hash of the Cabal file." '()) ((inputs ...) (list (list input-type - (list 'quasiquote inputs)))))) - + `(list ,@inputs)))))) + (define (maybe-arguments) (match (append (if (not include-test-dependencies?) '(#:tests? #f) diff --git a/tests/hackage.scm b/tests/hackage.scm index 66a13d9881..0ecef40b55 100644 --- a/tests/hackage.scm +++ b/tests/hackage.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2015 Federico Beffa ;;; Copyright © 2019 Robert Vollmert ;;; Copyright © 2021 Xinglu Chen +;;; Copyright © 2021 Sarah Morgensen ;;; ;;; This file is part of GNU Guix. ;;; @@ -178,9 +179,7 @@ library ('base32 (? string? hash))))) ('build-system 'haskell-build-system) - ('inputs - ('quasiquote - (("ghc-http" ('unquote 'ghc-http))))) + ('inputs ('list 'ghc-http)) ('home-page "http://test.org") ('synopsis (? string?)) ('description (? string?)) @@ -223,13 +222,8 @@ library ('base32 (? string? hash))))) ('build-system 'haskell-build-system) - ('inputs - ('quasiquote - (("ghc-b" ('unquote 'ghc-b)) - ("ghc-http" ('unquote 'ghc-http))))) - ('native-inputs - ('quasiquote - (("ghc-haskell-gi" ('unquote 'ghc-haskell-gi))))) + ('inputs ('list 'ghc-b 'ghc-http)) + ('native-inputs ('list 'ghc-haskell-gi)) ('home-page "http://test.org") ('synopsis (? string?)) ('description (? string?)) @@ -353,9 +347,7 @@ executable cabal ('base32 (? string? hash))))) ('build-system 'haskell-build-system) - ('inputs - ('quasiquote - (("ghc-http" ('unquote 'ghc-http))))) + ('inputs ('list 'ghc-http)) ('arguments ('quasiquote ('#:cabal-revision -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Jul 14 21:40:57 2021 Received: (at 49566) by debbugs.gnu.org; 15 Jul 2021 01:40:57 +0000 Received: from localhost ([127.0.0.1]:46160 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m3qMv-0003dv-Hv for submit@debbugs.gnu.org; Wed, 14 Jul 2021 21:40:57 -0400 Received: from out0.migadu.com ([94.23.1.103]:19446) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m3qMo-0003dU-JG for 49566@debbugs.gnu.org; Wed, 14 Jul 2021 21:40:50 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mgsn.dev; s=key1; t=1626313244; 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=rML/ZIAYpxkhMsZoUqcAPvsksaBKRjI3fGGD8Rq8JPk=; b=Ovzm1Iaf8j24mzj4sUJ4qtt6npqOAXTiLBMMD+xdWuYvhVXfMpmnoUu7zyk4GatNksvsvY SOxVUEDzXYEmG7tMfMRPHMCXWB01y2y/C9TaXP0hxrOjyvmZGgb6gM+N4/mwHv7KsgivQI zynYMGij2k9i2P8Mw1u0hfSnqTb4Q+4= From: Sarah Morgensen To: 49566@debbugs.gnu.org Subject: [PATCH core-updates 3/4] import: opam: Emit new-style package inputs. Date: Wed, 14 Jul 2021 18:40:36 -0700 Message-Id: In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: iskarian@mgsn.dev X-Spam-Score: 1.3 (+) 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/opam.scm (opam->guix-package): Wrap INPUTS and NATIVE-INPUTS in 'list' instead of 'quasiquote'. (dependency-list->inputs): Return a list of symbols. * tests/opam.scm ("opam->guix-package [...] Content analysis details: (1.3 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_MSPIKE_H4 RBL: Very Good reputation (+4) [94.23.1.103 listed in wl.mailspike.net] -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [94.23.1.103 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 2.0 PDS_OTHER_BAD_TLD Untrustworthy TLDs [URI: yoctocell.xyz (xyz)] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-Debbugs-Envelope-To: 49566 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 0.3 (/) * guix/import/opam.scm (opam->guix-package): Wrap INPUTS and NATIVE-INPUTS in 'list' instead of 'quasiquote'. (dependency-list->inputs): Return a list of symbols. * tests/opam.scm ("opam->guix-package"): Adjust accordingly. --- guix/import/opam.scm | 11 +++++------ tests/opam.scm | 10 +++------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/guix/import/opam.scm b/guix/import/opam.scm index 0201376457..1ce8b7e94e 100644 --- a/guix/import/opam.scm +++ b/guix/import/opam.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2018 Julien Lepiller ;;; Copyright © 2020 Martin Becze ;;; Copyright © 2021 Xinglu Chen +;;; Copyright © 2021 Sarah Morgensen ;;; ;;; This file is part of GNU Guix. ;;; @@ -269,10 +270,8 @@ path to the repository." (map dependency->native-input depends))) (define (dependency-list->inputs lst) - (map - (lambda (dependency) - (list dependency (list 'unquote (string->symbol dependency)))) - (ocaml-names->guix-names lst))) + (map string->symbol + (ocaml-names->guix-names lst))) (define* (opam-fetch name #:optional (repository (get-opam-repository))) (and-let* ((repository repository) @@ -325,10 +324,10 @@ or #f on failure." 'ocaml-build-system)) ,@(if (null? inputs) '() - `((propagated-inputs ,(list 'quasiquote inputs)))) + `((propagated-inputs (list ,@inputs)))) ,@(if (null? native-inputs) '() - `((native-inputs ,(list 'quasiquote native-inputs)))) + `((native-inputs (list ,@native-inputs)))) ,@(if (equal? name (guix-name->opam-name (ocaml-name->guix-name name))) '() `((properties diff --git a/tests/opam.scm b/tests/opam.scm index f1e3b70cb0..e7f1ff9e39 100644 --- a/tests/opam.scm +++ b/tests/opam.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2018 Julien Lepiller ;;; Copyright © 2021 Xinglu Chen +;;; Copyright © 2021 Sarah Morgensen ;;; ;;; This file is part of GNU Guix. ;;; @@ -101,13 +102,8 @@ url { ('base32 (? string? hash))))) ('build-system 'ocaml-build-system) - ('propagated-inputs - ('quasiquote - (("ocaml-zarith" ('unquote 'ocaml-zarith))))) - ('native-inputs - ('quasiquote - (("ocaml-alcotest" ('unquote 'ocaml-alcotest)) - ("ocamlbuild" ('unquote 'ocamlbuild))))) + ('propagated-inputs ('list 'ocaml-zarith)) + ('native-inputs ('list 'ocaml-alcotest 'ocamlbuild)) ('home-page "https://example.org/") ('synopsis "Some example package") ('description "This package is just an example.") -- 2.31.1 From debbugs-submit-bounces@debbugs.gnu.org Tue Jul 20 17:34:10 2021 Received: (at 49566-done) by debbugs.gnu.org; 20 Jul 2021 21:34:10 +0000 Received: from localhost ([127.0.0.1]:35560 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m5xNS-0003b1-61 for submit@debbugs.gnu.org; Tue, 20 Jul 2021 17:34:10 -0400 Received: from eggs.gnu.org ([209.51.188.92]:51500) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m5xNQ-0003ap-9b for 49566-done@debbugs.gnu.org; Tue, 20 Jul 2021 17:34:08 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:59338) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m5xNL-0006DH-28; Tue, 20 Jul 2021 17:34:03 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=45248 helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m5xNK-0000P1-Qz; Tue, 20 Jul 2021 17:34:03 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Sarah Morgensen Subject: Re: bug#49566: [PATCH core-updates 0/4] import: {egg, gem, opam, hackage}: Emit new-style package inputs. References: <66fc4a13098b1d7658175e9b966f4f579ac55b15.1626311767.git.iskarian@mgsn.dev> Date: Tue, 20 Jul 2021 23:34:01 +0200 In-Reply-To: <66fc4a13098b1d7658175e9b966f4f579ac55b15.1626311767.git.iskarian@mgsn.dev> (Sarah Morgensen's message of "Wed, 14 Jul 2021 18:40:37 -0700") Message-ID: <87h7goisae.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 49566-done Cc: 49566-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Applied the whole series. There was another test needing adjustment (see below) so I added it to the last patch. Thank you! Ludo=E2=80=99. --=-=-= Content-Type: text/x-patch Content-Disposition: inline diff --git a/tests/hackage.scm b/tests/hackage.scm index dcf9902c97..073e35ad05 100644 --- a/tests/hackage.scm +++ b/tests/hackage.scm @@ -411,9 +411,7 @@ executable cabal ('base32 (? string? hash))))) ('build-system 'haskell-build-system) - ('inputs - ('quasiquote - (("ghc-http" ('unquote 'ghc-http))))) + ('inputs ('list 'ghc-http)) ('home-page "http://test.org") ('synopsis (? string?)) ('description (? string?)) --=-=-=-- From unknown Thu Aug 21 14:54:43 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Wed, 18 Aug 2021 11:24:10 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator