Big kde-4.7.0 update

* Remove a lot of code duplication.
* Package almost all (except for smoke-based bindings).

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

pkgs/desktops/kde-4.7/accessibility/jovie.nix

@@ -1,17 +0,0 @@
-{ kde, cmake, qt4, kdelibs, automoc4, phonon }:
-
-kde.package {
-  buildInputs = [ cmake qt4 kdelibs automoc4 phonon ];
-
-#TODO: working backend: speechd or opentts
-  meta = {
-    description = "Text-to-speech synthesis daemon";
-    kde = {
-      name = "jovie";
-      module = "kdeaccessibility";
-      version = "0.6.0";
-      versionFile = "jovie/jovie/main.cpp";
-    };
-  };
-}
-

pkgs/desktops/kde-4.7/accessibility/kaccessible.nix

@@ -1,14 +0,0 @@
-{ kde, cmake, qt4, kdelibs, automoc4, phonon }:
-
-kde.package {
-  buildInputs = [ cmake qt4 kdelibs automoc4 phonon ];
-
-  meta = {
-    description = "Bridge that provides accessibility services to applications";
-    kde = {
-      name = "kaccessible";
-      module = "kdeaccessibility";
-    };
-  };
-}
-  

pkgs/desktops/kde-4.7/accessibility/kmag.nix

@@ -1,16 +0,0 @@
-{ kde, cmake, qt4, kdelibs, automoc4, phonon }:
-
-kde.package {
-  buildInputs = [ cmake qt4 kdelibs automoc4 phonon ];
-
-  meta = {
-    description = "Screen magnifier for KDE";
-    kde = {
-      name = "kmag";
-      module = "kdeaccessibility";
-      version = "1.0";
-      versionFile = "kmag/version.h";
-    };
-  };
-}
-

pkgs/desktops/kde-4.7/accessibility/kmousetool.nix

@@ -1,15 +0,0 @@
-{ kde, cmake, qt4, kdelibs, automoc4, phonon, libXtst }:
-
-kde.package {
-  buildInputs = [ cmake qt4 kdelibs automoc4 phonon libXtst ];
-
-  meta = {
-    description = "A program that clicks the mouse for you";
-    kde = {
-      name = "kmousetool";
-      module = "kdeaccessibility";
-      version = "1.12";
-      versionFile = "kmousetool/kmousetool/version.h";
-    };
-  };
-}

pkgs/desktops/kde-4.7/accessibility/kmouth.nix

@@ -1,14 +0,0 @@
-{ kde, cmake, qt4, kdelibs, automoc4, phonon }:
-
-kde.package {
-  buildInputs = [ cmake qt4 kdelibs automoc4 phonon ];
-
-  meta = {
-    description = "A type-and-say front end for speech synthesizers";
-    kde = {
-      name = "kmouth";
-      module = "kdeaccessibility";
-      version = "1.1.1";
-    };
-  };
-}

pkgs/desktops/kde-4.7/artwork/aurorae.nix

@@ -1,14 +0,0 @@
-{ cmake, kde, qt4, automoc4, kdelibs, phonon }:
-
-kde.package rec {
-  name = "aurorae-themes-${kde.release}";
-
-  buildInputs = [ cmake qt4 automoc4 kdelibs phonon ];
-  
-  meta = {
-    kde = {
-      name = "aurorae";
-      module = "kdeartwork";
-    };
-  };
-}

pkgs/desktops/kde-4.7/artwork/color-schemes.nix

@@ -1,15 +0,0 @@
-{ cmake, kde, qt4, automoc4, kdelibs, phonon }:
-
-kde.package rec {
-  name = "kde-color-schemes-${kde.release}";
-
-  buildInputs = [ cmake qt4 automoc4 kdelibs phonon ];
-  
-  meta = {
-    description = "Additional KDE color schemes";
-    kde = {
-      name = "ColorSchemes";
-      module = "kdeartwork";
-    };
-  };
-}

pkgs/desktops/kde-4.7/artwork/desktop-themes.nix

@@ -1,15 +0,0 @@
-{ cmake, kde, qt4, automoc4, kdelibs, phonon }:
-
-kde.package rec {
-  name = "kde-desktop-themes-${kde.release}";
-
-  buildInputs = [ cmake qt4 automoc4 kdelibs phonon ];
-
-  meta = {
-    description = "Additional KDE desktop themes";
-    kde = {
-      name = "desktopthemes";
-      module = "kdeartwork";
-    };
-  };
-}

pkgs/desktops/kde-4.7/artwork/emoticons.nix

@@ -1,15 +0,0 @@
-{ cmake, kde, qt4, automoc4, kdelibs, phonon }:
-
-kde.package rec {
-  name = "kde-emotion-icons-${kde.release}";
-
-  buildInputs = [ cmake qt4 automoc4 kdelibs phonon ];
-
-  meta = {
-    description = "Additional KDE emotion icons (smiles)";
-    kde = {
-      name = "emoticons";
-      module = "kdeartwork";
-    };
-  };
-}

pkgs/desktops/kde-4.7/artwork/high-resolution-wallpapers.nix

@@ -1,15 +0,0 @@
-{ cmake, kde, qt4, automoc4, kdelibs, phonon }:
-
-kde.package rec {
-  name = "kde-wallpapers-high-resolution-${kde.release}";
-
-  buildInputs = [ cmake qt4 automoc4 kdelibs phonon ];
-  
-  meta = {
-    description = "KDE wallpapers in high resolution";
-    kde = {
-      name = "HighResolutionWallpapers";
-      module = "kdeartwork";
-    };
-  };
-}

pkgs/desktops/kde-4.7/artwork/kscreensaver.nix

@@ -1,18 +0,0 @@
-{ cmake, kde, qt4, automoc4, kdelibs, phonon, xscreensaver, kde_workspace, eigen, libkexiv2 }:
-
-kde.package rec {
-  buildInputs =
-    [ cmake automoc4 qt4 kdelibs phonon xscreensaver kde_workspace eigen libkexiv2 ];
-  
-  preConfigure = "cp -v ${./FindXscreensaver.cmake} cmake/modules/FindXscreensaver.cmake";
-  
-  meta = {
-    description = "KDE screensavers";
-    kde = {
-      name = "kscreensaver";
-      module = "kdeartwork";
-      version = "1.0";
-      versionFile = "kscreensaver/kpartsaver/kpartsaver.cpp";
-    };
-  };
-}

pkgs/desktops/kde-4.7/artwork/kwin-styles.nix

@@ -1,13 +0,0 @@
-{ cmake, kde, qt4, automoc4, kdelibs, phonon, kde_workspace }:
-
-kde.package rec {
-  buildInputs = [ cmake qt4 automoc4 kdelibs phonon kde_workspace ];
-
-  meta = {
-    description = "Styles for KWin";
-    kde = {
-      name = "kwin-styles";
-      module = "kdeartwork";
-    };
-  };
-}

pkgs/desktops/kde-4.7/artwork/nuvola-icon-theme.nix

@@ -1,17 +0,0 @@
-{ cmake, kde, qt4, automoc4, kdelibs, phonon }:
-
-kde.package rec {
-  name = "nuvola-icon-theme-${kde.release}";
-  
-  # Sources contain primary and kdeclassic as well but they're not installed
-
-  buildInputs = [ cmake qt4 automoc4 kdelibs phonon ];
-  
-  meta = {
-    description = "KDE nuvola icon theme";
-    kde = {
-      name = "IconThemes";
-      module = "kdeartwork";
-    };
-  };
-}

pkgs/desktops/kde-4.7/artwork/phase-style.nix

@@ -1,15 +0,0 @@
-{ cmake, kde, qt4, automoc4, kdelibs, phonon }:
-
-kde.package rec {
-  name = "kde-style-phase-${kde.release}";
-
-  buildInputs = [ cmake qt4 automoc4 kdelibs phonon ];
-
-  meta = {
-    description = "Phase, a widget style for KDE";
-    kde = {
-      name = "styles";
-      module = "kdeartwork";
-    };
-  };
-}

pkgs/desktops/kde-4.7/artwork/sounds.nix

@@ -1,15 +0,0 @@
-{ cmake, kde, qt4, automoc4, kdelibs, phonon }:
-
-kde.package rec {
-  name = "kde-sounds-${kde.release}";
-
-  buildInputs = [ cmake qt4 automoc4 kdelibs phonon ];
-
-  meta = {
-    description = "New login/logout sounds";
-    kde = {
-      name = "sounds";
-      module = "kdeartwork";
-    };
-  };
-}

pkgs/desktops/kde-4.7/artwork/wallpapers.nix

@@ -1,15 +0,0 @@
-{ cmake, kde, qt4, automoc4, kdelibs, phonon }:
-
-kde.package rec {
-  name = "kde-wallpapers-${kde.release}";
-
-  buildInputs = [ cmake qt4 automoc4 kdelibs phonon ];
-
-  meta = {
-    description = "Additional KDE wallpapers";
-    kde = {
-      name = "wallpapers";
-      module = "kdeartwork";
-    };
-  };
-}

pkgs/desktops/kde-4.7/artwork/weather-wallpapers.nix

@@ -1,15 +0,0 @@
-{ cmake, kde, qt4, automoc4, kdelibs, phonon }:
-
-kde.package rec {
-  name = "kde-weather-wallpapers-${kde.release}";
-
-  buildInputs = [ cmake qt4 automoc4 kdelibs phonon ];
-
-  meta = {
-    description = "Additional KDE wallpapers (weather)";
-    kde = {
-      name = "WeatherWallpapers";
-      module = "kdeartwork";
-    };
-  };
-}

pkgs/desktops/kde-4.7/baseapps.nix

@@ -1,17 +0,0 @@
-{ automoc4, cmake, kde, kdelibs, qt4, strigi, soprano
-, shared_desktop_ontologies, glib, phonon
-}:
-
-kde.package {
-
-  buildInputs =
-    [ cmake kdelibs qt4 automoc4 strigi soprano shared_desktop_ontologies
-      glib phonon
-    ];
-
-  meta = {
-    description = "Base KDE applications, including the Dolphin file manager and Konqueror web browser";
-    license = "GPLv2";
-    kde.name = "kde-baseapps";
-  };
-}

pkgs/desktops/kde-4.7/bindings/default.nix

