From 23f2a18677a897505592ae5a46fa2dbfcb4663d6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 21 Sep 2007 13:07:25 +0000
Subject: [PATCH] * KDE 3.5.7. * Mirror scheme "mirror://kde/".

svn path=/nixpkgs/trunk/; revision=9353
---
 pkgs/build-support/fetchurl/mirrors.nix    |  8 ++++++++
 pkgs/desktops/kde-4/kdebase/default.nix    |  2 +-
 pkgs/desktops/kde-4/kdelibs/default.nix    |  2 +-
 pkgs/desktops/kde-4/kdepim/default.nix     |  2 +-
 pkgs/desktops/kde-4/kdepimlibs/default.nix |  2 +-
 pkgs/desktops/kde/kdebase/default.nix      |  8 +++++---
 pkgs/desktops/kde/kdelibs/default.nix      | 12 +++++++-----
 pkgs/top-level/all-packages.nix            |  2 +-
 8 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index 3ffbf706eb2d..4f126222a705 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -32,4 +32,12 @@
     http://www.eu.kernel.org/pub/
     http://www.de.kernel.org/pub/
   ];
+
+  # Mirrors of ftp://ftp.kde.org/pub/kde/.
+  kde = [
+    http://ftp.scarlet.be/pub/kde/
+    http://ftp.gwdg.de/pub/x11/kde/
+    ftp://ftp.heanet.ie/mirrors/ftp.kde.org/
+    ftp://ftp.kde.org/pub/kde/
+  ];
 }
diff --git a/pkgs/desktops/kde-4/kdebase/default.nix b/pkgs/desktops/kde-4/kdebase/default.nix
index 94fdc2c1691b..ebc0ba3cab34 100644
--- a/pkgs/desktops/kde-4/kdebase/default.nix
+++ b/pkgs/desktops/kde-4/kdebase/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
   
   src = fetchurl {
-    url = http://ftp.scarlet.be/pub/kde/unstable/3.92/src/kdebase-3.92.0.tar.bz2;
+    url = mirror://kde/unstable/3.92/src/kdebase-3.92.0.tar.bz2;
     sha256 = "1xh5a93l6anmix358fll4xfqm5fl4hpm1ksmlab8hr8s7vqng707";
   };
 
diff --git a/pkgs/desktops/kde-4/kdelibs/default.nix b/pkgs/desktops/kde-4/kdelibs/default.nix
index 247ad855f20f..9d59da000880 100644
--- a/pkgs/desktops/kde-4/kdelibs/default.nix
+++ b/pkgs/desktops/kde-4/kdelibs/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
   name = "kdelibs-4.0beta1";
   
   src = fetchurl {
-    url = http://ftp.scarlet.be/pub/kde/unstable/3.92/src/kdelibs-3.92.0.tar.bz2;
+    url = mirror://kde/unstable/3.92/src/kdelibs-3.92.0.tar.bz2;
     sha256 = "19jd9nx5g0ayxavj3ys52wx5ppxw9yr9jylxk7qplxsm525ryf1p";
   };
 
diff --git a/pkgs/desktops/kde-4/kdepim/default.nix b/pkgs/desktops/kde-4/kdepim/default.nix
index f03f3a105c83..dd1e706bf743 100644
--- a/pkgs/desktops/kde-4/kdepim/default.nix
+++ b/pkgs/desktops/kde-4/kdepim/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
   
   src = fetchurl {
-    url = http://ftp.scarlet.be/pub/kde/unstable/3.92/src/kdepim-3.92.0.tar.bz2;
+    url = mirror://kde/unstable/3.92/src/kdepim-3.92.0.tar.bz2;
     sha256 = "1wlq1h7j07f24n1mjnv9wbfsxn2vn24qfn5dgn4j4fsl84qha16i";
   };
 
