Merge master into x-updates

2014-02-16 11:45:02 +01:00 · 2014-02-16 11:45:02 +01:00 · 96f07fa74e
commit 96f07fa74e
parent 9a86ad2f7f 26d7645b6b
434 changed files with 4678 additions and 1227 deletions
--- a/doc/language-support.xml
+++ b/doc/language-support.xml
@ -108,7 +108,7 @@ a <varname>preConfigure</varname> hook to generate a configuration
 file used by <filename>Makefile.PL</filename>:

 <programlisting>
-{buildPerlPackage, fetchurl, db4}:
+{buildPerlPackage, fetchurl, db}:

 buildPerlPackage rec {
  name = "BerkeleyDB-0.36";
@ -119,8 +119,8 @@ buildPerlPackage rec {
  };

  preConfigure = ''
-    echo "LIB = ${db4}/lib" > config.in
-    echo "INCLUDE = ${db4}/include" >> config.in
+    echo "LIB = ${db}/lib" > config.in
+    echo "INCLUDE = ${db}/include" >> config.in
  '';
 }
 </programlisting>
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@ -34,6 +34,7 @@
  jcumming = "Jack Cummings <jack@mudshark.org>";
  kkallio = "Karn Kallio <tierpluspluslists@gmail.com>";
  ktosiek = "Tomasz Kontusz <tomasz.kontusz@gmail.com>";
+  lethalman = "Luca Bruno <lucabru@src.gnome.org>";
  linquize = "Linquize <linquize@yahoo.com.hk>";
  lovek323 = "Jason O'Conal <jason@oconal.id.au>";
  ludo = "Ludovic Courtès <ludo@gnu.org>";
@ -56,6 +57,7 @@
  rob = "Rob Vermaas <rob.vermaas@gmail.com>";
  roconnor = "Russell O'Connor <roconnor@theorem.ca>";
  roelof = "Roelof Wobben <rwobben@hotmail.com>";
+  rszibele = "Richard Szibele <richard_szibele@hotmail.com>";
  sander = "Sander van der Burg <s.vanderburg@tudelft.nl>";
  shlevy = "Shea Levy <shea@shealevy.com>";
  simons = "Peter Simons <simons@cryp.to>";
--- a/lib/modules.nix
+++ b/lib/modules.nix
@ -12,7 +12,7 @@ rec {
     and ‘config’: the nested set of all option values. */
  evalModules = { modules, prefix ? [], args ? {}, check ? true }:
    let
-      args' = args // result;
+      args' = args // { lib = import ./.; } // result;
      closed = closeModules modules args';
      # Note: the list of modules is reversed to maintain backward
      # compatibility with the old module system.  Not sure if this is
--- a/nixos/maintainers/scripts/ec2/create-ebs-amis.py
+++ b/nixos/maintainers/scripts/ec2/create-ebs-amis.py
@ -203,7 +203,7 @@ f = open("{0}.{1}.ami-id".format(args.region, image_type), "w")
 f.write("{0}".format(ami_id))
 f.close()

-for dest in [ 'us-east-1', 'us-west-1', 'us-west-2', 'eu-west-1']:
+for dest in [ 'us-east-1', 'us-west-1', 'us-west-2', 'eu-west-1', 'ap-southeast-1', 'ap-southeast-2', 'ap-northeast-1', 'sa-east-1']:
    if args.region != dest:
        print >> sys.stderr, "copying image from region {0} to {1}".format(args.region, dest)
        conn = boto.ec2.connect_to_region(dest)
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@ -111,6 +111,7 @@
      memcached = 100;
      cgminer = 101;
      munin = 102;
+      logcheck = 103;

      # When adding a uid, make sure it doesn't match an existing gid.

@ -201,6 +202,7 @@
      openldap = 93;
      connman = 94;
      munin = 95;
+      keys = 96;

      # When adding a gid, make sure it doesn't match an existing uid.

--- a/nixos/modules/security/ca.nix
+++ b/nixos/modules/security/ca.nix
@ -10,11 +10,6 @@ with pkgs.lib;
      [ { source = "${pkgs.cacert}/etc/ca-bundle.crt";
          target = "ssl/certs/ca-bundle.crt";
        }
-
-        # Backward compatibility; may remove at some point.
-        { source = "${pkgs.cacert}/etc/ca-bundle.crt";
-          target = "ca-bundle.crt";
-        }
      ];

    environment.variables.OPENSSL_X509_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt";
--- a/nixos/modules/services/logging/logcheck.nix
+++ b/nixos/modules/services/logging/logcheck.nix
@ -208,12 +208,13 @@ in
        mapAttrsToList writeIgnoreRule cfg.ignore
        ++ mapAttrsToList writeIgnoreCronRule cfg.ignoreCron;

-    users.extraUsers = singleton
-      { name = cfg.user;
+    users.extraUsers = optionalAttrs (cfg.user == "logcheck") (singleton
+      { name = "logcheck";
+        uid = config.ids.uids.logcheck;
        shell = "/bin/sh";
        description = "Logcheck user account";
        extraGroups = cfg.extraGroups;
-      };
+      });

    system.activationScripts.logcheck = ''
      mkdir -m 700 -p /var/{lib,lock}/logcheck
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@ -177,16 +177,13 @@ in {
    systemd.services."networkmanager-init" = {
      description = "NetworkManager initialisation";
      wantedBy = [ "network.target" ];
-      partOf = [ "NetworkManager.service" ];
-      wants = [ "ModemManager.service" ];
+      wants = [ "NetworkManager.service" ];
      before = [ "NetworkManager.service" ];
      script = ''
        mkdir -m 700 -p /etc/NetworkManager/system-connections
        mkdir -m 755 -p ${stateDirs}
      '';
-      serviceConfig = {
-        Type = "oneshot";
-      };
+      serviceConfig.Type = "oneshot";
    };

    # Turn off NixOS' network management
--- a/nixos/modules/services/networking/vsftpd.nix
+++ b/nixos/modules/services/networking/vsftpd.nix
@ -91,6 +91,7 @@ let
      ${optionalString (pkgs.stdenv.system == "x86_64-linux") ''
        seccomp_sandbox=NO
      ''}
+      anon_umask=${cfg.anonymousUmask}
    '';

 in
@ -139,6 +140,13 @@ in
        description = "RSA certificate file.";
      };

+      anonymousUmask = mkOption {
+        type = types.string;
+        default = "077";
+        example = "002";
+        description = "Anonymous write umask.";
+      };
+
    } // (listToAttrs (catAttrs "nixosOption" optionDescription));

  };
--- a/nixos/modules/services/printing/cupsd.nix
+++ b/nixos/modules/services/printing/cupsd.nix
@ -143,7 +143,9 @@ in
      };

    services.printing.drivers =
-      [ pkgs.cups pkgs.cups_pdf_filter pkgs.ghostscript additionalBackends pkgs.perl pkgs.coreutils pkgs.gnused ];
+      [ pkgs.cups pkgs.cups_pdf_filter pkgs.ghostscript additionalBackends
+        pkgs.perl pkgs.coreutils pkgs.gnused pkgs.bc pkgs.gawk pkgs.gnugrep
+	];

    services.printing.cupsdConf =
      ''
--- a/nixos/modules/services/ttys/agetty.nix
+++ b/nixos/modules/services/ttys/agetty.nix
@ -28,6 +28,17 @@ with pkgs.lib;
        '';
      };

+      serialSpeed = mkOption {
+        type = types.listOf types.int;
+        default = [ 115200 57600 38400 9600 ];
+        example = [ 38400 9600 ];
+        description = ''
+            Bitrates to allow for agetty's listening on serial ports. Listing more
+            bitrates gives more interoperability but at the cost of long delays
+            for getting a sync on the line.
+        '';
+      };
+
    };

  };
@ -78,8 +89,9 @@ with pkgs.lib;
        X-RestartIfChanged=false
      '';
    
-    systemd.units."serial-getty@.service".text =
-      ''
+    systemd.units."serial-getty@.service".text = let
+        speeds = with pkgs.lib; concatStringsSep "," (map toString config.services.mingetty.serialSpeed);
+      in ''
        [Unit]
        Description=Serial Getty on %I
        Documentation=man:agetty(8) man:systemd-getty-generator(8)
@ -95,7 +107,7 @@ with pkgs.lib;
        [Service]
        Environment=TERM=linux
        Environment=LOCALE_ARCHIVE=/run/current-system/sw/lib/locale/locale-archive
-        ExecStart=@${pkgs.utillinux}/sbin/agetty agetty --login-program ${pkgs.shadow}/bin/login %I 115200,57600,38400,9600
+        ExecStart=@${pkgs.utillinux}/sbin/agetty agetty --login-program ${pkgs.shadow}/bin/login %I ${speeds}
        Type=idle
        Restart=always
        RestartSec=0
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@ -9,6 +9,7 @@ let
    user ${cfg.user} ${cfg.group};
    daemon off;
    ${cfg.config}
+    ${cfg.appendConfig}
  '';
 in

@ -36,6 +37,19 @@ in
        ";
      };

