From 67213a27592122e05c196c490de2ddf990d6832a Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Tue, 29 Mar 2022 00:03:03 +0300 Subject: [PATCH] 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. --- guix/download.scm | 5 +++-- tests/lint.scm | 11 ++++++++++- 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 ;;; Copyright © 2016 Alex Griffin ;;; Copyright © 2016 David Craven +;;; Copyright © 2016, 2017, 2020, 2022 Efraim Flashner ;;; Copyright © 2017 Tobias Geerinckx-Rice ;;; Copyright © 2019 Guy Fleury Iteriteka ;;; @@ -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 ;;; Copyright © 2016 Hartmut Goebel ;;; Copyright © 2017 Alex Kost -;;; Copyright © 2017 Efraim Flashner +;;; Copyright © 2017, 2022 Efraim Flashner ;;; Copyright © 2018, 2019 Arun Isaac ;;; Copyright © 2020 Timothy Sample ;;; Copyright © 2020 Tobias Geerinckx-Rice @@ -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))