From patchwork Tue Dec 20 09:34:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 45451 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 3F5F327BBED; Tue, 20 Dec 2022 10:02:43 +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=-3.9 required=5.0 tests=BAYES_00,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 9CEE227BBE9 for ; Tue, 20 Dec 2022 10:02:42 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p7Z2W-0004tM-05; Tue, 20 Dec 2022 04:36:00 -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 1p7Z1f-0004eU-0A for guix-patches@gnu.org; Tue, 20 Dec 2022 04:35:12 -0500 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 1p7Z1e-0002vS-MZ for guix-patches@gnu.org; Tue, 20 Dec 2022 04:35:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p7Z1e-0003RF-Hj for guix-patches@gnu.org; Tue, 20 Dec 2022 04:35:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#57460] [PATCH v3 06/18] import: crate: Allow updating to a specific version. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 20 Dec 2022 09:35:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 57460 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch moreinfo To: 57460@debbugs.gnu.org Received: via spool by 57460-submit@debbugs.gnu.org id=B57460.167152889213097 (code B ref 57460); Tue, 20 Dec 2022 09:35:06 +0000 Received: (at 57460) by debbugs.gnu.org; 20 Dec 2022 09:34:52 +0000 Received: from localhost ([127.0.0.1]:43734 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7Z1P-0003P3-T8 for submit@debbugs.gnu.org; Tue, 20 Dec 2022 04:34:52 -0500 Received: from mout.kundenserver.de ([212.227.126.187]:44905) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7Z1H-0003Nv-Ud for 57460@debbugs.gnu.org; Tue, 20 Dec 2022 04:34:44 -0500 Received: from hermia.goebel-consult.de ([87.176.134.225]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.167]) with ESMTPSA (Nemesis) id 1N5mWp-1oo23Z1NZj-017FV0 for <57460@debbugs.gnu.org>; Tue, 20 Dec 2022 10:34:38 +0100 Received: from thisbe.goebel-consult.de (hermia.goebel-consult.de [192.168.110.7]) by hermia.goebel-consult.de (Postfix) with ESMTP id 81EB36696D; Tue, 20 Dec 2022 10:34:23 +0100 (CET) From: Hartmut Goebel Date: Tue, 20 Dec 2022 10:34:11 +0100 Message-Id: X-Mailer: git-send-email 2.30.6 In-Reply-To: References: MIME-Version: 1.0 X-Provags-ID: V03:K1:8Z3RP6vVQBiEPmgqnFGXLbzOcCj+1FH39bGckJKa6fffZuv6R0a 6jslejkkAYmYGkgWzSUeyaSCab3eoyLOu/Utk2wWFtRwUIyicim8c4EUdt2T5u6/VVg3ZZB Cd7T0OUJNUWeBao8nHTBcikomhpcRk09cf8jIv7iYqVc8BC6yk5qobBrkXSlegwGNr5OiSA ZpHMX2B7Tu7DplSdDFL6A== UI-OutboundReport: notjunk:1;M01:P0:l4rf5Vl5dHc=;Tki1LE5AYJA+nvvMQUFjhQ4y/+g 1+cRmCDO1jMoKVGPWf2OuZIDj4zWNIi/sxRfuqGBkj3Q+g7RIoTUVdpAOoEI0MkLI5QL0a7NB O+IZNVMEI02Ng6sVN6fj3PYchDh049FSZMbPjv5XsHVZmDNyNJpYRc0IfLzCtGLZSGx2i8bs7 UH3xEice+OSk6QfiHKbSFomt48L3mYyIDXnTur8sKLIQfs9Aie7ICHcMyEOmYCEiII/vd/F5H CHhE5TmT+IZMnNx9FBSI0nX6o0w1VN0zcZ/yIQZ7eYoVZh9Ei9/QGwtuxYY0uG6s3wEtCE4Sy LU8RjgHBF7fFsxXP5w9b3paeYS3oHQcVcNGcJjctXUgFQ1/e4HQ5z63UwzDTPj+J9sSQcJB+G YViLE33Vnq0ycXBGSvGJpP9eKRKEE3gp7cR/6Z8fZfhx8Jc/JRNPqRzWsQbxYi7y46CfdgM8N 5YKZqIST7vZR5nJBdMwxPqPDrUaGA+LzPkVCWqsOSd8GoidOKmqPlgytHnhnmH2du7Zv4w+iy 8AF6FPdFEPlVPGfJ8Y5IvrmNWuTh+szJc9FFgL2tmJPGOd0+MbjCytYyNwu0gLEgxwKGOs6Tq N+WsqaAP23JOBe009ZSZdv64YaMqcgjK9CHUgI0BxLDeCJXlvVIlfp02fx5nEZH/Q+KGEXBQZ dL1z1uX+I1szJUecqJv7FO82nMc5wKlN+3BYwBJqJ3A7erhCB06kwq+9QH0kcI0= 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/crate.scm (latest-release): Rename to 'import-release', add #:version argument. If version is given, return an upstream-source for this version. --- guix/import/crate.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/guix/import/crate.scm b/guix/import/crate.scm index 51bfcd7bed..339dbcd74c 100644 --- a/guix/import/crate.scm +++ b/guix/import/crate.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2019, 2020, 2021 Ludovic Courtès ;;; Copyright © 2019, 2020 Martin Becze ;;; Copyright © 2021 Nicolas Goaziou +;;; Copyright © 2022 Hartmut Goebel ;;; ;;; This file is part of GNU Guix. ;;; @@ -354,11 +355,12 @@ look up the development dependencs for the given crate." (define crate-package? (url-predicate crate-url?)) -(define (latest-release package) - "Return an for the latest release of PACKAGE." +(define* (import-release package #:key (version #f)) + "Return an for the latest release of PACKAGE. Optionally +include a VERSION string to fetch a specific version." (let* ((crate-name (guix-package->crate-name package)) (crate (lookup-crate crate-name)) - (version (crate-latest-version crate)) + (version (or version (crate-latest-version crate))) (url (crate-uri crate-name version))) (upstream-source (package (package-name package)) @@ -370,5 +372,5 @@ look up the development dependencs for the given crate." (name 'crate) (description "Updater for crates.io packages") (pred crate-package?) - (import latest-release))) + (import import-release)))