From 5e8908c481fa0a4e87de703d89fab6cdde4b72ae Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Thu, 5 Mar 2009 11:09:47 +0000 Subject: [PATCH] Upgrade to KDE 4.2.1 svn path=/nixpkgs/trunk/; revision=14340 --- pkgs/desktops/kde-4.2/admin/default.nix | 6 +++--- pkgs/desktops/kde-4.2/artwork/default.nix | 6 +++--- pkgs/desktops/kde-4.2/base-runtime/default.nix | 6 +++--- pkgs/desktops/kde-4.2/base-workspace/default.nix | 6 +++--- pkgs/desktops/kde-4.2/base/default.nix | 6 +++--- pkgs/desktops/kde-4.2/bindings/default.nix | 6 +++--- pkgs/desktops/kde-4.2/edu/default.nix | 6 +++--- pkgs/desktops/kde-4.2/games/default.nix | 6 +++--- pkgs/desktops/kde-4.2/graphics/default.nix | 6 +++--- pkgs/desktops/kde-4.2/libs/default.nix | 6 +++--- pkgs/desktops/kde-4.2/multimedia/default.nix | 6 +++--- pkgs/desktops/kde-4.2/network/default.nix | 6 +++--- pkgs/desktops/kde-4.2/pim/default.nix | 6 +++--- pkgs/desktops/kde-4.2/pimlibs/default.nix | 6 +++--- pkgs/desktops/kde-4.2/plasma-addons/default.nix | 6 +++--- pkgs/desktops/kde-4.2/sdk/default.nix | 6 +++--- pkgs/desktops/kde-4.2/support/phonon/default.nix | 6 +++--- pkgs/desktops/kde-4.2/support/soprano/default.nix | 6 +++--- pkgs/desktops/kde-4.2/toys/default.nix | 6 +++--- pkgs/desktops/kde-4.2/utils/default.nix | 6 +++--- pkgs/desktops/kde-4.2/webdev/default.nix | 6 +++--- 21 files changed, 63 insertions(+), 63 deletions(-) diff --git a/pkgs/desktops/kde-4.2/admin/default.nix b/pkgs/desktops/kde-4.2/admin/default.nix index 8107ea547437..cddaa97f5287 100644 --- a/pkgs/desktops/kde-4.2/admin/default.nix +++ b/pkgs/desktops/kde-4.2/admin/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, cmake, qt4, pkgconfig, perl, kdelibs, kdepimlibs, automoc4, phonon}: stdenv.mkDerivation { - name = "kdeadmin-4.2.0"; + name = "kdeadmin-4.2.1"; src = fetchurl { - url = mirror://kde/stable/4.2.0/src/kdeadmin-4.2.0.tar.bz2; - md5 = "2c5b33477b5679bcd9fdbc1f8017e6fb"; + url = mirror://kde/stable/4.2.1/src/kdeadmin-4.2.1.tar.bz2; + sha1 = "888203103fe86010461b1e38d51ba9a20f3250e8"; }; CMAKE_PREFIX_PATH=kdepimlibs; buildInputs = [ cmake qt4 pkgconfig perl kdelibs kdepimlibs automoc4 phonon ]; diff --git a/pkgs/desktops/kde-4.2/artwork/default.nix b/pkgs/desktops/kde-4.2/artwork/default.nix index 3c868bac59ab..e1cc3f4b441d 100644 --- a/pkgs/desktops/kde-4.2/artwork/default.nix +++ b/pkgs/desktops/kde-4.2/artwork/default.nix @@ -2,10 +2,10 @@ kdelibs, kdebase_workspace, automoc4, phonon, strigi, eigen}: stdenv.mkDerivation { - name = "kdeartwork-4.2.0"; + name = "kdeartwork-4.2.1"; src = fetchurl { - url = mirror://kde/stable/4.2.0/src/kdeartwork-4.2.0.tar.bz2; - md5 = "d81623b60c7deb314bc2e28a52254ac2"; + url = mirror://kde/stable/4.2.1/src/kdeartwork-4.2.1.tar.bz2; + sha1 = "02bd99ca5cf303bdeb991b3e85b45dfc4e69e0bc"; }; buildInputs = [ cmake qt4 perl xscreensaver kdelibs kdebase_workspace automoc4 phonon strigi eigen ]; diff --git a/pkgs/desktops/kde-4.2/base-runtime/default.nix b/pkgs/desktops/kde-4.2/base-runtime/default.nix index 690f03e8a209..5728b206c92a 100644 --- a/pkgs/desktops/kde-4.2/base-runtime/default.nix +++ b/pkgs/desktops/kde-4.2/base-runtime/default.nix @@ -2,10 +2,10 @@ automoc4, phonon, strigi, soprano, cluceneCore}: stdenv.mkDerivation { - name = "kdebase-runtime-4.2.0"; + name = "kdebase-runtime-4.2.1"; src = fetchurl { - url = mirror://kde/stable/4.2.0/src/kdebase-runtime-4.2.0.tar.bz2; - md5 = "8ef48aae16a6dddb3055d81d7e5c375f"; + url = mirror://kde/stable/4.2.1/src/kdebase-runtime-4.2.1.tar.bz2; + sha1 = "e80d1882d36e4c9737e80fcb5080bc683403ddb5"; }; /* CLUCENE_HOME=cluceneCore;*/ buildInputs = [ cmake perl bzip2 qt4 alsaLib xineLib samba stdenv.gcc.libc kdelibs diff --git a/pkgs/desktops/kde-4.2/base-workspace/default.nix b/pkgs/desktops/kde-4.2/base-workspace/default.nix index 84af85054171..0ed7e90f2087 100644 --- a/pkgs/desktops/kde-4.2/base-workspace/default.nix +++ b/pkgs/desktops/kde-4.2/base-workspace/default.nix @@ -5,10 +5,10 @@ automoc4, phonon, strigi, soprano, qimageblitz}: stdenv.mkDerivation { - name = "kdebase-workspace-4.2.0"; + name = "kdebase-workspace-4.2.1"; src = fetchurl { - url = mirror://kde/stable/4.2.0/src/kdebase-workspace-4.2.0.tar.bz2; - md5 = "193e30b9ed0b55b0196289d9df43a904"; + url = mirror://kde/stable/4.2.1/src/kdebase-workspace-4.2.1.tar.bz2; + sha1 = "412b8a6778d5c71a366c054b0136edae309bbef0"; }; CMAKE_PREFIX_PATH=kdepimlibs; buildInputs = [ cmake perl python qt4 kdelibs kdepimlibs pthread_stubs boost libusb stdenv.gcc.libc diff --git a/pkgs/desktops/kde-4.2/base/default.nix b/pkgs/desktops/kde-4.2/base/default.nix index 992f1d22dd63..1a6124f29c9a 100644 --- a/pkgs/desktops/kde-4.2/base/default.nix +++ b/pkgs/desktops/kde-4.2/base/default.nix @@ -2,10 +2,10 @@ automoc4, phonon, strigi, qimageblitz, soprano}: stdenv.mkDerivation { - name = "kdebase-4.2.0"; + name = "kdebase-4.2.1"; src = fetchurl { - url = mirror://kde/stable/4.2.0/src/kdebase-4.2.0.tar.bz2; - md5 = "da86a8ad624e86eda3a7509f39272060"; + url = mirror://kde/stable/4.2.1/src/kdebase-4.2.1.tar.bz2; + sha1 = "c500024294a7621d176d26bdabdd138d18ec827d"; }; buildInputs = [ cmake perl qt4 kdelibs pciutils libraw1394 automoc4 phonon strigi qimageblitz soprano ]; diff --git a/pkgs/desktops/kde-4.2/bindings/default.nix b/pkgs/desktops/kde-4.2/bindings/default.nix index 05cc1da653d2..0109a6c5ce1a 100644 --- a/pkgs/desktops/kde-4.2/bindings/default.nix +++ b/pkgs/desktops/kde-4.2/bindings/default.nix @@ -2,10 +2,10 @@ kdelibs, kdepimlibs, automoc4, phonon}: stdenv.mkDerivation { - name = "kdebindings-4.2.0"; + name = "kdebindings-4.2.1"; src = fetchurl { - url = mirror://kde/stable/4.2.0/src/kdebindings-4.2.0.tar.bz2; - md5 = "6eae8fd968da83fe65e592993e416adc"; + url = mirror://kde/stable/4.2.1/src/kdebindings-4.2.1.tar.bz2; + sha1 = "96353bb3269a7ca37ff31487a0fb7a9c25958963"; }; builder = ./builder.sh; CMAKE_PREFIX_PATH=kdepimlibs; diff --git a/pkgs/desktops/kde-4.2/edu/default.nix b/pkgs/desktops/kde-4.2/edu/default.nix index ea60ef0b4cba..bb5c8566d6e8 100644 --- a/pkgs/desktops/kde-4.2/edu/default.nix +++ b/pkgs/desktops/kde-4.2/edu/default.nix @@ -3,10 +3,10 @@ kdelibs, automoc4, phonon}: stdenv.mkDerivation { - name = "kdeedu-4.2.0"; + name = "kdeedu-4.2.1"; src = fetchurl { - url = mirror://kde/stable/4.2.0/src/kdeedu-4.2.0.tar.bz2; - md5 = "aaddbdab29e1d284ad8ee67a78b4c597"; + url = mirror://kde/stable/4.2.1/src/kdeedu-4.2.1.tar.bz2; + sha1 = "f2381f33f6586b950e925423d135b9e66b7bf428"; }; buildInputs = [ cmake qt4 perl libxml2 libxslt openbabel boost readline gmm gsl facile kdelibs automoc4 phonon ]; diff --git a/pkgs/desktops/kde-4.2/games/default.nix b/pkgs/desktops/kde-4.2/games/default.nix index 83188248b001..cc099d9cb704 100644 --- a/pkgs/desktops/kde-4.2/games/default.nix +++ b/pkgs/desktops/kde-4.2/games/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, cmake, qt4, perl, kdelibs, automoc4, phonon, qca2}: stdenv.mkDerivation { - name = "kdegames-4.2.0"; + name = "kdegames-4.2.1"; src = fetchurl { - url = mirror://kde/stable/4.2.0/src/kdegames-4.2.0.tar.bz2; - md5 = "68cefd627025be99ba136e5a4e35e554"; + url = mirror://kde/stable/4.2.1/src/kdegames-4.2.1.tar.bz2; + sha1 = "dee8a0fece054bc3b6234fa088ca16b8f5f87795"; }; buildInputs = [ cmake qt4 perl kdelibs automoc4 phonon qca2 ]; } diff --git a/pkgs/desktops/kde-4.2/graphics/default.nix b/pkgs/desktops/kde-4.2/graphics/default.nix index d317594ff9cb..bb0a85f3e5c2 100644 --- a/pkgs/desktops/kde-4.2/graphics/default.nix +++ b/pkgs/desktops/kde-4.2/graphics/default.nix @@ -3,10 +3,10 @@ kdelibs, automoc4, phonon, strigi, qimageblitz, soprano, qca2}: stdenv.mkDerivation { - name = "kdegraphics-4.2.0"; + name = "kdegraphics-4.2.1"; src = fetchurl { - url = mirror://kde/stable/4.2.0/src/kdegraphics-4.2.0.tar.bz2; - md5 = "8beb6fe5d475d0b0245ea6d4cc7e9732"; + url = mirror://kde/stable/4.2.1/src/kdegraphics-4.2.1.tar.bz2; + sha1 = "5c21e016c75a79a9499aac26ea1240d6024e700e"; }; buildInputs = [ cmake perl qt4 exiv2 lcms saneBackends gphoto2 libspectre poppler chmlib stdenv.gcc.libc libXxf86vm diff --git a/pkgs/desktops/kde-4.2/libs/default.nix b/pkgs/desktops/kde-4.2/libs/default.nix index 912250ccfe75..881ca1b4f853 100644 --- a/pkgs/desktops/kde-4.2/libs/default.nix +++ b/pkgs/desktops/kde-4.2/libs/default.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation { - name = "kdelibs-4.2.0"; + name = "kdelibs-4.2.1"; src = fetchurl { - url = mirror://kde/stable/4.2.0/src/kdelibs-4.2.0.tar.bz2; - md5 = "2d830a922195fefe6e073111850247ac"; + url = mirror://kde/stable/4.2.1/src/kdelibs-4.2.1.tar.bz2; + sha1 = "d2214b9864b64e4a8382a9f593d082c801c58571"; }; buildInputs = [ diff --git a/pkgs/desktops/kde-4.2/multimedia/default.nix b/pkgs/desktops/kde-4.2/multimedia/default.nix index bcb5d0486d23..77f7164e82d9 100644 --- a/pkgs/desktops/kde-4.2/multimedia/default.nix +++ b/pkgs/desktops/kde-4.2/multimedia/default.nix @@ -2,10 +2,10 @@ kdelibs, automoc4, phonon}: stdenv.mkDerivation { - name = "kdemultimedia-4.2.0"; + name = "kdemultimedia-4.2.1"; src = fetchurl { - url = mirror://kde/stable/4.2.0/src/kdemultimedia-4.2.0.tar.bz2; - md5 = "3e944c87888ac1ac5b11d3722dd31f88"; + url = mirror://kde/stable/4.2.1/src/kdemultimedia-4.2.1.tar.bz2; + sha1 = "5382c963fae0ca6528c326b73234525e170a5c2e"; }; buildInputs = [ cmake perl qt4 alsaLib libvorbis xineLib flac taglib cdparanoia kdelibs automoc4 phonon ]; diff --git a/pkgs/desktops/kde-4.2/network/default.nix b/pkgs/desktops/kde-4.2/network/default.nix index 551a69d192af..4581869cce0e 100644 --- a/pkgs/desktops/kde-4.2/network/default.nix +++ b/pkgs/desktops/kde-4.2/network/default.nix @@ -4,10 +4,10 @@ kdelibs, kdepimlibs, automoc4, phonon, qca2, soprano, qimageblitz}: stdenv.mkDerivation { - name = "kdenetwork-4.2.0"; + name = "kdenetwork-4.2.1"; src = fetchurl { - url = mirror://kde/stable/4.2.0/src/kdenetwork-4.2.0.tar.bz2; - md5 = "0ea1628e11d398fdf45276a35edd3cae"; + url = mirror://kde/stable/4.2.1/src/kdenetwork-4.2.1.tar.bz2; + sha1 = "d6d730c167cd72d43904715014b2adc8f7d5bc1e"; }; CMAKE_PREFIX_PATH=kdepimlibs; buildInputs = [ cmake qt4 perl speex gmp libxml2 libxslt sqlite alsaLib libidn diff --git a/pkgs/desktops/kde-4.2/pim/default.nix b/pkgs/desktops/kde-4.2/pim/default.nix index b8cf74f8a884..8f36dac341b3 100644 --- a/pkgs/desktops/kde-4.2/pim/default.nix +++ b/pkgs/desktops/kde-4.2/pim/default.nix @@ -3,10 +3,10 @@ kdelibs, kdepimlibs, automoc4, phonon, akonadi, strigi, soprano, qca2}: stdenv.mkDerivation { - name = "kdepim-4.2.0"; + name = "kdepim-4.2.1"; src = fetchurl { - url = mirror://kde/stable/4.2.0/src/kdepim-4.2.0.tar.bz2; - md5 = "a80631de21930b2544c86722138aaa6c"; + url = mirror://kde/stable/4.2.1/src/kdepim-4.2.1.tar.bz2; + sha1 = "be97f4d34eb19b08c30988e07a75c24d5ccad08c"; }; CMAKE_PREFIX_PATH=kdepimlibs; builder = ./builder.sh; diff --git a/pkgs/desktops/kde-4.2/pimlibs/default.nix b/pkgs/desktops/kde-4.2/pimlibs/default.nix index 201977dcb452..134e01aa00e0 100644 --- a/pkgs/desktops/kde-4.2/pimlibs/default.nix +++ b/pkgs/desktops/kde-4.2/pimlibs/default.nix @@ -2,10 +2,10 @@ kdelibs, automoc4, phonon, akonadi}: stdenv.mkDerivation { - name = "kdepimlibs-4.2.0"; + name = "kdepimlibs-4.2.1"; src = fetchurl { - url = mirror://kde/stable/4.2.0/src/kdepimlibs-4.2.0.tar.bz2; - md5 = "8a91677e2dca7d4db26b33c78e239e5e"; + url = mirror://kde/stable/4.2.1/src/kdepimlibs-4.2.1.tar.bz2; + sha1 = "150228037fcd740fec0a490149cd1980ddb8fb57"; }; buildInputs = [ cmake qt4 perl boost cyrus_sasl gpgme stdenv.gcc.libc libical openldap kdelibs automoc4 phonon akonadi ]; diff --git a/pkgs/desktops/kde-4.2/plasma-addons/default.nix b/pkgs/desktops/kde-4.2/plasma-addons/default.nix index cfbadd612a02..ad9b16337723 100644 --- a/pkgs/desktops/kde-4.2/plasma-addons/default.nix +++ b/pkgs/desktops/kde-4.2/plasma-addons/default.nix @@ -2,10 +2,10 @@ kdelibs, kdebase_workspace, kdepimlibs, kdegraphics, automoc4, phonon}: stdenv.mkDerivation { - name = "kdeplasma-addons-4.2.0"; + name = "kdeplasma-addons-4.2.1"; src = fetchurl { - url = mirror://kde/stable/4.2.0/src/kdeplasma-addons-4.2.0.tar.bz2; - md5 = "d98f805f4c9b7af7278067f9e544b2ec"; + url = mirror://kde/stable/4.2.1/src/kdeplasma-addons-4.2.1.tar.bz2; + sha1 = "8e164a8e1476862392371f765372c2e168895d55"; }; inherit kdebase_workspace; builder = ./builder.sh; diff --git a/pkgs/desktops/kde-4.2/sdk/default.nix b/pkgs/desktops/kde-4.2/sdk/default.nix index b8bccc2023f4..e35254dc8ee5 100644 --- a/pkgs/desktops/kde-4.2/sdk/default.nix +++ b/pkgs/desktops/kde-4.2/sdk/default.nix @@ -2,10 +2,10 @@ kdelibs, kdepimlibs, automoc4, phonon, strigi}: stdenv.mkDerivation { - name = "kdesdk-4.2.0"; + name = "kdesdk-4.2.1"; src = fetchurl { - url = mirror://kde/stable/4.2.0/src/kdesdk-4.2.0.tar.bz2; - md5 = "79d01b4f10f1ecc283f7860d2c7973e9"; + url = mirror://kde/stable/4.2.1/src/kdesdk-4.2.1.tar.bz2; + sha1 = "dca74527bcf6e5925ec58a74196e683cc68a259a"; }; CMAKE_PREFIX_PATH=kdepimlibs; buildInputs = [ cmake qt4 perl libxml2 libxslt boost subversion diff --git a/pkgs/desktops/kde-4.2/support/phonon/default.nix b/pkgs/desktops/kde-4.2/support/phonon/default.nix index 99b3403f992e..f5b5b9e86bde 100644 --- a/pkgs/desktops/kde-4.2/support/phonon/default.nix +++ b/pkgs/desktops/kde-4.2/support/phonon/default.nix @@ -5,10 +5,10 @@ gst_all, xineLib, automoc4}: stdenv.mkDerivation { - name = "phonon-4.3.0"; + name = "phonon-4.3.1"; src = fetchurl { - url = mirror://kde/stable/phonon/4.3.0/phonon-4.3.0.tar.bz2; - md5 = "f851219ec1fb4eadc7904f053b6b498d"; + url = mirror://kde/stable/phonon/4.3.1/phonon-4.3.1.tar.bz2; + sha1 = "f7537e5280d0a4cc1348975daa7a7e45d833d45c"; }; buildInputs = [ cmake libXau libXdmcp diff --git a/pkgs/desktops/kde-4.2/support/soprano/default.nix b/pkgs/desktops/kde-4.2/support/soprano/default.nix index 558c4fd66fb6..87bac0c90506 100644 --- a/pkgs/desktops/kde-4.2/support/soprano/default.nix +++ b/pkgs/desktops/kde-4.2/support/soprano/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, cmake, qt4, jdk, cluceneCore, redland}: stdenv.mkDerivation { - name = "soprano-2.2.1"; + name = "soprano-2.2.3"; src = fetchurl { - url = mirror://sourceforge/soprano/soprano-2.2.1.tar.bz2; - md5 = "69688a71273e1e9389fc60e3085c695f"; + url = mirror://sourceforge/soprano/soprano-2.2.3.tar.bz2; + md5 = "22c992a252144ae0a3a964ba2f6f1933"; }; JAVA_HOME=jdk; buildInputs = [ cmake qt4 jdk cluceneCore redland ]; diff --git a/pkgs/desktops/kde-4.2/toys/default.nix b/pkgs/desktops/kde-4.2/toys/default.nix index efef29867166..e1a23ce16cb1 100644 --- a/pkgs/desktops/kde-4.2/toys/default.nix +++ b/pkgs/desktops/kde-4.2/toys/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, cmake, qt4, perl, kdelibs, kdebase_workspace, automoc4, phonon}: stdenv.mkDerivation { - name = "kdetoys-4.2.0"; + name = "kdetoys-4.2.1"; src = fetchurl { - url = mirror://kde/stable/4.2.0/src/kdetoys-4.2.0.tar.bz2; - md5 = "3adf538297e5dca51f15186b4acd02ce"; + url = mirror://kde/stable/4.2.1/src/kdetoys-4.2.1.tar.bz2; + sha1 = "46157a10a35d37e798faa8bb988ac1c3f2a51f07"; }; buildInputs = [ cmake qt4 perl kdelibs kdebase_workspace automoc4 phonon ]; } diff --git a/pkgs/desktops/kde-4.2/utils/default.nix b/pkgs/desktops/kde-4.2/utils/default.nix index a4147d6d7dd4..37a55b9931e5 100644 --- a/pkgs/desktops/kde-4.2/utils/default.nix +++ b/pkgs/desktops/kde-4.2/utils/default.nix @@ -2,10 +2,10 @@ kdelibs, kdepimlibs, automoc4, phonon, qimageblitz}: stdenv.mkDerivation { - name = "kdeutils-4.2.0"; + name = "kdeutils-4.2.1"; src = fetchurl { - url = mirror://kde/stable/4.2.0/src/kdeutils-4.2.0.tar.bz2; - md5 = "f0ca24c7d3e5bb0ab55bf6b26fc6224e"; + url = mirror://kde/stable/4.2.1/src/kdeutils-4.2.1.tar.bz2; + sha1 = "2f875d05584b25b928b38e1da2b04c073acefd35"; }; CMAKE_PREFIX_PATH=kdepimlibs; buildInputs = [ cmake qt4 perl gmp python libzip libarchive diff --git a/pkgs/desktops/kde-4.2/webdev/default.nix b/pkgs/desktops/kde-4.2/webdev/default.nix index 1642bc9aa865..9b06650a4028 100644 --- a/pkgs/desktops/kde-4.2/webdev/default.nix +++ b/pkgs/desktops/kde-4.2/webdev/default.nix @@ -2,10 +2,10 @@ kdelibs, kdepimlibs, automoc4, phonon}: stdenv.mkDerivation { - name = "kdewebdev-4.2.0"; + name = "kdewebdev-4.2.1"; src = fetchurl { - url = mirror://kde/stable/4.2.0/src/kdewebdev-4.2.0.tar.bz2; - md5 = "8b60c68f6cbbe9c5bb48caa576853f9e"; + url = mirror://kde/stable/4.2.1/src/kdewebdev-4.2.1.tar.bz2; + sha1 = "438bef3bb32ce53a83c6f30f65fb49d4d4e7c76a"; }; CMAKE_PREFIX_PATH=kdepimlibs; buildInputs = [ cmake qt4 perl libxml2 libxslt boost kdelibs kdepimlibs automoc4 phonon ];