From patchwork Sat Dec 2 17:23:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Saku Laesvuori X-Patchwork-Id: 57228 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 887F727BBE2; Sat, 2 Dec 2023 17:24:14 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1ADDE27BBEA for ; Sat, 2 Dec 2023 17:24:12 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r9Tic-0002Vw-EH; Sat, 02 Dec 2023 12:23:54 -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 ) id 1r9Tib-0002VW-Dt for guix-patches@gnu.org; Sat, 02 Dec 2023 12:23:53 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r9Tib-0000FA-3m for guix-patches@gnu.org; Sat, 02 Dec 2023 12:23:53 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r9Tij-00081g-M3; Sat, 02 Dec 2023 12:24:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67564] [PATCH v2 1/3] guix: import: hackage: Fix crash on recursive import References: In-Reply-To: Resent-From: Saku Laesvuori Original-Sender: "Debbugs-submit" Resent-CC: lars@6xq.net, guix-patches@gnu.org Resent-Date: Sat, 02 Dec 2023 17:24:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67564 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67564@debbugs.gnu.org Cc: Saku Laesvuori , Lars-Dominik Braun X-Debbugs-Original-Xcc: Lars-Dominik Braun Received: via spool by 67564-submit@debbugs.gnu.org id=B67564.170153781530785 (code B ref 67564); Sat, 02 Dec 2023 17:24:01 +0000 Received: (at 67564) by debbugs.gnu.org; 2 Dec 2023 17:23:35 +0000 Received: from localhost ([127.0.0.1]:58550 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9TiI-00080T-Jk for submit@debbugs.gnu.org; Sat, 02 Dec 2023 12:23:34 -0500 Received: from vmi571514.contaboserver.net ([75.119.130.101]:49808 helo=mail.laesvuori.fi) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r9TiF-00080J-SS for 67564@debbugs.gnu.org; Sat, 02 Dec 2023 12:23:33 -0500 Received: from X-kone.lan (88-113-24-127.elisa-laajakaista.fi [88.113.24.127]) by mail.laesvuori.fi (Postfix) with ESMTPSA id 6AA2334009D; Sat, 2 Dec 2023 18:23:20 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=laesvuori.fi; s=mail; t=1701537801; bh=yEi7TA5KZvgKENmRqaf/k65wMTMrljAOUBUZBSe42Jo=; h=From:To:Cc:Subject:Date; b=c1lWK9slxTxNPaPrgyKUz+2Iu2pXeD4HFa7GfVNhlpFtZakAzSN1Ksl1/iDEb2zif O9OU/jVRQYnlYJQKvHVwYjV3E5+AAOQHEHYLX7W4fmQiOZFqa21HpfdXGkuT6qpl1d A/Z/MNf7gNlw2BG4RPD8ye/EQVwC7lQW+fobAOWc= Date: Sat, 2 Dec 2023 19:23:04 +0200 Message-ID: <1e1cc11c9361ab747435c2159355d14f6046d41d.1701537651.git.saku@laesvuori.fi> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Saku Laesvuori X-ACL-Warn: , Saku Laesvuori via Guix-patches X-Patchwork-Original-From: Saku Laesvuori via Guix-patches via From: Saku Laesvuori Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Fixes: https://issues.guix.gnu.org/64734 * guix/import/hackage.scm (hackage-module->sexp): Return package names instead of records. Change-Id: Id428a8b903b4b59d44205ca366324a0a69a4e05b --- guix/import/hackage.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: cd46757c1a0f886848fbb6828c028dd2a2532767 diff --git a/guix/import/hackage.scm b/guix/import/hackage.scm index 9333bedbbd..bbaee73a06 100644 --- a/guix/import/hackage.scm +++ b/guix/import/hackage.scm @@ -335,7 +335,7 @@ (define* (hackage-module->sexp cabal cabal-hash (synopsis ,(cabal-package-synopsis cabal)) (description ,(beautify-description (cabal-package-description cabal))) (license ,(string->license (cabal-package-license cabal)))) - inputs))) + (map upstream-input-name inputs)))) (define* (hackage->guix-package package-name #:key (include-test-dependencies? #t)