* Fix some URLs.

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

7 files changed, 15 insertions, 44 deletions

diff --git a/pkgs/development/interpreters/python/python-2.5b1.nix b/pkgs/development/interpreters/python/python-2.5b1.nix
deleted file mode 100644
index 0f2851831de..00000000000
--- a/pkgs/development/interpreters/python/python-2.5b1.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{stdenv, fetchurl, zlib ? null, zlibSupport ? true}:
-
-assert zlibSupport -> zlib != null;
-
-stdenv.mkDerivation {
-  name = "python-2.5b1";
-  src = fetchurl {
-    url = http://www.python.org/ftp/python/2.5/Python-2.5b1.tgz;
-    md5 = "957c8d24d2ba8d4ba028c7f348ac5c86";
-  };
-  buildInputs = [
-    (if zlibSupport then zlib else null)
-  ];
-  inherit zlibSupport;
-  configureFlags = "--enable-shared";
-}
diff --git a/pkgs/development/interpreters/spidermonkey/default.nix b/pkgs/development/interpreters/spidermonkey/default.nix
index 769d384c998..a8484cb7c7f 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.uni-erlangen.de/pub/mozilla.org/js/js-1.5.tar.gz;
+    url = http://ftp.mozilla.org/pub/mozilla.org/js/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 b34227a4d2f..ed1994efaa4 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/gtk/v2.12/glib-2.12.1.tar.bz2;
+    url = ftp://ftp.gtk.org/pub/glib/2.12/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 182c735accf..c997157f33c 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 = ftp://ftp.kde.org/pub/kde/stable/latest/src/arts-1.5.4.tar.bz2;
+    url = http://ftp.tiscali.nl/kde/stable/3.5.4/src/arts-1.5.4.tar.bz2;
     md5 = "886ba4a13dc0da312d94c09f50c3ffe6";
   };
 
diff --git a/pkgs/os-specific/linux/syslinux/default.nix b/pkgs/os-specific/linux/syslinux/default.nix
index da47807c666..61de3b46519 100644
--- a/pkgs/os-specific/linux/syslinux/default.nix
+++ b/pkgs/os-specific/linux/syslinux/default.nix
@@ -1 +1,12 @@
-import ./syslinux-3.20.nix
+{stdenv, fetchurl, nasm, perl}:
+
+stdenv.mkDerivation {
+  name = "syslinux-3.20";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://nix.cs.uu.nl/dist/tarballs/syslinux-3.20.tar.bz2;
+    md5 = "0701e0de1de6d31bdd889384b041e5b7";
+  };
+ buildInputs = [nasm perl];
+ patches = [./syslinux-3.20-installpath.patch];
+}
diff --git a/pkgs/os-specific/linux/syslinux/syslinux-3.11.nix b/pkgs/os-specific/linux/syslinux/syslinux-3.11.nix
deleted file mode 100644
index e93d77b8d0f..00000000000
--- a/pkgs/os-specific/linux/syslinux/syslinux-3.11.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{stdenv, fetchurl, nasm, perl}:
-
-stdenv.mkDerivation {
-  name = "syslinux-3.11";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://www.kernel.org/pub/linux/utils/boot/syslinux/syslinux-3.11.tar.bz2;
-    md5 = "513ff71287a4397d507879a1a836c2e8";
-  };
- buildInputs = [nasm perl];
- patches = [./syslinux-installpath.patch];
-}
diff --git a/pkgs/os-specific/linux/syslinux/syslinux-3.20.nix b/pkgs/os-specific/linux/syslinux/syslinux-3.20.nix
deleted file mode 100644
index 61de3b46519..00000000000
--- a/pkgs/os-specific/linux/syslinux/syslinux-3.20.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{stdenv, fetchurl, nasm, perl}:
-
-stdenv.mkDerivation {
-  name = "syslinux-3.20";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/syslinux-3.20.tar.bz2;
-    md5 = "0701e0de1de6d31bdd889384b041e5b7";
-  };
- buildInputs = [nasm perl];
- patches = [./syslinux-3.20-installpath.patch];
-}