@@ -1,34 +0,0 @@
-{ kde, lib, cmake, perl, python, sip, pyqt4, zlib, libpng, freetype, fontconfig, qt4, boost
-, kdelibs, kdepimlibs, automoc4, soprano, akonadi, attica, polkit_qt_1, ruby
-}:
-
-# This function will only build the pykde4 module. I don't need the other bindings and
-# some bindings are even broken.
-
-kde.package rec {
-  patches = [ ./python-site-packages-install-dir.diff ./sip-4.11.patch ];
-
-  preConfigure = ''
-    CUSTOM_RUBY_SITE_ARCH_DIR=$(ruby -r rbconfig -e "print Config::CONFIG['sitearchdir']" | sed -e "s@${ruby}@$out@")
-    CUSTOM_RUBY_SITE_LIB_DIR=$(ruby -r rbconfig -e "print Config::CONFIG['sitelibdir']" | sed -e "s@${ruby}@$out@")
-    CUSTOM_PERL_SITE_ARCH_DIR=$(perl -MConfig -e 'print $Config{sitearch}' | sed -e "s@${perl}@$out@")
-    cmakeFlagsArray+=(
-      -DSIP_DEFAULT_SIP_DIR=$out/share/sip
-      -DCUSTOM_RUBY_SITE_ARCH_DIR=$CUSTOM_RUBY_SITE_ARCH_DIR
-      -DCUSTOM_RUBY_SITE_LIB_DIR=$CUSTOM_RUBY_SITE_LIB_DIR
-      -DCUSTOM_PERL_SITE_ARCH_DIR=$CUSTOM_PERL_SITE_ARCH_DIR
-    )
-  '';
-  
-  # TODO: okular, qimageblitz, qwt5, qscintilla2, c#
-  buildInputs = [ cmake perl python sip pyqt4 zlib libpng freetype fontconfig qt4 boost
-          kdelibs kdepimlibs automoc4 soprano akonadi attica polkit_qt_1 ruby ];
-
-  meta = {
-    description = "KDE bindings";
-    longDescription = "Provides KDE bindings for several languages such as Java, Smoke and Python";
-    license = "LGPL";
-    kde.name = "kdebindings";
-  };
-}
-

pkgs/desktops/kde-4.7/bindings/python-site-packages-install-dir.diff

