diff --git a/pkgs/desktops/kde-4.3/admin/default.nix b/pkgs/desktops/kde-4.3/admin/default.nix index f7a2de5c115..480910a0c64 100644 --- a/pkgs/desktops/kde-4.3/admin/default.nix +++ b/pkgs/desktops/kde-4.3/admin/default.nix @@ -1,12 +1,12 @@ -{stdenv, fetchurl, cmake, qt4, pkgconfig, perl, python, - sip, pyqt4, pycups, system_config_printer, rhpl, - kdelibs, kdepimlibs, kdebindings, automoc4, phonon}: +{ stdenv, fetchurl, lib, cmake, qt4, pkgconfig, perl, python +, sip, pyqt4, pycups, system_config_printer, rhpl +, kdelibs, kdepimlibs, kdebindings, automoc4, phonon}: stdenv.mkDerivation { - name = "kdeadmin-4.2.4"; + name = "kdeadmin-4.3.1"; src = fetchurl { - url = mirror://kde/stable/4.2.4/src/kdeadmin-4.2.4.tar.bz2; - sha1 = "72a9bfeaacf6bf70f464923f96b28891ad6b671e"; + url = mirror://kde/stable/4.3.1/src/kdeadmin-4.3.1.tar.bz2; + sha1 = "032933e521004046a46a7a3c01b5a03b2d6e75d4"; }; builder = ./builder.sh; inherit system_config_printer; @@ -14,4 +14,10 @@ stdenv.mkDerivation { CMAKE_PREFIX_PATH=kdepimlibs; buildInputs = [ cmake qt4 pkgconfig perl python sip pyqt4 pycups system_config_printer rhpl kdelibs kdepimlibs kdebindings automoc4 phonon ]; + meta = { + description = "KDE Administration Utilities"; + license = "GPL"; + homepage = http://www.kde.org; + maintainers = [ lib.maintainers.sander ]; + }; } diff --git a/pkgs/desktops/kde-4.3/bindings/default.nix b/pkgs/desktops/kde-4.3/bindings/default.nix index 357d1263df7..c505b8242b8 100644 --- a/pkgs/desktops/kde-4.3/bindings/default.nix +++ b/pkgs/desktops/kde-4.3/bindings/default.nix @@ -1,17 +1,24 @@ -{stdenv, fetchurl, python, sip, pyqt4, zlib, libpng, freetype, fontconfig, qt4, - libSM, libXrender, libXrandr, libXfixes, libXinerama, libXcursor, libXext, kdelibs}: +{ stdenv, fetchurl, lib, python, sip, pyqt4, zlib, libpng, freetype, fontconfig, qt4 +, libSM, libXrender, libXrandr, libXfixes, libXinerama, libXcursor, libXext, kdelibs}: # This function will only build the pykde4 module. I don't need the other bindings and # some bindings are even broken. stdenv.mkDerivation { - name = "kdebindings-4.2.4"; + name = "kdebindings-4.3.1"; src = fetchurl { - url = mirror://kde/stable/4.2.4/src/kdebindings-4.2.4.tar.bz2; - sha1 = "5550b690d1c63fc63b3603ad73ba2b911158fe96"; + url = mirror://kde/stable/4.3.1/src/kdebindings-4.3.1.tar.bz2; + sha1 = "bb414b1ab28b51d9bbbfaa2d9c8474b27c325c32"; }; builder = ./builder.sh; includeAllQtDirs=true; buildInputs = [ python sip pyqt4 zlib libpng freetype fontconfig qt4 libSM libXrender libXrandr libXfixes libXcursor libXinerama libXext kdelibs ]; + meta = { + description = "KDE bindings"; + longDescription = "Provides KDE bindings for several languages such as Java, Smoke and Python"; + license = "LGPL"; + homepage = http://www.kde.org; + maintainers = [ lib.maintainers.sander ]; + }; } diff --git a/pkgs/desktops/kde-4.3/default.nix b/pkgs/desktops/kde-4.3/default.nix index ce3c330734e..e3867b9537a 100644 --- a/pkgs/desktops/kde-4.3/default.nix +++ b/pkgs/desktops/kde-4.3/default.nix @@ -93,7 +93,7 @@ rec { }; kdeadmin = import ./admin { - inherit (pkgs) stdenv fetchurl cmake qt4 pkgconfig perl python sip pyqt4 pycups system_config_printer rhpl; + inherit (pkgs) stdenv fetchurl lib cmake qt4 pkgconfig perl python sip pyqt4 pycups system_config_printer rhpl; inherit kdelibs kdepimlibs kdebindings; inherit automoc4 phonon; }; @@ -162,15 +162,15 @@ rec { }; kdeutils = import ./utils { - inherit (pkgs) stdenv fetchurl cmake qt4 perl python gmp libzip libarchive sip pyqt4 pycups system_config_printer rhpl; - inherit kdelibs kdepimlibs kdebindings; - inherit automoc4 phonon qimageblitz; + inherit (pkgs) stdenv fetchurl lib cmake qt4 perl python gmp libzip libarchive xz sip pyqt4 pycups system_config_printer rhpl; + inherit kdelibs kdelibs_experimental kdepimlibs kdebase kdebindings; + inherit automoc4 phonon qimageblitz qca2; }; ### DEVELOPMENT kdebindings = import ./bindings { - inherit (pkgs) stdenv fetchurl python sip zlib libpng pyqt4 freetype fontconfig qt4; + inherit (pkgs) stdenv fetchurl lib python sip zlib libpng pyqt4 freetype fontconfig qt4; inherit (pkgs.xlibs) libSM libXrender libXrandr libXfixes libXcursor libXinerama libXext; inherit kdelibs; }; diff --git a/pkgs/desktops/kde-4.3/utils/default.nix b/pkgs/desktops/kde-4.3/utils/default.nix index ed455013273..99e0b8db17d 100644 --- a/pkgs/desktops/kde-4.3/utils/default.nix +++ b/pkgs/desktops/kde-4.3/utils/default.nix @@ -1,16 +1,23 @@ -{stdenv, fetchurl, cmake, qt4, perl, gmp, python, libzip, libarchive, sip, pyqt4, pycups, system_config_printer, rhpl, - kdelibs, kdepimlibs, kdebindings, automoc4, phonon, qimageblitz}: +{ stdenv, fetchurl, lib, cmake, qt4, perl, gmp, python, libzip, libarchive, xz +, sip, pyqt4, pycups, system_config_printer, rhpl +, kdelibs, kdelibs_experimental, kdepimlibs, kdebase, kdebindings, automoc4, phonon, qimageblitz, qca2}: stdenv.mkDerivation { - name = "kdeutils-4.2.4"; + name = "kdeutils-4.3.1"; src = fetchurl { - url = mirror://kde/stable/4.2.4/src/kdeutils-4.2.4.tar.bz2; - sha1 = "59bb17463bec48c77768e50fb0e9ec3c1b0827af"; + url = mirror://kde/stable/4.3.1/src/kdeutils-4.3.1.tar.bz2; + sha1 = "9743636306cfb137241b6c87f5944e6bf91870fe"; }; builder = ./builder.sh; inherit system_config_printer; includeAllQtDirs=true; CMAKE_PREFIX_PATH=kdepimlibs; - buildInputs = [ cmake qt4 perl gmp python libzip libarchive sip pyqt4 pycups system_config_printer rhpl - kdelibs kdepimlibs kdebindings automoc4 phonon qimageblitz ]; + buildInputs = [ cmake qt4 perl gmp python libzip libarchive xz sip pyqt4 pycups system_config_printer rhpl + kdelibs kdelibs_experimental kdepimlibs kdebase kdebindings automoc4 phonon qimageblitz qca2 ]; + meta = { + description = "KDE Utilities"; + license = "GPL"; + homepage = http://www.kde.org; + maintainers = [ lib.maintainers.sander ]; + }; }