From 7775caaa35ae2354eae078b1c3695d21a11c880c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 11 Apr 2005 13:09:01 +0000
Subject: [PATCH] * Evacuate tarballs.

svn path=/nixpkgs/trunk/; revision=2527
---
 maintainers/scripts/evacuate-urls.sh                            | 2 +-
 pkgs/applications/graphics/gqview/default.nix                   | 2 +-
 pkgs/applications/networking/browsers/firefox/default.nix       | 2 +-
 .../version-management/subversion-1.1.x/default.nix             | 2 +-
 pkgs/data/sgml+xml/stylesheets/xslt/docbook/default.nix         | 2 +-
 pkgs/development/interpreters/octave/default.nix                | 2 +-
 pkgs/development/libraries/gtk-libs-2.6/glib/default.nix        | 2 +-
 pkgs/development/libraries/gtk-libs-2.6/gtk+/default.nix        | 2 +-
 pkgs/development/libraries/libtiff/default.nix                  | 2 +-
 pkgs/development/libraries/openssl/default.nix                  | 2 +-
 pkgs/development/libraries/zlib/default.nix                     | 2 +-
 pkgs/development/tools/misc/valgrind/default.nix                | 2 +-
 pkgs/tools/archivers/unzip/default.nix                          | 2 +-
 pkgs/tools/security/gnupg/default.nix                           | 2 +-
 pkgs/tools/video/mjpegtools/default.nix                         | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/maintainers/scripts/evacuate-urls.sh b/maintainers/scripts/evacuate-urls.sh
index c830a7531758..11dcd9227912 100755
--- a/maintainers/scripts/evacuate-urls.sh
+++ b/maintainers/scripts/evacuate-urls.sh
@@ -6,7 +6,7 @@ find . -name "*.nix" | while read fn; do
 
         if oldURL=$(echo "$line" | sed 's^url = \(.*\);^\1^'); then
 
-            if ! echo "$oldURL" | grep -q -E ".cs.uu.nl|.stratego-language.org|java.sun.com|ut2004|linuxq3a|RealPlayer"; then
+            if ! echo "$oldURL" | grep -q -E ".cs.uu.nl|.stratego-language.org|java.sun.com|ut2004|linuxq3a|RealPlayer|Adbe"; then
                 base=$(basename $oldURL)
                 newURL="http://catamaran.labs.cs.uu.nl/dist/tarballs/$base"
                 newPath="/mnt/scratchy/eelco/public_html/tarballs/$base"
diff --git a/pkgs/applications/graphics/gqview/default.nix b/pkgs/applications/graphics/gqview/default.nix
index 393620229808..8a83164ee5cf 100644
--- a/pkgs/applications/graphics/gqview/default.nix
+++ b/pkgs/applications/graphics/gqview/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   name = "gqview-2.0.0";
 
   src = fetchurl {
-    url = http://heanet.dl.sourceforge.net/sourceforge/gqview/gqview-2.0.0.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gqview-2.0.0.tar.gz;
     md5 = "421c9a79827e91e394bdfc924071d66f";
   };
 
diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index 418940ed0448..08bb46a20fbd 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -7,7 +7,7 @@
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/1.0.2/source/firefox-1.0.2-source.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/firefox-1.0.2-source.tar.bz2;
     md5 = "fd1a0dec3e763e93eb45c0c34b399712";
   };
 
diff --git a/pkgs/applications/version-management/subversion-1.1.x/default.nix b/pkgs/applications/version-management/subversion-1.1.x/default.nix
index 64ce24b792fd..7c9143e6d966 100644
--- a/pkgs/applications/version-management/subversion-1.1.x/default.nix
+++ b/pkgs/applications/version-management/subversion-1.1.x/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://subversion.tigris.org/tarballs/subversion-1.1.4.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/subversion-1.1.4.tar.bz2;
     md5 = "6e557ae65b6b8d7577cc7704ede85a23";
   };
 
diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook/default.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook/default.nix
index 92e44b57b433..8b3ca0834158 100644
--- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook/default.nix
+++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "docbook-xsl-1.68.1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://heanet.dl.sourceforge.net/sourceforge/docbook/docbook-xsl-1.68.1.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/docbook-xsl-1.68.1.tar.bz2;
     md5 = "f4985efbc0f3411af8106928f8752fc5";
   };
 }
diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index 4763ddb445d4..26c4fe5c36bd 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -6,7 +6,7 @@ assert g77.langF77;
 stdenv.mkDerivation {
   name = "octave-2.9.0";
   src = fetchurl {
-    url = ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-2.9.0.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/octave-2.9.0.tar.bz2;
     md5 = "687a09033bc68f09810e947010bc8f29";
   };
   buildInputs = [g77 readline ncurses perl flex];
diff --git a/pkgs/development/libraries/gtk-libs-2.6/glib/default.nix b/pkgs/development/libraries/gtk-libs-2.6/glib/default.nix
index 49411a6edb6a..ad31f1625ac0 100644
--- a/pkgs/development/libraries/gtk-libs-2.6/glib/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.6/glib/default.nix
@@ -5,7 +5,7 @@ assert pkgconfig != null && gettext != null && perl != null;
 stdenv.mkDerivation {
   name = "glib-2.6.4";
   src = fetchurl {
-    url = ftp://ftp.gtk.org/pub/gtk/v2.6/glib-2.6.4.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/glib-2.6.4.tar.bz2;
     md5 = "af7eeb8aae764ff763418471ed6eb93d";
   };
   buildInputs = [pkgconfig gettext perl];
diff --git a/pkgs/development/libraries/gtk-libs-2.6/gtk+/default.nix b/pkgs/development/libraries/gtk-libs-2.6/gtk+/default.nix
index dfd02546e728..cc19acf4cef4 100644
--- a/pkgs/development/libraries/gtk-libs-2.6/gtk+/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.6/gtk+/default.nix
@@ -12,7 +12,7 @@ assert x11.buildClientLibs;
 stdenv.mkDerivation {
   name = "gtk+-2.6.6";
   src = fetchurl {
-    url = http://ftp.gnome.org/pub/GNOME/sources/gtk+/2.6/gtk+-2.6.6.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gtk+-2.6.6.tar.bz2;
     md5 = "6bf5a71a7ea6a02821fd0c9edab25904";
   };
   buildInputs = [pkgconfig perl libtiff libjpeg libpng];
diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix
index a6219619a264..e3248344adb3 100644
--- a/pkgs/development/libraries/libtiff/default.nix
+++ b/pkgs/development/libraries/libtiff/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   name = "libtiff-3.7.2";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.remotesensing.org/pub/libtiff/tiff-3.7.2.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/tiff-3.7.2.tar.gz;
     md5 = "9d7123bd0dbde2a3853fb758346adb78";
   };
   propagatedBuildInputs = [zlib libjpeg];
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 61dbfa90d75b..4e8b7129d52f 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -2,7 +2,7 @@
   name = "openssl-0.9.7f";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.openssl.org/source/openssl-0.9.7f.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/openssl-0.9.7f.tar.gz;
     md5 = "b2d37d7eb8a5a5040d834105d5ae1a50";
   };
   inherit perl;
diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix
index 879deb88d563..9d6a1e4c4268 100644
--- a/pkgs/development/libraries/zlib/default.nix
+++ b/pkgs/development/libraries/zlib/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "zlib-1.2.2";
   src = fetchurl {
-    url = http://www.gzip.org/zlib/zlib-1.2.2.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/zlib-1.2.2.tar.gz;
     md5 = "68bd51aaa6558c3bc3fd4890e53413de";
   };
   configureFlags = "--shared";
diff --git a/pkgs/development/tools/misc/valgrind/default.nix b/pkgs/development/tools/misc/valgrind/default.nix
index 6163426d777c..9c85197591e8 100644
--- a/pkgs/development/tools/misc/valgrind/default.nix
+++ b/pkgs/development/tools/misc/valgrind/default.nix
@@ -8,7 +8,7 @@
 stdenv.mkDerivation {
   name = "valgrind-2.4.0";
   src = fetchurl {
-    url = http://valgrind.org/downloads/valgrind-2.4.0.tar.bz2;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/valgrind-2.4.0.tar.bz2;
     md5 = "1d0bd81d368789946d32d18a468ea0cf";
   };
   buildInputs = [perl];
diff --git a/pkgs/tools/archivers/unzip/default.nix b/pkgs/tools/archivers/unzip/default.nix
index b7114e190bf0..eda3900e39e9 100644
--- a/pkgs/tools/archivers/unzip/default.nix
+++ b/pkgs/tools/archivers/unzip/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "unzip-5.52";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://ftp.info-zip.org/pub/infozip/src/unzip552.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/unzip552.tar.gz;
     md5 = "9d23919999d6eac9217d1f41472034a9";
   };
 }
diff --git a/pkgs/tools/security/gnupg/default.nix b/pkgs/tools/security/gnupg/default.nix
index dd567a48cb4e..4e456a8e7ada 100644
--- a/pkgs/tools/security/gnupg/default.nix
+++ b/pkgs/tools/security/gnupg/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "gnupg-1.4.0";
   builder = ./builder.sh;
   src = fetchurl {
-    url = ftp://ftp.nluug.nl/pub/os/Linux/distr/debian/pool/main/g/gnupg/gnupg_1.4.0.orig.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/gnupg_1.4.0.orig.tar.gz;
     md5 = "74e407a8dcb09866555f79ae797555da";
   };
 }
diff --git a/pkgs/tools/video/mjpegtools/default.nix b/pkgs/tools/video/mjpegtools/default.nix
index 2cbadfcfe86c..ab79086b9839 100644
--- a/pkgs/tools/video/mjpegtools/default.nix
+++ b/pkgs/tools/video/mjpegtools/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "mjpegtools-1.6.2";
   src = fetchurl {
-    url = http://mesh.dl.sourceforge.net/sourceforge/mjpeg/mjpegtools-1.6.2.tar.gz ;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/mjpegtools-1.6.2.tar.gz;
     md5 = "01c0120b0182de67f182ef99ad855daa" ;
   };
   buildInputs = [libjpeg libX11];