@@ -1,54 +0,0 @@
-diff --git a/python/pykde4/CMakeLists.txt b/python/pykde4/CMakeLists.txt
-index 01b69dc..375661d 100644
---- a/python/pykde4/CMakeLists.txt
-+++ b/python/pykde4/CMakeLists.txt
-@@ -188,12 +188,12 @@ IF(POLKITQT_FOUND)
-     SET(PYKDE_MODULES "${PYKDE_MODULES} polkitqt")
- ENDIF(POLKITQT_FOUND)
- 
--PYTHON_INSTALL(__init__.py ${PYTHON_SITE_PACKAGES_DIR}/PyKDE4)
-+PYTHON_INSTALL(__init__.py ${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyKDE4)
- 
- MESSAGE(STATUS "KDE_VERSION: ${KDE_VERSION}")
- MESSAGE(STATUS "KDE4_INCLUDE_DIR: ${KDE4_INCLUDE_DIR}")
- MESSAGE(STATUS "KDE4_LIB_DIR: ${KDE4_LIB_DIR}")
--MESSAGE(STATUS "PYTHON_SITE_PACKAGES_DIR: ${PYTHON_SITE_PACKAGES_DIR}")
-+MESSAGE(STATUS "PYTHON_SITE_PACKAGES_INSTALL_DIR: ${PYTHON_SITE_PACKAGES_INSTALL_DIR}")
- 
- # Setup and install pykdeconfig.py
- 
-@@ -225,7 +225,7 @@ _pkg_config = {
-     'konsolepart':          'False',
-     'libdir':               '${LIB_DIR}',
-     'pykde_kde_sip_flags':  '${_SIP_TAGS} ${_SIP_X} ${SIP_EXTRA_OPTIONS}',
--    'pykde_mod_dir':        '${PYTHON_SITE_PACKAGES_DIR}/PyKDE4',
-+    'pykde_mod_dir':        '${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyKDE4',
-     'pykde_modules':        '${PYKDE_MODULES}',
-     'pykde_sip_dir':        '${SIP_DEFAULT_SIP_DIR}/PyKDE4',
-     'pykde_version':        kde_version_hex,
-@@ -235,7 +235,7 @@ _pkg_config = {
- _default_macros = None")
- 
- CONFIGURE_FILE(pykdeconfig.py.in ${CMAKE_CURRENT_BINARY_DIR}/pykdeconfig.py)
--PYTHON_INSTALL(${CMAKE_CURRENT_BINARY_DIR}/pykdeconfig.py ${PYTHON_SITE_PACKAGES_DIR}/PyKDE4)
-+PYTHON_INSTALL(${CMAKE_CURRENT_BINARY_DIR}/pykdeconfig.py ${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyKDE4)
- 
- # Install the .sip files for anyone that wants to build bindings on top of PyKDE4.
- # (Don't forget the / at the end of sip/.)
-diff --git a/python/pykde4/tools/pykdeuic4/CMakeLists.txt b/python/pykde4/tools/pykdeuic4/CMakeLists.txt
-index ea711ba..115c777 100644
---- a/python/pykde4/tools/pykdeuic4/CMakeLists.txt
-+++ b/python/pykde4/tools/pykdeuic4/CMakeLists.txt
-@@ -1,5 +1,9 @@
- 
--PYTHON_INSTALL(kde4.py ${PYTHON_SITE_PACKAGES_DIR}/PyQt4/uic/widget-plugins/)
--PYTHON_INSTALL(pykdeuic4.py ${PYTHON_SITE_PACKAGES_DIR}/PyQt4/uic/)
-+PYTHON_INSTALL(kde4.py ${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyQt4/uic/widget-plugins/)
-+PYTHON_INSTALL(pykdeuic4.py ${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyQt4/uic/)
- find_path(cmake_module_dir create_exe_symlink.cmake ${CMAKE_MODULE_PATH})
--INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -DTARGET=${PYTHON_SITE_PACKAGES_DIR}/PyQt4/uic/pykdeuic4.py -DLINK_NAME=${BIN_INSTALL_DIR}/pykdeuic4 -P ${cmake_module_dir}/create_exe_symlink.cmake)" )
-+IF(IS_ABSOLUTE ${PYTHON_SITE_PACKAGES_INSTALL_DIR})
-+  INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -DTARGET=${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyQt4/uic/pykdeuic4.py -DLINK_NAME=${BIN_INSTALL_DIR}/pykdeuic4 -P ${cmake_module_dir}/create_exe_symlink.cmake)" )
-+ELSE(IS_ABSOLUTE ${PYTHON_SITE_PACKAGES_INSTALL_DIR})
-+  INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -DTARGET=${CMAKE_INSTALL_PREFIX}/${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyQt4/uic/pykdeuic4.py -DLINK_NAME=${BIN_INSTALL_DIR}/pykdeuic4 -P ${cmake_module_dir}/create_exe_symlink.cmake)" )
-+ENDIF(IS_ABSOLUTE ${PYTHON_SITE_PACKAGES_INSTALL_DIR})

pkgs/desktops/kde-4.7/bindings/sip-4.11.patch

@@ -1,67 +0,0 @@
-Make kdebindings compile against sip-4.11, from KDE svn
-Index: kdebindings/python/pykde4/sip/kdecore/typedefs.sip
-===================================================================
---- kdebindings/python/pykde4/sip/kdecore/typedefs.sip	(revision 1170601)
-+++ kdebindings/python/pykde4/sip/kdecore/typedefs.sip	(revision 1170602)
-@@ -733,61 +733,6 @@
- };
- 
- 
--%MappedType QList<uint>
--{
--%TypeHeaderCode
--#include <qlist.h>
--%End
--
--%ConvertFromTypeCode
--    // Create the list.
--    PyObject *l;
--
--    if ((l = PyList_New(sipCpp->size())) == NULL)
--        return NULL;
--
--    // Set the list elements.
--    for (int i = 0; i < sipCpp->size(); ++i) {
--        PyObject *pobj;
--
--#if PY_MAJOR_VERSION >= 3
--        if ((pobj = PyLong_FromLong(sipCpp->value(i))) == NULL) {
--#else
--        if ((pobj = PyInt_FromLong(sipCpp->value(i))) == NULL) {
--#endif
--            Py_DECREF(l);
--
--            return NULL;
--        }
--
--        PyList_SET_ITEM(l, i, pobj);
--    }
--
--    return l;
--%End
--
--%ConvertToTypeCode
--    // Check the type if that is all that is required.
--    if (sipIsErr == NULL)
--        return PyList_Check(sipPy);
--
--    QList<uint> *ql = new QList<uint>;
-- 
--    for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) {
--#if PY_MAJOR_VERSION >= 3
--        ql->append(PyLong_AsLong(PyList_GET_ITEM(sipPy, i)));
--#else
--        ql->append(PyInt_AsLong(PyList_GET_ITEM(sipPy, i)));
--#endif        
--    }
--    
--    *sipCppPtr = ql;
-- 
--    return sipGetState(sipTransferObj);
--%End
--};
--
--
- template <TYPE*>
- %MappedType QStack<TYPE*>
- {

pkgs/desktops/kde-4.7/default.nix

@@ -1,200 +1,125 @@
-{ callPackage, recurseIntoAttrs, runCommand, stdenv, fetchurl, qt47, system_config_printer, boost } @ args:
+{ callPackage, runCommand, stdenv, fetchurl, qt47, cmake, automoc4 }:
 
 let
-
   release = "4.7.0";
 
-  # Various packages (e.g. kdesdk) have been split up into many
-  # smaller packages.  Some people may want to install the entire
-  # package, so provide a wrapper package that recombines them.
-  combinePkgs = name: pkgs:
-    let pkgs' = stdenv.lib.attrValues pkgs; in
-    runCommand "${name}-${release}" ({ passthru = pkgs // { inherit pkgs; }; })
-      ''
-        mkdir -p $out/nix-support
-        echo ${toString pkgs'} > $out/nix-support/propagated-user-env-packages
-      '';
+  manifest = import (./kde-package + "/${release}.nix");
+
+  kdesrc = name: fetchurl {
+    url = "mirror://kde/" + (if manifest.stable then "" else "un")
+      + "stable/${release}/src/${name}-${release}.tar.bz2";
+    sha256 = builtins.getAttr name manifest.hashes;
+  };
+
+  mergeMeta = meta:
+    {
+      homepage = http://www.kde.org;
+      inherit (qt47.meta) platforms maintainers;
+    } // meta;
+
+  kdeMonoPkg = name: a@{meta, ...}:
+    stdenv.mkDerivation ({
+        name = "${name}-${release}";
+        src = kdesrc name;
+        meta = mergeMeta meta;
+        } // (builtins.removeAttrs a [ "meta" ]));
+  kdeMonolithic = name: path: callPackage path { kde = kdeMonoPkg name; };
+
+  kdeSubdirPkg = module:
+    {name, subdir ? name, sane ? name}:
+    let name_ = name; in
+    a@{cmakeFlags ? [], name ? name_, ...}:
+    stdenv.mkDerivation ({
+      name = "${name}-${release}";
+      src = kdesrc module;
+      cmakeFlags = ["-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE"
+      "-DBUILD_doc=TRUE" "-DBUILD_${subdir}=TRUE"] ++ cmakeFlags;
+    } // (removeAttrs a [ "name" "cmakeFlags" ]));
+
+  kdeSplittedPkg = module: {name, sane ? name}: kdeMonoPkg name;
+
+  combinePkgs = pkgFun: module: pkgs:
+    let
+      f = p@{name, ...}:
+        callPackage (./. + "/${module}/${name}.nix") { kde = pkgFun module p; };
+      list = map f pkgs;
+      attrs = builtins.listToAttrs (map
+        ({name, sane ? name, ...}@p: { name = sane; value = f p; })
+        pkgs);
+    in
+      runCommand "${module}-${release}"
+      ({passthru = attrs // { propagatedUserEnvPackages = list; recurseForDerivations = true;};})
+        ''
+          mkdir -pv $out/nix-support
+          echo "${toString list}" | tee $out/nix-support/propagated-user-env-packages
+        '';
+
+  kdeModule = { module, sane ? module, split, pkgs ? [] }:
+    let pkgs_ = filterPkgs module pkgs; in
+    {
+      name = sane;
+      value =
+        # Module is splitted by upstream
+        if split then combinePkgs kdeSplittedPkg module pkgs_
+        # Monolithic module
+        else if pkgs == [] then kdeMonolithic module (./. + "/${module}.nix")
+        # Module is splitted by us
+        else combinePkgs kdeSubdirPkg module pkgs_;
+    };
+
+  kdepkgs = builtins.listToAttrs (map kdeModule manifest.modules);
+
+  filterPkgs = module: (p:
+      removeNames (stdenv.lib.attrByPath [module] [] ignoreList) p
+      ++ (stdenv.lib.attrByPath [module] [] extraSubpkgs));
+
+# List difference, big - subst; optimised for empty subst
+  removeNames = subst: big: stdenv.lib.fold (s: out: stdenv.lib.filter (x: x.name != s) out) big subst;
+
+  ignoreList = {
+    kdeadmin = [ "strigi-analyzer" ];
+    kdesdk = [ "kioslave" ];
+    kdebindings = [ "kimono" "korundum" "kross-interpreters" "perlkde" "perlqt"
+      "qtruby" "qyoto" "smokekde" ];
+  };
+
+  extraSubpkgs = {
+    kdesdk =
+      [
+      {
+        name = "kioslave-svn";
+        sane = "kioslave_svn";
+        subdir = "kioslave";
+      }
+      {
+        name = "kioslave-perldoc";
+        sane = "kioslave_perldoc";
+        subdir = "kioslave";
+      }
+      ];
+  };
 
 in
-
-recurseIntoAttrs rec {
+kdepkgs // kdepkgs.kdebase //
+{
   recurseForRelease = true;
-
-  inherit callPackage stdenv;
+  akonadi = callPackage ./support/akonadi { };
+  soprano = callPackage ./support/soprano { };
 
   qt4 = qt47;
 
-  kde = callPackage ./kde-package { inherit release; stable = true; };
+  kdebase_workspace = kdepkgs.kdebase.kde_workspace;
 
-### SUPPORT
+# Propagate some libraries to the top-level
+  inherit (kdepkgs.kdegraphics) libkdcraw libkipi libkexiv2 libksane;
+  inherit (kdepkgs.kdebindings) pykde4;
+  inherit (kdepkgs.kdeedu) libkdeedu;
 
-  system_config_printer = args.system_config_printer.override { withGUI = false; };
+  inherit release;
 
-  akonadi = callPackage ./support/akonadi { };
-
-  oxygen_icons = callPackage ./support/oxygen-icons { };
-
-  soprano = callPackage ./support/soprano { };
-
-  libkexiv2 = callPackage ./libkexiv2.nix { };
-
-  libkipi = callPackage ./libkipi.nix { };
-
-  libkdcraw = callPackage ./libkdcraw.nix { };
-
-  kipi_plugins = callPackage ./kipi-plugins.nix { };
-
-### LIBS
-
-  kdelibs = callPackage ./libs { };
-
-  kdepimlibs = callPackage ./pimlibs.nix { };
-
-### BASE
-
-  kde_baseapps = callPackage ./baseapps.nix { };
-
-  kde_workspace = callPackage ./workspace.nix { };
-
-  kde_runtime = callPackage ./runtime.nix { };
-
-  # Backwards compatibility.
-  kdebase_workspace = kde_workspace;
-
-### BINDINGS
-
-  pykde4 = callPackage ./pykde4.nix { };
-
-### OTHER MODULES
-
-  konsole = callPackage ./konsole.nix { };
-
-  kcolorchooser = callPackage ./kcolorchooser.nix { };
-
-  kate = callPackage ./kate.nix { };
-
-  kde_wallpapers = callPackage ./wallpapers.nix { };
-
-  kdeadmin = callPackage ./admin.nix { };
-
-  kdegames = callPackage ./games.nix { };
-  
-  kdemultimedia = callPackage ./multimedia.nix { };
-
-  kdeaccessibility = combinePkgs "kdeaccessibility" {
-    #jovie = callPackage ./accessibility/jovie.nix { };
-    kmag = callPackage ./accessibility/kmag.nix { };
-    kmousetool = callPackage ./accessibility/kmousetool.nix { };
-    kmouth = callPackage ./accessibility/kmouth.nix { };
-    kaccessible = callPackage ./accessibility/kaccessible.nix { };
-  };
-
-  kdeartwork = combinePkgs "kdeartwork" {
-    aurorae = callPackage ./artwork/aurorae.nix { };
-    color_schemes = callPackage ./artwork/color-schemes.nix { };
-    desktop_themes = callPackage ./artwork/desktop-themes.nix { };
-    emoticons = callPackage ./artwork/emoticons.nix { };
-    high_resolution_wallpapers = callPackage ./artwork/high-resolution-wallpapers.nix { };
-    wallpapers = callPackage ./artwork/wallpapers.nix { };
-    nuvola_icon_theme = callPackage ./artwork/nuvola-icon-theme.nix { };
-    sounds = callPackage ./artwork/sounds.nix { };
-    weather_wallpapers = callPackage ./artwork/weather-wallpapers.nix { };
-    phase_style = callPackage ./artwork/phase-style.nix { };
-    kscreensaver = callPackage ./artwork/kscreensaver.nix { };
-    kwin_styles = callPackage ./artwork/kwin-styles.nix { };
-  };
-  
-  /*
-  kdeedu = callPackage ./edu { };
-  kdenetwork = callPackage ./network { };
-  kdeplasma_addons = callPackage ./plasma-addons { };
-  */
-
-  kdeedu = combinePkgs "kdeedu" {
-    klettres = callPackage ./edu/klettres.nix { };
-    kmplot = callPackage ./edu/kmplot.nix { };
-    kstars = callPackage ./edu/kstars.nix { };
-    rocs = callPackage ./edu/rocs.nix {
-      boost = args.boost.override {enableExceptions = true;};
-    };
-    step = callPackage ./edu/step.nix { };
-  };
-
-  kdegraphics = combinePkgs "kdegraphics" {
-    gwenview = callPackage ./graphics/gwenview.nix { };
-    kamera = callPackage ./graphics/kamera.nix { };
-    kgamma = callPackage ./graphics/kgamma.nix { };
-    kolourpaint = callPackage ./graphics/kolourpaint.nix { };
-    kruler = callPackage ./graphics/kruler.nix { };
-    ksnapshot = callPackage ./graphics/ksnapshot.nix { };
-    okular = callPackage ./graphics/okular.nix { };
-  };
-
-  kdesdk = combinePkgs "kdesdk" {
-    cervisia = callPackage ./sdk/cervisia.nix { };
-    kapptemplate = callPackage ./sdk/kapptemplate.nix { };
-    kcachegrind = callPackage ./sdk/kcachegrind.nix { };
-    kdeaccounts_plugin = callPackage ./sdk/kdeaccounts-plugin.nix { };
-    dolphin_plugins = callPackage ./sdk/dolphin-plugins.nix { };
-    kioslave_perldoc = callPackage ./sdk/kioslave-perldoc.nix { };
-    kioslave_svn = callPackage ./sdk/kioslave-svn.nix { };
-    strigi_analyzer = callPackage ./sdk/strigi-analyzer.nix { };
-    kmtrace = callPackage ./sdk/kmtrace.nix { };
-    kompare = callPackage ./sdk/kompare.nix { };
-    kpartloader = callPackage ./sdk/kpartloader.nix { };
-    kprofilemethod = callPackage ./sdk/kprofilemethod.nix { };
-    kstartperf = callPackage ./sdk/kstartperf.nix { };
-    kuiviewer = callPackage ./sdk/kuiviewer.nix { };
-    lokalize = callPackage ./sdk/lokalize.nix { };
-    poxml = callPackage ./sdk/poxml.nix { };
-    scripts = callPackage ./sdk/scripts.nix { };
-    umbrello = callPackage ./sdk/umbrello.nix { };
-    okteta = callPackage ./sdk/okteta.nix { };
-  };
-
-  kdetoys = combinePkgs "kdetoys" {
-    amor = callPackage ./toys/amor.nix { };
-    kteatime = callPackage ./toys/kteatime.nix { };
-    ktux = callPackage ./toys/ktux.nix { };
-  };
-
-  kdeutils = combinePkgs "kdeutils" {
-    ark = callPackage ./utils/ark.nix { };
-    kcalc = callPackage ./utils/kcalc.nix { };
-    kcharselect = callPackage ./utils/kcharselect.nix { };
-    kdf = callPackage ./utils/kdf.nix { };
-    kfloppy = callPackage ./utils/kfloppy.nix { };
-    kgpg = callPackage ./utils/kgpg.nix { };
-    kremotecontrol = callPackage ./utils/kremotecontrol.nix { };
-    ktimer = callPackage ./utils/ktimer.nix { };
-    kwallet = callPackage ./utils/kwallet.nix { };
-    printer_applet = callPackage ./utils/printer-applet.nix { };
-    superkaramba = callPackage ./utils/superkaramba.nix { };
-    sweeper = callPackage ./utils/sweeper.nix { };
-    filelight = callPackage ./utils/filelight.nix { };
-  };
-
-  kdewebdev = combinePkgs "kdewebdev" {
-    klinkstatus = callPackage ./webdev/klinkstatus.nix { };
-    kommander = callPackage ./webdev/kommander.nix { };
-    kfilereplace = callPackage ./webdev/kfilereplace.nix { };
-    kimagemapeditor = callPackage ./webdev/kimagemapeditor.nix { };
-  };
-
-  kdepim_runtime = callPackage ./pim-runtime.nix { };
-  
-  kdepim = callPackage ./pim.nix { };
-
-### DEVELOPMENT
-
-  /*
-  kdebindings = callPackage ./bindings { };
-  */
+  full = stdenv.lib.attrValues kdepkgs;
 
   l10n = callPackage ./l10n { inherit release; };
 
-  # Make the split packages visible to `nix-env -q'.
-  misc = recurseIntoAttrs
-    (kdeaccessibility.pkgs // kdeartwork.pkgs // kdesdk.pkgs // kdetoys.pkgs // kdeutils.pkgs // kdewebdev.pkgs);
-
+  subdirNames = map (x: x.module) (stdenv.lib.filter (x: !x.split && (x ? pkgs)) manifest.modules);
 }

pkgs/desktops/kde-4.7/edu/klettres.nix

@@ -1,12 +0,0 @@
-{ kde, cmake, kdelibs, qt4, automoc4, phonon }:
-
-kde.package {
-  buildInputs = [ cmake kdelibs qt4 automoc4 phonon ];
-
-  meta = {
-    description = "A KDE alphabet tutorial";
-    kde = {
-      name = "klettres";
-    };
-  };
-}

pkgs/desktops/kde-4.7/edu/kstars.nix

@@ -1,12 +0,0 @@
-{ kde, cmake, kdelibs, qt4, automoc4, phonon, eigen, xplanet, indilib }:
-
-kde.package {
-  buildInputs = [ cmake kdelibs qt4 automoc4 phonon eigen xplanet indilib ];
-
-  meta = {
-    description = "A KDE graphical desktop planetarium";
-    kde = {
-      name = "kstars";
-    };
-  };
-}

pkgs/desktops/kde-4.7/edu/step.nix

@@ -1,12 +0,0 @@
-{ kde, cmake, kdelibs, qt4, automoc4, phonon, gsl, libqalculate, eigen }:
-
-kde.package {
-  buildInputs = [ cmake kdelibs qt4 automoc4 phonon gsl libqalculate eigen ];
-
-  meta = {
-    description = "A KDE interactive physical simulator";
-    kde = {
-      name = "step";
-    };
-  };
-}

pkgs/desktops/kde-4.7/games.nix

@@ -1,23 +0,0 @@
-{ kde, cmake, qt4, perl, shared_mime_info, kdelibs, automoc4, qca2
-, twisted, pythonPackages, pyqt4, sip, makeWrapper, phonon, pykde4 }:
-
-kde.package rec {
-
-  buildInputs =
-    [ cmake kdelibs qt4 automoc4 phonon shared_mime_info qca2
-      pythonPackages.python pythonPackages.wrapPython
-    ] ++ pythonPath;
-
-  pythonPath =
-    [ pythonPackages.twisted pyqt4 pykde4 ];
-    
-  # TODO: ggz
-
-  postInstall = "wrapPythonPrograms";
-
-  meta = {
-    description = "KDE Games";
-    license = "GPL";
-    kde.name = "kdegames";
-  };
-}

pkgs/desktops/kde-4.7/graphics/gwenview.nix

@@ -1,17 +0,0 @@
-{ kde, cmake, qt4, kdelibs, automoc4, exiv2, soprano
-, shared_desktop_ontologies, kde_baseapps, libkipi, phonon
-}:
-
-kde.package {
-
-  buildInputs =
-    [ cmake qt4 kdelibs automoc4 exiv2 soprano shared_desktop_ontologies
-      kde_baseapps libkipi phonon
-    ];
-
-  meta = {
-    description = "Gwenview, the KDE image viewer";
-    license = "GPLv2";
-    kde.name = "gwenview";
-  };
-}

pkgs/desktops/kde-4.7/graphics/kamera.nix

@@ -1,12 +0,0 @@
-{ automoc4, cmake, kde, kdelibs, qt4, phonon, libgphoto2 }:
-
-kde.package {
-
-  buildInputs = [ cmake kdelibs qt4 automoc4 phonon libgphoto2 ];
-
-  meta = {
-    description = "KDE camera interface library";
-    license = "GPLv2";
-    kde.name = "kamera";
-  };
-}

pkgs/desktops/kde-4.7/graphics/kgamma.nix

@@ -1,12 +0,0 @@
-{ automoc4, cmake, kde, kdelibs, qt4, phonon, libXxf86vm }:
-
-kde.package {
-
-  buildInputs = [ cmake kdelibs qt4 automoc4 phonon libXxf86vm ];
-
-  meta = {
-    description = "KDE monitor calibration tool";
-    license = "GPLv2";
-    kde.name = "kgamma";
-  };
-}

pkgs/desktops/kde-4.7/graphics/kolourpaint.nix

@@ -1,12 +0,0 @@
-{ automoc4, cmake, kde, kdelibs, qt4, phonon, qimageblitz }:
-
-kde.package {
-
-  buildInputs = [ cmake kdelibs qt4 automoc4 phonon qimageblitz ];
-
-  meta = {
-    description = "KDE paint program"; 
-    license = "GPLv2";
-    kde.name = "kolourpaint";
-  };
-}

pkgs/desktops/kde-4.7/graphics/kruler.nix

@@ -1,12 +0,0 @@
-{ automoc4, cmake, kde, kdelibs, qt4, phonon }:
-
-kde.package {
-
-  buildInputs = [ cmake kdelibs qt4 automoc4 phonon ];
-
-  meta = {
-    description = "KDE screen ruler";
-    license = "GPLv2";
-    kde.name = "kruler";
-  };
-}

pkgs/desktops/kde-4.7/graphics/ksnapshot.nix

@@ -1,12 +0,0 @@
-{ automoc4, cmake, kde, kdelibs, qt4, libkipi, phonon }:
-
-kde.package {
-
-  buildInputs = [ cmake kdelibs qt4 automoc4 libkipi phonon ];
-
-  meta = {
-    description = "KDE screenshot utility";
-    license = "GPLv2";
-    kde.name = "ksnapshot";
-  };
-}

pkgs/desktops/kde-4.7/graphics/okular.nix

@@ -1,16 +0,0 @@
-{ automoc4, chmlib, cmake, djvulibre, ebook_tools, kde, kdelibs, libspectre
-, popplerQt4, qca2, qimageblitz, qt4, phonon }:
-
-kde.package {
-
-  buildInputs =
-    [ automoc4 chmlib cmake djvulibre ebook_tools kdelibs libspectre popplerQt4
-      qca2 qimageblitz qt4 phonon
-    ];
-
-  meta = {
-    description = "Okular, the KDE document viewer";
-    license = "GPLv2";
-    kde.name = "okular";
-  };
-}

pkgs/desktops/kde-4.7/kate.nix

@@ -1,12 +0,0 @@
-{ automoc4, cmake, kde, kdelibs, qt4, shared_mime_info, perl, phonon }:
-
-kde.package {
-
-  buildInputs = [ cmake kdelibs qt4 automoc4 shared_mime_info perl phonon ];
-
-  meta = {
-    description = "Kate, the KDE Advanced Text Editor, as well as KWrite";
-    license = "GPLv2";
-    kde.name = "kate";
-  };
-}

pkgs/desktops/kde-4.7/kcolorchooser.nix

@@ -1,12 +0,0 @@
-{ automoc4, cmake, kde, kdelibs, qt4, phonon }:
-
-kde.package {
-
-  buildInputs = [ cmake kdelibs qt4 automoc4 phonon ];
-
-  meta = {
-    description = "KDE color chooser utility";
-    license = "GPLv2";
-    kde.name = "kcolorchooser";
-  };
-}

pkgs/desktops/kde-4.7/kde-package/default.nix

@@ -1,63 +0,0 @@
-{ stdenv, fetchurl, release, stable ? true }:
-
-rec {
-  inherit release;
-  
-  stable_ = stable;
-
-  defaultArgs = { name, stable ? stable_, version ? release, module ? name, ... }:
-
-    (
-      {
-        name = "${name}-${version}";
-
-        src = fetchurl {
-          url = "mirror://kde/" + (if stable then "" else "un")
-            + "stable/${release}/src/${module}-${release}.tar.bz2";
-          sha256 = (stdenv.lib.findFirst
-              (x: x.module == module)
-              (throw "No module ${module} in release ${release}!")
-              (import (./manifest + "-${release}.nix"))
-            ).sha256;
-        };
-
-        enableParallelBuilding = true;
-
-        meta = {
-          maintainers = with stdenv.lib.maintainers; [ sander urkud ];
-          platforms = stdenv.lib.platforms.linux;
-          homepage = if name == module
-            then http://www.kde.org
-            else assert builtins.substring 0 3 module == "kde";
-              "http://"
-              + builtins.substring 3
-                (builtins.sub (builtins.stringLength module) 3) module
-              + ".kde.org/projects/${name}";
-        };
-      } // (if module == name then { } else {
-        cmakeFlags = ''
-          -DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE
-          -DBUILD_doc=TRUE -DBUILD_${name}=TRUE'';
-      })
-    );
-
-  package = a@{meta, ...}:
-    assert a.meta ? kde;
-    let
-      default = defaultArgs a.meta.kde;
-    in
-# hand-written merge
-    stdenv.mkDerivation (
-      default
-        // removeAttrs a [ "meta" "cmakeFlags" ]
-        // {
-          meta = default.meta // a.meta;
-        }
-        // (if default ? cmakeFlags || a ? cmakeFlags then {
-          cmakeFlags =
-            (if default ? cmakeFlags then "${default.cmakeFlags}" else "")
-            + (if default ? cmakeFlags && a ? cmakeFlags then " " else "")
-            + (if a ? cmakeFlags then a.cmakeFlags else "");
-        } else { }
-      ));
-}

pkgs/desktops/kde-4.7/kde-package/kde-manifest.sh

@@ -1,30 +1,141 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 # Usage: download kde release to $dir, then run
 # $0 $dir
 
-dir=$1
+dir="$1"
 
+# Detect release number & whether it is a stable release
 if [[ ! -d "${dir}" ]]; then
   echo "${dir} is not a directory (or doesn't exist)!" >&2
   exit 1
 fi
 
 release=$(ls "${dir}"/kdelibs-*.tar.bz2 | \
-	sed -e 's/.*kdelibs-//' -e 's/\.tar\.bz2//')
+  sed -e 's/.*kdelibs-//' -e 's/\.tar\.bz2//')
+
+if [[ ${release##*.} -gt 50 ]]; then
+  stable="false"
+else
+  stable="true"
+fi
 
 echo "Detected release ${release}" >&2
 
-exec > "manifest-${release}.nix"
-echo "["
+declare -A hash
+declare -A modules
+declare -a packages
+declare -a top_level
+
+# xsltproc output declares -A module
+if [[ ! -f kde_projects.xml ]]; then
+  curl -O -J http://projects.kde.org/kde_projects.xml
+fi
+eval `xsltproc kde-submodules.xslt kde_projects.xml`
+
+print_sane() {
+  echo "Called print_sane $1" >&2
+  sane="${1//[^a-z0-9_]/_}"
+  if [[ "$sane" != "$1" ]]; then
+    echo "Sane version is $sane" >&2
+    echo -n "sane=\"$sane\";"
+  fi
+}
+
 for i in `cd "${dir}"; ls *-${release}.tar.bz2`; do
-  module=${i%-${release}.tar.bz2}
-  echo -n "${module}.. " >&2
-  hash=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}")
-  echo "{"
-  echo "  module = \"${module}\";"
-  echo "  sha256 = \"${hash}\";"
-  echo "}"
-  echo $hash >&2
+  package=${i%-${release}.tar.bz2}
+  packages+=( "$package" )
+  echo -n "${package}.. " >&2
+  hash[$package]=$(nix-hash --type sha256 --flat --base32 "${dir}/${i}")
+  echo -n ${hash[$package]} >&2
+
+  if [ -n "${module[$package]}" ]; then
+    m="${module[$package]}"
+    echo " (${m})" >&2
+    modules[$m]=1
+  else
+    top_level+=( "$package" )
+    echo " (top-level)" >&2
+  fi
+  #nix-store --add-fixed sha256 "${dir}/${i}" >&2
 done
-echo "]"
+
+
+print_pkg_hash() {
+  echo -n "{name=\"${1}\";value=\"${hash[$1]}\";}"
+}
+
+print_hashes(){
+  echo -n "hashes=builtins.listToAttrs["
+  for p in "${packages[@]}"; do print_pkg_hash "$p"; done
+  echo -n "];"
+}
+
+print_split_module(){
+  echo -n "$1:" >&2
+  echo -n "{module=\"$1\";"
+  print_sane "$1"
+  echo -n "split=true;"
+  echo -n "pkgs=["
+  for p in "${packages[@]}"; do
+    if [[ "${module[$p]}" == "$1" ]]; then
+      echo -n "{name=\"$p\";"
+      print_sane "$p"
+      echo -n "}"
+      echo -n " $p" >&2
+    fi
+  done
+  echo -n "];}"
+  echo >&2
+}
+
+print_mono_module(){
+  echo -n "{module=\"$1\";"
+  print_sane "$1"
+  echo -n "$1 ... " >&2
+  echo -n "split=false;"
+  cml="$1-$release/CMakeLists.txt"
+  tar -xf "${dir}/$1-${release}.tar.bz2" "$cml"
+  if grep '^[^#]*add_subdirectory' $cml >/dev/null; then
+    if grep '^[^#]*add_subdirectory' $cml | grep -v macro_optional_add_subdirectory >/dev/null; then
+      echo " is monolithic (has unconditionally added subdirs)" >&2
+    else
+      subdirs=( `grep '^[^#]*add_subdirectory' $cml |
+        sed -e 's/[^#]*add_subdirectory *( *\(.*\) *)/\1/' |
+        grep -v '\(doc\|cmake\)'` )
+      echo " seems splittable, subdirs: ${subdirs[*]}" >&2
+      echo -n "pkgs=["
+      for s in "${subdirs[@]}"; do
+        echo -n "{name=\"${s//\//-}\";"
+        print_sane "$s"
+        if [[ $s != "${s//\//-}" ]]; then
+          echo -n "subdir=\"$s\";"
+        fi
+        echo -n "}"
+      done
+    echo -n "];"
+    fi
+  else
+    echo " is monolithic (has no subdirs)" >&2
+  fi
+  rm $cml
+  rmdir $1-$release
+  echo -n "}"
+}
+
+print_modules(){
+  echo -n "modules=["
+  echo "Printing modules splitted by upstream" >&2
+  for m in "${!modules[@]}"; do print_split_module "$m"; done
+  echo >&2
+  echo "Printing modules not splitted by upstream (${top_level[*]})" >&2
+  for m in "${top_level[@]}"; do print_mono_module "$m"; done
+  echo -n "];"
+}
+
+echo "Writing ${release}.nix" >&2
+exec > "${release}.nix"
+echo -n "{stable=${stable};"
+print_hashes
+print_modules
+echo -n "}"

pkgs/desktops/kde-4.7/kde-package/kde-submodules.xslt

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- xslt file for http://projects.kde.org/kde_projects.xml -->
+
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+
+	<xsl:output method="text" />
+	<xsl:template match="/">
+		<xsl:for-each select="kdeprojects/component[@identifier='kde']">
+			<xsl:text>declare -A module
</xsl:text>
+			<xsl:for-each select="module">
+				<xsl:variable name="module" select='@identifier' />
+				<xsl:for-each select=".//project[repo]">
+					<xsl:text>module["</xsl:text>
+					<xsl:value-of select='@identifier' />
+					<xsl:text>"]="</xsl:text>
+					<xsl:value-of select="$module" />
+					<xsl:text>"
</xsl:text>
+				</xsl:for-each>
+			</xsl:for-each>
+		</xsl:for-each>
+	</xsl:template>
+</xsl:stylesheet>

pkgs/desktops/kde-4.7/kde-package/manifest-4.7.0.nix

@@ -1,286 +0,0 @@
-[
-{
-  module = "blinken";
-  sha256 = "1g4vpwbal6d7ypmq6l8dh17gi249cd261hsa4bjkvb0wx88i66qr";
-}
-{
-  module = "cantor";
-  sha256 = "0xb4xja9ab4kzgzpikhlkrl68287lqdigvl6pzbh9m6g0ghlp697";
-}
-{
-  module = "gwenview";
-  sha256 = "14a1mjcfcw4nq2c5qkvca8mgdrr31gm24l9nlkcj7p8yrpkxfykh";
-}
-{
-  module = "kalgebra";
-  sha256 = "140528rn3zx489g1lawr1n19i3rrc58h2ii8gh46dnlfcgig13bb";
-}
-{
-  module = "kalzium";
-  sha256 = "1vfa9kdxrdfqqfad0dp2pwi919qs5pbgdk7jmi4dccwlhgmv3226";
-}
-{
-  module = "kamera";
-  sha256 = "02g3mh14rfyrmpa3r8m5pqzxhs4kdb3xvg34434g9r51v3am3ypk";
-}
-{
-  module = "kanagram";
-  sha256 = "04hv13mij4kg8bifs690q4qxr4qk7dnviihlc297x434l0iz2spd";
-}
-{
-  module = "kate";
-  sha256 = "0bd0b354a7cx8cmw2d5pbqn0an38xls86454gclyjd1ilr3l41m9";
-}
-{
-  module = "kbruch";
-  sha256 = "169c6xq0jvp9cv6p9ypk8sryxsh711xdgbs02yiqd476ykavj3jv";
-}
-{
-  module = "kcolorchooser";
-  sha256 = "1f7nj9ccvf1bg3nnm7xchaqvfnskkbnd1h2xd5fxmj9fz1195kqv";
-}
-{
-  module = "kdeaccessibility";
-  sha256 = "01qx0w5dylkbxchj5kg9iawdc0rjbxv1w1dg90ld98fn583g70ws";
-}
-{
-  module = "kdeadmin";
-  sha256 = "1zm6p65wgdn0rv9vzcm89vsiw1696g0bf7kshvwnjmsfc9whsgq3";
-}
-{
-  module = "kdeartwork";
-  sha256 = "12cqpam82k086088i2p1318y1vjr7c8iffppnm6mkbllg2g8ydip";
-}
-{
-  module = "kde-baseapps";
-  sha256 = "0jpi3fjsav52v6ziwdldy03akfpahaagjp3g3m015cmn9bhk2l71";
-}
-{
-  module = "kdegames";
-  sha256 = "1n98jiax7s4m8gb2jq5vdwsg6sfkls7m4mfm627dfsqmvpcgf9k0";
-}
-{
-  module = "kdegraphics-strigi-analyzer";
-  sha256 = "15p0wsiawhygdq9fwp451vcbxbf1sv9pvlwz3x4ma5mp8la7k4vd";
-}
-{
-  module = "kdegraphics-thumbnailers";
-  sha256 = "1gl08an6gzdxvam9fvq5c98zm8m95h6184y0hf0zlqjzkqgg312l";
-}
-{
-  module = "kdelibs";
-  sha256 = "1f0wmcsw0lkfaqdil2yxjfpldr0ckwy5iblkwwaad4n1b4hyssyv";
-}
-{
-  module = "kdemultimedia";
-  sha256 = "0b53vg6gp4qv92w7y721xwbv23bzzljvyl18j05z8ig2l6m57kf5";
-}
-{
-  module = "kdenetwork";
-  sha256 = "1ifg2hxbh80fpszm9r1jzamy65jlkqb6y8fcfa0sngwsklkxn5sh";
-}
-{
-  module = "kdepim";
-  sha256 = "140n4q1rf2jbxmqmkwzam1fipk4k30n3wn9ik8mlqfmxm06dhgqs";
-}
-{
-  module = "kdepimlibs";
-  sha256 = "020irkn43q999idk4kwfi9250fvk98ffi9m998ywgzfl9wps01g0";
-}
-{
-  module = "kdepim-runtime";
-  sha256 = "11ad82hisya8ysx6p1ik6nw1hbyqwksxhimlxcrjkkjh76nphs2g";
-}
-{
-  module = "kdeplasma-addons";
-  sha256 = "1bi7n6lav9z08pvarhsgx9wmm14mr34mvjm4vk9jszrdi7vl2ayj";
-}
-{
-  module = "kde-runtime";
-  sha256 = "1wm91hkj8h1rbavcxwgjfsfrzhr3rs1xd6zf2kxyh1hh9fkdrx3w";
-}
-{
-  module = "kdesdk";
-  sha256 = "04kx9srv8a4z9lic9v3f375rglpz87hhq6wppxksi9qgyc0vzqnv";
-}
-{
-  module = "kdetoys";
-  sha256 = "1ahsk0990a3zx665mjqaljb5w392qkk1pnla5srqg57g62yhig8f";
-}
-{
-  module = "kdeutils";
-  sha256 = "1n031c1i42bq08md156k7fhzw67b28b0a6168m9c9hnhh3483r7l";
-}
-{
-  module = "kde-wallpapers";
-  sha256 = "1xb9k9w479xcwa4caxqn4z1h942lvx7ahy0crxkk41ra3xgw7fg9";
-}
-{
-  module = "kdewebdev";
-  sha256 = "0v8v45rwfldk299ny0jhxqa7xsa1x0ywz7lbqc9i0m3g808ifa29";
-}
-{
-  module = "kde-workspace";
-  sha256 = "0s1l7airb92dd4vprry39nzikarv03qfsmd2j0brif5jjfjd2c3y";
-}
-{
-  module = "kgamma";
-  sha256 = "1xgxnb8x2iy1ikychs8bh5jplkdlk7br6yrmivzrz7s2337dlm35";
-}
-{
-  module = "kgeography";
-  sha256 = "1pm4y5d4d0cl36wgwrkm48yk60m73ljys2awahjsfdpwxs0x42ca";
-}
-{
-  module = "khangman";
-  sha256 = "0ccp1qsji6jjybcbc0rwkw78ypl5kwk1kb74vrnz2ss9anxky2c3";
-}
-{
-  module = "kig";
-  sha256 = "06nk38wg43rxxdzr535vrw4f3d1v9kym5bir6vfpyay8xdxqgf5f";
-}
-{
-  module = "kimono";
-  sha256 = "1p4scmzn0kbkpbrv27658bh56ll9zazaf3rk1p2c6lm6zglvm9gd";
-}
-{
-  module = "kiten";
-  sha256 = "119h7fslp975r0kd7i1zmvhrfrr19rlhm4ni99pd4jxnhz05n47k";
-}
-{
-  module = "klettres";
-  sha256 = "0znca4iqgxlmldyzmd5rf9z2c0jhmmijwxyxaqjffrphq407wms0";
-}
-{
-  module = "kmplot";
-  sha256 = "1zyk3701mhga9d53bm8xyzbw4zn6s9ijfnp0ww2hq9dcm81w12ga";
-}
-{
-  module = "kolourpaint";
-  sha256 = "0ckqz8fmaq92lkaxm87c2nfdjvwp4l310vnicqm2bkkmkma9p6cs";
-}
-{
-  module = "konsole";
-  sha256 = "1apchw8n1k2xyi3h0n3w4fxwy6vx6lxhx7ll3vhfmyl8wa0gzwf5";
-}
-{
-  module = "korundum";
-  sha256 = "1ndhbn6i5napfgp5czsbww1vknss49xhxlj6rn5ci1m5j2zfajic";
-}
-{
-  module = "kross-interpreters";
-  sha256 = "0hzx08r60z9pl7i1hnh6q1zq4s7wmny4015b55prllaa94yb1ya2";
-}
-{
-  module = "kruler";
-  sha256 = "1bydk587las6dx447mihkg7qmn0hn6iis20xfl4wygx7a81imnw3";
-}
-{
-  module = "ksaneplugin";
-  sha256 = "02g4vdgz4k7rahkwss5m1vfv22rzhr6gzmzf79vrbg15mci57jzz";
-}
-{
-  module = "ksnapshot";
-  sha256 = "1dllmx8v2qzkfhy9b3j87yjmkyl3fdkjbmdfqlk5kq2n40k3fha0";
-}
-{
-  module = "kstars";
-  sha256 = "0qgsphimg200kapnjwqh3186z27ypszmhr4knk46jyyczmj2k4nd";
-}
-{
-  module = "ktouch";
-  sha256 = "1w1ps11xazqvvh66v78r714283kd5icvz6dgbh7wfangpqya2g9i";
-}
-{
-  module = "kturtle";
-  sha256 = "0xiz13nb2wgajgm2z105pywi0fcw09appp4k4wbg6nykqdcql0n5";
-}
-{
-  module = "kwordquiz";
-  sha256 = "1rja09mvp7j264ap27m4413dy8l1867ds1w3yizlqlcrl92fby7b";
-}
-{
-  module = "libkdcraw";
-  sha256 = "0dcplib41s5cnv5jjnx2y7d9gd4vls6qlf1vpr1iqsbhrr0az50a";
-}
-{
-  module = "libkdeedu";
-  sha256 = "0nq2b4l5134lkyv0vzfqpp5w7vbr0b6lg88xyjlpih6n9bywiv16";
-}
-{
-  module = "libkexiv2";
-  sha256 = "1fgawizv09vv0almb05sf5f93iqsp3w8x9nx4p9hys66qiz8n467";
-}
-{
-  module = "libkipi";
-  sha256 = "09gpjx4vyncf6js79jf7w4w55lgnzawii40ar7ssrhnxspckbdn0";
-}
-{
-  module = "libksane";
-  sha256 = "1ffwz2g4y12fg8pckz1a0qizziljv17zbn7g1vjf30pw8dpk0x12";
-}
-{
-  module = "marble";
-  sha256 = "0x5yhs28g0z1s9qjmgkdidfp0hmy526l9cmqjccaqn7a61ziv0qz";
-}
-{
-  module = "mobipocket";
-  sha256 = "06qh1xdijc4fscpbxfc7f6mmy1dkxvhx7sb4fmhk2m3z569ir2jx";
-}
-{
-  module = "okular";
-  sha256 = "016xa6i0n1nyq1h9z8nhwc9br9k09l0c2gxhzfd9g6nf528zlbdf";
-}
-{
-  module = "oxygen-icons";
-  sha256 = "1a4dkhay0qrbz9gz2xx3d7vbk18qyjrx9hxgdazjxr35ba6xipgc";
-}
-{
-  module = "parley";
-  sha256 = "0zkj272wrih66mcpr27am9qnp3ab4275is06c8h6hzf5wmfq6sib";
-}
-{
-  module = "perlkde";
-  sha256 = "0pp8ljvck68b45yxhknmyn8z1a1xnq3ahcpz8m6pfch77hlg7fhj";
-}
-{
-  module = "perlqt";
-  sha256 = "0sw1dpxshmmdvp93x59wclslm5xza0yy0f8nmqgdns8c77g0b3k8";
-}
-{
-  module = "pykde4";
-  sha256 = "1mdq474f4jj637k0a9jpb2vcvq4f90vwrhgjs7mqqwmvkh6vv6h0";
-}
-{
-  module = "qtruby";
-  sha256 = "1h7m17d36y5vgaxcqwa814yxmsx19v0xh9m83cq1zznxl62sbmh1";
-}
-{
-  module = "qyoto";
-  sha256 = "1lbdv00hd0s0m5ywjnb52wgz3hb5nx45kwpjkjrjcj1jg76rvk72";
-}
-{
-  module = "rocs";
-  sha256 = "1ma5ylc4rvzjrn1l8rv8684map78zk73fa1a3iz996z1c5fg09wm";
-}
-{
-  module = "smokegen";
-  sha256 = "1g05if9k9ichxlrfly5lha6n2mcihbaz681yg14cjj806s0qs53l";
-}
-{
-  module = "smokekde";
-  sha256 = "0b8kx8a3990l6f7pf252diz7b50r81kxkhigkzkc9lzq833a2siq";
-}
-{
-  module = "smokeqt";
-  sha256 = "0cgjdh9dr4pn1yh423mhifv2yvd283k2mhwkmfn2i0398h71a252";
-}
-{
-  module = "step";
-  sha256 = "1pg7k60rbvr6nfq47xnj98w121703s79z8rap601xrmb8wyfhmyy";
-}
-{
-  module = "svgpart";
-  sha256 = "0xyp4sibcdjxq2ny348m4z95bh71r3q3pm8xfwb1j50my9g8ijir";
-}
-]

pkgs/desktops/kde-4.7/kde-wallpapers.nix

@@ -1,8 +1,8 @@
-{ automoc4, cmake, kde, kdelibs, qt4, phonon }:
+{ kde, kdelibs }:
 
-kde.package {
+kde {
 
-  buildInputs = [ cmake kdelibs qt4 automoc4 phonon ];
+  buildInputs = [ kdelibs ];
 
   outputHashAlgo = "sha256";
   outputHashMode = "recursive";
@@ -10,6 +10,5 @@ kde.package {
 
   meta = {
     description = "Wallpapers for KDE";
-    kde.name = "kde-wallpapers";
   };
 }

pkgs/desktops/kde-4.7/kdeaccessibility/jovie.nix

@@ -0,0 +1,9 @@
+{ kde, kdelibs, speechd }:
+
+kde {
+  buildInputs = [ kdelibs speechd ];
+
+  meta = {
+    description = "Text-to-speech synthesis daemon";
+  };
+}

pkgs/desktops/kde-4.7/kdeaccessibility/kaccessible.nix

@@ -0,0 +1,9 @@
+{ kde, kdelibs, speechd }:
+
+kde {
+  buildInputs = [ kdelibs speechd ];
+
+  meta = {
+    description = "Bridge that provides accessibility services to applications";
+  };
+}

pkgs/desktops/kde-4.7/kdeaccessibility/kmag.nix

@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Screen magnifier for KDE";
+  };
+}

pkgs/desktops/kde-4.7/kdeaccessibility/kmousetool.nix

@@ -0,0 +1,9 @@
+{ kde, kdelibs, libXtst }:
+
+kde {
+  buildInputs = [ kdelibs libXtst ];
+
+  meta = {
+    description = "A program that clicks the mouse for you";
+  };
+}

pkgs/desktops/kde-4.7/kdeaccessibility/kmouth.nix

@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "A type-and-say front end for speech synthesizers";
+  };
+}

pkgs/desktops/kde-4.7/kdeadmin/kcron.nix

@@ -0,0 +1,5 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+}

pkgs/desktops/kde-4.7/kdeadmin/ksystemlog.nix

@@ -0,0 +1,5 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+}

pkgs/desktops/kde-4.7/kdeadmin/kuser.nix

@@ -0,0 +1,5 @@
+{ kde, kdelibs, kdepimlibs }:
+
+kde {
+  buildInputs = [ kdelibs kdepimlibs ];
+}

pkgs/desktops/kde-4.7/kdeadmin/system-config-printer-kde.nix

@@ -1,27 +1,18 @@
-{ kde, cmake, qt4, pkgconfig, perl, pythonPackages
-, sip, pycups, pygobject, system_config_printer
-, kdelibs, automoc4, phonon, kdepimlibs, pykde4
-, cups, nettools }:
+{ kde, pkgconfig, pythonPackages, sip, pycups, pygobject, system_config_printer,
+  kdelibs, kdepimlibs, pykde4, cups, nettools }:
 
-let
+let s_c_p = system_config_printer.override { withGUI = false; }; in
+kde {
+  buildInputs = [ kdelibs kdepimlibs pythonPackages.python pycups pykde4 sip
+    pygobject s_c_p ];
 
-in
-
-kde.package rec {
-
-  buildInputs =
-    [ cmake kdelibs qt4 automoc4 phonon kdepimlibs
-      pythonPackages.python
-      pycups pykde4 sip pygobject system_config_printer
-    ];
-
-  passthru = { inherit system_config_printer; };
+  passthru = { system_config_printer = s_c_p; };
 
   preConfigure =
     ''
       for i in system-config-printer-kde/cmake-modules/FindSystemConfigPrinter.py system-config-printer-kde/system-config-printer-kde.py; do
         substituteInPlace $i \
-          --replace /usr/share/system-config-printer ${system_config_printer}/share/system-config-printer \
+          --replace /usr/share/system-config-printer ${s_c_p}/share/system-config-printer \
           --replace /usr/bin/cupstestppd ${cups}/bin/cupstestppd \
           --replace /bin/hostname ${nettools}/bin/hostname
       done
@@ -32,17 +23,11 @@ kde.package rec {
       # Bake the required Python path into the printer configuration program.
       res=
       for i in $(IFS=:; echo $PYTHONPATH); do res="$res''${res:+,} '$i'"; done
-      
+
       sed -i $out/share/apps/system-config-printer-kde/system-config-printer-kde.py \
           -e "1 a import sys\nsys.path = [$res] + sys.path"
-      
+
       mkdir -p $out/nix-support
       echo ${pykde4} > $out/nix-support/propagated-user-env-packages
     '';
-    
-  meta = {
-    description = "KDE Administration Utilities";
-    license = "GPL";
-    kde.name = "kdeadmin";
-  };
 }

pkgs/desktops/kde-4.7/kdeartwork/ColorSchemes.nix

@@ -0,0 +1,11 @@
+{ kde, kdelibs }:
+
+kde {
+  name = "kde-color-schemes";
+
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Additional KDE color schemes";
+  };
+}

pkgs/desktops/kde-4.7/kdeartwork/HighResolutionWallpapers.nix

@@ -0,0 +1,11 @@
+{ kde, kdelibs }:
+
+kde rec {
+  name = "kde-wallpapers-high-resolution";
+
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "KDE wallpapers in high resolution";
+  };
+}

pkgs/desktops/kde-4.7/kdeartwork/IconThemes.nix

@@ -0,0 +1,13 @@
+{ kde, kdelibs }:
+
+kde {
+  name = "kdeartwork-icon-themes";
+
+  # Sources contain primary and kdeclassic as well but they're not installed
+
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "KDE nuvola and mono icon themes";
+  };
+}

pkgs/desktops/kde-4.7/kdeartwork/WeatherWallpapers.nix

@@ -0,0 +1,11 @@
+{ kde, kdelibs }:
+
+kde rec {
+  name = "kde-weather-wallpapers";
+
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Additional KDE wallpapers (weather)";
+  };
+}

pkgs/desktops/kde-4.7/kdeartwork/aurorae.nix

@@ -0,0 +1,7 @@
+{ kde, kdelibs }:
+
+kde {
+  name = "aurorae-themes";
+
+  buildInputs = [ kdelibs ];
+}

pkgs/desktops/kde-4.7/kdeartwork/desktopthemes.nix

@@ -0,0 +1,11 @@
+{ kde, kdelibs }:
+
+kde {
+  name = "kde-desktop-themes";
+
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Additional KDE desktop themes";
+  };
+}

pkgs/desktops/kde-4.7/kdeartwork/emoticons.nix

@@ -0,0 +1,11 @@
+{ kde, kdelibs }:
+
+kde {
+  name = "kde-emotion-icons";
+
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Additional KDE emotion icons (smiles)";
+  };
+}

pkgs/desktops/kde-4.7/kdeartwork/kscreensaver.nix

@@ -0,0 +1,13 @@
+{ kde, kdelibs, xscreensaver, kde_workspace, eigen, libkexiv2 }:
+
+kde {
+  buildInputs = [ kdelibs xscreensaver kde_workspace eigen libkexiv2 ];
+
+  preConfigure = "cp -v ${./FindXscreensaver.cmake} cmake/modules/FindXscreensaver.cmake";
+
+  cmakeFlags = [ "-DBUILD_asciiquarium:BOOL=ON" ];
+
+  meta = {
+    description = "KDE screensavers";
+  };
+}

pkgs/desktops/kde-4.7/kdeartwork/kwin-styles.nix

@@ -0,0 +1,9 @@
+{ kde, kdelibs, kde_workspace }:
+
+kde {
+  buildInputs = [ kdelibs kde_workspace ];
+
+  meta = {
+    description = "Styles for KWin";
+  };
+}

pkgs/desktops/kde-4.7/kdeartwork/sounds.nix

@@ -0,0 +1,11 @@
+{ kde, kdelibs }:
+
+kde rec {
+  name = "kde-sounds";
+
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "New login/logout sounds";
+  };
+}

pkgs/desktops/kde-4.7/kdeartwork/styles.nix

@@ -0,0 +1,11 @@
+{ kde, kdelibs }:
+
+kde rec {
+  name = "kde-style-phase";
+
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Phase, a widget style for KDE";
+  };
+}

pkgs/desktops/kde-4.7/kdeartwork/wallpapers.nix

@@ -0,0 +1,11 @@
+{ kde, kdelibs }:
+
+kde rec {
+  name = "kde-wallpapers";
+
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Additional KDE wallpapers";
+  };
+}

