From: Hartmut Goebel <h.goebel@crazy-compilers.com>
To: 57460@debbugs.gnu.org
Subject: [bug#57460] [PATCH 05/20] refresh: Allow updating to a specific version (gnu-maintenance)
Date: Sun, 28 Aug 2022 15:18:31 +0200 [thread overview]
Message-ID: <51528a9d139e8178faa1365f49d29e55ed320ada.1661691694.git.h.goebel@crazy-compilers.com> (raw)
In-Reply-To: <cover.1661691694.git.h.goebel@crazy-compilers.com>
* guix/gnu-maintenance.scm
(latest-ftp-release): Rename to (import-ftp-release),
add keyword-argument 'version'.
If version is given, try to find the respective version.
(latest-html-release): Rename to (import-html-release),
add keyword-argument 'version'.
If version is given, try to find the respective version.
(latest-gnu-release): Rename to (import-gnu-release),
add keyword-argument 'version'. 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),
add keyword-argument 'version', pass on to import-ftp-release.
(import-release*): Rename to (import-release*),
add keyword-argument 'version', pass on to latest-release.
(latest-savannah-release): Rename to (import-savannah-release),
add keword-argument version, pass on to import-html-release.
(latest-xorg-release): Rename to (import-xorg-release),
add keword-argument version, pass on to import-ftp-release.
(latest-kernel.org-release): Rename to (import-kernel.org-release),
add keyword-argument 'version', pass on to import-html-release.
(latest-html-updatable-release): Rename to (import-html-updatable-release),
add keyword-argument 'version', pass on to import-html-release.
* guix/import/gnu.scm(gnu->guix-package): Adjust function call.
---
guix/gnu-maintenance.scm | 140 +++++++++++++++++++++++----------------
guix/import/gnu.scm | 2 +-
2 files changed, 84 insertions(+), 58 deletions(-)
diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm
index 8446a59fb5..ea3394e9e8 100644
--- a/guix/gnu-maintenance.scm
+++ b/guix/gnu-maintenance.scm
@@ -328,8 +328,9 @@ 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")))
@@ -400,8 +401,11 @@ 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
+ (car (filter (lambda (r) (string=? version (upstream-source-version r)))
+ (coalesce-sources releases)))
+ (reduce latest-release #f
+ (coalesce-sources releases))))
(result (if (and result release)
(latest-release release result)
(or release result)))
@@ -413,13 +417,15 @@ 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 <upstream-source> for the latest version of PACKAGE or #f.
PACKAGE must be the canonical name of a GNU package."
- (latest-ftp-release package
+ (import-ftp-release package
+ #:version version
#:server server
#:directory directory))
@@ -435,14 +441,15 @@ of EXP otherwise."
(close-port port))
#f)))
-(define (latest-release* package)
- "Like 'latest-release', but (1) take a <package> object, and (2) ignore FTP
+(define* (import-release* package #:key (version #f))
+ "Like 'import-release', but (1) take a <package> 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))))
@@ -467,8 +474,9 @@ 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)
@@ -538,13 +546,17 @@ 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
+ (car (filter (lambda (r) (string=? version (upstream-source-version r)))
+ (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)))))))
\f
;;;
@@ -576,46 +588,55 @@ 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.
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)."
+
+ (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-values (((server directory)
(ftp-server/directory package))
((name)
(package-upstream-name package)))
(let* ((files (ftp.gnu.org-files))
+ ;; select archives 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/"))))
- tarballs))
- (signature-urls (map (cut string-append <> ".sig") urls)))))
- (()
- #f)))))
+ files))
+ ;; find latest version
+ (version (or version
+ (and (not (null? relevant))
+ (tarball->version
+ (find-latest-archive-version relevant)))))
+ ;; find archives matching this version
+ (archives (filter (lambda (file)
+ (string=? version (tarball->version file)))
+ relevant)))
+ (match archives
+ (() #f)
+ (_
+ (upstream-source
+ (package name)
+ (version version)
+ (urls (map (lambda (file)
+ (string-append "mirror://gnu/"
+ (string-drop file
+ (string-length "/gnu/"))))
+ archives))
+ (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
@@ -668,7 +689,7 @@ GNOME packages; EMMS is included though, because its releases are on gnu.org."
;; HTML (unlike <https://download.savannah.nongnu.org/releases>.)
"https://nongnu.freemirror.org/nongnu")
-(define (latest-savannah-release package)
+(define* (import-savannah-release package #:key (version #f))
"Return the latest release of PACKAGE."
(let* ((uri (string->uri
(match (origin-uri (package-source package))
@@ -680,7 +701,8 @@ GNOME packages; EMMS is included though, because its releases are on gnu.org."
"mirror://savannah")))
;; Note: We use the default 'file->signature', which adds ".sig", ".asc",
;; or whichever detached signature naming scheme PACKAGE uses.
- (and=> (latest-html-release package
+ (and=> (import-html-release package
+ #:version version
#:base-url %savannah-base
#:directory directory)
(cut adjusted-upstream-source <> rewrite))))
@@ -744,21 +766,22 @@ GNOME packages; EMMS is included though, because its releases are on gnu.org."
(when port
(close-port port))))))
-(define (latest-xorg-release package)
+(define* (import-xorg-release package #:key (version #f))
"Return the latest release of PACKAGE."
(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)
+(define* (import-kernel.org-release package #:key (version #f))
"Return the latest release of PACKAGE, the name of a kernel.org package."
(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)
@@ -772,7 +795,8 @@ GNOME packages; EMMS is included though, because its releases are on gnu.org."
(directory (dirname (uri-path uri)))
(rewrite (url-prefix-rewrite %kernel.org-base
"mirror://kernel.org")))
- (and=> (latest-html-release package
+ (and=> (import-html-release package
+ #:version version
#:base-url %kernel.org-base
#:directory directory
#:file->signature file->signature)
@@ -801,7 +825,7 @@ 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."
(let* ((uri (string->uri
@@ -817,10 +841,12 @@ the directory containing its source tarball."
""
(dirname (uri-path uri))))
(package (package-upstream-name package)))
+
(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)
@@ -838,7 +864,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
@@ -849,14 +875,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
@@ -870,20 +896,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)))
--
2.30.4
next prev parent reply other threads:[~2022-08-28 13:20 UTC|newest]
Thread overview: 60+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-28 13:15 [bug#57460] [PATCH 00/19] Refresh to specific version Hartmut Goebel
2022-08-28 13:18 ` [bug#57460] [PATCH 01/20] upstream-updater: Rename record field Hartmut Goebel
2022-08-28 13:18 ` [bug#57460] [PATCH 02/20] import: cpan: Remove unused exports Hartmut Goebel
2022-08-28 13:18 ` [bug#57460] [PATCH 03/20] updaters: Issue error-message if version is given: Hartmut Goebel
2022-08-28 13:18 ` [bug#57460] [PATCH 04/20] import: sourceforge: Issue error-message if version is given Hartmut Goebel
2022-08-28 13:22 ` Maxime Devos
2022-08-28 13:18 ` Hartmut Goebel [this message]
2022-09-24 9:17 ` [bug#57460] [PATCH 00/19] Refresh to specific version Ludovic Courtès
2022-08-28 13:18 ` [bug#57460] [PATCH 06/20] refresh: Allow updating to a specific version (crate) Hartmut Goebel
2022-09-24 9:19 ` [bug#57460] [PATCH 00/19] Refresh to specific version Ludovic Courtès
2022-08-28 13:18 ` [bug#57460] [PATCH 07/20] refresh: Allow updating to a specific version (egg) Hartmut Goebel
2022-08-28 13:18 ` [bug#57460] [PATCH 08/20] refresh: Allow updating to a specific version (git) Hartmut Goebel
2022-09-24 9:24 ` [bug#57460] [PATCH 00/19] Refresh to specific version Ludovic Courtès
2022-08-28 13:18 ` [bug#57460] [PATCH 09/20] refresh: Allow updating to a specific version (github) Hartmut Goebel
2022-09-24 9:26 ` [bug#57460] [PATCH 00/19] Refresh to specific version Ludovic Courtès
2022-08-28 13:18 ` [bug#57460] [PATCH 10/20] refresh: Allow updating to a specific version (gnome) Hartmut Goebel
2022-09-24 9:29 ` [bug#57460] [PATCH 00/19] Refresh to specific version Ludovic Courtès
2022-09-24 10:25 ` Maxime Devos
2022-09-24 16:31 ` Ludovic Courtès
2022-08-28 13:18 ` [bug#57460] [PATCH 11/20] refresh: Allow updating to a specific version (hexpm) Hartmut Goebel
2022-08-28 13:18 ` [bug#57460] [PATCH 12/20] refresh: Allow updating to a specific version (kde) Hartmut Goebel
2022-09-24 9:34 ` [bug#57460] [PATCH 00/19] Refresh to specific version Ludovic Courtès
2022-08-28 13:18 ` [bug#57460] [PATCH 13/20] refresh: Allow updating to a specific version (launchpad) Hartmut Goebel
2022-08-28 13:18 ` [bug#57460] [PATCH 14/20] refresh: Allow updating to a specific version (pypi) Hartmut Goebel
2022-08-28 13:18 ` [bug#57460] [PATCH 15/20] refresh: Allow updating to a specific version (script) Hartmut Goebel
2022-08-28 13:26 ` Maxime Devos
2022-09-24 9:45 ` [bug#57460] [PATCH 00/19] Refresh to specific version Ludovic Courtès
2022-11-01 15:58 ` Hartmut Goebel
2022-11-22 7:33 ` Ludovic Courtès
2022-08-28 13:18 ` [bug#57460] [PATCH 16/20] refresh: Allow updating to a specific version (upstream) Hartmut Goebel
2022-08-28 13:18 ` [bug#57460] [PATCH 17/20] refresh: Allow updating to a specific version (documentation) Hartmut Goebel
2022-08-28 13:18 ` [bug#57460] [PATCH 18/20] TEMP REMOVE import: git: Restrict to non-github origins Hartmut Goebel
2022-08-28 17:26 ` Liliana Marie Prikler
2022-08-28 13:18 ` [bug#57460] [PATCH 19/20] TEMP REMOVE upstream: Output names of importers tried Hartmut Goebel
2022-08-28 13:18 ` [bug#57460] [PATCH 20/20] TEMP REMOVE Add test-script for refesh-with-version Hartmut Goebel
2022-08-28 13:30 ` [bug#57460] [PATCH 00/19] Refresh to specific version Maxime Devos
2022-09-24 9:48 ` Ludovic Courtès
2022-11-01 16:02 ` Hartmut Goebel
2022-12-20 9:34 ` [bug#57460] [PATCH v3 00/18] " Hartmut Goebel
2022-12-20 9:34 ` [bug#57460] [PATCH v3 01/18] upstream-updater: Rename record field Hartmut Goebel
2022-12-20 9:34 ` [bug#57460] [PATCH v3 02/18] import: cpan: Remove unused exports Hartmut Goebel
2022-12-20 9:34 ` [bug#57460] [PATCH v3 03/18] import: Issue error-message if version is given Hartmut Goebel
2022-12-20 9:34 ` [bug#57460] [PATCH v3 04/18] import: sourceforge: " Hartmut Goebel
2022-12-20 9:34 ` [bug#57460] [PATCH v3 05/18] gnu-maintenance: Allow updating to a specific version Hartmut Goebel
2022-12-20 9:34 ` [bug#57460] [PATCH v3 06/18] import: crate: " Hartmut Goebel
2022-12-20 9:34 ` [bug#57460] [PATCH v3 07/18] import: egg: " Hartmut Goebel
2022-12-20 9:34 ` [bug#57460] [PATCH v3 08/18] import: gem: " Hartmut Goebel
2022-12-20 9:34 ` [bug#57460] [PATCH v3 09/18] import: git: " Hartmut Goebel
2022-12-20 9:34 ` [bug#57460] [PATCH v3 10/18] import: github: " Hartmut Goebel
2022-12-20 9:34 ` [bug#57460] [PATCH v3 11/18] import: gnome: " Hartmut Goebel
2022-12-20 9:34 ` [bug#57460] [PATCH v3 12/18] import: hexpm: " Hartmut Goebel
2022-12-20 9:34 ` [bug#57460] [PATCH v3 13/18] import: kde: " Hartmut Goebel
2022-12-20 9:34 ` [bug#57460] [PATCH v3 14/18] import: launchpad: " Hartmut Goebel
2022-12-20 9:34 ` [bug#57460] [PATCH v3 15/18] import: pypi: " Hartmut Goebel
2022-12-20 9:34 ` [bug#57460] [PATCH v3 16/18] refresh: " Hartmut Goebel
2022-12-20 9:34 ` [bug#57460] [PATCH v3 17/18] upstream: " Hartmut Goebel
2022-12-20 9:34 ` [bug#57460] [PATCH v3 18/18] doc: Describe how to update " Hartmut Goebel
2022-12-23 22:42 ` [bug#57460] [PATCH 00/19] Refresh to " Ludovic Courtès
2022-12-23 22:45 ` Ludovic Courtès
2022-12-26 16:42 ` bug#57460: " Hartmut Goebel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=51528a9d139e8178faa1365f49d29e55ed320ada.1661691694.git.h.goebel@crazy-compilers.com \
--to=h.goebel@crazy-compilers.com \
--cc=57460@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.