From 68a8b278c16b9359a71faa45d3ba583e20957474 Mon Sep 17 00:00:00 2001
From: Ryan Burns <rtburns@protonmail.com>
Date: Thu, 4 Nov 2021 18:21:10 -0700
Subject: [PATCH 01/16] anup: fix build on darwin

---
 pkgs/applications/misc/anup/default.nix | 4 +++-
 pkgs/top-level/all-packages.nix         | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/anup/default.nix b/pkgs/applications/misc/anup/default.nix
index 9c99c84eabee..3eed2a7501c3 100644
--- a/pkgs/applications/misc/anup/default.nix
+++ b/pkgs/applications/misc/anup/default.nix
@@ -1,4 +1,4 @@
-{ lib, rustPlatform, fetchFromGitHub, sqlite, xdg-utils}:
+{ lib, stdenv, rustPlatform, fetchFromGitHub, Security, sqlite, xdg-utils}:
 
 rustPlatform.buildRustPackage rec {
   pname = "anup";
@@ -14,6 +14,8 @@ rustPlatform.buildRustPackage rec {
   buildInputs = [
     sqlite
     xdg-utils
+  ] ++ lib.optionals stdenv.isDarwin [
+    Security
   ];
 
   cargoSha256 = "sha256-1TA2HDHKA3twFtlAWaC2zcRzS8TJwcbBt1OTQ3hC3qM=";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 171e7f110b47..39f5053a412b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -23752,7 +23752,9 @@ with pkgs;
 
   antiword = callPackage ../applications/office/antiword {};
 
-  anup = callPackage ../applications/misc/anup {};
+  anup = callPackage ../applications/misc/anup {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   anytype = callPackage ../applications/misc/anytype { };
 

From f2325f8ef044497cde4f251953d048706f8c4ce6 Mon Sep 17 00:00:00 2001
From: Ryan Burns <rtburns@protonmail.com>
Date: Thu, 4 Nov 2021 18:38:10 -0700
Subject: [PATCH 02/16] aws-sdk-cpp: re-disable flaky test

This was un-disabled as it was thought to be resolved,
but has occurred again on Hydra.
---
 pkgs/development/libraries/aws-sdk-cpp/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix
index 41603993c75d..25570b7d03a0 100644
--- a/pkgs/development/libraries/aws-sdk-cpp/default.nix
+++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix
@@ -28,6 +28,8 @@ stdenv.mkDerivation rec {
   };
 
   postPatch = ''
+    # Flaky on Hydra
+    rm aws-cpp-sdk-core-tests/aws/auth/AWSCredentialsProviderTest.cpp
     # Includes aws-c-auth private headers, so only works with submodule build
     rm aws-cpp-sdk-core-tests/aws/auth/AWSAuthSignerTest.cpp
   '' + lib.optionalString stdenv.hostPlatform.isMusl ''
@@ -66,7 +68,6 @@ stdenv.mkDerivation rec {
   # fix build with gcc9, can be removed after bumping to current version
   NIX_CFLAGS_COMPILE = [ "-Wno-error" ];
 
-  # aws-cpp-sdk-core-tests/aws/auth/AWSCredentialsProviderTest.cpp
   # aws-cpp-sdk-core-tests/aws/client/AWSClientTest.cpp
   # seem to have a datarace
   enableParallelChecking = false;

From 5fc42890c93405cc7ea98e8d6cd514b970a492ed Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 5 Nov 2021 20:22:26 +0100
Subject: [PATCH 03/16] python3Packages.aioguardian: 2021.10.0 -> 2021.11.0

---
 .../python-modules/aioguardian/default.nix    | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/aioguardian/default.nix b/pkgs/development/python-modules/aioguardian/default.nix
index 08b1a1402dd9..7b16e2ffc50d 100644
--- a/pkgs/development/python-modules/aioguardian/default.nix
+++ b/pkgs/development/python-modules/aioguardian/default.nix
@@ -4,6 +4,7 @@
 , asyncio-dgram
 , asynctest
 , buildPythonPackage
+, docutils
 , fetchFromGitHub
 , poetry-core
 , pytest-aiohttp
@@ -15,13 +16,13 @@
 
 buildPythonPackage rec {
   pname = "aioguardian";
-  version = "2021.10.0";
+  version = "2021.11.0";
 
   src = fetchFromGitHub {
     owner = "bachya";
     repo = pname;
     rev = version;
-    sha256 = "sha256-LKtuBMbpaVnp/eQ5hW1RQiArEBw4Lw+29y/q6Dq/tyI=";
+    sha256 = "sha256-jQIRACm0d0a5mQqlwxSTgLZfJFvGLWuJTb/MacppmS4=";
   };
 
   format = "pyproject";
@@ -34,6 +35,7 @@ buildPythonPackage rec {
     aiohttp
     async-timeout
     asyncio-dgram
+    docutils
     voluptuous
   ];
 
@@ -45,9 +47,18 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  disabledTestPaths = [ "examples/" ];
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace 'docutils = "<0.18"' 'docutils = "*"'
+  '';
 
-  pythonImportsCheck = [ "aioguardian" ];
+  disabledTestPaths = [
+    "examples/"
+  ];
+
+  pythonImportsCheck = [
+    "aioguardian"
+  ];
 
   meta = with lib; {
     description = " Python library to interact with Elexa Guardian devices";

From edc67d3862c242b254e3eff0b61bd5cef989e4d1 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Fri, 5 Nov 2021 21:13:25 +0100
Subject: [PATCH 04/16] nixosTests.chromium: Redirect stdout to avoid blocking

---
 nixos/tests/chromium.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix
index d67acd075a13..1df4def66374 100644
--- a/nixos/tests/chromium.nix
+++ b/nixos/tests/chromium.nix
@@ -86,7 +86,7 @@ mapAttrs (channel: chromiumPkg: makeTest rec {
             options.append("--use-gl=swiftshader")
         # Launch the process:
         options.append("file://${startupHTML}")
-        machine.succeed(ru(f'ulimit -c unlimited; {binary} {shlex.join(options)} & disown'))
+        machine.succeed(ru(f'ulimit -c unlimited; {binary} {shlex.join(options)} >&2 & disown'))
         if binary.startswith("google-chrome"):
             # Need to click away the first window:
             machine.wait_for_text("Make Google Chrome the default browser")

From 0fb806301dd627c7eb342658796da1a8c9ba586e Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Fri, 5 Nov 2021 21:13:36 +0100
Subject: [PATCH 05/16] nixosTests.pantheon: Redirect stdout to avoid blocking

---
 nixos/tests/pantheon.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/pantheon.nix b/nixos/tests/pantheon.nix
index 20aee2eb7a4c..aebf6b534476 100644
--- a/nixos/tests/pantheon.nix
+++ b/nixos/tests/pantheon.nix
@@ -51,7 +51,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} :
         machine.wait_for_window("plank")
 
     with subtest("Open elementary terminal"):
-        machine.execute("su - ${user.name} -c 'DISPLAY=:0 io.elementary.terminal &'")
+        machine.execute("su - ${user.name} -c 'DISPLAY=:0 io.elementary.terminal >&2 &'")
         machine.wait_for_window("io.elementary.terminal")
         machine.sleep(20)
         machine.screenshot("screen")

From 1927b71928f8f9420c2df48222a1b6808251b4e1 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Fri, 5 Nov 2021 21:13:47 +0100
Subject: [PATCH 06/16] nixosTests.xfce: Redirect stdout to avoid blocking

---
 nixos/tests/xfce.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/xfce.nix b/nixos/tests/xfce.nix
index 99e30342e593..148eccdbe308 100644
--- a/nixos/tests/xfce.nix
+++ b/nixos/tests/xfce.nix
@@ -38,7 +38,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
       # Check that logging in has given the user ownership of devices.
       machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}")
 
-      machine.succeed("su - ${user.name} -c 'DISPLAY=:0.0 xfce4-terminal &'")
+      machine.succeed("su - ${user.name} -c 'DISPLAY=:0.0 xfce4-terminal >&2 &'")
       machine.wait_for_window("Terminal")
       machine.sleep(10)
       machine.screenshot("screen")

From d65985674794acc54dce4052239686cf8784d496 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Fri, 5 Nov 2021 21:22:31 +0100
Subject: [PATCH 07/16] nixosTests.service-runner: Redirect stdout to avoid
 blocking

---
 nixos/tests/service-runner.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/service-runner.nix b/nixos/tests/service-runner.nix
index 58f46735f56d..79d96f739a6c 100644
--- a/nixos/tests/service-runner.nix
+++ b/nixos/tests/service-runner.nix
@@ -24,7 +24,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
         machine.succeed(
             """
             mkdir -p /run/nginx /var/log/nginx /var/cache/nginx
-            ${nodes.machine.config.systemd.services.nginx.runner} &
+            ${nodes.machine.config.systemd.services.nginx.runner} >&2 &
             echo $!>my-nginx.pid
             """
         )

From 88e646ef28ae1fdc29351b0b172858620edb0d24 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 5 Nov 2021 15:23:10 +0100
Subject: [PATCH 08/16] python3Packages.pyppeteer: relax websockets constrain

---
 .../python-modules/pyppeteer/default.nix      | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/pyppeteer/default.nix b/pkgs/development/python-modules/pyppeteer/default.nix
index 37a40f867bda..153be45ca8f5 100644
--- a/pkgs/development/python-modules/pyppeteer/default.nix
+++ b/pkgs/development/python-modules/pyppeteer/default.nix
@@ -2,6 +2,7 @@
 , appdirs
 , buildPythonPackage
 , fetchFromGitHub
+, importlib-metadata
 , poetry-core
 , pyee
 , pytest-xdist
@@ -16,9 +17,10 @@
 buildPythonPackage rec {
   pname = "pyppeteer";
   version = "0.2.6";
-  disabled = pythonOlder "3.6";
   format = "pyproject";
 
+  disabled = pythonOlder "3.6";
+
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
@@ -32,6 +34,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     appdirs
+    importlib-metadata
     pyee
     tqdm
     urllib3
@@ -44,6 +47,11 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace 'websockets = "^9.1"' 'websockets = "*"'
+  '';
+
   disabledTestPaths = [
     # Requires network access
     "tests/test_browser.py"
@@ -71,12 +79,14 @@ buildPythonPackage rec {
     "TestPDF"
   ];
 
-  pythonImportsCheck = [ "pyppeteer" ];
+  pythonImportsCheck = [
+    "pyppeteer"
+  ];
 
-  meta = {
+  meta = with lib; {
     description = "Headless chrome/chromium automation library (unofficial port of puppeteer)";
     homepage = "https://github.com/pyppeteer/pyppeteer";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ kmein ];
+    license = licenses.mit;
+    maintainers = with maintainers; [ kmein ];
   };
 }

From 9c70596689599cfbe28602db26b346e9092024c6 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 6 Nov 2021 00:45:08 +0000
Subject: [PATCH 09/16] mirrors: update sunet base URLs

---
 pkgs/build-support/fetchurl/mirrors.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index 8dc4f4207b6c..99ba082cdded 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -150,8 +150,8 @@
     "https://www.imagemagick.org/download/"
     "https://mirror.checkdomain.de/imagemagick/"
     "https://ftp.nluug.nl/ImageMagick/"
-    "ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/" # also contains older versions removed from most mirrors
-    "http://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/"
+    "ftp://ftp.sunet.se/mirror/imagemagick.org/ftp/" # also contains older versions removed from most mirrors
+    "https://ftp.sunet.se/mirror/imagemagick.org/ftp/"
     "ftp://ftp.imagemagick.org/pub/ImageMagick/"
     "http://ftp.fifi.org/ImageMagick/"
     "ftp://ftp.fifi.org/ImageMagick/"

From 246d34d57ad3c1842705ec371609da3ebc21e728 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 6 Nov 2021 00:52:33 +0000
Subject: [PATCH 10/16] mirrors: remove inactive mirrors

---
 pkgs/build-support/fetchurl/mirrors.nix | 40 -------------------------
 1 file changed, 40 deletions(-)

diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index 99ba082cdded..c02c6839c584 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -74,9 +74,7 @@
   # kernel.org's /pub (/pub/{linux,software}) tree.
   kernel = [
     "http://cdn.kernel.org/pub/"
-    "http://ramses.wh2.tu-dresden.de/pub/mirrors/kernel.org/"
     "http://linux-kernel.uio.no/pub/"
-    "http://kernel.osuosl.org/pub/"
     "ftp://ftp.funet.fi/pub/mirrors/ftp.kernel.org/pub/"
   ];
 
@@ -112,25 +110,19 @@
     "http://mirrors.fe.up.pt/pub/nongnu/"
     "http://ftp.acc.umu.se/mirror/gnu.org/savannah/"
     "http://ftp.twaren.net/Unix/NonGNU/"
-    "http://ftp.yzu.edu.tw/pub/nongnu/"
-    "http://mirror.rackdc.com/savannah/"
     "http://savannah-nongnu-org.ip-connect.vn.ua/"
     "http://www.mirrorservice.org/sites/download.savannah.gnu.org/releases/"
     "http://gnu.mirrors.pair.com/savannah/savannah/"
     "ftp://mirror.easyname.at/nongnu/"
     "ftp://mirror2.klaus-uwe.me/nongnu/"
-    "ftp://savannah.c3sl.ufpr.br/savannah-nongnu/"
     "ftp://mirror.csclub.uwaterloo.ca/nongnu/"
-    "ftp://mirror.cedia.org.ec/nongnu"
     "ftp://ftp.igh.cnrs.fr/pub/nongnu/"
     "ftp://mirror.netcologne.de/savannah/"
     "ftp://nongnu.uib.no/pub/nongnu/"
     "ftp://mirrors.fe.up.pt/pub/nongnu/"
     "ftp://ftp.twaren.net/Unix/NonGNU/"
-    "ftp://ftp.yzu.edu.tw/pub/nongnu/"
     "ftp://savannah-nongnu-org.ip-connect.vn.ua/mirror/savannah.nongnu.org/"
     "ftp://ftp.mirrorservice.org/sites/download.savannah.gnu.org/releases/"
-    "ftp://spinellicreations.com/gnu_dot_org_savannah_mirror/"
   ];
 
   samba = [
@@ -152,9 +144,6 @@
     "https://ftp.nluug.nl/ImageMagick/"
     "ftp://ftp.sunet.se/mirror/imagemagick.org/ftp/" # also contains older versions removed from most mirrors
     "https://ftp.sunet.se/mirror/imagemagick.org/ftp/"
-    "ftp://ftp.imagemagick.org/pub/ImageMagick/"
-    "http://ftp.fifi.org/ImageMagick/"
-    "ftp://ftp.fifi.org/ImageMagick/"
   ];
 
   # CPAN mirrors.
@@ -204,10 +193,8 @@
     "http://fedora.osuosl.org/"
     "http://ftp.nluug.nl/pub/os/Linux/distr/fedora/"
     "http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/"
-    "http://fedora.bhs.mirrors.ovh.net/"
     "http://mirror.csclub.uwaterloo.ca/fedora/"
     "http://ftp.linux.cz/pub/linux/fedora/"
-    "http://ftp.heanet.ie/pub/fedora/"
     "http://mirror.1000mbps.com/fedora/"
     "http://archives.fedoraproject.org/pub/archive/fedora/"
   ];
@@ -216,27 +203,18 @@
   opensuse = [
     "http://opensuse.hro.nl/opensuse/distribution/"
     "http://ftp.funet.fi/pub/linux/mirrors/opensuse/distribution/"
-    "http://ftp.belnet.be/mirror/ftp.opensuse.org/distribution/"
-    "http://ftp.uni-kassel.de/opensuse/distribution/"
     "http://ftp.opensuse.org/pub/opensuse/distribution/"
     "http://ftp5.gwdg.de/pub/opensuse/discontinued/distribution/"
     "http://ftp.hosteurope.de/mirror/ftp.opensuse.org/discontinued/"
-    "http://opensuse.mirror.server4you.net/distribution/"
-    "http://ftp.nsysu.edu.tw/Linux/OpenSuSE/distribution/"
   ];
 
-  # Gnome (see http://ftp.gnome.org/pub/GNOME/MIRRORS).
   gnome = [
     # This one redirects to some mirror closeby, so it should be all you need.
     "http://download.gnome.org/"
 
-    "http://ftp.unina.it/pub/linux/GNOME/"
     "http://fr2.rpmfind.net/linux/gnome.org/"
-    "ftp://ftp.dit.upm.es/pub/GNOME/"
     "http://ftp.acc.umu.se/pub/GNOME/"
     "http://ftp.belnet.be/mirror/ftp.gnome.org/"
-    "http://linorg.usp.br/gnome/"
-    "http://mirror.aarnet.edu.au/pub/GNOME/"
     "ftp://ftp.cse.buffalo.edu/pub/Gnome/"
     "ftp://ftp.nara.wide.ad.jp/pub/X11/GNOME/"
   ];
@@ -250,9 +228,6 @@
     "http://archive.be2.xfce.org/"
     "http://ftp.udc.es/xfce/"
     "http://archive.al-us.xfce.org/"
-    "http://mirror.yongbok.net/X11/xfce-mirror/"
-    "http://mirrors.tummy.com/pub/archive.xfce.org/"
-    "http://xfce.mirror.uber.com.au/"
   ];
 
   # X.org.
@@ -261,14 +236,10 @@
     "https://ftp.x.org/archive/"
   ];
 
-  # Apache mirrors (see http://www.apache.org/mirrors/).
   apache = [
     "https://www-eu.apache.org/dist/"
     "https://ftp.wayne.edu/apache/"
-    "http://www.eu.apache.org/dist/"
-    "ftp://ftp.fu-berlin.de/unix/www/apache/"
     "http://ftp.tudelft.nl/apache/"
-    "http://mirror.cc.columbia.edu/pub/software/apache/"
     "https://www.apache.org/dist/"
     "https://archive.apache.org/dist/" # fallback for old releases
     "ftp://ftp.funet.fi/pub/mirrors/apache.org/"
@@ -278,7 +249,6 @@
 
   postgresql = [
     "http://ftp.postgresql.org/pub/"
-    "ftp://ftp.postgresql.org/pub/"
   ];
 
   metalab = [
@@ -303,9 +273,6 @@
   # Hackage mirrors
   hackage = [
     "http://hackage.haskell.org/package/"
-    "http://hdiff.luite.com/packages/archive/package/"
-    "http://hackage.fpcomplete.com/package/"
-    "http://objects-us-east-1.dream.io/hackage-mirror/package/"
   ];
 
   # Roy marples mirrors
@@ -319,15 +286,11 @@
     # Africa
     "ftp://ftp.sun.ac.za/pub/mirrors/www.sagemath.org/spkg/upstream/"
     "http://sagemath.mirror.ac.za/spkg/upstream/"
-    "https://ftp.leg.uct.ac.za/pub/packages/sage/spkg/upstream/"
     "http://mirror.ufs.ac.za/sagemath/spkg/upstream/"
 
     # America, North
-    "http://mirrors-usa.go-parts.com/sage/sagemath/spkg/upstream/"
     "http://mirrors.mit.edu/sage/spkg/upstream/"
     "http://www.cecm.sfu.ca/sage/spkg/upstream/"
-    "http://files.sagemath.org/spkg/upstream/"
-    "http://mirror.clibre.uqam.ca/sage/spkg/upstream/"
     "https://mirrors.xmission.com/sage/spkg/upstream/"
 
     # America, South
@@ -335,8 +298,6 @@
     "http://linorg.usp.br/sage/spkg/upstream"
 
     # Asia
-    "http://mirror.hust.edu.cn/sagemath/spkg/upstream/"
-    "https://ftp.iitm.ac.in/sage/spkg/upstream/"
     "http://ftp.kaist.ac.kr/sage/spkg/upstream/"
     "http://ftp.riken.jp/sagemath/spkg/upstream/"
     "https://mirrors.tuna.tsinghua.edu.cn/sagemath/spkg/upstream/"
@@ -350,7 +311,6 @@
 
     # Europe
     "http://sage.mirror.garr.it/mirrors/sage/spkg/upstream/"
-    "http://mirror.switch.ch/mirror/sagemath/spkg/upstream/"
     "http://mirrors.fe.up.pt/pub/sage/spkg/upstream/"
     "http://www-ftp.lip6.fr/pub/math/sagemath/spkg/upstream/"
     "http://ftp.ntua.gr/pub/sagemath/spkg/upstream/"

From 1b78d3720cc7f05c230741795e1ddee99c016b98 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 6 Nov 2021 00:53:08 +0000
Subject: [PATCH 11/16] mirrors: use HTTPS where available

---
 pkgs/build-support/fetchurl/mirrors.nix | 152 ++++++++++++------------
 1 file changed, 76 insertions(+), 76 deletions(-)

diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index c02c6839c584..fd07c7c921be 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -2,7 +2,7 @@
 
   # Content-addressable Nix mirrors.
   hashedMirrors = [
-    "http://tarballs.nixos.org"
+    "https://tarballs.nixos.org"
   ];
 
   # Mirrors for mirror://site/filename URIs, where "site" is
@@ -11,7 +11,7 @@
   luarocks = [
     "https://luarocks.org/"
     "https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/master/"
-    "http://luafr.org/moonrocks/"
+    "https://luafr.org/moonrocks/"
     "http://luarocks.logiceditor.com/rocks/"
   ];
 
@@ -41,21 +41,21 @@
     # mirror.
     "https://ftpmirror.gnu.org/"
 
-    "http://ftp.nluug.nl/pub/gnu/"
-    "http://mirrors.kernel.org/gnu/"
-    "http://mirror.ibcp.fr/pub/gnu/"
-    "http://mirror.dogado.de/gnu/"
-    "http://mirror.tochlab.net/pub/gnu/"
+    "https://ftp.nluug.nl/pub/gnu/"
+    "https://mirrors.kernel.org/gnu/"
+    "https://mirror.ibcp.fr/pub/gnu/"
+    "https://mirror.dogado.de/gnu/"
+    "https://mirror.tochlab.net/pub/gnu/"
     "ftp://ftp.funet.fi/pub/mirrors/ftp.gnu.org/gnu/"
 
     # This one is the master repository, and thus it's always up-to-date.
-    "http://ftp.gnu.org/pub/gnu/"
+    "https://ftp.gnu.org/pub/gnu/"
   ];
 
   # GCC.
   gcc = [
     "https://bigsearcher.com/mirrors/gcc/"
-    "http://mirror.koddos.net/gcc/"
+    "https://mirror.koddos.net/gcc/"
     "ftp://ftp.nluug.nl/mirror/languages/gcc/"
     "ftp://ftp.fu-berlin.de/unix/languages/gcc/"
     "ftp://ftp.irisa.fr/pub/mirrors/gcc.gnu.org/gcc/"
@@ -66,14 +66,14 @@
   gnupg = [
     "https://gnupg.org/ftp/gcrypt/"
     "http://www.ring.gr.jp/pub/net/"
-    "http://mirrors.dotsrc.org/gcrypt/"
-    "http://ftp.heanet.ie/mirrors/ftp.gnupg.org/gcrypt/"
-    "http://www.mirrorservice.org/sites/ftp.gnupg.org/gcrypt/"
+    "https://mirrors.dotsrc.org/gcrypt/"
+    "https://ftp.heanet.ie/mirrors/ftp.gnupg.org/gcrypt/"
+    "https://www.mirrorservice.org/sites/ftp.gnupg.org/gcrypt/"
   ];
 
   # kernel.org's /pub (/pub/{linux,software}) tree.
   kernel = [
-    "http://cdn.kernel.org/pub/"
+    "https://cdn.kernel.org/pub/"
     "http://linux-kernel.uio.no/pub/"
     "ftp://ftp.funet.fi/pub/mirrors/ftp.kernel.org/pub/"
   ];
@@ -83,32 +83,32 @@
     "https://download.kde.org/download.php?url="
     "https://ftp.gwdg.de/pub/linux/kde/"
     "https://mirrors.ocf.berkeley.edu/kde/"
-    "http://mirrors.mit.edu/kde/"
+    "https://mirrors.mit.edu/kde/"
     "https://mirrors.ustc.edu.cn/kde/"
-    "http://ftp.funet.fi/pub/mirrors/ftp.kde.org/pub/kde/"
+    "https://ftp.funet.fi/pub/mirrors/ftp.kde.org/pub/kde/"
   ];
 
   # Gentoo files.
   gentoo = [
-    "http://ftp.snt.utwente.nl/pub/os/linux/gentoo/"
-    "http://distfiles.gentoo.org/"
-    "ftp://mirrors.kernel.org/gentoo/"
+    "https://ftp.snt.utwente.nl/pub/os/linux/gentoo/"
+    "https://distfiles.gentoo.org/"
+    "https://mirrors.kernel.org/gentoo/"
   ];
 
   savannah = [
     # Mirrors from https://download-mirror.savannah.gnu.org/releases/00_MIRRORS.html
-    "http://mirror.easyname.at/nongnu/"
+    "https://mirror.easyname.at/nongnu/"
     "http://mirror2.klaus-uwe.me/nongnu/"
-    "http://savannah.c3sl.ufpr.br/"
-    "http://mirror.csclub.uwaterloo.ca/nongnu/"
-    "http://mirror.cedia.org.ec/nongnu/"
-    "http://ftp.igh.cnrs.fr/pub/nongnu/"
-    "http://mirror6.layerjet.com/nongnu"
-    "http://mirror.netcologne.de/savannah/"
-    "http://ftp.cc.uoc.gr/mirrors/nongnu.org/"
-    "http://nongnu.uib.no/"
+    "https://savannah.c3sl.ufpr.br/"
+    "https://mirror.csclub.uwaterloo.ca/nongnu/"
+    "https://mirror.cedia.org.ec/nongnu/"
+    "https://ftp.igh.cnrs.fr/pub/nongnu/"
+    "https://mirror6.layerjet.com/nongnu"
+    "https://mirror.netcologne.de/savannah/"
+    "https://ftp.cc.uoc.gr/mirrors/nongnu.org/"
+    "https://nongnu.uib.no/"
     "http://mirrors.fe.up.pt/pub/nongnu/"
-    "http://ftp.acc.umu.se/mirror/gnu.org/savannah/"
+    "https://ftp.acc.umu.se/mirror/gnu.org/savannah/"
     "http://ftp.twaren.net/Unix/NonGNU/"
     "http://savannah-nongnu-org.ip-connect.vn.ua/"
     "http://www.mirrorservice.org/sites/download.savannah.gnu.org/releases/"
@@ -132,8 +132,8 @@
 
   # BitlBee mirrors, see https://www.bitlbee.org/main.php/mirrors.html .
   bitlbee = [
-    "http://get.bitlbee.org/"
-    "http://ftp.snt.utwente.nl/pub/software/bitlbee/"
+    "https://get.bitlbee.org/"
+    "https://ftp.snt.utwente.nl/pub/software/bitlbee/"
     "http://bitlbee.intergenia.de/"
   ];
 
@@ -150,17 +150,17 @@
   cpan = [
     "https://cpan.metacpan.org/"
     "https://cpan.perl.org/"
-    "http://backpan.perl.org/"  # for old releases
+    "https://backpan.perl.org/"  # for old releases
   ];
 
   # CentOS.
   centos = [
     "http://mirror.centos.org/centos/"
     # For old releases
-    "http://vault.centos.org/"
+    "https://vault.centos.org/"
     "https://archive.kernel.org/centos-vault/"
-    "http://ftp.jaist.ac.jp/pub/Linux/CentOS-vault/"
-    "http://mirrors.aliyun.com/centos-vault/"
+    "https://ftp.jaist.ac.jp/pub/Linux/CentOS-vault/"
+    "https://mirrors.aliyun.com/centos-vault/"
     "https://mirror.chpc.utah.edu/pub/vault.centos.org/"
     "https://mirror.math.princeton.edu/pub/centos-vault/"
     "https://mirrors.tripadvisor.com/centos-vault/"
@@ -168,66 +168,66 @@
 
   # Debian.
   debian = [
-    "http://httpredir.debian.org/debian/"
+    "https://httpredir.debian.org/debian/"
     "ftp://ftp.de.debian.org/debian/"
     "ftp://ftp.fr.debian.org/debian/"
     "ftp://ftp.nl.debian.org/debian/"
     "ftp://ftp.ru.debian.org/debian/"
-    "http://ftp.debian.org/debian/"
+    "https://ftp.debian.org/debian/"
     "http://archive.debian.org/debian-archive/debian/"
     "ftp://ftp.funet.fi/pub/mirrors/ftp.debian.org/debian/"
   ];
 
   # Ubuntu.
   ubuntu = [
-    "http://nl.archive.ubuntu.com/ubuntu/"
+    "https://nl.archive.ubuntu.com/ubuntu/"
     "http://de.archive.ubuntu.com/ubuntu/"
     "http://archive.ubuntu.com/ubuntu/"
-    "http://old-releases.ubuntu.com/ubuntu/"
+    "https://old-releases.ubuntu.com/ubuntu/"
   ];
 
   # Fedora (please only add full mirrors that carry old Fedora distributions as well).
   # See: https://mirrors.fedoraproject.org/publiclist (but not all carry old content).
   fedora = [
-    "http://archives.fedoraproject.org/pub/fedora/"
-    "http://fedora.osuosl.org/"
+    "https://archives.fedoraproject.org/pub/fedora/"
+    "https://fedora.osuosl.org/"
     "http://ftp.nluug.nl/pub/os/Linux/distr/fedora/"
-    "http://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/"
+    "https://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/"
     "http://mirror.csclub.uwaterloo.ca/fedora/"
-    "http://ftp.linux.cz/pub/linux/fedora/"
+    "https://ftp.linux.cz/pub/linux/fedora/"
     "http://mirror.1000mbps.com/fedora/"
-    "http://archives.fedoraproject.org/pub/archive/fedora/"
+    "https://archives.fedoraproject.org/pub/archive/fedora/"
   ];
 
   # openSUSE.
   opensuse = [
-    "http://opensuse.hro.nl/opensuse/distribution/"
-    "http://ftp.funet.fi/pub/linux/mirrors/opensuse/distribution/"
-    "http://ftp.opensuse.org/pub/opensuse/distribution/"
-    "http://ftp5.gwdg.de/pub/opensuse/discontinued/distribution/"
+    "https://opensuse.hro.nl/opensuse/distribution/"
+    "https://ftp.funet.fi/pub/linux/mirrors/opensuse/distribution/"
+    "https://ftp.opensuse.org/pub/opensuse/distribution/"
+    "https://ftp5.gwdg.de/pub/opensuse/discontinued/distribution/"
     "http://ftp.hosteurope.de/mirror/ftp.opensuse.org/discontinued/"
   ];
 
   gnome = [
     # This one redirects to some mirror closeby, so it should be all you need.
-    "http://download.gnome.org/"
+    "https://download.gnome.org/"
 
-    "http://fr2.rpmfind.net/linux/gnome.org/"
-    "http://ftp.acc.umu.se/pub/GNOME/"
-    "http://ftp.belnet.be/mirror/ftp.gnome.org/"
+    "https://fr2.rpmfind.net/linux/gnome.org/"
+    "https://ftp.acc.umu.se/pub/GNOME/"
+    "https://ftp.belnet.be/mirror/ftp.gnome.org/"
     "ftp://ftp.cse.buffalo.edu/pub/Gnome/"
     "ftp://ftp.nara.wide.ad.jp/pub/X11/GNOME/"
   ];
 
   xfce = [
-    "http://archive.xfce.org/"
-    "http://mirror.netcologne.de/xfce/"
+    "https://archive.xfce.org/"
+    "https://mirror.netcologne.de/xfce/"
     "http://archive.se.xfce.org/xfce/"
-    "http://archive.be.xfce.org/xfce/"
+    "https://archive.be.xfce.org/xfce/"
     "http://mirror.perldude.de/archive.xfce.org/"
     "http://archive.be2.xfce.org/"
     "http://ftp.udc.es/xfce/"
-    "http://archive.al-us.xfce.org/"
+    "https://archive.al-us.xfce.org/"
   ];
 
   # X.org.
@@ -243,12 +243,12 @@
     "https://www.apache.org/dist/"
     "https://archive.apache.org/dist/" # fallback for old releases
     "ftp://ftp.funet.fi/pub/mirrors/apache.org/"
-    "http://apache.cs.uu.nl/"
-    "http://apache.cs.utah.edu/"
+    "https://apache.cs.uu.nl/"
+    "https://apache.cs.utah.edu/"
   ];
 
   postgresql = [
-    "http://ftp.postgresql.org/pub/"
+    "https://ftp.postgresql.org/pub/"
   ];
 
   metalab = [
@@ -256,7 +256,7 @@
     "ftp://ftp.metalab.unc.edu/pub/linux/"
   ];
 
-  # Bioconductor mirrors (from http://bioconductor.org/about/mirrors)
+  # Bioconductor mirrors (from https://bioconductor.org/about/mirrors/)
   # The commented-out ones don't seem to allow direct package downloads;
   # they serve error messages that result in hash mismatches instead.
   bioc = [
@@ -266,30 +266,30 @@
     # http://mirror.aarnet.edu.au/pub/bioconductor/
     # http://watson.nci.nih.gov/bioc_mirror/
     "http://bioconductor.jp/packages/"
-    "http://bioconductor.statistik.tu-dortmund.de/packages/"
-    "http://mirrors.ustc.edu.cn/bioc/"
+    "https://bioconductor.statistik.tu-dortmund.de/packages/"
+    "https://mirrors.ustc.edu.cn/bioc/"
   ];
 
   # Hackage mirrors
   hackage = [
-    "http://hackage.haskell.org/package/"
+    "https://hackage.haskell.org/package/"
   ];
 
   # Roy marples mirrors
   roy = [
-    "http://roy.marples.name/downloads/"
-    "http://cflags.cc/roy/"
+    "https://roy.marples.name/downloads/"
+    "https://cflags.cc/roy/"
   ];
 
-  # Sage mirrors (http://www.sagemath.org/mirrors.html)
+  # Sage mirrors (https://www.sagemath.org/mirrors.html)
   sageupstream = [
     # Africa
     "ftp://ftp.sun.ac.za/pub/mirrors/www.sagemath.org/spkg/upstream/"
-    "http://sagemath.mirror.ac.za/spkg/upstream/"
-    "http://mirror.ufs.ac.za/sagemath/spkg/upstream/"
+    "https://sagemath.mirror.ac.za/spkg/upstream/"
+    "https://mirror.ufs.ac.za/sagemath/spkg/upstream/"
 
     # America, North
-    "http://mirrors.mit.edu/sage/spkg/upstream/"
+    "https://mirrors.mit.edu/sage/spkg/upstream/"
     "http://www.cecm.sfu.ca/sage/spkg/upstream/"
     "https://mirrors.xmission.com/sage/spkg/upstream/"
 
@@ -303,34 +303,34 @@
     "https://mirrors.tuna.tsinghua.edu.cn/sagemath/spkg/upstream/"
     "https://mirrors.ustc.edu.cn/sagemath/spkg/upstream/"
     "http://ftp.tsukuba.wide.ad.jp/software/sage/spkg/upstream/"
-    "http://ftp.yz.yamagata-u.ac.jp/pub/math/sage/spkg/upstream/"
+    "https://ftp.yz.yamagata-u.ac.jp/pub/math/sage/spkg/upstream/"
     "https://mirror.yandex.ru/mirrors/sage.math.washington.edu/spkg/upstream/"
 
     # Australia
-    "http://mirror.aarnet.edu.au/pub/sage/spkg/upstream/"
+    "https://mirror.aarnet.edu.au/pub/sage/spkg/upstream/"
 
     # Europe
-    "http://sage.mirror.garr.it/mirrors/sage/spkg/upstream/"
+    "https://sage.mirror.garr.it/mirrors/sage/spkg/upstream/"
     "http://mirrors.fe.up.pt/pub/sage/spkg/upstream/"
-    "http://www-ftp.lip6.fr/pub/math/sagemath/spkg/upstream/"
+    "https://www-ftp.lip6.fr/pub/math/sagemath/spkg/upstream/"
     "http://ftp.ntua.gr/pub/sagemath/spkg/upstream/"
   ];
 
   # MySQL mirrors
   mysql = [
-    "http://cdn.mysql.com/Downloads/"
+    "https://cdn.mysql.com/Downloads/"
   ];
 
   # OpenBSD mirrors
   openbsd = [
-    "http://ftp.openbsd.org/pub/OpenBSD/"
+    "https://ftp.openbsd.org/pub/OpenBSD/"
     "ftp://ftp.nluug.nl/pub/OpenBSD/"
     "ftp://ftp-stud.fht-esslingen.de/pub/OpenBSD/"
   ];
 
   # Steam Runtime mirrors
   steamrt = [
-    "http://repo.steampowered.com/steamrt/"
+    "https://repo.steampowered.com/steamrt/"
     "https://public.abbradar.moe/steamrt/"
   ];
 
@@ -349,7 +349,7 @@
 
   # Mozilla projects.
   mozilla = [
-    "http://download.cdn.mozilla.net/pub/mozilla.org/"
+    "https://download.cdn.mozilla.net/pub/mozilla.org/"
     "https://archive.mozilla.org/pub/"
   ];
 

From 4419e8ee8eb76bc11b629069e2a5215503d7b1c9 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 6 Nov 2021 01:06:45 +0000
Subject: [PATCH 12/16] mirrors: prioritize HTTPS

---
 pkgs/build-support/fetchurl/mirrors.nix | 69 ++++++++++++++-----------
 1 file changed, 39 insertions(+), 30 deletions(-)

diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index fd07c7c921be..3ab4be4d8be2 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -46,10 +46,11 @@
     "https://mirror.ibcp.fr/pub/gnu/"
     "https://mirror.dogado.de/gnu/"
     "https://mirror.tochlab.net/pub/gnu/"
-    "ftp://ftp.funet.fi/pub/mirrors/ftp.gnu.org/gnu/"
 
     # This one is the master repository, and thus it's always up-to-date.
     "https://ftp.gnu.org/pub/gnu/"
+
+    "ftp://ftp.funet.fi/pub/mirrors/ftp.gnu.org/gnu/"
   ];
 
   # GCC.
@@ -65,10 +66,10 @@
   # GnuPG.
   gnupg = [
     "https://gnupg.org/ftp/gcrypt/"
-    "http://www.ring.gr.jp/pub/net/"
     "https://mirrors.dotsrc.org/gcrypt/"
     "https://ftp.heanet.ie/mirrors/ftp.gnupg.org/gcrypt/"
     "https://www.mirrorservice.org/sites/ftp.gnupg.org/gcrypt/"
+    "http://www.ring.gr.jp/pub/net/"
   ];
 
   # kernel.org's /pub (/pub/{linux,software}) tree.
@@ -98,7 +99,6 @@
   savannah = [
     # Mirrors from https://download-mirror.savannah.gnu.org/releases/00_MIRRORS.html
     "https://mirror.easyname.at/nongnu/"
-    "http://mirror2.klaus-uwe.me/nongnu/"
     "https://savannah.c3sl.ufpr.br/"
     "https://mirror.csclub.uwaterloo.ca/nongnu/"
     "https://mirror.cedia.org.ec/nongnu/"
@@ -107,8 +107,9 @@
     "https://mirror.netcologne.de/savannah/"
     "https://ftp.cc.uoc.gr/mirrors/nongnu.org/"
     "https://nongnu.uib.no/"
-    "http://mirrors.fe.up.pt/pub/nongnu/"
     "https://ftp.acc.umu.se/mirror/gnu.org/savannah/"
+    "http://mirror2.klaus-uwe.me/nongnu/"
+    "http://mirrors.fe.up.pt/pub/nongnu/"
     "http://ftp.twaren.net/Unix/NonGNU/"
     "http://savannah-nongnu-org.ip-connect.vn.ua/"
     "http://www.mirrorservice.org/sites/download.savannah.gnu.org/releases/"
@@ -142,8 +143,8 @@
     "https://www.imagemagick.org/download/"
     "https://mirror.checkdomain.de/imagemagick/"
     "https://ftp.nluug.nl/ImageMagick/"
-    "ftp://ftp.sunet.se/mirror/imagemagick.org/ftp/" # also contains older versions removed from most mirrors
     "https://ftp.sunet.se/mirror/imagemagick.org/ftp/"
+    "ftp://ftp.sunet.se/mirror/imagemagick.org/ftp/" # also contains older versions removed from most mirrors
   ];
 
   # CPAN mirrors.
@@ -155,7 +156,6 @@
 
   # CentOS.
   centos = [
-    "http://mirror.centos.org/centos/"
     # For old releases
     "https://vault.centos.org/"
     "https://archive.kernel.org/centos-vault/"
@@ -164,16 +164,17 @@
     "https://mirror.chpc.utah.edu/pub/vault.centos.org/"
     "https://mirror.math.princeton.edu/pub/centos-vault/"
     "https://mirrors.tripadvisor.com/centos-vault/"
+    "http://mirror.centos.org/centos/"
   ];
 
   # Debian.
   debian = [
     "https://httpredir.debian.org/debian/"
+    "https://ftp.debian.org/debian/"
     "ftp://ftp.de.debian.org/debian/"
     "ftp://ftp.fr.debian.org/debian/"
     "ftp://ftp.nl.debian.org/debian/"
     "ftp://ftp.ru.debian.org/debian/"
-    "https://ftp.debian.org/debian/"
     "http://archive.debian.org/debian-archive/debian/"
     "ftp://ftp.funet.fi/pub/mirrors/ftp.debian.org/debian/"
   ];
@@ -181,9 +182,9 @@
   # Ubuntu.
   ubuntu = [
     "https://nl.archive.ubuntu.com/ubuntu/"
+    "https://old-releases.ubuntu.com/ubuntu/"
     "http://de.archive.ubuntu.com/ubuntu/"
     "http://archive.ubuntu.com/ubuntu/"
-    "https://old-releases.ubuntu.com/ubuntu/"
   ];
 
   # Fedora (please only add full mirrors that carry old Fedora distributions as well).
@@ -191,12 +192,12 @@
   fedora = [
     "https://archives.fedoraproject.org/pub/fedora/"
     "https://fedora.osuosl.org/"
-    "http://ftp.nluug.nl/pub/os/Linux/distr/fedora/"
     "https://ftp.funet.fi/pub/mirrors/ftp.redhat.com/pub/fedora/"
-    "http://mirror.csclub.uwaterloo.ca/fedora/"
     "https://ftp.linux.cz/pub/linux/fedora/"
-    "http://mirror.1000mbps.com/fedora/"
     "https://archives.fedoraproject.org/pub/archive/fedora/"
+    "http://ftp.nluug.nl/pub/os/Linux/distr/fedora/"
+    "http://mirror.csclub.uwaterloo.ca/fedora/"
+    "http://mirror.1000mbps.com/fedora/"
   ];
 
   # openSUSE.
@@ -222,12 +223,12 @@
   xfce = [
     "https://archive.xfce.org/"
     "https://mirror.netcologne.de/xfce/"
-    "http://archive.se.xfce.org/xfce/"
     "https://archive.be.xfce.org/xfce/"
+    "https://archive.al-us.xfce.org/"
+    "http://archive.se.xfce.org/xfce/"
     "http://mirror.perldude.de/archive.xfce.org/"
     "http://archive.be2.xfce.org/"
     "http://ftp.udc.es/xfce/"
-    "https://archive.al-us.xfce.org/"
   ];
 
   # X.org.
@@ -239,12 +240,12 @@
   apache = [
     "https://www-eu.apache.org/dist/"
     "https://ftp.wayne.edu/apache/"
-    "http://ftp.tudelft.nl/apache/"
     "https://www.apache.org/dist/"
     "https://archive.apache.org/dist/" # fallback for old releases
-    "ftp://ftp.funet.fi/pub/mirrors/apache.org/"
     "https://apache.cs.uu.nl/"
     "https://apache.cs.utah.edu/"
+    "http://ftp.tudelft.nl/apache/"
+    "ftp://ftp.funet.fi/pub/mirrors/apache.org/"
   ];
 
   postgresql = [
@@ -265,9 +266,9 @@
     # http://bioconductor.fmrp.usp.br/
     # http://mirror.aarnet.edu.au/pub/bioconductor/
     # http://watson.nci.nih.gov/bioc_mirror/
-    "http://bioconductor.jp/packages/"
     "https://bioconductor.statistik.tu-dortmund.de/packages/"
     "https://mirrors.ustc.edu.cn/bioc/"
+    "http://bioconductor.jp/packages/"
   ];
 
   # Hackage mirrors
@@ -283,36 +284,44 @@
 
   # Sage mirrors (https://www.sagemath.org/mirrors.html)
   sageupstream = [
-    # Africa
-    "ftp://ftp.sun.ac.za/pub/mirrors/www.sagemath.org/spkg/upstream/"
+    # Africa (HTTPS)
     "https://sagemath.mirror.ac.za/spkg/upstream/"
     "https://mirror.ufs.ac.za/sagemath/spkg/upstream/"
 
-    # America, North
+    # America, North (HTTPS)
     "https://mirrors.mit.edu/sage/spkg/upstream/"
-    "http://www.cecm.sfu.ca/sage/spkg/upstream/"
     "https://mirrors.xmission.com/sage/spkg/upstream/"
 
-    # America, South
-    "http://sagemath.c3sl.ufpr.br/spkg/upstream/"
-    "http://linorg.usp.br/sage/spkg/upstream"
-
-    # Asia
-    "http://ftp.kaist.ac.kr/sage/spkg/upstream/"
-    "http://ftp.riken.jp/sagemath/spkg/upstream/"
+    # Asia (HTTPS)
     "https://mirrors.tuna.tsinghua.edu.cn/sagemath/spkg/upstream/"
     "https://mirrors.ustc.edu.cn/sagemath/spkg/upstream/"
     "http://ftp.tsukuba.wide.ad.jp/software/sage/spkg/upstream/"
     "https://ftp.yz.yamagata-u.ac.jp/pub/math/sage/spkg/upstream/"
     "https://mirror.yandex.ru/mirrors/sage.math.washington.edu/spkg/upstream/"
 
-    # Australia
+    # Australia (HTTPS)
     "https://mirror.aarnet.edu.au/pub/sage/spkg/upstream/"
 
-    # Europe
+    # Europe (HTTPS)
     "https://sage.mirror.garr.it/mirrors/sage/spkg/upstream/"
-    "http://mirrors.fe.up.pt/pub/sage/spkg/upstream/"
     "https://www-ftp.lip6.fr/pub/math/sagemath/spkg/upstream/"
+
+    # Africa (non-HTTPS)
+    "ftp://ftp.sun.ac.za/pub/mirrors/www.sagemath.org/spkg/upstream/"
+
+    # America, North (non-HTTPS)
+    "http://www.cecm.sfu.ca/sage/spkg/upstream/"
+
+    # America, South (non-HTTPS)
+    "http://sagemath.c3sl.ufpr.br/spkg/upstream/"
+    "http://linorg.usp.br/sage/spkg/upstream"
+
+    # Asia (non-HTTPS)
+    "http://ftp.kaist.ac.kr/sage/spkg/upstream/"
+    "http://ftp.riken.jp/sagemath/spkg/upstream/"
+
+    # Europe (non-HTTPS)
+    "http://mirrors.fe.up.pt/pub/sage/spkg/upstream/"
     "http://ftp.ntua.gr/pub/sagemath/spkg/upstream/"
   ];
 

From 02dfbde63938f077e21d7880781132ea141b0b21 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sat, 6 Nov 2021 01:56:39 +0000
Subject: [PATCH 13/16] treewide: use mirror URLs where available

Candidates identified with

	git grep -F "$(grep -v '#' pkgs/build-support/fetchurl/mirrors.nix |
		grep -v nixos.org | grep :// | cut -d '"' -f 2)"

and then manually reviewed and tested.
---
 pkgs/applications/misc/mkgmap/deps.nix                 | 10 +++++-----
 pkgs/applications/science/medicine/xmedcon/default.nix |  2 +-
 pkgs/applications/window-managers/oroborus/default.nix |  2 +-
 pkgs/data/fonts/arphic/default.nix                     |  4 ++--
 pkgs/development/compilers/apache-flex-sdk/default.nix |  2 +-
 pkgs/development/compilers/closure/default.nix         |  2 +-
 pkgs/development/libraries/libopus/default.nix         |  2 +-
 pkgs/development/libraries/libopusenc/default.nix      |  2 +-
 pkgs/development/libraries/libutempter/default.nix     |  2 +-
 pkgs/development/libraries/plplot/default.nix          |  2 +-
 pkgs/development/libraries/serf/default.nix            |  2 +-
 pkgs/development/libraries/unixODBCDrivers/default.nix |  2 +-
 pkgs/development/libraries/xalanc/default.nix          |  2 +-
 pkgs/development/libraries/xml-security-c/default.nix  |  2 +-
 .../development/mobile/titaniumenv/titaniumsdk-7.5.nix | 10 +++++-----
 .../development/mobile/titaniumenv/titaniumsdk-8.2.nix | 10 +++++-----
 .../development/mobile/titaniumenv/titaniumsdk-8.3.nix | 10 +++++-----
 pkgs/development/ocaml-modules/inifiles/default.nix    |  2 +-
 pkgs/development/tools/avro-tools/default.nix          |  2 +-
 pkgs/development/tools/flyway/default.nix              |  2 +-
 pkgs/misc/drivers/epson-alc1100/default.nix            |  2 +-
 pkgs/os-specific/linux/pax-utils/default.nix           |  2 +-
 pkgs/servers/fingerd/bsd-fingerd/default.nix           |  2 +-
 pkgs/servers/http/jetty/default.nix                    |  2 +-
 pkgs/tools/cd-dvd/brasero/default.nix                  |  2 +-
 pkgs/tools/networking/bsd-finger/default.nix           |  2 +-
 pkgs/tools/networking/dhcpdump/default.nix             |  2 +-
 pkgs/tools/networking/sshoogr/default.nix              |  2 +-
 pkgs/tools/networking/swagger-codegen/default.nix      |  2 +-
 pkgs/tools/networking/swagger-codegen3/default.nix     |  2 +-
 pkgs/tools/text/dirdiff/default.nix                    |  2 +-
 pkgs/tools/text/sgml/jade/default.nix                  |  2 +-
 32 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/pkgs/applications/misc/mkgmap/deps.nix b/pkgs/applications/misc/mkgmap/deps.nix
index 22b5410d6bbc..68cd5a79fe72 100644
--- a/pkgs/applications/misc/mkgmap/deps.nix
+++ b/pkgs/applications/misc/mkgmap/deps.nix
@@ -9,23 +9,23 @@
     sha256 = "0zb4pqkwly5z30ww66qhhasdhdrzwmrw00347yrbgyk2ii4wjad3";
   };
   protobuf = fetchurl {
-    url = "https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.jar";
+    url = "mirror://maven/com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.jar";
     sha256 = "0x6c4pbsizvk3lm6nxcgi1g2iqgrxcna1ip74lbn01f0fm2wdhg0";
   };
   xpp3 = fetchurl {
-    url = "https://repo1.maven.org/maven2/xpp3/xpp3/1.1.4c/xpp3-1.1.4c.jar";
+    url = "mirror://maven/xpp3/xpp3/1.1.4c/xpp3-1.1.4c.jar";
     sha256 = "1f9ifnxxj295xb1494jycbfm76476xm5l52p7608gf0v91d3jh83";
   };
   jaxb-api = fetchurl {
-    url = "https://repo1.maven.org/maven2/javax/xml/bind/jaxb-api/2.3.0/jaxb-api-2.3.0.jar";
+    url = "mirror://maven/javax/xml/bind/jaxb-api/2.3.0/jaxb-api-2.3.0.jar";
     sha256 = "00rxpc0m30d3jc572ni01ryxq8gcbnr955xsabrijg9pknc0fc48";
   };
   junit = fetchurl {
-    url = "https://repo1.maven.org/maven2/junit/junit/4.11/junit-4.11.jar";
+    url = "mirror://maven/junit/junit/4.11/junit-4.11.jar";
     sha256 = "1zh6klzv8w30dx7jg6pkhllk4587av4znflzhxz8x97c7rhf3a4h";
   };
   hamcrest-core = fetchurl {
-    url = "https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar";
+    url = "mirror://maven/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar";
     sha256 = "1sfqqi8p5957hs9yik44an3lwpv8ln2a6sh9gbgli4vkx68yzzb6";
   };
 }
diff --git a/pkgs/applications/science/medicine/xmedcon/default.nix b/pkgs/applications/science/medicine/xmedcon/default.nix
index 3c2bec86a7a5..bee2be729d1e 100644
--- a/pkgs/applications/science/medicine/xmedcon/default.nix
+++ b/pkgs/applications/science/medicine/xmedcon/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   version = "0.21.2";
 
   src = fetchurl {
-    url = "https://prdownloads.sourceforge.net/${pname}/${pname}-${version}.tar.bz2";
+    url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
     sha256 = "0svff8rc3j2p47snaq1hx9mv4ydmxawpb0hf3d165g1ccjwvmm6m";
   };
 
diff --git a/pkgs/applications/window-managers/oroborus/default.nix b/pkgs/applications/window-managers/oroborus/default.nix
index 0124261e423f..d24abb68fb7e 100644
--- a/pkgs/applications/window-managers/oroborus/default.nix
+++ b/pkgs/applications/window-managers/oroborus/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
                   libXft libXpm libXrandr libXrender xorgproto libXinerama ];
 
   src = fetchurl {
-    url = "http://ftp.debian.org/debian/pool/main/o/oroborus/oroborus_${version}.tar.gz";
+    url = "mirror://debian/pool/main/o/oroborus/oroborus_${version}.tar.gz";
     sha256 = "12bvk8x8rfnymbfbwmdcrd9g8m1zxbcq7rgvfdkjr0gnpi0aa82j";
   };
 
diff --git a/pkgs/data/fonts/arphic/default.nix b/pkgs/data/fonts/arphic/default.nix
index 714af585d255..02e2a2de417b 100644
--- a/pkgs/data/fonts/arphic/default.nix
+++ b/pkgs/data/fonts/arphic/default.nix
@@ -6,7 +6,7 @@ in {
   arphic-ukai = fetchzip {
     name = "arphic-ukai-${version}";
 
-    url = "http://archive.ubuntu.com/ubuntu/pool/main/f/fonts-arphic-ukai/fonts-arphic-ukai_${version}.orig.tar.bz2";
+    url = "mirror://ubuntu/pool/main/f/fonts-arphic-ukai/fonts-arphic-ukai_${version}.orig.tar.bz2";
 
     postFetch = ''
       tar -xjvf $downloadedFile --strip-components=1
@@ -31,7 +31,7 @@ in {
   arphic-uming = fetchzip {
     name = "arphic-uming-${version}";
 
-    url = "http://archive.ubuntu.com/ubuntu/pool/main/f/fonts-arphic-uming/fonts-arphic-uming_${version}.orig.tar.bz2";
+    url = "mirror://ubuntu/pool/main/f/fonts-arphic-uming/fonts-arphic-uming_${version}.orig.tar.bz2";
 
     postFetch = ''
       tar -xjvf $downloadedFile --strip-components=1
diff --git a/pkgs/development/compilers/apache-flex-sdk/default.nix b/pkgs/development/compilers/apache-flex-sdk/default.nix
index 5b5b21aa73d7..527b800551eb 100644
--- a/pkgs/development/compilers/apache-flex-sdk/default.nix
+++ b/pkgs/development/compilers/apache-flex-sdk/default.nix
@@ -11,7 +11,7 @@ in stdenv.mkDerivation rec {
   version = "4.16.1";
 
   src = fetchurl {
-    url = "https://www.apache.org/dist/flex/${version}/binaries/${pname}-${version}-bin.tar.gz";
+    url = "mirror://apache/flex/${version}/binaries/${pname}-${version}-bin.tar.gz";
     sha256 = "13iq16dqvgcpb0p35x66hzxsq5pkbr2lbwr766nnqiryinnagz8p";
   };
 
diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix
index eb8c898e09ed..c967af75bf22 100644
--- a/pkgs/development/compilers/closure/default.nix
+++ b/pkgs/development/compilers/closure/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "20210808";
 
   src = fetchurl {
-    url = "https://repo1.maven.org/maven2/com/google/javascript/closure-compiler/v${version}/closure-compiler-v${version}.jar";
+    url = "mirror://maven/com/google/javascript/closure-compiler/v${version}/closure-compiler-v${version}.jar";
     sha256 = "1cvibvm8l4mp64ml6lpsh3w62bgbr42pi3i7ga8ss0prhr0dsk3y";
   };
 
diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix
index 7a3a77931c76..7c563e081d01 100644
--- a/pkgs/development/libraries/libopus/default.nix
+++ b/pkgs/development/libraries/libopus/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   version = "1.3.1";
 
   src = fetchurl {
-    url = "https://archive.mozilla.org/pub/opus/opus-${version}.tar.gz";
+    url = "mirror://mozilla/opus/opus-${version}.tar.gz";
     sha256 = "17gz8kxs4i7icsc1gj713gadiapyklynlwqlf0ai98dj4lg8xdb5";
   };
 
diff --git a/pkgs/development/libraries/libopusenc/default.nix b/pkgs/development/libraries/libopusenc/default.nix
index 3cb14a2ea99e..bd749616cc47 100644
--- a/pkgs/development/libraries/libopusenc/default.nix
+++ b/pkgs/development/libraries/libopusenc/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "0.2.1";
 
   src = fetchurl {
-    url = "https://archive.mozilla.org/pub/opus/libopusenc-${version}.tar.gz";
+    url = "mirror://mozilla/opus/libopusenc-${version}.tar.gz";
     sha256 = "1ffb0vhlymlsq70pxsjj0ksz77yfm2x0a1x8q50kxmnkm1hxp642";
   };
 
diff --git a/pkgs/development/libraries/libutempter/default.nix b/pkgs/development/libraries/libutempter/default.nix
index ff2044242b9f..6c0406bf4013 100644
--- a/pkgs/development/libraries/libutempter/default.nix
+++ b/pkgs/development/libraries/libutempter/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   version = "1.1.6";
 
   src = fetchurl {
-    url = "http://archive.ubuntu.com/ubuntu/pool/main/libu/libutempter/libutempter_${version}.orig.tar.bz2";
+    url = "mirror://ubuntu/pool/main/libu/libutempter/libutempter_${version}.orig.tar.bz2";
     sha256 = "15y3xbgznjxnfmix4xg3bwmqdvghdw7slbhazb0ybmyf65gmd65q";
   };
 
diff --git a/pkgs/development/libraries/plplot/default.nix b/pkgs/development/libraries/plplot/default.nix
index 92d74cab93bc..dca1248b8b6b 100644
--- a/pkgs/development/libraries/plplot/default.nix
+++ b/pkgs/development/libraries/plplot/default.nix
@@ -15,7 +15,7 @@ in stdenv.mkDerivation rec {
   version = "5.15.0";
 
   src = fetchurl {
-    url = "https://downloads.sourceforge.net/project/${pname}/${pname}/${version}%20Source/${pname}-${version}.tar.gz";
+    url = "mirror://sourceforge/project/${pname}/${pname}/${version}%20Source/${pname}-${version}.tar.gz";
     sha256 = "0ywccb6bs1389zjfmc9zwdvdsvlpm7vg957whh6b5a96yvcf8bdr";
   };
 
diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/development/libraries/serf/default.nix
index 2549704c1a8c..4f00e057e3c6 100644
--- a/pkgs/development/libraries/serf/default.nix
+++ b/pkgs/development/libraries/serf/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   version = "1.3.9";
 
   src = fetchurl {
-    url = "https://www.apache.org/dist/serf/${pname}-${version}.tar.bz2";
+    url = "mirror://apache/serf/${pname}-${version}.tar.bz2";
     sha256 = "1k47gbgpp52049andr28y28nbwh9m36bbb0g8p0aka3pqlhjv72l";
   };
 
diff --git a/pkgs/development/libraries/unixODBCDrivers/default.nix b/pkgs/development/libraries/unixODBCDrivers/default.nix
index b766b933a656..b4e574e85b1a 100644
--- a/pkgs/development/libraries/unixODBCDrivers/default.nix
+++ b/pkgs/development/libraries/unixODBCDrivers/default.nix
@@ -8,7 +8,7 @@
     version = "10.01.0000";
 
     src = fetchurl {
-      url = "http://ftp.postgresql.org/pub/odbc/versions/src/${pname}-${version}.tar.gz";
+      url = "mirror://postgresql/odbc/versions/src/${pname}-${version}.tar.gz";
       sha256 = "1cyams7157f3gry86x64xrplqi2vyqrq3rqka59gv4lb4rpl7jl7";
     };
 
diff --git a/pkgs/development/libraries/xalanc/default.nix b/pkgs/development/libraries/xalanc/default.nix
index b757b737f976..a532b42c1976 100644
--- a/pkgs/development/libraries/xalanc/default.nix
+++ b/pkgs/development/libraries/xalanc/default.nix
@@ -9,7 +9,7 @@ in stdenv.mkDerivation rec {
   version = "1.11";
 
   src = fetchurl {
-    url = "http://www.eu.apache.org/dist/xalan/xalan-c/sources/xalan_c-${version}-src.tar.gz";
+    url = "mirror://apache/xalan/xalan-c/sources/xalan_c-${version}-src.tar.gz";
     sha256 = "0a3a2b15vpacnqgpp6fiy1pwyc8q6ywzvyb5445f6wixfdspypjg";
   };
 
diff --git a/pkgs/development/libraries/xml-security-c/default.nix b/pkgs/development/libraries/xml-security-c/default.nix
index 7548a45e5d41..c3275c0ad507 100644
--- a/pkgs/development/libraries/xml-security-c/default.nix
+++ b/pkgs/development/libraries/xml-security-c/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "2.0.2";
 
   src = fetchurl {
-    url = "https://www.apache.org/dist/santuario/c-library/${pname}-${version}.tar.gz";
+    url = "mirror://apache/santuario/c-library/${pname}-${version}.tar.gz";
     sha256 = "1prh5sxzipkqglpsh53iblbr7rxi54wbijxdjiahzjmrijqa40y3";
   };
 
diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix
index 89fd34bb5a3d..ea6ead43f0c0 100644
--- a/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix
+++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-7.5.nix
@@ -15,23 +15,23 @@ let
   proguardVersion = "5.3.3";
 
   proguardGradlePOM = fetchurl {
-    url = "https://repo1.maven.org/maven2/net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.pom";
+    url = "mirror://maven/net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.pom";
     sha256 = "03v9zm3ykfkyb5cs5ald07ph103fh68d5c33rv070r29p71dwszj";
   };
   proguardGradleJAR = fetchurl {
-    url = "https://repo1.maven.org/maven2/net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.jar";
+    url = "mirror://maven/net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.jar";
     sha256 = "0shhpsjfc5gam15jnv1hk718v5c7vi7dwdc3gvmnid6dc85kljzk";
   };
   proguardParentPOM = fetchurl {
-    url = "https://repo1.maven.org/maven2/net/sf/proguard/proguard-parent/${proguardVersion}/proguard-parent-${proguardVersion}.pom";
+    url = "mirror://maven/net/sf/proguard/proguard-parent/${proguardVersion}/proguard-parent-${proguardVersion}.pom";
     sha256 = "0mv0zbwyw8xa4mkc5kw69y5xqashkz9gp123akfvh9f6152l3202";
   };
   proguardBasePOM = fetchurl {
-    url = "https://repo1.maven.org/maven2/net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.pom";
+    url = "mirror://maven/net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.pom";
     sha256 = "1jnr6zsxfimb8wglqlwa6rrdc3g3nqf1dyw0k2dq9cj0q4pgn7p5";
   };
   proguardBaseJAR = fetchurl {
-    url = "https://repo1.maven.org/maven2/net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.jar";
+    url = "mirror://maven/net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.jar";
     sha256 = "11nwdb9y84cghcx319nsjjf9m035s4s1184zrhzpvaxq2wvqhbhx";
   };
 
diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix
index fb462cc27fe6..7cb0390417fd 100644
--- a/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix
+++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-8.2.nix
@@ -15,23 +15,23 @@ let
   proguardVersion = "5.3.3";
 
   proguardGradlePOM = fetchurl {
-    url = "https://repo1.maven.org/maven2/net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.pom";
+    url = "mirror://maven/net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.pom";
     sha256 = "03v9zm3ykfkyb5cs5ald07ph103fh68d5c33rv070r29p71dwszj";
   };
   proguardGradleJAR = fetchurl {
-    url = "https://repo1.maven.org/maven2/net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.jar";
+    url = "mirror://maven/net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.jar";
     sha256 = "0shhpsjfc5gam15jnv1hk718v5c7vi7dwdc3gvmnid6dc85kljzk";
   };
   proguardParentPOM = fetchurl {
-    url = "https://repo1.maven.org/maven2/net/sf/proguard/proguard-parent/${proguardVersion}/proguard-parent-${proguardVersion}.pom";
+    url = "mirror://maven/net/sf/proguard/proguard-parent/${proguardVersion}/proguard-parent-${proguardVersion}.pom";
     sha256 = "0mv0zbwyw8xa4mkc5kw69y5xqashkz9gp123akfvh9f6152l3202";
   };
   proguardBasePOM = fetchurl {
-    url = "https://repo1.maven.org/maven2/net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.pom";
+    url = "mirror://maven/net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.pom";
     sha256 = "1jnr6zsxfimb8wglqlwa6rrdc3g3nqf1dyw0k2dq9cj0q4pgn7p5";
   };
   proguardBaseJAR = fetchurl {
-    url = "https://repo1.maven.org/maven2/net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.jar";
+    url = "mirror://maven/net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.jar";
     sha256 = "11nwdb9y84cghcx319nsjjf9m035s4s1184zrhzpvaxq2wvqhbhx";
   };
 
diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix
index c207b112fae2..aef3e0c56e45 100644
--- a/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix
+++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-8.3.nix
@@ -15,23 +15,23 @@ let
   proguardVersion = "5.3.3";
 
   proguardGradlePOM = fetchurl {
-    url = "https://repo1.maven.org/maven2/net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.pom";
+    url = "mirror://maven/net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.pom";
     sha256 = "03v9zm3ykfkyb5cs5ald07ph103fh68d5c33rv070r29p71dwszj";
   };
   proguardGradleJAR = fetchurl {
-    url = "https://repo1.maven.org/maven2/net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.jar";
+    url = "mirror://maven/net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.jar";
     sha256 = "0shhpsjfc5gam15jnv1hk718v5c7vi7dwdc3gvmnid6dc85kljzk";
   };
   proguardParentPOM = fetchurl {
-    url = "https://repo1.maven.org/maven2/net/sf/proguard/proguard-parent/${proguardVersion}/proguard-parent-${proguardVersion}.pom";
+    url = "mirror://maven/net/sf/proguard/proguard-parent/${proguardVersion}/proguard-parent-${proguardVersion}.pom";
     sha256 = "0mv0zbwyw8xa4mkc5kw69y5xqashkz9gp123akfvh9f6152l3202";
   };
   proguardBasePOM = fetchurl {
-    url = "https://repo1.maven.org/maven2/net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.pom";
+    url = "mirror://maven/net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.pom";
     sha256 = "1jnr6zsxfimb8wglqlwa6rrdc3g3nqf1dyw0k2dq9cj0q4pgn7p5";
   };
   proguardBaseJAR = fetchurl {
-    url = "https://repo1.maven.org/maven2/net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.jar";
+    url = "mirror://maven/net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.jar";
     sha256 = "11nwdb9y84cghcx319nsjjf9m035s4s1184zrhzpvaxq2wvqhbhx";
   };
 
diff --git a/pkgs/development/ocaml-modules/inifiles/default.nix b/pkgs/development/ocaml-modules/inifiles/default.nix
index ad9bd3e2dc71..7e2659381148 100644
--- a/pkgs/development/ocaml-modules/inifiles/default.nix
+++ b/pkgs/development/ocaml-modules/inifiles/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "ocaml${ocaml.version}-inifiles-1.2";
 
   src = fetchurl {
-    url = "http://archive.ubuntu.com/ubuntu/pool/universe/o/ocaml-inifiles/ocaml-inifiles_1.2.orig.tar.gz";
+    url = "mirror://ubuntu/pool/universe/o/ocaml-inifiles/ocaml-inifiles_1.2.orig.tar.gz";
     sha256 = "0jhzgiypmh6hwsv1zpiq77fi0cvcmwbiy5x0yg7mz6p3dh1dmkns";
   };
 
diff --git a/pkgs/development/tools/avro-tools/default.nix b/pkgs/development/tools/avro-tools/default.nix
index 5dd058614c10..c7a96ce247eb 100644
--- a/pkgs/development/tools/avro-tools/default.nix
+++ b/pkgs/development/tools/avro-tools/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url =
-    "https://repo1.maven.org/maven2/org/apache/avro/avro-tools/${version}/${pname}-${version}.jar";
+    "mirror://maven/org/apache/avro/avro-tools/${version}/${pname}-${version}.jar";
     sha256 = "169cv4fjsj69fa2s87gh1i7wk0xzh3l7sx5yyz3cgyjalg4a12n1";
   };
 
diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix
index 4674ae5170ae..0e1d18d2eb1c 100644
--- a/pkgs/development/tools/flyway/default.nix
+++ b/pkgs/development/tools/flyway/default.nix
@@ -3,7 +3,7 @@ stdenv.mkDerivation rec{
   pname = "flyway";
   version = "7.13.0";
   src = fetchurl {
-    url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz";
+    url = "mirror://maven/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz";
     sha256 = "sha256-rZUVxswJdCFKwuXlzko+t+ZO1plRgH2VcZFJ5kkiM2s=";
   };
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/misc/drivers/epson-alc1100/default.nix b/pkgs/misc/drivers/epson-alc1100/default.nix
index 5551f734138c..641d68d39479 100644
--- a/pkgs/misc/drivers/epson-alc1100/default.nix
+++ b/pkgs/misc/drivers/epson-alc1100/default.nix
@@ -4,7 +4,7 @@ let
   version = "1.2-0";
 
   libstdcpp5 = fetchurl {
-    url = "http://old-releases.ubuntu.com/ubuntu/pool/universe/g/gcc-3.3/libstdc++5_3.3.6-17ubuntu1_i386.deb";
+    url = "mirror://ubuntu/pool/universe/g/gcc-3.3/libstdc++5_3.3.6-17ubuntu1_i386.deb";
     sha256 = "10f8zcmqaa7skvg2bz94mnlgqpan4iscvi8913r6iawjh7hiisjy";
   };
 in
diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/pkgs/os-specific/linux/pax-utils/default.nix
index db5763029977..4bc5266cadc4 100644
--- a/pkgs/os-specific/linux/pax-utils/default.nix
+++ b/pkgs/os-specific/linux/pax-utils/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "1.3.3";
 
   src = fetchurl {
-    url = "http://distfiles.gentoo.org/distfiles/${pname}-${version}.tar.xz";
+    url = "mirror://gentoo/distfiles/${pname}-${version}.tar.xz";
     sha256 = "sha256-7sp/vZi8Zr6tSncADCAl2fF+qCAbhCRYgkBs4AubaxQ=";
   };
 
diff --git a/pkgs/servers/fingerd/bsd-fingerd/default.nix b/pkgs/servers/fingerd/bsd-fingerd/default.nix
index 0220a18916b3..4fb6f44b4547 100644
--- a/pkgs/servers/fingerd/bsd-fingerd/default.nix
+++ b/pkgs/servers/fingerd/bsd-fingerd/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   version = "0.17";
 
   src = fetchurl {
-    url = "ftp://ftp.metalab.unc.edu/pub/linux/system/network/finger/bsd-finger-${version}.tar.gz";
+    url = "mirror://metalab/system/network/finger/bsd-finger-${version}.tar.gz";
     sha256 = "1yhkiv0in588il7f84k2xiy78g9lv12ll0y7047gazhiimk5v244";
   };
 
diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix
index f226e0ad7e4a..25eb0c6312cb 100644
--- a/pkgs/servers/http/jetty/default.nix
+++ b/pkgs/servers/http/jetty/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   pname = "jetty";
   version = "9.4.43.v20210629";
   src = fetchurl {
-    url = "https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${version}/jetty-distribution-${version}.tar.gz";
+    url = "mirror://maven/org/eclipse/jetty/jetty-distribution/${version}/jetty-distribution-${version}.tar.gz";
     sha256 = "sha256-AfrmVLCZMuRGAZqoWeevbgXifbreErVM17rjJJ/HI9k=";
   };
 
diff --git a/pkgs/tools/cd-dvd/brasero/default.nix b/pkgs/tools/cd-dvd/brasero/default.nix
index ea720f4f3eb2..2107d4ed0824 100644
--- a/pkgs/tools/cd-dvd/brasero/default.nix
+++ b/pkgs/tools/cd-dvd/brasero/default.nix
@@ -12,7 +12,7 @@ in stdenv.mkDerivation rec {
   pname = "brasero";
 
   src = fetchurl {
-    url = "http://download.gnome.org/sources/brasero/${major}/${pname}-${version}.tar.xz";
+    url = "mirror://gnome/sources/brasero/${major}/${pname}-${version}.tar.xz";
     sha256 = "0h90y674j26rvjahb8cc0w79zx477rb6zaqcj26wzvq8kmpic8k8";
   };
 
diff --git a/pkgs/tools/networking/bsd-finger/default.nix b/pkgs/tools/networking/bsd-finger/default.nix
index 354c669b3366..4f8d946fa360 100644
--- a/pkgs/tools/networking/bsd-finger/default.nix
+++ b/pkgs/tools/networking/bsd-finger/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   version = "0.17";
 
   src = fetchurl {
-    url = "ftp://ftp.metalab.unc.edu/pub/linux/system/network/finger/bsd-finger-${version}.tar.gz";
+    url = "mirror://metalab/system/network/finger/bsd-finger-${version}.tar.gz";
     sha256 = "1yhkiv0in588il7f84k2xiy78g9lv12ll0y7047gazhiimk5v244";
   };
 
diff --git a/pkgs/tools/networking/dhcpdump/default.nix b/pkgs/tools/networking/dhcpdump/default.nix
index b8bd1d88bf20..d940731c7c95 100644
--- a/pkgs/tools/networking/dhcpdump/default.nix
+++ b/pkgs/tools/networking/dhcpdump/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "1.8";
 
   src = fetchurl {
-    url = "http://archive.ubuntu.com/ubuntu/pool/universe/d/dhcpdump/dhcpdump_${version}.orig.tar.gz";
+    url = "mirror://ubuntu/pool/universe/d/dhcpdump/dhcpdump_${version}.orig.tar.gz";
     sha256 = "143iyzkqvhj4dscwqs75jvfr4wvzrs11ck3fqn5p7yv2h50vjpkd";
   };
 
diff --git a/pkgs/tools/networking/sshoogr/default.nix b/pkgs/tools/networking/sshoogr/default.nix
index f3c9c1a31fb8..e20978c277d9 100644
--- a/pkgs/tools/networking/sshoogr/default.nix
+++ b/pkgs/tools/networking/sshoogr/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "0.9.26";
 
   src = fetchzip {
-    url = "https://repo1.maven.org/maven2/com/aestasit/infrastructure/${pname}/${pname}/${version}/${pname}-${version}.zip";
+    url = "mirror://maven/com/aestasit/infrastructure/${pname}/${pname}/${version}/${pname}-${version}.zip";
     sha256 = "134qlx90y82g1rfxhyn12z9r2imm1l3fz09hrrn3pgcdcq5jz2s1";
   };
 
diff --git a/pkgs/tools/networking/swagger-codegen/default.nix b/pkgs/tools/networking/swagger-codegen/default.nix
index f2847703bdba..37e35e95e7f4 100644
--- a/pkgs/tools/networking/swagger-codegen/default.nix
+++ b/pkgs/tools/networking/swagger-codegen/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   ];
 
   src = fetchurl {
-    url = "https://repo1.maven.org/maven2/io/swagger/${pname}-cli/${version}/${jarfilename}";
+    url = "mirror://maven/io/swagger/${pname}-cli/${version}/${jarfilename}";
     sha256 = "04wl5k8k1ziqz7k5w0g7i6zdfn41pbh3k0m8vq434k1886inf8yn";
   };
 
diff --git a/pkgs/tools/networking/swagger-codegen3/default.nix b/pkgs/tools/networking/swagger-codegen3/default.nix
index 2981196ef7c0..9114df94b540 100644
--- a/pkgs/tools/networking/swagger-codegen3/default.nix
+++ b/pkgs/tools/networking/swagger-codegen3/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   ];
 
   src = fetchurl {
-    url = "https://repo1.maven.org/maven2/io/swagger/codegen/v3/${pname}-cli/${version}/${jarfilename}";
+    url = "mirror://maven/io/swagger/codegen/v3/${pname}-cli/${version}/${jarfilename}";
     sha256 = "sha256-sEwqUmtWaoBV0QmdP8ibm3neqWHk7+tWLAuO2FaCUtQ=";
   };
 
diff --git a/pkgs/tools/text/dirdiff/default.nix b/pkgs/tools/text/dirdiff/default.nix
index b49df59b29e1..e0385d332450 100644
--- a/pkgs/tools/text/dirdiff/default.nix
+++ b/pkgs/tools/text/dirdiff/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "2.1";
 
   src = fetchurl {
-    url = "https://www.samba.org/ftp/paulus/${pname}-${version}.tar.gz";
+    url = "mirror://samba/paulus/${pname}-${version}.tar.gz";
     sha256 = "0lljd8av68j70733yshzzhxjr1lm0vgmbqsm8f02g03qsma3cdyb";
   };
 
diff --git a/pkgs/tools/text/sgml/jade/default.nix b/pkgs/tools/text/sgml/jade/default.nix
index 338520b4df2b..c599375bc1cc 100644
--- a/pkgs/tools/text/sgml/jade/default.nix
+++ b/pkgs/tools/text/sgml/jade/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   };
 
   patchsrc =  fetchurl {
-    url = "http://ftp.debian.org/debian/pool/main/j/jade/jade_${version}-${debpatch}.diff.gz";
+    url = "mirror://debian/pool/main/j/jade/jade_${version}-${debpatch}.diff.gz";
     sha256 = "8e94486898e3503308805f856a65ba5b499a6f21994151270aa743de48305464";
   };
 

From 3f9f6c91bd3ef6b7bd5d4105b0d4bc93fb30fdc2 Mon Sep 17 00:00:00 2001
From: Joel <joel@joel.tokyo>
Date: Wed, 3 Nov 2021 18:12:59 +1000
Subject: [PATCH 14/16] maintainers: add jyooru

---
 maintainers/maintainer-list.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index a2e74aa129b2..aa3ce8fa6c7b 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5797,6 +5797,16 @@
     githubId = 20658981;
     name = "Jarosław Wygoda";
   };
+  jyooru = {
+    email = "joel@joel.tokyo";
+    github = "jyooru";
+    githubId = 63786778;
+    name = "Joel";
+    keys = [{
+      longkeyid = "rsa4096/18550BD205E9EF64";
+      fingerprint = "9148 DC9E F4D5 3EB6 A30E  8EF0 1855 0BD2 05E9 EF64";
+    }];
+  };
   jyp = {
     email = "jeanphilippe.bernardy@gmail.com";
     github = "jyp";

From f3decfa7da519290e61c06fb029bfc8ff0ce4147 Mon Sep 17 00:00:00 2001
From: Joel <joel@joel.tokyo>
Date: Wed, 3 Nov 2021 18:13:27 +1000
Subject: [PATCH 15/16] octofetch: init at 0.3.1

octofetch: use buildInputs for openssl

Co-authored-by: Jonathan Ringer <jonringer@users.noreply.github.com>
---
 pkgs/tools/misc/octofetch/default.nix | 31 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/tools/misc/octofetch/default.nix

diff --git a/pkgs/tools/misc/octofetch/default.nix b/pkgs/tools/misc/octofetch/default.nix
new file mode 100644
index 000000000000..b415b43d0cd3
--- /dev/null
+++ b/pkgs/tools/misc/octofetch/default.nix
@@ -0,0 +1,31 @@
+{ lib
+, fetchFromGitHub
+, rustPlatform
+, pkg-config
+, openssl
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "octofetch";
+  version = "0.3.1";
+
+  src = fetchFromGitHub {
+    owner = "azur1s";
+    repo = pname;
+    rev = version;
+    sha256 = "sha256-ciBFTVdHotjifNAoXJjI9CumyK98OkMmfWMbrEldlNI=";
+  };
+
+  cargoSha256 = "sha256-Gzemm5HY6YwlxesQlil6R+34OtAeU2k7f/9+Lll3i8k=";
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [ openssl ];
+
+  meta = with lib; {
+    description = "Github user information on terminal";
+    homepage = "https://github.com/azur1s/octofetch";
+    license = licenses.mit;
+    maintainers = with maintainers; [ jyooru ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index de2b285800a0..a86c88a068b2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8035,6 +8035,8 @@ with pkgs;
 
   ocserv = callPackage ../tools/networking/ocserv { };
 
+  octofetch = callPackage ../tools/misc/octofetch { };
+
   oha = callPackage ../tools/networking/oha {
     inherit (darwin.apple_sdk.frameworks) Security;
   };

From 4d821295f132630956e9def11fcb7bb843f4da69 Mon Sep 17 00:00:00 2001
From: John Soo <jsoo1@users.noreply.github.com>
Date: Fri, 5 Nov 2021 20:26:24 -0700
Subject: [PATCH 16/16] dhall-grafana: init at 0.1. (#144826)

---
 pkgs/development/dhall-modules/dhall-grafana.nix | 11 +++++++++++
 pkgs/top-level/dhall-packages.nix                |  3 +++
 2 files changed, 14 insertions(+)
 create mode 100644 pkgs/development/dhall-modules/dhall-grafana.nix

diff --git a/pkgs/development/dhall-modules/dhall-grafana.nix b/pkgs/development/dhall-modules/dhall-grafana.nix
new file mode 100644
index 000000000000..dcb9645f66f9
--- /dev/null
+++ b/pkgs/development/dhall-modules/dhall-grafana.nix
@@ -0,0 +1,11 @@
+{ dhallPackages, buildDhallGitHubPackage }:
+
+buildDhallGitHubPackage {
+  name = "grafana";
+  owner = "weeezes";
+  repo = "dhall-grafana";
+  # 2021-11-05
+  rev = "bf2f8c8ab44682c8cef4fdce2d2f7fbeb0cfe162";
+  sha256 = "0h1l39kj49yvadpbw6jw3mc7qzsmhxlqqpx3cgnr9f063nh73f96";
+  dependencies = [ dhallPackages.Prelude ];
+}
diff --git a/pkgs/top-level/dhall-packages.nix b/pkgs/top-level/dhall-packages.nix
index 173c37f49214..1be67f2a4dea 100644
--- a/pkgs/top-level/dhall-packages.nix
+++ b/pkgs/top-level/dhall-packages.nix
@@ -27,6 +27,9 @@ let
 
         lib = import ../development/dhall-modules/lib.nix { inherit lib; };
 
+        dhall-grafana =
+          callPackage ../development/dhall-modules/dhall-grafana.nix { };
+
         dhall-kubernetes =
           callPackage ../development/dhall-modules/dhall-kubernetes.nix { };