pkgs/desktops/kde-4.7/kdebase/kate.nix

@@ -0,0 +1,10 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Kate, the KDE Advanced Text Editor, as well as KWrite";
+    license = "GPLv2";
+  };
+}

pkgs/desktops/kde-4.7/kdebase/kde-baseapps.nix

@@ -0,0 +1,10 @@
+{ kde, kdelibs, shared_desktop_ontologies, glib, htmlTidy }:
+
+kde {
+  buildInputs = [ kdelibs shared_desktop_ontologies glib htmlTidy ];
+
+  meta = {
+    description = "Base KDE applications, including the Dolphin file manager and Konqueror web browser";
+    license = "GPLv2";
+  };
+}

pkgs/desktops/kde-4.7/kdebase/kde-runtime.nix

@@ -0,0 +1,20 @@
+{ kde, kdelibs, shared_desktop_ontologies, bzip2, xz, libssh, exiv2, attica,
+  libcanberra, virtuoso, makeWrapper, samba, ntrack
+}:
+
+kde {
+  buildInputs =
+    [ kdelibs shared_desktop_ontologies bzip2 xz libssh exiv2 attica virtuoso
+    makeWrapper samba ntrack (libcanberra.override { gtk = null; })
+    ];
+
+# Copied from kde45, Nepomuk needs it.
+  postInstall = ''
+    wrapProgram "$out/bin/nepomukservicestub" --prefix LD_LIBRARY_PATH : "${virtuoso}/lib" \
+        --prefix PATH : "${virtuoso}/bin"
+  '';
+
+  meta = {
+    license = "LGPL";
+  };
+}

