From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id 17xxGW7VO2BSUgAA0tVLHw (envelope-from ) for ; Sun, 28 Feb 2021 17:39:58 +0000 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id iLzOFG7VO2BEEAAA1q6Kng (envelope-from ) for ; Sun, 28 Feb 2021 17:39:58 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id C286819133 for ; Sun, 28 Feb 2021 18:39:57 +0100 (CET) Received: from localhost ([::1]:53858 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lGQ2u-00054B-Su for larch@yhetil.org; Sun, 28 Feb 2021 12:39:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:44514) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lGQ0H-0003tr-GQ for guix-patches@gnu.org; Sun, 28 Feb 2021 12:37:14 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:35588) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lGQ05-0005se-LU for guix-patches@gnu.org; Sun, 28 Feb 2021 12:37:08 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lGQ05-0007bI-UK for guix-patches@gnu.org; Sun, 28 Feb 2021 12:37:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46832] [PATCH] import: hackage: Accept optional version paramter. Resent-From: Xinglu Chen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 28 Feb 2021 17:37:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 46832 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 46832@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.161453378029152 (code B ref -1); Sun, 28 Feb 2021 17:37:01 +0000 Received: (at submit) by debbugs.gnu.org; 28 Feb 2021 17:36:20 +0000 Received: from localhost ([127.0.0.1]:47131 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lGPzQ-0007a6-Fu for submit@debbugs.gnu.org; Sun, 28 Feb 2021 12:36:20 -0500 Received: from lists.gnu.org ([209.51.188.17]:51180) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lGPzO-0007Zy-CO for submit@debbugs.gnu.org; Sun, 28 Feb 2021 12:36:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42480) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lGPzN-0003Bt-4q for guix-patches@gnu.org; Sun, 28 Feb 2021 12:36:17 -0500 Received: from h87-96-130-155.cust.a3fiber.se ([87.96.130.155]:45844 helo=mail.yoctocell.xyz) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lGPyy-0003zP-J1 for guix-patches@gnu.org; Sun, 28 Feb 2021 12:36:14 -0500 From: Xinglu Chen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yoctocell.xyz; s=mail; t=1614528975; bh=yz4MFK1t7NWRfmuQD8Lg5zx1MFUpzuoW3JsZoKPgVCA=; h=From:To:Subject:Date; b=ZidUHgAB3Tu78mF96LyA+4u5H9ChAE48RAbRVlQXBi5cTXGpWTty2agriWvixxdQ3 vdrlcip+x0Ae0YJEvOQDNHoFEXhSUQoHWLcE0u9Qo1WUuDZI/FmWjkhqlMcCeg1o/x pOSdRK18aZ4MqH8Ni/7s73q5HZbDZjRGp0JeRNUs= Message-Id: <223714e238a28dad4dbbd66a2fa506582a44992a.1614528863.git.public@yoctocell.xyz> Date: Sun, 28 Feb 2021 17:16:10 +0100 MIME-Version: 1.0 Content-Type: text/plain Received-SPF: pass client-ip=87.96.130.155; envelope-from=public@yoctocell.xyz; helo=mail.yoctocell.xyz X-Spam_score_int: 7 X-Spam_score: 0.7 X-Spam_bar: / X-Spam_report: (0.7 / 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, FROM_SUSPICIOUS_NTLD=0.499, FROM_SUSPICIOUS_NTLD_FP=0.001, PDS_OTHER_BAD_TLD=1.325, RDNS_DYNAMIC=0.982, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1614533998; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type:resent-cc:resent-from:resent-sender: resent-message-id:list-id:list-help:list-unsubscribe:list-subscribe: list-post:dkim-signature; bh=1N8IesGHQkf4YxRWwodBrpqWW1Fkn3ADJ4BylJUergc=; b=eRmyCWkBlYkzI4JB0biomAC/bkP0vXYfXib9X0OjuKQNw42YXPiJ9JFVBl0rSyK3niZMOR e2YN5584d6FclJBy/VRPAIlp2+TBfaecJe/ETJJBCmE5ASB7YXXU/A9n2sylyp5S+nQIC+ AX+DaYrGUd8IBFLV+6x0jT/1eOX/vgiAnICTvOU+KwMGZ3OyQjlAUXVIIgVJC68ZJLmvln LUWPgzihPP67X+9yhyxbSV8C6dPBIONxXIYKRYZwBffAxMj837pe0s2WpyEf/bk6QDI/U/ VJQN6Se44hIkb+gSWwNILXmt/UZtk3dsiSNIlu1zDDv7yqtWV6eUk6UtRubxYg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1614533998; a=rsa-sha256; cv=none; b=qL7KNZjZjVyxzWNAHPOLTqqZqetsqQxT62l8fRrRSFH/A/EgOSHzb9uMjoLym09OCpQxaf IyNkVli5fx/7wVx0QT82lFnOvJBsx4UrSWcstMlWYSjQbwUlRnVCKwFpjDQESgvXUKkvSl rPwHL03qqVe1G0xkAd8b96DAYQP88U1ScqIPT2B+Yudpo/7UQLG5L6Z+J1upRTLPofZRW+ uGEOAmcX5IQE1BE+T0gsRDtVGRQzNWQUJ5geF8EW1h6UWO+IAzx6pil6Hgv3qfvPfe0M45 dVhlxfmtc0H901JkkCmdhnip61bt9MLtKHCefvqcx9uD6tOcrtmdvHIcNVHGPw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=yoctocell.xyz header.s=mail header.b=ZidUHgAB; dmarc=fail reason="SPF not aligned (relaxed)" header.from=yoctocell.xyz (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -0.27 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=yoctocell.xyz header.s=mail header.b=ZidUHgAB; dmarc=fail reason="SPF not aligned (relaxed)" header.from=yoctocell.xyz (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: C286819133 X-Spam-Score: -0.27 X-Migadu-Scanner: scn1.migadu.com X-TUID: 9WnuY9nM2WjM * guix/import/hackage.scm (hackage-recursive-import): Add the VERSION key. Make REPO a key. --- Looks like Martin forgot to update the Hackage importer in commit bea3b17739fc591b8cf6db1f8d28a6f6c9585577. guix/import/hackage.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guix/import/hackage.scm b/guix/import/hackage.scm index 6ca4f65cb0..9f992ffe8e 100644 --- a/guix/import/hackage.scm +++ b/guix/import/hackage.scm @@ -344,8 +344,8 @@ respectively." (memoize hackage->guix-package)) (define* (hackage-recursive-import package-name . args) - (recursive-import package-name #f - #:repo->guix-package (lambda (name repo) + (recursive-import package-name + #:repo->guix-package (lambda* (name #:key repo version) (apply hackage->guix-package/m (cons name args))) #:guix-name hackage-name->package-name)) -- 2.30.0