summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--pkgs/build-support/fetchurl/mirrors.nix65
-rw-r--r--pkgs/development/libraries/science/math/lcalc/default.nix2
-rw-r--r--pkgs/development/libraries/science/math/rankwidth/default.nix2
-rw-r--r--pkgs/development/libraries/science/math/rubiks/default.nix2
-rw-r--r--pkgs/development/libraries/science/math/sympow/default.nix2
5 files changed, 35 insertions, 38 deletions
diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index 2d1773531532..d5f29e3daf1b 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -319,51 +319,48 @@ rec {
   ];
 
   # Sage mirrors (http://www.sagemath.org/mirrors.html)
-  sagemath = [
+  sageupstream = [
     # Africa
-    http://sagemath.polytechnic.edu.na/src/
-    ftp://ftp.sun.ac.za/pub/mirrors/www.sagemath.org/src/
-    http://sagemath.mirror.ac.za/src/
-    https://ftp.leg.uct.ac.za/pub/packages/sage/src/
-    http://mirror.ufs.ac.za/sagemath/src/
+    http://sagemath.polytechnic.edu.na/spkg/upstream/
+    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/src/
-    http://mirrors.mit.edu/sage/src/
-    http://www.cecm.sfu.ca/sage/src/
-    http://files.sagemath.org/src/
-    http://mirror.clibre.uqam.ca/sage/src/
-    https://mirrors.xmission.com/sage/src/
+    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
-    http://sagemath.c3sl.ufpr.br/src/
-    http://linorg.usp.br/sage/
+    http://sagemath.c3sl.ufpr.br/spkg/upstream/
+    http://linorg.usp.br/sage/spkg/upstream
 
     # Asia
-    http://sage.asis.io/src/
-    http://mirror.hust.edu.cn/sagemath/src/
-    https://ftp.iitm.ac.in/sage/src/
-    http://ftp.kaist.ac.kr/sage/src/
-    http://ftp.riken.jp/sagemath/src/
-    https://mirrors.tuna.tsinghua.edu.cn/sagemath/src/
-    https://mirrors.ustc.edu.cn/sagemath/src/
-    http://ftp.tsukuba.wide.ad.jp/software/sage/src/
-    http://ftp.yz.yamagata-u.ac.jp/pub/math/sage/src/
-    https://mirror.yandex.ru/mirrors/sage.math.washington.edu/src/
+    http://sage.asis.io/spkg/upstream/
+    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/
+    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://mirror.yandex.ru/mirrors/sage.math.washington.edu/spkg/upstream/
 
     # Australia
-    http://echidna.maths.usyd.edu.au/sage/src/
+    http://echidna.maths.usyd.edu.au/sage/spkg/upstream/
 
     # Europe
-    http://sage.mirror.garr.it/mirrors/sage/src/
-    http://sunsite.rediris.es/mirror/sagemath/src/
-    http://mirror.switch.ch/mirror/sagemath/src/
-    http://mirrors.fe.up.pt/pub/sage/src/
-    http://www-ftp.lip6.fr/pub/math/sagemath/src/
-    http://ftp.ntua.gr/pub/sagemath/src/
-
-    # Old versions
-    http://sagemath.org/src-old/
+    http://sage.mirror.garr.it/mirrors/sage/spkg/upstream/
+    http://sunsite.rediris.es/mirror/sagemath/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/
   ];
 
   # MySQL mirrors
diff --git a/pkgs/development/libraries/science/math/lcalc/default.nix b/pkgs/development/libraries/science/math/lcalc/default.nix
index 90393cff001c..6bbd43b0c848 100644
--- a/pkgs/development/libraries/science/math/lcalc/default.nix
+++ b/pkgs/development/libraries/science/math/lcalc/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   src = fetchurl {
     # original at http://oto.math.uwaterloo.ca/~mrubinst/L_function_public/CODE/L-${version}.tar.gz, no longer available
     # "newer" version at google code https://code.google.com/archive/p/l-calc/source/default/source
-    url = "http://mirrors.mit.edu/sage/spkg/upstream/lcalc/lcalc-${version}.tar.bz2";
+    url = "mirror://sageupstream/lcalc/lcalc-${version}.tar.bz2";
     sha256 = "1c6dsdshgxhqppjxvxhp8yhpxaqvnz3d1mlh26r571gkq8z2bm43";
   };
 
diff --git a/pkgs/development/libraries/science/math/rankwidth/default.nix b/pkgs/development/libraries/science/math/rankwidth/default.nix
index f38fce5831ee..fda54fe44ab1 100644
--- a/pkgs/development/libraries/science/math/rankwidth/default.nix
+++ b/pkgs/development/libraries/science/math/rankwidth/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "http://mirrors.mit.edu/sage/spkg/upstream/rw/rw-${version}.tar.gz";
+    url = "mirror://sageupstream/rw/rw-${version}.tar.gz";
     sha256 = "1rv2v42x2506x7f10349m1wpmmfxrv9l032bkminni2gbip9cjg0";
   };
 
diff --git a/pkgs/development/libraries/science/math/rubiks/default.nix b/pkgs/development/libraries/science/math/rubiks/default.nix
index fe448106b15d..624885c501aa 100644
--- a/pkgs/development/libraries/science/math/rubiks/default.nix
+++ b/pkgs/development/libraries/science/math/rubiks/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "http://mirrors.mit.edu/sage/spkg/upstream/rubiks/rubiks-${version}.tar.bz2";
+    url = "mirror://sageupstream/rubiks/rubiks-${version}.tar.bz2";
     sha256 = "0zdmkb0j1kyspdpsszzb2k3279xij79jkx0dxd9f3ix1yyyg3yfq";
   };
 
diff --git a/pkgs/development/libraries/science/math/sympow/default.nix b/pkgs/development/libraries/science/math/sympow/default.nix
index c83b3d1737cf..40e139ff5b56 100644
--- a/pkgs/development/libraries/science/math/sympow/default.nix
+++ b/pkgs/development/libraries/science/math/sympow/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     # Original website no longer reachable
-    url = "http://mirrors.mit.edu/sage/spkg/upstream/sympow/sympow-${version}.tar.bz2";
+    url = "mirror://sageupstream/sympow/sympow-${version}.tar.bz2";
     sha256 = "0hphs7ia1wr5mydf288zvwj4svrymfpadcg3pi6w80km2yg5bm3c";
   };