summary refs log tree commit diff
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2022-03-29 00:03:03 +0300
committerEfraim Flashner <efraim@flashner.co.il>2022-03-29 14:43:14 +0300
commit67213a27592122e05c196c490de2ddf990d6832a (patch)
tree36d107e237ea3435ac9fe9cc9546ed26afc11aca
parent53b04339fe521f486d3017930a419d5ca8a6cffd (diff)
downloadguix-67213a27592122e05c196c490de2ddf990d6832a.tar.gz
download: Use https for main KDE source.
* guix/download.scm (%mirrors)[kde]: Use https URIs for main KDE mirrors.
* tests/lint.scm ("mirror-url: kde suggestion"): New test.
-rw-r--r--guix/download.scm5
-rw-r--r--tests/lint.scm11
2 files changed, 13 insertions, 3 deletions
diff --git a/guix/download.scm b/guix/download.scm
index 4e219c9f49..47a2fcb180 100644
--- a/guix/download.scm
+++ b/guix/download.scm
@@ -4,6 +4,7 @@
 ;;; Copyright © 2015 Federico Beffa <beffa@fbengineering.ch>
 ;;; Copyright © 2016 Alex Griffin <a@ajgrf.com>
 ;;; Copyright © 2016 David Craven <david@craven.ch>
+;;; Copyright © 2016, 2017, 2020, 2022 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2017 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2019 Guy Fleury Iteriteka <hoonandon@gmail.com>
 ;;;
@@ -261,8 +262,8 @@
        "http://ftp.debian.org/debian/"
        "http://archive.debian.org/debian/")
       (kde
-       "http://download.kde.org"
-       "http://download.kde.org/Attic" ; for when it gets archived.
+       "https://download.kde.org/"
+       "https://download.kde.org/Attic/"    ; for when it gets archived.
        ;; Mirrors from http://files.kde.org/extra/mirrors.html
        ;; Europe
        "http://mirror.easyname.at/kde"
diff --git a/tests/lint.scm b/tests/lint.scm
index 6bb24370da..8be74d2604 100644
--- a/tests/lint.scm
+++ b/tests/lint.scm
@@ -5,7 +5,7 @@
 ;;; Copyright © 2015, 2016 Mathieu Lirzin <mthl@gnu.org>
 ;;; Copyright © 2016 Hartmut Goebel <h.goebel@crazy-compilers.com>
 ;;; Copyright © 2017 Alex Kost <alezost@gmail.com>
-;;; Copyright © 2017 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2017, 2022 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2018, 2019 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2020 Timothy Sample <samplet@ngyro.com>
 ;;; Copyright © 2020 Tobias Geerinckx-Rice <me@tobias.gr>
@@ -1102,6 +1102,15 @@
     (single-lint-warning-message
      (check-mirror-url (dummy-package "x" (source source))))))
 
+(test-equal "mirror-url: kde suggestion"
+  "URL should be 'mirror://kde/stable/gcompris/qt/src/gcompris-qt-2.3.tar.xz'"
+  (let ((source (origin
+                  (method url-fetch)
+                  (uri "https://download.kde.org/stable/gcompris/qt/src/gcompris-qt-2.3.tar.xz")
+                  (sha256 %null-sha256))))
+    (single-lint-warning-message
+     (check-mirror-url (dummy-package "x" (source source))))))
+
 (test-equal "github-url"
   '()
   (with-http-server `((200 ,%long-string))