From patchwork Tue Dec 20 09:34:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 45445 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 8FD1327BBED; Tue, 20 Dec 2022 09:59: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=-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 BB43527BBE9 for ; Tue, 20 Dec 2022 09:59:12 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p7Z2W-0004tR-GH; 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-0004fG-TU 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 1p7Z1f-0002vi-K4 for guix-patches@gnu.org; Tue, 20 Dec 2022 04:35:07 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p7Z1f-0003RY-G1 for guix-patches@gnu.org; Tue, 20 Dec 2022 04:35:07 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#57460] [PATCH v3 08/18] import: gem: 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:07 +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.167152889313110 (code B ref 57460); Tue, 20 Dec 2022 09:35:07 +0000 Received: (at 57460) by debbugs.gnu.org; 20 Dec 2022 09:34:53 +0000 Received: from localhost ([127.0.0.1]:43738 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7Z1Q-0003PN-Um for submit@debbugs.gnu.org; Tue, 20 Dec 2022 04:34:53 -0500 Received: from mout.kundenserver.de ([217.72.192.75]:34865) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7Z1M-0003OT-Hw for 57460@debbugs.gnu.org; Tue, 20 Dec 2022 04:34:49 -0500 Received: from hermia.goebel-consult.de ([87.176.134.225]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.183]) with ESMTPSA (Nemesis) id 1Mn2iP-1oQqKz3y7T-00k6a7 for <57460@debbugs.gnu.org>; Tue, 20 Dec 2022 10:34:42 +0100 Received: from thisbe.goebel-consult.de (hermia.goebel-consult.de [192.168.110.7]) by hermia.goebel-consult.de (Postfix) with ESMTP id A77086699F; Tue, 20 Dec 2022 10:34:23 +0100 (CET) From: Hartmut Goebel Date: Tue, 20 Dec 2022 10:34:13 +0100 Message-Id: <3d65acf2575c85dd5964d35e5d199e7ec6898ce0.1671527962.git.h.goebel@crazy-compilers.com> X-Mailer: git-send-email 2.30.6 In-Reply-To: References: MIME-Version: 1.0 X-Provags-ID: V03:K1:cgV13AUK+JwwUe34fDF4379K3JsnKG+3jyF3hM475TwC4B7dtcO pG55ovO3TkRYBspSR1/7QW0QBIh+HuK/W6Hm+An1UCmg++onOI7myBfYQDnar93Wn0enR72 Q5sv17bytwFEsB6A8iQsKyMt+f6Q+3KojcIvDJ4TA4sNUrKH03FSzVwsb53fzKYFYSFpZmr xV15T8VroiydwsGfyJHeA== UI-OutboundReport: notjunk:1;M01:P0:9iHK6u91gX0=;U5YHUqanYbRmE0iPjUccz169KEi M2Q2h1sDeeHJeAMnUA3BC5VhefyL314kE7ytPcC8/vjn7QQU6599xMFQf8n1uCR/0bPhwZ9Rg EgyhoR/L/1/p2nvNpPtcgbELBQx/Z2/Yh0DzXD38o4k78fmDa5povXemF5cw5SU1Opybmn2dM 28wSyodsIl6Xlwrz/4sw2T2VD2b1pKzTKZ6KURPho8tLtlZQb0PPY8AQXjTvaxzxqR8o28Cvh 4SQae2HnU99fIArwDeZhySdK8sKV09zNKBsJpiP7nbxTWyDfe/vmkWaO9+UJliAMQWF3Hlkx9 ft9kHuR5Lk8lKZ/3Nr3FTJHk47cL1rkfpSosi1IFaMwDuGq5SmAuHx4jOlWrb8SqEZmU2l5VH fhgkc/LwTDKwiUohy/9Ym6x5r1y233gvgltCeZr/Xvrrg4kkzXx6byVDKtyuBfGvq2Eoioi6f BpKGITnzzEChgYyGgzvFnyUQT7PgYqQ0qiPs5NbE/Bncy+lI9pvySzrZjnG1GeCzRmW0pSl+L ZURL529pwX7fCXQtq4Yq61O3ct4G8kY99gloHuUU0MonD1J2LqEkfy1Bl6oll/l55PTIT2TWR 0YNl57xkMVraL6u6GySHHdg7xgEeXC4nU6ydbufIjiqpowxcvd+FZt5I4gx5EJ7Pf0Qdej01k tlCENQmYpuNTPMFEi2/n4irph3Fps4l7K6YRi9/6jw== 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/gem.scm (latest-release): Rename to 'import-release', add #:version argument. If version is given, return an upstream-source for this version. --- guix/import/gem.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/guix/import/gem.scm b/guix/import/gem.scm index 1c6c55baa6..8ad0662628 100644 --- a/guix/import/gem.scm +++ b/guix/import/gem.scm @@ -6,6 +6,7 @@ ;;; Copyright © 2020 Martin Becze ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2022 Taiju HIGASHI +;;; Copyright © 2022 Hartmut Goebel ;;; ;;; This file is part of GNU Guix. ;;; @@ -173,11 +174,11 @@ package on RubyGems." (define gem-package? (url-prefix-predicate "https://rubygems.org/downloads/")) -(define (latest-release package) +(define* (import-release package #:key (version #f)) "Return an for the latest release of PACKAGE." (let* ((gem-name (guix-package->gem-name package)) (gem (rubygems-fetch gem-name)) - (version (gem-version gem)) + (version (or version (gem-version gem))) (url (rubygems-uri gem-name version))) (upstream-source (package (package-name package)) @@ -189,7 +190,7 @@ package on RubyGems." (name 'gem) (description "Updater for RubyGem packages") (pred gem-package?) - (import latest-release))) + (import import-release))) (define* (gem-recursive-import package-name #:optional version) (recursive-import package-name