| Message ID | b55d537e0cb39ec26e07e988729168a28c84e9d5.1662022775.git.maximedevos@telenet.be |
|---|---|
| State | Accepted |
| Headers | show |
| Series | Stop unmirroring during updates. | expand |
| Context | Check | Description |
|---|---|---|
| cbaines/comparison | success | View comparision |
| cbaines/git-branch | success | View Git branch |
| cbaines/applying patch | success | View Laminar job |
| cbaines/issue | success | View issue |
| cbaines/comparison | success | View comparision |
| cbaines/git-branch | success | View Git branch |
| cbaines/applying patch | success | View Laminar job |
| cbaines/issue | success | View issue |
diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm index 84fd087319..2f09539d5d 100644 --- a/guix/gnu-maintenance.scm +++ b/guix/gnu-maintenance.scm @@ -532,9 +532,12 @@ (define (url->release url) (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))
Partially fixes: https://issues.guix.gnu.org/57477. TODO: test case, it's http! 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. --- guix/gnu-maintenance.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)