From patchwork Tue Mar 21 22:59:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Csepp X-Patchwork-Id: 48556 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 42C0316F9D; Tue, 21 Mar 2023 23:01:22 +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=-1.8 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 8CCA716F87 for ; Tue, 21 Mar 2023 23:01:19 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pekyg-0004RX-9N; Tue, 21 Mar 2023 19:01:14 -0400 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 1pekyV-0004Qi-43 for guix-patches@gnu.org; Tue, 21 Mar 2023 19:01:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pekyU-0005Tq-R1 for guix-patches@gnu.org; Tue, 21 Mar 2023 19:01:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pekyU-0007rl-9W for guix-patches@gnu.org; Tue, 21 Mar 2023 19:01:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62359] [PATCH] import: opam: opam->guix-package: Fix default repo argument. Resent-From: Csepp Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Mar 2023 23:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 62359 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62359@debbugs.gnu.org Cc: raingloom@riseup.net X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167943961830173 (code B ref -1); Tue, 21 Mar 2023 23:01:02 +0000 Received: (at submit) by debbugs.gnu.org; 21 Mar 2023 23:00:18 +0000 Received: from localhost ([127.0.0.1]:32878 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pekxm-0007qb-F5 for submit@debbugs.gnu.org; Tue, 21 Mar 2023 19:00:18 -0400 Received: from lists.gnu.org ([209.51.188.17]:56632) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pekxk-0007qT-Nv for submit@debbugs.gnu.org; Tue, 21 Mar 2023 19:00:17 -0400 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 1pekxj-0004Cl-FC for guix-patches@gnu.org; Tue, 21 Mar 2023 19:00:16 -0400 Received: from mx1.riseup.net ([198.252.153.129]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pekxh-0005B3-Tu for guix-patches@gnu.org; Tue, 21 Mar 2023 19:00:15 -0400 Received: from fews2.riseup.net (fews2-pn.riseup.net [10.0.1.84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "mail.riseup.net", Issuer "R3" (not verified)) by mx1.riseup.net (Postfix) with ESMTPS id 4Ph6Wc592VzDrXK for ; Tue, 21 Mar 2023 23:00:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=riseup.net; s=squak; t=1679439612; bh=HyZMkrnB7Mjt8dxlUrVdYc24jDND1aUIiov63qCKn/Q=; h=From:To:Cc:Subject:Date:From; b=Y3G2ZIka1HCI9mrjTCvIYOzVi2V3dmApqN+BgNdytQwUX75122Tnz490lGhZfhV+g mLlNZd2T+BVb/21yL1S3OY0RujsPwXd2ohyRfnSDug6yKfh5sc5YtxaAbTwy21YD50 vF5RNG3wEY8EYzVX2EhwVc92mNFXfxQCP/jT26AY= X-Riseup-User-ID: 07EF0328028CEBA30B9925D9BAB48E973C3A40425E529940A05C083FC5ACF556 Received: from [127.0.0.1] (localhost [127.0.0.1]) by fews2.riseup.net (Postfix) with ESMTPSA id 4Ph6Wb5zkYz1y7V; Tue, 21 Mar 2023 23:00:11 +0000 (UTC) From: Csepp Date: Tue, 21 Mar 2023 23:59:52 +0100 Message-Id: <20230321225952.5138-1-raingloom@riseup.net> MIME-Version: 1.0 Received-SPF: pass client-ip=198.252.153.129; envelope-from=raingloom@riseup.net; helo=mx1.riseup.net 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, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * guix/import/opam.scm (opam->guix-package): Make default repo a list of strings. --- guix/import/opam.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/guix/import/opam.scm b/guix/import/opam.scm index fa4f678593..4d353248d9 100644 --- a/guix/import/opam.scm +++ b/guix/import/opam.scm @@ -340,7 +340,7 @@ (define (opam->guix-source url-dict) (sha256 (base32 ,(guix-hash-url temp))))))) 'no-source-information))) -(define* (opam->guix-package name #:key (repo 'opam) version #:allow-other-keys) +(define* (opam->guix-package name #:key (repo '("opam")) version #:allow-other-keys) "Import OPAM package NAME from REPOSITORY (a directory name) or, if REPOSITORY is #f, from the official OPAM repository. Return a 'package' sexp or #f on failure."