Merge branch 'master' into staging

1 files changed, 4 insertions, 11 deletions

diff --git a/guix/scripts/describe.scm b/guix/scripts/describe.scm
index 5e00067ef8..f13f221da9 100644
--- a/guix/scripts/describe.scm
+++ b/guix/scripts/describe.scm
@@ -201,11 +201,7 @@ way and displaying details about the channel's source code."
                    (format #t (G_ "    commit: ~a~%")
                            (if (supports-hyperlinks?)
                                (channel-commit-hyperlink channel commit)
-                               commit))
-                   (when (not (supports-hyperlinks?))
-                     (format #t (G_ "    URL: ~a~%")
-                             (channel-commit-hyperlink channel commit
-                                                       (lambda (url msg) url))))))
+                               commit))))
                 (_ #f)))
 
             ;; Show most recently installed packages last.
@@ -237,12 +233,9 @@ way and displaying details about the channel's source code."
 
 (define* (channel-commit-hyperlink channel
                                    #:optional
-                                   (commit (channel-commit channel))
-                                   (transformer hyperlink))
+                                   (commit (channel-commit channel)))
   "Return a hyperlink for COMMIT in CHANNEL, using COMMIT as the hyperlink's
-text.  The hyperlink links to a web view of COMMIT, when available.
-TRANSFORMER is a procedure of 2 arguments, a URI and text, and returns a
-string for display."
+text.  The hyperlink links to a web view of COMMIT, when available."
   (let* ((url  (channel-url channel))
          (uri  (string->uri url))
          (host (and uri (uri-host uri))))
@@ -251,7 +244,7 @@ string for display."
           (#f
            commit)
           ((_ template)
-           (transformer (template url commit) commit)))
+           (hyperlink (template url commit) commit)))
         commit)))