[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
08/72: gnu-maintenance: Accept package object in 'import-html-release' p
From: |
guix-commits |
Subject: |
08/72: gnu-maintenance: Accept package object in 'import-html-release' procedure. |
Date: |
Tue, 15 Aug 2023 20:42:22 -0400 (EDT) |
apteryx pushed a commit to branch qt-updates
in repository guix.
commit 4a7c49a38983592313b30522f57e7b6a1f0e67ae
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Wed Aug 9 22:53:03 2023 -0400
gnu-maintenance: Accept package object in 'import-html-release' procedure.
This is in preparation for a new URL rewriting feature, which will need to
have the current version information available.
* guix/gnu-maintenance.scm (import-html-release): Update doc. Adjust
default
value of the DIRECTORY argument. Bind PACKAGE in lexical scope so that its
value there is unchanged.
(import-savannah-release, import-kernel.org-release)
(import-html-updatable-release): Adjust accordingly.
---
guix/gnu-maintenance.scm | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm
index 67abbc1c5a..13d6c1c7f2 100644
--- a/guix/gnu-maintenance.scm
+++ b/guix/gnu-maintenance.scm
@@ -494,11 +494,12 @@ hosted on ftp.gnu.org, or not under that name (this is
the case for
(define* (import-html-release base-url package
#:key
(version #f)
- (directory (string-append "/" package))
+ (directory (string-append
+ "/" (package-upstream-name package)))
file->signature)
- "Return an <upstream-source> for the latest release of PACKAGE (a string)
-under DIRECTORY at BASE-URL, or #f. Optionally include a VERSION string to
-fetch a specific version.
+ "Return an <upstream-source> for the latest release of PACKAGE under
+DIRECTORY at BASE-URL, 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'.
@@ -507,7 +508,8 @@ 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
file URL and must return the corresponding signature URL, or #f it signatures
are unavailable."
- (let* ((url (if (string-null? directory)
+ (let* ((package (package-upstream-name package))
+ (url (if (string-null? directory)
base-url
(string-append base-url directory "/")))
(links (url->links url)))
@@ -730,7 +732,6 @@ to fetch a specific version."
(match (origin-uri (package-source package))
((? string? uri) uri)
((uri mirrors ...) uri))))
- (package (package-upstream-name package))
(directory (dirname (uri-path uri))))
;; Note: We use the default 'file->signature', which adds ".sig", ".asc",
;; or whichever detached signature naming scheme PACKAGE uses.
@@ -825,7 +826,6 @@ Optionally include a VERSION string to fetch a specific
version."
(match (origin-uri (package-source package))
((? string? uri) uri)
((uri mirrors ...) uri))))
- (package (package-upstream-name package))
(directory (dirname (uri-path uri))))
(import-html-release %kernel.org-base package
#:version version
@@ -869,8 +869,7 @@ string to fetch a specific version."
"://" (uri-host uri))))
(directory (if custom
""
- (dirname (uri-path uri))))
- (package (package-upstream-name package)))
+ (dirname (uri-path uri)))))
(false-if-networking-error
(import-html-release base package
#:version version
- branch qt-updates created (now e3b7f4e95c), guix-commits, 2023/08/15
- 01/72: gnu-maintenance: Make base-url argument of import-html-release required., guix-commits, 2023/08/15
- 03/72: gnu: qt: Streamline qt-urls., guix-commits, 2023/08/15
- 04/72: gnu: qt-creator: Use mirror://qt for source URI., guix-commits, 2023/08/15
- 02/72: download: Add mirrors for Qt., guix-commits, 2023/08/15
- 08/72: gnu-maintenance: Accept package object in 'import-html-release' procedure.,
guix-commits <=
- 11/72: gnu-maintenance: Add support to rewrite version in URL path., guix-commits, 2023/08/15
- 13/72: gnu-maintenance: Consider Qt source tarballs as "release files"., guix-commits, 2023/08/15
- 09/72: gnu-maintenance: Document nested procedures in 'import-html-release'., guix-commits, 2023/08/15
- 07/72: gnu-maintenance: Fix indentation., guix-commits, 2023/08/15
- 06/72: gnu-maintenance: Extract url->links procedure., guix-commits, 2023/08/15
- 27/72: gnu: qtshadertools: Update to 6.5.2., guix-commits, 2023/08/15
- 31/72: gnu: qtlottie: Update to 6.5.2., guix-commits, 2023/08/15
- 25/72: gnu: qtdeclarative: Update to 6.5.2., guix-commits, 2023/08/15
- 40/72: gnu: qtbase-5: Update to 5.15.10., guix-commits, 2023/08/15
- 41/72: gnu: qt3d-5: Update to 5.15.10., guix-commits, 2023/08/15