summary refs log tree commit diff
diff options
context:
space:
mode:
authorMaxime Devos <maximedevos@telenet.be>2022-09-01 11:01:54 +0200
committerLudovic Courtès <ludo@gnu.org>2022-09-26 23:29:37 +0200
commitd9b8169a9f3cd5bcafcd2f85af7c7c876272c540 (patch)
tree302e8f1b66d5b369c984b6edb91d0013af3644c7
parent60474b5291360830983aa2c2514cb9da44259d1d (diff)
downloadguix-d9b8169a9f3cd5bcafcd2f85af7c7c876272c540.tar.gz
gnu-maintenance: Simplify latest-kernel.org-release.
As latest-html-release now produces mirror:// URIs where possible,
the additional post-processing is not necessary anymore.

As a test, revert the dtc package back to 1.6.0 and try updating 'gash',
the mirror:// URI remains.

* gnu-maintenance.scm (latest-kernel.org-release): Do not call
adjusted-upstream-source on the result.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
-rw-r--r--guix/gnu-maintenance.scm13
1 files changed, 5 insertions, 8 deletions
diff --git a/guix/gnu-maintenance.scm b/guix/gnu-maintenance.scm
index cb774d2ed6..824762695c 100644
--- a/guix/gnu-maintenance.scm
+++ b/guix/gnu-maintenance.scm
@@ -791,14 +791,11 @@ GNOME packages; EMMS is included though, because its releases are on gnu.org."
                        ((? string? uri) uri)
                        ((uri mirrors ...) uri))))
          (package   (package-upstream-name package))
-         (directory (dirname (uri-path uri)))
-         (rewrite   (url-prefix-rewrite %kernel.org-base
-                                        "mirror://kernel.org")))
-    (and=> (latest-html-release package
-                                #:base-url %kernel.org-base
-                                #:directory directory
-                                #:file->signature file->signature)
-           (cut adjusted-upstream-source <> rewrite))))
+         (directory (dirname (uri-path uri))))
+    (latest-html-release package
+                         #:base-url %kernel.org-base
+                         #:directory directory
+                         #:file->signature file->signature)))
 
 (define html-updatable-package?
   ;; Return true if the given package may be handled by the generic HTML