diff --git a/pkgs/desktops/kde-4/kdepimlibs/default.nix b/pkgs/desktops/kde-4/kdepimlibs/default.nix
index 63721073ab41..44c6728b5e3a 100644
--- a/pkgs/desktops/kde-4/kdepimlibs/default.nix
+++ b/pkgs/desktops/kde-4/kdepimlibs/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
   name = "kdepimlibs-4.0beta1";
   
   src = fetchurl {
-    url = http://ftp.scarlet.be/pub/kde/unstable/3.92/src/kdepimlibs-3.92.0.tar.bz2;
+    url = mirror://kde/unstable/3.92/src/kdepimlibs-3.92.0.tar.bz2;
     sha256 = "0q7zzj8n282xaxvdij74fb17w5c1vja7izxfrkcbq7arn9f40wbx";
   };
 
diff --git a/pkgs/desktops/kde/kdebase/default.nix b/pkgs/desktops/kde/kdebase/default.nix
index 95e2ea743fb7..77dc9889995a 100644
--- a/pkgs/desktops/kde/kdebase/default.nix
+++ b/pkgs/desktops/kde/kdebase/default.nix
@@ -2,12 +2,14 @@
 , qt, kdelibs, openssl, bzip2, fontconfig
 }:
 
+let version = "3.5.7"; in
+
 stdenv.mkDerivation {
-  name = "kdebase-3.5.6";
+  name = "kdebase-3.5.7";
   
   src = fetchurl {
-    url = http://ftp.scarlet.be/pub/kde/stable/3.5.6/src/kdebase-3.5.6.tar.bz2;
-    sha256 = "0zmxnw4p8bkd2b867cwdzdnp36ikwnz0ffrbx6d3ylz1nbw3anr4";
+    url = "mirror://kde/stable/${version}/src/kdebase-${version}.tar.bz2";
+    md5 = "b421e01b3ee712549ee967f58ed24de0";
   };
 
   buildInputs = [
diff --git a/pkgs/desktops/kde/kdelibs/default.nix b/pkgs/desktops/kde/kdelibs/default.nix
index 7633f8e1346c..9eb6625d45aa 100644
--- a/pkgs/desktops/kde/kdelibs/default.nix
+++ b/pkgs/desktops/kde/kdelibs/default.nix
@@ -1,14 +1,16 @@
 { stdenv, fetchurl, libX11, libXt, libXext, zlib, perl, qt, openssl, pcre
 , pkgconfig, libjpeg, libpng, libtiff, libxml2, libxslt, libtool, expat
-, freetype, bzip2
+, freetype, bzip2, cups
 }:
 
+let version = "3.5.7"; in
+
 stdenv.mkDerivation {
-  name = "kdelibs-3.5.6";
+  name = "kdelibs-${version}";
   
   src = fetchurl {
-    url = http://ftp.scarlet.be/pub/kde/stable/3.5.6/src/kdelibs-3.5.6.tar.bz2;
-    sha256 = "0p0v4gr61qlvnpg9937chrjh3s7xi3nn7wvrg1xjf8dfqq164xh6";
+    url = "mirror://kde/stable/${version}/src/kdelibs-${version}.tar.bz2";
+    md5 = "50ed644f2ec91963570fe2b155652957";
   };
 
   passthru = {inherit openssl libX11 libjpeg qt;};
@@ -16,7 +18,7 @@ stdenv.mkDerivation {
   buildInputs = [
     libX11 libXt libXext zlib perl qt openssl pcre 
     pkgconfig libjpeg libpng libtiff libxml2 libxslt expat
-    libtool freetype bzip2
+    libtool freetype bzip2 cups
   ];
 
   configureFlags = "
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5b93f83d1b28..ac91de4d7650 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3825,7 +3825,7 @@ rec {
     inherit
       fetchurl stdenv zlib perl openssl pcre pkgconfig
       libjpeg libpng libtiff libxml2 libxslt libtool
-      expat freetype bzip2;
+      expat freetype bzip2 cups;
     inherit (xlibs) libX11 libXt libXext;
     qt = qt3;
   };