pkgs/desktops/kde-4.7/kdebase/kde-workspace.nix

@@ -1,19 +1,18 @@
-{ automoc4, cmake, kde, kdelibs, qt4, strigi, qimageblitz, libdbusmenu_qt
-, xorg, soprano, shared_desktop_ontologies, lm_sensors, pciutils, libraw1394
-, libusb, libxklavier, perl, python, libqalculate, akonadi, consolekit
-, phonon, xkeyboard_config, kdepimlibs, pam, boost, gpsd
+{ kde, kdelibs, qimageblitz, libdbusmenu_qt, xorg, shared_desktop_ontologies,
+  lm_sensors, pciutils, libraw1394, libusb, libxklavier, python, libqalculate,
+  consolekit, xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison, akonadi,
+  kdebindings
 }:
 
-kde.package {
+kde {
 
   buildInputs =
-    [ cmake kdelibs qt4 automoc4 strigi qimageblitz libdbusmenu_qt
+    [ kdelibs qimageblitz libdbusmenu_qt kdebindings.pykde4
       xorg.libxkbfile xorg.libXcomposite xorg.libXScrnSaver xorg.libXtst
       xorg.libXcomposite xorg.libXdamage xorg.libXau xorg.libXdmcp
       xorg.libpthreadstubs
-      boost gpsd soprano shared_desktop_ontologies lm_sensors pciutils
-      libraw1394 libusb python libqalculate akonadi perl consolekit phonon
-      kdepimlibs pam
+      boost gpsd shared_desktop_ontologies lm_sensors pciutils libraw1394
+      libusb python libqalculate consolekit kdepimlibs pam prison akonadi
     ];
 
   preConfigure =
@@ -29,6 +28,5 @@ kde.package {
   meta = {
     description = "KDE workspace components such as Plasma, Kwin and System Settings";
     license = "GPLv2";
-    kde.name = "kde-workspace";
   };
 }

pkgs/desktops/kde-4.7/kdebase/konsole.nix

@@ -0,0 +1,11 @@
+{ kde, kdelibs }:
+
+kde {
+
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Konsole, the KDE terminal emulator";
+    license = "GPLv2";
+  };
+}

pkgs/desktops/kde-4.7/kdebindings/perlqt.nix

@@ -0,0 +1,10 @@
+{ kde, cmake, kdebindings, perl }:
+
+kde {
+  buildInputs = [ kdebindings.smokeqt perl ];
+  buildNativeInputs = [ cmake ];
+
+  meta = {
+    description = "Perl bindings for Qt library";
+  };
+}

pkgs/desktops/kde-4.7/kdebindings/pykde-purity.patch

@@ -0,0 +1,49 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c853e38..5df3253 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -73,7 +73,7 @@ INCLUDE_DIRECTORIES(
+     ${QT_QTWEBKIT_INCLUDE_DIR}
+     ${KDE4_INCLUDE_DIR}
+     ${KDE4_INCLUDE_DIR}/solid
+-    ${KDE4_INCLUDE_DIR}/phonon
++	${PHONON_INCLUDE_DIR}/phonon
+     ${KDE4_INCLUDE_DIR}/kio
+     ${KDE4_INCLUDE_DIR}/kdeprint
+     ${KDE4_INCLUDE_DIR}/kdeprint/lpr
+@@ -232,7 +232,7 @@ _pkg_config = {
+     'pykde_kde_sip_flags':  '${_SIP_TAGS} ${_SIP_X} ${SIP_EXTRA_OPTIONS}',
+     'pykde_mod_dir':        '${PYTHON_SITE_PACKAGES_INSTALL_DIR}/PyKDE4',
+     'pykde_modules':        '${PYKDE_MODULES}',
+-    'pykde_sip_dir':        '${SIP_DEFAULT_SIP_DIR}/PyKDE4',
++    'pykde_sip_dir':        '${CMAKE_INSTALL_PREFIX}/share/sip/PyKDE4',
+     'pykde_version':        kde_version_hex,
+     'pykde_version_str':    '${KDE_VERSION}'
+ }
+@@ -244,7 +244,7 @@ PYTHON_INSTALL(${CMAKE_CURRENT_BINARY_DIR}/pykdeconfig.py ${PYTHON_SITE_PACKAGES
+ 
+ # Install the .sip files for anyone that wants to build bindings on top of PyKDE4.
+ # (Don't forget the / at the end of sip/.)
+-INSTALL(DIRECTORY sip/ DESTINATION ${SIP_DEFAULT_SIP_DIR}/PyKDE4
++INSTALL(DIRECTORY sip/ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/sip/PyKDE4
+     PATTERN "*~" EXCLUDE    # This sucks, why can't I just whitelist what I _do_ want?
+     PATTERN ".svn" EXCLUDE
+     PATTERN "*.in" EXCLUDE)
+diff --git a/kpythonpluginfactory/CMakeLists.txt b/kpythonpluginfactory/CMakeLists.txt
+index 41fa0fe..642d867 100644
+--- a/kpythonpluginfactory/CMakeLists.txt
++++ b/kpythonpluginfactory/CMakeLists.txt
+@@ -3,7 +3,12 @@
+ set(kpythonpluginfactory_SRCS
+     kpythonpluginfactory.cpp)
+ 
+-GET_FILENAME_COMPONENT(LIB_PYTHON ${PYTHON_LIBRARY} NAME)
++option(HARDCODE_LIB_PYTHON_PATH "Whether the path to libpython.so should be hardcoded" OFF)
++if(HARDCODE_LIB_PYTHON_PATH)
++	get_filename_component(LIB_PYTHON ${PYTHON_LIBRARY} REALPATH)
++else(HARDCODE_LIB_PYTHON_PATH)
++    get_filename_component(LIB_PYTHON ${PYTHON_LIBRARY} NAME)
++endif(HARDCODE_LIB_PYTHON_PATH)
+ ADD_DEFINITIONS(-DLIB_PYTHON=\\"${LIB_PYTHON}\\")
+ ADD_DEFINITIONS(-DKDE_DEFAULT_DEBUG_AREA=15000)
+ 

pkgs/desktops/kde-4.7/kdebindings/pykde4.nix

@@ -0,0 +1,30 @@
+{ kde, kdelibs, python, sip, pyqt4, kdepimlibs, shared_desktop_ontologies,
+  boost, lndir }:
+
+let pydir = "lib/python${python.majorVersion}"; in
+
+kde {
+  buildInputs = [ python kdepimlibs shared_desktop_ontologies boost ];
+
+  propagatedBuildInputs = [ pyqt4 sip ];
+
+#NIX_CFLAGS_COMPILE = "-I${phonon}/include/phonon";
+
+  patches = [ ./pykde-purity.patch ];
+
+  cmakeFlags = "-DHARDCODE_LIB_PYTHON_PATH=ON";
+
+  preConfigure =
+    ''
+      # Symlink PyQt into PyKDE.  This is necessary because PyQt looks
+      # in its PyQt4/uic/widget-plugins directory for plugins, and KDE
+      # needs to install a plugin.
+      mkdir -pv $out/${pydir}
+      ${lndir}/bin/lndir ${pyqt4}/${pydir} $out/${pydir}
+    '';
+
+  meta = {
+    description = "Python bindings for KDE";
+    kde.name = "pykde4";
+  };
+}

pkgs/desktops/kde-4.7/kdebindings/smokegen.nix

@@ -0,0 +1,13 @@
+{ kde, qt4, cmake }:
+
+kde {
+  buildInputs = [ qt4 ];
+  buildNativeInputs = [ cmake ];
+
+  patchPhase = "sed -e /RPATH/d -i CMakeLists.txt";
+
+  meta = {
+    description = "C++ parser used to generate language bindings for Qt/KDE";
+    license = "GPLv2";
+  };
+}

pkgs/desktops/kde-4.7/kdebindings/smokekde.nix

@@ -0,0 +1,10 @@
+{ kde, kdelibs, kdebindings }:
+
+kde {
+  propagatedBuildInputs = [ kdelibs kdebindings.smokeqt ];
+
+  meta = {
+    description = "C++ parser used to generate language bindings for Qt/KDE";
+    license = "GPLv2";
+  };
+}

pkgs/desktops/kde-4.7/kdebindings/smokeqt.nix

@@ -0,0 +1,12 @@
+{ kde, qt4, cmake, phonon, qimageblitz, kdebindings }:
+
+kde {
+  propagatedBuildInputs = [ qt4 phonon qimageblitz ];
+  buildNativeInputs = [ cmake ];
+  propagatedBuildNativeInputs = [ kdebindings.smokegen ];
+
+  meta = {
+    description = "C++ parser used to generate language bindings for Qt/KDE";
+    license = "GPLv2";
+  };
+}

pkgs/desktops/kde-4.7/kdeedu/FindLibfacile.cmake

@@ -0,0 +1,32 @@
+# - Try to find Libfacile
+# Once done this will define
+#
+#  LIBFACILE_FOUND - system has Libfacile
+#  LIBFACILE_INCLUDE_DIR - the Libfacile include directory
+#  LIBFACILE_LIBRARIES - Link these to use Libfacile
+#
+# Copyright (c) 2006, Carsten Niehaus, <cniehaus@gmx.de>
+# Copyright (c) 2006, Montel Laurent, <montel@kde.org>
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+
+find_package(OCaml)
+
+if( OCAML_FOUND )
+   find_library(LIBFACILE_LIBRARIES NAMES facile.a
+       HINTS ${OCAMLC_DIR}
+       PATH_SUFFIXES facile ocaml/facile
+   )
+   find_path(LIBFACILE_INCLUDE_DIR NAMES facile.cmi
+       HINTS ${OCAMLC_DIR}
+       PATH_SUFFIXES facile lib/ocaml/facile
+   )
+endif(OCAML_FOUND)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Libfacile DEFAULT_MSG LIBFACILE_INCLUDE_DIR
+	LIBFACILE_LIBRARIES OCAML_FOUND)
+
+# show the LIBFACILE_INCLUDE_DIR and LIBFACILE_LIBRARIES variables only in the advanced view
+mark_as_advanced(LIBFACILE_INCLUDE_DIR LIBFACILE_LIBRARIES )

pkgs/desktops/kde-4.7/kdeedu/blinken.nix

@@ -0,0 +1,8 @@
+{ kde, kdelibs }:
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Memory Enhancement Game";
+  };
+}

pkgs/desktops/kde-4.7/kdeedu/cantor.nix

@@ -0,0 +1,8 @@
+{ kde, kdelibs, libspectre }:
+kde {
+  buildInputs = [ kdelibs libspectre ];
+
+  meta = {
+    description = "KDE Frontend to Mathematical Software";
+  };
+}

pkgs/desktops/kde-4.7/kdeedu/kalgebra.nix

@@ -0,0 +1,8 @@
+{ kde, kdelibs, libkdeedu, readline }:
+kde {
+  buildInputs = [ kdelibs libkdeedu readline ];
+
+  meta = {
+    description = "2D and 3D Graph Calculator";
+  };
+}

pkgs/desktops/kde-4.7/kdeedu/kalzium-feature-log.patch

@@ -0,0 +1,15 @@
+commit d96c6e70400dcd4e3514065e607388b80f96d6a1
+Author: Yury G. Kudryashov <urkud.urkud@gmail.com>
+Date:   Mon Aug 15 00:53:16 2011 +0400
+
+    Display feature log
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 132934c..eec6942 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -47,3 +47,4 @@ add_subdirectory(src)
+ add_subdirectory(data)
+ add_subdirectory(plasmoid)
+ add_subdirectory(libscience)
++macro_display_feature_log()

pkgs/desktops/kde-4.7/kdeedu/kalzium.nix

@@ -0,0 +1,15 @@
+{ kde, kdelibs, facile, ocaml, eigen, openbabel, avogadro }:
+kde {
+  buildInputs = [ kdelibs facile ocaml eigen openbabel avogadro ];
+
+  prePatch = ''
+    cp -v ${./FindLibfacile.cmake} cmake/modules/FindLibfacile.cmake
+    sed -e 's/\+facile/''${LIBFACILE_INCLUDE_DIR}/' -i src/CMakeOCamlInstructions.cmake
+    '';
+
+  patches = [ ./kalzium-feature-log.patch ];
+
+  meta = {
+    description = "Periodic Table of Elements";
+  };
+}

pkgs/desktops/kde-4.7/kdeedu/kanagram.nix

@@ -0,0 +1,8 @@
+{ kde, kdelibs, libkdeedu }:
+kde {
+  buildInputs = [ kdelibs libkdeedu ];
+
+  meta = {
+    description = "Letter Order Game";
+  };
+}

pkgs/desktops/kde-4.7/kdeedu/kbruch.nix

@@ -0,0 +1,8 @@
+{ kde, kdelibs }:
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Practice Fractions";
+  };
+}

pkgs/desktops/kde-4.7/kdeedu/kgeography.nix

@@ -0,0 +1,8 @@
+{ kde, kdelibs }:
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Geography Trainer";
+  };
+}

