guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

05/18: gnu-maintenance: Produce mirror:// URIs in latest-html-release.


From: guix-commits
Subject: 05/18: gnu-maintenance: Produce mirror:// URIs in latest-html-release.
Date: Mon, 26 Sep 2022 17:32:09 -0400 (EDT)

civodul pushed a commit to branch master
in repository guix.

commit 11ec14ff0ede22fa5e402baf46938b17513d21e6
Author: Maxime Devos <maximedevos@telenet.be>
AuthorDate: Thu Sep 1 11:01:50 2022 +0200

    gnu-maintenance: Produce mirror:// URIs in latest-html-release.
    
    Partially fixes <https://issues.guix.gnu.org/57477>.
    
    I'm not aware of a package using both latest-html-release and mirrors, so it
    has not been completely tested.  However, updating "yt-dlp" appears to work
    (except for git-fetch not being supported yet).  The expression for the
    signature-urls field had to be tweaked to not call uri-mirror-rewrite on 
#false.
    
    * guix/gnu-maintenance.scm 
(latest-html-release)[url->research]{urls,signature-urls}:
    Call uri-mirror-rewrite on the URLs.
    
    Co-authored-by: Ludovic Courtès <ludo@gnu.org>
---
 guix/gnu-maintenance.scm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm
index b6450994e6..604522e913 100644
--- a/guix/gnu-maintenance.scm
+++ b/guix/gnu-maintenance.scm
@@ -538,9 +538,12 @@ are unavailable."
                (upstream-source
                 (package package)
                 (version version)
-                (urls (list url))
+                ;; uri-mirror-rewrite: Don't turn nice mirror:// URIs into 
ftp://
+                ;; URLs during "guix refresh -u".
+                (urls (list (uri-mirror-rewrite url)))
                 (signature-urls
-                 (list ((or file->signature file->signature/guess) url))))))))
+                 (and=> ((or file->signature file->signature/guess) url)
+                        (lambda (url) (list (uri-mirror-rewrite url))))))))))
 
     (define candidates
       (filter-map url->release links))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]