From 8e08738756f51d095950f177e5d6c4df41ed72c1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 12 Oct 2006 15:58:51 +0000
Subject: [PATCH] * More URLs.

svn path=/nixpkgs/trunk/; revision=6718
---
 .../editors/eclipse/eclipse-sdk-3.1.1.nix      | 18 ------------------
 .../editors/eclipse/eclipse-sdk-3.1.2.nix      |  2 +-
 .../interpreters/spidermonkey/default.nix      |  2 +-
 .../libraries/gtk-libs-2.10/glib/default.nix   |  2 +-
 .../development/libraries/kde/arts/default.nix |  2 +-
 pkgs/tools/security/gnupg/default.nix          |  2 +-
 6 files changed, 5 insertions(+), 23 deletions(-)
 delete mode 100644 pkgs/applications/editors/eclipse/eclipse-sdk-3.1.1.nix

diff --git a/pkgs/applications/editors/eclipse/eclipse-sdk-3.1.1.nix b/pkgs/applications/editors/eclipse/eclipse-sdk-3.1.1.nix
deleted file mode 100644
index 4fdc8f394e59..000000000000
--- a/pkgs/applications/editors/eclipse/eclipse-sdk-3.1.1.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{fetchurl, stdenv, makeWrapper, jdk, gtk, glib, libXtst, plugins ? []}:
-
-let {
-  body =
-    stdenv.mkDerivation {
-      name = "eclipse-sdk-3.1.1";
-      builder = ./builder.sh;
-      src = bindist;
-      inherit makeWrapper jdk plugins;
-      libraries = [gtk glib libXtst];
-   };
-
-  bindist = 
-    fetchurl {
-      url = http://nix.cs.uu.nl/dist/tarballs/eclipse-SDK-3.1.1-linux-gtk.tar.gz;
-      md5 = "a2ae61431657e2ed247867b9a9948290";
-    };
-}
diff --git a/pkgs/applications/editors/eclipse/eclipse-sdk-3.1.2.nix b/pkgs/applications/editors/eclipse/eclipse-sdk-3.1.2.nix
index fdd25c08b729..e9e336a81995 100644
--- a/pkgs/applications/editors/eclipse/eclipse-sdk-3.1.2.nix
+++ b/pkgs/applications/editors/eclipse/eclipse-sdk-3.1.2.nix
@@ -12,7 +12,7 @@ let {
 
   bindist = 
     fetchurl {
-      url = http://sunsite.informatik.rwth-aachen.de/eclipse/downloads/drops/R-3.1.2-200601181600/eclipse-SDK-3.1.2-linux-gtk.tar.gz;
+      url = http://archive.eclipse.org/eclipse/downloads/drops/R-3.1.2-200601181600/eclipse-SDK-3.1.2-linux-gtk.tar.gz;
       md5 = "ece50ed4d6d48dac839bfe8fa719fcff";
     };
 }
diff --git a/pkgs/development/interpreters/spidermonkey/default.nix b/pkgs/development/interpreters/spidermonkey/default.nix
index a8484cb7c7fa..4053599cc3b9 100644
--- a/pkgs/development/interpreters/spidermonkey/default.nix
+++ b/pkgs/development/interpreters/spidermonkey/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "spidermonkey-1.5";
   src = fetchurl {
-    url = http://ftp.mozilla.org/pub/mozilla.org/js/js-1.5.tar.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/js-1.5.tar.gz;
     md5 = "863bb6462f4ce535399a7c6276ae6776";
   };
 
diff --git a/pkgs/development/libraries/gtk-libs-2.10/glib/default.nix b/pkgs/development/libraries/gtk-libs-2.10/glib/default.nix
index ed1994efaa45..98a175b8cee2 100644
--- a/pkgs/development/libraries/gtk-libs-2.10/glib/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.10/glib/default.nix
@@ -5,7 +5,7 @@ assert pkgconfig != null && gettext != null && perl != null;
 stdenv.mkDerivation {
   name = "glib-2.12.1"; # <- sic! gtk 2.10 needs glib 2.12
   src = fetchurl {
-    url = ftp://ftp.gtk.org/pub/glib/2.12/glib-2.12.1.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/glib-2.12.1.tar.bz2;
     md5 = "97786d2a03f0f190bd782749139dc10c";
   };
   buildInputs = [pkgconfig gettext perl];
diff --git a/pkgs/development/libraries/kde/arts/default.nix b/pkgs/development/libraries/kde/arts/default.nix
index c997157f33cc..4fdd914ccffa 100644
--- a/pkgs/development/libraries/kde/arts/default.nix
+++ b/pkgs/development/libraries/kde/arts/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
     --x-libraries=${libX11}/lib";
 
   src = fetchurl {
-    url = http://ftp.tiscali.nl/kde/stable/3.5.4/src/arts-1.5.4.tar.bz2;
+    url = http://nix.cs.uu.nl/dist/tarballs/arts-1.5.4.tar.bz2;
     md5 = "886ba4a13dc0da312d94c09f50c3ffe6";
   };
 
diff --git a/pkgs/tools/security/gnupg/default.nix b/pkgs/tools/security/gnupg/default.nix
index f839db368a32..a7147c68e1fd 100644
--- a/pkgs/tools/security/gnupg/default.nix
+++ b/pkgs/tools/security/gnupg/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   };
   buildInputs = [readline];
   idea = if ideaSupport then fetchurl {
-    url = ftp://ftp.gnupg.dk/pub/contrib-dk/idea.c.gz;
+    url = http://nix.cs.uu.nl/dist/tarballs/idea.c.gz;
     md5 = "9dc3bc086824a8c7a331f35e09a3e57f";
   } else null;
 }