pkgs/desktops/kde-4.7/kdeedu/khangman.nix

@@ -0,0 +1,8 @@
+{ kde, kdelibs, libkdeedu }:
+kde {
+  buildInputs = [ kdelibs libkdeedu ];
+
+  meta = {
+    description = "KDE hangman game";
+  };
+}

pkgs/desktops/kde-4.7/kdeedu/kig.nix

@@ -0,0 +1,12 @@
+{ kde, kdelibs, boost, python}:
+kde {
+  buildInputs = [ kdelibs boost python ];
+
+  cmakeFlags = ''
+    -DBOOST_PYTHON_INCLUDES:PATH=${boost}/include;${python}/include/${python.libPrefix}
+    -DBOOST_PYTHON_LIBS=boost_python;${python.libPrefix} -DKIG_ENABLE_PYTHON_SCRIPTING=1
+    '';
+  meta = {
+    description = "KDE Interactive Geometry";
+  };
+}

pkgs/desktops/kde-4.7/kdeedu/kiten.nix

@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Japanese Reference/Study Tool";
+  };
+}

pkgs/desktops/kde-4.7/kdeedu/klettres.nix

@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "A KDE alphabet tutorial";
+  };
+}

pkgs/desktops/kde-4.7/kdeedu/kmplot.nix

