From patchwork Tue Dec 20 09:34:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 45456 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 450A427BBED; Tue, 20 Dec 2022 10:12:30 +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 1A31027BBE9 for ; Tue, 20 Dec 2022 10:12:28 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p7Z2O-0004mk-Bm; Tue, 20 Dec 2022 04:35:57 -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 1p7Z1b-0004dj-N2 for guix-patches@gnu.org; Tue, 20 Dec 2022 04:35:08 -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 1p7Z1b-0002kX-Du for guix-patches@gnu.org; Tue, 20 Dec 2022 04:35:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p7Z1b-0003QL-9L for guix-patches@gnu.org; Tue, 20 Dec 2022 04:35:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#57460] [PATCH v3 01/18] upstream-updater: Rename record field. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 20 Dec 2022 09:35:03 +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.167152887813012 (code B ref 57460); Tue, 20 Dec 2022 09:35:03 +0000 Received: (at 57460) by debbugs.gnu.org; 20 Dec 2022 09:34:38 +0000 Received: from localhost ([127.0.0.1]:43716 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7Z1B-0003No-3A for submit@debbugs.gnu.org; Tue, 20 Dec 2022 04:34:38 -0500 Received: from mout.kundenserver.de ([212.227.126.135]:47083) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7Z16-0003NK-CE for 57460@debbugs.gnu.org; Tue, 20 Dec 2022 04:34:33 -0500 Received: from hermia.goebel-consult.de ([87.176.134.225]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1Mw9oq-1or04M2DAq-00s2uX for <57460@debbugs.gnu.org>; Tue, 20 Dec 2022 10:34:26 +0100 Received: from thisbe.goebel-consult.de (hermia.goebel-consult.de [192.168.110.7]) by hermia.goebel-consult.de (Postfix) with ESMTP id 15798663A4; Tue, 20 Dec 2022 10:34:23 +0100 (CET) From: Hartmut Goebel Date: Tue, 20 Dec 2022 10:34:06 +0100 Message-Id: <563370ec45490a38b9bb4d4ba0a797dfd76ad807.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:hamqOSoXQRcvQnqzsxUNF62fth5/lCZdO6Bc1P9naXDtqQtLbZP /RwoG3AuP+8EEitWzUYtaPioh6ciTQfWX0SYT84C+z88SWbHSZqip17BDoK/qbi5SSnjRHE 1Xh74ZhAn0oSuyCuzJVp0Qg3Xfho/GRjgmz8LIwmYhZakHkMtdqlrlSkbtx4hSTtZ92FyEM dtfxEoC54qM7etHBf5wcA== UI-OutboundReport: notjunk:1;M01:P0:qZFwIGCUUkQ=;enie4ECdoaFWDrjxNLInHpn1Co4 CRgBkFYdaDBthwMAdSA0cYLCN/aXf9EIebbWzf0naJBGROPbkCnErfZ5ERPBL0F10Ol7mgqn+ fnEvZCztYL0eu9PtoYAySx7kpYLlBYkCTcsILKTlthMSiMk3CCXVYrSs4qn9mmVAI0ooy/3JY nrnmhlZfy/4kJDm/+8NHQh5Q6T919a9cHbZmEP0ilrC8tYnOyzLwgVcbnmKif8nlAgUuWg4xW cnvQMQsesAiDKgdbz0Wo0ylbKEEz+o3rQZgDxiQ27s6NdwzmHoXlnt9BC81+6PaIckT5TLF07 +aIEFOkR3xSFzlOb0+Qsg9JCwpBtESrFyyOEWNuD7kwEuq3EmRJDIbRHmvHYHE6GkBHrl+aGV LOuzRm1jFK0045JkWkqH3xBNMA7R1HXmPC5LIXii75YRbTygsrsFwUrF9r+FSaLgDofNGE2QR LeI7wqPcxlMTLUnlOrmvjRSYPyIyvLQV1ikfV9y8zkY/b5F2VP6cYJ1HOjj1lBxQq0anlXYT6 9/3BGkwPfKHLClVAnGc2peCjjSKRDUOU7dnjJ2DOvvJk+ecWcVJHrYF7Dco3H/iw9U6nWv20z asBThsVqEQMzRBv7NA0doX59v6tgGyfW7V+Gl4EyMqMaIMk+TXNFLxJwnrxOQi8poTP6B9Ol7 w0WqodPEkN67i/SeONaHAKQwooNw6IFDqhS5yQzJsOmEmfcYUKihJtEHWZQVk4U= 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 The next commits will make the functions, which are currently importing the latest version of a package, change into importing the latest or a given version of the package (for those updaters supporting specifying a version). Thus the name ‘latest‘ is no longer appropriate. * guix/upstream.scm (upstream-updater) Rename field [latest] to [import]. (lookup-updater, package-latest-release) Adjust fieldname accordingly. * guix/gnu-maintenance.scm (%gnu-updater, %gnu-ftp-updater, %savannah-updater, %sourceforge-updater, %xorg-updater, %kernel.org-updater, %generic-html-updater), guix/import/cpan.scm (%cpan-updater), guix/import/cran.scm (%cran-updater, %bioconductor-updater), guix/import/crate.scm (%crate-updater), guix/import/egg.scm (%egg-updater), guix/import/elpa.scm (%elpa-updater), guix/import/gem.scm (%gem-updater), guix/import/git.scm (%generic-git-updater), guix/import/github.scm (%github-updater), guix/import/gnome.scm (%gnome-updater), guix/import/hackage.scm (%hackage-updater), guix/import/hexpm.scm (%hexpm-updater), guix/import/kde.scm (%kde-updater), guix/import/launchpad.scm (%launchpad-updater), guix/import/minetest.scm (%minetest-updater), guix/import/opam.scm (%opam-updater), guix/import/pypi.scm (%pypi-updater), guix/import/stackage.scm (%stackage-updater), tests/import-github.scm (found-sexp) tests/transformations.scm ("options->transformation, with-latest"): Adjust fieldname accordingly. --- guix/gnu-maintenance.scm | 14 +++++++------- guix/import/cpan.scm | 2 +- guix/import/cran.scm | 4 ++-- guix/import/crate.scm | 2 +- guix/import/egg.scm | 2 +- guix/import/elpa.scm | 2 +- guix/import/gem.scm | 2 +- guix/import/git.scm | 2 +- guix/import/github.scm | 2 +- guix/import/gnome.scm | 2 +- guix/import/hackage.scm | 2 +- guix/import/hexpm.scm | 2 +- guix/import/kde.scm | 2 +- guix/import/launchpad.scm | 2 +- guix/import/minetest.scm | 2 +- guix/import/opam.scm | 2 +- guix/import/pypi.scm | 2 +- guix/import/stackage.scm | 2 +- guix/upstream.scm | 10 +++++----- tests/import-github.scm | 2 +- tests/transformations.scm | 8 ++++---- 21 files changed, 35 insertions(+), 35 deletions(-) diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm index 2881a6be43..3067ee18b3 100644 --- a/guix/gnu-maintenance.scm +++ b/guix/gnu-maintenance.scm @@ -848,7 +848,7 @@ the directory containing its source tarball." (name 'gnu) (description "Updater for GNU packages") (pred gnu-hosted?) - (latest latest-gnu-release))) + (import latest-gnu-release))) (define %gnu-ftp-updater ;; This is for GNU packages taken from alternate locations, such as @@ -859,41 +859,41 @@ the directory containing its source tarball." (pred (lambda (package) (and (not (gnu-hosted? package)) (pure-gnu-package? package)))) - (latest latest-release*))) + (import latest-release*))) (define %savannah-updater (upstream-updater (name 'savannah) (description "Updater for packages hosted on savannah.gnu.org") (pred (url-prefix-predicate "mirror://savannah/")) - (latest latest-savannah-release))) + (import latest-savannah-release))) (define %sourceforge-updater (upstream-updater (name 'sourceforge) (description "Updater for packages hosted on sourceforge.net") (pred (url-prefix-predicate "mirror://sourceforge/")) - (latest latest-sourceforge-release))) + (import latest-sourceforge-release))) (define %xorg-updater (upstream-updater (name 'xorg) (description "Updater for X.org packages") (pred (url-prefix-predicate "mirror://xorg/")) - (latest latest-xorg-release))) + (import latest-xorg-release))) (define %kernel.org-updater (upstream-updater (name 'kernel.org) (description "Updater for packages hosted on kernel.org") (pred (url-prefix-predicate "mirror://kernel.org/")) - (latest latest-kernel.org-release))) + (import latest-kernel.org-release))) (define %generic-html-updater (upstream-updater (name 'generic-html) (description "Updater that crawls HTML pages.") (pred html-updatable-package?) - (latest latest-html-updatable-release))) + (import latest-html-updatable-release))) ;;; gnu-maintenance.scm ends here diff --git a/guix/import/cpan.scm b/guix/import/cpan.scm index 87abe9c2f1..cb2d3dd410 100644 --- a/guix/import/cpan.scm +++ b/guix/import/cpan.scm @@ -358,4 +358,4 @@ in RELEASE, a record." (name 'cpan) (description "Updater for CPAN packages") (pred cpan-package?) - (latest latest-release))) + (import latest-release))) diff --git a/guix/import/cran.scm b/guix/import/cran.scm index 48fbc1dccb..473d8c4f5b 100644 --- a/guix/import/cran.scm +++ b/guix/import/cran.scm @@ -776,13 +776,13 @@ s-expression corresponding to that package, or #f on failure." (name 'cran) (description "Updater for CRAN packages") (pred cran-package?) - (latest latest-cran-release))) + (import latest-cran-release))) (define %bioconductor-updater (upstream-updater (name 'bioconductor) (description "Updater for Bioconductor packages") (pred bioconductor-package?) - (latest latest-bioconductor-release))) + (import latest-bioconductor-release))) ;;; cran.scm ends here diff --git a/guix/import/crate.scm b/guix/import/crate.scm index c76d7e9c1a..51bfcd7bed 100644 --- a/guix/import/crate.scm +++ b/guix/import/crate.scm @@ -370,5 +370,5 @@ look up the development dependencs for the given crate." (name 'crate) (description "Updater for crates.io packages") (pred crate-package?) - (latest latest-release))) + (import latest-release))) diff --git a/guix/import/egg.scm b/guix/import/egg.scm index 0d6d72c465..2ad48c3399 100644 --- a/guix/import/egg.scm +++ b/guix/import/egg.scm @@ -348,6 +348,6 @@ not work." (name 'egg) (description "Updater for CHICKEN egg packages") (pred egg-package?) - (latest latest-release))) + (import latest-release))) ;;; egg.scm ends here diff --git a/guix/import/elpa.scm b/guix/import/elpa.scm index 9399f45ebc..1dbdff9391 100644 --- a/guix/import/elpa.scm +++ b/guix/import/elpa.scm @@ -444,7 +444,7 @@ type ''." (name 'elpa) (description "Updater for ELPA packages") (pred package-from-elpa-repository?) - (latest latest-release))) + (import latest-release))) (define elpa-guix-name (cut guix-name "emacs-" <>)) diff --git a/guix/import/gem.scm b/guix/import/gem.scm index ad1343bff4..1c6c55baa6 100644 --- a/guix/import/gem.scm +++ b/guix/import/gem.scm @@ -189,7 +189,7 @@ package on RubyGems." (name 'gem) (description "Updater for RubyGem packages") (pred gem-package?) - (latest latest-release))) + (import latest-release))) (define* (gem-recursive-import package-name #:optional version) (recursive-import package-name diff --git a/guix/import/git.scm b/guix/import/git.scm index 4cf404677c..bb5ba4d97e 100644 --- a/guix/import/git.scm +++ b/guix/import/git.scm @@ -226,4 +226,4 @@ tag, or #false and #false if the latest version could not be determined." (name 'generic-git) (description "Updater for packages hosted on Git repositories") (pred git-package?) - (latest latest-git-release))) + (import latest-git-release))) diff --git a/guix/import/github.scm b/guix/import/github.scm index e1a1af7133..ac6ef06eda 100644 --- a/guix/import/github.scm +++ b/guix/import/github.scm @@ -330,6 +330,6 @@ releases." (name 'github) (description "Updater for GitHub packages") (pred github-package?) - (latest latest-release))) + (import latest-release))) diff --git a/guix/import/gnome.scm b/guix/import/gnome.scm index 9d8cd8ec76..09c6dbbd0d 100644 --- a/guix/import/gnome.scm +++ b/guix/import/gnome.scm @@ -130,4 +130,4 @@ https://discourse.gnome.org/t/new-gnome-versioning-scheme/4235" (name 'gnome) (description "Updater for GNOME packages") (pred (url-prefix-predicate "mirror://gnome/")) - (latest latest-gnome-release))) + (import latest-gnome-release))) diff --git a/guix/import/hackage.scm b/guix/import/hackage.scm index 878a7d2f9c..d56f52a221 100644 --- a/guix/import/hackage.scm +++ b/guix/import/hackage.scm @@ -381,6 +381,6 @@ respectively." (name 'hackage) (description "Updater for Hackage packages") (pred hackage-package?) - (latest latest-release))) + (import latest-release))) ;;; cabal.scm ends here diff --git a/guix/import/hexpm.scm b/guix/import/hexpm.scm index 2a7a9f3d82..3b63837393 100644 --- a/guix/import/hexpm.scm +++ b/guix/import/hexpm.scm @@ -344,4 +344,4 @@ latest version of PACKAGE-NAME." (name 'hexpm) (description "Updater for hex.pm packages") (pred (url-prefix-predicate hexpm-package-url)) - (latest latest-release))) + (import latest-release))) diff --git a/guix/import/kde.scm b/guix/import/kde.scm index 6873418d62..510d823a4f 100644 --- a/guix/import/kde.scm +++ b/guix/import/kde.scm @@ -187,4 +187,4 @@ not be determined." (name 'kde) (description "Updater for KDE packages") (pred (url-prefix-predicate "mirror://kde/")) - (latest latest-kde-release))) + (import latest-kde-release))) diff --git a/guix/import/launchpad.scm b/guix/import/launchpad.scm index aeb447b0a5..b7e0295c4e 100644 --- a/guix/import/launchpad.scm +++ b/guix/import/launchpad.scm @@ -145,4 +145,4 @@ for example, 'linuxdcpp'. Return #f if there is no releases." (name 'launchpad) (description "Updater for Launchpad packages") (pred launchpad-package?) - (latest latest-release))) + (import latest-release))) diff --git a/guix/import/minetest.scm b/guix/import/minetest.scm index 43cfb533e2..6581013215 100644 --- a/guix/import/minetest.scm +++ b/guix/import/minetest.scm @@ -513,4 +513,4 @@ or #false if the latest release couldn't be determined." (name 'minetest) (description "Updater for Minetest packages on ContentDB") (pred minetest-package?) - (latest latest-minetest-release))) + (import latest-minetest-release))) diff --git a/guix/import/opam.scm b/guix/import/opam.scm index b4b5a6eaad..8a5aa4d8c6 100644 --- a/guix/import/opam.scm +++ b/guix/import/opam.scm @@ -435,4 +435,4 @@ package in OPAM." (name 'opam) (description "Updater for OPAM packages") (pred opam-package?) - (latest latest-release))) + (import latest-release))) diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm index 4760fc3dae..3e3e949283 100644 --- a/guix/import/pypi.scm +++ b/guix/import/pypi.scm @@ -583,4 +583,4 @@ source. To build it from source, refer to the upstream repository at (name 'pypi) (description "Updater for PyPI packages") (pred pypi-package?) - (latest latest-release))) + (import latest-release))) diff --git a/guix/import/stackage.scm b/guix/import/stackage.scm index 49be982a7f..af9809304f 100644 --- a/guix/import/stackage.scm +++ b/guix/import/stackage.scm @@ -175,6 +175,6 @@ PACKAGE or #f if the package is not included in the Stackage LTS release." (name 'stackage) (description "Updater for Stackage LTS packages") (pred stackage-lts-package?) - (latest latest-lts-release))) + (import latest-lts-release))) ;;; stackage.scm ends here diff --git a/guix/upstream.scm b/guix/upstream.scm index 32736940aa..3b576898ec 100644 --- a/guix/upstream.scm +++ b/guix/upstream.scm @@ -66,7 +66,7 @@ upstream-updater-name upstream-updater-description upstream-updater-predicate - upstream-updater-latest + upstream-updater-import upstream-input-change? upstream-input-change-name @@ -241,7 +241,7 @@ correspond to the same version." (name upstream-updater-name) (description upstream-updater-description) (pred upstream-updater-predicate) - (latest upstream-updater-latest)) + (import upstream-updater-import)) (define (importer-modules) "Return the list of importer modules." @@ -272,7 +272,7 @@ correspond to the same version." "Return an updater among UPDATERS that matches PACKAGE, or #f if none of them matches." (find (match-lambda - (($ name description pred latest) + (($ name description pred import) (pred package))) updaters)) @@ -285,9 +285,9 @@ them until one of them returns an upstream source. It is the caller's responsibility to ensure that the returned source is newer than the current one." (any (match-lambda - (($ name description pred latest) + (($ name description pred import) (and (pred package) - (latest package)))) + (import package)))) updaters)) (define* (package-latest-release* package diff --git a/tests/import-github.scm b/tests/import-github.scm index 4d3f8cfc7e..5100296540 100644 --- a/tests/import-github.scm +++ b/tests/import-github.scm @@ -92,7 +92,7 @@ (define* (found-sexp old-version old-commit tags releases) (and=> (call-with-releases (lambda () - ((upstream-updater-latest %github-updater) + ((upstream-updater-import %github-updater) (example-package old-version old-commit))) tags releases) upstream-source->sexp)) diff --git a/tests/transformations.scm b/tests/transformations.scm index 47b1fc650d..5c136e1d48 100644 --- a/tests/transformations.scm +++ b/tests/transformations.scm @@ -488,10 +488,10 @@ (name 'dummy) (pred (const #t)) (description "") - (latest (const (upstream-source - (package "foo") - (version "42.0") - (urls '("http://example.org"))))))))) + (import (const (upstream-source + (package "foo") + (version "42.0") + (urls '("http://example.org"))))))))) (let* ((p (dummy-package "foo" (version "1.0"))) (t (options->transformation `((with-latest . "foo"))))) From patchwork Tue Dec 20 09:34:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 45443 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 35CDD27BBEB; Tue, 20 Dec 2022 09:54:30 +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 autolearn=unavailable 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 F00DF27BBE9 for ; Tue, 20 Dec 2022 09:54:26 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p7Z2V-0004sr-AU; Tue, 20 Dec 2022 04:35:59 -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 1p7Z1e-0004eF-9o for guix-patches@gnu.org; Tue, 20 Dec 2022 04:35:11 -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 1p7Z1d-0002qn-Hn for guix-patches@gnu.org; Tue, 20 Dec 2022 04:35:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p7Z1d-0003R1-Dz for guix-patches@gnu.org; Tue, 20 Dec 2022 04:35:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#57460] [PATCH v3 02/18] import: cpan: Remove unused exports. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 20 Dec 2022 09:35:05 +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.167152888313053 (code B ref 57460); Tue, 20 Dec 2022 09:35:05 +0000 Received: (at 57460) by debbugs.gnu.org; 20 Dec 2022 09:34:43 +0000 Received: from localhost ([127.0.0.1]:43725 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7Z1H-0003OQ-3E for submit@debbugs.gnu.org; Tue, 20 Dec 2022 04:34:43 -0500 Received: from mout.kundenserver.de ([212.227.17.13]:44509) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7Z1A-0003NR-Bw for 57460@debbugs.gnu.org; Tue, 20 Dec 2022 04:34:40 -0500 Received: from hermia.goebel-consult.de ([87.176.134.225]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MkHEN-1oROZB2UTx-00keHQ for <57460@debbugs.gnu.org>; Tue, 20 Dec 2022 10:34:28 +0100 Received: from thisbe.goebel-consult.de (hermia.goebel-consult.de [192.168.110.7]) by hermia.goebel-consult.de (Postfix) with ESMTP id 2CAD8663C4; Tue, 20 Dec 2022 10:34:23 +0100 (CET) From: Hartmut Goebel Date: Tue, 20 Dec 2022 10:34:07 +0100 Message-Id: X-Mailer: git-send-email 2.30.6 In-Reply-To: References: MIME-Version: 1.0 X-Provags-ID: V03:K1:iFVIXS/6bht+9GRNmZ+mL0yIUdcBCRd8emddt7Ow52gbCrsLsY9 WlGEd2vxAGRfRL+w1wMGv15Mlv2Wm38xaGl+8vA5+WxDTCol3jjmmLzPj1duE57zQ2OBa1k ZeN3HyPF7k8NTM37qIOT4ADJV8G9/J9kl0piDmBFT3k3xF98az0M0m+Pgxa/7zJgDVfun6I uIY3q7odZUeVYao0D7iZQ== UI-OutboundReport: notjunk:1;M01:P0:TQrFTYD7As0=;v1yZT2vFQNquzrD1xZuZN2KgGdf yg84o8zpGlPuQQK2+f0b7h7YxC+Gn7DQRLbzXTdci/cO5CheUEF1HNZqmaSEZ057gbhm9/8FG XwfYy4avymF760QcgE+lFcqrjV2mORSWQ90y0MUnIf+6aGTyQiqnirujcx3GBf/LF4Zc3V18z SdNafVfRWIP1lxmN5eqnIQyycA+HNexqSXXKc+QTgTefYeWEsg1yJLv7StSNLVvB4RoyVX7ub qJ1/FAq7DWTd2Tbdefwwu0BMlCkX9u+a417aqv4dA0zb4/BKwYSiDmDphLNFid4lA2bZFrSVP 6LbjGAMg7wnxePBpPuetjTLh+cz72HB0rv+wB2tNQ/Om/vhmKWb+N1moRxSvUkDlnut12E2QO OzK/9DwfBHrjDgC9oetZMxkszZLLP9zAUu2UXzfv5aT8zEUUxOc3VL3AcX5N0yRtvt7gWRjk6 BVRZ0FAd5X1CSDuj0GQRZ0MgftMkpvLGyq1+ywWbGiTQ3dZ5AqV0vDppDoxwC/dMjn1+r7mT3 u7UUxCueJsC0YeX75nybJh/Owcvzpn6l9dB+ey8dNBxmr4L8wKfOCP5jvTGQ8ZXMGvVNqtlB2 yyUVEC8djNFRMQSWqhz8PTuy09A2agWh0ly9akOyphNCkLYTAsZCFDcwNNK/nAxtEvL/KnMJT ngSyWvHG0hWWeIy8hN6y3HPMaLSMD8QQAdfJWcBxrg== 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/cpan.scm (#:export): Remove unused exports. --- guix/import/cpan.scm | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/guix/import/cpan.scm b/guix/import/cpan.scm index cb2d3dd410..a929dc62e3 100644 --- a/guix/import/cpan.scm +++ b/guix/import/cpan.scm @@ -39,26 +39,7 @@ #:use-module (guix packages) #:use-module (guix upstream) #:use-module (guix derivations) - #:export (cpan-dependency? - cpan-dependency-relationship - cpan-dependency-phase - cpan-dependency-module - cpan-dependency-version - - cpan-release? - cpan-release-license - cpan-release-author - cpan-release-version - cpan-release-module - cpan-release-distribution - cpan-release-download-url - cpan-release-abstract - cpan-release-home-page - cpan-release-dependencies - json->cpan-release - - cpan-fetch - cpan->guix-package + #:export (cpan->guix-package metacpan-url->mirror-url %cpan-updater From patchwork Tue Dec 20 09:34:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 45452 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 EDA9C27BBED; Tue, 20 Dec 2022 10:05:13 +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=unavailable 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 13EB727BBE9 for ; Tue, 20 Dec 2022 10:05:11 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p7Z2X-0004tf-1c; Tue, 20 Dec 2022 04:36:01 -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 1p7Z1c-0004dt-Nj for guix-patches@gnu.org; Tue, 20 Dec 2022 04:35:09 -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 1p7Z1c-0002kd-ER for guix-patches@gnu.org; Tue, 20 Dec 2022 04:35:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p7Z1c-0003Qb-8F for guix-patches@gnu.org; Tue, 20 Dec 2022 04:35:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#57460] [PATCH v3 03/18] import: Issue error-message if version is given. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 20 Dec 2022 09:35:04 +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.167152888213038 (code B ref 57460); Tue, 20 Dec 2022 09:35:04 +0000 Received: (at 57460) by debbugs.gnu.org; 20 Dec 2022 09:34:42 +0000 Received: from localhost ([127.0.0.1]:43720 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7Z1F-0003OD-4a for submit@debbugs.gnu.org; Tue, 20 Dec 2022 04:34:42 -0500 Received: from mout.kundenserver.de ([212.227.126.131]:59129) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7Z1D-0003NY-2m for 57460@debbugs.gnu.org; Tue, 20 Dec 2022 04:34:40 -0500 Received: from hermia.goebel-consult.de ([87.176.134.225]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MXGSU-1pOkS91GgQ-00Yhy4 for <57460@debbugs.gnu.org>; Tue, 20 Dec 2022 10:34:31 +0100 Received: from thisbe.goebel-consult.de (hermia.goebel-consult.de [192.168.110.7]) by hermia.goebel-consult.de (Postfix) with ESMTP id 432B2663CC; Tue, 20 Dec 2022 10:34:23 +0100 (CET) From: Hartmut Goebel Date: Tue, 20 Dec 2022 10:34:08 +0100 Message-Id: <88e627ef28e4025b8cb670461f827c59c1b89276.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:fNNbmREUa0P2uysajcHIAiHn7cVskWtiUN9JC26EUd0HKf/QGrS 3IZEjMMFoLiZvjSYvR0ZEdhz424M1ryiN3ZEq01ohPWT9zYX4JQK6yhiKo1E5A1qbwFSvy3 7zAf11lvrwZ6W8UkI4lyVyAFNx3VAi0Pu+ncZbu/YykYDvPZAGzHCbTSVngoRm+ZwKVOd0y Ym97aERDsBITaX7A1x70Q== UI-OutboundReport: notjunk:1;M01:P0:9bXuxuMtCp8=;mV21hqzGWJaYalG/WVR0Ky2Pud0 MsmsaNd016oIH9GRrn33KvUe+kMsw6pIBtX5ksC3qVnQG5LmOHd385ApNwCvkEIiKYC18uykT uyTx5EaQg852Bk80fxGROd4rDT1Y81nJDruZx/BQuugW5wRjh7n8DIc+K8+PlkGJt7sQnv5jZ D/1zQr3R1ZmdLwxD5wAS62G1uXo3ULHG3FiSHHwYSHR/RHQUYFbxSbeNoE2i8cYm/2ojC5M1W +F53eYzaXAIKaFVMNqPWYN+O0YlO8ZC05gkliKtMBjuvaTM2C0NQrdzlZ5H/p5ekF0d7g/RJw oLD1iFQ30wz2A6J+s7DKjpGGRd/u+EcI7F1LUbiK9200XBF1khH8gIK3RN1wKig+XKcc8F3b0 x/RnHIRKPSx0m2taZvyRpsiag1z/pej4RHkHzN2qv1EmAJ/Jrgb104QcOA9M2HJPuj73KRJPA nkbUUdNVsPSSO6ExUByC9q9Ej6Ie7uqSSx7F/JtC19DaIQbdkH96Pa52DFTafZ5ryHylvpaGT PgFU2tslfKCxWth9QthZaL6ymy+MbS+2ZZCuSOK64zfJZbzQ3t9pL/RMFzSwh45Ox+1Q600U1 SDoNsfvgE7vWVbhRIv2wfMaCjkqWWVprIWjt3tr5HvViEyUA6yaGG4KvSQQPCYXhcqpm/TXg2 M2aqzU7NTM0P1XXC40jHCPWGWeWG09YOgYBBQ+L0FA== 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 These importer don't support importing a specific version, thus the updater does neither. Issue an error message in case version is given. * guix/import/cpan.scm (latest-release), guix/import/elpa.scm (latest-release), guix/import/hackage.scm (latest-release), guix/import/minetest.scm (latest-minetest-release), guix/import/opam.scm (latest-release): Add #:version argument, issue error if version is given. * guix/import/cran.scm (latest-cran-release): Same. (latest-bioconductor-release) Same. : rename to . * guix/import/stackage.scm (latest-lts-release): For each generated updater, add #:version argument and issue error if version is given. --- guix/import/cpan.scm | 9 ++++++++- guix/import/cran.scm | 19 +++++++++++++++---- guix/import/elpa.scm | 9 ++++++++- guix/import/hackage.scm | 10 +++++++++- guix/import/minetest.scm | 10 +++++++++- guix/import/opam.scm | 9 ++++++++- guix/import/stackage.scm | 8 +++++++- 7 files changed, 64 insertions(+), 10 deletions(-) diff --git a/guix/import/cpan.scm b/guix/import/cpan.scm index a929dc62e3..8972b87080 100644 --- a/guix/import/cpan.scm +++ b/guix/import/cpan.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2016 Alex Sassmannshausen ;;; Copyright © 2017, 2018 Tobias Geerinckx-Rice ;;; Copyright © 2020, 2021 Ludovic Courtès +;;; Copyright © 2022 Hartmut Goebel ;;; ;;; This file is part of GNU Guix. ;;; @@ -29,6 +30,7 @@ #:use-module (srfi srfi-26) #:use-module (json) #:use-module (gcrypt hash) + #:use-module (guix diagnostics) #:use-module (guix store) #:use-module (guix utils) #:use-module (guix base32) @@ -305,8 +307,13 @@ in RELEASE, a record." ")")))) (url-predicate (cut regexp-exec cpan-rx <>)))) -(define (latest-release package) +(define* (latest-release package #:key (version #f)) "Return an for the latest release of PACKAGE." + (when version + (error + (formatted-message + (G_ "~a updater doesn't support updating to a specific version, sorry.") + "cpan"))) (match (cpan-fetch (package->upstream-name package)) (#f #f) (release diff --git a/guix/import/cran.scm b/guix/import/cran.scm index 473d8c4f5b..1ed3580315 100644 --- a/guix/import/cran.scm +++ b/guix/import/cran.scm @@ -5,6 +5,7 @@ ;;; Copyright © 2020 Martin Becze ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2021 Simon Tournier +;;; Copyright © 2022 Hartmut Goebel ;;; ;;; This file is part of GNU Guix. ;;; @@ -693,8 +694,13 @@ s-expression corresponding to that package, or #f on failure." (_ #f))) (_ #f))))) -(define (latest-cran-release pkg) +(define* (latest-cran-release pkg #:key (version #f)) "Return an for the latest release of the package PKG." + (when version + (error + (formatted-message + (G_ "~a provides only the latest version of each package, sorry.") + "CRAN"))) (define upstream-name (package->upstream-name pkg)) @@ -713,20 +719,25 @@ s-expression corresponding to that package, or #f on failure." (changed-inputs pkg (description->package 'cran meta))))))) -(define (latest-bioconductor-release pkg) +(define* (latest-bioconductor-release pkg #:key (version #f)) "Return an for the latest release of the package PKG." + (when version + (error + (formatted-message + (G_ "~a provides only the latest version of each package, sorry.") + "bioconductor.org"))) (define upstream-name (package->upstream-name pkg)) - (define version + (define latest-version (latest-bioconductor-package-version upstream-name)) (and version ;; Bioconductor does not provide signatures. (upstream-source (package (package-name pkg)) - (version version) + (version latest-version) (urls (bioconductor-uri upstream-name version)) (input-changes (changed-inputs diff --git a/guix/import/elpa.scm b/guix/import/elpa.scm index 1dbdff9391..f9e9f2de53 100644 --- a/guix/import/elpa.scm +++ b/guix/import/elpa.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2021 Xinglu Chen ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2021 Simon Tournier +;;; Copyright © 2022 Hartmut Goebel ;;; ;;; This file is part of GNU Guix. ;;; @@ -35,6 +36,7 @@ #:use-module (srfi srfi-26) #:use-module (srfi srfi-34) #:use-module (srfi srfi-35) + #:use-module (guix diagnostics) #:use-module ((guix download) #:select (download-to-store)) #:use-module (guix import utils) #:use-module (guix http-client) @@ -400,11 +402,16 @@ type ''." (string-drop (package-name package) 6) (package-name package)))) -(define (latest-release package) +(define* (latest-release package #:key (version #f)) "Return an for the latest release of PACKAGE." (define name (guix-package->elpa-name package)) (define repo (elpa-repository package)) + (when version + (error + (formatted-message + (G_ "~a updater doesn't support updating to a specific version, sorry.") + "elpa"))) (match (elpa-package-info name repo) (#f ;; No info, perhaps because PACKAGE is not truly an ELPA package. diff --git a/guix/import/hackage.scm b/guix/import/hackage.scm index d56f52a221..3c2cd75db4 100644 --- a/guix/import/hackage.scm +++ b/guix/import/hackage.scm @@ -7,6 +7,7 @@ ;;; Copyright © 2021 Xinglu Chen ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2019 Simon Tournier +;;; Copyright © 2022 Hartmut Goebel ;;; ;;; This file is part of GNU Guix. ;;; @@ -30,10 +31,12 @@ #:use-module (srfi srfi-34) #:use-module (srfi srfi-26) #:use-module (srfi srfi-1) + #:use-module (guix diagnostics) #:use-module ((guix download) #:select (download-to-store url-fetch)) #:use-module ((guix utils) #:select (package-name->name+version canonical-newline-port)) #:use-module (guix http-client) + #:use-module (guix i18n) #:use-module (guix import utils) #:use-module (guix import cabal) #:use-module (guix store) @@ -359,8 +362,13 @@ respectively." (let ((hackage-rx (make-regexp "(https?://hackage.haskell.org|mirror://hackage/)"))) (url-predicate (cut regexp-exec hackage-rx <>)))) -(define (latest-release package) +(define* (latest-release package #:key (version #f)) "Return an for the latest release of PACKAGE." + (when version + (error + (formatted-message + (G_ "~a updater doesn't support updating to a specific version, sorry.") + "hackage"))) (let* ((hackage-name (guix-package->hackage-name package)) (cabal-meta (hackage-fetch hackage-name))) (match cabal-meta diff --git a/guix/import/minetest.scm b/guix/import/minetest.scm index 6581013215..1f1cfc834d 100644 --- a/guix/import/minetest.scm +++ b/guix/import/minetest.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2021, 2022 Maxime Devos +;;; Copyright © 2022 Hartmut Goebel ;;; ;;; This file is part of GNU Guix. ;;; @@ -25,6 +26,7 @@ #:use-module (srfi srfi-2) #:use-module (srfi srfi-11) #:use-module (srfi srfi-26) + #:use-module (guix diagnostics) #:use-module ((guix packages) #:prefix package:) #:use-module (guix upstream) #:use-module (guix utils) @@ -486,7 +488,7 @@ list of AUTHOR/NAME strings." (and (string-prefix? "minetest-" (package:package-name pkg)) (assq-ref (package:package-properties pkg) 'upstream-name))) -(define (latest-minetest-release pkg) +(define* (latest-minetest-release pkg #:key (version #f)) "Return an for the latest release of the package PKG, or #false if the latest release couldn't be determined." (define author/name @@ -494,6 +496,12 @@ or #false if the latest release couldn't be determined." (define contentdb-package (contentdb-fetch author/name)) ; TODO warn if #f? (define release (latest-release author/name)) (define source (package:package-source pkg)) + + (when version + (error + (formatted-message + (G_ "~a updater doesn't support updating to a specific version, sorry.") + "minetest"))) (and contentdb-package release (release-commit release) ; not always set ;; Only continue if both the old and new version number are both diff --git a/guix/import/opam.scm b/guix/import/opam.scm index 8a5aa4d8c6..59dbb7cb8b 100644 --- a/guix/import/opam.scm +++ b/guix/import/opam.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2021 Xinglu Chen ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2021, 2022 Alice Brenon +;;; Copyright © 2022 Hartmut Goebel ;;; ;;; This file is part of GNU Guix. ;;; @@ -35,6 +36,7 @@ #:use-module ((guix build utils) #:select (dump-port find-files mkdir-p)) #:use-module (guix build-system) #:use-module (guix build-system ocaml) + #:use-module (guix diagnostics) #:use-module (guix http-client) #:use-module (guix ui) #:use-module (guix packages) @@ -417,8 +419,13 @@ package in OPAM." (member (build-system-name (package-build-system package)) '(dune ocaml)) (not (string-prefix? "ocaml4" (package-name package))))) -(define (latest-release package) +(define* (latest-release package #:key (version #f)) "Return an for the latest release of PACKAGE." + (when version + (error + (formatted-message + (G_ "~a updater doesn't support updating to a specific version, sorry.") + "opam"))) (and-let* ((opam-name (guix-package->opam-name package)) (opam-file (opam-fetch opam-name)) (version (assoc-ref opam-file "version")) diff --git a/guix/import/stackage.scm b/guix/import/stackage.scm index af9809304f..e54df95985 100644 --- a/guix/import/stackage.scm +++ b/guix/import/stackage.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2020 Martin Becze ;;; Copyright © 2021 Xinglu Chem ;;; Copyright © 2021 Ludovic Courtès +;;; Copyright © 2022 Hartmut Goebel ;;; ;;; This file is part of GNU Guix. ;;; @@ -139,9 +140,14 @@ included in the Stackage LTS release." (mlambda () (stackage-lts-packages (stackage-lts-info-fetch %default-lts-version))))) - (lambda* (pkg) + (lambda* (pkg #:key (version #f)) "Return an for the latest Stackage LTS release of PACKAGE or #f if the package is not included in the Stackage LTS release." + (when version + (error + (formatted-message + (G_ "~a updater doesn't support updating to a specific version, sorry.") + "stackage"))) (let* ((hackage-name (guix-package->hackage-name pkg)) (version (lts-package-version (packages) hackage-name)) (name-version (hackage-name-version hackage-name version))) From patchwork Tue Dec 20 09:34:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 45446 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 1017A27BBE9; Tue, 20 Dec 2022 09:59:34 +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=unavailable 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 0F13E27BBEB for ; Tue, 20 Dec 2022 09:59:33 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p7Z2x-0005Cb-6E; Tue, 20 Dec 2022 04:36:27 -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 1p7Z1e-0004eE-A3 for guix-patches@gnu.org; Tue, 20 Dec 2022 04:35:11 -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 1p7Z1d-0002mw-4f for guix-patches@gnu.org; Tue, 20 Dec 2022 04:35:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p7Z1d-0003Qt-0C for guix-patches@gnu.org; Tue, 20 Dec 2022 04:35:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#57460] [PATCH v3 04/18] import: sourceforge: Issue error-message if version is given. Resent-From: Hartmut Goebel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 20 Dec 2022 09:35:04 +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.167152888313044 (code B ref 57460); Tue, 20 Dec 2022 09:35:04 +0000 Received: (at 57460) by debbugs.gnu.org; 20 Dec 2022 09:34:43 +0000 Received: from localhost ([127.0.0.1]:43722 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7Z1G-0003OF-70 for submit@debbugs.gnu.org; Tue, 20 Dec 2022 04:34:42 -0500 Received: from mout.kundenserver.de ([212.227.126.187]:57107) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7Z1D-0003Ne-83 for 57460@debbugs.gnu.org; Tue, 20 Dec 2022 04:34:40 -0500 Received: from hermia.goebel-consult.de ([87.176.134.225]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.167]) with ESMTPSA (Nemesis) id 1McH1Q-1obXaH2XPA-00cirj for <57460@debbugs.gnu.org>; Tue, 20 Dec 2022 10:34:33 +0100 Received: from thisbe.goebel-consult.de (hermia.goebel-consult.de [192.168.110.7]) by hermia.goebel-consult.de (Postfix) with ESMTP id 52F48663DB; Tue, 20 Dec 2022 10:34:23 +0100 (CET) From: Hartmut Goebel Date: Tue, 20 Dec 2022 10:34:09 +0100 Message-Id: <4233f0aa1b008ba00d1d9630aef291e45bc2c59d.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:eIdEgUBzUb6dmwD+hCcjYKyhLYREQZLfIuis9t9rAeM9TpJqt84 XTvBSCIBoN44W4pCxNIAdnG842gV4GsXtbhDXI8k/4EmvH2DPaMTiiD/HBPeepdSyol1z0g a1pVg15Wdxts8TXTSLDnaeBbc0OZLUfnFY+GRVyTxEQTSRZ9F1kSiaCNuX7e9DI4BS4ygHD LkrgZsCGMPAEH/SmZJILw== UI-OutboundReport: notjunk:1;M01:P0:uPZdCFuwsgE=;hhc8cNXnfdgZs84rsoy+A/ATmcV fQXTFROJ+JpXNbr9SN6oP8pWJeO9kYqiL+9LK+ByyIUg5lKvqWSqri8Kbsfvs8QEmNwbHsvKc F0jQleXVYgKkXeQxl8XlVWS7VJyHV9K03tG9YqFEgPbyZNrvjTJRg28wEqmFUmacpLZv5ehPj 0LYmOdoFVbEbPkpIPjXSSyg2GVD4Wrn1cAi3pThzuDArYupXH2iolvfWM1MOIoKHN1RPE0MHW hmL42XniKye873rvPbLhZ8OGVv2oWpsW0LVCYkUb+S2c4rWS8YVotVJnCXzzNhtAOzRrNN+8F dVtvPSppIW9WUzLDJSUQcsURW/jzKDMzvW12hUwwT1YcZ2f7+Dw0myOktpRd4mQPv4cYHRP9+ NT+ZCIrfW1htILDc4MxqWb6OzWJqiMsRjOKAhgJSar3nZMoyfoy53OnO7QGzK/78qt6n7Q5mG 84vPULuP4S5ZPueuELN+LT4S+SVhIk00dfATifAsK1crOd9bReGKNCBfYj9rBSXAlm1QDl/nw MZdiy/O5mVJpAnDEtx6sQfATok3/0QI+uMr3P9gcAmVxl1OBQ+QZPIG1/EQsZoKXaC14R6PrV bmMGnzoXn67f/b6g3Z8Yxy9dEGbT831XRAvaWyUyr/lA8SuFC4q82S7hpMNm74hMHCmjiH4En bTw973xxOgztABLgbTIOMPl3nZuYphWNednaUKU8IQ== 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 Due to the complicated directory structure at sourceforce, enabling the sourceforge importer to update to a specific version is very complicated to implement. Since only 2.0% of the packages in guix are covered by this updater I dedided to not implement this. * guix/gnu-maintenance.scm (latest-sourceforge-release): Add #:version argument. Issue error-message if version is given. --- guix/gnu-maintenance.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm index 3067ee18b3..e414de8e28 100644 --- a/guix/gnu-maintenance.scm +++ b/guix/gnu-maintenance.scm @@ -37,6 +37,8 @@ #:autoload (guix download) (%mirrors) #:use-module (guix ftp-client) #:use-module (guix utils) + #:use-module (guix diagnostics) + #:use-module (guix i18n) #:use-module (guix memoization) #:use-module (guix records) #:use-module (guix upstream) @@ -705,7 +707,7 @@ GNOME packages; EMMS is included though, because its releases are on gnu.org." #:base-url %savannah-base #:directory directory))) -(define (latest-sourceforge-release package) +(define* (latest-sourceforge-release package #:key (version #f)) "Return the latest release of PACKAGE." (define (uri-append uri extension) ;; Return URI with EXTENSION appended. @@ -720,6 +722,12 @@ GNOME packages; EMMS is included though, because its releases are on gnu.org." ((200 302) #t) (else #f)))) + (when version + (error + (formatted-message + (G_ "Updating to a specific version is not yet implemented for ~a, sorry.") + "sourceforge"))) + (let* ((name (package-upstream-name package)) (base (string-append "https://sourceforge.net/projects/" name "/files")) From patchwork Tue Dec 20 09:34:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 45449 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 F13F627BBED; Tue, 20 Dec 2022 10:01:04 +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 82ED527BBE9 for ; Tue, 20 Dec 2022 10:01:02 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p7Z2n-00056J-J2; Tue, 20 Dec 2022 04:36:17 -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 1p7Z1e-0004eH-Av for guix-patches@gnu.org; Tue, 20 Dec 2022 04:35:11 -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-0002vB-0y 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 1p7Z1d-0003R8-R7 for guix-patches@gnu.org; Tue, 20 Dec 2022 04:35:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#57460] [PATCH v3 05/18] gnu-maintenance: 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:05 +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.167152889213089 (code B ref 57460); Tue, 20 Dec 2022 09:35:05 +0000 Received: (at 57460) by debbugs.gnu.org; 20 Dec 2022 09:34:52 +0000 Received: from localhost ([127.0.0.1]:43731 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7Z1O-0003Ow-L3 for submit@debbugs.gnu.org; Tue, 20 Dec 2022 04:34:51 -0500 Received: from mout.kundenserver.de ([217.72.192.75]:43409) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7Z1G-0003Nn-68 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 (mreue108 [212.227.15.183]) with ESMTPSA (Nemesis) id 1N2m3G-1okRY802G4-0138tG for <57460@debbugs.gnu.org>; Tue, 20 Dec 2022 10:34:36 +0100 Received: from thisbe.goebel-consult.de (hermia.goebel-consult.de [192.168.110.7]) by hermia.goebel-consult.de (Postfix) with ESMTP id 6AD2E6696C; Tue, 20 Dec 2022 10:34:23 +0100 (CET) From: Hartmut Goebel Date: Tue, 20 Dec 2022 10:34:10 +0100 Message-Id: <215e393122cd3b18318ed1d5893af64d995b248e.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:UDLk4DOsQAga+2HXz6q8ynveAVcxMZXAtRWTkMa1sxpqODce3D6 zUf3Ed/VdyZsJeZ04bMDyu3v236NzBSw5byzi4ZaBb0inrPkvjpQKY6dYOcrGUiAtdSOSwO tQULTQHZXZMcVo4eQ/FtfxG9VkpB3oujMNxKqRvGeC9E91qM1Vwc1Wj3Lc/r5Kqt87sCeIG QZHC3H7/q7LnU6WboFJ5A== UI-OutboundReport: notjunk:1;M01:P0:fIYZEFIL0+E=;eAI3cQL6bk6LlZVAXwd0aLkqqnO pG4tJoyqaDVe6aNHDgF4AWzB0UEWej8W55R/i5WX5zbWsmG9UhUz2nvIV7iA0r+ZwUEcOqk0D Q9YJ96zfbWcAA8OvBHNd6iscgPtNHEwEtoV5BUlMhwABQjOaILp40hTC7L0TxijanGdTQFr4w TkmLgEEAgndKklXwJO7KJnPHlWrY6PLWaMSQoZnYxeWYxvRbu23KvGwCfxeFpKaGvniDil9N3 M8mVE8yoKHAsztTcWdFCI85SzjRGbTPHX4dIFY0YD/jTRwYZADj9/iE+M7uAdACx8SJhQAgS/ kLFhrjqj3N0lbrBntbFdpK+0kcZHuv2jo+rXYhJ/XFRFKUpfywIemwBxIA6vQwWEYTyERXXnh 5SA+0T7yPjwrhaWKcQDlYAS42Fn1Fc/xAzMPmyelRP7Wj1hqRGm18HqJvzkeCiHwBsxIbPJ0F 1xOmUZJuOLwZAXA06anJSREKVQ7hTtqYKQpVoGDw36Wmkhz7uLcUzUdGT76TSXd6lmUUxfzE2 DPA6r1slR2FfTs7dFsBd9ezSlheLYDEjNJiMixAGVTwFz6RxB5n+8ZUWJbzJnImbHk9zNKJK9 0LGcNcGqKcLp+pIpFNm5oyGDFKDaQRwrEhZ+SycEzKhcOGiynEvTF+MpBQH5CgSvoBEDgMOsJ fTf1IvhyWrirx0A1iSeBftBSdtdKrwIQyBmsi0rqDtBBYLfEeuJWHgNnXTnGn0M= 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/gnu-maintenance.scm (latest-ftp-release): Rename to … (import-ftp-release) … this, add #:version argument. If version is given, try to find the respective version. (latest-html-release): Rename to … (import-html-release) … this, add #:version argument. If version is given, try to find the respective version. (latest-gnu-release): Rename to … (import-gnu-release) … this, add #:version argument. Refactor to first select archives for respective package, the find the requested or latest version, then create the upstream-source. (latest-release): Rename to … (import-release) … this, add #:version argument, pass on to … (import-ftp-release) … this. (import-release*): Rename to … (import-release*) … this, add #:version argument, pass on to … (latest-release) … this. (latest-savannah-release): Rename to … (import-savannah-release) … this, add keword-argument version, pass on to … (import-html-release) … this. (latest-xorg-release): Rename to … (import-xorg-release) … this, add keword-argument version, pass on to … (import-ftp-release) … this. (latest-kernel.org-release): Rename to … (import-kernel.org-release) … this, add #:version argument, pass on to … (import-html-release) … this. (latest-html-updatable-release): Rename to … (import-html-updatable-release) … this, add #:version argument, pass on to … (import-html-release) … this. * guix/import/gnu.scm(gnu->guix-package): Adjust function call. --- guix/gnu-maintenance.scm | 171 ++++++++++++++++++++++++--------------- guix/import/gnu.scm | 2 +- 2 files changed, 105 insertions(+), 68 deletions(-) diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm index e414de8e28..e26702599d 100644 --- a/guix/gnu-maintenance.scm +++ b/guix/gnu-maintenance.scm @@ -333,14 +333,17 @@ name/directory pairs." files) result))))))) -(define* (latest-ftp-release project +(define* (import-ftp-release project #:key + (version #f) (server "ftp.gnu.org") (directory (string-append "/gnu/" project)) (file->signature (cut string-append <> ".sig"))) "Return an for the latest release of PROJECT on SERVER -under DIRECTORY, or #f. Use FTP-OPEN and FTP-CLOSE to open (resp. close) FTP -connections; this can be useful to reuse connections. +under DIRECTORY, or #f. Optionally include a VERSION string to fetch a specific version. + +Use FTP-OPEN and FTP-CLOSE to open (resp. close) FTP connections; this can be +useful to reuse connections. FILE->SIGNATURE must be a procedure; it is passed a source file URL and must return the corresponding signature URL, or #f it signatures are unavailable." @@ -407,8 +410,12 @@ return the corresponding signature URL, or #f it signatures are unavailable." ;; Assume that SUBDIRS correspond to versions, and jump into the ;; one with the highest version number. - (let* ((release (reduce latest-release #f - (coalesce-sources releases))) + (let* ((release (if version + (find (lambda (upstream) + (string=? (upstream-source-version upstream) version)) + (coalesce-sources releases)) + (reduce latest-release #f + (coalesce-sources releases)))) (result (if (and result release) (latest-release release result) (or release result))) @@ -420,13 +427,16 @@ return the corresponding signature URL, or #f it signatures are unavailable." (ftp-close conn) result)))))) -(define* (latest-release package +(define* (import-release package #:key + (version #f) (server "ftp.gnu.org") (directory (string-append "/gnu/" package))) "Return the for the latest version of PACKAGE or #f. -PACKAGE must be the canonical name of a GNU package." - (latest-ftp-release package +PACKAGE must be the canonical name of a GNU package. Optionally include a +VERSION string to fetch a specific version." + (import-ftp-release package + #:version version #:server server #:directory directory)) @@ -442,14 +452,15 @@ of EXP otherwise." (close-port port)) #f))) -(define (latest-release* package) - "Like 'latest-release', but (1) take a object, and (2) ignore FTP +(define* (import-release* package #:key (version #f)) + "Like 'import-release', but (1) take a object, and (2) ignore FTP errors that might occur when PACKAGE is not actually a GNU package, or not hosted on ftp.gnu.org, or not under that name (this is the case for \"emacs-auctex\", for instance.)" (let-values (((server directory) (ftp-server/directory package))) - (false-if-ftp-error (latest-release (package-upstream-name package) + (false-if-ftp-error (import-release (package-upstream-name package) + #:version version #:server server #:directory directory)))) @@ -474,14 +485,18 @@ hosted on ftp.gnu.org, or not under that name (this is the case for (_ links)))) -(define* (latest-html-release package +(define* (import-html-release package #:key + (version #f) (base-url "https://kernel.org/pub") (directory (string-append "/" package)) file->signature) "Return an for the latest release of PACKAGE (a string) on -SERVER under DIRECTORY, or #f. BASE-URL should be the URL of an HTML page, -typically a directory listing as found on 'https://kernel.org/pub'. +SERVER under DIRECTORY, or #f. Optionally include a VERSION string to fetch a +specific version. + +BASE-URL should be the URL of an HTML page, typically a directory listing as +found on 'https://kernel.org/pub'. When FILE->SIGNATURE is omitted or #f, guess the detached signature file name, if any. Otherwise, FILE->SIGNATURE must be a procedure; it is passed a source @@ -554,13 +569,18 @@ are unavailable." (match candidates (() #f) ((first . _) - ;; Select the most recent release and return it. - (reduce (lambda (r1 r2) - (if (version>? (upstream-source-version r1) - (upstream-source-version r2)) - r1 r2)) - first - (coalesce-sources candidates)))))) + (if version + ;; find matching release version and return it + (find (lambda (upstream) + (string=? (upstream-source-version upstream) version)) + (coalesce-sources candidates)) + ;; Select the most recent release and return it. + (reduce (lambda (r1 r2) + (if (version>? (upstream-source-version r1) + (upstream-source-version r2)) + r1 r2)) + first + (coalesce-sources candidates))))))) ;;; @@ -592,9 +612,9 @@ are unavailable." (call-with-gzip-input-port port (compose string->lines get-string-all)))))) -(define (latest-gnu-release package) +(define* (import-gnu-release package #:key (version #f)) "Return the latest release of PACKAGE, a GNU package available via -ftp.gnu.org. +ftp.gnu.org. Optionally include a VERSION string to fetch a specific version. This method does not rely on FTP access at all; instead, it browses the file list available from %GNU-FILE-LIST-URI over HTTP(S)." @@ -604,42 +624,50 @@ list available from %GNU-FILE-LIST-URI over HTTP(S)." (define (better-tarball? tarball1 tarball2) (string=? (file-extension tarball1) archive-type)) + (define (find-latest-tarball-version tarballs) + (fold (lambda (file1 file2) + (if (and file2 + (version>? (tarball-sans-extension (basename file2)) + (tarball-sans-extension (basename file1)))) + file2 + file1)) + #f + tarballs)) + (let-values (((server directory) (ftp-server/directory package)) ((name) (package-upstream-name package))) (let* ((files (ftp.gnu.org-files)) + ;; select tarballs for this package (relevant (filter (lambda (file) (and (string-prefix? "/gnu" file) (string-contains file directory) (release-file? name (basename file)))) - files))) - (match (sort relevant (lambda (file1 file2) - (version>? (tarball-sans-extension - (basename file1)) - (tarball-sans-extension - (basename file2))))) - ((and tarballs (reference _ ...)) - (let* ((version (tarball->version reference)) - (tarballs (filter (lambda (file) - (string=? (tarball-sans-extension - (basename file)) - (tarball-sans-extension - (basename reference)))) - tarballs))) - (upstream-source - (package name) - (version version) - (urls (map (lambda (file) - (string-append "mirror://gnu/" - (string-drop file - (string-length "/gnu/")))) + files)) + ;; find latest version + (version (or version + (and (not (null? relevant)) + (tarball->version + (find-latest-tarball-version relevant))))) + ;; find tarballs matching this version + (tarballs (filter (lambda (file) + (string=? version (tarball->version file))) + relevant))) + (match tarballs + (() #f) + (_ + (upstream-source + (package name) + (version version) + (urls (map (lambda (file) + (string-append "mirror://gnu/" + (string-drop file + (string-length "/gnu/")))) ;; Sort so that the tarball with the same compression ;; format as currently used in PACKAGE comes first. (sort tarballs better-tarball?))) - (signature-urls (map (cut string-append <> ".sig") urls))))) - (() - #f))))) + (signature-urls (map (cut string-append <> ".sig") urls)))))))) (define %package-name-rx ;; Regexp for a package name, e.g., "foo-X.Y". Since TeXmacs uses @@ -693,8 +721,9 @@ GNOME packages; EMMS is included though, because its releases are on gnu.org." ;; HTML (unlike .) "https://de.freedif.org/savannah/") -(define (latest-savannah-release package) - "Return the latest release of PACKAGE." +(define* (import-savannah-release package #:key (version #f)) + "Return the latest release of PACKAGE. Optionally include a VERSION string +to fetch a specific version." (let* ((uri (string->uri (match (origin-uri (package-source package)) ((? string? uri) uri) @@ -703,12 +732,14 @@ GNOME packages; EMMS is included though, because its releases are on gnu.org." (directory (dirname (uri-path uri)))) ;; Note: We use the default 'file->signature', which adds ".sig", ".asc", ;; or whichever detached signature naming scheme PACKAGE uses. - (latest-html-release package + (import-html-release package + #:version version #:base-url %savannah-base #:directory directory))) (define* (latest-sourceforge-release package #:key (version #f)) - "Return the latest release of PACKAGE." + "Return the latest release of PACKAGE. Optionally include a VERSION string +to fetch a specific version." (define (uri-append uri extension) ;; Return URI with EXTENSION appended. (build-uri (uri-scheme uri) @@ -766,21 +797,24 @@ GNOME packages; EMMS is included though, because its releases are on gnu.org." (when port (close-port port)))))) -(define (latest-xorg-release package) - "Return the latest release of PACKAGE." +(define* (import-xorg-release package #:key (version #f)) + "Return the latest release of PACKAGE. Optionally include a VERSION string +to fetch a specific version." (let ((uri (string->uri (origin-uri (package-source package))))) (false-if-ftp-error - (latest-ftp-release + (import-ftp-release (package-name package) + #:version version #:server "ftp.freedesktop.org" #:directory (string-append "/pub/xorg/" (dirname (uri-path uri))))))) -(define (latest-kernel.org-release package) - "Return the latest release of PACKAGE, the name of a kernel.org package." +(define* (import-kernel.org-release package #:key (version #f)) + "Return the latest release of PACKAGE, the name of a kernel.org package. +Optionally include a VERSION string to fetch a specific version." (define %kernel.org-base ;; This URL and sub-directories thereof are nginx-generated directory - ;; listings suitable for 'latest-html-release'. + ;; listings suitable for 'import-html-release'. "https://mirrors.edge.kernel.org/pub") (define (file->signature file) @@ -792,7 +826,8 @@ GNOME packages; EMMS is included though, because its releases are on gnu.org." ((uri mirrors ...) uri)))) (package (package-upstream-name package)) (directory (dirname (uri-path uri)))) - (latest-html-release package + (import-html-release package + #:version version #:base-url %kernel.org-base #:directory directory #:file->signature file->signature))) @@ -819,9 +854,10 @@ GNOME packages; EMMS is included though, because its releases are on gnu.org." (or (assoc-ref (package-properties package) 'release-monitoring-url) (http-url? package))))) -(define (latest-html-updatable-release package) +(define* (import-html-updatable-release package #:key (version #f)) "Return the latest release of PACKAGE. Do that by crawling the HTML page of -the directory containing its source tarball." +the directory containing its source tarball. Optionally include a VERSION +string to fetch a specific version." (let* ((uri (string->uri (match (origin-uri (package-source package)) ((? string? url) url) @@ -838,7 +874,8 @@ the directory containing its source tarball." (catch #t (lambda () (guard (c ((http-get-error? c) #f)) - (latest-html-release package + (import-html-release package + #:version version #:base-url base #:directory directory))) (lambda (key . args) @@ -856,7 +893,7 @@ the directory containing its source tarball." (name 'gnu) (description "Updater for GNU packages") (pred gnu-hosted?) - (import latest-gnu-release))) + (import import-gnu-release))) (define %gnu-ftp-updater ;; This is for GNU packages taken from alternate locations, such as @@ -867,14 +904,14 @@ the directory containing its source tarball." (pred (lambda (package) (and (not (gnu-hosted? package)) (pure-gnu-package? package)))) - (import latest-release*))) + (import import-release*))) (define %savannah-updater (upstream-updater (name 'savannah) (description "Updater for packages hosted on savannah.gnu.org") (pred (url-prefix-predicate "mirror://savannah/")) - (import latest-savannah-release))) + (import import-savannah-release))) (define %sourceforge-updater (upstream-updater @@ -888,20 +925,20 @@ the directory containing its source tarball." (name 'xorg) (description "Updater for X.org packages") (pred (url-prefix-predicate "mirror://xorg/")) - (import latest-xorg-release))) + (import import-xorg-release))) (define %kernel.org-updater (upstream-updater (name 'kernel.org) (description "Updater for packages hosted on kernel.org") (pred (url-prefix-predicate "mirror://kernel.org/")) - (import latest-kernel.org-release))) + (import import-kernel.org-release))) (define %generic-html-updater (upstream-updater (name 'generic-html) (description "Updater that crawls HTML pages.") (pred html-updatable-package?) - (import latest-html-updatable-release))) + (import import-html-updatable-release))) ;;; gnu-maintenance.scm ends here diff --git a/guix/import/gnu.scm b/guix/import/gnu.scm index 2b9b71feb0..139c32a545 100644 --- a/guix/import/gnu.scm +++ b/guix/import/gnu.scm @@ -117,7 +117,7 @@ details.)" (unless package (raise (formatted-message (G_ "no GNU package found for ~a") name))) - (match (latest-release name) + (match (import-release name) ((? upstream-source? release) (let ((version (upstream-source-version release))) (gnu-package->sexp package release #:key-download key-download))) 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))) From patchwork Tue Dec 20 09:34:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 45442 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 8F43227BBED; Tue, 20 Dec 2022 09:53:07 +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 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 1275427BBEB for ; Tue, 20 Dec 2022 09:53:04 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p7Z2T-0004pA-Mz; Tue, 20 Dec 2022 04:35:58 -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-0004ef-Gi 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-0002vX-7b 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-0003RR-3d for guix-patches@gnu.org; Tue, 20 Dec 2022 04:35:07 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#57460] [PATCH v3 07/18] import: egg: 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.167152889313103 (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]:43736 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7Z1Q-0003PC-Do for submit@debbugs.gnu.org; Tue, 20 Dec 2022 04:34:52 -0500 Received: from mout.kundenserver.de ([212.227.126.131]:58889) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7Z1K-0003O8-7D for 57460@debbugs.gnu.org; Tue, 20 Dec 2022 04:34:46 -0500 Received: from hermia.goebel-consult.de ([87.176.134.225]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MwjO6-1ox4by2ZtC-00y79U for <57460@debbugs.gnu.org>; Tue, 20 Dec 2022 10:34:40 +0100 Received: from thisbe.goebel-consult.de (hermia.goebel-consult.de [192.168.110.7]) by hermia.goebel-consult.de (Postfix) with ESMTP id 905036699E; Tue, 20 Dec 2022 10:34:23 +0100 (CET) From: Hartmut Goebel Date: Tue, 20 Dec 2022 10:34:12 +0100 Message-Id: X-Mailer: git-send-email 2.30.6 In-Reply-To: References: MIME-Version: 1.0 X-Provags-ID: V03:K1:qZYI+t+vUt2iDhLSb3Ksxf0UUkQ9i+kgxbXv9LV4dOBszeQFo4g Xst69GEtqCs03FEKFC28s6L9TB3gD3Ub7woiEIfyUIccBvZXO2t3thrSP1TdVBZsQu+rVXb m1dJ5AjVQm8smt03Ic73i1nTVouD+eMs1Pg+ptIbNdlO3Lb3c2SyfX2ixL1S7F6ygAxz6yt InBIIzg7elm8jjoOgGLXQ== UI-OutboundReport: notjunk:1;M01:P0:/4qX/hhejJg=;L5PkTlBX44iywrjcQgn9SlXZ6G9 poVIwtgQKFPZRoH+PHad5GFEkMQg4FBOZHuzIUDqWe0x9NbSfkmR2lFmOfhOWCW6wOxVJ6IVU 1Efr5tO+kJx4lkz0fWon9hxFk3KKeaJHJ7ea9daQFZunFXdzm2/N5Ej18FXYgl2Y10fRHElXs odBduUSE0RB2w8VnRD1ve+mnflmollguIqnui9Ufieba1OO0JPzSslN76M5H2SIZRJuLCUahG nfT6QYrfmZ8vgT4KFD4eC7ik1K1IpPm1f7FQNmx6YQycFtPtwBW8aYhjgUSRD2MeI1vH3Zgtu zEKCO5esfVluqKQYo3uFoNTVNxW/w6G8sWzeTFP/c3oBtHGv4twkNqQTRsZfitnKzDZLgfzDK bk2APcZJ9BCDr3CIWq1rOajfaTZDjn/xzcWBS6W6EOGe1/ozMHxCDzOwgPYGCtGThCDfPWfDT pNkmtQ2hDN4HDcvp88J5LbHb2/Sm7FM/uKzjFhZMiUSrz+OHZ3f3jpGV8gqr1jrxcpK9perIJ elMWCT7SGhl/SO/5DSNEL/biHXlUYGLbfA/06Exd7ggIL5t1pPP+1+bhGwi3aKuG9DMepJ9IO l6jo5+ESevrZ7BJLyNF4ktWSw/Qixtkh5Q6cpVjG2BQk9/vSuAExqAb2G15YPsQ+TAEgjE5zA KU/ToquvhonYT+vSo6K8/LZq7Ga3/NtXmXbCsXZ/1+w2o/sVyrNIAPlnLAGYrVA= 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/egg.scm (latest-release): Rename to 'import-release', add #:version argument. If version is given, return an upstream-source for this version. --- guix/import/egg.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/guix/import/egg.scm b/guix/import/egg.scm index 2ad48c3399..10a40fe4f8 100644 --- a/guix/import/egg.scm +++ b/guix/import/egg.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2021 Xinglu Chen ;;; Copyright © 2021 Tobias Geerinckx-Rice ;;; Copyright © 2021 Sarah Morgensen +;;; Copyright © 2022 Hartmut Goebel ;;; ;;; This file is part of GNU Guix. ;;; @@ -333,10 +334,11 @@ not work." ;;; Updater. ;;; -(define (latest-release package) - "Return an @code{} for the latest release of PACKAGE." +(define* (import-release package #:key (version #f)) + "Return an @code{} for the latest release of PACKAGE. +Optionally include a VERSION string to fetch a specific version." (let* ((egg-name (guix-package->egg-name package)) - (version (find-latest-version egg-name)) + (version (or version (find-latest-version egg-name))) (source-url (egg-uri egg-name version))) (upstream-source (package (package-name package)) @@ -348,6 +350,6 @@ not work." (name 'egg) (description "Updater for CHICKEN egg packages") (pred egg-package?) - (import latest-release))) + (import import-release))) ;;; egg.scm ends here 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 From patchwork Tue Dec 20 09:34:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 45440 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 B8C7C27BBE9; Tue, 20 Dec 2022 09:38:05 +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 autolearn=unavailable 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 9138927BBEB for ; Tue, 20 Dec 2022 09:38:03 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p7Z2r-00056W-MW; Tue, 20 Dec 2022 04:36:21 -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 1p7Z1g-0004fZ-AX 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 1p7Z1g-0002vn-0r for guix-patches@gnu.org; Tue, 20 Dec 2022 04:35:08 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p7Z1f-0003Rg-SX for guix-patches@gnu.org; Tue, 20 Dec 2022 04:35:07 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#57460] [PATCH v3 09/18] import: git: 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.167152890213144 (code B ref 57460); Tue, 20 Dec 2022 09:35:07 +0000 Received: (at 57460) by debbugs.gnu.org; 20 Dec 2022 09:35:02 +0000 Received: from localhost ([127.0.0.1]:43743 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7Z1Z-0003Po-EO for submit@debbugs.gnu.org; Tue, 20 Dec 2022 04:35:02 -0500 Received: from mout.kundenserver.de ([217.72.192.74]:35623) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7Z1O-0003Ok-U5 for 57460@debbugs.gnu.org; Tue, 20 Dec 2022 04:34:51 -0500 Received: from hermia.goebel-consult.de ([87.176.134.225]) by mrelayeu.kundenserver.de (mreue109 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MAORp-1p1HcU1HKN-00Bri2 for <57460@debbugs.gnu.org>; Tue, 20 Dec 2022 10:34:45 +0100 Received: from thisbe.goebel-consult.de (hermia.goebel-consult.de [192.168.110.7]) by hermia.goebel-consult.de (Postfix) with ESMTP id BDC34669A4; Tue, 20 Dec 2022 10:34:23 +0100 (CET) From: Hartmut Goebel Date: Tue, 20 Dec 2022 10:34:14 +0100 Message-Id: X-Mailer: git-send-email 2.30.6 In-Reply-To: References: MIME-Version: 1.0 X-Provags-ID: V03:K1:t5ih020ghzFPutTDAk2J0eNwXsPC6UEGopjofTNi49bkVXVYfce sI/dgKLb/E5XiQAz5ksvf8tQ1ABbzo8JNSDTymQxLGC0d+mDEtXJMpBp48muBMbLpgeCsNR 0eMD4Q8aksPgfDwCch/FaOsXxKwwfKFgO/8M17yun0OCLRMF9lvja1luwcbZvlzrYbiWqFy tmU1MgFblCUn2lCqkGOTg== UI-OutboundReport: notjunk:1;M01:P0:CxiNzNtdGms=;QaThMoGOegf54jNF175gTBGI8fY Zq9aNTpU0JvN5fIHRQrScr42G4T3cgjD/MNp17XNfQGQRsObqGxCWzHCNRnxisZPg+Nd/BrW5 6Q2dB5KpAhm4Zz0x7jMvDZcmmJl6x51+pMMhgEJvwxWlxzzv7aZzqZ7GdS9sfcxsBntesNePY 5f4FoqWL0oUooZATarFH/QrtjBAfgWMcpyOlt/FUouhFQeM7T2TuuDi9c5naixwJx3+3DUvjh HmKAbEHFdOYNos0z0YekEwha5Mv45gTwu3lPJjjwJff/hCNNmFDc93iiWPTrRllw44QT7OE+h k5aVnwBiEgLq/Z8NpY1Kbr16h3w/S/0gwKUC0pnQw3xJxkuutjpIz0oNRZU0i6sMIZKDEV8LI GbK5t7hGS/cmmhxXEAdKq1nxcUqkGVOCOvdjgPgLcXubdZ9CUB7RscCkfi6EcmhF0L5bXqrUH LAVaIrI+iwQ4O0ywztTAIvycPyc+LMa6SxcB18/ES7QsusJi7ngeBUWSuMgPXBsAhtGOQ1GQW ZGLQIdXo98UBhvJSEJ6OwUC88tkQessDNSOrpKrEuKhbHN75YpE+grPd0aMUpSMbsq3ijU+Ne OW15j5itIIcpJXAeu6Wh/P/7LUpfXHw/XKkvuTSYDo1fyQaCq6y6f+jCYThredKG5uFu+myv2 jZrc12aSETexWYOOjFEWR9vjHBEwHuwjLvZT0bWCoA== 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/git.scm (latest-tag): Add #:version argument. If version is given, try to find the respective version tag. (latest-git-tag-version): Add #:version argument and pass it on to called functions. (latest-releease) Rename to 'import-release', add #:version argument and pass it on to called functions. --- guix/import/git.scm | 39 +++++++++++++++++++++++++++------------ 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/guix/import/git.scm b/guix/import/git.scm index bb5ba4d97e..c15943bd7c 100644 --- a/guix/import/git.scm +++ b/guix/import/git.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2021 Xinglu Chen ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2022 Maxime Devos +;;; Copyright © 2022 Hartmut Goebel ;;; ;;; This file is part of GNU Guix. ;;; @@ -146,9 +147,11 @@ version corresponding to the tag, and the cdr is the name of the tag." tags) entry tag) %pre-release-rx)) @@ -169,13 +172,22 @@ repository at URL." ((null? versions->tags) (git-no-valid-tags-error)) (else - (match (last versions->tags) - ((version . tag) - (values version tag))))))) - -(define (latest-git-tag-version package) + (let ((versions (if version + (filter (match-lambda + ((candidate-version . tag) + (string=? version candidate-version))) + versions->tags) + versions->tags))) + (if (null? versions) + (values #f #f) + (match (last versions) + ((version . tag) + (values version tag))))))))) + +(define* (latest-git-tag-version package #:key (version #f)) "Given a PACKAGE, return the latest version of it and the corresponding git -tag, or #false and #false if the latest version could not be determined." +tag, or #false and #false if the latest version could not be determined. +Optionally include a VERSION string to fetch a specific version." (guard (c ((or (git-no-tags-error? c) (git-no-valid-tags-error? c)) (warning (or (package-field-location package 'source) (package-location package)) @@ -193,6 +205,7 @@ tag, or #false and #false if the latest version could not be determined." (url (git-reference-url (origin-uri source))) (property (cute assq-ref (package-properties package) <>))) (latest-tag url + #:version version #:prefix (property 'release-tag-prefix) #:suffix (property 'release-tag-suffix) #:delim (property 'release-tag-version-delimiter) @@ -206,12 +219,14 @@ tag, or #false and #false if the latest version could not be determined." (git-reference? (origin-uri origin)))) (_ #f))) -(define (latest-git-release package) - "Return an for the latest release of PACKAGE." +(define* (import-git-release package #:key (version #f)) + "Return an for the latest release of PACKAGE. +Optionally include a VERSION string to fetch a specific version." (let* ((name (package-name package)) (old-version (package-version package)) (old-reference (origin-uri (package-source package))) - (new-version new-version-tag (latest-git-tag-version package))) + (new-version new-version-tag + (latest-git-tag-version package #:version version))) (and new-version new-version-tag (upstream-source (package name) @@ -226,4 +241,4 @@ tag, or #false and #false if the latest version could not be determined." (name 'generic-git) (description "Updater for packages hosted on Git repositories") (pred git-package?) - (import latest-git-release))) + (import import-git-release))) From patchwork Tue Dec 20 09:34:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 45447 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 32C5A27BBE9; Tue, 20 Dec 2022 09:59:55 +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 autolearn=unavailable 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 7222E27BBEB for ; Tue, 20 Dec 2022 09:59:52 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p7Z2W-0004tQ-FZ; 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 1p7Z1g-0004g8-Ma 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 1p7Z1g-0002vy-Cp for guix-patches@gnu.org; Tue, 20 Dec 2022 04:35:08 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p7Z1g-0003Rn-8v for guix-patches@gnu.org; Tue, 20 Dec 2022 04:35:08 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#57460] [PATCH v3 10/18] import: github: 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:08 +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.167152890213157 (code B ref 57460); Tue, 20 Dec 2022 09:35:08 +0000 Received: (at 57460) by debbugs.gnu.org; 20 Dec 2022 09:35:02 +0000 Received: from localhost ([127.0.0.1]:43745 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7Z1a-0003Px-1u for submit@debbugs.gnu.org; Tue, 20 Dec 2022 04:35:02 -0500 Received: from mout.kundenserver.de ([212.227.126.131]:45549) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7Z1S-0003Oq-EQ for 57460@debbugs.gnu.org; Tue, 20 Dec 2022 04:34:55 -0500 Received: from hermia.goebel-consult.de ([87.176.134.225]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MXotA-1pOCDU3QPU-00YBZ7 for <57460@debbugs.gnu.org>; Tue, 20 Dec 2022 10:34:48 +0100 Received: from thisbe.goebel-consult.de (hermia.goebel-consult.de [192.168.110.7]) by hermia.goebel-consult.de (Postfix) with ESMTP id E2401669A5; Tue, 20 Dec 2022 10:34:23 +0100 (CET) From: Hartmut Goebel Date: Tue, 20 Dec 2022 10:34:15 +0100 Message-Id: <9344624489973aad01dfb6f2ed3c072e29964610.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:hljYhqfObiDFw5vetJdqSqD7DLOW8UN2Z2JGeiaNoWe4xXVD4/t 5sNaIBYoEUE+sXq4LeDoZTIBrT1RahUtA5lZQMcDtO7cqMiuSbA7BaDKy8dvjo7WIyuNMtf 15zMbKfN5eOtisVXwDllN4o3Z5vROJMIHkXAoo9sqmB4XGy2ht+wrfx52QOAuk6FTiWdscz r7Jj7MAxOZdIzn5NNcB3Q== UI-OutboundReport: notjunk:1;M01:P0:9ijiATMDvQk=;uQDUhcnE21Tw1EXWePdeZiqCdsV JVQgtSeBl31xsaMbORSbhmHkyUfpoKY1mha5F90xIB3mHt2IgTIzZKr8yanIrX+nWd1ZtxjGr dlG06Wm0CM6N6HU8fMOd7Ib0XnKoBuzzdYsKPHnT6eyUnlGT4CwWjmYoDKWoT5oYal6+Cm/4S kh5PNjp4+jQGvi4UbDFCYbt6Z4nn33uEnls0VtrCr8ljmJoHyDpq5VcciOzCtauhSjOt1mgZ4 XTdj5MEw29emDG29ZybkShiEusoc6CTnzyGzNSyYZ4YJaAoI5b/sa1HT7GLBBf314vY2TVRbD lc/oRaYE1HK7N9/XttkU1EMH5NyHEL2NlhXVIwwVn/LIILeZxTH5Y1fPl5Qzaz1/MzqMWo47p qfllwTVi/Uu9bm2DNI7gogHIDB4T6l/2mTegMHqyKyvvo1C/LWp9gjRNr5o46+vtg9HrUHAW6 t4/o7LPeqf6+X0oTFEy/eEIlQ6ynM42fA6toOxXQwH55lvo7aetLmFQvGGynoIzhBOMqvnKTj KgDQuVEmiEE6a+lFPVD+TH8eQ/eFDOciEwMHJfxIZ4ifuCfjX+YBEGPBpi5qA0n4p5kApEfZ4 LDkVr7o9DAEqbWW7UjJU2ki6rJnm74FP6cfIz5d/KCbWiTFNMyHjG2aPL+CUFi8I1goTMFuAr MzopjTOfoeCc4zjzEii32tr/E4Hclr/Be53nOw5P1g== 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/github.scm (latest-released-version): Add #:version argument. If version is given, try to find the respective release. (latest-releease) Rename to 'import-release', add #:version argument and pass it on to 'latest-released-version'. --- guix/import/github.scm | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/guix/import/github.scm b/guix/import/github.scm index ac6ef06eda..a1bda5ec43 100644 --- a/guix/import/github.scm +++ b/guix/import/github.scm @@ -249,11 +249,13 @@ Alternatively, you can wait until your rate limit is reset, or use the #:headers headers))) (x x))))))))) -(define (latest-released-version url package-name) +(define* (latest-released-version url package-name #:key (version #f)) "Return the newest released version and its tag given a string URL like 'https://github.com/arq5x/bedtools2/archive/v2.24.0.tar.gz' and the name of the package e.g. 'bedtools2'. Return #f (two values) if there are no -releases." +releases. + +Optionally include a VERSION string to fetch a specific version." (define (pre-release? x) (assoc-ref x "prerelease")) @@ -290,16 +292,25 @@ releases." (match (and=> (fetch-releases-or-tags url) vector->list) (#f (values #f #f)) (json - (match (sort (filter-map release->version - (match (remove pre-release? json) - (() json) ; keep everything - (releases releases))) - (lambda (x y) (version>? (car x) (car y)))) + (let ((releases (filter-map release->version + (match (remove pre-release? json) + (() json) ; keep everything + (releases releases))))) + (match (if version + ;; Find matching release version. + (filter (match-lambda + ((candidate-version . tag) + (string=? version candidate-version))) + releases) + ;; Sort releases descending. + (sort releases + (lambda (x y) (version>? (car x) (car y))))) (((latest-version . tag) . _) (values latest-version tag)) - (() (values #f #f)))))) + (() (values #f #f))))))) -(define (latest-release pkg) - "Return an for the latest release of PKG." +(define* (import-release pkg #:key (version #f)) + "Return an for the latest release of PKG. +Optionally include a VERSION string to fetch a specific version." (define (github-uri uri) (match uri ((? string? url) @@ -313,7 +324,8 @@ releases." (source-uri (github-uri original-uri)) (name (package-name pkg)) (newest-version version-tag - (latest-released-version source-uri name))) + (latest-released-version source-uri name + #:version version))) (if newest-version (upstream-source (package name) @@ -330,6 +342,6 @@ releases." (name 'github) (description "Updater for GitHub packages") (pred github-package?) - (import latest-release))) + (import import-release))) From patchwork Tue Dec 20 09:34:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 45450 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 2BB5327BBEB; Tue, 20 Dec 2022 10:02:18 +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=unavailable 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 E917727BBE9 for ; Tue, 20 Dec 2022 10:02:14 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p7Z2W-0004tU-Rd; 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 1p7Z1h-0004gC-9t 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 1p7Z1g-0002w4-W7 for guix-patches@gnu.org; Tue, 20 Dec 2022 04:35:09 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p7Z1g-0003Ru-P8 for guix-patches@gnu.org; Tue, 20 Dec 2022 04:35:08 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#57460] [PATCH v3 11/18] import: gnome: 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:08 +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.167152890313177 (code B ref 57460); Tue, 20 Dec 2022 09:35:08 +0000 Received: (at 57460) by debbugs.gnu.org; 20 Dec 2022 09:35:03 +0000 Received: from localhost ([127.0.0.1]:43747 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7Z1a-0003Q9-Nk for submit@debbugs.gnu.org; Tue, 20 Dec 2022 04:35:03 -0500 Received: from mout.kundenserver.de ([212.227.126.130]:39065) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7Z1V-0003P4-7b for 57460@debbugs.gnu.org; Tue, 20 Dec 2022 04:34:57 -0500 Received: from hermia.goebel-consult.de ([87.176.134.225]) by mrelayeu.kundenserver.de (mreue012 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MoeU5-1oVoPa0lGT-00p86t for <57460@debbugs.gnu.org>; Tue, 20 Dec 2022 10:34:51 +0100 Received: from thisbe.goebel-consult.de (hermia.goebel-consult.de [192.168.110.7]) by hermia.goebel-consult.de (Postfix) with ESMTP id 0549F669A8; Tue, 20 Dec 2022 10:34:24 +0100 (CET) From: Hartmut Goebel Date: Tue, 20 Dec 2022 10:34:16 +0100 Message-Id: <424e88881eb29ea85b2bc2aa0da95cc0fb8a7aac.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:6wy24axkXv7uXoBl8YayYDNfHD+cpXLws3SvAs+4tiNnZYKL8DF hn8gQavtFvm4Jo/FSdDJ7mhO8hprM7COCD2pxIySv2dWaqc7hr5EHomSnOBbHjKWnDc6xa2 7Nh/09cb0wQCxq2XKaiiJbclxlVoKxmoh6nIt8N+prSaxRhYTiEOCvhg5e4LByuzMlJVqL+ Yur4rX5mZgANkYDWsWdUA== UI-OutboundReport: notjunk:1;M01:P0:711oOjfxw00=;SU1E3scJeYoPN/IjohP0WSmYcHP o5txPox/QX8FzBjfp76z+MV0DjHTRV+l4iM4iuwB5JEISJ+HrpUu/F8t4UK6VN2t4jNp/NGZz TUv/4a1oFffxGC+ERdchoCMkQ18SEs6ZgY6io3M6RD0XSezuYaQJ3AKBZE1vzmft6eUlkR2c1 54Ig3ROUuemFmLVYY5wyrdZlcup5hN6wnUWwzsi7RPjlxnZh4Q6T/ciKDAIlxY7mE6LAcXhVx lPNsOZQW8nWL2ms+bubP9oLYx+ckiXfM2wS5Egol3//ADMk6EbPUedqmwMcsp6iB+F5/+zGcq 0cs4yw7cadyHZg47xMbGyi0+kpLFyvdnkty2md+uDGdqTsU9DmUqz65NF+5LINoXPgi7Rx2B8 0U3ernxorSbwW/ZQNNu3sbyQL4DK4JyoONvCEfGUhhsZhDE7ZInB7a0oz47c4VEs416uU2GgY Dp3X4yuAM1uLzdjoMb7kZ4f1n2L4141Mt8bJd5IoXWpX1li3pQNzG3sZizihuE8PYvTHcgf8n uDYeo2mcuPt2WPuZADgLwlWS+7cb289SKG+uxbsBwSFNblHKfN08Ik+uOo7oyzEQE0FINzKWB MTxaOyynd51EbjNtOsBLD+i+SI/JxghwCCquOz3T/E3vjvR+i51iKKZu7vyoVW73pMlFL0Ijn KpjRdZ0b5PqROmtHlWAGa2EqR6pyEFFYCMryJsFoJgmUsJFzs+9JfqL9iq0Z20o= 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/gnome.scm (latest-gnome-release): Rename to 'import-gnome-release', add #:version argument. If version is given, try to find the respective version [find-latest-release]: New function, based on former code. [find-version-release]: New function. --- guix/import/gnome.scm | 47 +++++++++++++++++++++++++++---------------- 1 file changed, 30 insertions(+), 17 deletions(-) diff --git a/guix/import/gnome.scm b/guix/import/gnome.scm index 09c6dbbd0d..3c5a96fdde 100644 --- a/guix/import/gnome.scm +++ b/guix/import/gnome.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2017, 2019, 2021 Ludovic Courtès ;;; Copyright © 2022 Maxim Cournoyer +;;; Copyright © 2022 Hartmut Goebel ;;; ;;; This file is part of GNU Guix. ;;; @@ -57,9 +58,10 @@ source for metadata." name "/" relative-url)))) '("tar.lz" "tar.xz" "tar.bz2" "tar.gz"))))))) -(define (latest-gnome-release package) +(define* (import-gnome-release package #:key (version #f)) "Return the latest release of PACKAGE, a GNOME package, or #f if it could -not be determined." +not be determined. Optionally include a VERSION string to fetch a specific +version." (define %not-dot (char-set-complement (char-set #\.))) @@ -88,6 +90,28 @@ https://discourse.gnome.org/t/new-gnome-versioning-scheme/4235" ;; Some packages like "NetworkManager" have camel-case names. (package-upstream-name package)) + (define (find-latest-release releases) + (fold (match-lambda* + (((key . value) result) + (cond ((release-version? key) + (match result + (#f + (cons key value)) + ((newest . _) + (if (version>? key newest) + (cons key value) + result)))) + (else + result)))) + #f + releases)) + + (define (find-version-release releases version) + (find (match-lambda + ((key . value) + (string=? key version))) + releases)) + (guard (c ((http-get-error? c) (if (= 404 (http-get-error-code c)) #f @@ -108,20 +132,9 @@ https://discourse.gnome.org/t/new-gnome-versioning-scheme/4235" (match json (#(4 releases _ ...) (let* ((releases (assoc-ref releases upstream-name)) - (latest (fold (match-lambda* - (((key . value) result) - (cond ((release-version? key) - (match result - (#f - (cons key value)) - ((newest . _) - (if (version>? key newest) - (cons key value) - result)))) - (else - result)))) - #f - releases))) + (latest (if version + (find-version-release releases version) + (find-latest-release releases)))) (and latest (jsonish->upstream-source upstream-name latest)))))))) @@ -130,4 +143,4 @@ https://discourse.gnome.org/t/new-gnome-versioning-scheme/4235" (name 'gnome) (description "Updater for GNOME packages") (pred (url-prefix-predicate "mirror://gnome/")) - (import latest-gnome-release))) + (import import-gnome-release))) From patchwork Tue Dec 20 09:34:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 45448 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 6B46327BBED; Tue, 20 Dec 2022 10:00:00 +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 D604427BBE9 for ; Tue, 20 Dec 2022 09:59:59 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p7Z2n-00056M-Lg; Tue, 20 Dec 2022 04:36:17 -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 1p7Z1h-0004gZ-P1 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 1p7Z1h-0002wE-Fb for guix-patches@gnu.org; Tue, 20 Dec 2022 04:35:09 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p7Z1h-0003S6-Ba for guix-patches@gnu.org; Tue, 20 Dec 2022 04:35:09 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#57460] [PATCH v3 12/18] import: hexpm: 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:09 +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.167152890413190 (code B ref 57460); Tue, 20 Dec 2022 09:35:09 +0000 Received: (at 57460) by debbugs.gnu.org; 20 Dec 2022 09:35:04 +0000 Received: from localhost ([127.0.0.1]:43751 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7Z1b-0003QT-JJ for submit@debbugs.gnu.org; Tue, 20 Dec 2022 04:35:04 -0500 Received: from mout.kundenserver.de ([212.227.17.24]:45501) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7Z1X-0003PV-67 for 57460@debbugs.gnu.org; Tue, 20 Dec 2022 04:34:59 -0500 Received: from hermia.goebel-consult.de ([87.176.134.225]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1M3lHZ-1p7q8c2JiV-000tbY for <57460@debbugs.gnu.org>; Tue, 20 Dec 2022 10:34:53 +0100 Received: from thisbe.goebel-consult.de (hermia.goebel-consult.de [192.168.110.7]) by hermia.goebel-consult.de (Postfix) with ESMTP id 1F781669A9; Tue, 20 Dec 2022 10:34:24 +0100 (CET) From: Hartmut Goebel Date: Tue, 20 Dec 2022 10:34:17 +0100 Message-Id: X-Mailer: git-send-email 2.30.6 In-Reply-To: References: MIME-Version: 1.0 X-Provags-ID: V03:K1:mzFNjKuF+TBILaxeh4Ya+sTVtL8UnndHAOrBXLtxqDq1dp3qwwu ENip14OFVoNUaIVMo/PmVpT/PZgLjrSsdHswSm1n+Vrl7F0d72E9PiClpOQgCxbsnT4eajS /panXcsWyr+ceXmzOwCZ0WnTc6Fcww0E6v0iJFx82SvpPxgxu3MaxCiYafhX+y4rj9FJKha 2/MdZay+mS2MXD9B9frTA== UI-OutboundReport: notjunk:1;M01:P0:h0maMFhPUoA=;phmBVAH5fpwQHxXUHyFmoHQ9L3i 5/pr+2Drc8S8xdz18tD2x2gl34MSAq5unkyJTnR/0sslOxL1UkqBjr4NY2gmeQE3VPRig8lLP /vGybJmmuxchobwOXBFp6U2nbn3hp1OeBNgqQk1qDgH7Fxw1hsVWO9q5r6ldrz/GJuZpP452B +4XyAsV4xWzWEVKBDM8M76e9ivEzU4HEJqS3MdFiENvwRXtMlvqJbqdqoHlo9AjuB7eq7ToLa KS/E9bmshQyGHoac86usYJxaUgBogLi0vfGRgzmPd3ToZtY9pB0t7KFYvGbGGss4xxlkUN/rO QXVYv3NRiejqAr/pfGOMgCAehuw38aYBjWAYADerERd5bShe8HXbmnQ+41HcsZjuCx8pgVRqM Elp9Txc8GBhQHV/Kf/f+zQv3xw+/ig2NDPzKiTC9CTZUGpcTTj2iCLfPPsMTM+ue+mDRYN4JN Q7sTmhEJYu9NpetCzpNFkdGGVuIhvQqCjt1me7Y8c1v0npMEpNOOB4epFy4bGB1mL7B6Vsodr 7gH3bw0PBVs30IkFBazaq3SjrdT3BPy8OhmrpEI/TYi0QMWKn0UwmvjJ1RjpR1iHK7vG3GkZ+ 7AiXwVFRm8NRHwzbbRvJjWBc/9N1eCSnl1JVaoWnBxQlO+/qg8OZXdF7kBWZ6wRVutknzQZ7x XK9oeFE4R+06KVZymud6hbuViyrWq7cV3He3l+Ndwg== 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/hexpm.scm (latest-release): Rename to 'import-release', add #:version argument. If version is given, return an upstream-source for this version. --- guix/import/hexpm.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/guix/import/hexpm.scm b/guix/import/hexpm.scm index 3b63837393..8a009fd245 100644 --- a/guix/import/hexpm.scm +++ b/guix/import/hexpm.scm @@ -328,11 +328,12 @@ latest version of PACKAGE-NAME." ;;; Updater ;;; -(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* ((hexpm-name (guix-package->hexpm-name package)) (hexpm (lookup-hexpm hexpm-name)) - (version (hexpm-latest-release hexpm)) + (version (or version (hexpm-latest-release hexpm))) (url (hexpm-uri hexpm-name version))) (upstream-source (package (package-name package)) @@ -344,4 +345,4 @@ latest version of PACKAGE-NAME." (name 'hexpm) (description "Updater for hex.pm packages") (pred (url-prefix-predicate hexpm-package-url)) - (import latest-release))) + (import import-release))) From patchwork Tue Dec 20 09:34:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 45455 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 34D0727BBEB; Tue, 20 Dec 2022 10:08:46 +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 autolearn=unavailable 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 276BB27BBE9 for ; Tue, 20 Dec 2022 10:08:44 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p7Z2s-00058O-1v; Tue, 20 Dec 2022 04:36:22 -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 1p7Z2Y-0004us-W5 for guix-patches@gnu.org; Tue, 20 Dec 2022 04:36:04 -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 1p7Z2X-00038n-Tv for guix-patches@gnu.org; Tue, 20 Dec 2022 04:36:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p7Z2X-0003Tw-N2 for guix-patches@gnu.org; Tue, 20 Dec 2022 04:36:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#57460] [PATCH v3 13/18] import: kde: 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:36:01 +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.167152891513308 (code B ref 57460); Tue, 20 Dec 2022 09:36:01 +0000 Received: (at 57460) by debbugs.gnu.org; 20 Dec 2022 09:35:15 +0000 Received: from localhost ([127.0.0.1]:43771 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7Z1m-0003Sa-Ev for submit@debbugs.gnu.org; Tue, 20 Dec 2022 04:35:14 -0500 Received: from mout.kundenserver.de ([212.227.126.135]:55173) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7Z1b-0003Ph-IK for 57460@debbugs.gnu.org; Tue, 20 Dec 2022 04:35:04 -0500 Received: from hermia.goebel-consult.de ([87.176.134.225]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MCbZL-1oz4iI3t5f-009eLV for <57460@debbugs.gnu.org>; Tue, 20 Dec 2022 10:34:57 +0100 Received: from thisbe.goebel-consult.de (hermia.goebel-consult.de [192.168.110.7]) by hermia.goebel-consult.de (Postfix) with ESMTP id 2EB95669AA; Tue, 20 Dec 2022 10:34:24 +0100 (CET) From: Hartmut Goebel Date: Tue, 20 Dec 2022 10:34:18 +0100 Message-Id: <18bade2491a673e87847d531c66119fc1478dd4d.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:2qCal+xhLp59t8yhLlQnOTDDMYaxdyhM+Bd64eF7LW8v24Z2E76 zcvVP8YZDWXMgg/hHUdLS8tjnEeSjb8BxcPLt06vnwq7u+0XbPW3oz7ak0OlQM37j0Z86KV Dr/vn7QPj4uU+5ucJRErz/dOwfiHYkc69Po6kkVaeRdT3oGyr6fxJ4qf4/79UNUWXAFAiL0 ZkTpZnzGO+vEateciXsrw== UI-OutboundReport: notjunk:1;M01:P0:v/hyhiAv5s0=;zBqmOg1yPD/3vs/54q5MQeRJCeQ wpGvnVxRMtToenMusFmA/FUV6fvu+UBwV+wwKiLcAhLN9bmBdM0RaCDIKX9veMhs81I522bgv v+7MScg06fynZGUOTjX/Mb6dq7FIxUFeZA9nBRnQZQjBLzOyK2kOipjUdaD8EXfu4bJpab+Oy /CDQ/rUrquWfhFn+f5NGD7LZXkWqgiJItKoaSIYCNIJ850OBCqbeUwjXKapnL/44rmFQfzNtr 8713R3WntIc2kT/g8ru2D0yEbPnbAXJZZbLrz5hbIbCtu1rdSyQt2IxunerXKrpPCk8nGiYB1 /HEdpa4Gt5hIKP1hje7PNuCmEnGhmQjrk/EjCJnBm1Rf9muqK0H0xrvaniH2iTAu+98obOl2e n2XoJu4iUUrR60xfu6Rr5Ipxgnb2Sz7oayPAh6KMfr/qy8YijbPKDV3+Bu7plYJQZpWzOqkYH Zz5PW9BLC9Lq/R+gB/o+6KFzZYHJ0bkMD6a225OeFsvC1x8dw4oEiRq0SPqePsnr70hu9C/Ig SfuIYYjCZ6z2H4ZmzY13l+wSgKR9x65rBPtGc2rnfcEAJRKwDL9dlPAgjD1Vw0JCFt86UKfnC ACEin2+s7rEMeIHvjuR9AzG60aLKBaj8CjjU3Mmbli30SRsYXO4tqETS7unDBZhj3JmPVDCr4 Oa4RkWLXjM3tzyYE1Wa0L2KFUptLE6ptP2eYESKYWA== 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/kde.scm (latest-kde-release): Rename to 'import-kde-release', add #:version argument. Rework the code to not sort the relevant files, but just find the requested or latest version. [find-latest-archive-version]: New function. --- guix/import/kde.scm | 61 ++++++++++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 25 deletions(-) diff --git a/guix/import/kde.scm b/guix/import/kde.scm index 510d823a4f..3566312eca 100644 --- a/guix/import/kde.scm +++ b/guix/import/kde.scm @@ -28,6 +28,7 @@ #:use-module (ice-9 match) #:use-module (ice-9 rdelim) #:use-module (ice-9 regex) + #:use-module (srfi srfi-1) #:use-module (srfi srfi-11) #:use-module (web uri) @@ -149,42 +150,52 @@ Output: (string-join (map version->pattern directory-parts) "/") "/")))) -(define (latest-kde-release package) +(define* (import-kde-release package #:key (version #f)) "Return the latest release of PACKAGE, a KDE package, or #f if it could -not be determined." +not be determined. Optionally include a VERSION string to fetch a specific +version." + + (define (find-latest-archive-version archives) + (fold (lambda (file1 file2) + (if (and file2 + (version>? (tarball-sans-extension (basename file2)) + (tarball-sans-extension (basename file1)))) + file2 + file1)) + #f + archives)) + (let* ((uri (string->uri (origin-uri (package-source package)))) (path-rx (uri->kde-path-pattern uri)) (name (package-upstream-name package)) (files (download.kde.org-files)) + ;; select archives for this package (relevant (filter (lambda (file) (and (regexp-exec path-rx file) (release-file? name (basename file)))) - files))) - (match (sort relevant (lambda (file1 file2) - (version>? (tarball-sans-extension - (basename file1)) - (tarball-sans-extension - (basename file2))))) - ((and tarballs (reference _ ...)) - (let* ((version (tarball->version reference)) - (tarballs (filter (lambda (file) - (string=? (tarball-sans-extension - (basename file)) - (tarball-sans-extension - (basename reference)))) - tarballs))) - (upstream-source - (package name) - (version version) - (urls (map (lambda (file) - (string-append "mirror://kde/" file)) - tarballs))))) - (() - #f)))) + files)) + ;; Find latest version. + (version (or version + (and (not (null? relevant)) + (tarball->version (find-latest-archive-version relevant))))) + ;; Find archives matching this version. + (tarballs (filter (lambda (file) + (string=? version (tarball->version file))) + relevant))) + (match tarballs + (() #f) + (_ + (upstream-source + (package name) + (version version) + (urls (map (lambda (file) + (string-append "mirror://kde/" file)) + tarballs))))))) + (define %kde-updater (upstream-updater (name 'kde) (description "Updater for KDE packages") (pred (url-prefix-predicate "mirror://kde/")) - (import latest-kde-release))) + (import import-kde-release))) From patchwork Tue Dec 20 09:34:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 45457 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 7AF9427BBED; Tue, 20 Dec 2022 10:13:58 +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 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 D6B2227BBE9 for ; Tue, 20 Dec 2022 10:13:57 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p7Z2u-00059g-4o; Tue, 20 Dec 2022 04:36:24 -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 1p7Z2Z-0004uu-2o for guix-patches@gnu.org; Tue, 20 Dec 2022 04:36:04 -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 1p7Z2Y-00038q-CJ for guix-patches@gnu.org; Tue, 20 Dec 2022 04:36:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p7Z2Y-0003U3-64 for guix-patches@gnu.org; Tue, 20 Dec 2022 04:36:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#57460] [PATCH v3 14/18] import: launchpad: 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:36:02 +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.167152891513316 (code B ref 57460); Tue, 20 Dec 2022 09:36:02 +0000 Received: (at 57460) by debbugs.gnu.org; 20 Dec 2022 09:35:15 +0000 Received: from localhost ([127.0.0.1]:43773 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7Z1m-0003Sf-VE for submit@debbugs.gnu.org; Tue, 20 Dec 2022 04:35:15 -0500 Received: from mout.kundenserver.de ([212.227.126.134]:33401) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7Z1d-0003Pn-T7 for 57460@debbugs.gnu.org; Tue, 20 Dec 2022 04:35:06 -0500 Received: from hermia.goebel-consult.de ([87.176.134.225]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.167]) with ESMTPSA (Nemesis) id 1Mdvyo-1oZstm0sNS-00b5zl for <57460@debbugs.gnu.org>; Tue, 20 Dec 2022 10:35:00 +0100 Received: from thisbe.goebel-consult.de (hermia.goebel-consult.de [192.168.110.7]) by hermia.goebel-consult.de (Postfix) with ESMTP id 46A72669AB; Tue, 20 Dec 2022 10:34:24 +0100 (CET) From: Hartmut Goebel Date: Tue, 20 Dec 2022 10:34:19 +0100 Message-Id: <2b7d35f5b7052dab718e6e4c1c9407f1560bf63f.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:1f8pR3fP9UjXnIjUYIOiwmpM5TEH1KXLaS0U7/qzDSHDe1/61ln W8w9+DAPwcb+KKR05znjcI+cyefLoZyquKNrJe9LBM0NGCj1+2vVvR/bvXp1y7WFWFdwQm8 hT3dHxKxBg2qZPfjlU3zDNwMr/YuJ5L4WjY2PD9BEfmCdQddL1t1mU1qz9c/bqLsE519TTQ OXCYRmz6Ra35XxITWfTmA== UI-OutboundReport: notjunk:1;M01:P0:rUGrKwsaY30=;wykPrkMZCmuR1RuaFmbnCA2ADBi Tw8Xx/SKyZ6TrCEynIgjFRGH+U78rOQh4OuR3apsbeOyZa1td3CDYeeNuaGGgLsJ8ecBFL+gM yTeah59iBkQfhwlB/ScmyHPKkXrZuDXH1UdvCCoprijsd0uaFKBjA2G+hDXucQXvHQmNK4qf2 ChM1lToQf1L0gqRRRRCBvEMB5nwymV+k1WmbU/V36z7Iv1smdAVdNfkaWqeNiOXHV6zNJpR/j GrS0iYDFPTtI3fFTtPqhakdvyMM+9eLZudKWnbvb/smR5x1sx59IbIbVS1dB5O1IBfvyEYYSn 2XYdz6j2GIdATo9q4luV6YRCB5lEzS/dzvRDGZKJMxiRr9lKEfA+UXpuwsd2tco0yneWvKFRB siDvc7+iPKaVqFuwaCgYvG62uK1Hf8woJB9deQCCRkwEEwkn7PLJFnWYJok4z7LV1xg1iU/nI 7G7HKE1cQC69Cj0hxmFPYZJWRjRa0orngF0xB/Vh/BJTv/2j5S4tj3F/Qww+aFto+EfDBStkm Z9qVUvk8pZjk2jo3R1D0u8bUOCCkjHFjZjpRc5xq5xLsNUQ2tOlIRqrEPMMGcDJw2IlOtIPXA xrtL1xhAuhrnj8hSV4pRvVZqS+Wayj/GGMxX94zvN6UIi6W1daQ1UcA2EOYmC35L6qhWARjLM UQBhWWfTvW3dy7v4RWaCrqKzqGqxSgRFe/M/dvOSdA== 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/launchpad.scm (latest-release): Rename to 'import-release', add #:version argument. If version is given, return an upstream-source for this version. --- guix/import/launchpad.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/guix/import/launchpad.scm b/guix/import/launchpad.scm index b7e0295c4e..01953ea69c 100644 --- a/guix/import/launchpad.scm +++ b/guix/import/launchpad.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2019, 2020 Arun Isaac ;;; Copyright © 2021 Matthew James Kraai ;;; Copyright © 2020 Brice Waegeneire +;;; Copyright © 2022 Hartmut Goebel ;;; ;;; This file is part of GNU Guix. ;;; @@ -121,8 +122,9 @@ for example, 'linuxdcpp'. Return #f if there is no releases." (last (remove pre-release? (vector->list (assoc-ref json "entries")))) "version")))) -(define (latest-release pkg) - "Return an for the latest release of PKG." +(define* (import-release pkg #:key (version #f)) + "Return an for the latest release of PKG. Optionally +include a VERSION string to fetch a specific version." (define (origin-launchpad-uri origin) (match (origin-uri origin) ((? string? url) url) ; surely a Launchpad URL @@ -132,7 +134,7 @@ for example, 'linuxdcpp'. Return #f if there is no releases." (let* ((source-uri (origin-launchpad-uri (package-source pkg))) (name (package-name pkg)) (repository (launchpad-repository source-uri)) - (newest-version (latest-released-version repository))) + (newest-version (or version (latest-released-version repository)))) (if newest-version (upstream-source (package name) @@ -145,4 +147,4 @@ for example, 'linuxdcpp'. Return #f if there is no releases." (name 'launchpad) (description "Updater for Launchpad packages") (pred launchpad-package?) - (import latest-release))) + (import import-release))) From patchwork Tue Dec 20 09:34:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 45441 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 A0F3027BBEB; Tue, 20 Dec 2022 09:47:57 +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=unavailable 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 477A727BBE9 for ; Tue, 20 Dec 2022 09:47:55 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p7Z2t-00059Z-QZ; Tue, 20 Dec 2022 04:36:23 -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 1p7Z2Z-0004uv-3S for guix-patches@gnu.org; Tue, 20 Dec 2022 04:36:04 -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 1p7Z2Y-00038u-Ny for guix-patches@gnu.org; Tue, 20 Dec 2022 04:36:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p7Z2Y-0003UA-Ii for guix-patches@gnu.org; Tue, 20 Dec 2022 04:36:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#57460] [PATCH v3 15/18] import: pypi: 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:36:02 +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.167152891613331 (code B ref 57460); Tue, 20 Dec 2022 09:36:02 +0000 Received: (at 57460) by debbugs.gnu.org; 20 Dec 2022 09:35:16 +0000 Received: from localhost ([127.0.0.1]:43775 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7Z1n-0003So-Ho for submit@debbugs.gnu.org; Tue, 20 Dec 2022 04:35:16 -0500 Received: from mout.kundenserver.de ([217.72.192.75]:50145) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7Z1g-0003QI-5L for 57460@debbugs.gnu.org; Tue, 20 Dec 2022 04:35:08 -0500 Received: from hermia.goebel-consult.de ([87.176.134.225]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MSbt9-1pIOml2UCP-00SygY for <57460@debbugs.gnu.org>; Tue, 20 Dec 2022 10:35:02 +0100 Received: from thisbe.goebel-consult.de (hermia.goebel-consult.de [192.168.110.7]) by hermia.goebel-consult.de (Postfix) with ESMTP id 5E1EF669AC; Tue, 20 Dec 2022 10:34:24 +0100 (CET) From: Hartmut Goebel Date: Tue, 20 Dec 2022 10:34:20 +0100 Message-Id: <2167633f20f8537b163574c0d1cc5b0c59368998.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:kd9+tbp1aynyjTkR8fwEEOcg5GnAkoqcAxWqR/8CUivM5IeVGHf sCxLwnbJahFq2QJ+gflVeIfkQoHChvtzO2chH5OtT7sHd35f4HYK3mhUeq45q1wmhc689PZ w1UwmEpPXjpW8MKOeqBc8H9r53KKRrvreCZAsKYbtcekrgVSmksDJ4oYBQvm+/1WJ6eB1Gp AmoxsSopkepJ6u/58kWdA== UI-OutboundReport: notjunk:1;M01:P0:5RMWdOtqR2Q=;zLsxHGBcsQ/lnGU6Yy1QRR4LwnT bOkPLLkzJpf0PpdlkaYr1Jd/ujNmZRQ/obaiDkcoEet0vSJzKPu4eWJmZ/65bnY9KtAKdad+q I0U7a37QwkXOKbm4Avq7+y5I/6RCPTeqEYkCji8n4S5DJZZpbRmQWw34NOwZa3FUvrPzU7JvH NplGNNo8WkW2vG/eG5kewuz5hJF3FCOiEuguSLIVEQSvyVyw04McNI9wv/6W8m/AXhaQPCTAl EPtULMrHflkgpfkzSqv7tBeNvhhG0Q6u4njcneUmuF7TxB2aoFzZyE9V4bdmSlMrq4FzTFZIs j3Z+qYcisDT5EEZ76tofbYXGCk1HVeUW7MifGmArsLOLt2fvUpEq055WOOLprHtkg55bWeUBp rcJNF7A0VoDPRqowraGdN5fU30+XSkDa2Udv1aRRu6LC1nVSOlsKaBdfDQdKESbAHG6KthMJ0 PaOJIcb+f+lSZcIRJAZh+TgjG2c2MVkY6Mu6Fp9pHRqGrGlv8EvS4bc/KLdrlCGPSFhZldDo+ ZijpgmQEaujdSl05xo+6v3UglHplqV1F1Nh0NlzuMbaq/pxPM8n7A404hUWjUF3jFEnVlIbTd ZtLaqfp0Q5DPz7gyX0np3nL+vIMcFjmFRgN4DI7lC59WBUUCy8aE9owEovO8MbBp+1yjGnbGF NxHd+fqXgnS7V3Yy4AqM1hUZhMyzikXojf2I6Y7NJA== 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/pypi.scm (latest-release): Rename to 'import-release', add #:version argument and pass it on to called functions. --- guix/import/pypi.scm | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/guix/import/pypi.scm b/guix/import/pypi.scm index 3e3e949283..0e5998b36e 100644 --- a/guix/import/pypi.scm +++ b/guix/import/pypi.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2021 Marius Bakke ;;; Copyright © 2022 Vivien Kraus ;;; Copyright © 2021 Simon Tournier +;;; Copyright © 2022 Hartmut Goebel ;;; ;;; This file is part of GNU Guix. ;;; @@ -556,15 +557,16 @@ source. To build it from source, refer to the upstream repository at (string-prefix? "https://pypi.org/packages" url) (string-prefix? "https://files.pythonhosted.org/packages" 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* ((pypi-name (guix-package->pypi-name package)) (pypi-package (pypi-fetch pypi-name))) (and pypi-package (guard (c ((missing-source-error? c) #f)) (let* ((info (pypi-project-info pypi-package)) - (version (project-info-version info)) - (dist (source-release pypi-package)) + (version (or version (project-info-version info))) + (dist (source-release pypi-package version)) (url (distribution-url dist))) (upstream-source (urls (list url)) @@ -574,7 +576,7 @@ source. To build it from source, refer to the upstream repository at #f)) (input-changes (changed-inputs package - (pypi->guix-package pypi-name))) + (pypi->guix-package pypi-name #:version version))) (package (package-name package)) (version version))))))) @@ -583,4 +585,4 @@ source. To build it from source, refer to the upstream repository at (name 'pypi) (description "Updater for PyPI packages") (pred pypi-package?) - (import latest-release))) + (import import-release))) From patchwork Tue Dec 20 09:34:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 45444 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 2E2A627BBF1; Tue, 20 Dec 2022 09:59:08 +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 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 B5BD027BBEB for ; Tue, 20 Dec 2022 09:59:03 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p7Z2x-0005Cg-Hx; Tue, 20 Dec 2022 04:36:27 -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 1p7Z2Z-0004v2-KL for guix-patches@gnu.org; Tue, 20 Dec 2022 04:36:04 -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 1p7Z2Z-000397-Ae for guix-patches@gnu.org; Tue, 20 Dec 2022 04:36:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p7Z2Z-0003UH-0U for guix-patches@gnu.org; Tue, 20 Dec 2022 04:36:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#57460] [PATCH v3 16/18] refresh: 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:36:02 +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.167152891713339 (code B ref 57460); Tue, 20 Dec 2022 09:36:02 +0000 Received: (at 57460) by debbugs.gnu.org; 20 Dec 2022 09:35:17 +0000 Received: from localhost ([127.0.0.1]:43780 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7Z1o-0003Sy-80 for submit@debbugs.gnu.org; Tue, 20 Dec 2022 04:35:16 -0500 Received: from mout.kundenserver.de ([212.227.126.130]:33339) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7Z1i-0003R0-JC for 57460@debbugs.gnu.org; Tue, 20 Dec 2022 04:35:11 -0500 Received: from hermia.goebel-consult.de ([87.176.134.225]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1M9WeC-1pD5LA3lA4-005Xv8 for <57460@debbugs.gnu.org>; Tue, 20 Dec 2022 10:35:04 +0100 Received: from thisbe.goebel-consult.de (hermia.goebel-consult.de [192.168.110.7]) by hermia.goebel-consult.de (Postfix) with ESMTP id 7AF33669AD; Tue, 20 Dec 2022 10:34:24 +0100 (CET) From: Hartmut Goebel Date: Tue, 20 Dec 2022 10:34:21 +0100 Message-Id: <33d5dc74aa743c1588644b861fbe095cd761300d.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:soyilmYbR6EJzJc3u4HcC7sul2RTBfqem5ryYAUe76CfeZ3Axkx qj13XA+ou0Od7MOtKyG2QwBy4a2ZwTqz9zL4oaKH43RxejZpbXs3qlKRlR+/QG4K/Bw8d6v gpq5EBpA5T1M1G/52Q/q5wf159IU5K1bFNJNS0U4kMaL1Vs4czP+3/FiaMn6REZhKOYW7JA 0OrDlo2skLTXYiOVUoBoQ== UI-OutboundReport: notjunk:1;M01:P0:P3TWMKAk3gU=;4unfG9+y9ELIwrjC7Hrz0x8bEo/ dvPuGJHnvg7aB1fRGMWEDP4cItKziziuEi7z4MZgG6hiIc+1VVsU+DtMLfMnKuMWwh7YI72eI fm51YdmTp7AG87SL/n9pzxPZ8K5nPtLgGqMRnDjbiOtpA704KNjhoby2DPuONsi8RvECSiMKi Oqm4cxxavTceH9nXVJQCrp2VsCQdvzNLkTXsQg8GmvaILDH9v0Wkk5qvuCSWG0/eNxrm0Euyd e12fZ/Ym5jnUGqBKnnQPt26T0dpUZqdQBrkWCEeYcnLnDczojB5Uz698cB7V0Awgodb8G/CKU 4oK2SC/cVeM+t4nC1sGdDjEfNQX4AcdRl5yURr3fD9kHdCRQgjwN24GpUEG5yff2D1aUMjYB1 Ar0YNe5vKk9A6jBRXapSdcQrC1deCKLjgiHSfmqGlkpRh4NO+dkbDcUiN6I6J96Nosx4Gd1UA RJonzgBmFnhK9LoZXLcEHfV9evzNGVZtwa02kWo8tZacurTKWOWQ3BWoz2UeCCkmbysl2vRGc jN45LXw/WMheRkx3W6QwxFdshqc0vv/+TfipaoYDX7s06JaEcv8MzE6dNB3THLfMsgBptc1Ic 9hfnCwGyyjrBBmhkIqcDmFNXbTOHlUO4/n0O6f/k2tHHQv9hBUAV87AdiaBXHafYWTDrbuKdy irtsgrK01DCzWhBMeTRyR2f9/t0MtzNHALbInqU4A/MZoPhNmCmP3TNuV/C6a6o= 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/scripts/refresh.scm (options->packages)[args-packages]: Handle version specification in package name arguments. (update-package): Add #:version argument and pass it on to called functions. (guix-refresh): When updating, pass the specified version (if any) to update-package. [package-list-without-versions, package-list-with-versions]: New functions. --- guix/scripts/refresh.scm | 49 ++++++++++++++++++++++++++++++---------- 1 file changed, 37 insertions(+), 12 deletions(-) diff --git a/guix/scripts/refresh.scm b/guix/scripts/refresh.scm index 14329751f8..e0b94ce48d 100644 --- a/guix/scripts/refresh.scm +++ b/guix/scripts/refresh.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2019 Ricardo Wurmus ;;; Copyright © 2020 Simon Tournier ;;; Copyright © 2021 Sarah Morgensen +;;; Copyright © 2022 Hartmut Goebel ;;; ;;; This file is part of GNU Guix. ;;; @@ -46,6 +47,7 @@ #:use-module (ice-9 vlist) #:use-module (ice-9 format) #:use-module (srfi srfi-1) + #:use-module (srfi srfi-9) #:use-module (srfi srfi-26) #:use-module (srfi srfi-37) #:use-module (srfi srfi-71) @@ -181,7 +183,7 @@ specified with `--select'.\n")) (newline) (show-bug-report-information)) -(define (options->packages opts) +(define (options->update-specs opts) "Return the list of packages requested by OPTS, honoring options like '--recursive'." (define core-package? @@ -224,7 +226,7 @@ update would trigger a complete rebuild." (('argument . spec) ;; Take either the specified version or the ;; latest one. - (specification->package spec)) + (update-specification->update-spec spec)) (('expression . exp) (read/eval-package-expression exp)) (_ #f)) @@ -254,6 +256,25 @@ update would trigger a complete rebuild." (with-monad %store-monad (return packages)))) + +;;; +;;; Utilities. +;;; + +(define-record-type + (update-spec package version) + update? + (package update-spec-package) + (version update-spec-version)) + +(define (update-specification->update-spec spec) + "Given SPEC, a package name like \"guile@2.0=2.0.8\", return a +record with two fields: the package to upgrade, and the target version." + (match (string-rindex spec #\=) + (#f (update-spec (specification->package spec) #f)) + (idx (update-spec (specification->package (substring spec 0 idx)) + (substring spec (1+ idx)))))) + ;;; ;;; Updates. @@ -298,7 +319,7 @@ update would trigger a complete rebuild." (G_ "no updater for ~a~%") (package-name package))) -(define* (update-package store package updaters +(define* (update-package store package version updaters #:key (key-download 'interactive) warn?) "Update the source file that defines PACKAGE with the new version. KEY-DOWNLOAD specifies a download policy for missing OpenPGP keys; allowed @@ -307,7 +328,7 @@ warn about packages that have no matching updater." (if (lookup-updater package updaters) (let ((version output source (package-update store package updaters - #:key-download key-download)) + #:key-download key-download #:version version)) (loc (or (package-field-location package 'version) (package-location package)))) (when version @@ -540,12 +561,12 @@ all are dependent packages: ~{~a~^ ~}~%") (with-error-handling (with-store store (run-with-store store - (mlet %store-monad ((packages (options->packages opts))) + (mlet %store-monad ((update-specs (options->update-specs opts))) (cond (list-dependent? - (list-dependents packages)) + (list-dependents (map update-spec-package update-specs))) (list-transitive? - (list-transitive packages)) + (list-transitive (map update-spec-package update-specs))) (update? (parameterize ((%openpgp-key-server (or (assoc-ref opts 'key-server) @@ -558,13 +579,17 @@ all are dependent packages: ~{~a~^ ~}~%") (string-append (config-directory) "/upstream/trustedkeys.kbx")))) (for-each - (cut update-package store <> updaters - #:key-download key-download - #:warn? warn?) - packages) + (lambda (update) + (update-package store + (update-spec-package update) + (update-spec-version update) + updaters + #:key-download key-download + #:warn? warn?)) + update-specs) (return #t))) (else (for-each (cut check-for-package-update <> updaters #:warn? warn?) - packages) + (map update-spec-package update-specs)) (return #t))))))))) From patchwork Tue Dec 20 09:34:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 45453 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 4A05527BBED; Tue, 20 Dec 2022 10:05:34 +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 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 5023827BBE9 for ; Tue, 20 Dec 2022 10:05:33 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p7Z2s-00059H-Od; Tue, 20 Dec 2022 04:36:22 -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 1p7Z2Z-0004v6-Q9 for guix-patches@gnu.org; Tue, 20 Dec 2022 04:36:04 -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 1p7Z2Z-00039B-H9 for guix-patches@gnu.org; Tue, 20 Dec 2022 04:36:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p7Z2Z-0003UO-Cy for guix-patches@gnu.org; Tue, 20 Dec 2022 04:36:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#57460] [PATCH v3 17/18] upstream: 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:36:03 +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.167152891713345 (code B ref 57460); Tue, 20 Dec 2022 09:36:03 +0000 Received: (at 57460) by debbugs.gnu.org; 20 Dec 2022 09:35:17 +0000 Received: from localhost ([127.0.0.1]:43783 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7Z1o-0003T6-W8 for submit@debbugs.gnu.org; Tue, 20 Dec 2022 04:35:17 -0500 Received: from mout.kundenserver.de ([212.227.17.10]:56627) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7Z1l-0003Rf-5E for 57460@debbugs.gnu.org; Tue, 20 Dec 2022 04:35:13 -0500 Received: from hermia.goebel-consult.de ([87.176.134.225]) by mrelayeu.kundenserver.de (mreue106 [212.227.15.183]) with ESMTPSA (Nemesis) id 1Mqro7-1oTbWE24FF-00mtH5 for <57460@debbugs.gnu.org>; Tue, 20 Dec 2022 10:35:07 +0100 Received: from thisbe.goebel-consult.de (hermia.goebel-consult.de [192.168.110.7]) by hermia.goebel-consult.de (Postfix) with ESMTP id 8CBE2669AE; Tue, 20 Dec 2022 10:34:24 +0100 (CET) From: Hartmut Goebel Date: Tue, 20 Dec 2022 10:34:22 +0100 Message-Id: X-Mailer: git-send-email 2.30.6 In-Reply-To: References: MIME-Version: 1.0 X-Provags-ID: V03:K1:LBDY/sOe6KGOH4p190O3bbMEj1hPonazQiMel/vhxCBbObHWrxb 2OmKk/CMx+CuDqxkqP+slr2LHMBS/90ESFpoAfaEpyWvcm9XTMVKqBH3W528UNvYR63gx8e gQ/Q3rCdw7mtg2uKTNupkZdQslf1jFiUXj7vvCJGU93q5y7F1wXe/M7dg+Iar//PV+OjPx8 u4IDpT6QbYRKoPlitVFZw== UI-OutboundReport: notjunk:1;M01:P0:Df6qYKK1Mgk=;6qOWoGZVWh9SzObXHPwNMImo5Lt yrNewxcUfw23w7nq9rRh8gL02OsJ9LTxgVDQDeeIuRblpoYPo91S1t81buvGion1GHqbe6Tcp Pg8XQeAd5537QRXD12DXn2TckzW+RZ9Lk+m7iJ/ytVfSKGOVM1PVamo1qPMwHhYrFPxbzL9Av KJJo2oi/SUBkpvyt228qAU+UKaIw4xb8H6loMovzCtoXa9W/M01DIRAbyKoayaQN4uxUdA7Nk /8kXSrL4Xnj7uuXd2KALyIhYQbSpgUtSVCYsCdovWqqZumjr1OxzVjQLrFebP1GOd4iJKtEPi 1K61BypbBgI72WGr4OT0CGRyJehXH3gesLItoxLhjMH3ALwJ3yyAIBPNIkU5jGWsKgc1iFKq/ nZnnT8w4h7Rbk8YJAz8lrxyaPo6ZNM8pziYGqU8usxpAXo1HaIb1BxbFrn4NwrjgSwvq1Tu8v ULwgy0QouAyxrhpGztd6gJmrRUbRiTs+YYX1t7vjvXucYk9q29O54rDvl3qUNNEBaoxMeZPsT xbfvR/5308Mycs5Jf534Dueprn1UzPj1h+vnYXdpTbTyJk7yTWxgNkAtD8rjI/MPy5Jy4j5Gs SoA2Ef3A74hkQ7d7bxOrqSNmKefqpUzD1462l5oAzo736FLwzigma8sSnYSmyffgBzy6eiMdx 3+9CyfcR2p+q/Tkf8bpiuBgxjdI1ptZpqnTKUA0JyKPiuqb86c6hywsjnFdrHc8= 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/upstream.scm(package-latest-release): Add keyword-argument 'version' and pass it on to the updater's 'import' function. (package-update): add keyword-argument 'version' and pass it on to package-latest-release. Differentiate the error message issued when no package was found, depending on whether version was given or not. --- guix/upstream.scm | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/guix/upstream.scm b/guix/upstream.scm index 3b576898ec..f3ab9ab78b 100644 --- a/guix/upstream.scm +++ b/guix/upstream.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2019, 2022 Ricardo Wurmus ;;; Copyright © 2021 Sarah Morgensen ;;; Copyright © 2021, 2022 Maxime Devos +;;; Copyright © 2022 Hartmut Goebel ;;; ;;; This file is part of GNU Guix. ;;; @@ -278,7 +279,8 @@ them matches." (define* (package-latest-release package #:optional - (updaters (force %updaters))) + (updaters (force %updaters)) + #:key (version #f)) "Return an upstream source to update PACKAGE, a object, or #f if none of UPDATERS matches PACKAGE. When several updaters match PACKAGE, try them until one of them returns an upstream source. It is the caller's @@ -287,7 +289,7 @@ one." (any (match-lambda (($ name description pred import) (and (pred package) - (import package)))) + (import package #:version version)))) updaters)) (define* (package-latest-release* package @@ -494,13 +496,13 @@ SOURCE, an ." (define* (package-update store package #:optional (updaters (force %updaters)) - #:key (key-download 'interactive)) + #:key (key-download 'interactive) (version #f)) "Return the new version, the file name of the new version tarball, and input changes for PACKAGE; return #f (three values) when PACKAGE is up-to-date; raise an error when the updater could not determine available releases. KEY-DOWNLOAD specifies a download policy for missing OpenPGP keys; allowed values: 'always', 'never', and 'interactive' (default)." - (match (package-latest-release package updaters) + (match (package-latest-release package updaters #:version version) ((? upstream-source? source) (if (version>? (upstream-source-version source) (package-version package)) @@ -524,8 +526,11 @@ this method: ~s") (values #f #f #f))) (#f ;; Warn rather than abort so that other updates can still take place. - (warning (G_ "updater failed to determine available releases for ~a~%") - (package-name package)) + (if version + (warning (G_ "updater failed to find release ~a@~a~%") + (package-name package) version) + (warning (G_ "updater failed to determine available releases for ~a~%") + (package-name package))) (values #f #f #f)))) (define* (update-package-source package source hash) From patchwork Tue Dec 20 09:34:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hartmut Goebel X-Patchwork-Id: 45454 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 AE58627BBE9; Tue, 20 Dec 2022 10:05:35 +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 autolearn=unavailable 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 8E51F27BBED for ; Tue, 20 Dec 2022 10:05:34 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p7Z2s-00058g-CP; Tue, 20 Dec 2022 04:36:22 -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 1p7Z2a-0004vC-98 for guix-patches@gnu.org; Tue, 20 Dec 2022 04:36:04 -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 1p7Z2Z-00039H-UR for guix-patches@gnu.org; Tue, 20 Dec 2022 04:36:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p7Z2Z-0003UV-Pe for guix-patches@gnu.org; Tue, 20 Dec 2022 04:36:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#57460] [PATCH v3 18/18] doc: Describe how to update 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:36:03 +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.167152892813361 (code B ref 57460); Tue, 20 Dec 2022 09:36:03 +0000 Received: (at 57460) by debbugs.gnu.org; 20 Dec 2022 09:35:28 +0000 Received: from localhost ([127.0.0.1]:43787 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7Z1z-0003TQ-K2 for submit@debbugs.gnu.org; Tue, 20 Dec 2022 04:35:27 -0500 Received: from mout.kundenserver.de ([212.227.126.135]:59747) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p7Z1n-0003SN-Ca for 57460@debbugs.gnu.org; Tue, 20 Dec 2022 04:35:15 -0500 Received: from hermia.goebel-consult.de ([87.176.134.225]) by mrelayeu.kundenserver.de (mreue011 [212.227.15.167]) with ESMTPSA (Nemesis) id 1M5PyX-1p8ON63LBV-001Put for <57460@debbugs.gnu.org>; Tue, 20 Dec 2022 10:35:09 +0100 Received: from thisbe.goebel-consult.de (hermia.goebel-consult.de [192.168.110.7]) by hermia.goebel-consult.de (Postfix) with ESMTP id 9A503669AF; Tue, 20 Dec 2022 10:34:24 +0100 (CET) From: Hartmut Goebel Date: Tue, 20 Dec 2022 10:34:23 +0100 Message-Id: <2b905274a868aa9f0d015b8b688e1526172a63da.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:uC1mSHDysg43ZslYRkuulYKRcH4kAav8wuuMJv93qI88p7K/qQA n3jUEZDX6XQS8waJXH/1ZWE0MMGDZtp/uNcSFocfXtsy5ZUbez4jemhZQoai+iS9wYbQ6Tm +Pj0YLpoShChT7YWvqLbQaQHieqv4XcXSZUfR8R+QvJJhIl0WEG731TcOTqJiuSmQ0gw0rW mBJIosT35sPCGRb7Bc6Sg== UI-OutboundReport: notjunk:1;M01:P0:yLtXFuKAAPw=;XAxk30g94y8cOaAqzSB0/N+iInP QoQHDHNj5G4YVAiBzskKbrUlohe/UNeWdaPWUKr87bJZftX2Z9WWqWcSZiIs3uIUz/EiWz5HH l1BzLwxN+c+dt7w7GBvqluXxlJbO1WPXUqJnD6MFTiheWXsm27ya70NvWqeyDqNQ9SC5pFAWT xs36Nd8y+5yWEMwrw5limvhYwbk6XvmCjGl+zgmgl3LmxY3UrICBBnXuHVg8YdMxzMJprL/f8 eprYzfFAufOXYhbv4X9vOmSgseGl4cdRfDW1b2R6jEpum1uGdWyOWxuaAr0Zp6Sq1n8Jt8NTd h+yGZ30Z8MM9U2CZoszK8+PP1ykhakxmNQOZ9yOJ053lxaOd+KLO3Achbsw7a7/EytvmJNFqD FFNqvEVcDb40DkNEoOEJswVtFrH9/SHM6+DMRd90LyK7AUMvB5ErZXgOv5+ZmVg5gsK1DNlVl DYST+o+wQ5DkHhUL0GZ7xakxGHSTssViZTx+SFVRVbVuMpypa8lSjtnPr+t9KvlB3WboBEKhY LgJXuOgWGzYfE+XMxJ99IETo0PWb8wEV0NH3Dax3DZnrpeduUdLZwyKT/VJcFTI1aMxQdtggu VNEydbcTj08hcd6bWdAXhjqtjZDh3Q3r4TvBTNom5chichUBFtV7Uaf3ixubLJWcOTTP14StB V2nzHCmACRdLhsCTNtKMrfR4GVIwuHbSoTJA9LOxltniNmvr71zo1qfLDitcFzE= 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 --- doc/guix.texi | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/doc/guix.texi b/doc/guix.texi index c031c8d880..8bca0e1098 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -13932,6 +13932,25 @@ gnu/packages/multiprecision.scm:40:12: 6.1.2 is already the latest version of gm @end table +If for some reason you don't want to update to the latest version, +you can update to a specific version +by appending an equal-sign and the desired version number +to the package specification. +However, not all updaters support this. + +@example +$ guix refresh trytond-party +gnu/packages/guile.scm:392:2: guile would be upgraded from 3.0.3 to 3.0.5 +$ guix refresh -u guile=3.0.4 +@dots{} +gnu/packages/guile.scm:392:2: guile: updating from version 3.0.3 to version 3.0.4... +@dots{} +$ guix refresh -u guile@@2.0=2.0.12 +@dots{} +gnu/packages/guile.scm:147:2: guile: updating from version 2.0.10 to version 2.0.12... +@dots{} +@end example + Sometimes the upstream name differs from the package name used in Guix, and @command{guix refresh} needs a little help. Most updaters honor the @code{upstream-name} property in package definitions, which can be used