From 93e511c31927013e95d485d2eae7ebf08c40d009 Mon Sep 17 00:00:00 2001 From: c0bw3b Date: Sat, 1 Dec 2018 18:07:00 +0100 Subject: [PATCH] Treewide: use HTTPS on GNU Savannah domains HTTP -> HTTPS for: - http://savannah.gnu.org/ - http://git.savannah.gnu.org/ - http://download.savannah.gnu.org/ - http://svn.savannah.gnu.org/ --- pkgs/applications/audio/mi2ly/default.nix | 2 +- pkgs/applications/audio/mi2ly/default.upstream | 2 +- pkgs/applications/audio/mimms/default.nix | 2 +- pkgs/applications/editors/emacs-modes/bbdb/3.nix | 2 +- pkgs/applications/editors/leafpad/default.nix | 2 +- pkgs/applications/misc/devilspie2/default.nix | 2 +- pkgs/applications/misc/xlog/default.nix | 2 +- pkgs/development/compilers/gcl/2.6.13-pre.nix | 2 +- pkgs/development/interpreters/guile/1.8.nix | 2 +- pkgs/development/interpreters/guile/2.0.nix | 2 +- pkgs/development/libraries/gnu-config/default.nix | 6 +++--- pkgs/development/libraries/gnutls-kdh/generic.nix | 2 +- pkgs/development/libraries/gsl/gsl-1_16.nix | 2 +- pkgs/development/libraries/readline/6.2.nix | 2 +- pkgs/development/libraries/readline/6.3.nix | 2 +- pkgs/development/libraries/readline/7.0.nix | 2 +- pkgs/development/misc/avr/libc/default.nix | 2 +- pkgs/development/tools/gnulib/default.nix | 2 +- pkgs/development/tools/java/fastjar/default.nix | 2 +- pkgs/development/tools/misc/cppi/default.nix | 2 +- pkgs/games/cuyo/default.nix | 2 +- pkgs/games/liquidwar/5.nix | 2 +- pkgs/tools/backup/store-backup/default.nix | 2 +- pkgs/tools/inputmethods/m17n-db/default.nix | 2 +- pkgs/tools/inputmethods/m17n-lib/default.nix | 2 +- pkgs/tools/inputmethods/m17n-lib/otf.nix | 2 +- pkgs/tools/text/gnupatch/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 ++-- 28 files changed, 31 insertions(+), 31 deletions(-) diff --git a/pkgs/applications/audio/mi2ly/default.nix b/pkgs/applications/audio/mi2ly/default.nix index 4dfc7b13046e..58c1690a9bb0 100644 --- a/pkgs/applications/audio/mi2ly/default.nix +++ b/pkgs/applications/audio/mi2ly/default.nix @@ -6,7 +6,7 @@ let version="0.12"; name="${baseName}-${version}"; hash="1b14zcwlvnxhjxr3ymyzg0mg4sbijkinzpxm641s859jxcgylmll"; - url="http://download.savannah.gnu.org/releases/mi2ly/mi2ly.0.12.tar.bz2"; + url="https://download.savannah.gnu.org/releases/mi2ly/mi2ly.0.12.tar.bz2"; sha256="1b14zcwlvnxhjxr3ymyzg0mg4sbijkinzpxm641s859jxcgylmll"; }; buildInputs = [ diff --git a/pkgs/applications/audio/mi2ly/default.upstream b/pkgs/applications/audio/mi2ly/default.upstream index 131f0e3a71d6..0b2607989aa2 100644 --- a/pkgs/applications/audio/mi2ly/default.upstream +++ b/pkgs/applications/audio/mi2ly/default.upstream @@ -1,3 +1,3 @@ -url http://download.savannah.gnu.org/releases/mi2ly/ +url https://download.savannah.gnu.org/releases/mi2ly/ ensure_choice version '.*/mi2ly[.]([0-9.]+)[.]tar.*' '\1' diff --git a/pkgs/applications/audio/mimms/default.nix b/pkgs/applications/audio/mimms/default.nix index b9b840682d74..2d301a8b6a96 100644 --- a/pkgs/applications/audio/mimms/default.nix +++ b/pkgs/applications/audio/mimms/default.nix @@ -5,7 +5,7 @@ pythonPackages.buildPythonApplication rec { version = "3.2"; src = fetchurl { - url = "http://download.savannah.gnu.org/releases/mimms/mimms-${version}.tar.bz2"; + url = "https://download.savannah.gnu.org/releases/mimms/mimms-${version}.tar.bz2"; sha256 = "0zmcd670mpq85cs3nvdq3i805ba0d1alqahfy1m9cpf7kxrivfml"; }; diff --git a/pkgs/applications/editors/emacs-modes/bbdb/3.nix b/pkgs/applications/editors/emacs-modes/bbdb/3.nix index 15ffece1c048..d20ab53bf7e1 100644 --- a/pkgs/applications/editors/emacs-modes/bbdb/3.nix +++ b/pkgs/applications/editors/emacs-modes/bbdb/3.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "bbdb-3.1.2"; src = fetchurl { - url = "http://download.savannah.gnu.org/releases/bbdb/${name}.tar.gz"; + url = "https://download.savannah.gnu.org/releases/bbdb/${name}.tar.gz"; sha256 = "1gs16bbpiiy01w9pyg12868r57kx1v3hnw04gmqsmpc40l1hyy05"; }; diff --git a/pkgs/applications/editors/leafpad/default.nix b/pkgs/applications/editors/leafpad/default.nix index dd3fb542da7c..c3b46cf61df8 100644 --- a/pkgs/applications/editors/leafpad/default.nix +++ b/pkgs/applications/editors/leafpad/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "0.8.18.1"; name = "leafpad-${version}"; src = fetchurl { - url = "http://download.savannah.gnu.org/releases/leafpad/${name}.tar.gz"; + url = "https://download.savannah.gnu.org/releases/leafpad/${name}.tar.gz"; sha256 = "0b0az2wvqgvam7w0ns1j8xp2llslm1rx6h7zcsy06a7j0yp257cm"; }; diff --git a/pkgs/applications/misc/devilspie2/default.nix b/pkgs/applications/misc/devilspie2/default.nix index 1ea45c3574a5..4fb9ca5fa713 100644 --- a/pkgs/applications/misc/devilspie2/default.nix +++ b/pkgs/applications/misc/devilspie2/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "0.43"; src = fetchurl { - url = "http://download.savannah.gnu.org/releases/devilspie2/devilspie2_${version}-src.tar.gz"; + url = "https://download.savannah.gnu.org/releases/devilspie2/devilspie2_${version}-src.tar.gz"; sha256 = "0a7qjl2qd4099kkkbwa1y2fk48s21jlr409lf9mij7mlc9yc3zzc"; }; diff --git a/pkgs/applications/misc/xlog/default.nix b/pkgs/applications/misc/xlog/default.nix index 4f7a7c3a75af..c0b0ef63369f 100644 --- a/pkgs/applications/misc/xlog/default.nix +++ b/pkgs/applications/misc/xlog/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { version = "2.0.15"; src = fetchurl { - url = "http://download.savannah.gnu.org/releases/xlog/${name}.tar.gz"; + url = "https://download.savannah.gnu.org/releases/xlog/${name}.tar.gz"; sha256 = "0an883wqw3zwpw8nqinm9cb17hp2xw9vf603k4l2345p61jqdw2j"; }; diff --git a/pkgs/development/compilers/gcl/2.6.13-pre.nix b/pkgs/development/compilers/gcl/2.6.13-pre.nix index 71a6eaa8db8d..1e8bdbd4e68f 100644 --- a/pkgs/development/compilers/gcl/2.6.13-pre.nix +++ b/pkgs/development/compilers/gcl/2.6.13-pre.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { src = fetchgit { sha256 = "0vpxb6z5g9fjavrgx8gz8fsjvskfz64f63qibh5s00fvvndlwi88"; - url = "http://git.savannah.gnu.org/r/gcl.git"; + url = "https://git.savannah.gnu.org/r/gcl.git"; rev = "refs/tags/Version_2_6_13pre50"; }; diff --git a/pkgs/development/interpreters/guile/1.8.nix b/pkgs/development/interpreters/guile/1.8.nix index 13a0d45dbe41..6a97c3973975 100644 --- a/pkgs/development/interpreters/guile/1.8.nix +++ b/pkgs/development/interpreters/guile/1.8.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { # One test fails. # ERROR: file: "libtest-asmobs", message: "file not found" # This is fixed here: - # . + # . doCheck = false; doInstallCheck = doCheck; diff --git a/pkgs/development/interpreters/guile/2.0.nix b/pkgs/development/interpreters/guile/2.0.nix index ea34fd61f3b7..921f4b03abc4 100644 --- a/pkgs/development/interpreters/guile/2.0.nix +++ b/pkgs/development/interpreters/guile/2.0.nix @@ -41,7 +41,7 @@ patches = [ ./disable-gc-sensitive-tests.patch ./eai_system.patch ./clang.patch (fetchpatch { # Fixes stability issues with 00-repl-server.test - url = "http://git.savannah.gnu.org/cgit/guile.git/patch/?id=2fbde7f02adb8c6585e9baf6e293ee49cd23d4c4"; + url = "https://git.savannah.gnu.org/cgit/guile.git/patch/?id=2fbde7f02adb8c6585e9baf6e293ee49cd23d4c4"; sha256 = "0p6c1lmw1iniq03z7x5m65kg3lq543kgvdb4nrxsaxjqf3zhl77v"; }) ./riscv.patch diff --git a/pkgs/development/libraries/gnu-config/default.nix b/pkgs/development/libraries/gnu-config/default.nix index a14d7486e96f..3f0fcafa4475 100644 --- a/pkgs/development/libraries/gnu-config/default.nix +++ b/pkgs/development/libraries/gnu-config/default.nix @@ -5,11 +5,11 @@ let # Don't use fetchgit as this is needed during Aarch64 bootstrapping configGuess = fetchurl { - url = "http://git.savannah.gnu.org/cgit/config.git/plain/config.guess?id=${rev}"; + url = "https://git.savannah.gnu.org/cgit/config.git/plain/config.guess?id=${rev}"; sha256 = "1bb8z1wzjs81p9qrvji4bc2a8zyxjinz90k8xq7sxxdp6zrmq1sv"; }; configSub = fetchurl { - url = "http://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=${rev}"; + url = "https://git.savannah.gnu.org/cgit/config.git/plain/config.sub?id=${rev}"; sha256 = "00dn5i2cp4iqap5vr368r5ifrgcjfq5pr97i4dkkdbha1han5hsc"; }; in @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Attempt to guess a canonical system name"; - homepage = http://savannah.gnu.org/projects/config; + homepage = https://savannah.gnu.org/projects/config; license = licenses.gpl3; # In addition to GPLv3: # As a special exception to the GNU General Public License, if you diff --git a/pkgs/development/libraries/gnutls-kdh/generic.nix b/pkgs/development/libraries/gnutls-kdh/generic.nix index a81cd91fdc76..d1d3c8575b0f 100644 --- a/pkgs/development/libraries/gnutls-kdh/generic.nix +++ b/pkgs/development/libraries/gnutls-kdh/generic.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation { [ "--enable-guile" "--with-guile-site-dir=\${out}/share/guile/site" ]; # Build of the Guile bindings is not parallel-safe. See - # + # # for the actual fix. Also an apparent race in the generation of # systemkey-args.h. enableParallelBuilding = false; diff --git a/pkgs/development/libraries/gsl/gsl-1_16.nix b/pkgs/development/libraries/gsl/gsl-1_16.nix index ede2b51c5599..577b05abeff5 100644 --- a/pkgs/development/libraries/gsl/gsl-1_16.nix +++ b/pkgs/development/libraries/gsl/gsl-1_16.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { ./disable-fma.patch # http://lists.gnu.org/archive/html/bug-gsl/2011-11/msg00019.html (fetchpatch { name = "bug-39055.patch"; - url = "http://git.savannah.gnu.org/cgit/gsl.git/patch/?id=9cc12d"; + url = "https://git.savannah.gnu.org/cgit/gsl.git/patch/?id=9cc12d"; sha256 = "1bmrmihi28cly9g9pq54kkix2jy59y7cd7h5fw4v1c7h5rc2qvs8"; }) ]; diff --git a/pkgs/development/libraries/readline/6.2.nix b/pkgs/development/libraries/readline/6.2.nix index e97b31896c1d..54aa42439d97 100644 --- a/pkgs/development/libraries/readline/6.2.nix +++ b/pkgs/development/libraries/readline/6.2.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation (rec { desire its capabilities. ''; - homepage = http://savannah.gnu.org/projects/readline/; + homepage = https://savannah.gnu.org/projects/readline/; license = stdenv.lib.licenses.gpl3Plus; diff --git a/pkgs/development/libraries/readline/6.3.nix b/pkgs/development/libraries/readline/6.3.nix index cfa70f423db3..cbe6c083cb44 100644 --- a/pkgs/development/libraries/readline/6.3.nix +++ b/pkgs/development/libraries/readline/6.3.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { desire its capabilities. ''; - homepage = http://savannah.gnu.org/projects/readline/; + homepage = https://savannah.gnu.org/projects/readline/; license = licenses.gpl3Plus; diff --git a/pkgs/development/libraries/readline/7.0.nix b/pkgs/development/libraries/readline/7.0.nix index 9c0c3d31b4b6..e96b4f1ebe27 100644 --- a/pkgs/development/libraries/readline/7.0.nix +++ b/pkgs/development/libraries/readline/7.0.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { desire its capabilities. ''; - homepage = http://savannah.gnu.org/projects/readline/; + homepage = https://savannah.gnu.org/projects/readline/; license = licenses.gpl3Plus; diff --git a/pkgs/development/misc/avr/libc/default.nix b/pkgs/development/misc/avr/libc/default.nix index 05790a81e658..4527a8700f6e 100644 --- a/pkgs/development/misc/avr/libc/default.nix +++ b/pkgs/development/misc/avr/libc/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { name = "avr-libc-${version}"; src = fetchurl { - url = http://download.savannah.gnu.org/releases/avr-libc/avr-libc-2.0.0.tar.bz2; + url = https://download.savannah.gnu.org/releases/avr-libc/avr-libc-2.0.0.tar.bz2; sha256 = "15svr2fx8j6prql2il2fc0ppwlv50rpmyckaxx38d3gxxv97zpdj"; }; diff --git a/pkgs/development/tools/gnulib/default.nix b/pkgs/development/tools/gnulib/default.nix index f7aad74cf9b5..a545e715ea64 100644 --- a/pkgs/development/tools/gnulib/default.nix +++ b/pkgs/development/tools/gnulib/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "gnulib-20180226"; src = fetchgit { - url = "http://git.savannah.gnu.org/r/gnulib.git"; + url = "https://git.savannah.gnu.org/r/gnulib.git"; rev = "0bec5d56c6938c2f28417bb5fd1c4b05ea2e7d28"; sha256 = "0sifr3bkmhyr5s6ljgfyr0fw6w49ajf11rlp1r797f3r3r6j9w4k"; }; diff --git a/pkgs/development/tools/java/fastjar/default.nix b/pkgs/development/tools/java/fastjar/default.nix index 8469b1b1272e..403bfeabfd05 100644 --- a/pkgs/development/tools/java/fastjar/default.nix +++ b/pkgs/development/tools/java/fastjar/default.nix @@ -5,7 +5,7 @@ let version = "0.98"; in name = "fastjar-${version}"; src = fetchurl { - url = "http://download.savannah.gnu.org/releases/fastjar/fastjar-${version}.tar.gz"; + url = "https://download.savannah.gnu.org/releases/fastjar/fastjar-${version}.tar.gz"; sha256 = "0iginbz2m15hcsa3x4y7v3mhk54gr1r7m3ghx0pg4n46vv2snmpi"; }; diff --git a/pkgs/development/tools/misc/cppi/default.nix b/pkgs/development/tools/misc/cppi/default.nix index 148c08d9c866..e4d123dece1d 100644 --- a/pkgs/development/tools/misc/cppi/default.nix +++ b/pkgs/development/tools/misc/cppi/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - homepage = http://savannah.gnu.org/projects/cppi/; + homepage = https://savannah.gnu.org/projects/cppi/; description = "A C preprocessor directive indenter"; diff --git a/pkgs/games/cuyo/default.nix b/pkgs/games/cuyo/default.nix index 69c7adfd284c..19d857a8e78c 100644 --- a/pkgs/games/cuyo/default.nix +++ b/pkgs/games/cuyo/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "2.1.0"; src = fetchurl { - url = http://download.savannah.gnu.org/releases/cuyo/cuyo-2.1.0.tar.gz; + url = https://download.savannah.gnu.org/releases/cuyo/cuyo-2.1.0.tar.gz; sha256 = "17yqv924x7yvwix7yz9jdhgyar8lzdhqvmpvv0any8rdkajhj23c"; }; diff --git a/pkgs/games/liquidwar/5.nix b/pkgs/games/liquidwar/5.nix index dfb2934cf775..d748c96da242 100644 --- a/pkgs/games/liquidwar/5.nix +++ b/pkgs/games/liquidwar/5.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { version = "5.6.4"; name = "liquidwar5-${version}"; src = fetchurl { - url = "http://download.savannah.gnu.org/releases/liquidwar/liquidwar-${version}.tar.gz"; + url = "https://download.savannah.gnu.org/releases/liquidwar/liquidwar-${version}.tar.gz"; sha256 = "18wkbfzp07yckg05b5gjy67rw06z9lxp0hzg0zwj7rz8i12jxi9j"; }; diff --git a/pkgs/tools/backup/store-backup/default.nix b/pkgs/tools/backup/store-backup/default.nix index 3dbf138ed57b..4f8c234b752f 100644 --- a/pkgs/tools/backup/store-backup/default.nix +++ b/pkgs/tools/backup/store-backup/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [ perl makeWrapper ]; src = fetchurl { - url = "http://download.savannah.gnu.org/releases/storebackup/storeBackup-${version}.tar.bz2"; + url = "https://download.savannah.gnu.org/releases/storebackup/storeBackup-${version}.tar.bz2"; sha256 = "0y4gzssc93x6y93mjsxm5b5cdh68d7ffa43jf6np7s7c99xxxz78"; }; diff --git a/pkgs/tools/inputmethods/m17n-db/default.nix b/pkgs/tools/inputmethods/m17n-db/default.nix index ba78f1ba02f8..8732d1a816d1 100644 --- a/pkgs/tools/inputmethods/m17n-db/default.nix +++ b/pkgs/tools/inputmethods/m17n-db/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "m17n-db-1.8.0"; src = fetchurl { - url = "http://download.savannah.gnu.org/releases/m17n/${name}.tar.gz"; + url = "https://download.savannah.gnu.org/releases/m17n/${name}.tar.gz"; sha256 = "0vfw7z9i2s9np6nmx1d4dlsywm044rkaqarn7akffmb6bf1j6zv5"; }; diff --git a/pkgs/tools/inputmethods/m17n-lib/default.nix b/pkgs/tools/inputmethods/m17n-lib/default.nix index a4c9006cb24b..baf57ed90498 100644 --- a/pkgs/tools/inputmethods/m17n-lib/default.nix +++ b/pkgs/tools/inputmethods/m17n-lib/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "m17n-lib-1.8.0"; src = fetchurl { - url = "http://download.savannah.gnu.org/releases/m17n/${name}.tar.gz"; + url = "https://download.savannah.gnu.org/releases/m17n/${name}.tar.gz"; sha256 = "0jp61y09xqj10mclpip48qlfhniw8gwy8b28cbzxy8hq8pkwmfkq"; }; diff --git a/pkgs/tools/inputmethods/m17n-lib/otf.nix b/pkgs/tools/inputmethods/m17n-lib/otf.nix index 05231b385dbc..a69f46e9678c 100644 --- a/pkgs/tools/inputmethods/m17n-lib/otf.nix +++ b/pkgs/tools/inputmethods/m17n-lib/otf.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libotf-0.9.16"; src = fetchurl { - url = "http://download.savannah.gnu.org/releases/m17n/${name}.tar.gz"; + url = "https://download.savannah.gnu.org/releases/m17n/${name}.tar.gz"; sha256 = "0sq6g3xaxw388akws6qrllp3kp2sxgk2dv4j79k6mm52rnihrnv8"; }; diff --git a/pkgs/tools/text/gnupatch/default.nix b/pkgs/tools/text/gnupatch/default.nix index 238dba3a9f1e..edea95d7d691 100644 --- a/pkgs/tools/text/gnupatch/default.nix +++ b/pkgs/tools/text/gnupatch/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { more original files, producing patched versions. ''; - homepage = http://savannah.gnu.org/projects/patch; + homepage = https://savannah.gnu.org/projects/patch; license = stdenv.lib.licenses.gpl3Plus; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e21ab50f0ddf..8c2ff2606220 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -294,8 +294,8 @@ with pkgs; ... # For hash agility }@args: fetchzip ({ inherit name; - url = "http://git.savannah.gnu.org/cgit/${repo}.git/snapshot/${repo}-${rev}.tar.gz"; - meta.homepage = "http://git.savannah.gnu.org/cgit/${repo}.git/"; + url = "https://git.savannah.gnu.org/cgit/${repo}.git/snapshot/${repo}-${rev}.tar.gz"; + meta.homepage = "https://git.savannah.gnu.org/cgit/${repo}.git/"; } // removeAttrs args [ "repo" "rev" ]) // { inherit rev; }; # gitlab example