+      appendConfig = mkOption {
+        type = types.lines;
+        default = "";
+        description = ''
+          Configuration lines appended to the generated Nginx
+          configuration file. Commonly used by different modules
+          providing http snippets. <option>appendConfig</option>
+          can be specified more than once and it's value will be
+          concatenated (contrary to <option>config</option> which
+          can be set only once).
+        '';
+      };
+
      stateDir = mkOption {
        default = "/var/spool/nginx";
        description = "
--- a/nixos/modules/services/x11/redshift.nix
+++ b/nixos/modules/services/x11/redshift.nix
@ -14,24 +14,37 @@ in {

    services.redshift.latitude = mkOption {
      description = "Your current latitude";
-      type = types.string;
+      type = types.uniq types.string;
    };

    services.redshift.longitude = mkOption {
      description = "Your current longitude";
-      type = types.string;
+      type = types.uniq types.string;
    };

    services.redshift.temperature = {
      day = mkOption {
        description = "Colour temperature to use during day time";
        default = 5500;
-        type = types.int;
+        type = types.uniq types.int;
      };
      night = mkOption {
        description = "Colour temperature to use during night time";
        default = 3700;
-        type = types.int;
+        type = types.uniq types.int;
+      };
+    };
+
+    services.redshift.brightness = {
+      day = mkOption {
+        description = "Screen brightness to apply during the day (between 0.1 and 1.0)";
+        default = 1;
+        type = types.uniq types.string;
+      };
+      night = mkOption {
+        description = "Screen brightness to apply during the night (between 0.1 and 1.0)";
+        default = 1;
+        type = types.uniq types.string;
      };
    };
  };
@ -41,10 +54,12 @@ in {
      description = "Redshift colour temperature adjuster";
      requires = [ "display-manager.service" ];
      after = [ "display-manager.service" ];
-      script = ''
+      wantedBy = [ "graphical.target" ];
+      serviceConfig.ExecStart = ''
        ${pkgs.redshift}/bin/redshift \
          -l ${cfg.latitude}:${cfg.longitude} \
-          -t ${toString cfg.temperature.day}:${toString cfg.temperature.night}
+          -t ${toString cfg.temperature.day}:${toString cfg.temperature.night} \
+          -b ${toString cfg.brightness.day}:${toString cfg.brightness.night}
      '';
      environment = { DISPLAY = ":0"; };
      serviceConfig.Restart = "always";
--- a/nixos/modules/system/boot/stage-1-init.sh
+++ b/nixos/modules/system/boot/stage-1-init.sh
@ -320,6 +320,10 @@ while read -u 3 mountPoint; do
        echo -n "waiting for device $device to appear..."
        for try in $(seq 1 20); do
            sleep 1
+            # also re-try lvm activation now that new block devices might have appeared
+            lvm vgchange -ay
+            # and tell udev to create nodes for the new LVs
+            udevadm trigger --action=add
            if test -e $device; then break; fi
            echo -n "."
        done
--- a/nixos/modules/system/boot/stage-2-init.sh
+++ b/nixos/modules/system/boot/stage-2-init.sh
@ -136,7 +136,8 @@ fi
 # elsehwere)
 if ! mountpoint -q /run/keys; then
    rm -rf /run/keys
-    mkdir -m 0700 /run/keys
+    mkdir -m 0750 /run/keys
+    chown root:keys /run/keys
    mount -t ramfs none /run/keys
 fi

--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@ -645,6 +645,8 @@ in
      '';

    # Target for ‘charon send-keys’ to hook into.
+    users.extraGroups.keys.gid = config.ids.gids.keys;
+
    systemd.targets.keys =
      { description = "Security Keys";
      };
--- a/nixos/modules/virtualisation/virtualbox-image.nix
+++ b/nixos/modules/virtualisation/virtualbox-image.nix
@ -111,5 +111,5 @@ with pkgs.lib;
  # Prevent logging in as root without a password.  For NixOps, we
  # don't need this because the user can login via SSH, and for the
  # demo images, there is a demo user account that can sudo to root.
-  security.initialRootPassword = "!";
+  security.initialRootPassword = mkDefault "!";
 }
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@ -44,7 +44,7 @@ in rec {
        (all nixos.iso_graphical)
        (all nixos.ova)

-        #(all nixos.tests.efi-installer.simple)
+        (all nixos.tests.efi-installer.simple)
        (all nixos.tests.firefox)
        (all nixos.tests.firewall)
        (all nixos.tests.installer.grub1)
--- a/pkgs/applications/audio/amarok/default.nix
+++ b/pkgs/applications/audio/amarok/default.nix
@ -22,12 +22,10 @@ stdenv.mkDerivation rec {

  cmakeFlags = "-DKDE4_BUILD_TESTS=OFF";

-  postInstall = ''
-    mkdir -p $out/nix-support
-    echo ${qtscriptgenerator} > $out/nix-support/propagated-user-env-packages
-  '';
+  propagatedUserEnvPkgs = [ qtscriptgenerator ];

  meta = {
+    repositories.git = git://anongit.kde.org/amarok.git;
    description = "Popular music player for KDE";
    license = "GPL";
    homepage = http://amarok.kde.org;
--- a/pkgs/applications/audio/moc/default.nix
+++ b/pkgs/applications/audio/moc/default.nix
@ -1,4 +1,4 @@
-{ stdenv, fetchurl, ncurses, pkgconfig, alsaLib, flac, libmad, speex, ffmpeg_0_10, libvorbis, mpc, libsndfile, jackaudio, db4, libmodplug, timidity, libid3tag, libtool }:
+{ stdenv, fetchurl, ncurses, pkgconfig, alsaLib, flac, libmad, speex, ffmpeg_0_10, libvorbis, mpc, libsndfile, jackaudio, db, libmodplug, timidity, libid3tag, libtool }:

 stdenv.mkDerivation rec {
  name = "moc-${version}";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {

  configurePhase = "./configure prefix=$out";

-  buildInputs = [ ncurses pkgconfig alsaLib flac libmad speex ffmpeg_0_10 libvorbis mpc libsndfile jackaudio db4 libmodplug timidity libid3tag libtool ];
+  buildInputs = [ ncurses pkgconfig alsaLib flac libmad speex ffmpeg_0_10 libvorbis mpc libsndfile jackaudio db libmodplug timidity libid3tag libtool ];

  meta = {
    description = "MOC (music on console) is a console audio player for LINUX/UNIX designed to be powerful and easy to use.";
--- a/pkgs/applications/audio/qmmp/default.nix
+++ b/pkgs/applications/audio/qmmp/default.nix
@ -28,11 +28,11 @@
 # handle that.

 stdenv.mkDerivation rec {
-  name = "qmmp-0.7.3";
+  name = "qmmp-0.7.5";

  src = fetchurl {
    url = "http://qmmp.ylsoftware.com/files/${name}.tar.bz2";
-    sha256 = "0qjmnyq3qmrm510g3lsa6vd80nmbz0859pwhnaaa19ah0jhf3r2p";
+    sha256 = "0ryg4hns5zi9swn2q4vxjya3i4drdqfzycngwzd6fdl176lswrk0";
  };

  buildInputs =
--- a/pkgs/applications/editors/emacs-modes/writegood/default.nix
+++ b/pkgs/applications/editors/emacs-modes/writegood/default.nix
@ -0,0 +1,30 @@
+{stdenv, fetchurl, emacs}:
+
+let version = "1.3";
+
+in stdenv.mkDerivation {
+  name = "writegood-mode-${version}";
+  src = fetchurl {
+    url = "https://github.com/bnbeckwith/writegood-mode/archive/v${version}.tar.gz";
+    sha256 = "0p34rgawnqg94vk4lcw14x99rrvsd23dmbwkxz2vax5kq6l8y5yf";
+  };
+
+  buildInputs = [ emacs ];
+
+  buildPhase = ''
+    emacs -L . --batch -f batch-byte-compile *.el
+  '';
+
+  installPhase = ''
+    install -d $out/share/emacs/site-lisp
+    install *.el *.elc $out/share/emacs/site-lisp
+  '';
+
+  meta = {
+    description = "Emacs minor mode that aids in finding common writing problems";
+    homepage = https://github.com/bnbeckwith/writegood-mode;
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.pSub ];
+    license = "GPL3";
+  };
+}
--- a/pkgs/applications/editors/scite/default.nix
+++ b/pkgs/applications/editors/scite/default.nix
@ -0,0 +1,35 @@
+{ stdenv, fetchurl, pkgconfig, gtk }:
+
+let
+  version = "3.3.7";
+
+  version_short = stdenv.lib.replaceChars [ "." ] [ "" ] "${version}";
+in stdenv.mkDerivation {
+  name = "scite-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/project/scintilla/SciTE/${version}/scite${version_short}.tgz";
+    sha256 = "0x7i6yxq50frsjkrp3lc5zy0d1ssq2n91igjn0dmqajpg7kls2dd";
+  };
+
+  buildInputs = [ pkgconfig gtk ];
+  sourceRoot = "scintilla/gtk";
+
+  buildPhase = ''
+    make
+    cd ../../scite/gtk
+    make prefix=$out/
+  '';
+
+  installPhase = ''
+    make install prefix=$out/
+  '';
+
+  meta = {
+    homepage = "http://www.scintilla.org/SciTE.html";
+    description = "SCIntilla based Text Editor";
+    license = stdenv.lib.licenses.mit;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = stdenv.lib.maintainers.rszibele;
+  };
+}
--- a/pkgs/applications/editors/vim/ft-nix-support.patch
+++ b/pkgs/applications/editors/vim/ft-nix-support.patch
@ -23,7 +23,7 @@ new file mode 100644
 index 0000000..a2f9918
 --- /dev/null
 +++ b/runtime/syntax/nix.vim
-@@ -0,0 +1,42 @@
+@@ -0,0 +1,47 @@
 +" Vim syntax file
 +" Language:	nix
 +" Maintainer:	Marc Weber <marco-oweber@gmx.de>
@ -68,3 +68,8 @@ index 0000000..a2f9918
 +hi def link nixFuncArg     Identifier
 +
 +let b:current_syntax = "nix"
+
+" scan backwards to find begining of multiline statements
+syn sync ccomment nixMultiLineComment minlines=10 maxlines=500
+syn sync ccomment nixStringIndented minlines=10 maxlines=500
+syn sync ccomment nixString maxlines=10
--- a/pkgs/applications/graphics/darktable/default.nix
+++ b/pkgs/applications/graphics/darktable/default.nix
@ -9,12 +9,12 @@
 assert stdenv ? glibc;

 stdenv.mkDerivation rec {
-  version = "1.2.3";
+  version = "1.4.1";
  name = "darktable-${version}";

  src = fetchurl {
    url = "mirror://sourceforge/darktable/darktable/1.2/darktable-${version}.tar.xz";
-    sha256 = "05kkkz13a5rhb246rq1nxv7h91pcvm15filvik8n8gn143h64sv8";
+    sha256 = "1pkixhiyyjx5wx4dlkvabga9glcx374f1ic2kxmzzdprfm6kkqfd";
  };

  buildInputs =
--- a/pkgs/applications/graphics/freecad/cmake.patch
+++ b/pkgs/applications/graphics/freecad/cmake.patch
@ -0,0 +1,12 @@
+diff -ru freecad-0.13.1830.orig/CMakeLists.txt freecad-0.13.1830/CMakeLists.txt
+--- freecad-0.13.1830.orig/CMakeLists.txt       2013-02-02 18:09:17.000000000 +0100
+++ freecad-0.13.1830/CMakeLists.txt    2014-02-15 10:16:00.939725500 +0100
+@@ -321,7 +321,7 @@
+         foreach(it ${moc_files})
+             get_filename_component(it ${it} ABSOLUTE)
+             QT4_MAKE_OUTPUT_FILE(${it} moc_ cpp outfile)
+-            QT4_CREATE_MOC_COMMAND(${it} ${outfile} "${moc_flags}" "${moc_options}")
+            QT4_CREATE_MOC_COMMAND(${it} ${outfile} "${moc_flags}" "${moc_options}" "")
+             set(${outfiles} ${${outfiles}} ${outfile})
+             add_file_dependencies(${it} ${outfile})
+         endforeach(it)
--- a/pkgs/applications/graphics/freecad/default.nix
+++ b/pkgs/applications/graphics/freecad/default.nix
@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
      --set COIN_GL_NO_CURRENT_CONTEXT_CHECK 1
  '';

-  patches = [ ./pythonpath.patch ];
+  patches = [ ./pythonpath.patch ./cmake.patch ];

  meta = {
    homepage = http://free-cad.sourceforge.net/;
--- a/pkgs/applications/misc/bitcoin/default.nix
+++ b/pkgs/applications/misc/bitcoin/default.nix
@ -1,4 +1,4 @@
-{ fetchurl, stdenv, openssl, db4, boost, zlib, miniupnpc, qt4 }:
+{ fetchurl, stdenv, openssl, db, boost, zlib, miniupnpc, qt4 }:

 stdenv.mkDerivation rec {
  version = "0.8.6";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
    sha256 = "036xx06gyrfh65rpdapff3viz1f38vzkj7lnhil6fc0s7pjmsjbk";
  };

-  buildInputs = [ openssl db4 boost zlib miniupnpc qt4 ];
+  buildInputs = [ openssl db boost zlib miniupnpc qt4 ];

  configurePhase = ''
    cd src
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@ -4,11 +4,11 @@
 }:

 stdenv.mkDerivation rec {
-  name = "calibre-1.21.0";
+  name = "calibre-1.23.0";

  src = fetchurl {
    url = "mirror://sourceforge/calibre/${name}.tar.xz";
-    sha256 = "05hwny9zi32gkk3hadvigrqrnbgzw53vhjkjp60dq0lb545pscih";
+    sha256 = "1sm6v53c12nkqnpv7n4g1mzkwmzbn74a8v83bzvvjiz0i9c7cl59";
  };

  inherit python;
--- a/pkgs/applications/misc/freicoin/default.nix
+++ b/pkgs/applications/misc/freicoin/default.nix
@ -1,4 +1,4 @@
-{ fetchurl, stdenv, db4, boost, gmp, mpfr, miniupnpc, qt4, unzip }:
+{ fetchurl, stdenv, db, boost, gmp, mpfr, miniupnpc, qt4, unzip }:

 stdenv.mkDerivation rec {
  version = "0.8.3-1";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {

  # I think that openssl and zlib are required, but come through other
  # packages
-  buildInputs = [ db4 boost gmp mpfr miniupnpc qt4 unzip ];
+  buildInputs = [ db boost gmp mpfr miniupnpc qt4 unzip ];

  configurePhase = "qmake";

--- a/pkgs/applications/misc/ikiwiki/default.nix
+++ b/pkgs/applications/misc/ikiwiki/default.nix
@ -23,7 +23,7 @@ assert mercurialSupport -> (mercurial != null);

 let
  name = "ikiwiki";
-  version = "3.20140102";
+  version = "3.20140125";

  lib = stdenv.lib;
 in
@ -32,7 +32,7 @@ stdenv.mkDerivation {

  src = fetchurl {
    url = "http://ftp.de.debian.org/debian/pool/main/i/ikiwiki/${name}_${version}.tar.gz";
-    sha256 = "0nsyfq7j03cg4qq73kw7cxnc7wgbr2m75fqmmll77wyl9cb661lj";
+    sha256 = "06r95xhm8pnvswgmkf3j7h4n6b1nmk0v0znmnzblkdx7xh12m0hd";
  };

  buildInputs = [ perl TextMarkdown URI HTMLParser HTMLScrubber HTMLTemplate
--- a/pkgs/applications/misc/jigdo/default.nix
+++ b/pkgs/applications/misc/jigdo/default.nix
@ -1,4 +1,4 @@
-{ stdenv, fetchurl, db4, gtk, bzip2 }:
+{ stdenv, fetchurl, db, gtk, bzip2 }:

 stdenv.mkDerivation {
  name = "jigdo-0.7.3";
@ -14,7 +14,7 @@ stdenv.mkDerivation {
    sha256 = "0jnlzm9m2hjlnw0zs2fv456ml5r2jj2q1lncqbrgg52lq18f6fa3";
  };

-  buildInputs = [ db4 gtk bzip2 ];
+  buildInputs = [ db gtk bzip2 ];

  configureFlags = "--without-libdb";

--- a/pkgs/applications/misc/librecad/2.0.nix
+++ b/pkgs/applications/misc/librecad/2.0.nix
@ -1,12 +1,12 @@
-{ stdenv, fetchurl, qt4, muparser, which, boost}:
+{ stdenv, fetchurl, qt4, muparser, which, boost, pkgconfig }:

 stdenv.mkDerivation {
-  name = "librecad-2.0.0beta1";
+  name = "librecad-2.0.2";

  src = fetchurl {
-    url = https://github.com/LibreCAD/LibreCAD/tarball/2.0.0beta1;
-    name = "librecad-2.0.0beta1.tar.gz";
-    sha256 = "8bf969b79be115f3b3ff72cc030a4c21fe93164dd0cb19ddfb78a7d66b8bc770";
+    url = https://github.com/LibreCAD/LibreCAD/tarball/2.0.2;
+    name = "librecad-2.0.2.tar.gz";
+    sha256 = "0a5rs1h4n74d4bnrj91ij6y6wzc8d6nbrg9lfwjx8icjjl6hqikm";
  };

  patchPhase = ''
@ -25,12 +25,14 @@ stdenv.mkDerivation {
  '';

  buildInputs = [ qt4 muparser which boost ];
+  nativeBuildInputs = [ pkgconfig ];

  enableParallelBuilding = true;

  meta = {
    description = "A 2D CAD package based upon Qt";
    homepage = http://librecad.org;
+    repositories.git = git://github.com/LibreCAD/LibreCAD.git;
    license = "GPLv2";
    maintainers = with stdenv.lib.maintainers; [viric];
    platforms = with stdenv.lib.platforms; linux;
--- a/pkgs/applications/misc/librecad/default.nix
+++ b/pkgs/applications/misc/librecad/default.nix
@ -1,12 +1,12 @@
 { stdenv, fetchurl, qt4, muparser, which}:

 stdenv.mkDerivation {
-  name = "librecad-1.0.2";
+  name = "librecad-1.0.4";

  src = fetchurl {
-    url = https://github.com/LibreCAD/LibreCAD/tarball/v1.0.2;
-    name = "librecad-1.0.2.tar.gz";
-    sha256 = "13ee7e401e4f5fbc68c2e017b7189bec788038f4f6e77f559861ceb8cfb1907d";
+    url = https://github.com/LibreCAD/LibreCAD/tarball/v1.0.4;
+    name = "librecad-1.0.4.tar.gz";
+    sha256 = "00nzbijw7pn1zkj4256da501xcm6rkcvycpa79y6dr2p6c43yc6m";
  };

  patchPhase = ''
--- a/pkgs/applications/misc/zathura/default.nix
+++ b/pkgs/applications/misc/zathura/default.nix
@ -33,6 +33,8 @@ rec {

    builder = ./builder.sh;

+    preferLocalBuild = true;
+
    meta = {
      homepage = http://pwmt.org/projects/zathura/;
      description = "A highly customizable and functional PDF viewer";
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@ -40,6 +40,8 @@ stdenv.mkDerivation {
    echo ${browser} > $out/nix-support/propagated-user-env-packages
  '';

+  preferLocalBuild = true;
+
  # Let each plugin tell us (through its `mozillaPlugin') attribute
  # where to find the plugin in its tree.
  plugins = map (x: x + x.mozillaPlugin) plugins;
--- a/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/nspluginwrapper/default.nix
@ -26,6 +26,8 @@ stdenv.mkDerivation rec {

  buildInputs = [which pkgconfig file glib gtk2 gtk3 curl];

+  preferLocalBuild = true;
+
  meta = {
    description = ''A wrapper to run browser plugins out-of-process'';
    homepage = "http://nspluginwrapper.org/";
--- a/pkgs/applications/networking/browsers/vimb/default.nix
+++ b/pkgs/applications/networking/browsers/vimb/default.nix
@ -0,0 +1,42 @@
+{ stdenv, fetchurl, pkgconfig, libsoup, webkit, gtk, glib_networking
+, gsettings_desktop_schemas, makeWrapper
+}:
+
+stdenv.mkDerivation rec {
+  name = "vimb-${version}";
+  version = "2.2";
+
+  src = fetchurl {
+    url = "https://github.com/fanglingsu/vimb/archive/${version}.tar.gz";
+    sha256 = "18gig6rcxv0i4a8mz3jv29zpj0323zw45jsg1ycx61a08rzag60m";
+  };
+
+  # Nixos default ca bundle
+  patchPhase = ''
+    sed -i s,/etc/ssl/certs/ca-certificates.crt,/etc/ssl/certs/ca-bundle.crt, src/default.h
+  '';
+
+  buildInputs = [ makeWrapper gtk libsoup pkgconfig webkit ];
+
+  makeFlags = [ "PREFIX=$(out)" ];
+
+  postInstall = ''
+    wrapProgram "$out/bin/vimb" \
+      --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \
+      --prefix XDG_DATA_DIRS : "${gsettings_desktop_schemas}/share"
+  '';
+
+  meta = {
+    description = "A Vim-like browser";
+    longDescription = ''
+      A fast and lightweight vim like web browser based on the webkit web
+      browser engine and the GTK toolkit. Vimb is modal like the great vim
+      editor and also easily configurable during runtime. Vimb is mostly
+      keyboard driven and does not detract you from your daily work.
+    '';
+    homepage = "http://fanglingsu.github.io/vimb/";
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = [ stdenv.lib.maintainers.rickynils ];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
--- a/pkgs/applications/networking/browsers/vimprobable2/default.nix
+++ b/pkgs/applications/networking/browsers/vimprobable2/default.nix
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {

  # Nixos default ca bundle
  patchPhase = ''
-    sed -i s,/etc/ssl/certs/ca-certificates.crt,/etc/ca-bundle.crt, config.h
+    sed -i s,/etc/ssl/certs/ca-certificates.crt,/etc/ssl/certs/ca-bundle.crt, config.h
  '';

  buildInputs = [ makeWrapper gtk libsoup libX11 perl pkgconfig webkit ];
--- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ekiga/default.nix
@ -2,7 +2,7 @@ x@{builderDefsPackage
  , cyrus_sasl, gettext, openldap, ptlib, opal, GConf, libXv, rarian, intltool
  , perl, perlXMLParser, evolution_data_server, gnome_doc_utils, avahi
  , libsigcxx, gtk, dbus_glib, libnotify, libXext, xextproto, automake
-  , autoconf, pkgconfig, libxml2, videoproto, unixODBC, db4, nspr, nss, zlib
+  , autoconf, pkgconfig, libxml2, videoproto, unixODBC, db, nspr, nss, zlib
  , libXrandr, randrproto, which, libxslt, libtasn1, gmp, nettle
  , ...}:
 builderDefsPackage
--- a/pkgs/applications/networking/instant-messengers/kadu/cmake.patch
+++ b/pkgs/applications/networking/instant-messengers/kadu/cmake.patch
@ -0,0 +1,13 @@
+diff -ru kadu-0.12.2.orig/plugins/jabber_protocol/3rdparty/CMakeLists.txt kadu-0.12.2/plugins/jabber_protocol/3rdparty/CMakeLists.txt
+--- kadu-0.12.2.orig/plugins/jabber_protocol/3rdparty/CMakeLists.txt	2012-08-30 16:13:17.000000000 +0200
+++ kadu-0.12.2/plugins/jabber_protocol/3rdparty/CMakeLists.txt	2014-02-15 10:20:33.368716013 +0100
+@@ -26,7 +26,7 @@
+ 					get_filename_component (_basename ${_current_MOC} NAME_WE)
+ 					set (_header ${_abs_FILE})
+ 					set (_moc ${_abs_PATH}/${_current_MOC})
+-					QT4_CREATE_MOC_COMMAND (${_header} ${_moc} "${_moc_INCS}" "")
+					QT4_CREATE_MOC_COMMAND (${_header} ${_moc} "${_moc_INCS}" "" "")
+ 					MACRO_ADD_FILE_DEPENDENCIES (${_abs_FILE} ${_moc})
+ 				endforeach (_current_MOC_INC)
+ 			endif (_match)
+Only in kadu-0.12.2/plugins/jabber_protocol/3rdparty: CMakeLists.txt~
--- a/pkgs/applications/networking/instant-messengers/kadu/default.nix
+++ b/pkgs/applications/networking/instant-messengers/kadu/default.nix
@ -26,6 +26,7 @@ stdenv.mkDerivation {
    sed -i -e '/mpd_mediaplayer/d' \
           -e '/encryption_ng/d'   \
           -e '/encryption_ng_simlite/d' Plugins.cmake
+    patch -p1 < ${./cmake.patch}
  '';

  NIX_LDFLAGS="-lX11";
--- a/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
  nativeBuildInputs = [pkgconfig libxslt];
  buildInputs = [ libxml2 dbus_glib sqlite libsoup libnice telepathy_glib gnutls ];

-  configureFlags = "--with-ca-certificates=/etc/ca-bundle.crt";
+  configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-bundle.crt";

  meta = {
    homepage = http://telepathy.freedesktop.org;
--- a/pkgs/applications/networking/irc/irssi/otr/default.nix
+++ b/pkgs/applications/networking/irc/irssi/otr/default.nix
@ -1,16 +1,16 @@
 { stdenv, fetchurl, libotr, automake, autoconf, libtool, glib, pkgconfig, irssi }:

 let
-  rev = "cab3fc915c";
+  rev = "640e98c74b";
 in
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "irssi-otr-20130601-${rev}";
+  name = "irssi-otr-20131007-${rev}";
  
  src = fetchurl {
    url = "https://github.com/cryptodotis/irssi-otr/tarball/${rev}";
    name = "${name}.tar.gz";
-    sha256 = "0kn9c562zfh36gpcrbpslwjjr78baagdwphczz2d608ndczm1vrk";
+    sha256 = "0d08ianzhy20w0ld8xx7hgrp9psg54l37619pcdpqyrnlzkkdalz";
  };

  patchPhase = ''
--- a/pkgs/applications/networking/znc/default.nix
+++ b/pkgs/applications/networking/znc/default.nix
@ -1,4 +1,4 @@
-{stdenv, fetchurl, openssl, pkgconfig
+{ stdenv, fetchurl, openssl, pkgconfig
 , withPerl ? false, perl
 , withPython ? false, python3
 , withTcl ? false, tcl
@ -7,10 +7,11 @@

 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "znc-1.0";
+  name = "znc-1.2";
+
  src = fetchurl {
    url = "http://znc.in/releases/${name}.tar.gz";
-    sha256 = "0ah6890ngvj97kah3x7fd8yzi6dpdgrxw1b2skj2cyv98bd3jmd8";
+    sha256 = "07bh306wl5494sqsgz4a526wvyrylkc8vpnbr5pkxwjg90mcv8nr";
  };

  buildInputs = [ openssl pkgconfig ]
@ -24,11 +25,11 @@ stdenv.mkDerivation rec {
    + optionalString withTcl "--enable-tcl --with-tcl=${tcl}/lib "
    + optionalString withCyrus "--enable-cyrus ";

-  meta = {
+  meta = with stdenv.lib; {
    description = "Advanced IRC bouncer";
    homepage = http://wiki.znc.in/ZNC;
-    maintainers = [ stdenv.lib.maintainers.viric ];
-    license = "ASL2.0";
-    platforms = stdenv.lib.platforms.unix;
+    maintainers = with maintainers; [ viric ];
+    license = licenses.asl20;
+    platforms = platforms.unix;
  };
 }
--- a/pkgs/applications/office/kmymoney/default.nix
+++ b/pkgs/applications/office/kmymoney/default.nix
@ -1,20 +1,22 @@
 { stdenv, fetchurl, cmake, kdelibs, automoc4, kdepimlibs, gettext, pkgconfig
-, shared_mime_info, perl, boost, gpgme, gmpxx, libalkimia, libofx, libical }:
+, shared_mime_info, perl, boost, gpgme, gmpxx, libalkimia, libofx, libical
+, doxygen }:

 stdenv.mkDerivation rec {
-  name = "kmymoney-4.6.2";
+  name = "kmymoney-4.6.4";

  src = fetchurl {
-    url = "mirror://sourceforge/kmymoney2/${name}.tar.bz2";
-    sha256 = "0x9bl4h2mk8dv49nnn7drv528fnl5ynvvyy7q4m22k0d5yxarn5d";
+    url = "mirror://sourceforge/kmymoney2/${name}.tar.xz";
+    sha256 = "04n0lgi2yrx67bgjzbdbcm10pxs7l53srmp240znzw59njnjyll9";
  };

-  buildInputs = [ kdepimlibs perl boost gpgme gmpxx libalkimia libofx libical ];
+  buildInputs = [ kdepimlibs perl boost gpgme gmpxx libalkimia libofx libical
+                  doxygen ];
  nativeBuildInputs = [ cmake automoc4 gettext shared_mime_info pkgconfig ];

  KDEDIRS = libalkimia;

-  patches = [ ./qgpgme.patch ./qt-4.8.patch ];
+  patches = [ ./qgpgme.patch ];

  meta = {
    homepage = http://kmymoney2.sourceforge.net/;
--- a/pkgs/applications/office/kmymoney/qt-4.8.patch
+++ b/pkgs/applications/office/kmymoney/qt-4.8.patch
@ -1,32 +0,0 @@
-From: Christoph Feck <christoph@maxiom.de>
-Date: Thu, 10 Nov 2011 11:34:20 +0000
-Subject: Fix compile with Qt 4.8
-X-Git-Url: http://quickgit.kde.org/?p=kmymoney.git&amp;a=commitdiff&amp;h=8324cfb9657d8c03f83691402386e8c5bfb29981
---
-Fix compile with Qt 4.8
-
-Sideported commits f42a0a3d878afebb298609c9886851858c56cc15 and
-fe74b25bf3b78c42e95569fe467a397876bc9c04 from massif-visualizer
---
-
-
--- a/libkdchart/src/KDChartBackgroundAttributes.cpp
-+++ b/libkdchart/src/KDChartBackgroundAttributes.cpp
-@@ -22,6 +22,7 @@
- 
- #include "KDChartBackgroundAttributes.h"
- #include <QPixmap>
-+#include <QVariant>
- 
- #include <KDABLibFakes>
- 
-@@ -150,7 +151,7 @@ QDebug operator<<(QDebug dbg, const KDCh
- 	<< "visible="<<ba.isVisible()
- 	<< "brush="<<ba.brush()
- 	<< "pixmapmode="<<ba.pixmapMode()
-	<< "pixmap="<<ba.pixmap()
-+	<< "pixmap="<<QVariant(ba.pixmap())
- 	<< ")";
-     return dbg;
- }
-
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@ -6,7 +6,7 @@

 { stdenv, fetchurl, pam, python3, tcsh, libxslt, perl, ArchiveZip
 , CompressZlib, zlib, libjpeg, expat, pkgconfigUpstream, freetype, libwpd
-, libxml2, db4, sablotron, curl, libXaw, fontconfig, libsndfile, neon
+, libxml2, db, sablotron, curl, libXaw, fontconfig, libsndfile, neon
 , bison, flex, zip, unzip, gtk, libmspack, getopt, file, cairo, which
 , icu, boost, jdk, ant, libXext, libX11, libXtst, libXi, cups
 , libXinerama, openssl, gperf, cppunit, GConf, ORBit2, poppler
@ -248,7 +248,7 @@ stdenv.mkDerivation rec {

  buildInputs =
    [ ant ArchiveZip autoconf automake bison boost cairo clucene_core
-      CompressZlib cppunit cups curl db4 dbus_glib expat file flex fontconfig
+      CompressZlib cppunit cups curl db dbus_glib expat file flex fontconfig
      freetype GConf getopt gnome_vfs gperf gst_plugins_base gstreamer gtk
      hunspell icu jdk kde4.kdelibs lcms libcdr libexttextcat unixODBC libjpeg
      libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11
--- a/pkgs/applications/version-management/codeville/0.8.0.nix
+++ b/pkgs/applications/version-management/codeville/0.8.0.nix
@ -1,6 +1,6 @@
 args : with args; 

-if (! python ? db4Support) || (! python.db4Support) then 
+if (! python ? dbSupport) || (! python.dbSupport) then 
  throw ''Python DB4 support is required for codeville.'' 
 else

--- a/pkgs/applications/version-management/fossil/default.nix
+++ b/pkgs/applications/version-management/fossil/default.nix
@ -1,11 +1,11 @@
 {stdenv, fetchurl, zlib, openssl, tcl, readline, sqlite, withJson ? true}:

 stdenv.mkDerivation {
-  name = "fossil-1.27";
+  name = "fossil-1.28";

  src = fetchurl {
-    url = http://www.fossil-scm.org/download/fossil-src-20130911114349.tar.gz;
-    sha256 = "0n40z8bx2311i11zjx2x15lw3q8vzjwvfqzikrjlqnpal4vzd72f";
+    url = http://www.fossil-scm.org/download/fossil-src-20140127173344.tar.gz;
+    sha256 = "105a3f3wiqshmkw8q7f7ask3nm0jkjf0h3h2283qiqlsqfkwb9xc";
  };

  buildInputs = [ zlib openssl readline sqlite ];
--- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
@ -15,8 +15,8 @@

 cabal.mkDerivation (self: {
  pname = "git-annex";
-  version = "5.20140129";
-  sha256 = "0m1n3m16gvd0693i5xq5adki0hd0wdn7p5vqjxkqnc3imx9f11ng";
+  version = "5.20140210";
+  sha256 = "0l5fny743v27yv7spppms64qca0mizh776b6wv8wca0wmcbc6j88";
  isLibrary = false;
  isExecutable = true;
  buildDepends = [
@ -53,6 +53,7 @@ cabal.mkDerivation (self: {
    cp dist/build/git-annex/git-annex git-annex
    ./git-annex test
  '';
+  propagatedUserEnvPkgs = [git lsof];
  meta = {
    homepage = "http://git-annex.branchable.com/";
    description = "manage files with git, without checking their contents into git";
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@ -10,7 +10,7 @@

 let

-  version = "1.8.5.4";
+  version = "1.9.0";

  svn = subversionClient.override { perlBindings = true; };

@ -21,7 +21,7 @@ stdenv.mkDerivation {

  src = fetchurl {
    url = "http://git-core.googlecode.com/files/git-${version}.tar.gz";
-    sha256 = "062z4j4hfhfdlvkxs2mzarsyvbqvfy4kv8j5h4c75ymb5yp8iklk";
+    sha256 = "10lq71vrg1zbqm923wb0p36ily6y5x057f2bryk4wqkdqgyrfc6y";
  };

  patches = [ ./docbook2texi.patch ./symlinks-in-bin.patch ];
@ -66,7 +66,7 @@ stdenv.mkDerivation {
      mkdir -p $out/etc/bash_completion.d
      ln -s $out/share/git/contrib/completion/git-completion.bash $out/etc/bash_completion.d/

-      # grep is a runtime dependence, need to patch so that it's found
+      # grep is a runtime dependency, need to patch so that it's found
      substituteInPlace $out/libexec/git-core/git-sh-setup \
          --replace ' grep' ' ${gnugrep}/bin/grep' \
          --replace ' egrep' ' ${gnugrep}/bin/egrep'
@ -77,7 +77,7 @@ stdenv.mkDerivation {
             -e 's|	perl -e|	${perl}/bin/perl -e|g' \
             $out/libexec/git-core/{git-am,git-submodule}

-      # gzip (and optionally bzip2, xz, zip) are a runtime dependencies for
+      # gzip (and optionally bzip2, xz, zip) are runtime dependencies for
      # gitweb.cgi, need to patch so that it's found
      sed -i -e "s|'compressor' => \['gzip'|'compressor' => ['${gzip}/bin/gzip'|" \
          $out/share/gitweb/gitweb.cgi
--- a/pkgs/applications/version-management/kdesvn/default.nix
+++ b/pkgs/applications/version-management/kdesvn/default.nix
@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gettext, apr, aprutil, subversion, db4, kdelibs, expat }:
+{ stdenv, fetchurl, gettext, apr, aprutil, subversion, db, kdelibs, expat }:

 # the homepage mentions this is the final release.
 # from now on, kdesvn will be part of the official kde software distribution
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
    sed -i -e "s|/usr|${subversion}|g" src/svnqt/cmakemodules/FindSubversion.cmake
  '';

-  buildInputs = [ apr aprutil subversion db4 kdelibs expat ];
+  buildInputs = [ apr aprutil subversion db kdelibs expat ];

  nativeBuildInputs = [ gettext ];

--- a/pkgs/applications/video/dvswitch/default.nix
+++ b/pkgs/applications/video/dvswitch/default.nix
@ -1,29 +0,0 @@
-{ stdenv, fetchurl, alsaLib, boost, cmake, gtkmm, libXau, libXdmcp
-, libXv, libav, pixman, libpthreadstubs, pkgconfig 
-}:
-
-stdenv.mkDerivation rec {
-  name = "dvswitch-${version}";
-  version = "0.8.3.6";
-
-  src = fetchurl {
-    url = "https://alioth.debian.org/frs/download.php/3615/${name}.tar.gz";
-    sha256 = "7bd196389f9913ae08e12a29e168d79324c508bb545eab114df77b0375cd87f0";
-  };
-
-  buildInputs = [
-    alsaLib boost cmake gtkmm libXau libXdmcp libXv libav
-    libpthreadstubs pixman pkgconfig
-  ];
-
-  patchPhase = ''
-    sed -e "s@prefix /usr/local@prefix $out@" -i CMakeLists.txt
-  '';
-
-  meta =  with stdenv.lib; {
-    description = "interactive live video mixer for DV streams";
-    homepage = "http://dvswitch.alioth.debian.org";
-    license = licenses.gpl2Plus;
-    maintainers = [ maintainers.goibhniu ];
-  };
-}
--- a/pkgs/build-support/clang-wrapper/default.nix
+++ b/pkgs/build-support/clang-wrapper/default.nix
@ -84,4 +84,6 @@ stdenv.mkDerivation {
       if stdenv.system == "mips64el-linux" then "ld.so.1" else
       abort "don't know the name of the dynamic linker for this platform")
    else "";
+
+  preferLocalBuild = true;
 }
--- a/pkgs/build-support/fetchgit/default.nix
+++ b/pkgs/build-support/fetchgit/default.nix
@ -44,5 +44,7 @@ stdenv.mkDerivation {
    # by definition pure.
    "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy"
    ];
+
+  preferLocalBuild = true;
 }

--- a/pkgs/build-support/fetchsvn/default.nix
+++ b/pkgs/build-support/fetchsvn/default.nix
@ -40,4 +40,6 @@ stdenv.mkDerivation {
    # by definition pure.
    "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy"
    ];
+
+  preferLocalBuild = true;
 }
--- a/pkgs/build-support/kdewrapper/default.nix
+++ b/pkgs/build-support/kdewrapper/default.nix
@ -39,4 +39,6 @@ stdenv.mkDerivation {
    chmod +x $PROG
    done
  '';
+
+  preferLocalBuild = true;
 }
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@ -924,6 +924,32 @@ rec {
      packages = commonFedoraPackages ++ [ "cronie" "util-linux" ];
    };

+    fedora17i386 = {
+      name = "fedora-17-i386";
+      fullName = "Fedora 17 (i386)";
+      packagesList = fetchurl {
+        url = mirror://fedora/linux/releases/17/Everything/i386/os/repodata/82dc1ea6d26e53a367dc6e7472113c4454c9a8ac7c98d4bfb11fd0b6f311450f-primary.xml.gz;
+        sha256 = "03s527rvdl0zn6zx963wmjlcjm247h8p4x3fviks6lvfsak1xp42";
+      };
+      urlPrefix = mirror://fedora/linux/releases/17/Everything/i386/os;
+      archs = ["noarch" "i386" "i586" "i686"];
+      packages = commonFedoraPackages ++ [ "cronie" "util-linux" ];
+      unifiedSystemDir = true;
+    };
+
+    fedora17x86_64 = {
+      name = "fedora-17-x86_64";
+      fullName = "Fedora 17 (x86_64)";
+      packagesList = fetchurl {
+        url = mirror://fedora/linux/releases/17/Everything/x86_64/os/repodata/7009de56f1a1c399930fa72094a310a40d38153c96d0b5af443914d3d6a7d811-primary.xml.gz;
+        sha256 = "04fqlzbd651r8jpvbl4n7hakh3d422ir88571y9rkhx1y5bdw2bh";
+      };
+      urlPrefix = mirror://fedora/linux/releases/17/Everything/x86_64/os;
+      archs = ["noarch" "x86_64"];
+      packages = commonFedoraPackages ++ [ "cronie" "util-linux" ];
+      unifiedSystemDir = true;
+    };
+
    fedora18i386 = {
      name = "fedora-18-i386";
      fullName = "Fedora 18 (i386)";
@ -1505,22 +1531,22 @@ rec {
    debian70x86_64 = debian7x86_64;

    debian7i386 = {
-      name = "debian-7.3-wheezy-i386";
-      fullName = "Debian 7.3 Wheezy (i386)";
+      name = "debian-7.4-wheezy-i386";
+      fullName = "Debian 7.4 Wheezy (i386)";
      packagesList = fetchurl {
        url = mirror://debian/dists/wheezy/main/binary-i386/Packages.bz2;
-        sha256 = "037637520ce371a50beb5446fd27a731f30b51bc362c2f4a5dcfce9c7e30ffb6";
+        sha256 = "9f19822c82e25cd149f82b0d16fdbc00d1080db7f34e41de456498dc7c54f2b4";
      };
      urlPrefix = mirror://debian;
      packages = commonDebianPackages;
    };

    debian7x86_64 = {
-      name = "debian-7.3-wheezy-amd64";
-      fullName = "Debian 7.3 Wheezy (amd64)";
+      name = "debian-7.4-wheezy-amd64";
+      fullName = "Debian 7.4 Wheezy (amd64)";
      packagesList = fetchurl {
        url = mirror://debian/dists/wheezy/main/binary-amd64/Packages.bz2;
-        sha256 = "c2ed55a2a263d482826c934b97ad910984fa5695ab1c480841741b828d0590a5";
+        sha256 = "160ee0917693bc2e8f69b233c220857f35a70d906540d99d2779def576daf5f7";
      };
      urlPrefix = mirror://debian;
      packages = commonDebianPackages;
--- a/pkgs/data/fonts/fontWrap/default.nix
+++ b/pkgs/data/fonts/fontWrap/default.nix
@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
 	name = "wrapped-font-dir";
 	builder = writeScript (name + "-builder")
 		(textClosure localDefs [ doInstall doForceShare doPropagate]);
+  preferLocalBuild = true;
 	meta = {
 		description = "
 		Just a wrapper to create fonts.dir and fonts.scale .
--- a/pkgs/desktops/gnome-3/core/baobab/default.nix
+++ b/pkgs/desktops/gnome-3/core/baobab/default.nix
@ -0,0 +1,45 @@
+{ stdenv, intltool, fetchurl, vala, libgtop, pkgconfig, gtk3, glib
+, bash, makeWrapper, itstool, libxml2, gnome3 }:
+
+# TODO: icons and theme still does not work
+# use packaged gnome3.gnome_icon_theme_symbolic 
+
+stdenv.mkDerivation rec {
+  name = "baobab-3.10.1";
+
+  src = fetchurl {
+    url = "https://download.gnome.org/sources/baobab/3.10/${name}.tar.xz";
+    sha256 = "23ce8e4847ce5f1c8230e757532d94c84e6e273d6ec8fca20eecaed5f96563f9";
+  };
+
+  configureFlags = [ "--disable-static" ];
+
+  doCheck = true;
+
+  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  buildInputs = [ vala pkgconfig gtk3 glib libgtop intltool itstool libxml2
+                  gnome3.gsettings_desktop_schemas makeWrapper ];
+
+  installFlags = "gsettingsschemadir=\${out}/share/${name}/glib-2.0/schemas/";
+
+  postInstall = ''
+    wrapProgram "$out/bin/baobab" \
+      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:${gnome3.gsettings_desktop_schemas}/share:$out/share:$out/share/${name}"
+  '';
+
+  preFixup = ''
+    rm $out/share/icons/hicolor/icon-theme.cache
+    rm $out/share/icons/HighContrast/icon-theme.cache
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://wiki.gnome.org/Apps/Baobab;
+    description = "Graphical application to analyse disk usage in any Gnome environment";
+    maintainers = with maintainers; [ lethalman ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+  };
+}
--- a/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
+++ b/pkgs/desktops/gnome-3/core/evolution-data-server/default.nix
@ -1,5 +1,5 @@
 { fetchurl, stdenv, pkgconfig, gnome3, python, intltool, libsoup, libxml2, libsecret
-, p11_kit, db4, nspr, nss, libical, gperf }:
+, p11_kit, db, nspr, nss, libical, gperf }:


 stdenv.mkDerivation rec {
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {

  buildInputs = with gnome3;
    [ pkgconfig glib python intltool libsoup libxml2 gtk gnome_online_accounts libsecret
-      gcr p11_kit db4 nspr nss libgweather libical libgdata gperf ];
+      gcr p11_kit db nspr nss libgweather libical libgdata gperf ];

  # uoa irrelevant for now
  configureFlags = "--disable-uoa --with-nspr-includes=${nspr}/include/nspr --with-nss-includes=${nss}/include/nss";
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@ -14,6 +14,8 @@ rec {

  at_spi2_core = callPackage ./core/at-spi2-core { };

+  baobab = callPackage ./core/baobab { };
+
  caribou = callPackage ./core/caribou { };

  dconf = callPackage ./core/dconf { };
--- a/pkgs/desktops/kde-4.12/applications/kate.nix
+++ b/pkgs/desktops/kde-4.12/applications/kate.nix
@ -0,0 +1,11 @@
+{ kde, kdelibs, kactivities, qjson, pyqt4, sip, python, pykde4}:
+
+kde {
+
+  buildInputs = [ kdelibs kactivities qjson pyqt4 sip python pykde4 ];
+
+  meta = {
+    description = "Kate, the KDE Advanced Text Editor, as well as KWrite";
+    license = "GPLv2";
+  };
+}
--- a/pkgs/desktops/kde-4.12/applications/konsole.nix
+++ b/pkgs/desktops/kde-4.12/applications/konsole.nix
@ -0,0 +1,11 @@
+{ kde, kdelibs, kde_baseapps }:
+
+kde {
+
+  buildInputs = [ kdelibs kde_baseapps ];
+
+  meta = {
+    description = "Konsole, the KDE terminal emulator";
+    license = "GPLv2";
+  };
+}
--- a/pkgs/desktops/kde-4.12/default.nix
+++ b/pkgs/desktops/kde-4.12/default.nix
@ -0,0 +1,42 @@
+{ callPackage, callPackageOrig, stdenv, qt48, release ? "4.12.2" }:
+
+let
+  # Need callPackageOrig to avoid infinite cycle
+  kde = callPackageOrig ./kde-package {
+    inherit release ignoreList extraSubpkgs callPackage;
+  };
+
+  # The list of igored individual modules
+  ignoreList = {
+    # Doesn't work yet
+    kdeutils = [ "ksecrets" ];
+    # kdeadmin/strigi-analyzer has no real code
+    kdeadmin = [ "strigi-analyzer" ];
+    # Most of kdebindings do not compile due to a bug in the buildsystem
+    kdebindings = [ "kimono" "korundum" "kross-interpreters" "perlkde" "qyoto" ];
+  };
+
+  # Extra subpackages in the manifest format
+  extraSubpkgs = {};
+
+in
+
+kde.modules // kde.individual //
+{
+  inherit (kde) manifest modules individual splittedModuleList;
+
+  akonadi = callPackage ./support/akonadi { };
+
+  qt4 = qt48;
+
+  kdebase_workspace = kde.modules.kde_workspace;
+
+  inherit release;
+
+  full = stdenv.lib.attrValues kde.modules;
+
+  l10n = callPackage ./l10n {
+    inherit release;
+    inherit (kde.manifest) stable;
+  };
+}
--- a/pkgs/desktops/kde-4.12/files/kde-wallpapers-buildsystem.patch
+++ b/pkgs/desktops/kde-4.12/files/kde-wallpapers-buildsystem.patch
@ -0,0 +1,17 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3d3e247..f78db67 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -1,5 +1,10 @@
+-find_package(KDE4 REQUIRED)
+-include(KDE4Defaults)
+project(kde-wallpapers NONE)
+if( WALLPAPER_INSTALL_DIR )
+  message(STATUS "Installing wallpapers to user-supplied directory ${WALLPAPER_INSTALL_DIR}")
+else()
+  find_package(KDE4 REQUIRED)
+  include(KDE4Defaults)
+endif()
+ 
+ install(DIRECTORY Air DESTINATION ${WALLPAPER_INSTALL_DIR} PATTERN .svn EXCLUDE)
+ 
--- a/pkgs/desktops/kde-4.12/files/polkit-install.patch
+++ b/pkgs/desktops/kde-4.12/files/polkit-install.patch
@ -0,0 +1,12 @@
+diff -ru -x '*~' kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake
+--- kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake	2011-05-20 22:24:54.000000000 +0200
+++ kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake	2011-07-12 14:03:00.000000000 +0200
+@@ -139,7 +139,7 @@
+         ${CMAKE_INSTALL_PREFIX} _KDE4_AUTH_POLICY_FILES_INSTALL_DIR
+         ${POLKITQT-1_POLICY_FILES_INSTALL_DIR})
+ 
+-    set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR ${_KDE4_AUTH_POLICY_FILES_INSTALL_DIR} CACHE STRING 
+    set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions" CACHE STRING 
+         "Where policy files generated by KAuth will be installed" FORCE)
+ elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "FAKE")
+     set (KAUTH_COMPILING_FAKE_BACKEND TRUE)
--- a/pkgs/desktops/kde-4.12/kactivities.nix
+++ b/pkgs/desktops/kde-4.12/kactivities.nix
@ -0,0 +1,9 @@
+{ kde, kdelibs, nepomuk_core }:
+
+kde {
+  propagatedBuildInputs = [ kdelibs nepomuk_core ];
+
+  meta = {
+    description = "KDE activities library and daemon";
+  };
+}
--- a/pkgs/desktops/kde-4.12/kde-base-artwork.nix
+++ b/pkgs/desktops/kde-4.12/kde-base-artwork.nix
@ -0,0 +1,14 @@
+{ kde, kdelibs }:
+
+kde {
+  outputHashAlgo = "sha256";
+  outputHashMode = "recursive";
+  outputHash = "0mrd3w7rhsj0v92c8rh9zjxyifq7wyvwszksf2gyn53dzd06blk8";
+
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "KDE Base artwork";
+    license = "GPL";
+  };
+}
--- a/pkgs/desktops/kde-4.12/kde-baseapps/kde-baseapps.nix
+++ b/pkgs/desktops/kde-4.12/kde-baseapps/kde-baseapps.nix
@ -0,0 +1,11 @@
+{ kde, kdelibs, htmlTidy, kactivities
+, nepomuk_core, nepomuk_widgets, libXt }:
+
+kde {
+  buildInputs = [ kdelibs nepomuk_core nepomuk_widgets htmlTidy kactivities libXt ];
+
+  meta = {
+    description = "Base KDE applications, including the Dolphin file manager and Konqueror web browser";
+    license = "GPLv2";
+  };
+}
--- a/pkgs/desktops/kde-4.12/kde-package/4.12.2.nix
+++ b/pkgs/desktops/kde-4.12/kde-package/4.12.2.nix
@ -0,0 +1,444 @@
+{stable=true;
+hashes=builtins.listToAttrs[
+  {name="amor";value="0m5lxcsv9arkhws9xqvxip6k3gg15ppjslrds1lyr1clk1zxrras";}
+  {name="analitza";value="021msxl7jynj6b1n3j5vv1fwzlqi0ib48fwmai7ffvgc23mnsplq";}
+  {name="ark";value="0906pbmwk5l9vd1wx13299mk7lpa4v342l5b5yg4j5fmhd73i1qn";}
+  {name="audiocd-kio";value="0yx99c3g627a8swzgqiykhd7xk95b43gs1mf7ysadg33gpbcm2fj";}
+  {name="blinken";value="1hcr6ckrd6g53ivrhwd2h0hiv2lqym2lahchb1z3q07qyc2676fb";}
+  {name="bomber";value="14i3bsxmq0js7rj9wyvxry2fw8pc2jcqpfkxa7l490kz8wq01vxb";}
+  {name="bovo";value="09lmbyb2jr8q143i67gkqrsf1pa9s83g88149r7srxsy7lkz86l9";}
+  {name="cantor";value="1yf2q7x6rmims60xam2jhs52pnfmv19fphvcwd45q9mjjxkw3iqs";}
+  {name="cervisia";value="049rrjvx0djdi0rfi4f3qdbn62bjy5hr1g6w1vsr79mryifwv9sj";}
+  {name="dolphin-plugins";value="1qdvs0y7f6qmgjkg4jzbp99l89ykjfl0czn743mx4m5mmnabdwpf";}
+  {name="dragon";value="1gygky1g23mlwx0545pzaljzbg7d3g4wqfxbvbl1svdi3mw9pwxb";}
+  {name="ffmpegthumbs";value="1hsm33nq73x1l902pp1qfz88mlv1mrh4h6sxg7qjfnwxnxiaxbkd";}
+  {name="filelight";value="0z4x5dm09997ia8sv27ichxkmlbq1pn4sbvkwjb8gybgikyx083k";}
+  {name="granatier";value="1lq51441w2y1bh2hqgbbkr8xhc3zk9lqkycy8b2avgdkn9l49plr";}
+  {name="gwenview";value="1naghib8wmbdzh7bz6vga9b7lr797979gq2600ykall3nixwpwpv";}
+  {name="jovie";value="1m7spjpl8n23bfy8xq4qngwlbwj9fpy8a1bdq1q5zi0ij89ljcmw";}
+  {name="juk";value="06k7cpvzpdjxivh42n68602m5frrg97lfss8mpgn830xdbrmsp51";}
+  {name="kaccessible";value="02hlb891297l4hv4i4jx4pi4axccq9qkpmgi2is6zb3yqs0ij1l9";}
+  {name="kactivities";value="1hpnigkfyi0i6qb74jfi52m870dpnv09h5adwkqc0nq70bv8dsi9";}
+  {name="kajongg";value="1z5a9r0849r3fd2i9y5z2k9raj0nsl5hprcw53z3mlybdrpaddiq";}
+  {name="kalgebra";value="1mbyi8hcyy53zhn11yxjkiz52k7a6yb54kvndlm3abg1s862zdh2";}
+  {name="kalzium";value="1gnjz05nc3wgcr0ymahnp652hhrkqlrz400f5dzhkq5wrl7vh3ly";}
+  {name="kamera";value="1pxmh79li1f6grf07w2yin2r4ig6znvhl4ym3lqkq263ffjmjvnz";}
+  {name="kanagram";value="07fw93w78girj6rqi8kb30f5hkk8a02zmm3pdkw21rhm03iv1lm6";}
+  {name="kapman";value="10xjhz3glyrbd0l68fz678k1gsnp6arjyz7xvnwa1w6wyq82kssk";}
+  {name="kapptemplate";value="1rzs4il8rhpwbj2zjrxrvgznx6ixwpnp5rmkysz0sgc9i41f9l4k";}
+  {name="kate";value="148wymcxay6vfdri33cmxb06wzlbb1kka7cxdmqn6bw3a8967dvx";}
+  {name="katomic";value="0gk516zk4nr2lb8akw316z0kbna4yk1cr4zclpg6id5xh1jgpgly";}
+  {name="kblackbox";value="0v1ambfp1gmnzp9c42mycgds4kvayda1r1frgv3822lqv1nqcbs0";}
+  {name="kblocks";value="13qyd21h6lh880l19fzy5l1m5rfnbqjdgqc1yivwxrjhhdd5blzj";}
+  {name="kbounce";value="0d8gjvz9dqzvwl1aamf45a0qi9fj63cr2pid2wbxdp2b0v4qjqfb";}
+  {name="kbreakout";value="0wlaglbqr5hyav9m032w7hadia2a071mhnbhrvnw97195lmw7y3h";}
+  {name="kbruch";value="1zq5rzvqv7nhf1h2zqyjnw4g4w380b9dy9782dsr01l2z7ydiab6";}
+  {name="kcachegrind";value="0w63lrr6dw82r0zxsgfpb6kllqxsliw4k7ln232lj14y6ngs6fz2";}
+  {name="kcalc";value="0ga0xcnairfrfdlda6ljrmpnsn2cy8x2k2np535sckj9c0drw1n8";}
+  {name="kcharselect";value="1n8phby2i3s4myb4nlmwrmvz1acqk3llmic94zysx4j1p1vzjjj4";}
+  {name="kcolorchooser";value="1x0cr95xpqfr8vz5jgr14cg9kximnmanc7yqzazqvdlzqmza9602";}
+  {name="kcron";value="1gbzz3x39dawrjhdwsgkvi7kjsply38j0imyn0rdi0pmksd8pl1j";}
+  {name="kdeartwork";value="11ik4n16ym4lhcdkxnhnjhf2i14kaxc645fm158lghklwax00rap";}
+  {name="kde-baseapps";value="11bm9abdamql62yg6cycbhh58s9kqhsz2zg2lpwppp5z4ywzw4rg";}
+  {name="kde-base-artwork";value="12v2gg6lwq859b3ay8g08galrra44wmrislbysazbific5idxcyz";}
+  {name="kde-dev-scripts";value="0nzfd3zywr8qmq65h1yhyn7fc9grg5aw8819bcvmixws88fvrxm9";}
+  {name="kde-dev-utils";value="1bwqx7g9hrrhyhfbv475bfxw193zinrksx858aypf86r0xf57zcy";}
+  {name="kdegraphics-mobipocket";value="0cji929vibrb6nxnw151r9z3n70l2ldd01x8v8kijpd9igywwvc9";}
+  {name="kdegraphics-strigi-analyzer";value="1s9pcjskh8m69gi2r54z05p4k9xwn9j0ifb8p1163kg1qyff6bhy";}
+  {name="kdegraphics-thumbnailers";value="05bq2wr9knwjkk088fd0bnw1l352dgfb7bg6h5y691wc21dy5zi9";}
+  {name="kdelibs";value="0ykqhgjmfxvysd2skk5c4kijnkg1ynmi2z6agshijyiqjkx20gnh";}
+  {name="kdenetwork-filesharing";value="0gxiqlzxmmwyg2kxivhhyd9rxif3q800p7agp3rns91x1k1k6dxj";}
+  {name="kdenetwork-strigi-analyzers";value="1l8yigrzfrqdmnzsh8ass1n45bw4gp25s9zc22sgmz5ng9l72501";}
+  {name="kdepim";value="1axgk6v0sf7bakjkz3348kg25rdllbdy0rvxys1c3a5kcpxi6z49";}
+  {name="kdepimlibs";value="1qj7mv2dn3833fpcfqirqh6wa3046d75mn7amkbmgkh0iq7s8xg4";}
+  {name="kdepim-runtime";value="173a8mlq1lmz47p9r56dp8pxll0qyam5mfm0fiffvjygc2wlczbq";}
+  {name="kdeplasma-addons";value="1f6shv7d0a0v1iq75ywgs0p9n8x2y0n7p9g185904giz40d7sm0x";}
+  {name="kde-runtime";value="14vipbrnmnzapz1c8l0rfy93i4vap9lgqks6q819xbvm3hqg38ac";}
+  {name="kdesdk-kioslaves";value="1f18ddm8lwx3yqwj3gmvmvg3frsq10k7rn52yd60yxl2q4ifba2z";}
+  {name="kdesdk-strigi-analyzers";value="1ya6dg6a2b7p83wgj7hw2nky6x72cy6g5vmi6id8v70gix3c21bi";}
+  {name="kdesdk-thumbnailers";value="09kz9yck8lwjbfgvw2qppk6x82fm0cyvzi0k9qj3pkz9lva1g4ri";}
+  {name="kde-wallpapers";value="0ipqnnnrl04kdmcc492c3l62d1fmsf3w3gannxhmrwr17hkl530n";}
+  {name="kdewebdev";value="0sbwmwb6h5ddx3s86p01a4jdjjbgvkvji7baxjdpvxscyhp6b0m4";}
+  {name="kdf";value="190mcs9s6rcfa8p5m7c2vs6ghdlfygxz9m038ibvbfic4zyl1kk0";}
+  {name="kdiamond";value="09b9wjn30118q5c8y6ixwhd4041pb8g7izy0w420riaal314lj9b";}
+  {name="kdnssd";value="0bir835kn6m0bsrsh09ph41jn1bm347zfl5fkrwnhnxp937mba9c";}
+  {name="kfloppy";value="1mr353kij4rn4qcip81dhcxswscsmwzsk0a29rqcpxli66ydv015";}
+  {name="kfourinline";value="01qaamcmvcbv90fgmfwmgmdx5asw8mp0biayhimmsi6fc4ykbl54";}
+  {name="kgamma";value="1hhd9qw8bqrc9zj5l8lh1izay2s58qfrj2an7yvppjvcx5n8gbgw";}
+  {name="kgeography";value="1nhgl85lj9w86425n2ndird10j28ffvf0kdy8rgz99bgdhsrk15c";}
+  {name="kget";value="1ix29z9sh575z9srndzryjra0phvhs8izy849dykczjh0kqx5cvn";}
+  {name="kgoldrunner";value="01rrdx2wd0962lrf8cw4c6pyp3yj95wmxf5v0dl95y7zqg81hzaq";}
+  {name="kgpg";value="17jd3cylpj690zd2rawa12cdp5nfcqik2kvqk6i2lq2zlqm3z4aq";}
+  {name="khangman";value="1gj2wybjbrzwf7r2svsip32ll009q89y7khmvmmwz6xl2klk1s21";}
+  {name="kig";value="13i9ddj8d3w6jisdlfw7l8krsdr38g60j18hcpc2sd875ba7qv15";}
+  {name="kigo";value="180b6yqiydwfv62jfmvcxqhsc2pmp7n5s5m4cr3g58090q9lj0li";}
+  {name="killbots";value="099k2y9y2f0rbl1hafqrih58ky1al5nrslx3i1kzkbhqphl8khqa";}
+  {name="kimono";value="004ch6pi60qcrzrnz5fsfx25gmm2nx0hmx88h1s292zbi0c9ccd0";}
+  {name="kiriki";value="0niajfivghvdc88dwk13bqjzj8x8nj6h357wd4jnsvrx90wm8mp3";}
+  {name="kiten";value="07xz2rl8f5683a3zjv8rs2acp81d806vx3w5z1xbvlziiw1y2sj6";}
+  {name="kjumpingcube";value="1hn2n27vyk6zjc8jmnv8hmxhmb3323zg4qkwb6rmqkai28q9rdnd";}
+  {name="klettres";value="15is8hrmh4m45npg40iv06c1v9yjv2rk2xwfm8c7a5r3xncqh6im";}
+  {name="klickety";value="0n72r56xx9vgy19izwbddbssgnmvzacdjq6g5s9vrlnkz2lac0ak";}
+  {name="klines";value="0lrka7pgx26v5rf0kp3mqbw65q9p281hsi3whnjf0c3nnq80v25i";}
+  {name="kmag";value="0y0l19m0irmd5q3fxarr18d7f6a4537g8b1bm6hnq48v63w6f13i";}
+  {name="kmahjongg";value="06dvr50x6y0115pr2rx605pm3nll3lglz2z1q07dc8ydfgqjy2sp";}
+  {name="kmines";value="1fz2q1xbagzi27xvl2wx5hd6fnk0qy33apr103cqq1lprb68n2dl";}
+  {name="kmix";value="137v4np9nhynwybabb1z1h9wvcrzm9yvjxybjkfwz0csz747pyah";}
+  {name="kmousetool";value="1n1isbq1vncs5kw1hp0g7s84bggksg14wgas3bqzhcbcxcfdj0i3";}
+  {name="kmouth";value="07im0lvkws27sgg68lgwc5fzx8wiz758ynxigbx85gavmjvr2cv1";}
+  {name="kmplot";value="18s8826yh9krsbh20widv53z0cvd6js60apvj6iwzq00506bjjlh";}
+  {name="knavalbattle";value="1gc7kgg5q4ha5bil6r5amf5ww4jby953b4xk87m9cb7pwhp65z7s";}
+  {name="knetwalk";value="1ky2933f2mp4m6mh5z4ighvd255pqsmblqrbbsnpy8ks7qx9acwm";}
+  {name="kolf";value="0s1qkvfsw42hsi84wi6a93zm7cz1kciiqgp1p9izgdyd3qr48lml";}
+  {name="kollision";value="02jczgs348wlb8djvb1l44hkg8055zk4fl6am70i943jc1f9isiv";}
+  {name="kolourpaint";value="1m7vjnx8f7y59lf9z8gncspvw1pfbqz7aqbb1msgwphhr06m5x59";}
+  {name="kompare";value="0s8a53bn8k6x10gi9bdfyrqm30742krv2gjz9gpckpycb4d7g8k1";}
+  {name="konquest";value="1n3aai02vgb2cclljak9cvfdrcv75ay6lbaji065qnx9zb925zn7";}
+  {name="konsole";value="1qh4jjwxp3wxyh876bwg6mwbvgr5b9kcyfn7679j04z5hydzxpvc";}
+  {name="kopete";value="04xhp0293xzrimfhnhxi7l760a5bliqk370pl0bw05j9lc3fa2gw";}
+  {name="korundum";value="06cajw6disdhyajnhqjsxc68mwc34qqv95z46345i08b2z7xy7b7";}
+  {name="kpat";value="1rphkkdx7076zxfx186znay355sfz0y2m2xi7mimngydi4n0fa93";}
+  {name="kppp";value="0zji9ihid90drdd561gqqzi2bmxi2vsznf4lpi09iy2x3sl4z4ah";}
+  {name="krdc";value="0dimldcijnw14s9archnqfhyi2b519xgd65jpz2z8nw7vxnfja9y";}
+  {name="kremotecontrol";value="1rx0pa5gvncsczvdzncqhra4rxign6nnawp1w2g4amv0mpjpxdz8";}
+  {name="kreversi";value="1gh5dqsfx6hzlmxp9xivj571f3x9d434p9683cy16ck6rg3290kr";}
+  {name="krfb";value="1s515wb0bh8lhgbffkji48mvsq8wl80k6c3fka3fn84kyqc74kn8";}
+  {name="kross-interpreters";value="0qvhs3d691kzzqkg48y2d9gc45l4mr5qyzg0sb2hkmwzskdmim2b";}
+  {name="kruler";value="1q7z31g67cg5v4x1b348cics063dcy0fpbmh2vmj3g51kha9a3za";}
+  {name="ksaneplugin";value="0h05db6gid0519a79b89y74vfqjls71ncqc28wysvpcpi80rwhzn";}
+  {name="kscd";value="0q6yl13n0gblida0k5a66g8xaliizsjd6zw4xssfj5x67bfmnkq7";}
+  {name="kshisen";value="10c3akddm1qgbmays7v9fh61f9p857l9cpa0k6gvxjg9z2sixd23";}
+  {name="ksirk";value="067i4y1m4c7m6lh0c3hzwslvysfibprr2zp3hsn22if0l5l37fgp";}
+  {name="ksnakeduel";value="1wg266jvs7krvh8mpj6v7r8p5f8znpd3br4x6fs27vcy8pw91bac";}
+  {name="ksnapshot";value="0mylgwysysw1cbhf1jh34qh4d1frhrz85icwg4s7vpw8v6iz26nk";}
+  {name="kspaceduel";value="1x7sn50pxj7v36xziszzq96pl1qcb0ycczx8sxdk30wllpyi50k1";}
+  {name="ksquares";value="1mqxmzvf2wyhcn24rd7glr8g7xks87fd7l5vyh2z73w7dshlf1q2";}
+  {name="kstars";value="05yd9q1n2ja452x6b2b3x0rrr3cpg3zphcvzqk7qv1pdc7dckyyx";}
+  {name="ksudoku";value="1vmslqp8kdmbr5zj0kh0mpsagrhins0y7a5xfb2p61bwprpvqqp8";}
+  {name="ksystemlog";value="1syyjsb0yn59fvbjbdhg4i20lb1ynjd3jj4b5z3bh34d3wzbcfz5";}
+  {name="kteatime";value="1y59cnx65p5i9fw9vm2hls40nq253ps3zj7ps34fcspnjvfcipgx";}
+  {name="ktimer";value="155sbcj4lqxs6sbl2wrc7pgnha4ji5mii1jkax1rggjxspk540n4";}
+  {name="ktouch";value="1v8ybp03cv7xwx9k6ia9b0fnh657an205grk9k0zx5v930ag3p0v";}
+  {name="ktuberling";value="1bcf9vq0hcm9n4343vi8slbqjhv1bffwr7kk4m12gr38yshx5r4v";}
+  {name="kturtle";value="0lgahnmjnwsd20a9xw7f66wqg29klkz7f2i4qalzcrh55a8sbjxg";}
+  {name="ktux";value="1jw8fh47hc8i5aykrir2wq4r3n6ikbrqw1vy3wsz3jcd94434c55";}
+  {name="kubrick";value="0ylz4wf4vbaqbm78ahcz43sxcv3j7znmx20jby0i83izard9w169";}
+  {name="kuser";value="0wsdwi0cac9d1r66l6kial13gqyiyclvrnwi602jmzs10c3vz7lk";}
+  {name="kwallet";value="0a541jgbwpv0ar128bfc67j0piza4n1mifp0dx9hmjqahfylw8yv";}
+  {name="kwordquiz";value="0s6ii237625wfr5qzzdf4s5x9dmwmv2xc0qzmcniib0g4230y53k";}
+  {name="libkcddb";value="03mkgcgcg50r66gfvb9gqxhkl6ixvg5mjcshcz8wlxzamx0vkdcg";}
+  {name="libkcompactdisc";value="1kdcanilyanzi5ixxh357335030x2hlkykg0p3i6375jcivx0j4z";}
+  {name="libkdcraw";value="01xbsb6nsp3rq6l1fyg5i8ysf09hy93n8hy5n3z5jzx8j5gar0jh";}
+  {name="libkdeedu";value="16sibrnaw57j7ngj6d32hn5k0piqmvl6b9slnijzy46yaf60qqjd";}
+  {name="libkdegames";value="0gz23vigrm1q9fm02xs0pi2dkvcwackcp4by6swp8wvz5bx6r3sq";}
+  {name="libkexiv2";value="185cbm1a8sl0hrd7dq69mbkxw88c9qwlhnnip76r3cpzh0fqqcx2";}
+  {name="libkipi";value="1bgrr1dqmn3i844x5ib88z2gq4c2s0zkrxyfv54scy57gnp8z666";}
+  {name="libkmahjongg";value="1svawck122495cdp6vx427nd4vjwmvvpav8xgh15p1av4jdvlpyy";}
+  {name="libkomparediff2";value="17hiffmpknyp86h4lc9q1grn7m8ywhlk5f6p2vq6xl2la6zca6k0";}
+  {name="libksane";value="1dc4cf9wxxg9bg4ldf5ldvl0jpsh6av41kk4fnzsj8h153mak4dx";}
+  {name="lokalize";value="0yvqwbwbs8njzahcp44slg9jaagjrv2ypk8b7abynsa8zlgwjh2h";}
+  {name="lskat";value="129a9bmpiiz3rscnwck4adnmsimb9ql7dqs113yyvkmxj5ncgfdd";}
+  {name="marble";value="1fzaqck6b7gw047jjlbwwsgjlnan3jqj9drd7adxb9klx1ikpskl";}
+  {name="mplayerthumbs";value="13v63lmzzcaz83rjfydhz508m4083ksxdi1m8qrjnlkbwnc6ks2k";}
+  {name="nepomuk-core";value="0p3aya5ajaxzbwmgaqc8rpilzw5vzkms1c7jcsjmyyr51iplkyb4";}
+  {name="nepomuk-widgets";value="1am2gg46ybn6xgfgnzcwzizf9r441i2l7jx655z4zff6wgms9mz5";}
+  {name="okteta";value="0227l2hnz3i8ap19r5lai02y5hqhc3sgkz33wd7j23y0nr5cpv0k";}
+  {name="okular";value="1722ncmd81yz8qfisrllniv0iqwn2i1gyvdd0d0ygs416wj6rmjx";}
+  {name="oxygen-icons";value="1v314rrj0d6jgir7hrhapqagl376f5hwciqxkxkg7vynp6kli33r";}
+  {name="pairs";value="1pfpam1n9bwni2pcq429grzxanprazwz7g1h0l02jbksfv4sabz7";}
+  {name="palapeli";value="0ip07xsr8w45cf0mxya9i64315d7r1zaj0nd0bq4xhcw09qmyyxr";}
+  {name="parley";value="1rqw0y0p7fka6v8hpcq75n8nlk43697js99cdzb0zvrm6gzjmjm5";}
+  {name="perlkde";value="0sxz0bvavclqdimd5hmcsc884alsyflc8v31wd79l3pc51alsibs";}
+  {name="perlqt";value="18dbzm94wa49ysbar7fi64cyhd38w0b0b9rj9pjacxrpfvwa3vg2";}
+  {name="picmi";value="07ycx2xgzqr0sbirsd9gcs9bmxf01i2jnmbp2i13znv2y25xm7j6";}
+  {name="poxml";value="1skyms17zdds878rzzxnc393pvw2fv01wysyr8v7nkylzi77a8fc";}
+  {name="print-manager";value="0rjwi4l99h5wqd728by9ax26v2b7brmkam990s3waids91kbcxrb";}
+  {name="pykde4";value="0x3vz31cz12jp1prdh6rmc501f5av0qby8yi1hkqwgpkfyyqmczj";}
+  {name="qtruby";value="1y79azyhspcnfnkgx54b3k60k0a14aga85cv9hilzl6jn7w8qmmz";}
+  {name="qyoto";value="19fnpzf5bq3i75gb51fm0vrlkgi79jgjcb3sw1w1g5gzy1lkr4nc";}
+  {name="rocs";value="1a1p72slgv7ss73v4md7w1avsssbwflfb339abpc44h361w5pwnz";}
+  {name="smokegen";value="14ashkkh8g0s5i56p5v10w2rskcr435s01hb36yjqva1gfxbs1vf";}
+  {name="smokekde";value="0infmb6gsfiq8iargwba3xl4115dp2fj0whg1f595x0qkl2dlkbf";}
+  {name="smokeqt";value="1nf7jcn2cwdrws8dqk5vgxnda507yh6mg093mgxdjrr8h787x2gn";}
+  {name="step";value="1h29lm6k89nbz038z19irid0fk20dv5h829wvmmmylk1d881a6l6";}
+  {name="superkaramba";value="1n7x85zafz4z7i5p9cw15s5dbfbcr864ml7nw0rwybacppdgp59n";}
+  {name="svgpart";value="0m019wf56pq4c8qds6g7l2h51r5n7ayyf7yyhil8rp4fdwmz44ia";}
+  {name="sweeper";value="0r8qfy5a9y3pcza8ik1yl73d4jn0biiv7kdmv72ci7jjv93fiyq5";}
+  {name="umbrello";value="1d9zl92xcyqhc8b9pn1ih856dainwvgbcqvz6bky891pmggp1n7w";}
+];
+modules=[
+{
+  module="kdemultimedia";
+  split=true;
+  pkgs=[
+    { name="audiocd-kio"; sane="audiocd_kio"; }
+    { name="dragon";  }
+    { name="ffmpegthumbs";  }
+    { name="juk";  }
+    { name="kmix";  }
+    { name="kscd";  }
+    { name="libkcddb";  }
+    { name="libkcompactdisc";  }
+    { name="mplayerthumbs";  }
+  ];
+}
+{
+  module="kdegraphics";
+  split=true;
+  pkgs=[
+    { name="gwenview";  }
+    { name="kamera";  }
+    { name="kcolorchooser";  }
+    { name="kdegraphics-mobipocket"; sane="kdegraphics_mobipocket"; }
+    { name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; }
+    { name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; }
+    { name="kgamma";  }
+    { name="kolourpaint";  }
+    { name="kruler";  }
+    { name="ksaneplugin";  }
+    { name="ksnapshot";  }
+    { name="libkdcraw";  }
+    { name="libkexiv2";  }
+    { name="libkipi";  }
+    { name="libksane";  }
+    { name="okular";  }
+    { name="svgpart";  }
+  ];
+}
+{
+  module="kdelibs";
+  split=true;
+  pkgs=[
+    { name="kdelibs";  }
+    { name="nepomuk-core"; sane="nepomuk_core"; }
+    { name="nepomuk-widgets"; sane="nepomuk_widgets"; }
+  ];
+}
+{
+  module="kdenetwork";
+  split=true;
+  pkgs=[
+    { name="kdenetwork-filesharing"; sane="kdenetwork_filesharing"; }
+    { name="kdenetwork-strigi-analyzers"; sane="kdenetwork_strigi_analyzers"; }
+    { name="kdnssd";  }
+    { name="kget";  }
+    { name="kopete";  }
+    { name="kppp";  }
+    { name="krdc";  }
+    { name="krfb";  }
+  ];
+}
+{
+  module="kdeutils";
+  split=true;
+  pkgs=[
+    { name="ark";  }
+    { name="filelight";  }
+    { name="kcalc";  }
+    { name="kcharselect";  }
+    { name="kdf";  }
+    { name="kfloppy";  }
+    { name="kgpg";  }
+    { name="kremotecontrol";  }
+    { name="ktimer";  }
+    { name="kwallet";  }
+    { name="print-manager"; sane="print_manager"; }
+    { name="superkaramba";  }
+    { name="sweeper";  }
+  ];
+}
+{
+  module="applications";
+  split=true;
+  pkgs=[
+    { name="kate";  }
+    { name="konsole";  }
+  ];
+}
+{
+  module="kdetoys";
+  split=true;
+  pkgs=[
+    { name="amor";  }
+    { name="kteatime";  }
+    { name="ktux";  }
+  ];
+}
+{
+  module="kdesdk";
+  split=true;
+  pkgs=[
+    { name="cervisia";  }
+    { name="dolphin-plugins"; sane="dolphin_plugins"; }
+    { name="kapptemplate";  }
+    { name="kcachegrind";  }
+    { name="kde-dev-scripts"; sane="kde_dev_scripts"; }
+    { name="kde-dev-utils"; sane="kde_dev_utils"; }
+    { name="kdesdk-kioslaves"; sane="kdesdk_kioslaves"; }
+    { name="kdesdk-strigi-analyzers"; sane="kdesdk_strigi_analyzers"; }
+    { name="kdesdk-thumbnailers"; sane="kdesdk_thumbnailers"; }
+    { name="kompare";  }
+    { name="libkomparediff2";  }
+    { name="lokalize";  }
+    { name="okteta";  }
+    { name="poxml";  }
+    { name="umbrello";  }
+  ];
+}
+{
+  module="kdegames";
+  split=true;
+  pkgs=[
+    { name="bomber";  }
+    { name="bovo";  }
+    { name="granatier";  }
+    { name="kajongg";  }
+    { name="kapman";  }
+    { name="katomic";  }
+    { name="kblackbox";  }
+    { name="kblocks";  }
+    { name="kbounce";  }
+    { name="kbreakout";  }
+    { name="kdiamond";  }
+    { name="kfourinline";  }
+    { name="kgoldrunner";  }
+    { name="kigo";  }
+    { name="killbots";  }
+    { name="kiriki";  }
+    { name="kjumpingcube";  }
+    { name="klickety";  }
+    { name="klines";  }
+    { name="kmahjongg";  }
+    { name="kmines";  }
+    { name="knavalbattle";  }
+    { name="knetwalk";  }
+    { name="kolf";  }
+    { name="kollision";  }
+    { name="konquest";  }
+    { name="kpat";  }
+    { name="kreversi";  }
+    { name="kshisen";  }
+    { name="ksirk";  }
+    { name="ksnakeduel";  }
+    { name="kspaceduel";  }
+    { name="ksquares";  }
+    { name="ksudoku";  }
+    { name="ktuberling";  }
+    { name="kubrick";  }
+    { name="libkdegames";  }
+    { name="libkmahjongg";  }
+    { name="lskat";  }
+    { name="palapeli";  }
+    { name="picmi";  }
+  ];
+}
+{
+  module="kdeedu";
+  split=true;
+  pkgs=[
+    { name="analitza";  }
+    { name="blinken";  }
+    { name="cantor";  }
+    { name="kalgebra";  }
+    { name="kalzium";  }
+    { name="kanagram";  }
+    { name="kbruch";  }
+    { name="kgeography";  }
+    { name="khangman";  }
+    { name="kig";  }
+    { name="kiten";  }
+    { name="klettres";  }
+    { name="kmplot";  }
+    { name="kstars";  }
+    { name="ktouch";  }
+    { name="kturtle";  }
+    { name="kwordquiz";  }
+    { name="libkdeedu";  }
+    { name="marble";  }
+    { name="pairs";  }
+    { name="parley";  }
+    { name="rocs";  }
+    { name="step";  }
+  ];
+}
+{
+  module="kdeadmin";
+  split=true;
+  pkgs=[
+    { name="kcron";  }
+    { name="ksystemlog";  }
+    { name="kuser";  }
+  ];
+}
+{
+  module="kdebindings";
+  split=true;
+  pkgs=[
+    { name="kimono";  }
+    { name="korundum";  }
+    { name="kross-interpreters"; sane="kross_interpreters"; }
+    { name="perlkde";  }
+    { name="perlqt";  }
+    { name="pykde4";  }
+    { name="qtruby";  }
+    { name="qyoto";  }
+    { name="smokegen";  }
+    { name="smokekde";  }
+    { name="smokeqt";  }
+  ];
+}
+{
+  module="kdeaccessibility";
+  split=true;
+  pkgs=[
+    { name="jovie";  }
+    { name="kaccessible";  }
+    { name="kmag";  }
+    { name="kmousetool";  }
+    { name="kmouth";  }
+  ];
+}
+{
+  module="kde-baseapps";
+sane="kde_baseapps";  split=true;
+  pkgs=[
+    { name="kde-baseapps"; sane="kde_baseapps"; }
+  ];
+}
+{ module="kactivities";  split=false;}
+{ module="kdeartwork";  split=false;
+  pkgs=[
+    { name="ColorSchemes"; }
+    { name="IconThemes"; }
+    { name="emoticons"; }
+    { name="kscreensaver"; }
+    { name="kwin-styles"; sane="kwin_styles";}
+    { name="styles"; }
+    { name="wallpapers"; }
+    { name="HighResolutionWallpapers"; }
+    { name="WeatherWallpapers"; }
+    { name="desktopthemes"; }
+  ];
+
+}
+{ module="kde-base-artwork"; sane="kde_base_artwork"; split=false;}
+{ module="kdelibs";  split=false;}
+{ module="kdepim";  split=false;}
+{ module="kdepimlibs";  split=false;}
+{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;}
+{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;}
+{ module="kde-runtime"; sane="kde_runtime"; split=false;}
+{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;}
+{ module="kdewebdev";  split=false;
+  pkgs=[
+    { name="klinkstatus"; }
+    { name="kfilereplace"; }
+    { name="kimagemapeditor"; }
+    { name="kommander"; }
+  ];
+
+}
+{ module="kde-workspace"; sane="kde_workspace"; split=false;}
+{ module="oxygen-icons"; sane="oxygen_icons"; split=false;}
+];
+}
--- a/pkgs/desktops/kde-4.12/kde-package/default.nix
+++ b/pkgs/desktops/kde-4.12/kde-package/default.nix
@ -0,0 +1,128 @@
+{ callPackage, runCommand, stdenv, fetchurl, qt4, cmake, automoc4
+, release, ignoreList, extraSubpkgs
+}:
+
+let
+  inherit (stdenv.lib) filter fold;
+  inherit (builtins) getAttr hasAttr remoteAttrs listToAttrs tail head;
+in
+rec {
+  manifest = import (./. + "/${release}.nix");
+
+  # src attribute for $name tarball
+  kdesrc = name: fetchurl {
+    url = "mirror://kde/" + (if manifest.stable then "" else "un")
+      + "stable/${release}/src/${name}-${release}.tar.xz";
+    sha256 = getAttr name manifest.hashes;
+  };
+
+  # Default meta attribute
+  defMeta = {
+    homepage = http://www.kde.org;
+    platforms = stdenv.lib.platforms.linux;
+    inherit (qt4.meta) maintainers;
+  };
+
+  # KDE package built from the whole tarball
+  # This function is used both for monolithic modules and modules which are
+  # released as individual tarballs
+  kdeMonoPkg = name: let n_ = name; in a@{meta, name ? n_, version ? release, ...}:
+    stdenv.mkDerivation ({
+      name = "${name}-${version}";
+      src = kdesrc name;
+      meta = defMeta // meta;
+      enableParallelBuilding = true;
+    } // (removeAttrs a [ "meta" "name" ]));
+
+  # kdeMonoPkg wrapper for modules splitted upstream compatible with combinePkgs
+  # API.
+  kdeSplittedPkg = module: {name, sane ? name}: kdeMonoPkg name;
+
+  # Build subdirectory ${subdir} of tarball ${module}-${release}.tar.xz
+  kdeSubdirPkg = module:
+    {name, subdir ? name, sane ? name}:
+    let name_ = name; in
+    a@{cmakeFlags ? [], name ? name_, meta ? {}, ...}:
+    stdenv.mkDerivation ({
+      name = "${name}-${release}";
+      src = kdesrc module;
+      cmakeFlags =
+        [ "-DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE"
+          "-DBUILD_doc=TRUE"
+          "-DBUILD_${subdir}=TRUE"
+        ] ++ cmakeFlags;
+      meta = defMeta // meta;
+      enableParallelBuilding = module.enableParallelBuilding or true;
+    } // (removeAttrs a [ "meta" "name" "cmakeFlags" ]));
+
+  # A KDE monolithic module
+  kdeMonoModule = name: path: callPackage path { kde = kdeMonoPkg name; };
+
+  # Combine packages in one module.
+  # Arguments:
+  #  * pkgFun --- a function of the following signature:
+  #               module: manifest_attrs: manual_attrs: derivation;
+  #  * module --- name of the module
+  #  * pkgs --- list of packages in manifest format
+  combinePkgs = pkgFun: module: pkgs:
+    let
+      f = p@{name, ...}:
+        callPackage (./.. + "/${module}/${name}.nix") { kde = pkgFun module p; };
+      list = map f pkgs;
+      attrs = listToAttrs (map
+        ({name, sane ? name, ...}@p: { name = sane; value = f p; })
+        pkgs);
+    in
+      runCommand "${module}-${release}"
+      ({passthru = attrs // {
+         propagatedUserEnvPackages = list;
+         projects = attrs;
+       };})
+        ''
+          mkdir -pv $out/nix-support
+          echo "${toString list}" | tee $out/nix-support/propagated-user-env-packages
+        '';
+
+  # Given manifest module data, return the module
+  kdeModule = { module, sane ? module, split, pkgs ? [] }:
+    let
+      pkgs_ = filterPkgs module pkgs;
+    in
+    # Module is splitted by upstream
+    if split then combinePkgs kdeSplittedPkg module pkgs_
+    # Monolithic module
+    else if pkgs == [] then kdeMonoModule module (./.. + "/${module}.nix")
+    # Module is splitted by us
+    else combinePkgs kdeSubdirPkg module pkgs_;
+
+  # The same, as nameValuePair with sane name
+  kdeModuleNV = a@{ module, sane ? module, ... }:
+    { name = sane; value = kdeModule a; };
+
+  filterPkgs = module: (p:
+      removeNames (stdenv.lib.attrByPath [module] [] ignoreList) p
+      ++ (stdenv.lib.attrByPath [module] [] extraSubpkgs));
+
+  # Remove attrsets with x.name in subst. Optimized for empty subst.
+  removeNames = subst: big:
+    fold (s: out: filter (x: x.name != s) out) big subst;
+
+  modules = listToAttrs (map kdeModuleNV manifest.modules);
+
+  splittedModuleList =
+    let
+      splitted = filter (a: a ? pkgs) manifest.modules;
+      names = map ({module, sane ? module, ...}: sane) splitted;
+    in
+    map (m: m.projects) (stdenv.lib.attrVals names modules);
+
+  individual =
+    stdenv.lib.zipAttrsWith
+    (
+      name: list:
+      if tail list == []
+      then head list
+      else abort "Multiple modules define ${name}"
+    )
+    splittedModuleList;
+}
--- a/pkgs/desktops/kde-4.12/kde-package/kde-manifest.sh
+++ b/pkgs/desktops/kde-4.12/kde-package/kde-manifest.sh
@ -0,0 +1,146 @@
+#! /bin/sh
+
+# Usage: download kde release to $dir, then run
+# $0 $dir
+
+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.xz | \
+  sed -e 's/.*kdelibs-//' -e 's/\.tar\.xz//')
+
+if [[ ${release##*.} -gt 50 ]]; then
+  stable="false"
+else
+  stable="true"
+fi
+
+echo "Detected release ${release}" >&2
+
+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`
+
+module[kde-baseapps]=kde-baseapps
+unset module[kactivities]
+
+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.xz`; do
+  package=${i%-${release}.tar.xz}
+  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
+
+
+print_pkg_hash() {
+  echo "  {name=\"${1}\";value=\"${hash[$1]}\";}"
+}
+
+print_hashes(){
+  echo "hashes=builtins.listToAttrs["
+  for p in "${packages[@]}"; do print_pkg_hash "$p"; done
+  echo "];"
+}
+
+print_split_module(){
+  echo -n "$1:" >&2
+  echo -e "{\n  module=\"$1\";"
+  print_sane "$1"
+  echo "  split=true;"
+  echo "  pkgs=["
+  for p in "${packages[@]}"; do
+    if [[ "${module[$p]}" == "$1" ]]; then
+      echo -n "    { name=\"$p\"; "
+      print_sane "$p"
+      echo " }"
+      echo -n " $p" >&2
+    fi
+  done
+  echo "  ];"
+  echo "}"
+  echo >&2
+}
+
+print_mono_module(){
+  echo -en "{ module=\"$1\"; "
+  print_sane "$1"
+  echo -n "$1 ... " >&2
+  echo -n " split=false;"
+  cml="$1-$release/CMakeLists.txt"
+  tar -xf "${dir}/$1-${release}.tar.xz" "$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 -e "\n  pkgs=["
+      for s in "${subdirs[@]}"; do
+        echo -en "    {"
+		echo -n " name=\"${s//\//-}\"; "
+        print_sane "$s"
+        if [[ $s != "${s//\//-}" ]]; then
+          echo -n "subdir=\"$s\"; "
+        fi
+        echo "}"
+      done
+      echo -e "  ];\n"
+    fi
+  else
+    echo " is monolithic (has no subdirs)" >&2
+  fi
+  rm $cml
+  rmdir $1-$release
+  echo "}"
+}
+
+print_modules(){
+  echo "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 "];"
+}
+
+echo "Writing ${release}.nix" >&2
+exec > "${release}.nix"
+echo "{stable=${stable};"
+print_hashes
+print_modules
+echo "}"
--- a/pkgs/desktops/kde-4.12/kde-package/kde-submodules.xslt
+++ b/pkgs/desktops/kde-4.12/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>
--- a/pkgs/desktops/kde-4.12/kde-runtime.nix
+++ b/pkgs/desktops/kde-4.12/kde-runtime.nix
@ -0,0 +1,24 @@
+{ kde, kdelibs, bzip2, libssh, exiv2, attica, qca2
+, libcanberra, virtuoso, samba, libjpeg, ntrack, pkgconfig, xz, pulseaudio
+, networkmanager, kactivities, kdepimlibs, openexr, ilmbase, gpgme
+}:
+
+kde {
+  buildInputs = [
+    kdelibs attica xz bzip2 libssh libjpeg exiv2 ntrack
+    qca2 samba libcanberra pulseaudio gpgme
+    networkmanager kactivities kdepimlibs openexr
+#todo: add openslp
+#todo: gpgme can't be found because cmake module is provided by kdepimlibs which are found too late
+  ];
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
+
+  passthru.propagatedUserEnvPackages = [ virtuoso ];
+
+  meta = {
+    license = "LGPL";
+  };
+}
--- a/pkgs/desktops/kde-4.12/kde-wallpapers.nix
+++ b/pkgs/desktops/kde-4.12/kde-wallpapers.nix
@ -0,0 +1,17 @@
+{ kde, cmake }:
+
+kde {
+  nativeBuildInputs = [ cmake ];
+
+  patches = [ ./files/kde-wallpapers-buildsystem.patch ];
+
+  cmakeFlags = "-DWALLPAPER_INSTALL_DIR=share/wallpapers";
+
+  outputHashAlgo = "sha256";
+  outputHashMode = "recursive";
+  outputHash = "19d2ly05hv2x1kkzgdgvkcpjypp2nk4q9bffv17lz2q5pzhjhsa4";
+
+  meta = {
+    description = "Wallpapers for KDE";
+  };
+}
--- a/pkgs/desktops/kde-4.12/kde-workspace.nix
+++ b/pkgs/desktops/kde-4.12/kde-workspace.nix
@ -0,0 +1,46 @@
+{ kde, kdelibs, qimageblitz, libdbusmenu_qt, xorg, lm_sensors
+, pciutils, libraw1394, libusb1, python, libqalculate, akonadi
+, xkeyboard_config, kdepimlibs, pam, boost, gpsd, prison
+, libjpeg, pkgconfig, kactivities, qjson, udev, fetchurl
+}:
+
+kde {
+
+  version = "4.11.6";
+
+  src = fetchurl {
+    url = "mirror://kde/stable/4.12.2/src/kde-workspace-4.11.6.tar.xz";
+    sha256 = "0lk3k9zl4x4il5dqpw7mf25gv8a3y48fd3jq3jvgmwwlviwcpcz1";
+  };
+
+#todo: wayland, xmms,   libusb isn't found
+  buildInputs =
+    [ kdelibs qimageblitz libdbusmenu_qt xorg.libxcb xorg.xcbutilimage libjpeg 
+      xorg.xcbutilrenderutil xorg.xcbutilkeysyms xorg.libpthreadstubs xorg.libXdmcp
+      xorg.libxkbfile xorg.libXcomposite  xorg.libXtst
+      xorg.libXdamage
+
+      python boost qjson lm_sensors gpsd libraw1394 pciutils udev
+      akonadi pam libusb1 libqalculate kdepimlibs  prison
+      kactivities
+    ];
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  preConfigure =
+   ''
+     # Fix incorrect path to kde4-config.
+     substituteInPlace startkde.cmake --replace '$bindir/kde4-config' ${kdelibs}/bin/kde4-config
+
+     # Fix the path to the keyboard configuration files.
+     substituteInPlace kcontrol/keyboard/xkb_rules.cpp \
+       --replace /usr/share/X11 ${xkeyboard_config}/etc/X11
+   '';
+
+  enableParallelBuilding = false; # frequent problems on Hydra
+
+  meta = {
+    description = "KDE workspace components such as Plasma, Kwin and System Settings";
+    license = "GPLv2";
+  };
+}
--- a/pkgs/desktops/kde-4.12/kdeaccessibility/jovie.nix
+++ b/pkgs/desktops/kde-4.12/kdeaccessibility/jovie.nix
@ -0,0 +1,9 @@
+{ kde, kdelibs, speechd }:
+
+kde {
+  buildInputs = [ kdelibs speechd ];
+
+  meta = {
+    description = "Text-to-speech synthesis daemon";
+  };
+}
--- a/pkgs/desktops/kde-4.12/kdeaccessibility/kaccessible.nix
+++ b/pkgs/desktops/kde-4.12/kdeaccessibility/kaccessible.nix
@ -0,0 +1,9 @@
+{ kde, kdelibs, speechd }:
+
+kde {
+  buildInputs = [ kdelibs speechd ];
+
+  meta = {
+    description = "Bridge that provides accessibility services to applications";
+  };
+}
--- a/pkgs/desktops/kde-4.12/kdeaccessibility/kmag.nix
+++ b/pkgs/desktops/kde-4.12/kdeaccessibility/kmag.nix
@ -0,0 +1,10 @@
+{ kde, kdelibs }:
+
+kde {
+#todo: package qaccessibilityclient
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Screen magnifier for KDE";
+  };
+}
--- a/pkgs/desktops/kde-4.12/kdeaccessibility/kmousetool.nix
+++ b/pkgs/desktops/kde-4.12/kdeaccessibility/kmousetool.nix
@ -0,0 +1,9 @@
+{ kde, kdelibs, libXtst, libXt }:
+
+kde {
+  buildInputs = [ kdelibs libXtst libXt ];
+
+  meta = {
+    description = "A program that clicks the mouse for you";
+  };
+}
--- a/pkgs/desktops/kde-4.12/kdeaccessibility/kmouth.nix
+++ b/pkgs/desktops/kde-4.12/kdeaccessibility/kmouth.nix
@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "A type-and-say front end for speech synthesizers";
+  };
+}
--- a/pkgs/desktops/kde-4.12/kdeadmin/kcron.nix
+++ b/pkgs/desktops/kde-4.12/kdeadmin/kcron.nix
@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Configure and schedule tasks";
+  };
+}
--- a/pkgs/desktops/kde-4.12/kdeadmin/ksystemlog.nix
+++ b/pkgs/desktops/kde-4.12/kdeadmin/ksystemlog.nix
@ -0,0 +1,9 @@
+{ kde, kdelibs }:
+
+kde {
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "System log viewer tool";
+  };
+}
--- a/pkgs/desktops/kde-4.12/kdeadmin/kuser.nix
+++ b/pkgs/desktops/kde-4.12/kdeadmin/kuser.nix
@ -0,0 +1,9 @@
+{ kde, kdelibs, kdepimlibs }:
+
+kde {
+  buildInputs = [ kdelibs kdepimlibs ];
+
+  meta = {
+    description = "User management tool";
+  };
+}
--- a/pkgs/desktops/kde-4.12/kdeartwork/ColorSchemes.nix
+++ b/pkgs/desktops/kde-4.12/kdeartwork/ColorSchemes.nix
@ -0,0 +1,11 @@
+{ kde, kdelibs }:
+
+kde {
+  name = "kde-color-schemes";
+
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Additional KDE color schemes";
+  };
+}
--- a/pkgs/desktops/kde-4.12/kdeartwork/FindXscreensaver.cmake
+++ b/pkgs/desktops/kde-4.12/kdeartwork/FindXscreensaver.cmake
@ -0,0 +1,73 @@
+#Macro to find xscreensaver directory
+
+# Copyright (c) 2006, Laurent Montel, <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.
+
+if (NOT XSCREENSAVER_FOUND)
+  FIND_PATH(XSCREENSAVER_DIR deco
+    HINTS
+      ${KDE4_INCLUDE_DIR}
+    PATHS
+      /usr
+      /usr/local
+      /opt/local
+      /usr/X11R6
+      /opt/kde
+      /opt/kde3
+      /usr/kde
+      /usr/local/kde
+      /usr/local/xscreensaver
+      /usr/openwin/lib/xscreensaver
+      /etc
+    PATH_SUFFIXES
+      lib${LIB_SUFFIX}/xscreensaver
+      lib${LIB_SUFFIX}/misc/xscreensaver
+      lib/xscreensaver
+      lib64/xscreensaver
+      lib/misc/xscreensaver
+      libexec/xscreensaver
+      bin/xscreensaver-hacks
+      hacks)
+  message(STATUS "XSCREENSAVER_DIR <${XSCREENSAVER_DIR}>")
+
+  FIND_PATH(XSCREENSAVER_CONFIG_DIR deco.xml
+    PATHS
+    ${KDE4_INCLUDE_DIR}
+    /usr/
+    /usr/local/
+    /opt/local/
+    /usr/X11R6/
+    /opt/kde/
+    /opt/kde3/
+    /usr/kde/
+    /usr/local/kde/
+    /usr/openwin/lib/xscreensaver/
+    /etc/
+    PATH_SUFFIXES xscreensaver xscreensaver/config share/xscreensaver/config
+  )
+  MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR :<${XSCREENSAVER_CONFIG_DIR}>")
+
+endif(NOT XSCREENSAVER_FOUND)
+
+#MESSAGE(STATUS "XSCREENSAVER_CONFIG_DIR :<${XSCREENSAVER_CONFIG_DIR}>")
+#MESSAGE(STATUS "XSCREENSAVER_DIR :<${XSCREENSAVER_DIR}>")
+
+# Need to fix hack
+if(XSCREENSAVER_DIR AND XSCREENSAVER_CONFIG_DIR)
+    set(XSCREENSAVER_FOUND TRUE)
+endif(XSCREENSAVER_DIR AND XSCREENSAVER_CONFIG_DIR)
+
+if (XSCREENSAVER_FOUND)
+  if (NOT Xscreensaver_FIND_QUIETLY)
+    message(STATUS "Found XSCREENSAVER_CONFIG_DIR <${XSCREENSAVER_CONFIG_DIR}>")
+  endif (NOT Xscreensaver_FIND_QUIETLY)
+else (XSCREENSAVER_FOUND)
+  if (Xscreensaver_FIND_REQUIRED)
+    message(FATAL_ERROR "XScreenSaver not found")
+  endif (Xscreensaver_FIND_REQUIRED)
+endif (XSCREENSAVER_FOUND)
+
+
+MARK_AS_ADVANCED(XSCREENSAVER_DIR XSCREENSAVER_CONFIG_DIR)
--- a/pkgs/desktops/kde-4.12/kdeartwork/HighResolutionWallpapers.nix
+++ b/pkgs/desktops/kde-4.12/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";
+  };
+}
--- a/pkgs/desktops/kde-4.12/kdeartwork/IconThemes.nix
+++ b/pkgs/desktops/kde-4.12/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";
+  };
+}
--- a/pkgs/desktops/kde-4.12/kdeartwork/WeatherWallpapers.nix
+++ b/pkgs/desktops/kde-4.12/kdeartwork/WeatherWallpapers.nix
@ -0,0 +1,11 @@
+{ kde, kdelibs }:
+
+kde rec {
+  name = "kde-weather-wallpapers";
+
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Additional KDE wallpapers (weather)";
+  };
+}
--- a/pkgs/desktops/kde-4.12/kdeartwork/desktopthemes.nix
+++ b/pkgs/desktops/kde-4.12/kdeartwork/desktopthemes.nix
@ -0,0 +1,11 @@
+{ kde, kdelibs }:
+
+kde {
+  name = "kde-desktop-themes";
+
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Additional KDE desktop themes";
+  };
+}
--- a/pkgs/desktops/kde-4.12/kdeartwork/emoticons.nix
+++ b/pkgs/desktops/kde-4.12/kdeartwork/emoticons.nix
@ -0,0 +1,11 @@
+{ kde, kdelibs }:
+
+kde {
+  name = "kde-emotion-icons";
+
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Additional KDE emotion icons (smiles)";
+  };
+}
--- a/pkgs/desktops/kde-4.12/kdeartwork/kscreensaver.nix
+++ b/pkgs/desktops/kde-4.12/kdeartwork/kscreensaver.nix
@ -0,0 +1,15 @@
+{ kde, kdelibs, xscreensaver, kde_workspace, eigen, libkexiv2, libXt, pkgconfig }:
+
+kde {
+  buildInputs = [ kdelibs xscreensaver kde_workspace eigen libkexiv2 libXt ];
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  prePatch = "cp -v ${./FindXscreensaver.cmake} cmake/modules/FindXscreensaver.cmake";
+
+  cmakeFlags = [ "-DBUILD_asciiquarium:BOOL=ON" ];
+
+  meta = {
+    description = "KDE screensavers";
+  };
+}
--- a/pkgs/desktops/kde-4.12/kdeartwork/kwin-styles.nix
+++ b/pkgs/desktops/kde-4.12/kdeartwork/kwin-styles.nix
@ -0,0 +1,9 @@
+{ kde, kdelibs, kde_workspace }:
+
+kde {
+  buildInputs = [ kdelibs kde_workspace ];
+
+  meta = {
+    description = "Styles for KWin";
+  };
+}
--- a/pkgs/desktops/kde-4.12/kdeartwork/styles.nix
+++ b/pkgs/desktops/kde-4.12/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";
+  };
+}
--- a/pkgs/desktops/kde-4.12/kdeartwork/wallpapers.nix
+++ b/pkgs/desktops/kde-4.12/kdeartwork/wallpapers.nix
@ -0,0 +1,11 @@
+{ kde, kdelibs }:
+
+kde rec {
+  name = "kdeartwork-wallpapers";
+
+  buildInputs = [ kdelibs ];
+
+  meta = {
+    description = "Additional KDE wallpapers";
+  };
+}
--- a/pkgs/desktops/kde-4.12/kdebindings/perlqt.nix
+++ b/pkgs/desktops/kde-4.12/kdebindings/perlqt.nix
@ -0,0 +1,14 @@
+{ kde, cmake, smokeqt, perl }:
+
+kde {
+
+  # TODO: qscintilla2, qwt5
+
+  buildInputs = [ smokeqt perl ];
+
+  nativeBuildInputs = [ cmake ];
+
+  meta = {
+    description = "Perl bindings for Qt library";
+  };
+}
--- a/pkgs/desktops/kde-4.12/kdebindings/pykde4.nix
+++ b/pkgs/desktops/kde-4.12/kdebindings/pykde4.nix
@ -0,0 +1,32 @@
+{ kde, kdelibs, python, sip, pyqt4, kdepimlibs, shared_desktop_ontologies,
+  polkit_qt_1, boost, lndir, pkgconfig }:
+
+let pydir = "lib/python${python.majorVersion}"; in
+
+kde {
+
+  # todo: polkit isn't found by the build system
+
+  buildInputs = [
+    python kdepimlibs shared_desktop_ontologies
+    boost polkit_qt_1
+  ];
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  propagatedBuildInputs = [ pyqt4 sip ];
+
+  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}
+      cmakeFlagsArray=( "-DSIP_DEFAULT_SIP_DIR=$prefix/share/sip" )
+    '';
+
+  meta = {
+    description = "Python bindings for KDE";
+  };
+}
--- a/pkgs/desktops/kde-4.12/kdebindings/qtruby-install-prefix.patch
+++ b/pkgs/desktops/kde-4.12/kdebindings/qtruby-install-prefix.patch
@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 33078b4..30aec0e 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -31,8 +31,8 @@ if (NOT COMPILE_RUBY)
+     return()
+ endif (NOT COMPILE_RUBY)
+ 
+-SET(CUSTOM_RUBY_SITE_ARCH_DIR ${RUBY_SITEARCH_DIR} CACHE DIR "custom installation directory for ruby binary extension" )
+-SET(CUSTOM_RUBY_SITE_LIB_DIR ${RUBY_SITELIB_DIR} CACHE DIR "custom installation directory for ruby extension" )
+string(REPLACE "${RUBY_ROOT_DIR}" "${CMAKE_INSTALL_PREFIX}" CUSTOM_RUBY_SITE_ARCH_DIR ${RUBY_SITEARCH_DIR})
+string(REPLACE "${RUBY_ROOT_DIR}" "${CMAKE_INSTALL_PREFIX}" CUSTOM_RUBY_SITE_LIB_DIR ${RUBY_SITELIB_DIR})
+ 
+ # compute an overall version number which can be compared at once
+ MATH(EXPR RUBY_VERSION_NUMBER "${RUBY_VERSION_MAJOR}*10000 + ${RUBY_VERSION_MINOR}*100 + ${RUBY_VERSION_PATCH}")
--- a/Show More
+++ b/Show More