@@ -1,7 +1,7 @@
-{ kde, cmake, kdelibs, qt4, automoc4, phonon }:
+{ kde, kdelibs }:
 
-kde.package {
-  buildInputs = [ cmake kdelibs qt4 automoc4 phonon ];
+kde {
+  buildInputs = [ kdelibs ];
 
   meta = {
     description = "A KDE mathematical function plotter";

pkgs/desktops/kde-4.7/kdeedu/kstars.nix

@@ -0,0 +1,9 @@
+{ kde, kdelibs, eigen, xplanet, indilib }:
+
+kde {
+  buildInputs = [ kdelibs eigen xplanet indilib ];
+
+  meta = {
+    description = "A KDE graphical desktop planetarium";
+  };
+}

pkgs/desktops/kde-4.7/kdeedu/ktouch.nix

@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Touch Typing Tutor";
+  };
+}

pkgs/desktops/kde-4.7/kdeedu/kturtle.nix

@@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Educational Programming Environment";
+  };
+}

pkgs/desktops/kde-4.7/kdeedu/kwordquiz.nix

@@ -0,0 +1,9 @@
+{ kde, kdelibs, libkdeedu }:
+
+kde {
+  buildInputs = [ kdelibs libkdeedu ];
+
+  meta = {
+    description = "Flash Card Trainer";
+  };
+}

