* Merge r2396.

svn path=/nixpkgs/trunk/; revision=2397

3 files changed, 3 insertions, 3 deletions

diff --git a/pkgs/tools/graphics/exif/default.nix b/pkgs/tools/graphics/exif/default.nix
index 8d682e811193b..71d2acff48f0d 100644
--- a/pkgs/tools/graphics/exif/default.nix
+++ b/pkgs/tools/graphics/exif/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "exif-0.6.9";
 
   src = fetchurl {
-    url = http://heanet.dl.sourceforge.net/sourceforge/libexif/exif-0.6.9.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/exif-0.6.9.tar.gz;
     md5 = "555029098386fa677c461eb249d852d7";
   };
 
diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix
index 79ce2d0bdfd8e..96052721365ae 100644
--- a/pkgs/tools/graphics/graphviz/default.nix
+++ b/pkgs/tools/graphics/graphviz/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-2.2.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/graphviz-2.2.tar.gz;
     md5 = "9275d30695a5c22f360acbef7b85acd3";
   };
 
diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix
index f7ada98ab491e..a4e7db590b30e 100644
--- a/pkgs/tools/misc/file/default.nix
+++ b/pkgs/tools/misc/file/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "file-4.13";
   src = fetchurl {
-    url = ftp://ftp.astron.com/pub/file/file-4.13.tar.gz;
+    url = http://catamaran.labs.cs.uu.nl/dist/tarballs/file-4.13.tar.gz;
     md5 = "2bfc0f878ee22e50441b68df2ccbb984";
   };
 }