pkgs/desktops/kde-4.7/kdeedu/libkdeedu.nix

@@ -0,0 +1,8 @@
+{ kde, kdelibs }:
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Libraries used by KDE Education applications";
+  };
+}

pkgs/desktops/kde-4.7/kdeedu/marble.nix

@@ -0,0 +1,9 @@
+{ kde, kdelibs, gpsd }:
+
+kde {
+  buildInputs = [ kdelibs gpsd ];
+
+  meta = {
+    description = "Marble Virtual Globe";
+  };
+}

pkgs/desktops/kde-4.7/kdeedu/parley.nix

@@ -0,0 +1,9 @@
+{ kde, kdelibs, libkdeedu, libxml2, attica }:
+
+kde {
+  buildInputs = [ kdelibs libkdeedu libxml2 attica ];
+
+  meta = {
+    description = "Vocabulary Trainer";
+  };
+}

pkgs/desktops/kde-4.7/kdeedu/rocs.nix

@@ -1,7 +1,7 @@
-{ kde, cmake, kdelibs, qt4, automoc4, phonon, boost, perl }:
+{ kde, kdelibs, boost }:
 
-kde.package {
-  buildInputs = [ cmake kdelibs qt4 automoc4 phonon boost perl ];
+kde {
+  buildInputs = [ kdelibs (boost.override { enableExceptions = true; }) ];
 
   NIX_CFLAGS_COMPILE = "-fexceptions";
 

pkgs/desktops/kde-4.7/kdeedu/step.nix

@@ -0,0 +1,12 @@
+{ kde, kdelibs, gsl, libqalculate, eigen }:
+
+kde {
+  buildInputs = [ kdelibs gsl libqalculate eigen ];
+
+  meta = {
+    description = "A KDE interactive physical simulator";
+    kde = {
+      name = "step";
+    };
+  };
+}

pkgs/desktops/kde-4.7/kdegames.nix

@@ -0,0 +1,18 @@
+{ kde, kdelibs, qca2, twisted, pythonPackages, sip, makeWrapper, kdebindings,
+  openal, libsndfile, qhull }:
+
+kde rec {
+  buildInputs = [ kdelibs qca2 pythonPackages.python pythonPackages.wrapPython
+    openal libsndfile qhull ] ++ pythonPath;
+
+  pythonPath = [ pythonPackages.twisted kdebindings.pykde4 ];
+
+  # TODO: ggz
+
+  postInstall = "wrapPythonPrograms";
+
+  meta = {
+    description = "KDE Games";
+    license = "GPL";
+  };
+}

pkgs/desktops/kde-4.7/kdegraphics/gwenview.nix

@@ -0,0 +1,12 @@
+{ kde, kdelibs, exiv2, shared_desktop_ontologies, kde_baseapps, libkipi }:
+
+kde {
+
+  buildInputs =
+    [ kdelibs exiv2 shared_desktop_ontologies kde_baseapps libkipi ];
+
+  meta = {
+    description = "Gwenview, the KDE image viewer";
+    license = "GPLv2";
+  };
+}