From 77c413926230eb4fda6be41f666f5603129bbf73 Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Mon, 4 Apr 2016 18:06:48 +0900
Subject: [PATCH 001/287] gtk3: make gtk3 look for immodule cache in
 $NIX_PROFILE

---
 .../libraries/gtk+/3.0-immodules.cache.patch  | 27 +++++++++++++++++++
 pkgs/development/libraries/gtk+/3.x.nix       |  9 ++-----
 2 files changed, 29 insertions(+), 7 deletions(-)
 create mode 100644 pkgs/development/libraries/gtk+/3.0-immodules.cache.patch

diff --git a/pkgs/development/libraries/gtk+/3.0-immodules.cache.patch b/pkgs/development/libraries/gtk+/3.0-immodules.cache.patch
new file mode 100644
index 000000000000..bbe5f28dbd3e
--- /dev/null
+++ b/pkgs/development/libraries/gtk+/3.0-immodules.cache.patch
@@ -0,0 +1,27 @@
+--- a/gtk/deprecated/gtkrc.c	2016-04-02 18:43:08.401663112 +0900
++++ b/gtk/deprecated/gtkrc.c	2016-04-02 18:29:19.927608592 +0900
+@@ -774,5 +774,23 @@
+   if (var)
+     result = g_strdup (var);
+ 
++  // check NIX_PROFILES paths.
++  const gchar *nixProfilesEnv = g_getenv ("NIX_PROFILES");
++  gchar *cachePath;
++  guint i;
++
++  if(nixProfilesEnv && !result){
++    gchar **paths = g_strsplit(nixProfilesEnv, " ", -1);
++    for (i = 0; paths[i] != NULL; i++){
++      cachePath = g_build_filename(paths[i], "etc", "gtk-3.0", "immodules.cache", NULL);
++      if( g_file_test( cachePath, G_FILE_TEST_EXISTS) ){
++        if(result) g_free(result);
++        result = g_strdup(cachePath);
++      }
++      g_free(cachePath);
++    }
++    g_strfreev(paths);
++  }
++
+   if (!result)
+     {
+ 
diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix
index a2da4c7b0339..45003e17f973 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk+/3.x.nix
@@ -28,6 +28,8 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig gettext gobjectIntrospection perl ];
 
+  patches = [ ./3.0-immodules.cache.patch ];
+
   buildInputs = [ libxkbcommon epoxy json_glib ];
   propagatedBuildInputs = with xorg; with stdenv.lib;
     [ expat glib cairo pango gdk_pixbuf atk at_spi2_atk
@@ -58,13 +60,6 @@ stdenv.mkDerivation rec {
       --replace '-L${gmp.dev}/lib' '-L${gmp.out}/lib'
   '';
 
-  passthru = {
-    gtkExeEnvPostBuild = ''
-      rm $out/lib/gtk-3.0/3.0.0/immodules.cache
-      $out/bin/gtk-query-immodules-3.0 $out/lib/gtk-3.0/3.0.0/immodules/*.so > $out/lib/gtk-3.0/3.0.0/immodules.cache
-    ''; # workaround for bug of nix-mode for Emacs */ '';
-  };
-
   meta = with stdenv.lib; {
     description = "A multi-platform toolkit for creating graphical user interfaces";
 

From 3e2318ec3ecff70e1583ad5717f26f91ecdda952 Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Sat, 9 Apr 2016 17:43:55 +0900
Subject: [PATCH 002/287] gtk2: make gtk2 look for immodule cache in
 $NIX_PROFILE

---
 .../libraries/gtk+/2.0-immodules.cache.patch  | 27 +++++++++++++++++++
 pkgs/development/libraries/gtk+/2.x.nix       |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/development/libraries/gtk+/2.0-immodules.cache.patch

diff --git a/pkgs/development/libraries/gtk+/2.0-immodules.cache.patch b/pkgs/development/libraries/gtk+/2.0-immodules.cache.patch
new file mode 100644
index 000000000000..1b8231756e71
--- /dev/null
+++ b/pkgs/development/libraries/gtk+/2.0-immodules.cache.patch
@@ -0,0 +1,27 @@
+--- a/gtk/gtkrc.c	2014-09-30 05:02:17.000000000 +0900
++++ b/gtk/gtkrc.c	2016-04-09 17:39:51.363288355 +0900
+@@ -445,5 +445,23 @@
+   if (var)
+     result = g_strdup (var);
+ 
++  // check NIX_PROFILES paths.
++  const gchar *nixProfilesEnv = g_getenv ("NIX_PROFILES");
++  gchar *cachePath;
++  guint i;
++
++  if(nixProfilesEnv && !result){
++    gchar **paths = g_strsplit(nixProfilesEnv, " ", -1);
++    for (i = 0; paths[i] != NULL; i++){
++      cachePath = g_build_filename(paths[i], "etc", "gtk-2.0", "immodules.cache", NULL);
++      if( g_file_test( cachePath, G_FILE_TEST_EXISTS) ){
++        if(result) g_free(result);
++        result = g_strdup(cachePath);
++      }
++      g_free(cachePath);
++    }
++    g_strfreev(paths);
++  }
++
+   if (!result)
+     {
+
diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix
index d4d4cddb4023..f3ebc189cd7a 100644
--- a/pkgs/development/libraries/gtk+/2.x.nix
+++ b/pkgs/development/libraries/gtk+/2.x.nix
@@ -26,6 +26,8 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ setupHook perl pkgconfig gettext ];
 
+  patches = [ ./2.0-immodules.cache.patch ];
+
   propagatedBuildInputs = with xorg; with stdenv.lib;
     [ glib cairo pango gdk_pixbuf atk ]
     ++ optionals (stdenv.isLinux || stdenv.isDarwin) [

From cfe062f2b6e3c75a68f69104a1f87180004f1341 Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Mon, 4 Apr 2016 18:11:20 +0900
Subject: [PATCH 003/287] input methods: fix gtk cache

---
 nixos/modules/config/system-path.nix        |  2 +
 nixos/modules/i18n/input-method/default.nix | 42 +++++++++++++++++++--
 nixos/modules/i18n/input-method/fcitx.nix   |  2 +-
 nixos/modules/i18n/input-method/ibus.nix    |  4 +-
 nixos/modules/i18n/input-method/nabi.nix    |  2 +-
 nixos/modules/i18n/input-method/uim.nix     |  2 +-
 6 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix
index d7815324c4c4..8c4170597826 100644
--- a/nixos/modules/config/system-path.nix
+++ b/nixos/modules/config/system-path.nix
@@ -102,6 +102,8 @@ in
     environment.pathsToLink =
       [ "/bin"
         "/etc/xdg"
+        "/etc/gtk-2.0"
+        "/etc/gtk-3.0"
         "/info"
         "/lib" # FIXME: remove and update debug-info.nix
         "/sbin"
diff --git a/nixos/modules/i18n/input-method/default.nix b/nixos/modules/i18n/input-method/default.nix
index 7e6a25bfb084..5d57a7f99666 100644
--- a/nixos/modules/i18n/input-method/default.nix
+++ b/nixos/modules/i18n/input-method/default.nix
@@ -1,10 +1,32 @@
 { config, pkgs, lib, ... }:
 
 with lib;
-
+let
+  cfg = config.i18n.inputMethod;
+  gtk2_cache = pkgs.stdenv.mkDerivation {
+    preferLocalBuild = true; 
+    allowSubstitutes = false;
+    name = "gtk2-immodule.cache";
+    buildInputs = [ pkgs.gtk cfg.package ];
+    buildCommand = ''
+      mkdir -p $out/etc/gtk-2.0/
+      GTK_PATH=${cfg.package}/lib/gtk-2.0/ gtk-query-immodules-2.0 > $out/etc/gtk-2.0/immodules.cache
+    '';
+  };
+  gtk3_cache = pkgs.stdenv.mkDerivation {
+    preferLocalBuild = true; 
+    allowSubstitutes = false;
+    name = "gtk3-immodule.cache";
+    buildInputs = [ pkgs.gtk3 cfg.package ];
+    buildCommand = ''
+      mkdir -p $out/etc/gtk-3.0/
+      GTK_PATH=${cfg.package}/lib/gtk-3.0/ gtk-query-immodules-3.0 > $out/etc/gtk-3.0/immodules.cache
+    '';
+  };
+in
 {
-  options = {
-    i18n.inputMethod = {
+  options.i18n = {
+    inputMethod = {
       enabled = mkOption {
         type    = types.nullOr (types.enum [ "ibus" "fcitx" "nabi" "uim" ]);
         default = null;
@@ -24,6 +46,20 @@ with lib;
           </itemizedlist>
         '';
       };
+
+      package = mkOption {
+        internal = true;
+        type     = types.path;
+        default  = null;
+        description = ''
+          The input method method package.
+        '';
+      };
     };
   };
+
+  config = mkIf (cfg.enabled != null) {
+    environment.systemPackages = [ cfg.package gtk2_cache gtk3_cache ];
+  };
+
 }
diff --git a/nixos/modules/i18n/input-method/fcitx.nix b/nixos/modules/i18n/input-method/fcitx.nix
index 8e31743504f1..bdefd2d2d596 100644
--- a/nixos/modules/i18n/input-method/fcitx.nix
+++ b/nixos/modules/i18n/input-method/fcitx.nix
@@ -32,7 +32,7 @@ in
   };
 
   config = mkIf (config.i18n.inputMethod.enabled == "fcitx") {
-    environment.systemPackages = [ fcitxPackage ];
+    i18n.inputMethod.package = fcitxPackage;
 
     environment.variables = {
       GTK_IM_MODULE = "fcitx";
diff --git a/nixos/modules/i18n/input-method/ibus.nix b/nixos/modules/i18n/input-method/ibus.nix
index bb80f43634d3..097a662c3c6d 100644
--- a/nixos/modules/i18n/input-method/ibus.nix
+++ b/nixos/modules/i18n/input-method/ibus.nix
@@ -41,9 +41,11 @@ in
   };
 
   config = mkIf (config.i18n.inputMethod.enabled == "ibus") {
+    i18n.inputMethod.package = ibusPackage;
+
     # Without dconf enabled it is impossible to use IBus
     environment.systemPackages = with pkgs; [
-      ibusPackage ibus-qt gnome3.dconf ibusAutostart
+      ibus-qt gnome3.dconf ibusAutostart
     ];
 
     environment.variables = {
diff --git a/nixos/modules/i18n/input-method/nabi.nix b/nixos/modules/i18n/input-method/nabi.nix
index c6708365effa..87620ae4e7b2 100644
--- a/nixos/modules/i18n/input-method/nabi.nix
+++ b/nixos/modules/i18n/input-method/nabi.nix
@@ -3,7 +3,7 @@
 with lib;
 {
   config = mkIf (config.i18n.inputMethod.enabled == "nabi") {
-    environment.systemPackages = [ pkgs.nabi ];
+    i18n.inputMethod.package = pkgs.nabi;
 
     environment.variables = {
       GTK_IM_MODULE = "nabi";
diff --git a/nixos/modules/i18n/input-method/uim.nix b/nixos/modules/i18n/input-method/uim.nix
index f8a3e560656d..7ad68bf851fe 100644
--- a/nixos/modules/i18n/input-method/uim.nix
+++ b/nixos/modules/i18n/input-method/uim.nix
@@ -22,7 +22,7 @@ in
   };
 
   config = mkIf (config.i18n.inputMethod.enabled == "uim") {
-    environment.systemPackages = [ pkgs.uim ];
+    i18n.inputMethod.package = pkgs.uim;
 
     environment.variables = {
       GTK_IM_MODULE = "uim";

From a047ba25f4ab932980460db588f7ef14602bc4a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 9 Feb 2016 15:23:16 +0100
Subject: [PATCH 004/287] libiconv: fix on mingw

---
 pkgs/development/libraries/libiconv/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix
index f5818c3bf4c9..9b62436ae080 100644
--- a/pkgs/development/libraries/libiconv/default.nix
+++ b/pkgs/development/libraries/libiconv/default.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, lib }:
 
-assert (!stdenv.isLinux);
+assert !stdenv.isLinux || stdenv ? cross; # TODO: improve on cross
 
 stdenv.mkDerivation rec {
   name = "libiconv-1.14";
@@ -15,6 +15,12 @@ stdenv.mkDerivation rec {
     ./libiconv-1.14-wchar.patch
   ];
 
+  postPatch =
+    lib.optionalString (stdenv.cross.libc or null == "msvcrt")
+      ''
+        sed '/^_GL_WARN_ON_USE (gets/d' -i srclib/stdio.in.h
+      '';
+
   configureFlags =
   # On Cygwin, Libtool produces a `.dll.a', which is not a "real" DLL
   # (Windows' linker would need to be used somehow to produce an actual

From 13df963c7eef2f2a6f469a881084bc5473d4cd88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 4 Feb 2016 11:07:28 +0100
Subject: [PATCH 005/287] mingw: update 3.1.0 -> 4.0.6

---
 pkgs/os-specific/windows/mingw-w64/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/windows/mingw-w64/default.nix b/pkgs/os-specific/windows/mingw-w64/default.nix
index bf15b208e1a7..a9df0d29e09f 100644
--- a/pkgs/os-specific/windows/mingw-w64/default.nix
+++ b/pkgs/os-specific/windows/mingw-w64/default.nix
@@ -4,14 +4,15 @@
 }:
 
 let
-  name = "mingw-w64-3.1.0";
+  version = "4.0.6";
+  name = "mingw-w64-${version}";
 in
-stdenv.mkDerivation (rec {
+stdenv.mkDerivation ({
   inherit name;
 
   src = fetchurl {
-    url = "mirror://sourceforge/mingw-w64/mingw-w64-v3.1.0.tar.bz2";
-    sha256 = "1lhpw381gc59w8b1r9zzdwa9cdi2wx6qx7s6rvajapmbw7ksgrzc";
+    url = "mirror://sourceforge/mingw-w64/mingw-w64-v${version}.tar.bz2";
+    sha256 = "0p01vm5kx1ixc08402z94g1alip4vx66gjpvyi9maqyqn2a76h0c";
   };
 } //
 (if onlyHeaders then {

From 8b585cc9f555ac88970d8814641ad1488e8d9e9b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 21 Apr 2016 14:33:04 -0500
Subject: [PATCH 006/287] phonon: 4.8.3 -> 4.9.0

- Removed phonon-backend-vlc.
- Moved qt5.phonon to kde5.phonon.
---
 .../services/x11/desktop-managers/kde5.nix    | 36 +--------------
 .../phonon-backend-gstreamer/qt4/default.nix  | 33 --------------
 .../phonon-backend-gstreamer/qt5/default.nix  | 39 ----------------
 .../phonon-backend-vlc/qt4/default.nix        | 32 -------------
 .../phonon-backend-vlc/qt5/default.nix        | 31 -------------
 .../libraries/phonon/backends/gstreamer.nix   | 45 +++++++++++++++++++
 pkgs/development/libraries/phonon/default.nix | 27 +++++------
 pkgs/top-level/all-packages.nix               | 17 +++----
 8 files changed, 65 insertions(+), 195 deletions(-)
 delete mode 100644 pkgs/development/libraries/phonon-backend-gstreamer/qt4/default.nix
 delete mode 100644 pkgs/development/libraries/phonon-backend-gstreamer/qt5/default.nix
 delete mode 100644 pkgs/development/libraries/phonon-backend-vlc/qt4/default.nix
 delete mode 100644 pkgs/development/libraries/phonon-backend-vlc/qt5/default.nix
 create mode 100644 pkgs/development/libraries/phonon/backends/gstreamer.nix

diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix
index 70dc1ac2a26a..f5d9d8b8e0db 100644
--- a/nixos/modules/services/x11/desktop-managers/kde5.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde5.nix
@@ -22,26 +22,6 @@ in
         description = "Enable the Plasma 5 (KDE 5) desktop environment.";
       };
 
-      phonon = {
-
-        gstreamer = {
-          enable = mkOption {
-            type = types.bool;
-            default = true;
-            description = "Enable the GStreamer Phonon backend (recommended).";
-          };
-        };
-
-        vlc = {
-          enable = mkOption {
-            type = types.bool;
-            default = false;
-            description = "Enable the VLC Phonon backend.";
-          };
-        };
-
-      };
-
     };
 
   };
@@ -141,26 +121,14 @@ in
 
       ++ lib.optionals cfg.phonon.gstreamer.enable
         [
-          pkgs.phonon_backend_gstreamer
-          pkgs.gst_all.gstreamer
-          pkgs.gst_all.gstPluginsBase
-          pkgs.gst_all.gstPluginsGood
-          pkgs.gst_all.gstPluginsUgly
-          pkgs.gst_all.gstPluginsBad
-          pkgs.gst_all.gstFfmpeg # for mp3 playback
-          pkgs.qt55.phonon-backend-gstreamer
+          pkgs.phonon-backend-gstreamer
+          pkgs.kde5.phonon-backend-gstreamer
           pkgs.gst_all_1.gstreamer
           pkgs.gst_all_1.gst-plugins-base
           pkgs.gst_all_1.gst-plugins-good
           pkgs.gst_all_1.gst-plugins-ugly
           pkgs.gst_all_1.gst-plugins-bad
           pkgs.gst_all_1.gst-libav # for mp3 playback
-        ]
-
-      ++ lib.optionals cfg.phonon.vlc.enable
-        [
-          pkgs.phonon_qt5_backend_vlc
-          pkgs.qt55.phonon-backend-vlc
         ];
 
     environment.pathsToLink = [ "/share" ];
diff --git a/pkgs/development/libraries/phonon-backend-gstreamer/qt4/default.nix b/pkgs/development/libraries/phonon-backend-gstreamer/qt4/default.nix
deleted file mode 100644
index 2f588cbe7087..000000000000
--- a/pkgs/development/libraries/phonon-backend-gstreamer/qt4/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv, fetchurl, cmake, automoc4, qt4, pkgconfig, phonon, gst_all_1 }:
-
-let
-  version = "4.8.2";
-  pname = "phonon-backend-gstreamer";
-in
-
-stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
-
-  src = fetchurl {
-    url = "mirror://kde/stable/phonon/${pname}/${version}/src/${name}.tar.xz";
-    sha256 = "1q1ix6zsfnh6gfnpmwp67s376m7g7ahpjl1qp2fqakzb5cgzgq10";
-  };
-
-  buildInputs = with gst_all_1; [ phonon qt4 gstreamer gst-plugins-base ];
-
-  nativeBuildInputs = [ cmake automoc4 pkgconfig ];
-
-  NIX_CFLAGS_COMPILE = [
-    # This flag should be picked up through pkgconfig, but it isn't.
-    "-I${gst_all_1.gstreamer}/lib/gstreamer-1.0/include"
-  ];
-
-  cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ];
-
-  meta = {
-    homepage = http://phonon.kde.org/;
-    description = "GStreamer backend for Phonon";
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/phonon-backend-gstreamer/qt5/default.nix b/pkgs/development/libraries/phonon-backend-gstreamer/qt5/default.nix
deleted file mode 100644
index 98aa7d81b368..000000000000
--- a/pkgs/development/libraries/phonon-backend-gstreamer/qt5/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ stdenv, fetchurl, cmake, gst_all_1, phonon, pkgconfig, qtbase, debug ? false }:
-
-with stdenv.lib;
-
-let
-  version = "4.8.2";
-  pname = "phonon-backend-gstreamer";
-in
-
-stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
-
-  src = fetchurl {
-    url = "mirror://kde/stable/phonon/${pname}/${version}/src/${name}.tar.xz";
-    sha256 = "1q1ix6zsfnh6gfnpmwp67s376m7g7ahpjl1qp2fqakzb5cgzgq10";
-  };
-
-  buildInputs = with gst_all_1; [ gstreamer gst-plugins-base phonon qtbase ];
-
-  NIX_CFLAGS_COMPILE = [
-    # This flag should be picked up through pkgconfig, but it isn't.
-    "-I${gst_all_1.gstreamer}/lib/gstreamer-1.0/include"
-  ];
-
-  nativeBuildInputs = [ cmake pkgconfig ];
-
-  cmakeFlags = [
-    "-DCMAKE_INSTALL_LIBDIR=lib"
-    "-DPHONON_BUILD_PHONON4QT5=ON"
-  ]
-  ++ optional debug "-DCMAKE_BUILD_TYPE=Debug";
-
-  meta = with stdenv.lib; {
-    homepage = http://phonon.kde.org/;
-    description = "GStreamer backend for Phonon";
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/phonon-backend-vlc/qt4/default.nix b/pkgs/development/libraries/phonon-backend-vlc/qt4/default.nix
deleted file mode 100644
index 70b6174c635c..000000000000
--- a/pkgs/development/libraries/phonon-backend-vlc/qt4/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ stdenv, fetchurl, xz, vlc, automoc4, cmake, pkgconfig, phonon, qt4}:
-
-with stdenv.lib;
-
-let
-  pname = "phonon-backend-vlc";
-  v = "0.8.1";
-  # Force same Qt version in phonon and VLC
-  vlc_ = vlc.override { inherit qt4; };
-  phonon_ = phonon.override { inherit qt4; };
-in
-
-stdenv.mkDerivation {
-  name = "${pname}-${v}";
-
-  src = fetchurl {
-    url = "mirror://kde/stable/phonon/${pname}/${v}/${pname}-${v}.tar.xz";
-    sha256 = "1fyfh7qyb6rld350v2fgz452ld96d3z5ifchr323q0vc3hb9k222";
-  };
-
-  nativeBuildInputs = [ cmake pkgconfig automoc4 xz ];
-
-  buildInputs = [ vlc_ phonon_ qt4 ];
-
-  meta = {
-    homepage = http://phonon.kde.org/;
-    description = "VideoLAN backend for Phonon multimedia framework";
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ ttuegel urkud ];
-    license = licenses.lgpl21Plus;
-  };
-}
diff --git a/pkgs/development/libraries/phonon-backend-vlc/qt5/default.nix b/pkgs/development/libraries/phonon-backend-vlc/qt5/default.nix
deleted file mode 100644
index 744d681a6949..000000000000
--- a/pkgs/development/libraries/phonon-backend-vlc/qt5/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv, fetchurl, xz, vlc, cmake, pkgconfig, phonon, qtbase }:
-
-with stdenv.lib;
-
-let
-  pname = "phonon-backend-vlc";
-  v = "0.8.2";
-in
-
-stdenv.mkDerivation {
-  name = "${pname}-${v}";
-
-  src = fetchurl {
-    url = "mirror://kde/stable/phonon/${pname}/${v}/src/${pname}-${v}.tar.xz";
-    sha256 = "18ysdga681my75lxxv5h242pa4qappvg5z73wnc0ks9yypnzidys";
-  };
-
-  nativeBuildInputs = [ cmake pkgconfig xz ];
-
-  buildInputs = [ vlc phonon qtbase ];
-
-  cmakeFlags = ["-DPHONON_BUILD_PHONON4QT5=ON"];
-
-  meta = {
-    homepage = http://phonon.kde.org/;
-    description = "VideoLAN backend for Phonon multimedia framework";
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ ttuegel urkud ];
-    license = licenses.lgpl21Plus;
-  };
-}
diff --git a/pkgs/development/libraries/phonon/backends/gstreamer.nix b/pkgs/development/libraries/phonon/backends/gstreamer.nix
new file mode 100644
index 000000000000..756db94e3437
--- /dev/null
+++ b/pkgs/development/libraries/phonon/backends/gstreamer.nix
@@ -0,0 +1,45 @@
+{ stdenv, lib, fetchurl, cmake, gst_all_1, phonon, pkgconfig
+, extra-cmake-modules ? null, qtbase ? null, qtx11extras ? null, qt4 ? null
+, debug ? false }:
+
+with lib;
+
+let
+  v = "4.9.0";
+  pname = "phonon-backend-gstreamer";
+  withQt5 = extra-cmake-modules != null;
+in
+
+assert withQt5 -> qtbase != null;
+assert withQt5 -> qtx11extras != null;
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${if withQt5 then "qt5" else "qt4"}-${v}";
+
+  meta = with stdenv.lib; {
+    homepage = http://phonon.kde.org/;
+    description = "GStreamer backend for Phonon";
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ ttuegel ];
+  };
+
+  src = fetchurl {
+    url = "mirror://kde/stable/phonon/${pname}/${v}/src/${pname}-${v}.tar.xz";
+    sha256 = "1wc5p1rqglf0n1avp55s50k7fjdzdrhg0gind15k8796w7nfbhyf";
+  };
+
+  buildInputs = with gst_all_1;
+    [ gstreamer gst-plugins-base phonon ]
+    ++ (if withQt5 then [ qtbase qtx11extras ] else [ qt4 ]);
+
+  NIX_CFLAGS_COMPILE = [
+    # This flag should be picked up through pkgconfig, but it isn't.
+    "-I${gst_all_1.gstreamer}/lib/gstreamer-1.0/include"
+  ];
+
+  nativeBuildInputs = [ cmake pkgconfig ] ++ optional withQt5 extra-cmake-modules;
+
+  cmakeFlags =
+    [ "-DCMAKE_BUILD_TYPE=${if debug then "Debug" else "Release"}" ]
+    ++ optional withQt5 "-DPHONON_BUILD_PHONON4QT5=ON";
+}
diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix
index 3c731ca19e32..7f3a2d773cf5 100644
--- a/pkgs/development/libraries/phonon/default.nix
+++ b/pkgs/development/libraries/phonon/default.nix
@@ -1,21 +1,20 @@
-{ stdenv, fetchurl, cmake, mesa, pkgconfig, libpulseaudio
-, qt4 ? null, automoc4 ? null
-, qtbase ? null, qtquick1 ? null, qttools ? null
+{ stdenv, lib, fetchurl, cmake, mesa, pkgconfig, libpulseaudio
+, qt4 ? null, extra-cmake-modules ? null, qtbase ? null, qtquick1 ? null, qttools ? null
 , debug ? false }:
 
-with stdenv.lib;
+with lib;
 
 let
-  v = "4.8.3";
-  withQt5 = qtbase != null;
+  v = "4.9.0";
+  withQt5 = extra-cmake-modules != null;
 in
 
+assert withQt5 -> qtbase != null;
 assert withQt5 -> qtquick1 != null;
 assert withQt5 -> qttools != null;
-assert !withQt5 -> automoc4 != null;
 
 stdenv.mkDerivation rec {
-  name = "phonon-${v}";
+  name = "phonon-${if withQt5 then "qt5" else "qt4"}-${v}";
 
   meta = {
     homepage = http://phonon.kde.org/;
@@ -27,16 +26,14 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://kde/stable/phonon/${v}/src/phonon-${v}.tar.xz";
-    sha256 = "05nshngk03ln90vsjz44dx8al576f4vd5fvhs1l0jmx13jb9q551";
+    sha256 = "1q5hvsk4sfcb91625wcmldy7kgjmfpmpmkgzi6mxkqdd307v8x5v";
   };
 
   buildInputs =
     [ mesa libpulseaudio ]
     ++ (if withQt5 then [ qtbase qtquick1 qttools ] else [ qt4 ]);
 
-  nativeBuildInputs =
-    [ cmake pkgconfig ]
-    ++ optional (!withQt5) automoc4;
+  nativeBuildInputs = [ cmake pkgconfig ] ++ optional withQt5 extra-cmake-modules;
 
   NIX_CFLAGS_COMPILE = "-fPIC";
 
@@ -47,8 +44,8 @@ stdenv.mkDerivation rec {
   postPatch = ''
     sed -i PhononConfig.cmake.in \
         -e "/get_filename_component(rootDir/ s/^.*$//" \
-        -e "s,\\(set(PHONON_INCLUDE_DIR\\).*$,\\1 \"''${!outputDev}/include\")," \
-        -e "s,\\(set(PHONON_LIBRARY_DIR\\).*$,\\1 \"''${!outputLib}/lib\")," \
-        -e "s,\\(set(PHONON_BUILDSYSTEM_DIR\\).*$,\\1 \"''${!outputDev}/share/phonon${if withQt5 then "4qt5" else ""}/buildsystem\"),"
+        -e "/^set(PHONON_INCLUDE_DIR/ s,\''${rootDir},''${!outputDev}," \
+        -e "/^set(PHONON_LIBRARY_DIR/ s,\''${rootDir}/,," \
+        -e "/^set(PHONON_BUILDSYSTEM_DIR/ s,\''${rootDir},''${!outputDev},"
   '';
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7eb9741b2404..ed5684073cad 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8437,9 +8437,7 @@ in
 
   phonon = callPackage ../development/libraries/phonon {};
 
-  phonon_backend_gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer/qt4 {};
-
-  phonon_backend_vlc = callPackage ../development/libraries/phonon-backend-vlc/qt4 {};
+  phonon-backend-gstreamer = callPackage ../development/libraries/phonon/backends/gstreamer.nix {};
 
   physfs = callPackage ../development/libraries/physfs { };
 
@@ -8576,12 +8574,6 @@ in
 
     openbr = callPackage ../development/libraries/openbr { };
 
-    phonon = callPackage ../development/libraries/phonon { };
-
-    phonon-backend-gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer/qt5 { };
-
-    phonon-backend-vlc = callPackage ../development/libraries/phonon-backend-vlc/qt5 { };
-
     polkit-qt = callPackage ../development/libraries/polkit-qt-1/qt-5.nix { };
 
     poppler = callPackage ../development/libraries/poppler {
@@ -15461,8 +15453,11 @@ in
 
     kile = callPackage ../applications/editors/kile/frameworks.nix { };
 
-    konversation = callPackage ../applications/networking/irc/konversation/1.6.nix {
-    };
+    konversation = callPackage ../applications/networking/irc/konversation/1.6.nix { };
+
+    phonon = callPackage ../development/libraries/phonon { };
+
+    phonon-backend-gstreamer = callPackage ../development/libraries/phonon/backends/gstreamer.nix { };
 
     quassel = callPackage ../applications/networking/irc/quassel/qt-5.nix {
       monolithic = true;

From b4ff81ffd629d3f699b880ad62eaabf364a32d1d Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 22 Apr 2016 08:11:10 -0500
Subject: [PATCH 007/287] phonon-backend-vlc: init at 0.9.0

---
 .../services/x11/desktop-managers/kde4.nix    |  4 +-
 pkgs/applications/audio/tomahawk/default.nix  |  4 +-
 .../applications/graphics/digikam/default.nix |  6 +--
 pkgs/applications/video/minitube/default.nix  |  6 +--
 .../libraries/phonon/backends/vlc.nix         | 39 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++
 6 files changed, 53 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/development/libraries/phonon/backends/vlc.nix

diff --git a/nixos/modules/services/x11/desktop-managers/kde4.nix b/nixos/modules/services/x11/desktop-managers/kde4.nix
index 80e408be4923..3b639f672170 100644
--- a/nixos/modules/services/x11/desktop-managers/kde4.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde4.nix
@@ -29,7 +29,7 @@ let
 
   phononBackends = {
     gstreamer = [
-      pkgs.phonon_backend_gstreamer
+      pkgs.phonon-backend-gstreamer
       pkgs.gst_all.gstPluginsBase
       pkgs.gst_all.gstPluginsGood
       pkgs.gst_all.gstPluginsUgly
@@ -38,7 +38,7 @@ let
       pkgs.gst_all.gstreamer # needed?
     ];
 
-    vlc = [pkgs.phonon_backend_vlc];
+    vlc = [pkgs.phonon-backend-vlc];
   };
 
   phononBackendPackages = flip concatMap cfg.phononBackends
diff --git a/pkgs/applications/audio/tomahawk/default.nix b/pkgs/applications/audio/tomahawk/default.nix
index 61cb6b9896e3..7021cd165cfd 100644
--- a/pkgs/applications/audio/tomahawk/default.nix
+++ b/pkgs/applications/audio/tomahawk/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, cmake, pkgconfig, attica, boost, gnutls, libechonest
-, liblastfm, lucenepp, phonon, phonon_backend_vlc, qca2, qjson, qt4
+, liblastfm, lucenepp, phonon, phonon-backend-vlc, qca2, qjson, qt4
 , qtkeychain, quazip, sparsehash, taglib, websocketpp, makeWrapper
 
 , enableXMPP      ? true,  libjreen     ? null
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
 
   postInstall = let
     pluginPath = stdenv.lib.concatStringsSep ":" [
-      "${phonon_backend_vlc}/lib/kde4/plugins"
+      "${phonon-backend-vlc}/lib/kde4/plugins"
     ];
   in ''
     for i in "$out"/bin/*; do
diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix
index 119125066bda..453dc0809956 100644
--- a/pkgs/applications/graphics/digikam/default.nix
+++ b/pkgs/applications/graphics/digikam/default.nix
@@ -19,7 +19,7 @@
 
 # Supplementary packages required only by the wrapper.
 , bash, kde_runtime, kde_baseapps, makeWrapper, oxygen_icons
-, phonon_backend_vlc /*phonon_backend_gstreamer,*/
+, phonon-backend-vlc /*phonon-backend-gstreamer,*/
 , ffmpegthumbs /*mplayerthumbs*/
 , runCommand, shared_mime_info, writeScriptBin
 }:
@@ -93,7 +93,7 @@ let
   kdePkgs = [
     build # digikam's own build
     kdelibs kdepimlibs kde_runtime kde_baseapps libkdcraw oxygen_icons
-    /*phonon_backend_gstreamer*/ phonon_backend_vlc
+    /*phonon-backend-gstreamer*/ phonon-backend-vlc
     ffmpegthumbs /*mplayerthumbs*/ shared_mime_info ]
   # Optional build time dependencies
   ++ [
@@ -208,7 +208,7 @@ TODO
  -  Per lib `KDELIBS` environment variable export. See above in-code TODO comment.
  -  Missing optional `qt_soap` or `herqq` (av + normal package) dependencies. Those are not
     yet (or not fully) packaged in nix. Mainly required for upnp export.
- -  Possibility to use the `phonon_backend_gstreamer` with its own user specified set of backend.
+ -  Possibility to use the `phonon-backend-gstreamer` with its own user specified set of backend.
  -  Allow user to disable optional features or dependencies reacting properly.
  -  Compile `kipiplugins` as a separate package (so that it can be used by other kde packages
     and so that this package's build time is reduced).
diff --git a/pkgs/applications/video/minitube/default.nix b/pkgs/applications/video/minitube/default.nix
index 1a621032125b..971588901b46 100644
--- a/pkgs/applications/video/minitube/default.nix
+++ b/pkgs/applications/video/minitube/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, makeWrapper, phonon, phonon_backend_vlc, qt4, qmake4Hook
+{ stdenv, fetchFromGitHub, makeWrapper, phonon, phonon-backend-vlc, qt4, qmake4Hook
 # "Free" API key generated by nckx <tobias.geerinckx.rice@gmail.com>
 , withAPIKey ? "AIzaSyBtFgbln3bu1swQC-naMxMtKh384D3xJZE" }:
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     owner = "flaviotordini";
   };
 
-  buildInputs = [ phonon phonon_backend_vlc qt4 ];
+  buildInputs = [ phonon phonon-backend-vlc qt4 ];
   nativeBuildInputs = [ makeWrapper qmake4Hook ];
 
   qmakeFlags = [ "DEFINES+=APP_GOOGLE_API_KEY=${withAPIKey}" ];
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     wrapProgram $out/bin/minitube \
-      --prefix QT_PLUGIN_PATH : "${phonon_backend_vlc}/lib/kde4/plugins"
+      --prefix QT_PLUGIN_PATH : "${phonon-backend-vlc}/lib/kde4/plugins"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/libraries/phonon/backends/vlc.nix b/pkgs/development/libraries/phonon/backends/vlc.nix
new file mode 100644
index 000000000000..1f14ec575a0e
--- /dev/null
+++ b/pkgs/development/libraries/phonon/backends/vlc.nix
@@ -0,0 +1,39 @@
+{ stdenv, lib, fetchurl, cmake, phonon, pkgconfig, vlc
+, extra-cmake-modules ? null, qtbase ? null, qtx11extras ? null, qt4 ? null
+, debug ? false }:
+
+with lib;
+
+let
+  v = "0.9.0";
+  pname = "phonon-backend-vlc";
+  withQt5 = extra-cmake-modules != null;
+in
+
+assert withQt5 -> qtbase != null;
+assert withQt5 -> qtx11extras != null;
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${if withQt5 then "qt5" else "qt4"}-${v}";
+
+  meta = with stdenv.lib; {
+    homepage = http://phonon.kde.org/;
+    description = "GStreamer backend for Phonon";
+    platforms = platforms.linux;
+  };
+
+  src = fetchurl {
+    url = "mirror://kde/stable/phonon/${pname}/${v}/src/${pname}-${v}.tar.xz";
+    sha256 = "1gnd1j305mqajw5gxm42vg6ajkvi8611bxgc3qhj5k0saz5dgkn0";
+  };
+
+  buildInputs =
+    [ phonon vlc ]
+    ++ (if withQt5 then [ qtbase qtx11extras ] else [ qt4 ]);
+
+  nativeBuildInputs = [ cmake pkgconfig ] ++ optional withQt5 extra-cmake-modules;
+
+  cmakeFlags =
+    [ "-DCMAKE_BUILD_TYPE=${if debug then "Debug" else "Release"}" ]
+    ++ optional withQt5 "-DPHONON_BUILD_PHONON4QT5=ON";
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ed5684073cad..db687ba4a5d8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8439,6 +8439,8 @@ in
 
   phonon-backend-gstreamer = callPackage ../development/libraries/phonon/backends/gstreamer.nix {};
 
+  phonon-backend-vlc = callPackage ../development/libraries/phonon/backends/vlc.nix {};
+
   physfs = callPackage ../development/libraries/physfs { };
 
   pipelight = callPackage ../tools/misc/pipelight {
@@ -15459,6 +15461,8 @@ in
 
     phonon-backend-gstreamer = callPackage ../development/libraries/phonon/backends/gstreamer.nix { };
 
+    phonon-backend-vlc = callPackage ../development/libraries/phonon/backends/vlc.nix { };
+
     quassel = callPackage ../applications/networking/irc/quassel/qt-5.nix {
       monolithic = true;
       daemon = false;

From 48195dd2becfa820353e900ba05737b4fce1b466 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 22 Apr 2016 08:21:15 -0500
Subject: [PATCH 008/287] aliases: remove phonon aliases

---
 pkgs/top-level/aliases.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 23e05eb6c9e4..523163e37f55 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -64,8 +64,6 @@ doNotDisplayTwice rec {
   mupen64plus1_5 = mupen64plus; # added 2016-02-12
   ncat = nmap;  # added 2016-01-26
   nfsUtils = nfs-utils;  # added 2014-12-06
-  phonon_qt5 = qt5.phonon;  # added 2015-12-19
-  phonon_qt5_backend_gstreamer = qt5.phonon-backend-gstreamer;  # added 2015-12-19
   pidginlatexSF = pidginlatex; # added 2014-11-02
   poppler_qt5 = qt5.poppler;  # added 2015-12-19
   qca-qt5 = qt5.qca-qt5;  # added 2015-12-19

From 97e4c19fcaa01fcc7f456f3896cbddccb25a6bb6 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 22 Apr 2016 19:30:26 +0300
Subject: [PATCH 009/287] wrapPython: drop python suffixes

---
 pkgs/development/python-modules/generic/wrap.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/generic/wrap.sh b/pkgs/development/python-modules/generic/wrap.sh
index fa6a4d0102f3..a67ea51f5a9b 100644
--- a/pkgs/development/python-modules/generic/wrap.sh
+++ b/pkgs/development/python-modules/generic/wrap.sh
@@ -28,8 +28,10 @@ wrapPythonProgramsIn() {
     # Find all regular files in the output directory that are executable.
     for f in $(find "$dir" -type f -perm -0100); do
         # Rewrite "#! .../env python" to "#! /nix/store/.../python".
+        # Strip suffix, like "3" or "2.7m" -- we don't have any choice on which
+        # Python to use besides one in $python anyway.
         if head -n1 "$f" | grep -q '#!.*/env.*\(python\|pypy\)'; then
-            sed -i "$f" -e "1 s^.*/env[ ]*\(python\|pypy\)^#! $python^"
+            sed -i "$f" -e "1 s^.*/env[ ]*\(python\|pypy\)[^ ]*^#! $python^"
         fi
 
         # catch /python and /.python-wrapped

From 6ea0ae58af611ab30c42e2e51f3a70141e93a9a9 Mon Sep 17 00:00:00 2001
From: Guido Zgraggen <zgraggen@gmail.com>
Date: Fri, 22 Apr 2016 16:51:49 -0700
Subject: [PATCH 010/287] nix-prefetch-git: create parent directories

---
 pkgs/build-support/fetchgit/nix-prefetch-git | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git
index 9352757ea806..80544b745177 100755
--- a/pkgs/build-support/fetchgit/nix-prefetch-git
+++ b/pkgs/build-support/fetchgit/nix-prefetch-git
@@ -343,7 +343,7 @@ fi
 
 if test -n "$builder"; then
     test -n "$out" -a -n "$url" -a -n "$rev" || usage
-    mkdir $out
+    mkdir -p $out
     clone_user_rev "$out" "$url" "$rev"
 else
     if test -z "$hashType"; then
@@ -368,7 +368,7 @@ else
         trap "rm -rf \"$tmpPath\"" EXIT
 
         tmpFile="$tmpPath/$(url_to_name "$url" "$rev")"
-        mkdir "$tmpFile"
+        mkdir -p "$tmpFile"
 
         # Perform the checkout.
         clone_user_rev "$tmpFile" "$url" "$rev"

From 6e7787e666c50558b5aa10ffcca8e6c0c9bc1ba3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 10 Feb 2016 21:18:34 +0100
Subject: [PATCH 011/287] stdenv for windows: auto-link dependency DLLs

For every *.{exe,dll} in $output/bin/ we try to find all (potential)
transitive dependencies and symlink those DLLs into $output/bin
so they are found on invocation.
(DLLs are first searched in the directory of the running exe file.)

The links are relative, so relocating whole /nix/store won't break them.
The hook is activated on cygwin and when cross-compiling to mingw.
---
 .../build-support/setup-hooks/win-dll-link.sh | 45 +++++++++++++++++++
 pkgs/stdenv/generic/default.nix               |  8 +++-
 2 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/build-support/setup-hooks/win-dll-link.sh

diff --git a/pkgs/build-support/setup-hooks/win-dll-link.sh b/pkgs/build-support/setup-hooks/win-dll-link.sh
new file mode 100644
index 000000000000..be63f69ca10b
--- /dev/null
+++ b/pkgs/build-support/setup-hooks/win-dll-link.sh
@@ -0,0 +1,45 @@
+
+fixupOutputHooks+=(_linkDLLs)
+
+# For every *.{exe,dll} in $output/bin/ we try to find all (potential)
+# transitive dependencies and symlink those DLLs into $output/bin
+# so they are found on invocation.
+# (DLLs are first searched in the directory of the running exe file.)
+# The links are relative, so relocating whole /nix/store won't break them.
+_linkDLLs() {
+(
+    if [ ! -d "$prefix/bin" ]; then exit; fi
+    cd "$prefix/bin"
+
+    # Compose path list where DLLs should be located:
+    #   prefix $PATH by currently-built outputs
+    local DLLPATH=""
+    local outName
+    for outName in $outputs; do
+        addToSearchPath DLLPATH "${!outName}/bin"
+    done
+    DLLPATH="$DLLPATH:$PATH"
+
+    echo DLLPATH="'$DLLPATH'"
+
+    linkCount=0
+    # Iterate over any DLL that we depend on.
+    local dll
+    for dll in $(objdump -p *.{exe,dll} | sed -n 's/.*DLL Name: \(.*\)/\1/p' | sort -u); do
+        if [ -e "./$dll" ]; then continue; fi
+        # Locate the DLL - it should be an *executable* file on $DLLPATH.
+        local dllPath="$(PATH="$DLLPATH" type -P "$dll")"
+        if [ -z "$dllPath" ]; then continue; fi
+        # That DLL might have its own (transitive) dependencies,
+        # so add also all DLLs from its directory to be sure.
+        local dllPath2
+        for dllPath2 in "$dllPath" "$(dirname "$dllPath")"/*.dll; do
+            if [ -e ./"$(basename "$dllPath2")" ]; then continue; fi
+            ln -sr "$dllPath2" .
+            linkCount=$(($linkCount+1))
+        done
+    done
+    echo "Created $linkCount DLL link(s) in $prefix/bin"
+)
+}
+
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index 547541d28246..e01be369f423 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -196,7 +196,13 @@ let
           buildInputs = if crossConfig != null then buildInputs' else [];
           propagatedBuildInputs = if crossConfig != null then propagatedBuildInputs else [];
           # Inputs built by the usual native compiler.
-          nativeBuildInputs = nativeBuildInputs ++ (if crossConfig == null then buildInputs' else []);
+          nativeBuildInputs = nativeBuildInputs
+            ++ lib.optionals (crossConfig == null) buildInputs'
+            ++ lib.optional
+                (result.isCygwin
+                  || (crossConfig != null && lib.hasSuffix "mingw32" crossConfig))
+                ../../build-support/setup-hooks/win-dll-link.sh
+            ;
           propagatedNativeBuildInputs = propagatedNativeBuildInputs ++
             (if crossConfig == null then propagatedBuildInputs else []);
         } // ifDarwin {

From afaf1c2f77b0f30feaa155aa1ecd67353cd70896 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 21 Apr 2016 14:24:41 +0200
Subject: [PATCH 012/287] gettext: remove crossAttrs

They seem not needed anymore.
---
 pkgs/development/libraries/gettext/default.nix | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix
index 940df56c03c3..78a8756b59b4 100644
--- a/pkgs/development/libraries/gettext/default.nix
+++ b/pkgs/development/libraries/gettext/default.nix
@@ -54,13 +54,6 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  crossAttrs = {
-    buildInputs = lib.optional (stdenv ? ccCross && stdenv.ccCross.libc ? libiconv)
-      stdenv.ccCross.libc.libiconv.crossDrv;
-    # Gettext fails to guess the cross compiler
-    configureFlags = "CXX=${stdenv.cross.config}-g++";
-  };
-
   meta = {
     description = "Well integrated set of translation tools and documentation";
 

From 8b292a1b355e8e7f6e7a2cf439ab777bdae30422 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 14 Apr 2016 08:59:47 +0200
Subject: [PATCH 013/287] stdenv on mingw: fix 64-bin DLL detection in some
 cases

In particular, this makes 64-bit libpng create DLL now,
and thus depending packages won't fail anymore (e.g. freetype).
---
 pkgs/stdenv/adapters.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix
index 87d3938f13d3..0b6707bf8b16 100644
--- a/pkgs/stdenv/adapters.nix
+++ b/pkgs/stdenv/adapters.nix
@@ -96,8 +96,12 @@ rec {
                     name = name + "-" + cross.config;
                     nativeBuildInputs = nativeBuildInputsDrvs
                       ++ nativeInputsFromBuildInputs
-                      ++ [ gccCross binutilsCross ] ++
-                      stdenv.lib.optional selfNativeBuildInput nativeDrv;
+                      ++ [ gccCross binutilsCross ]
+                      ++ stdenv.lib.optional selfNativeBuildInput nativeDrv
+                        # without proper `file` command, libtool sometimes fails
+                        # to recognize 64-bit DLLs
+                      ++ stdenv.lib.optional (cross.config  == "x86_64-w64-mingw32") pkgs.file
+                      ;
 
                     # Cross-linking dynamic libraries, every buildInput should
                     # be propagated because ld needs the -rpath-link to find

From 91f2b9ed663bc58c2305edf2d52b4e54228394c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 21 Apr 2016 15:37:52 +0200
Subject: [PATCH 014/287] bzip2: fix on mingw

The whole expression is rather a mess, mainly due to upstream
often behaving badly with non-standard configurations.
---
 pkgs/tools/compression/bzip2/default.nix | 51 ++++++++++++++----------
 1 file changed, 29 insertions(+), 22 deletions(-)

diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix
index a165ab2b157b..d3ed5121ba98 100644
--- a/pkgs/tools/compression/bzip2/default.nix
+++ b/pkgs/tools/compression/bzip2/default.nix
@@ -35,10 +35,6 @@ in stdenv.mkDerivation {
       sed -i -e '/<sys\\stat\.h>/s|\\|/|' bzip2.c
     '';
     preConfigure = "sh ./autogen.sh";
-    # clear native hooks that are not needed with autoconf
-    preBuild = "";
-    preInstall = "";
-    postInstall = "";
   };
 
   outputs = [ "dev" "bin" "static" ] ++ stdenv.lib.optional sharedLibrary "out";
@@ -47,21 +43,23 @@ in stdenv.mkDerivation {
     make -f ${if stdenv.isDarwin then "Makefile-libbz2_dylib" else "Makefile-libbz2_so"}
   '';
 
-  preInstall = stdenv.lib.optionalString sharedLibrary (if !stdenv.isDarwin then ''
-    mkdir -p $out/lib
-    mv libbz2.so* $out/lib
-    ( cd $out/lib &&
-      ln -s libbz2.so.1.0.? libbz2.so &&
-      ln -s libbz2.so.1.0.? libbz2.so.1
-    )
-  '' else ''
-    mkdir -p $out/lib
-    mv libbz2.*.dylib $out/lib
-    ( cd $out/lib &&
-      ln -s libbz2.1.0.?.dylib libbz2.dylib &&
-      ln -s libbz2.1.0.?.dylib libbz2.1.dylib
-    )
-  '');
+  preInstall = stdenv.lib.optionalString
+    (sharedLibrary && stdenv.cross.libc or null != "msvcrt")
+    (if !stdenv.isDarwin then ''
+      mkdir -p $out/lib
+      mv libbz2.so* $out/lib
+      ( cd $out/lib &&
+        ln -s libbz2.so.1.0.? libbz2.so &&
+        ln -s libbz2.so.1.0.? libbz2.so.1
+      )
+    '' else ''
+      mkdir -p $out/lib
+      mv libbz2.*.dylib $out/lib
+      ( cd $out/lib &&
+        ln -s libbz2.1.0.?.dylib libbz2.dylib &&
+        ln -s libbz2.1.0.?.dylib libbz2.1.dylib
+      )
+    '');
 
   installFlags = [ "PREFIX=$(bin)" ];
 
@@ -70,9 +68,18 @@ in stdenv.mkDerivation {
     ln -s bzip2 $bin/bin/bunzip2
     ln -s bzip2 $bin/bin/bzcat
 
-    mkdir "$static"
-    mv "$bin/lib" "$static/"
-  '';
+  ''
+    + (if stdenv.cross.libc or null != "msvcrt" # mingw TODO: avoided rebuilds for now
+      then ''
+        mkdir "$static"
+        mv "$bin/lib" "$static/"
+      ''
+      else ''
+        moveToOutput "lib/*.a" "$static"
+        moveToOutput "lib/*.dll.a" "$out"
+        mkdir -p "$static" # empty for now, but we want to avoid failure
+      '')
+    ;
 
   postPatch = ''
     substituteInPlace Makefile --replace CC=gcc CC=cc

From 94eba251038cc3177f312e122c28bfbb0cc92ebc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 9 Feb 2016 15:37:04 +0100
Subject: [PATCH 015/287] libxml2: fix on mingw, without DLLs ATM

After closure-size merge we need to disable python support,
as python upstream doesn't support cross-building linux -> mingw.
---
 .../development/libraries/libxml2/default.nix | 35 +++++++++++++------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index f7e175373e12..769169104ab3 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, zlib, xz, python, findXMLCatalogs }:
+{ stdenv, lib, fetchurl, zlib, xz, python, findXMLCatalogs, libiconv
+, supportPython ? (! stdenv ? cross) }:
 
 stdenv.mkDerivation rec {
   name = "libxml2-${version}";
@@ -9,23 +10,35 @@ stdenv.mkDerivation rec {
     sha256 = "0bd17g6znn2r98gzpjppsqjg33iraky4px923j3k8kdl8qgy7sad";
   };
 
-  outputs = [ "dev" "out" "bin" "doc" "py" ];
-  propagatedBuildOutputs = "out bin py";
+  outputs = [ "dev" "out" "bin" "doc" ]
+    ++ lib.optional supportPython "py";
+  propagatedBuildOutputs = "out bin" + lib.optionalString supportPython " py";
 
-  buildInputs = [ python ]
+  buildInputs = lib.optional supportPython python
     # Libxml2 has an optional dependency on liblzma.  However, on impure
     # platforms, it may end up using that from /usr/lib, and thus lack a
     # RUNPATH for that, leading to undefined references for its users.
-    ++ stdenv.lib.optional stdenv.isFreeBSD xz;
+    ++ lib.optional stdenv.isFreeBSD xz;
 
   propagatedBuildInputs = [ zlib findXMLCatalogs ];
 
-  configureFlags = "--with-python=${python}";
+  configureFlags = lib.optional supportPython "--with-python=${python}";
 
   enableParallelBuilding = true;
 
-  preInstall = ''substituteInPlace python/libxml2mod.la --replace "${python}" "$py"'';
-  installFlags = ''pythondir="$(py)/lib/${python.libPrefix}/site-packages"'';
+  crossAttrs = lib.optionalAttrs (stdenv.cross.libc == "msvcrt") {
+    # creating the DLL is broken ATM
+    dontDisableStatic = true;
+    configureFlags = configureFlags ++ [ "--disable-shared" ];
+
+    # libiconv is a header dependency - propagating is enough
+    propagatedBuildInputs =  [ findXMLCatalogs libiconv ];
+  };
+
+  preInstall = lib.optionalString supportPython
+    ''substituteInPlace python/libxml2mod.la --replace "${python}" "$py"'';
+  installFlags = lib.optionalString supportPython
+    ''pythondir="$(py)/lib/${python.libPrefix}/site-packages"'';
 
   postFixup = ''
     moveToOutput bin/xml2-config "$dev"
@@ -33,13 +46,13 @@ stdenv.mkDerivation rec {
     moveToOutput share/man/man1 "$bin"
   '';
 
-  passthru = { inherit version; pythonSupport = true; };
+  passthru = { inherit version; pythonSupport = supportPython; };
 
   meta = {
     homepage = http://xmlsoft.org/;
     description = "An XML parsing library for C";
     license = "bsd";
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.eelco ];
+    platforms = lib.platforms.unix;
+    maintainers = [ lib.maintainers.eelco ];
   };
 }

From 49bec8173026c1a050829b43447a4a8f8ca850ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 9 Feb 2016 15:37:48 +0100
Subject: [PATCH 016/287] libxslt: fix on mingw by upstream patch

It's only static, as libxml2 is only static ATM.
---
 pkgs/development/libraries/libxslt/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix
index 0eda42879ece..c76f28246047 100644
--- a/pkgs/development/libraries/libxslt/default.nix
+++ b/pkgs/development/libraries/libxslt/default.nix
@@ -9,6 +9,12 @@ stdenv.mkDerivation rec {
   };
 
   patches = stdenv.lib.optional stdenv.isSunOS ./patch-ah.patch
+    ++ stdenv.lib.optional (stdenv.cross.libc or null == "msvcrt")
+        (fetchpatch {
+          name = "mingw.patch";
+          url = "http://git.gnome.org/browse/libxslt/patch/?id=ab5810bf27cd63";
+          sha256 = "0kkqq3fv2k3q86al38vp6zwxazpvp5kslcjnmrq4ax5cm2zvsjk3";
+        })
     ++ [
       (fetchpatch {
         name = "CVE-2015-7995.patch";

From 80509ab287687591ba179535bfc1cec88013a0d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 9 Feb 2016 19:14:18 +0100
Subject: [PATCH 017/287] libpng: fix on mingw by disabling doCheck

---
 pkgs/development/libraries/libpng/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix
index 6faed97aaee2..a5a0e1d42a38 100644
--- a/pkgs/development/libraries/libpng/default.nix
+++ b/pkgs/development/libraries/libpng/default.nix
@@ -26,7 +26,9 @@ in stdenv.mkDerivation rec {
 
   preConfigure = "export bin=$dev";
 
-  doCheck = true;
+  # it's hard to cross-run tests and some check programs didn't compile anyway
+  makeFlags = stdenv.lib.optional (!doCheck) "check_PROGRAMS=";
+  doCheck = ! stdenv ? cross;
 
   postInstall = ''mv "$out/bin" "$dev/bin"'';
 

From 321ecde8a163cdde9e39df277288e9ff3817f4df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 21 Apr 2016 16:12:50 +0200
Subject: [PATCH 018/287] zlib: on mingw, add another DLL link

Also clean up the expression a little.
It fixes at least libpng's DLL.
---
 pkgs/development/libraries/zlib/default.nix | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix
index 59713bb8d205..f7a72a7673a1 100644
--- a/pkgs/development/libraries/zlib/default.nix
+++ b/pkgs/development/libraries/zlib/default.nix
@@ -52,14 +52,21 @@ stdenv.mkDerivation rec {
 
   crossAttrs = {
     dontStrip = static;
+    dontSetConfigureCross = true;
   } // stdenv.lib.optionalAttrs (stdenv.cross.libc == "msvcrt") {
-    configurePhase=''
-      installFlags="BINARY_PATH=$out/bin INCLUDE_PATH=$out/include LIBRARY_PATH=$out/lib"
-    '';
+    installFlags = [
+      "BINARY_PATH=$(out)/bin"
+      "INCLUDE_PATH=$(dev)/include"
+      "LIBRARY_PATH=$(out)/lib"
+    ];
     makeFlags = [
       "-f" "win32/Makefile.gcc"
       "PREFIX=${stdenv.cross.config}-"
-    ] ++ (if static then [] else [ "SHARED_MODE=1" ]);
+    ] ++ stdenv.lib.optional (!static) "SHARED_MODE=1";
+
+    # Non-typical naming confuses libtool which then refuses to use zlib's DLL
+    # in some cases, e.g. when compiling libpng.
+    postInstall = postInstall + "ln -s zlib1.dll $out/bin/libz.dll";
   } // stdenv.lib.optionalAttrs (stdenv.cross.libc == "libSystem") {
     makeFlags = [ "RANLIB=${stdenv.cross.config}-ranlib" ];
   };

From bd3d377e5eff3521de386c298c9bd89b132f2ad0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 9 Feb 2016 19:27:14 +0100
Subject: [PATCH 019/287] freetype: fix on mingw

---
 pkgs/development/libraries/freetype/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix
index 81e98056e90b..0548d1433b75 100644
--- a/pkgs/development/libraries/freetype/default.nix
+++ b/pkgs/development/libraries/freetype/default.nix
@@ -26,7 +26,8 @@ stdenv.mkDerivation rec {
   };
 
   patches = []
-    ++ optionals useEncumberedCode [
+    # mingw: these patches use `strcasestr` which isn't available on windows
+    ++ optionals (useEncumberedCode && stdenv.cross.libc or null != "msvcrt" ) [
       (fetchbohoomil "01-freetype-2.6.2-enable-valid.patch"
         "1szq0zha7n41f4pq179wgfkam034mp2xn0xc36sdl5sjp9s9hv08")
       (fetchbohoomil "02-upstream-2015.12.05.patch"
@@ -39,7 +40,7 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype
   # dependence on harfbuzz is looser than the reverse dependence
-  buildInputs = [ pkgconfig which ]
+  nativeBuildInputs = [ pkgconfig which ]
     # FreeType requires GNU Make, which is not part of stdenv on FreeBSD.
     ++ optional (!stdenv.isLinux) gnumake;
 
@@ -56,7 +57,7 @@ stdenv.mkDerivation rec {
 
   postInstall = glib.flattenInclude;
 
-  crossAttrs = {
+  crossAttrs = stdenv.lib.optionalAttrs (stdenv.cross.libc or null != "msvcrt") {
     # Somehow it calls the unwrapped gcc, "i686-pc-linux-gnu-gcc", instead
     # of gcc. I think it's due to the unwrapped gcc being in the PATH. I don't
     # know why it's on the PATH.

From 7d4ebb526caa9904dc45e5905dd2e4d90f912979 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 10 Feb 2016 12:40:20 +0100
Subject: [PATCH 020/287] libjpeg(-turbo): fix on mingw

By porting a patch from msys2.
---
 .../libraries/libjpeg-turbo/default.nix       |  4 ++++
 .../libjpeg-turbo/mingw-boolean.patch         | 19 +++++++++++++++++++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/development/libraries/libjpeg-turbo/mingw-boolean.patch

diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix
index da4d3a9822f2..c326e630bd08 100644
--- a/pkgs/development/libraries/libjpeg-turbo/default.nix
+++ b/pkgs/development/libraries/libjpeg-turbo/default.nix
@@ -8,6 +8,10 @@ stdenv.mkDerivation rec {
     sha256 = "0gi349hp1x7mb98s4mf66sb2xay2kjjxj9ihrriw0yiy0k9va6sj";
   };
 
+  patches =
+    stdenv.lib.optional (stdenv.cross.libc or null == "msvcrt")
+      ./mingw-boolean.patch;
+
   outputs = [ "dev" "out" "doc" "bin" ];
 
   nativeBuildInputs = [ nasm ];
diff --git a/pkgs/development/libraries/libjpeg-turbo/mingw-boolean.patch b/pkgs/development/libraries/libjpeg-turbo/mingw-boolean.patch
new file mode 100644
index 000000000000..9b9483d63987
--- /dev/null
+++ b/pkgs/development/libraries/libjpeg-turbo/mingw-boolean.patch
@@ -0,0 +1,19 @@
+Ported to updated libjpeg-turbo from
+https://github.com/msys2/MINGW-packages/blob/master/mingw-w64-libjpeg-turbo/jpeg-typedefs.patch
+--- a/jmorecfg.h	2012-02-10 06:47:55 +0300
++++ b/jmorecfg.h	2012-05-03 10:29:13 +0400
+@@ -224,7 +224,13 @@
+  * Defining HAVE_BOOLEAN before including jpeglib.h should make it work.
+  */
+ 
+-#ifndef HAVE_BOOLEAN
++#if defined(_WIN32) && !defined(HAVE_BOOLEAN)
++#ifndef __RPCNDR_H__
++typedef unsigned char boolean;
++#endif
++#define HAVE_BOOLEAN
++#endif
++#if !defined(HAVE_BOOLEAN) && !defined(__RPCNDR_H__)
+ typedef int boolean;
+ #endif
+ #ifndef FALSE			/* in case these macros already exist */

From 076a09ee37570363f5fef77292a61a117edfdc8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 10 Feb 2016 12:07:15 +0100
Subject: [PATCH 021/287] poppler: disable some dependencies for minimal config

lcms, openjpeg and curl don't seem to be so necessary.
---
 pkgs/development/libraries/poppler/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index ebcdcc2b3efd..ef27113806ba 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -22,8 +22,8 @@ stdenv.mkDerivation rec {
 
   # TODO: reduce propagation to necessary libs
   propagatedBuildInputs = with lib;
-    [ zlib freetype fontconfig libjpeg lcms curl openjpeg ]
-    ++ optional (!minimal) cairo
+    [ zlib freetype fontconfig libjpeg ]
+    ++ optionals (!minimal) [ cairo lcms curl openjpeg ]
     ++ optional qt4Support qt4
     ++ optional qt5Support qtbase;
 
@@ -35,8 +35,11 @@ stdenv.mkDerivation rec {
       "--enable-libcurl"
       "--enable-zlib"
     ]
-    ++ optionals minimal [ "--disable-poppler-glib" "--disable-poppler-cpp" ]
-    ++ optional (!utils) "--disable-utils";
+    ++ optionals minimal [
+      "--disable-poppler-glib" "--disable-poppler-cpp"
+      "--disable-libopenjpeg" "--disable-libcurl"
+    ]
+    ++ optional (!utils) "--disable-utils" ;
 
   enableParallelBuilding = true;
 

From 960244c0af1cfab1c16993815e0373e36425f79b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 10 Feb 2016 12:08:23 +0100
Subject: [PATCH 022/287] poppler: improve on mingw

The minimal version should be fine now.
---
 pkgs/development/libraries/poppler/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index ef27113806ba..d9d5a7679b17 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -43,6 +43,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  crossAttrs.postPatch =
+    # there are tests using `strXXX_s` functions that are missing apparently
+    stdenv.lib.optionalString (stdenv.cross.libc or null == "msvcrt")
+      "sed '/^SUBDIRS =/s/ test / /' -i Makefile.in";
+
   meta = with lib; {
     homepage = http://poppler.freedesktop.org/;
     description = "A PDF rendering library";

From 7aae991fa2422459c5bab6498bc671d7dcc19033 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 11 Feb 2016 12:57:22 +0100
Subject: [PATCH 023/287] imagemagick: fix on mingw, only static ATM

The output gets rather large (67 MB) as *each* executable gets ~5 MB of
magick stuff statically. It seems we would have to fix or disable
libxml2 first to get around this blowup.
---
 .../graphics/ImageMagick/default.nix          | 45 +++++++++++++++----
 1 file changed, 37 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index ef3b7b05b187..76752c94d45d 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, pkgconfig, libtool
+{ lib, stdenv, fetchurl, fetchpatch, pkgconfig, libtool
 , bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg
 , lcms2, openexr, libpng, librsvg, libtiff, libxml2
 }:
@@ -9,11 +9,28 @@ let
     else if stdenv.system == "x86_64-linux" || stdenv.system == "x86_64-darwin" then "x86-64"
     else if stdenv.system == "armv7l-linux" then "armv7l"
     else throw "ImageMagick is not supported on this platform.";
+
+  cfg = {
+    version = "6.9.3-8";
+    sha256 = "129s4cwp6cbhgsr3xr8186q5j02zpbk6kqfk4j7ayb563zsrdb4h";
+    patches = [];
+  }
+    # Freeze version on mingw so we don't need to port the patch too often.
+    // lib.optionalAttrs (stdenv.cross.libc or null == "msvcrt") {
+        version = "6.9.2-0";
+        sha256 = "17ir8bw1j7g7srqmsz3rx780sgnc21zfn0kwyj78iazrywldx8h7";
+        patches = (fetchpatch {
+          name = "mingw-build.patch";
+          url = "https://raw.githubusercontent.com/Alexpux/MINGW-packages/"
+            + "01ca03b2a4ef/mingw-w64-imagemagick/002-build-fixes.patch";
+          sha256 = "1pypszlcx2sf7wfi4p37w1y58ck2r8cd5b2wrrwr9rh87p7fy1c0";
+        });
+      };
 in
 
 stdenv.mkDerivation rec {
   name = "imagemagick-${version}";
-  version = "6.9.3-8";
+  inherit (cfg) version;
 
   src = fetchurl {
     urls = [
@@ -21,8 +38,9 @@ stdenv.mkDerivation rec {
       # the original source above removes tarballs quickly
       "http://distfiles.macports.org/ImageMagick/ImageMagick-${version}.tar.xz"
     ];
-    sha256 = "129s4cwp6cbhgsr3xr8186q5j02zpbk6kqfk4j7ayb563zsrdb4h";
+    inherit (cfg) sha256;
   };
+  inherit (cfg) patches;
 
   outputs = [ "out" "doc" ];
 
@@ -35,15 +53,26 @@ stdenv.mkDerivation rec {
     ++ lib.optionals (ghostscript != null)
       [ "--with-gs-font-dir=${ghostscript}/share/ghostscript/fonts"
         "--with-gslib"
-      ];
+      ]
+    ++ lib.optionals (stdenv.cross.libc or null == "msvcrt")
+      [ "--enable-static" "--disable-shared" ] # due to libxml2 being without DLLs ATM
+    ;
+
+  nativeBuildInputs = [ pkgconfig libtool ];
 
   buildInputs =
-    [ pkgconfig libtool zlib fontconfig freetype ghostscript libjpeg
-      openexr libpng librsvg libtiff libxml2
-    ];
+    [ zlib fontconfig freetype ghostscript
+      libpng libtiff libxml2
+    ]
+    ++ lib.optionals (stdenv.cross.libc or null != "msvcrt")
+      [ openexr librsvg ]
+    ;
 
   propagatedBuildInputs =
-    [ bzip2 freetype libjpeg libX11 libXext libXt lcms2 ];
+    [ bzip2 freetype libjpeg lcms2 ]
+    ++ lib.optionals (stdenv.cross.libc or null != "msvcrt")
+      [ libX11 libXext libXt ]
+    ;
 
   postInstall = ''
     (cd "$out/include" && ln -s ImageMagick* ImageMagick)

From ad033f7665c14133cd17225d97a8db79012ddcbe Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sat, 11 Apr 2015 23:19:37 +0200
Subject: [PATCH 024/287] boost: Fix generation of crossB2Args.

`concatMapStringsSep` actually needs a function to work on the list
items, but it was probably a leftover from the refactor in af8654d.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/development/libraries/boost/generic.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix
index 5b0c06bd6bb2..65d188a86c54 100644
--- a/pkgs/development/libraries/boost/generic.nix
+++ b/pkgs/development/libraries/boost/generic.nix
@@ -77,7 +77,7 @@ let
     "toolset=gcc-cross"
     "--without-python"
   ];
-  crossB2Args = concatMapStringsSep " " (genericB2Flags ++ crossB2Flags);
+  crossB2Args = concatStringsSep " " (genericB2Flags ++ crossB2Flags);
 
   builder = b2Args: ''
     ./b2 ${b2Args}

From 2d760a28b3479bcbb39d512cf9930b46d17d5364 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 12 Apr 2015 10:32:18 +0200
Subject: [PATCH 025/287] boost: Supply some configure flags for mingw.

Otherwise, Boost.Build is trying to compile against pthread and
desperately searches for icu/iconv.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/development/libraries/boost/generic.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix
index 65d188a86c54..758d95309bb1 100644
--- a/pkgs/development/libraries/boost/generic.nix
+++ b/pkgs/development/libraries/boost/generic.nix
@@ -76,6 +76,9 @@ let
     "--user-config=user-config.jam"
     "toolset=gcc-cross"
     "--without-python"
+  ] ++ optionals stdenv.isCrossWin [
+    "target-os=windows"
+    "threadapi=win32"
   ];
   crossB2Args = concatStringsSep " " (genericB2Flags ++ crossB2Flags);
 

From 5f0f48c08b3c718d898b2f00b7b48a5bf6d3eb95 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 12 Apr 2015 10:34:06 +0200
Subject: [PATCH 026/287] boost: Reduce noise during cross compile.

I guess the "set -x" was only left there for debugging, so I'm removing
it because it let's the scrollback buffer explode ;-)

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/development/libraries/boost/generic.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix
index 758d95309bb1..51d3c911d677 100644
--- a/pkgs/development/libraries/boost/generic.nix
+++ b/pkgs/development/libraries/boost/generic.nix
@@ -173,7 +173,6 @@ stdenv.mkDerivation {
     # usual --build and --host added on cross building.
     preConfigure = ''
       export configureFlags="--without-icu ${concatStringsSep " " commonConfigureFlags}"
-      set -x
       cat << EOF > user-config.jam
       using gcc : cross : $crossConfig-g++ ;
       EOF

From fb74d901d76d393be28b19651f5368b89db93d16 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 12 Apr 2015 12:01:07 +0200
Subject: [PATCH 027/287] boost: Add patch for mingw to use gas instead.

The upstream sources only compile with masm, so we need to add a patch
that translates the masm sources to GNU assembler. Unfortunately, this
means, that "generic.nix" is no longer very much generic, but the
versions we currently include work fine with the patch.

Unfortunately, the boost build still doesn't finish, but we're getting
there soon enough.

The patch is from https://svn.boost.org/trac/boost/ticket/7262 and
following the discussion it seems that the upstream authors are
unwilling to add a gas version for the Windows platform. So in the long
term we might need to find a better solution to that, like for example
using Wine to run MASM.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/development/libraries/boost/generic.nix | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix
index 51d3c911d677..561f65afa513 100644
--- a/pkgs/development/libraries/boost/generic.nix
+++ b/pkgs/development/libraries/boost/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv, icu, expat, zlib, bzip2, python, fixDarwinDylibNames
+{ stdenv, fetchurl, icu, expat, zlib, bzip2, python, fixDarwinDylibNames
 , toolset ? if stdenv.cc.isClang then "clang" else null
 , enableRelease ? true
 , enableDebug ? false
@@ -79,6 +79,9 @@ let
   ] ++ optionals stdenv.isCrossWin [
     "target-os=windows"
     "threadapi=win32"
+    "binary-format=pe"
+    "address-model=${if stdenv.isCross64 then "64" else "32"}"
+    "architecture=x86"
   ];
   crossB2Args = concatStringsSep " " (genericB2Flags ++ crossB2Flags);
 
@@ -180,5 +183,13 @@ stdenv.mkDerivation {
     buildPhase = builder crossB2Args;
     installPhase = installer crossB2Args;
     postFixup = fixup;
+  } // optionalAttrs stdenv.isCrossWin {
+    patches = fetchurl {
+      url = "https://svn.boost.org/trac/boost/raw-attachment/ticket/7262/"
+          + "boost-mingw.patch";
+      sha256 = "0s32kwll66k50w6r5np1y5g907b7lcpsjhfgr7rsw7q5syhzddyj";
+    };
+
+    patchFlags = "-p0";
   };
 }

From 2b0d72585432832b96ed5cf117cf9035874dfce2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 16 Feb 2016 20:36:51 +0100
Subject: [PATCH 028/287] boost: finish fixes for mingw

- Dynamic linking won't work, it seems.
- When using a native python, the extension isn't built,
  so let's not depend on it.
- Replace flags missing on this branch, such as `isCrossWin`.
---
 pkgs/development/libraries/boost/generic.nix | 27 ++++++++++----------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix
index 561f65afa513..8835c58618a2 100644
--- a/pkgs/development/libraries/boost/generic.nix
+++ b/pkgs/development/libraries/boost/generic.nix
@@ -4,8 +4,8 @@
 , enableDebug ? false
 , enableSingleThreaded ? false
 , enableMultiThreaded ? true
-, enableShared ? true
-, enableStatic ? false
+, enableShared ? !(stdenv.cross.libc or null == "msvcrt") # problems for now
+, enableStatic ? !enableShared
 , enablePIC ? false
 , enableExceptions ? false
 , taggedLayout ? ((enableRelease && enableDebug) || (enableSingleThreaded && enableMultiThreaded) || (enableShared && enableStatic))
@@ -76,11 +76,11 @@ let
     "--user-config=user-config.jam"
     "toolset=gcc-cross"
     "--without-python"
-  ] ++ optionals stdenv.isCrossWin [
+  ] ++ optionals (stdenv.cross.libc == "msvcrt") [
     "target-os=windows"
     "threadapi=win32"
     "binary-format=pe"
-    "address-model=${if stdenv.isCross64 then "64" else "32"}"
+    "address-model=${if hasPrefix "x86_64-" stdenv.cross.config then "64" else "32"}"
     "architecture=x86"
   ];
   crossB2Args = concatStringsSep " " (genericB2Flags ++ crossB2Flags);
@@ -114,6 +114,8 @@ let
       find include \( -name '*.hpp' -or -name '*.h' -or -name '*.ipp' \) \
         -exec sed '1i#line 1 "{}"' -i '{}' \;
     )
+  '' + optionalString (stdenv.cross.libc or null == "msvcrt") ''
+    ${stdenv.cross.config}-ranlib "$lib"/lib/*.a
   '';
 
 in
@@ -149,14 +151,15 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  buildInputs = [ icu expat zlib bzip2 python ]
+  buildInputs = [ expat zlib bzip2 ]
+    ++ stdenv.lib.optionals (! stdenv ? cross) [ python icu ]
     ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
 
   configureScript = "./bootstrap.sh";
-  configureFlags = commonConfigureFlags ++ [
-    "--with-icu=${icu.dev}"
-    "--with-python=${python.interpreter}"
-  ] ++ optional (toolset != null) "--with-toolset=${toolset}";
+  configureFlags = commonConfigureFlags
+    ++ [ "--with-python=${python.interpreter}" ]
+    ++ optional (! stdenv ? cross) "--with-icu=${icu.dev}"
+    ++ optional (toolset != null) "--with-toolset=${toolset}";
 
   buildPhase = builder nativeB2Args;
 
@@ -168,10 +171,6 @@ stdenv.mkDerivation {
   setOutputFlags = false;
 
   crossAttrs = rec {
-    buildInputs = [ expat.crossDrv zlib.crossDrv bzip2.crossDrv ];
-    # all buildInputs set previously fell into propagatedBuildInputs, as usual, so we have to
-    # override them.
-    propagatedBuildInputs = buildInputs;
     # We want to substitute the contents of configureFlags, removing thus the
     # usual --build and --host added on cross building.
     preConfigure = ''
@@ -183,7 +182,7 @@ stdenv.mkDerivation {
     buildPhase = builder crossB2Args;
     installPhase = installer crossB2Args;
     postFixup = fixup;
-  } // optionalAttrs stdenv.isCrossWin {
+  } // optionalAttrs (stdenv.cross.libc == "msvcrt") {
     patches = fetchurl {
       url = "https://svn.boost.org/trac/boost/raw-attachment/ticket/7262/"
           + "boost-mingw.patch";

From 1bfc3a8965d54b88d132bf7368dac33919ba57e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 16 Feb 2016 20:44:54 +0100
Subject: [PATCH 029/287] boost: support libiconv, also on non-glibc platforms

---
 pkgs/development/libraries/boost/generic.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix
index 8835c58618a2..8e5579cb8ea7 100644
--- a/pkgs/development/libraries/boost/generic.nix
+++ b/pkgs/development/libraries/boost/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, icu, expat, zlib, bzip2, python, fixDarwinDylibNames
+{ stdenv, fetchurl, icu, expat, zlib, bzip2, python, fixDarwinDylibNames, libiconv
 , toolset ? if stdenv.cc.isClang then "clang" else null
 , enableRelease ? true
 , enableDebug ? false
@@ -151,7 +151,7 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  buildInputs = [ expat zlib bzip2 ]
+  buildInputs = [ expat zlib bzip2 libiconv ]
     ++ stdenv.lib.optionals (! stdenv ? cross) [ python icu ]
     ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
 

From 2e06e5eb3669408f5b0fa6c64ac50ca54f8a6ee9 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 23 Apr 2016 07:31:02 -0500
Subject: [PATCH 030/287] Revert "dbus: 1.8.20 -> 1.10.8"

This reverts commit d088e0621e11a03cd50b27863f883fb0f8d3db36.

The D-Bus update breaks logind and polkit.
---
 pkgs/development/libraries/dbus/default.nix   |  7 +++---
 .../dbus/ignore-missing-includedirs.patch     | 23 +++++++++++++++++++
 2 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/libraries/dbus/ignore-missing-includedirs.patch

diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index dd86ca540815..83635d9739f1 100644
--- a/pkgs/development/libraries/dbus/default.nix
+++ b/pkgs/development/libraries/dbus/default.nix
@@ -6,8 +6,8 @@ assert x11Support -> libX11 != null
                   && libSM != null;
 
 let
-  version = "1.10.8";
-  sha256 = "0560y3hxpgh346w6avcrcz79c8ansmn771y5xpcvvlr6m8mx5wxs";
+  version = "1.8.20";
+  sha256 = "0fkh3d5r57a659hw9lqnw4v0bc5556vx54fsf7l9c732ci6byksw";
 
 self =  stdenv.mkDerivation {
     name = "dbus-${version}";
@@ -17,7 +17,8 @@ self =  stdenv.mkDerivation {
       inherit sha256;
     };
 
-    patches = lib.optional stdenv.isSunOS ./implement-getgrouplist.patch;
+    patches = [ ./ignore-missing-includedirs.patch ]
+      ++ lib.optional stdenv.isSunOS ./implement-getgrouplist.patch;
     postPatch = ''
       substituteInPlace tools/Makefile.in \
         --replace 'install-localstatelibDATA:' 'disabled:' \
diff --git a/pkgs/development/libraries/dbus/ignore-missing-includedirs.patch b/pkgs/development/libraries/dbus/ignore-missing-includedirs.patch
new file mode 100644
index 000000000000..2781f4ae3de5
--- /dev/null
+++ b/pkgs/development/libraries/dbus/ignore-missing-includedirs.patch
@@ -0,0 +1,23 @@
+diff -ru -x '*~' dbus-1.2.24-orig/bus/config-parser.c dbus-1.2.24/bus/config-parser.c
+--- dbus-1.2.24-orig/bus/config-parser.c	2010-03-23 20:01:27.000000000 +0100
++++ dbus-1.2.24/bus/config-parser.c	2010-07-20 14:17:20.000000000 +0200
+@@ -2159,12 +2159,16 @@
+ 
+   retval = FALSE;
+   
+-  dir = _dbus_directory_open (dirname, error);
++  dbus_error_init (&tmp_error);
++  
++  dir = _dbus_directory_open (dirname, &tmp_error);
+ 
+   if (dir == NULL)
+-    goto failed;
++    {
++      retval = TRUE;
++      goto failed;
++    }
+ 
+-  dbus_error_init (&tmp_error);
+   while (_dbus_directory_get_next_file (dir, &filename, &tmp_error))
+     {
+       DBusString full_path;

From cbaca6aa7175d10b3c9820232965a797ca4bb45d Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 23 Apr 2016 09:54:51 -0500
Subject: [PATCH 031/287] phonon: fix src urls

---
 pkgs/development/libraries/phonon/backends/gstreamer.nix | 2 +-
 pkgs/development/libraries/phonon/backends/vlc.nix       | 2 +-
 pkgs/development/libraries/phonon/default.nix            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/phonon/backends/gstreamer.nix b/pkgs/development/libraries/phonon/backends/gstreamer.nix
index 756db94e3437..3f2ab6696d18 100644
--- a/pkgs/development/libraries/phonon/backends/gstreamer.nix
+++ b/pkgs/development/libraries/phonon/backends/gstreamer.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   };
 
   src = fetchurl {
-    url = "mirror://kde/stable/phonon/${pname}/${v}/src/${pname}-${v}.tar.xz";
+    url = "mirror://kde/stable/phonon/${pname}/${v}/${pname}-${v}.tar.xz";
     sha256 = "1wc5p1rqglf0n1avp55s50k7fjdzdrhg0gind15k8796w7nfbhyf";
   };
 
diff --git a/pkgs/development/libraries/phonon/backends/vlc.nix b/pkgs/development/libraries/phonon/backends/vlc.nix
index 1f14ec575a0e..aaff26eee286 100644
--- a/pkgs/development/libraries/phonon/backends/vlc.nix
+++ b/pkgs/development/libraries/phonon/backends/vlc.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   };
 
   src = fetchurl {
-    url = "mirror://kde/stable/phonon/${pname}/${v}/src/${pname}-${v}.tar.xz";
+    url = "mirror://kde/stable/phonon/${pname}/${v}/${pname}-${v}.tar.xz";
     sha256 = "1gnd1j305mqajw5gxm42vg6ajkvi8611bxgc3qhj5k0saz5dgkn0";
   };
 
diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix
index 7f3a2d773cf5..2356a0403804 100644
--- a/pkgs/development/libraries/phonon/default.nix
+++ b/pkgs/development/libraries/phonon/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   };
 
   src = fetchurl {
-    url = "mirror://kde/stable/phonon/${v}/src/phonon-${v}.tar.xz";
+    url = "mirror://kde/stable/phonon/${v}/phonon-${v}.tar.xz";
     sha256 = "1q5hvsk4sfcb91625wcmldy7kgjmfpmpmkgzi6mxkqdd307v8x5v";
   };
 

From 77fa336849704071d068ecc199e6fbbbb85d9546 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Sat, 23 Apr 2016 17:19:19 +0200
Subject: [PATCH 032/287] setup.hs: substitute uses only valid bash names

bash variable names may only contain alphanumeric ASCII-symbols and _,
and must not start with a number. Nix expression attribute names however
might contain nearly every character (in particular spaces and dashes).

Previously, a substitution that was not a valid bash name would be
expanded to an empty string. This commit introduce a check that throws
a (hopefully) helpful error when a wrong name is used in a substitution.
---
 pkgs/stdenv/generic/setup.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 9399ff7a7643..f7f9cd533c1f 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -408,6 +408,11 @@ substitute() {
 
         if [ "$p" = --subst-var ]; then
             varName="${params[$((n + 1))]}"
+            # check if the used nix attribute name is a valid bash name
+            if ! [[ "$varName" =~ ^[a-zA-Z_]+[a-zA-Z0-9_]*$ ]]; then
+                echo "substitution variables must be valid bash names, \"$varName\" isn't."
+                exit 1;
+            fi
             pattern="@$varName@"
             replacement="${!varName}"
             n=$((n + 1))
@@ -439,6 +444,7 @@ substituteAll() {
     local output="$2"
 
     # Select all environment variables that start with a lowercase character.
+    # Will not work with nix attribute names (and thus env variables) containing '\n'.
     for envVar in $(env | sed -e $'s/^\([a-z][^=]*\)=.*/\\1/; t \n d'); do
         if [ "$NIX_DEBUG" = "1" ]; then
             echo "$envVar -> ${!envVar}"

From a2d38bc7fc271ca5452ec3fd057bca3f737aa9ae Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Sat, 23 Apr 2016 17:55:20 +0200
Subject: [PATCH 033/287] doc/stdenv.xml document substitution env variables

The filtering of environment variables that start with an uppercase
letter is documented in the manual.
---
 doc/stdenv.xml                                   | 10 +++++++++-
 pkgs/build-support/substitute/substitute-all.nix |  1 +
 pkgs/stdenv/generic/setup.sh                     |  2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/doc/stdenv.xml b/doc/stdenv.xml
index 136e83ee0cda..8129dda5a37e 100644
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@@ -1169,7 +1169,15 @@ PATH=/nix/store/68afga4khv0w...-coreutils-6.12/bin
 echo @foo@
 </programlisting>
 
-    That is, no substitution is performed for undefined variables.</para></listitem>
+    That is, no substitution is performed for undefined variables.</para>
+
+    <para>Environment variables that start with an uppercase letter are filtered out,
+    to prevent global variables (like <literal>HOME</literal>) from accidentally
+    getting substituted.
+    The variables also have to be valid bash “names”, as
+    defined in the bash manpage (alphanumeric or <literal>_</literal>, must not
+    start with a number).</para>
+  </listitem>
   </varlistentry>
 
 
diff --git a/pkgs/build-support/substitute/substitute-all.nix b/pkgs/build-support/substitute/substitute-all.nix
index fb26894661d9..1022b25c4c9b 100644
--- a/pkgs/build-support/substitute/substitute-all.nix
+++ b/pkgs/build-support/substitute/substitute-all.nix
@@ -2,6 +2,7 @@
 
 args:
 
+# see the substituteAll in the nixpkgs documentation for usage and constaints
 stdenv.mkDerivation ({
   name = if args ? name then args.name else baseNameOf (toString args.src);
   builder = ./substitute-all.sh;
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index f7f9cd533c1f..a183aabed0e3 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -445,7 +445,7 @@ substituteAll() {
 
     # Select all environment variables that start with a lowercase character.
     # Will not work with nix attribute names (and thus env variables) containing '\n'.
-    for envVar in $(env | sed -e $'s/^\([a-z][^=]*\)=.*/\\1/; t \n d'); do
+    for envVar in $(set | sed -e $'s/^\([a-z][^=]*\)=.*/\\1/; t \n d'); do
         if [ "$NIX_DEBUG" = "1" ]; then
             echo "$envVar -> ${!envVar}"
         fi

From 7d7a9df3605c86e17bced51afe67eecd43f99754 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 16 Feb 2016 19:48:19 +0100
Subject: [PATCH 034/287] html-tidy: fix on mingw

This doesn't fix the cross-build by itself due to
https://github.com/NixOS/nixpkgs/issues/14965
But in this case one can hack around that "easily" by:
  (html-tidy.override {
    inherit (/*non-cross nixpkgs eval*/)
      cmake;
  }).crossDrv
---
 pkgs/tools/text/html-tidy/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/text/html-tidy/default.nix b/pkgs/tools/text/html-tidy/default.nix
index 062715b83020..c0db454ed29b 100644
--- a/pkgs/tools/text/html-tidy/default.nix
+++ b/pkgs/tools/text/html-tidy/default.nix
@@ -13,6 +13,9 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake libxslt/*manpage*/ ];
 
+  cmakeFlags = stdenv.lib.optional
+    (stdenv.cross.libc or null == "msvcrt") "-DCMAKE_SYSTEM_NAME=Windows";
+
   # ATM bin/tidy is statically linked, as upstream provides no other option yet.
   # https://github.com/htacg/tidy-html5/issues/326#issuecomment-160322107
 

From 5f3987f44f81d2ca7bae266cdb1b26bd6d50b6c8 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 14 Apr 2016 17:47:28 +0300
Subject: [PATCH 035/287] Revert "tryAttrs: init function"

This reverts commit 338340f993563551d8cb45941da987408abef65f.
---
 lib/attrsets.nix | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/lib/attrsets.nix b/lib/attrsets.nix
index 70986195ae05..4161fa546c8f 100644
--- a/lib/attrsets.nix
+++ b/lib/attrsets.nix
@@ -438,24 +438,6 @@ rec {
   overrideExisting = old: new:
     old // listToAttrs (map (attr: nameValuePair attr (attrByPath [attr] old.${attr} new)) (attrNames old));
 
-  /* Try given attributes in order. If no attributes are found, return
-     attribute list itself.
-
-     Example:
-       tryAttrs ["a" "b"] { a = 1; b = 2; }
-       => 1
-       tryAttrs ["a" "b"] { c = 3; }
-       => { c = 3; }
-  */
-  tryAttrs = allAttrs: set:
-    let tryAttrs_ = attrs:
-      if attrs == [] then set
-      else
-        (let h = head attrs; in
-         if hasAttr h set then getAttr h set
-         else tryAttrs_ (tail attrs));
-    in tryAttrs_ allAttrs;
-
 
   /*** deprecated stuff ***/
 

From 7d3e75827bc20d50a3b9172ed8891e5bffb30c93 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 14 Apr 2016 18:13:50 +0300
Subject: [PATCH 036/287] getOutput function: init

---
 lib/attrsets.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/lib/attrsets.nix b/lib/attrsets.nix
index 4161fa546c8f..9104ff35d194 100644
--- a/lib/attrsets.nix
+++ b/lib/attrsets.nix
@@ -438,6 +438,18 @@ rec {
   overrideExisting = old: new:
     old // listToAttrs (map (attr: nameValuePair attr (attrByPath [attr] old.${attr} new)) (attrNames old));
 
+  /* Get a package output.
+     If no output is found, fallback to `.out` and then to the default.
+
+     Example:
+       getOutput "dev" pkgs.openssl
+       => "/nix/store/9rz8gxhzf8sw4kf2j2f1grr49w8zx5vj-openssl-1.0.1r-dev"
+  */
+  getOutput = output: pkg:
+    if pkg.outputUnspecified or false
+      then pkg.${output} or pkg.out or pkg
+      else pkg;
+
 
   /*** deprecated stuff ***/
 

From ab0a0c004e1076315c8ed910437e6cf9c2f087ff Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 14 Apr 2016 18:14:28 +0300
Subject: [PATCH 037/287] makeSearchPathOutputs: refactor to
 makeSearchPathOutput

---
 lib/strings.nix                                          | 9 ++++-----
 nixos/modules/services/web-servers/apache-httpd/trac.nix | 2 +-
 .../services/x11/desktop-managers/enlightenment.nix      | 2 +-
 nixos/modules/system/boot/loader/grub/grub.nix           | 2 +-
 nixos/modules/system/boot/systemd-unit-options.nix       | 2 +-
 pkgs/applications/misc/guake/default.nix                 | 2 +-
 pkgs/applications/misc/roxterm/default.nix               | 2 +-
 .../networking/browsers/chromium/plugins.nix             | 2 +-
 .../networking/browsers/firefox-bin/default.nix          | 2 +-
 .../networking/browsers/google-chrome/default.nix        | 2 +-
 pkgs/applications/networking/browsers/opera/default.nix  | 2 +-
 .../applications/networking/browsers/vivaldi/default.nix | 2 +-
 .../networking/mailreaders/thunderbird-bin/default.nix   | 2 +-
 pkgs/applications/science/math/mathematica/9.nix         | 2 +-
 pkgs/applications/science/math/mathematica/default.nix   | 2 +-
 .../version-management/reposurgeon/default.nix           | 2 +-
 pkgs/games/ue4demos/default.nix                          | 2 +-
 pkgs/os-specific/linux/pm-utils/default.nix              | 2 +-
 18 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/lib/strings.nix b/lib/strings.nix
index bda96fb32da0..0e3137f42ee5 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -88,15 +88,14 @@ rec {
   makeSearchPath = subDir: packages:
     concatStringsSep ":" (map (path: path + "/" + subDir) packages);
 
-  /* Construct a Unix-style search path, given trying outputs in order.
+  /* Construct a Unix-style search path, using given package output.
      If no output is found, fallback to `.out` and then to the default.
 
      Example:
-       makeSearchPathOutputs "bin" ["bin"] [ pkgs.openssl pkgs.zlib ]
-       => "/nix/store/9rz8gxhzf8sw4kf2j2f1grr49w8zx5vj-openssl-1.0.1r-bin/bin:/nix/store/wwh7mhwh269sfjkm6k5665b5kgp7jrk2-zlib-1.2.8/bin"
+       makeSearchPathOutput "dev" "bin" [ pkgs.openssl pkgs.zlib ]
+       => "/nix/store/9rz8gxhzf8sw4kf2j2f1grr49w8zx5vj-openssl-1.0.1r-dev/bin:/nix/store/wwh7mhwh269sfjkm6k5665b5kgp7jrk2-zlib-1.2.8/bin"
   */
-  makeSearchPathOutputs = subDir: outputs: pkgs:
-    makeSearchPath subDir (map (pkg: if pkg.outputUnspecified or false then lib.tryAttrs (outputs ++ ["out"]) pkg else pkg) pkgs);
+  makeSearchPathOutput = output: subDir: pkgs: makeSearchPath subDir (map (lib.getOutput output) pkgs);
 
   /* Construct a library search path (such as RPATH) containing the
      libraries for a set of packages
diff --git a/nixos/modules/services/web-servers/apache-httpd/trac.nix b/nixos/modules/services/web-servers/apache-httpd/trac.nix
index c4aa6b6ad3a3..3196edc2838b 100644
--- a/nixos/modules/services/web-servers/apache-httpd/trac.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/trac.nix
@@ -96,7 +96,7 @@ in
   globalEnvVars = singleton
     { name = "PYTHONPATH";
       value =
-        makeSearchPathOutputs "lib/${pkgs.python.libPrefix}/site-packages" ["lib"]
+        makeSearchPathOutput "lib" "lib/${pkgs.python.libPrefix}/site-packages"
           [ pkgs.mod_python
             pkgs.pythonPackages.trac
             pkgs.setuptools
diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix
index 11df7297833b..2e788d869607 100644
--- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix
+++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix
@@ -7,7 +7,7 @@ let
   e = pkgs.enlightenment;
   xcfg = config.services.xserver;
   cfg = xcfg.desktopManager.enlightenment;
-  GST_PLUGIN_PATH = lib.makeSearchPathOutputs "lib/gstreamer-1.0" ["lib"] [
+  GST_PLUGIN_PATH = lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" [
     pkgs.gst_all_1.gst-plugins-base
     pkgs.gst_all_1.gst-plugins-good
     pkgs.gst_all_1.gst-plugins-bad
diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix
index 289405f93195..7fc467b60f7b 100644
--- a/nixos/modules/system/boot/loader/grub/grub.nix
+++ b/nixos/modules/system/boot/loader/grub/grub.nix
@@ -58,7 +58,7 @@ let
       path = (makeBinPath ([
         pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.findutils pkgs.diffutils pkgs.btrfs-progs
         pkgs.utillinux ] ++ (if cfg.efiSupport && (cfg.version == 2) then [pkgs.efibootmgr ] else [])
-      )) + ":" + (makeSearchPathOutputs "sbin" ["bin"] [
+      )) + ":" + (makeSearchPathOutput "bin" "sbin" [
         pkgs.mdadm pkgs.utillinux
       ]);
     });
diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix
index c8c9cda913c0..f2a22e4ada8a 100644
--- a/nixos/modules/system/boot/systemd-unit-options.nix
+++ b/nixos/modules/system/boot/systemd-unit-options.nix
@@ -193,7 +193,7 @@ in rec {
 
     path = mkOption {
       default = [];
-      apply = ps: "${makeBinPath ps}:${makeSearchPathOutputs "sbin" ["bin"] ps}";
+      apply = ps: "${makeBinPath ps}:${makeSearchPathOutput "bin" "sbin" ps}";
       description = ''
         Packages added to the service's <envar>PATH</envar>
         environment variable.  Both the <filename>bin</filename>
diff --git a/pkgs/applications/misc/guake/default.nix b/pkgs/applications/misc/guake/default.nix
index 81ac845c5cf8..6290f0827340 100644
--- a/pkgs/applications/misc/guake/default.nix
+++ b/pkgs/applications/misc/guake/default.nix
@@ -16,7 +16,7 @@ gconftool-2 --recursive-unset /apps/guake
 with lib;
 
 let inputs = [ dbus gtk2 gconf python2 libutempter vte keybinder gnome3.gnome_common ];
-    pyPath = makeSearchPathOutputs python2.sitePackages ["lib"] (attrVals [ "dbus" "notify" "pyGtkGlade" "pyxdg" ] python2Packages ++ [ gnome2.gnome_python ]);
+    pyPath = makeSearchPathOutput "lib" python2.sitePackages (attrVals [ "dbus" "notify" "pyGtkGlade" "pyxdg" ] python2Packages ++ [ gnome2.gnome_python ]);
  in stdenv.mkDerivation rec {
   name = "guake-${version}";
   version = "0.8.3";
diff --git a/pkgs/applications/misc/roxterm/default.nix b/pkgs/applications/misc/roxterm/default.nix
index ec055f3055fc..d8f44ba5cdbf 100644
--- a/pkgs/applications/misc/roxterm/default.nix
+++ b/pkgs/applications/misc/roxterm/default.nix
@@ -29,7 +29,7 @@ in stdenv.mkDerivation rec {
                          "-I${dbus_libs.lib}/lib/dbus-1.0/include" ];
 
   # Fix up python path so the lockfile library is on it.
-  PYTHONPATH = stdenv.lib.makeSearchPathOutputs pythonFull.sitePackages ["lib"] [
+  PYTHONPATH = stdenv.lib.makeSearchPathOutput "lib" pythonFull.sitePackages [
     pythonPackages.curses pythonPackages.lockfile
   ];
 
diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix
index b7883454b349..ac7f8111212e 100644
--- a/pkgs/applications/networking/browsers/chromium/plugins.nix
+++ b/pkgs/applications/networking/browsers/chromium/plugins.nix
@@ -65,7 +65,7 @@ let
 
     patchPhase = let
       rpaths = [ stdenv.cc.cc ];
-      mkrpath = p: "${makeSearchPathOutputs "lib64" ["lib"] p}:${makeLibraryPath p}";
+      mkrpath = p: "${makeSearchPathOutput "lib" "lib64" p}:${makeLibraryPath p}";
     in ''
       for sofile in PepperFlash/libpepflashplayer.so \
                     libwidevinecdm.so libwidevinecdmadapter.so; do
diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index 152089286b48..d07aec33eb0c 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -105,7 +105,7 @@ stdenv.mkDerivation {
       libheimdal
       libpulseaudio
       systemd
-    ] + ":" + stdenv.lib.makeSearchPathOutputs "lib64" ["lib"] [
+    ] + ":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" [
       stdenv.cc.cc
     ];
 
diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix
index 77f0d1693da3..3042f30e000a 100644
--- a/pkgs/applications/networking/browsers/google-chrome/default.nix
+++ b/pkgs/applications/networking/browsers/google-chrome/default.nix
@@ -65,7 +65,7 @@ in stdenv.mkDerivation rec {
     tar xf data.tar.xz
   '';
 
-  rpath = makeLibraryPath deps + ":" + makeSearchPathOutputs "lib64" ["lib"] deps;
+  rpath = makeLibraryPath deps + ":" + makeSearchPathOutput "lib" "lib64" deps;
   binpath = makeBinPath deps;
 
   installPhase = ''
diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix
index 325e855ec72e..a00905cf9377 100644
--- a/pkgs/applications/networking/browsers/opera/default.nix
+++ b/pkgs/applications/networking/browsers/opera/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
 
   libPath = stdenv.lib.makeLibraryPath buildInputs
     + stdenv.lib.optionalString (stdenv.system == "x86_64-linux")
-      (":" + stdenv.lib.makeSearchPathOutputs "lib64" ["lib"] buildInputs);
+      (":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" buildInputs);
 
   preFixup =
     ''
diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index 7c3c167cf32d..c8931811548f 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
 
   libPath = stdenv.lib.makeLibraryPath buildInputs
     + stdenv.lib.optionalString (stdenv.system == "x86_64-linux")
-      (":" + stdenv.lib.makeSearchPathOutputs "lib64" ["lib"] buildInputs);
+      (":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" buildInputs);
 
   buildPhase = ''
     echo "Patching Vivaldi binaries"
diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
index bbb51c7c1865..f974265aa6e6 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
@@ -105,7 +105,7 @@ stdenv.mkDerivation {
       nspr
       nss
       pango
-    ] + ":" + stdenv.lib.makeSearchPathOutputs "lib64" ["lib"] [
+    ] + ":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" [
       stdenv.cc.cc
     ];
 
diff --git a/pkgs/applications/science/math/mathematica/9.nix b/pkgs/applications/science/math/mathematica/9.nix
index 2a43cf5677fe..07a20b4ebe03 100644
--- a/pkgs/applications/science/math/mathematica/9.nix
+++ b/pkgs/applications/science/math/mathematica/9.nix
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
 
   ldpath = stdenv.lib.makeLibraryPath buildInputs
     + stdenv.lib.optionalString (stdenv.system == "x86_64-linux")
-      (":" + stdenv.lib.makeSearchPathOutputs "lib64" ["lib"] buildInputs);
+      (":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" buildInputs);
 
   phases = "unpackPhase installPhase fixupPhase";
 
diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix
index c2988331c4cd..4de4a0c261d5 100644
--- a/pkgs/applications/science/math/mathematica/default.nix
+++ b/pkgs/applications/science/math/mathematica/default.nix
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
 
   ldpath = stdenv.lib.makeLibraryPath buildInputs
     + stdenv.lib.optionalString (stdenv.system == "x86_64-linux")
-      (":" + stdenv.lib.makeSearchPathOutputs "lib64" ["lib"] buildInputs);
+      (":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" buildInputs);
 
   phases = "unpackPhase installPhase fixupPhase";
 
diff --git a/pkgs/applications/version-management/reposurgeon/default.nix b/pkgs/applications/version-management/reposurgeon/default.nix
index 669151adbcc8..55858034b1c4 100644
--- a/pkgs/applications/version-management/reposurgeon/default.nix
+++ b/pkgs/applications/version-management/reposurgeon/default.nix
@@ -51,7 +51,7 @@ mkDerivation rec {
         [ out git bazaar cvs darcs fossil mercurial
           monotone rcs src subversion cvs_fast_export ]
       );
-      pythonpath = makeSearchPathOutputs python27.sitePackages ["lib"] (
+      pythonpath = makeSearchPathOutput "lib" python27.sitePackages (
         filter (x: x != null)
         [ python27Packages.readline or null python27Packages.hglib or null ]
       );
diff --git a/pkgs/games/ue4demos/default.nix b/pkgs/games/ue4demos/default.nix
index 963dde91068b..4bac1cd1bb35 100644
--- a/pkgs/games/ue4demos/default.nix
+++ b/pkgs/games/ue4demos/default.nix
@@ -12,7 +12,7 @@ let
 
       rtdeps = stdenv.lib.makeLibraryPath
         [ xorg.libXxf86vm xorg.libXext openal ]
-        + ":" + stdenv.lib.makeSearchPathOutputs "lib64" ["lib"] [ stdenv.cc.cc ];
+        + ":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" [ stdenv.cc.cc ];
 
       buildCommand =
       ''
diff --git a/pkgs/os-specific/linux/pm-utils/default.nix b/pkgs/os-specific/linux/pm-utils/default.nix
index cb74dc204a3c..e2257642d0b1 100644
--- a/pkgs/os-specific/linux/pm-utils/default.nix
+++ b/pkgs/os-specific/linux/pm-utils/default.nix
@@ -6,7 +6,7 @@ let
   binPath = stdenv.lib.makeBinPath
     [ coreutils gnugrep utillinux kmod procps kbd dbus_tools ];
 
-  sbinPath = stdenv.lib.makeSearchPathOutputs "sbin" ["bin"]
+  sbinPath = stdenv.lib.makeSearchPathOutput "bin" "sbin"
     [ procps ];
 
 in

From c779e30d531032a7744685e80c2143b358efe1b0 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 14 Apr 2016 18:15:11 +0300
Subject: [PATCH 038/287] make*Path: implement via makeSearchPathOutput

---
 lib/strings.nix | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/lib/strings.nix b/lib/strings.nix
index 0e3137f42ee5..9e9bdd6e1535 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -107,9 +107,7 @@ rec {
        makeLibraryPath [ pkgs.openssl pkgs.zlib ]
        => "/nix/store/9rz8gxhzf8sw4kf2j2f1grr49w8zx5vj-openssl-1.0.1r/lib:/nix/store/wwh7mhwh269sfjkm6k5665b5kgp7jrk2-zlib-1.2.8/lib"
   */
-  makeLibraryPath = pkgs: makeSearchPath "lib"
-    # try to guess the right output of each pkg
-    (map (pkg: if pkg.outputUnspecified or false then pkg.lib or (pkg.out or pkg) else pkg) pkgs);
+  makeLibraryPath = makeSearchPathOutput "lib" "lib";
 
   /* Construct a binary search path (such as $PATH) containing the
      binaries for a set of packages.
@@ -118,8 +116,7 @@ rec {
        makeBinPath ["/root" "/usr" "/usr/local"]
        => "/root/bin:/usr/bin:/usr/local/bin"
   */
-  makeBinPath = pkgs: makeSearchPath "bin"
-    (map (pkg: if pkg.outputUnspecified or false then pkg.bin or (pkg.out or pkg) else pkg) pkgs);
+  makeBinPath = makeSearchPathOutput "bin" "bin";
 
 
   /* Construct a perl search path (such as $PERL5LIB)
@@ -131,8 +128,7 @@ rec {
        makePerlPath [ pkgs.perlPackages.NetSMTP ]
        => "/nix/store/n0m1fk9c960d8wlrs62sncnadygqqc6y-perl-Net-SMTP-1.25/lib/perl5/site_perl"
   */
-  makePerlPath = pkgs: makeSearchPath "lib/perl5/site_perl"
-    (map (pkg: if pkg.outputUnspecified or false then pkg.lib or (pkg.out or pkg) else pkg) pkgs);
+  makePerlPath = makeSearchPathOutput "lib" "lib/perl5/site_perl";
 
   /* Dependening on the boolean `cond', return either the given string
      or the empty string. Useful to contatenate against a bigger string.

From 5ff40ddedfe3188749faa21d71ac013277aff1d1 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 14 Apr 2016 19:00:39 +0300
Subject: [PATCH 039/287] add get* helper functions and mass-replace manual
 outputs search with them

---
 lib/attrsets.nix                              |  4 ++
 .../system/activation/activation-script.nix   |  3 +-
 pkgs/applications/search/recoll/default.nix   | 44 +++++++++----------
 pkgs/build-support/cc-wrapper/default.nix     | 12 ++---
 .../build-support/gcc-wrapper-old/default.nix |  8 ++--
 .../compilers/gcc-arm-embedded/default.nix    |  4 +-
 .../compilers/ghc/6.10.2-binary.nix           |  4 +-
 pkgs/development/compilers/go/1.4.nix         |  2 +-
 .../development/interpreters/perl/default.nix |  4 +-
 .../development/interpreters/pypy/default.nix |  7 ++-
 .../interpreters/python/2.6/default.nix       |  4 +-
 .../interpreters/python/2.7/default.nix       |  4 +-
 .../interpreters/python/3.2/default.nix       |  4 +-
 .../interpreters/python/3.3/default.nix       |  4 +-
 .../interpreters/python/3.4/default.nix       |  4 +-
 .../interpreters/python/3.5/default.nix       |  4 +-
 .../tools/build-managers/cmake/default.nix    |  6 +--
 pkgs/misc/emulators/wine/base.nix             |  5 ++-
 pkgs/stdenv/darwin/make-bootstrap-tools.nix   |  2 +-
 pkgs/stdenv/generic/default.nix               |  2 +-
 20 files changed, 67 insertions(+), 64 deletions(-)

diff --git a/lib/attrsets.nix b/lib/attrsets.nix
index 9104ff35d194..636cb257d6bf 100644
--- a/lib/attrsets.nix
+++ b/lib/attrsets.nix
@@ -450,6 +450,10 @@ rec {
       then pkg.${output} or pkg.out or pkg
       else pkg;
 
+  getBin = getOutput "bin";
+  getLib = getOutput "lib";
+  getDev = getOutput "dev";
+
 
   /*** deprecated stuff ***/
 
diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix
index 9d61d64f7553..4489e34831da 100644
--- a/nixos/modules/system/activation/activation-script.nix
+++ b/nixos/modules/system/activation/activation-script.nix
@@ -12,8 +12,7 @@ let
     '';
   });
 
-  path = map # outputs TODO?
-    (pkg: (pkg.bin or (pkg.out or pkg)))
+  path = map getBin
     [ pkgs.coreutils pkgs.gnugrep pkgs.findutils
       pkgs.glibc # needed for getent
       pkgs.shadow
diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix
index 253b97aff1e7..345b1341c0f4 100644
--- a/pkgs/applications/search/recoll/default.nix
+++ b/pkgs/applications/search/recoll/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, bison
+{ stdenv, fetchurl, lib, bison
 , qt4, xapian, file, python, perl
 , djvulibre, groff, libxslt, unzip, poppler_utils, antiword, catdoc, lyx
 , libwpd, unrtf, untex
@@ -26,27 +26,27 @@ stdenv.mkDerivation rec {
   # the absolute path to the filtering command. 
   postInstall = ''
     for f in $out/share/recoll/filters/* ; do
-      substituteInPlace  $f --replace antiword      ${antiword}/bin/antiword
-      substituteInPlace  $f --replace awk           ${gawk}/bin/awk
-      substituteInPlace  $f --replace catppt        ${catdoc}/bin/catppt
-      substituteInPlace  $f --replace djvused       ${djvulibre.bin}/bin/djvused
-      substituteInPlace  $f --replace djvutxt       ${djvulibre.bin}/bin/djvutxt
-      substituteInPlace  $f --replace egrep         ${gnugrep}/bin/egrep
-      substituteInPlace  $f --replace groff         ${groff}/bin/groff
-      substituteInPlace  $f --replace gunzip        ${gzip}/bin/gunzip
-      substituteInPlace  $f --replace iconv         ${libiconv.bin or libiconv}/bin/iconv
-      substituteInPlace  $f --replace lyx           ${lyx}/bin/lyx
-      substituteInPlace  $f --replace pdftotext     ${poppler_utils.out}/bin/pdftotext
-      substituteInPlace  $f --replace pstotext      ${ghostscript}/bin/ps2ascii 
-      substituteInPlace  $f --replace sed           ${gnused}/bin/sed
-      substituteInPlace  $f --replace tar           ${gnutar}/bin/tar
-      substituteInPlace  $f --replace unzip         ${unzip}/bin/unzip
-      substituteInPlace  $f --replace xls2csv       ${catdoc}/bin/xls2csv
-      substituteInPlace  $f --replace xsltproc      ${libxslt.bin}/bin/xsltproc
-      substituteInPlace  $f --replace unrtf         ${unrtf}/bin/unrtf
-      substituteInPlace  $f --replace untex         ${untex}/bin/untex
-      substituteInPlace  $f --replace wpd2html      ${libwpd}/bin/wpd2html
-      substituteInPlace  $f --replace /usr/bin/perl ${perl}/bin/perl
+      substituteInPlace  $f --replace antiword      ${lib.getBin antiword}/bin/antiword
+      substituteInPlace  $f --replace awk           ${lib.getBin gawk}/bin/awk
+      substituteInPlace  $f --replace catppt        ${lib.getBin catdoc}/bin/catppt
+      substituteInPlace  $f --replace djvused       ${lib.getBin djvulibre}/bin/djvused
+      substituteInPlace  $f --replace djvutxt       ${lib.getBin djvulibre}/bin/djvutxt
+      substituteInPlace  $f --replace egrep         ${lib.getBin gnugrep}/bin/egrep
+      substituteInPlace  $f --replace groff         ${lib.getBin groff}/bin/groff
+      substituteInPlace  $f --replace gunzip        ${lib.getBin gzip}/bin/gunzip
+      substituteInPlace  $f --replace iconv         ${lib.getBin libiconv}/bin/iconv
+      substituteInPlace  $f --replace lyx           ${lib.getBin lyx}/bin/lyx
+      substituteInPlace  $f --replace pdftotext     ${lib.getBin poppler_utils}/bin/pdftotext
+      substituteInPlace  $f --replace pstotext      ${lib.getBin ghostscript}/bin/ps2ascii
+      substituteInPlace  $f --replace sed           ${lib.getBin gnused}/bin/sed
+      substituteInPlace  $f --replace tar           ${lib.getBin gnutar}/bin/tar
+      substituteInPlace  $f --replace unzip         ${lib.getBin unzip}/bin/unzip
+      substituteInPlace  $f --replace xls2csv       ${lib.getBin catdoc}/bin/xls2csv
+      substituteInPlace  $f --replace xsltproc      ${lib.getBin libxslt}/bin/xsltproc
+      substituteInPlace  $f --replace unrtf         ${lib.getBin unrtf}/bin/unrtf
+      substituteInPlace  $f --replace untex         ${lib.getBin untex}/bin/untex
+      substituteInPlace  $f --replace wpd2html      ${lib.getBin libwpd}/bin/wpd2html
+      substituteInPlace  $f --replace /usr/bin/perl ${lib.getBin perl}/bin/perl
     done
   '';
 
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 6cdd04772445..6bdb35b912a7 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -27,13 +27,13 @@ let
   ccVersion = (builtins.parseDrvName cc.name).version;
   ccName = (builtins.parseDrvName cc.name).name;
 
-  libc_bin = if nativeLibc then null else libc.bin or libc;
-  libc_dev = if nativeLibc then null else libc.dev or libc;
-  libc_lib = if nativeLibc then null else libc.out or libc;
-  cc_solib = cc.lib or cc;
-  binutils_bin = if nativeTools then "" else binutils.bin or binutils;
+  libc_bin = if nativeLibc then null else getBin libc;
+  libc_dev = if nativeLibc then null else getDev libc;
+  libc_lib = if nativeLibc then null else getLib libc;
+  cc_solib = getLib cc;
+  binutils_bin = if nativeTools then "" else getBin binutils;
   # The wrapper scripts use 'cat' and 'grep', so we may need coreutils.
-  coreutils_bin = if nativeTools then "" else coreutils.bin or coreutils;
+  coreutils_bin = if nativeTools then "" else getBin coreutils;
 in
 
 stdenv.mkDerivation {
diff --git a/pkgs/build-support/gcc-wrapper-old/default.nix b/pkgs/build-support/gcc-wrapper-old/default.nix
index f44aaec5d9d7..a7801e239e9c 100644
--- a/pkgs/build-support/gcc-wrapper-old/default.nix
+++ b/pkgs/build-support/gcc-wrapper-old/default.nix
@@ -5,7 +5,7 @@
 # stdenv.mkDerivation provides a wrapper that sets up the right environment
 # variables so that the compiler and the linker just "work".
 
-{ name ? "", stdenv, nativeTools, nativeLibc, nativePrefix ? ""
+{ name ? "", stdenv, lib, nativeTools, nativeLibc, nativePrefix ? ""
 , gcc ? null, libc ? null, binutils ? null, coreutils ? null, shell ? ""
 , zlib ? null
 }:
@@ -41,10 +41,10 @@ stdenv.mkDerivation {
   addFlags = ./add-flags;
 
   inherit nativeTools nativeLibc nativePrefix gcc;
-  gcc_lib = gcc.lib or gcc;
+  gcc_lib = lib.getLib gcc;
   libc = if nativeLibc then null else libc;
-  libc_dev = if nativeLibc then null else libc.dev or libc;
-  libc_bin = if nativeLibc then null else libc.bin or libc;
+  libc_dev = if nativeLibc then null else lib.getDev libc;
+  libc_bin = if nativeLibc then null else lib.getBin libc;
   binutils = if nativeTools then null else binutils;
   # The wrapper scripts use 'cat', so we may need coreutils
   coreutils = if nativeTools then null else coreutils;
diff --git a/pkgs/development/compilers/gcc-arm-embedded/default.nix b/pkgs/development/compilers/gcc-arm-embedded/default.nix
index 1c549907c31d..85d8d37b21ce 100644
--- a/pkgs/development/compilers/gcc-arm-embedded/default.nix
+++ b/pkgs/development/compilers/gcc-arm-embedded/default.nix
@@ -33,8 +33,8 @@ stdenv.mkDerivation {
 
     for f in $(find $out); do
       if [ -f "$f" ] && patchelf "$f" 2> /dev/null; then
-        patchelf --set-interpreter ${glibc.out}/lib/ld-linux.so.2 \
-                 --set-rpath $out/lib:${gcc.lib or gcc}/lib:${ncurses.out}/lib \
+        patchelf --set-interpreter ${getLib glibc}/lib/ld-linux.so.2 \
+                 --set-rpath $out/lib:${getLib gcc}/lib:${ncurses.out}/lib \
                  "$f" || true
       fi
     done
diff --git a/pkgs/development/compilers/ghc/6.10.2-binary.nix b/pkgs/development/compilers/ghc/6.10.2-binary.nix
index 3ad872518f9e..045b9142ef3b 100644
--- a/pkgs/development/compilers/ghc/6.10.2-binary.nix
+++ b/pkgs/development/compilers/ghc/6.10.2-binary.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, perl, libedit, ncurses, gmp}:
+{stdenv, lib, fetchurl, perl, libedit, ncurses, gmp}:
 
 stdenv.mkDerivation rec {
   version = "6.10.2";
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
      '' else "");
 
   configurePhase = ''
-    ./configure --prefix=$out --with-gmp-libraries=${gmp.out}/lib --with-gmp-includes=${gmp.dev or gmp}/include
+    ./configure --prefix=$out --with-gmp-libraries=${lib.getLib gmp}/lib --with-gmp-includes=${lib.getDev gmp}/include
   '';
 
   # Stripping combined with patchelf breaks the executables (they die
diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix
index 3a1f39eab242..17c3cc052177 100644
--- a/pkgs/development/compilers/go/1.4.nix
+++ b/pkgs/development/compilers/go/1.4.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
     sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go
 
     # Find the loader dynamically
-    LOADER="$(find ${libc.out or libc}/lib -name ld-linux\* | head -n 1)"
+    LOADER="$(find ${lib.getLib libc}/lib -name ld-linux\* | head -n 1)"
 
     # Replace references to the loader
     find src/cmd -name asm.c -exec sed -i "s,/lib/ld-linux.*\.so\.[0-9],$LOADER," {} \;
diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix
index f8565b9637a5..a853ca4eb777 100644
--- a/pkgs/development/interpreters/perl/default.nix
+++ b/pkgs/development/interpreters/perl/default.nix
@@ -17,8 +17,8 @@ assert enableThreading -> (stdenv ? glibc);
 let
 
   libc = if stdenv.cc.libc or null != null then stdenv.cc.libc else "/usr";
-  libcInc = libc.dev or libc;
-  libcLib = libc.out or libc;
+  libcInc = lib.getDev libc;
+  libcLib = lib.getLib libc;
   common = { version, sha256 }: stdenv.mkDerivation rec {
     name = "perl-${version}";
 
diff --git a/pkgs/development/interpreters/pypy/default.nix b/pkgs/development/interpreters/pypy/default.nix
index 095e0b7db08e..fdbf7b1bab63 100644
--- a/pkgs/development/interpreters/pypy/default.nix
+++ b/pkgs/development/interpreters/pypy/default.nix
@@ -25,10 +25,9 @@ let
       ++ stdenv.lib.optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc
       ++ stdenv.lib.optional zlibSupport zlib;
 
-    C_INCLUDE_PATH = stdenv.lib.concatStringsSep ":" (map (p: "${p.dev or p}/include") buildInputs);
-    LIBRARY_PATH = stdenv.lib.concatStringsSep ":" (map (p: "${p.lib or p.out or p}/lib") buildInputs);
-    LD_LIBRARY_PATH = stdenv.lib.concatStringsSep ":" (map (p: "${p.lib or p.out or p}/lib")
-      (stdenv.lib.filter (x : x.outPath != stdenv.cc.libc.outPath or "") buildInputs));
+    C_INCLUDE_PATH = stdenv.lib.makeSearchPathOutput "dev" "include" buildInputs;
+    LIBRARY_PATH = stdenv.lib.makeLibraryPath buildInputs;
+    LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath (stdenv.lib.filter (x : x.outPath != stdenv.cc.libc.outPath or "") buildInputs);
 
     preConfigure = ''
       # hint pypy to find nix ncurses
diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix
index 96b44ddc17f3..2196bb7e8b86 100644
--- a/pkgs/development/interpreters/python/2.6/default.nix
+++ b/pkgs/development/interpreters/python/2.6/default.nix
@@ -53,8 +53,8 @@ let
     ++ optional zlibSupport zlib;
 
   mkPaths = paths: {
-    C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p.dev or p}/include") paths);
-    LIBRARY_PATH = concatStringsSep ":" (map (p: "${p.lib or (p.out or p)}/lib") paths);
+    C_INCLUDE_PATH = makeSearchPathOutput "dev" "include" paths;
+    LIBRARY_PATH = makeLibraryPath paths;
   };
 
   # Build the basic Python interpreter without modules that have
diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix
index f1ae897ea4ac..6b336766db78 100644
--- a/pkgs/development/interpreters/python/2.7/default.nix
+++ b/pkgs/development/interpreters/python/2.7/default.nix
@@ -102,8 +102,8 @@ let
   propagatedBuildInputs = optional stdenv.isDarwin configd;
 
   mkPaths = paths: {
-    C_INCLUDE_PATH = concatStringsSep ":" (map (p: "${p.dev or p}/include") paths);
-    LIBRARY_PATH = concatStringsSep ":" (map (p: "${p.lib or (p.out or p)}/lib") paths);
+    C_INCLUDE_PATH = makeSearchPathOutput "dev" "include" paths;
+    LIBRARY_PATH = makeLibraryPath paths;
   };
 
   # Build the basic Python interpreter without modules that have
diff --git a/pkgs/development/interpreters/python/3.2/default.nix b/pkgs/development/interpreters/python/3.2/default.nix
index c0b5d3401ddd..91f962efcf4a 100644
--- a/pkgs/development/interpreters/python/3.2/default.nix
+++ b/pkgs/development/interpreters/python/3.2/default.nix
@@ -44,8 +44,8 @@ stdenv.mkDerivation {
     ${optionalString stdenv.isDarwin ''export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2"''}
 
     configureFlagsArray=( --enable-shared --with-threads --with-wide-unicode
-                          CPPFLAGS="${concatStringsSep " " (map (p: "-I${p.dev or p}/include") buildInputs)}"
-                          LDFLAGS="${concatStringsSep " " (map (p: "-L${p.lib or (p.out or p)}/lib") buildInputs)}"
+                          CPPFLAGS="${makeSearchPathOutput "dev" "include" buildInputs}"
+                          LDFLAGS="${makeLibraryPath buildInputs}"
                           LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}"
                         )
   '';
diff --git a/pkgs/development/interpreters/python/3.3/default.nix b/pkgs/development/interpreters/python/3.3/default.nix
index a46ef7c056b2..b9cb46562122 100644
--- a/pkgs/development/interpreters/python/3.3/default.nix
+++ b/pkgs/development/interpreters/python/3.3/default.nix
@@ -46,8 +46,8 @@ stdenv.mkDerivation {
     ${optionalString stdenv.isDarwin ''export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2"''}
 
     configureFlagsArray=( --enable-shared --with-threads
-                          CPPFLAGS="${concatStringsSep " " (map (p: "-I${p.dev or p}/include") buildInputs)}"
-                          LDFLAGS="${concatStringsSep " " (map (p: "-L${p.lib or (p.out or p)}/lib") buildInputs)}"
+                          CPPFLAGS="${makeSearchPathOutput "dev" "include" buildInputs}"
+                          LDFLAGS="${makeLibraryPath buildInputs}"
                           LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}"
                         )
   '';
diff --git a/pkgs/development/interpreters/python/3.4/default.nix b/pkgs/development/interpreters/python/3.4/default.nix
index 8d87c6abfbb4..6a3ab25c5d40 100644
--- a/pkgs/development/interpreters/python/3.4/default.nix
+++ b/pkgs/development/interpreters/python/3.4/default.nix
@@ -58,8 +58,8 @@ stdenv.mkDerivation {
      ''}
 
     configureFlagsArray=( --enable-shared --with-threads
-                          CPPFLAGS="${concatStringsSep " " (map (p: "-I${p.dev or p}/include") buildInputs)}"
-                          LDFLAGS="${concatStringsSep " " (map (p: "-L${p.lib or (p.out or p)}/lib") buildInputs)}"
+                          CPPFLAGS="${makeSearchPathOutput "dev" "include" buildInputs}"
+                          LDFLAGS="${makeLibraryPath buildInputs}"
                           LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}"
                         )
   '';
diff --git a/pkgs/development/interpreters/python/3.5/default.nix b/pkgs/development/interpreters/python/3.5/default.nix
index 4bc39f4c2b3a..504c85ac38d2 100644
--- a/pkgs/development/interpreters/python/3.5/default.nix
+++ b/pkgs/development/interpreters/python/3.5/default.nix
@@ -58,8 +58,8 @@ stdenv.mkDerivation {
      ''}
 
     configureFlagsArray=( --enable-shared --with-threads
-                          CPPFLAGS="${concatStringsSep " " (map (p: "-I${p.dev or p}/include") buildInputs)}"
-                          LDFLAGS="${concatStringsSep " " (map (p: "-L${p.lib or (p.out or p)}/lib") buildInputs)}"
+                          CPPFLAGS="${makeSearchPathOutput "dev" "include" buildInputs}"
+                          LDFLAGS="${makeLibraryPath buildInputs}"
                           LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}"
                         )
   '';
diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index 9d0ff6e1f174..e1528aa5f009 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -47,9 +47,9 @@ stdenv.mkDerivation rec {
     ''
       fixCmakeFiles .
       substituteInPlace Modules/Platform/UnixPaths.cmake \
-        --subst-var-by glibc_bin ${glibc.bin or glibc} \
-        --subst-var-by glibc_dev ${glibc.dev or glibc} \
-        --subst-var-by glibc_lib ${glibc.out or glibc}
+        --subst-var-by glibc_bin ${getBin glibc} \
+        --subst-var-by glibc_dev ${getDev glibc} \
+        --subst-var-by glibc_lib ${getLib glibc}
     '';
   configureFlags =
     [ "--docdir=/share/doc/${name}"
diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix
index 804eb0bb304c..0398ed57a702 100644
--- a/pkgs/misc/emulators/wine/base.nix
+++ b/pkgs/misc/emulators/wine/base.nix
@@ -32,9 +32,10 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
   # them to the RPATH so that the user doesn't have to set them in
   # LD_LIBRARY_PATH.
   NIX_LDFLAGS = map (path: "-rpath " + path) (
-      map (x: "${x}/lib") ([ stdenv.cc.cc ] ++ (map (x: x.lib or x.out) buildInputs))
+      map (x: "${lib.getLib x}/lib") ([ stdenv.cc.cc ] ++ buildInputs)
       # libpulsecommon.so is linked but not found otherwise
-      ++ lib.optionals pulseaudioSupport (map (x: "${x}/lib/pulseaudio") (toBuildInputs pkgArches (pkgs: [ pkgs.libpulseaudio ])))
+      ++ lib.optionals pulseaudioSupport (map (x: "${lib.getLib x}/lib/pulseaudio")
+          (toBuildInputs pkgArches (pkgs: [ pkgs.libpulseaudio ])))
     );
 
   # Don't shrink the ELF RPATHs in order to keep the extra RPATH
diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
index 561dcc7fdfda..40f26dc2450b 100644
--- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
@@ -62,7 +62,7 @@ rec {
       cp -d ${openssl.out}/lib/*.dylib $out/lib
 
       cp -d ${gnugrep.pcre.out}/lib/libpcre*.dylib $out/lib
-      cp -d ${libiconv.lib or libiconv}/lib/lib*.dylib $out/lib
+      cp -d ${lib.getLib libiconv}/lib/lib*.dylib $out/lib
       cp -d ${gettext}/lib/libintl*.dylib $out/lib
       chmod +x $out/lib/libintl*.dylib
       cp -d ${ncurses.out}/lib/libncurses*.dylib $out/lib
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index 547541d28246..5d3b1682f396 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -223,7 +223,7 @@ let
         # include it in the result, it *is* available to nix-env for queries.
         meta = { }
             # If the packager hasn't specified `outputsToInstall`, choose a default,
-            # namely `p.bin or p.out or p`;
+            # namely `lib.getBin p`;
             # if he has specified it, it will be overridden below in `// meta`.
             #   Note: This default probably shouldn't be globally configurable.
             #   Services and users should specify outputs explicitly,

From d4794c36306616faa96b0dd5a6f0696d96973738 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 18 Apr 2016 17:06:15 +0300
Subject: [PATCH 040/287] stdenv: clarify how `outputsToInstall` is chosen

See https://github.com/NixOS/nixpkgs/pull/14694/files#r60013871
---
 pkgs/stdenv/generic/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index 5d3b1682f396..a51289fa9019 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -223,7 +223,7 @@ let
         # include it in the result, it *is* available to nix-env for queries.
         meta = { }
             # If the packager hasn't specified `outputsToInstall`, choose a default,
-            # namely `lib.getBin p`;
+            # which is the name of `p.bin or p.out or p`;
             # if he has specified it, it will be overridden below in `// meta`.
             #   Note: This default probably shouldn't be globally configurable.
             #   Services and users should specify outputs explicitly,

From 5ede7d4d925542da9315b659afbe16b90613414e Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 20 Apr 2016 17:41:36 +0300
Subject: [PATCH 041/287] octoprint: use makeSearchPathOutput

---
 nixos/modules/services/misc/octoprint.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/misc/octoprint.nix b/nixos/modules/services/misc/octoprint.nix
index 8d46bca99f99..c2b3f63be7d4 100644
--- a/nixos/modules/services/misc/octoprint.nix
+++ b/nixos/modules/services/misc/octoprint.nix
@@ -102,7 +102,7 @@ in
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" ];
       path = [ pluginsEnv ];
-      environment.PYTHONPATH = makeSearchPathOutputs pkgs.python.sitePackages ["lib"] [ pluginsEnv ];
+      environment.PYTHONPATH = makeSearchPathOutput "lib" pkgs.python.sitePackages [ pluginsEnv ];
 
       preStart = ''
         mkdir -p "${cfg.stateDir}"

From 96a5c34bc5736780f84a62e682c59da50e531f0e Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 25 Apr 2016 13:21:15 +0300
Subject: [PATCH 042/287] cmake2_8: use get(Output) functions

---
 pkgs/development/tools/build-managers/cmake/2.8.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/build-managers/cmake/2.8.nix b/pkgs/development/tools/build-managers/cmake/2.8.nix
index 6542c9ae3c52..885e10b465ae 100644
--- a/pkgs/development/tools/build-managers/cmake/2.8.nix
+++ b/pkgs/development/tools/build-managers/cmake/2.8.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = optional wantPS ps;
 
-  CMAKE_PREFIX_PATH = stdenv.lib.concatStringsSep ":"
+  CMAKE_PREFIX_PATH = concatStringsSep ":"
     (concatMap (p: [ p p.out ]) buildInputs);
 
   configureFlags =
@@ -63,9 +63,9 @@ stdenv.mkDerivation rec {
       source $setupHook
       fixCmakeFiles .
       substituteInPlace Modules/Platform/UnixPaths.cmake \
-        --subst-var-by glibc_bin ${glibc.bin or glibc} \
-        --subst-var-by glibc_dev ${glibc.dev or glibc} \
-        --subst-var-by glibc_lib ${glibc.out or glibc}
+        --subst-var-by glibc_bin ${getBin glibc} \
+        --subst-var-by glibc_dev ${getDev glibc} \
+        --subst-var-by glibc_lib ${getLib glibc}
     '';
 
   meta = {

From daa8ba26c94fff99e963a8739311ccb2033eda1c Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 25 Apr 2016 13:23:56 +0300
Subject: [PATCH 043/287] atomEnv: use makeSearchPathOutput

---
 pkgs/applications/editors/atom/env.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/atom/env.nix b/pkgs/applications/editors/atom/env.nix
index d91d8a4ecbe4..dbfc2ebb6b38 100644
--- a/pkgs/applications/editors/atom/env.nix
+++ b/pkgs/applications/editors/atom/env.nix
@@ -13,7 +13,7 @@ let
   ];
 
   libPathNative = lib.makeLibraryPath packages;
-  libPath64 = lib.makeSearchPathOutputs "lib64" ["lib"] packages;
+  libPath64 = lib.makeSearchPathOutput "lib" "lib64" packages;
   libPath = "${libPathNative}:${libPath64}";
 
 in { inherit packages libPath; }

From 69a072484dd9ee04c68a3bf3ce5a1bdb111a9229 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 25 Apr 2016 14:27:51 +0300
Subject: [PATCH 044/287] gcc-wrapper-old: fix binutils and coreutils' paths

---
 pkgs/build-support/gcc-wrapper-old/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/gcc-wrapper-old/default.nix b/pkgs/build-support/gcc-wrapper-old/default.nix
index a7801e239e9c..a87c726e0a8b 100644
--- a/pkgs/build-support/gcc-wrapper-old/default.nix
+++ b/pkgs/build-support/gcc-wrapper-old/default.nix
@@ -45,9 +45,9 @@ stdenv.mkDerivation {
   libc = if nativeLibc then null else libc;
   libc_dev = if nativeLibc then null else lib.getDev libc;
   libc_bin = if nativeLibc then null else lib.getBin libc;
-  binutils = if nativeTools then null else binutils;
+  binutils = if nativeTools then null else lib.getBin binutils;
   # The wrapper scripts use 'cat', so we may need coreutils
-  coreutils = if nativeTools then null else coreutils;
+  coreutils = if nativeTools then null else lib.getBin coreutils;
 
   langC = if nativeTools then true else gcc.langC;
   langCC = if nativeTools then true else gcc.langCC;

From c7377b0e4a5fb3cf44c334c2353adc96e0e82918 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 25 Apr 2016 17:12:49 +0200
Subject: [PATCH 045/287] zlib, bash: mass-rebuild cleanup

---
 pkgs/development/libraries/zlib/default.nix | 3 ---
 pkgs/shells/bash/default.nix                | 4 +---
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/zlib/default.nix b/pkgs/development/libraries/zlib/default.nix
index 59713bb8d205..92bde5deb973 100644
--- a/pkgs/development/libraries/zlib/default.nix
+++ b/pkgs/development/libraries/zlib/default.nix
@@ -64,9 +64,6 @@ stdenv.mkDerivation rec {
     makeFlags = [ "RANLIB=${stdenv.cross.config}-ranlib" ];
   };
 
-  # CYGXXX: This is not needed anymore and non-functional, but left not to trigger rebuilds
-  cygwinConfigureEnableShared = if (!stdenv.isCygwin) then true else null;
-
   passthru.version = version;
 
   meta = with stdenv.lib; {
diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix
index 2fa229692eb3..49d149eb183c 100644
--- a/pkgs/shells/bash/default.nix
+++ b/pkgs/shells/bash/default.nix
@@ -21,9 +21,7 @@ stdenv.mkDerivation rec {
     inherit sha256;
   };
 
-  outputs = if (!interactive) # conditional to avoid mass rebuild ATM
-    then [ "out" "doc" ]
-    else [ "out" "doc" "info" ];
+  outputs = [ "out" "doc" "info" ];
 
   # the man pages are small and useful enough
   outputMan = if interactive then "out" else null;

From 26f90102b897bab14d05bbd8c2385f619d04d8fa Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sat, 16 Apr 2016 19:26:31 +0300
Subject: [PATCH 046/287] openssl: fix indentation

---
 pkgs/development/libraries/openssl/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 1e0f419c5f73..304b575eb925 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -57,20 +57,20 @@ let
           rm "$out/lib/"*.a
       fi
 
-    mkdir -p $bin
-    mv $out/bin $bin/
+      mkdir -p $bin
+      mv $out/bin $bin/
 
-    mkdir $dev
-    mv $out/include $dev/
+      mkdir $dev
+      mv $out/include $dev/
 
       # remove dependency on Perl at runtime
-    rm -r $out/etc/ssl/misc
+      rm -r $out/etc/ssl/misc
 
       rmdir $out/etc/ssl/{certs,private}
     '';
 
     postFixup = ''
-    # Check to make sure the main output doesn't depend on perl
+      # Check to make sure the main output doesn't depend on perl
       if grep -r '${perl}' $out; then
         echo "Found an erroneous dependency on perl ^^^" >&2
         exit 1

From bb9fa90dca09fc02f5bdd0548c3e7d156b02da80 Mon Sep 17 00:00:00 2001
From: Allen Nelson <anelson@narrativescience.com>
Date: Mon, 25 Apr 2016 11:48:47 -0500
Subject: [PATCH 047/287] gnum4: disable tests

---
 pkgs/development/tools/misc/gnum4/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix
index 7216e1e169d0..eda98091fc64 100644
--- a/pkgs/development/tools/misc/gnum4/default.nix
+++ b/pkgs/development/tools/misc/gnum4/default.nix
@@ -8,10 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "0w0da1chh12mczxa5lnwzjk9czi3dq6gnnndbpa6w4rj76b1yklf";
   };
 
-  doCheck = !stdenv.isDarwin
-    && !stdenv.isCygwin                    # XXX: `test-dup2' fails on Cygwin
-    && !stdenv.isSunOS                     # XXX: `test-setlocale2.sh' fails
-    && !stdenv.isFreeBSD;                  # XXX: test 084 fails
+  doCheck = false;
 
   configureFlags = "--with-syscmd-shell=${stdenv.shell}";
 

From eb604134f7fdd95c78d7979e826cd165b1f627f2 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 21 Apr 2016 10:32:21 -0500
Subject: [PATCH 048/287] kde5_latest.frameworks: 5.19 -> 5.21

---
 .../desktops/kde-5/frameworks-5.21/attica.nix |  11 +
 pkgs/desktops/kde-5/frameworks-5.21/baloo.nix |  25 +
 .../kde-5/frameworks-5.21/bluez-qt.nix        |  17 +
 .../kde-5/frameworks-5.21/breeze-icons.nix    |  10 +
 .../kde-5/frameworks-5.21/default.nix         | 121 ++++
 .../extra-cmake-modules/default.nix           |  20 +
 .../extra-cmake-modules/nix-lib-path.patch    |  37 ++
 .../extra-cmake-modules/series                |   1 +
 .../extra-cmake-modules/setup-hook.sh         |  80 +++
 .../kde-5/frameworks-5.21/fetchsrcs.sh        |  57 ++
 .../frameworks-5.21/frameworkintegration.nix  |  17 +
 .../frameworks-5.21/kactivities-stats.nix     |   9 +
 .../kde-5/frameworks-5.21/kactivities.nix     |  19 +
 .../kde-5/frameworks-5.21/kapidox.nix         |  12 +
 .../kde-5/frameworks-5.21/karchive.nix        |  11 +
 .../kauth/cmake-install-paths.patch           |  17 +
 .../kde-5/frameworks-5.21/kauth/default.nix   |  16 +
 .../kauth/kauth-policy-install.patch          |  13 +
 .../kde-5/frameworks-5.21/kauth/series        |   1 +
 .../kde-5/frameworks-5.21/kbookmarks.nix      |  25 +
 .../0001-qdiriterator-follow-symlinks.patch   |  25 +
 .../frameworks-5.21/kcmutils/default.nix      |  17 +
 .../kde-5/frameworks-5.21/kcodecs.nix         |  11 +
 .../kde-5/frameworks-5.21/kcompletion.nix     |  14 +
 .../kde-5/frameworks-5.21/kconfig.nix         |  16 +
 .../0001-qdiriterator-follow-symlinks.patch   |  25 +
 .../kconfigwidgets/default.nix                |  18 +
 .../kde-5/frameworks-5.21/kcoreaddons.nix     |  16 +
 .../desktops/kde-5/frameworks-5.21/kcrash.nix |  16 +
 .../kde-5/frameworks-5.21/kdbusaddons.nix     |  17 +
 .../kde-5/frameworks-5.21/kdeclarative.nix    |  22 +
 pkgs/desktops/kde-5/frameworks-5.21/kded.nix  |  19 +
 .../kde-5/frameworks-5.21/kdelibs4support.nix |  32 +
 .../kdelibs4support/default.nix               |  36 ++
 .../kdelibs4support/nix-kde-include-dir.patch |  13 +
 .../frameworks-5.21/kdelibs4support/series    |   1 +
 .../kdelibs4support/setup-hook.sh             |   1 +
 .../kde-5/frameworks-5.21/kdesignerplugin.nix |  34 ++
 pkgs/desktops/kde-5/frameworks-5.21/kdesu.nix |  13 +
 .../kde-5/frameworks-5.21/kdewebkit.nix       |  13 +
 .../desktops/kde-5/frameworks-5.21/kdnssd.nix |  13 +
 .../frameworks-5.21/kdoctools/default.nix     |  19 +
 .../kdoctools-no-find-docbook-xml.patch       |  12 +
 .../frameworks-5.21/kdoctools/setup-hook.sh   |   5 +
 .../kde-5/frameworks-5.21/kemoticons.nix      |  17 +
 .../kde-5/frameworks-5.21/kfilemetadata.nix   |  13 +
 .../kfilemetadata/cmake-install-paths.patch   |  13 +
 .../frameworks-5.21/kfilemetadata/default.nix |  14 +
 .../frameworks-5.21/kfilemetadata/series      |   1 +
 .../kde-5/frameworks-5.21/kglobalaccel.nix    |  23 +
 .../kde-5/frameworks-5.21/kguiaddons.nix      |  13 +
 pkgs/desktops/kde-5/frameworks-5.21/khtml.nix |  21 +
 pkgs/desktops/kde-5/frameworks-5.21/ki18n.nix |  17 +
 .../kiconthemes/default-theme-breeze.patch    |  13 +
 .../frameworks-5.21/kiconthemes/default.nix   |  18 +
 .../kde-5/frameworks-5.21/kiconthemes/series  |   1 +
 .../kde-5/frameworks-5.21/kidletime.nix       |  15 +
 .../kde-5/frameworks-5.21/kimageformats.nix   |  13 +
 .../kde-5/frameworks-5.21/kinit/default.nix   |  17 +
 .../frameworks-5.21/kinit/kinit-libpath.patch |  34 ++
 .../kde-5/frameworks-5.21/kinit/series        |   1 +
 .../kde-5/frameworks-5.21/kio/default.nix     |  33 +
 .../kio/samba-search-path.patch               |  28 +
 .../desktops/kde-5/frameworks-5.21/kio/series |   1 +
 .../kde-5/frameworks-5.21/kitemmodels.nix     |  11 +
 .../kde-5/frameworks-5.21/kitemviews.nix      |  11 +
 .../kde-5/frameworks-5.21/kjobwidgets.nix     |  16 +
 pkgs/desktops/kde-5/frameworks-5.21/kjs.nix   |  16 +
 .../kde-5/frameworks-5.21/kjsembed.nix        |  17 +
 .../kde-5/frameworks-5.21/kmediaplayer.nix    |  15 +
 .../kde-5/frameworks-5.21/knewstuff.nix       |  17 +
 .../kde-5/frameworks-5.21/knotifications.nix  |  21 +
 .../kde-5/frameworks-5.21/knotifyconfig.nix   |  13 +
 .../kpackage/allow-external-paths.patch       |  13 +
 .../frameworks-5.21/kpackage/default.nix      |  23 +
 .../qdiriterator-follow-symlinks.patch        |  26 +
 .../kde-5/frameworks-5.21/kpackage/series     |   2 +
 .../desktops/kde-5/frameworks-5.21/kparts.nix |  17 +
 .../kde-5/frameworks-5.21/kpeople.nix         |  15 +
 .../kde-5/frameworks-5.21/kplotting.nix       |  11 +
 pkgs/desktops/kde-5/frameworks-5.21/kpty.nix  |  10 +
 pkgs/desktops/kde-5/frameworks-5.21/kross.nix |  14 +
 .../kde-5/frameworks-5.21/krunner.nix         |  16 +
 .../0001-qdiriterator-follow-symlinks.patch   |  25 +
 .../kservice/0002-no-canonicalize-path.patch  |  25 +
 .../frameworks-5.21/kservice/default.nix      |  18 +
 .../frameworks-5.21/kservice/setup-hook.sh    |  43 ++
 .../frameworks-5.21/ktexteditor/default.nix   |  22 +
 .../ktexteditor/no-qcoreapplication.patch     |  36 ++
 .../kde-5/frameworks-5.21/ktexteditor/series  |   1 +
 .../kde-5/frameworks-5.21/ktextwidgets.nix    |  16 +
 .../kde-5/frameworks-5.21/kunitconversion.nix |  10 +
 .../kde-5/frameworks-5.21/kwallet.nix         |  21 +
 .../kde-5/frameworks-5.21/kwidgetsaddons.nix  |  11 +
 .../kde-5/frameworks-5.21/kwindowsystem.nix   |  13 +
 .../kde-5/frameworks-5.21/kxmlgui.nix         |  18 +
 .../kde-5/frameworks-5.21/kxmlrpcclient.nix   |  10 +
 .../kde-5/frameworks-5.21/modemmanager-qt.nix |  13 +
 .../frameworks-5.21/networkmanager-qt.nix     |  13 +
 .../kde-5/frameworks-5.21/oxygen-icons5.nix   |  13 +
 .../plasma-framework/default.nix              |  25 +
 pkgs/desktops/kde-5/frameworks-5.21/solid.nix |  17 +
 .../desktops/kde-5/frameworks-5.21/sonnet.nix |  13 +
 pkgs/desktops/kde-5/frameworks-5.21/srcs.nix  | 573 ++++++++++++++++++
 .../kde-5/frameworks-5.21/threadweaver.nix    |  11 +
 pkgs/top-level/all-packages.nix               |   2 +-
 106 files changed, 2465 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/attica.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/baloo.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/bluez-qt.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/breeze-icons.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/default.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/extra-cmake-modules/default.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/extra-cmake-modules/nix-lib-path.patch
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/extra-cmake-modules/series
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/extra-cmake-modules/setup-hook.sh
 create mode 100755 pkgs/desktops/kde-5/frameworks-5.21/fetchsrcs.sh
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/frameworkintegration.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kactivities-stats.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kactivities.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kapidox.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/karchive.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kauth/cmake-install-paths.patch
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kauth/default.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kauth/kauth-policy-install.patch
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kauth/series
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kbookmarks.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kcmutils/0001-qdiriterator-follow-symlinks.patch
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kcmutils/default.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kcodecs.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kcompletion.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kconfig.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kconfigwidgets/default.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kcoreaddons.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kcrash.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kdbusaddons.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kdeclarative.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kded.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support/default.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support/nix-kde-include-dir.patch
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support/series
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support/setup-hook.sh
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kdesignerplugin.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kdesu.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kdewebkit.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kdnssd.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kdoctools/default.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kdoctools/kdoctools-no-find-docbook-xml.patch
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kdoctools/setup-hook.sh
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kemoticons.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kfilemetadata.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kfilemetadata/cmake-install-paths.patch
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kfilemetadata/default.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kfilemetadata/series
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kglobalaccel.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kguiaddons.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/khtml.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/ki18n.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kiconthemes/default-theme-breeze.patch
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kiconthemes/default.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kiconthemes/series
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kidletime.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kimageformats.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kinit/default.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kinit/kinit-libpath.patch
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kinit/series
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kio/default.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kio/samba-search-path.patch
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kio/series
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kitemmodels.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kitemviews.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kjobwidgets.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kjs.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kjsembed.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kmediaplayer.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/knewstuff.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/knotifications.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/knotifyconfig.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kpackage/allow-external-paths.patch
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kpackage/default.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kpackage/qdiriterator-follow-symlinks.patch
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kpackage/series
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kparts.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kpeople.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kplotting.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kpty.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kross.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/krunner.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kservice/0001-qdiriterator-follow-symlinks.patch
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kservice/0002-no-canonicalize-path.patch
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kservice/default.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kservice/setup-hook.sh
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/ktexteditor/default.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/ktexteditor/no-qcoreapplication.patch
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/ktexteditor/series
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/ktextwidgets.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kunitconversion.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kwallet.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kwidgetsaddons.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kwindowsystem.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kxmlgui.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kxmlrpcclient.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/modemmanager-qt.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/networkmanager-qt.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/oxygen-icons5.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/plasma-framework/default.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/solid.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/sonnet.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/srcs.nix
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/threadweaver.nix

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/attica.nix b/pkgs/desktops/kde-5/frameworks-5.21/attica.nix
new file mode 100644
index 000000000000..98721876c120
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/attica.nix
@@ -0,0 +1,11 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+}:
+
+kdeFramework {
+  name = "attica";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/baloo.nix b/pkgs/desktops/kde-5/frameworks-5.21/baloo.nix
new file mode 100644
index 000000000000..38c41d9271d8
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/baloo.nix
@@ -0,0 +1,25 @@
+{ kdeFramework, lib, extra-cmake-modules, kauth, kconfig
+, kcoreaddons, kcrash, kdbusaddons, kfilemetadata, ki18n, kidletime
+, kio, lmdb, makeQtWrapper, qtbase, qtquick1, solid
+}:
+
+kdeFramework {
+  name = "baloo";
+  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
+  buildInputs = [
+    kconfig kcrash kdbusaddons lmdb qtquick1 solid
+  ];
+  propagatedBuildInputs = [
+    kauth kcoreaddons kfilemetadata ki18n kio kidletime qtbase
+  ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/baloo_file"
+    wrapQtProgram "$out/bin/baloo_file_extractor"
+    wrapQtProgram "$out/bin/balooctl"
+    wrapQtProgram "$out/bin/baloosearch"
+    wrapQtProgram "$out/bin/balooshow"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/bluez-qt.nix b/pkgs/desktops/kde-5/frameworks-5.21/bluez-qt.nix
new file mode 100644
index 000000000000..f981b0516f72
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/bluez-qt.nix
@@ -0,0 +1,17 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, qtdeclarative
+}:
+
+kdeFramework {
+  name = "bluez-qt";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ qtdeclarative ];
+  preConfigure = ''
+    substituteInPlace CMakeLists.txt \
+      --replace /lib/udev/rules.d "$out/lib/udev/rules.d"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/breeze-icons.nix b/pkgs/desktops/kde-5/frameworks-5.21/breeze-icons.nix
new file mode 100644
index 000000000000..44cc99daf261
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/breeze-icons.nix
@@ -0,0 +1,10 @@
+{ kdeFramework
+, extra-cmake-modules
+, qtsvg
+}:
+
+kdeFramework {
+  name = "breeze-icons";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ qtsvg ];
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/default.nix b/pkgs/desktops/kde-5/frameworks-5.21/default.nix
new file mode 100644
index 000000000000..e88538a78b32
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/default.nix
@@ -0,0 +1,121 @@
+# Maintainer's Notes:
+#
+# Minor updates:
+#  1. Edit ./fetchsrcs.sh to point to the updated URL.
+#  2. Run ./fetchsrcs.sh.
+#  3. Build and enjoy.
+#
+# Major updates:
+#  We prefer not to immediately overwrite older versions with major updates, so
+#  make a copy of this directory first. After copying, be sure to delete ./tmp
+#  if it exists. Then follow the minor update instructions. Be sure to check if
+#  any new components have been added and package them as necessary.
+
+{ pkgs, debug ? false }:
+
+let
+
+  inherit (pkgs) lib makeSetupHook stdenv;
+
+  mirror = "mirror://kde";
+  srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; };
+
+  packages = self: with self; {
+    kdeFramework = args:
+      let
+        inherit (args) name;
+        inherit (srcs."${name}") src version;
+      in stdenv.mkDerivation (args // {
+        name = "${name}-${version}";
+        inherit src;
+
+        outputs = args.outputs or [ "dev" "out" ];
+
+        cmakeFlags =
+          (args.cmakeFlags or [])
+          ++ [ "-DBUILD_TESTING=OFF" ]
+          ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug";
+
+        meta = {
+          license = with lib.licenses; [
+            lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
+          ];
+          platforms = lib.platforms.linux;
+          homepage = "http://www.kde.org";
+        } // (args.meta or {});
+      });
+
+    attica = callPackage ./attica.nix {};
+    baloo = callPackage ./baloo.nix {};
+    bluez-qt = callPackage ./bluez-qt.nix {};
+    breeze-icons = callPackage ./breeze-icons.nix {};
+    extra-cmake-modules = callPackage ./extra-cmake-modules {};
+    frameworkintegration = callPackage ./frameworkintegration.nix {};
+    kactivities = callPackage ./kactivities.nix {};
+    kactivities-stats = callPackage ./kactivities-stats.nix {};
+    kapidox = callPackage ./kapidox.nix {};
+    karchive = callPackage ./karchive.nix {};
+    kauth = callPackage ./kauth {};
+    kbookmarks = callPackage ./kbookmarks.nix {};
+    kcmutils = callPackage ./kcmutils {};
+    kcodecs = callPackage ./kcodecs.nix {};
+    kcompletion = callPackage ./kcompletion.nix {};
+    kconfig = callPackage ./kconfig.nix {};
+    kconfigwidgets = callPackage ./kconfigwidgets {};
+    kcoreaddons = callPackage ./kcoreaddons.nix {};
+    kcrash = callPackage ./kcrash.nix {};
+    kdbusaddons = callPackage ./kdbusaddons.nix {};
+    kdeclarative = callPackage ./kdeclarative.nix {};
+    kded = callPackage ./kded.nix {};
+    kdelibs4support = callPackage ./kdelibs4support {};
+    kdesignerplugin = callPackage ./kdesignerplugin.nix {};
+    kdesu = callPackage ./kdesu.nix {};
+    kdewebkit = callPackage ./kdewebkit.nix {};
+    kdnssd = callPackage ./kdnssd.nix {};
+    kdoctools = callPackage ./kdoctools {};
+    kemoticons = callPackage ./kemoticons.nix {};
+    kfilemetadata = callPackage ./kfilemetadata {};
+    kglobalaccel = callPackage ./kglobalaccel.nix {};
+    kguiaddons = callPackage ./kguiaddons.nix {};
+    khtml = callPackage ./khtml.nix {};
+    ki18n = callPackage ./ki18n.nix {};
+    kiconthemes = callPackage ./kiconthemes {};
+    kidletime = callPackage ./kidletime.nix {};
+    kimageformats = callPackage ./kimageformats.nix {};
+    kinit = callPackage ./kinit {};
+    kio = callPackage ./kio {};
+    kitemmodels = callPackage ./kitemmodels.nix {};
+    kitemviews = callPackage ./kitemviews.nix {};
+    kjobwidgets = callPackage ./kjobwidgets.nix {};
+    kjs = callPackage ./kjs.nix {};
+    kjsembed = callPackage ./kjsembed.nix {};
+    kmediaplayer = callPackage ./kmediaplayer.nix {};
+    knewstuff = callPackage ./knewstuff.nix {};
+    knotifications = callPackage ./knotifications.nix {};
+    knotifyconfig = callPackage ./knotifyconfig.nix {};
+    kpackage = callPackage ./kpackage {};
+    kparts = callPackage ./kparts.nix {};
+    kpeople = callPackage ./kpeople.nix {};
+    kplotting = callPackage ./kplotting.nix {};
+    kpty = callPackage ./kpty.nix {};
+    kross = callPackage ./kross.nix {};
+    krunner = callPackage ./krunner.nix {};
+    kservice = callPackage ./kservice {};
+    ktexteditor = callPackage ./ktexteditor {};
+    ktextwidgets = callPackage ./ktextwidgets.nix {};
+    kunitconversion = callPackage ./kunitconversion.nix {};
+    kwallet = callPackage ./kwallet.nix {};
+    kwidgetsaddons = callPackage ./kwidgetsaddons.nix {};
+    kwindowsystem = callPackage ./kwindowsystem.nix {};
+    kxmlgui = callPackage ./kxmlgui.nix {};
+    kxmlrpcclient = callPackage ./kxmlrpcclient.nix {};
+    modemmanager-qt = callPackage ./modemmanager-qt.nix {};
+    networkmanager-qt = callPackage ./networkmanager-qt.nix {};
+    oxygen-icons5 = callPackage ./oxygen-icons5.nix {};
+    plasma-framework = callPackage ./plasma-framework {};
+    solid = callPackage ./solid.nix {};
+    sonnet = callPackage ./sonnet.nix {};
+    threadweaver = callPackage ./threadweaver.nix {};
+  };
+
+in packages
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/extra-cmake-modules/default.nix b/pkgs/desktops/kde-5/frameworks-5.21/extra-cmake-modules/default.nix
new file mode 100644
index 000000000000..1c2ea70442d3
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/extra-cmake-modules/default.nix
@@ -0,0 +1,20 @@
+{ kdeFramework, lib, copyPathsToStore, cmake, pkgconfig, qttools }:
+
+kdeFramework {
+  name = "extra-cmake-modules";
+
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
+
+  outputs = [ "out" ];  # this package has no runtime components
+  setupHook = ./setup-hook.sh;
+
+  # It is OK to propagate these inputs as long as
+  # extra-cmake-modules is never a propagated input
+  # of some other derivation.
+  propagatedNativeBuildInputs = [ cmake pkgconfig qttools ];
+
+  meta = with lib; {
+    license = licenses.bsd2;
+    maintainers = [ maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/extra-cmake-modules/nix-lib-path.patch b/pkgs/desktops/kde-5/frameworks-5.21/extra-cmake-modules/nix-lib-path.patch
new file mode 100644
index 000000000000..a74340a6dc96
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/extra-cmake-modules/nix-lib-path.patch
@@ -0,0 +1,37 @@
+Index: extra-cmake-modules-5.18.0/kde-modules/KDEInstallDirs.cmake
+===================================================================
+--- extra-cmake-modules-5.18.0.orig/kde-modules/KDEInstallDirs.cmake
++++ extra-cmake-modules-5.18.0/kde-modules/KDEInstallDirs.cmake
+@@ -200,32 +200,6 @@
+ # GNUInstallDirs code deals with re-configuring, but that is dealt with
+ # by the _define_* macros in this module).
+ set(_LIBDIR_DEFAULT "lib")
+-# Override this default 'lib' with 'lib64' iff:
+-#  - we are on a Linux, kFreeBSD or Hurd system but NOT cross-compiling
+-#  - we are NOT on debian
+-#  - we are on a 64 bits system
+-# reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf
+-# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if
+-# CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu"
+-# See http://wiki.debian.org/Multiarch
+-if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU")
+-   AND NOT CMAKE_CROSSCOMPILING)
+-  if (EXISTS "/etc/debian_version") # is this a debian system ?
+-    if(CMAKE_LIBRARY_ARCHITECTURE)
+-      set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
+-    endif()
+-  else() # not debian, rely on CMAKE_SIZEOF_VOID_P:
+-    if(NOT DEFINED CMAKE_SIZEOF_VOID_P)
+-      message(AUTHOR_WARNING
+-        "Unable to determine default LIB_INSTALL_LIBDIR directory because no target architecture is known. "
+-        "Please enable at least one language before including KDEInstallDirs.")
+-    else()
+-      if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+-        set(_LIBDIR_DEFAULT "lib64")
+-      endif()
+-    endif()
+-  endif()
+-endif()
+ 
+ set(_gnu_install_dirs_vars
+     BINDIR
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/extra-cmake-modules/series b/pkgs/desktops/kde-5/frameworks-5.21/extra-cmake-modules/series
new file mode 100644
index 000000000000..b4569e50a5f7
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/extra-cmake-modules/series
@@ -0,0 +1 @@
+nix-lib-path.patch
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/extra-cmake-modules/setup-hook.sh b/pkgs/desktops/kde-5/frameworks-5.21/extra-cmake-modules/setup-hook.sh
new file mode 100644
index 000000000000..193cb048949a
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/extra-cmake-modules/setup-hook.sh
@@ -0,0 +1,80 @@
+_ecmSetXdgDirs() {
+    addToSearchPathOnce XDG_DATA_DIRS "$1/share"
+    addToSearchPathOnce XDG_CONFIG_DIRS "$1/etc/xdg"
+    addToSearchPathOnce NIX_WRAP_XDG_CONFIG_DIRS "$1/etc/xdg"
+}
+
+_ecmPropagateSharedData() {
+    local sharedPaths=( \
+        "config.cfg" \
+        "kconf_update" \
+        "kservices5" \
+        "kservicetypes5" \
+        "kxmlgui5" \
+        "knotifications5" \
+        "icons" \
+        "sounds" \
+        "templates" \
+        "wallpapers" \
+        "applications" \
+        "desktop-directories" \
+        "mime" \
+        "dbus-1" \
+        "interfaces" \
+        "services" \
+        "system-services" )
+    for dir in ${sharedPaths[@]}; do
+        if [ -d "$1/share/$dir" ]; then
+            addToSearchPathOnce NIX_WRAP_XDG_DATA_DIRS "$1/share"
+            propagateOnce propagatedBuildInputs "$1"
+            propagateOnce propagatedUserEnvPkgs "$1"
+            break
+        fi
+    done
+}
+
+_ecmConfig() {
+    # Because we need to use absolute paths here, we must set *all* the paths.
+    cmakeFlags+=" -DKDE_INSTALL_EXECROOTDIR=${!outputBin}"
+    cmakeFlags+=" -DKDE_INSTALL_BINDIR=${!outputBin}/bin"
+    cmakeFlags+=" -DKDE_INSTALL_SBINDIR=${!outputBin}/sbin"
+    cmakeFlags+=" -DKDE_INSTALL_LIBDIR=${!outputLib}/lib"
+    cmakeFlags+=" -DKDE_INSTALL_LIBEXECDIR=${!outputLib}/lib/libexec"
+    cmakeFlags+=" -DKDE_INSTALL_CMAKEPACKAGEDIR=${!outputDev}/lib/cmake"
+    cmakeFlags+=" -DKDE_INSTALL_QTPLUGINDIR=${!outputLib}/lib/qt5/plugins"
+    cmakeFlags+=" -DKDE_INSTALL_PLUGINDIR=${!outputLib}/lib/qt5/plugins"
+    cmakeFlags+=" -DKDE_INSTALL_QTQUICKIMPORTSDIR=${!outputLib}/lib/qt5/imports"
+    cmakeFlags+=" -DKDE_INSTALL_QMLDIR=${!outputLib}/lib/qt5/qml"
+    cmakeFlags+=" -DKDE_INSTALL_INCLUDEDIR=${!outputInclude}/include"
+    cmakeFlags+=" -DKDE_INSTALL_LOCALSTATEDIR=/var"
+    cmakeFlags+=" -DKDE_INSTALL_DATAROOTDIR=${!outputLib}/share"
+    cmakeFlags+=" -DKDE_INSTALL_DATADIR=${!outputLib}/share"
+    cmakeFlags+=" -DKDE_INSTALL_DOCBUNDLEDIR=${!outputLib}/share/doc/HTML"
+    cmakeFlags+=" -DKDE_INSTALL_KCFGDIR=${!outputLib}/share/config.kcfg"
+    cmakeFlags+=" -DKDE_INSTALL_KCONFUPDATEDIR=${!outputLib}/share/kconf_update"
+    cmakeFlags+=" -DKDE_INSTALL_KSERVICES5DIR=${!outputLib}/share/kservices5"
+    cmakeFlags+=" -DKDE_INSTALL_KSERVICETYPES5DIR=${!outputLib}/share/kservicetypes5"
+    cmakeFlags+=" -DKDE_INSTALL_KXMLGUI5DIR=${!outputLib}/share/kxmlgui5"
+    cmakeFlags+=" -DKDE_INSTALL_KNOTIFY5RCDIR=${!outputLib}/share/knotifications5"
+    cmakeFlags+=" -DKDE_INSTALL_ICONDIR=${!outputLib}/share/icons"
+    cmakeFlags+=" -DKDE_INSTALL_LOCALEDIR=${!outputLib}/share/locale"
+    cmakeFlags+=" -DKDE_INSTALL_SOUNDDIR=${!outputLib}/share/sounds"
+    cmakeFlags+=" -DKDE_INSTALL_TEMPLATEDIR=${!outputLib}/share/templates"
+    cmakeFlags+=" -DKDE_INSTALL_WALLPAPERDIR=${!outputLib}/share/wallpapers"
+    cmakeFlags+=" -DKDE_INSTALL_APPDIR=${!outputLib}/share/applications"
+    cmakeFlags+=" -DKDE_INSTALL_DESKTOPDIR=${!outputLib}/share/desktop-directories"
+    cmakeFlags+=" -DKDE_INSTALL_MIMEDIR=${!outputLib}/share/mime/packages"
+    cmakeFlags+=" -DKDE_INSTALL_METAINFODIR=${!outputLib}/share/appdata"
+    cmakeFlags+=" -DKDE_INSTALL_MANDIR=${!outputLib}/share/man"
+    cmakeFlags+=" -DKDE_INSTALL_INFODIR=${!outputLib}/share/info"
+    cmakeFlags+=" -DKDE_INSTALL_DBUSDIR=${!outputLib}/share/dbus-1"
+    cmakeFlags+=" -DKDE_INSTALL_DBUSINTERFACEDIR=${!outputLib}/share/dbus-1/interfaces"
+    cmakeFlags+=" -DKDE_INSTALL_DBUSSERVICEDIR=${!outputLib}/share/dbus-1/services"
+    cmakeFlags+=" -DKDE_INSTALL_DBUSSYSTEMSERVICEDIR=${!outputLib}/share/dbus-1/system-services"
+    cmakeFlags+=" -DKDE_INSTALL_SYSCONFDIR=${!outputLib}/etc"
+    cmakeFlags+=" -DKDE_INSTALL_CONFDIR=${!outputLib}/etc/xdg"
+    cmakeFlags+=" -DKDE_INSTALL_AUTOSTARTDIR=${!outputLib}/etc/xdg/autostart"
+}
+
+envHooks+=(_ecmSetXdgDirs _ecmPropagateSharedData)
+preConfigureHooks+=(_ecmConfig)
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/fetchsrcs.sh b/pkgs/desktops/kde-5/frameworks-5.21/fetchsrcs.sh
new file mode 100755
index 000000000000..dde749b218c0
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/fetchsrcs.sh
@@ -0,0 +1,57 @@
+#! /usr/bin/env nix-shell
+#! nix-shell -i bash -p coreutils findutils gnused nix wget
+
+set -x
+
+# The trailing slash at the end is necessary!
+RELEASE_URL="http://download.kde.org/stable/frameworks/5.21/"
+EXTRA_WGET_ARGS='-A *.tar.xz'
+
+mkdir tmp; cd tmp
+
+rm -f ../srcs.csv
+
+wget -nH -r -c --no-parent $RELEASE_URL $EXTRA_WGET_ARGS
+
+find . | while read src; do
+    if [[ -f "${src}" ]]; then
+        # Sanitize file name
+        filename=$(basename "$src" | tr '@' '_')
+        nameVersion="${filename%.tar.*}"
+        name=$(echo "$nameVersion" | sed -e 's,-[[:digit:]].*,,' | sed -e 's,-opensource-src$,,')
+        version=$(echo "$nameVersion" | sed -e 's,^\([[:alpha:]][[:alnum:]]*-\)\+,,')
+        echo "$name,$version,$src,$filename" >>../srcs.csv
+    fi
+done
+
+cat >../srcs.nix <<EOF
+# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
+{ fetchurl, mirror }:
+
+{
+EOF
+
+gawk -F , "{ print \$1 }" ../srcs.csv | sort | uniq | while read name; do
+    versions=$(gawk -F , "/^$name,/ { print \$2 }" ../srcs.csv)
+    latestVersion=$(echo "$versions" | sort -rV | head -n 1)
+    src=$(gawk -F , "/^$name,$latestVersion,/ { print \$3 }" ../srcs.csv)
+    filename=$(gawk -F , "/^$name,$latestVersion,/ { print \$4 }" ../srcs.csv)
+    url="${src:2}"
+    sha256=$(nix-hash --type sha256 --base32 --flat "$src")
+    cat >>../srcs.nix <<EOF
+  $name = {
+    version = "$latestVersion";
+    src = fetchurl {
+      url = "\${mirror}/$url";
+      sha256 = "$sha256";
+      name = "$filename";
+    };
+  };
+EOF
+done
+
+echo "}" >>../srcs.nix
+
+rm -f ../srcs.csv
+
+cd ..
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/frameworkintegration.nix b/pkgs/desktops/kde-5/frameworks-5.21/frameworkintegration.nix
new file mode 100644
index 000000000000..26987c385ad5
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/frameworkintegration.nix
@@ -0,0 +1,17 @@
+{ kdeFramework, lib, extra-cmake-modules, kbookmarks, kcompletion
+, kconfig, kconfigwidgets, ki18n, kiconthemes, kio, knotifications
+, kwidgetsaddons, libXcursor, qtx11extras
+}:
+
+kdeFramework {
+  name = "frameworkintegration";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [
+    kbookmarks kcompletion kconfig knotifications kwidgetsaddons
+    libXcursor
+  ];
+  propagatedBuildInputs = [ kconfigwidgets ki18n kio kiconthemes qtx11extras ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kactivities-stats.nix b/pkgs/desktops/kde-5/frameworks-5.21/kactivities-stats.nix
new file mode 100644
index 000000000000..c8405ce31b08
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kactivities-stats.nix
@@ -0,0 +1,9 @@
+{ kdeFramework, lib, extra-cmake-modules
+, boost, kactivities, kconfig }:
+
+kdeFramework {
+  name = "kactivities-stats";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ boost kactivities kconfig ];
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kactivities.nix b/pkgs/desktops/kde-5/frameworks-5.21/kactivities.nix
new file mode 100644
index 000000000000..7c01073e078d
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kactivities.nix
@@ -0,0 +1,19 @@
+{ kdeFramework, lib, extra-cmake-modules, boost, kcmutils, kconfig
+, kcoreaddons, kdbusaddons, kdeclarative, kglobalaccel, ki18n
+, kio, kservice, kwindowsystem, kxmlgui, qtdeclarative
+}:
+
+kdeFramework {
+  name = "kactivities";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [
+    boost kcmutils kconfig kcoreaddons kdbusaddons kservice
+    kxmlgui
+  ];
+  propagatedBuildInputs = [
+    kdeclarative kglobalaccel ki18n kio kwindowsystem qtdeclarative
+  ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kapidox.nix b/pkgs/desktops/kde-5/frameworks-5.21/kapidox.nix
new file mode 100644
index 000000000000..647be8f052c3
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kapidox.nix
@@ -0,0 +1,12 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, python
+}:
+
+kdeFramework {
+  name = "kapidox";
+  nativeBuildInputs = [ extra-cmake-modules python ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/karchive.nix b/pkgs/desktops/kde-5/frameworks-5.21/karchive.nix
new file mode 100644
index 000000000000..a8d9a0003c3b
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/karchive.nix
@@ -0,0 +1,11 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+}:
+
+kdeFramework {
+  name = "karchive";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kauth/cmake-install-paths.patch b/pkgs/desktops/kde-5/frameworks-5.21/kauth/cmake-install-paths.patch
new file mode 100644
index 000000000000..c66f5ecd008f
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kauth/cmake-install-paths.patch
@@ -0,0 +1,17 @@
+Index: kauth-5.18.0/KF5AuthConfig.cmake.in
+===================================================================
+--- kauth-5.18.0.orig/KF5AuthConfig.cmake.in
++++ kauth-5.18.0/KF5AuthConfig.cmake.in
+@@ -4,9 +4,9 @@ set(KAUTH_STUB_FILES_DIR "@PACKAGE_KDE_I
+ 
+ set(KAUTH_BACKEND_NAME "@KAUTH_BACKEND_NAME@")
+ set(KAUTH_HELPER_BACKEND_NAME "@KAUTH_HELPER_BACKEND_NAME@")
+-set(KAUTH_POLICY_FILES_INSTALL_DIR "@KAUTH_POLICY_FILES_INSTALL_DIR@")
+-set(KAUTH_HELPER_INSTALL_DIR "@KAUTH_HELPER_INSTALL_DIR@")
+-set(KAUTH_HELPER_INSTALL_ABSOLUTE_DIR "@KAUTH_HELPER_INSTALL_ABSOLUTE_DIR@")
++set(KAUTH_POLICY_FILES_INSTALL_DIR "${KDE_INSTALL_DATADIR}/polkit-1/actions")
++set(KAUTH_HELPER_INSTALL_DIR "${KDE_INSTALL_LIBEXECDIR}")
++set(KAUTH_HELPER_INSTALL_ABSOLUTE_DIR "${KDE_INSTALL_LIBEXECDIR}")
+ 
+ find_dependency(KF5CoreAddons "@KF5_DEP_VERSION@")
+ 
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kauth/default.nix b/pkgs/desktops/kde-5/frameworks-5.21/kauth/default.nix
new file mode 100644
index 000000000000..1352d8c5821f
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kauth/default.nix
@@ -0,0 +1,16 @@
+{ kdeFramework, lib, copyPathsToStore
+, extra-cmake-modules
+, kcoreaddons
+, polkit-qt
+}:
+
+kdeFramework {
+  name = "kauth";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ polkit-qt ];
+  propagatedBuildInputs = [ kcoreaddons ];
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kauth/kauth-policy-install.patch b/pkgs/desktops/kde-5/frameworks-5.21/kauth/kauth-policy-install.patch
new file mode 100644
index 000000000000..340155256f28
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kauth/kauth-policy-install.patch
@@ -0,0 +1,13 @@
+diff --git a/KF5AuthConfig.cmake.in b/KF5AuthConfig.cmake.in
+index e859ec7..9a8ab18 100644
+--- a/KF5AuthConfig.cmake.in
++++ b/KF5AuthConfig.cmake.in
+@@ -4,7 +4,7 @@ set(KAUTH_STUB_FILES_DIR "${PACKAGE_PREFIX_DIR}/@KF5_DATA_INSTALL_DIR@/kauth/")
+ 
+ set(KAUTH_BACKEND_NAME "@KAUTH_BACKEND_NAME@")
+ set(KAUTH_HELPER_BACKEND_NAME "@KAUTH_HELPER_BACKEND_NAME@")
+-set(KAUTH_POLICY_FILES_INSTALL_DIR "@KAUTH_POLICY_FILES_INSTALL_DIR@")
++set(KAUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions")
+ set(KAUTH_HELPER_INSTALL_DIR "@KAUTH_HELPER_INSTALL_DIR@")
+ 
+ find_dependency(KF5CoreAddons "@KF5_DEP_VERSION@")
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kauth/series b/pkgs/desktops/kde-5/frameworks-5.21/kauth/series
new file mode 100644
index 000000000000..d2689425c387
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kauth/series
@@ -0,0 +1 @@
+cmake-install-paths.patch
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kbookmarks.nix b/pkgs/desktops/kde-5/frameworks-5.21/kbookmarks.nix
new file mode 100644
index 000000000000..1a469ab4db6d
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kbookmarks.nix
@@ -0,0 +1,25 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, kcodecs
+, kconfig
+, kconfigwidgets
+, kcoreaddons
+, kiconthemes
+, kxmlgui
+}:
+
+kdeFramework {
+  name = "kbookmarks";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [
+    kcodecs
+    kconfig
+    kconfigwidgets
+    kcoreaddons
+    kiconthemes
+    kxmlgui
+  ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kcmutils/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/frameworks-5.21/kcmutils/0001-qdiriterator-follow-symlinks.patch
new file mode 100644
index 000000000000..0d861fa95012
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kcmutils/0001-qdiriterator-follow-symlinks.patch
@@ -0,0 +1,25 @@
+From f14d2a275323a47104b33eb61c5b6910ae1a9f59 Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Wed, 14 Oct 2015 06:43:53 -0500
+Subject: [PATCH] qdiriterator follow symlinks
+
+---
+ src/kpluginselector.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/kpluginselector.cpp b/src/kpluginselector.cpp
+index 9c3431d..d6b1ee2 100644
+--- a/src/kpluginselector.cpp
++++ b/src/kpluginselector.cpp
+@@ -305,7 +305,7 @@ void KPluginSelector::addPlugins(const QString &componentName,
+     QStringList desktopFileNames;
+     const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, componentName + QStringLiteral("/kpartplugins"), QStandardPaths::LocateDirectory);
+     Q_FOREACH (const QString &dir, dirs) {
+-        QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories);
++      QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
+         while (it.hasNext()) {
+             desktopFileNames.append(it.next());
+         }
+-- 
+2.5.2
+
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kcmutils/default.nix b/pkgs/desktops/kde-5/frameworks-5.21/kcmutils/default.nix
new file mode 100644
index 000000000000..dbbb783ac615
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kcmutils/default.nix
@@ -0,0 +1,17 @@
+{ kdeFramework, lib, extra-cmake-modules, kconfigwidgets
+, kcoreaddons, kdeclarative, ki18n, kiconthemes, kitemviews
+, kpackage, kservice, kxmlgui
+}:
+
+kdeFramework {
+  name = "kcmutils";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [
+    kcoreaddons kiconthemes kitemviews kpackage kxmlgui
+  ];
+  propagatedBuildInputs = [ kconfigwidgets kdeclarative ki18n kservice ];
+  patches = [ ./0001-qdiriterator-follow-symlinks.patch ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kcodecs.nix b/pkgs/desktops/kde-5/frameworks-5.21/kcodecs.nix
new file mode 100644
index 000000000000..53a69a69b69c
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kcodecs.nix
@@ -0,0 +1,11 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+}:
+
+kdeFramework {
+  name = "kcodecs";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kcompletion.nix b/pkgs/desktops/kde-5/frameworks-5.21/kcompletion.nix
new file mode 100644
index 000000000000..e393774f16a5
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kcompletion.nix
@@ -0,0 +1,14 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, kconfig
+, kwidgetsaddons
+}:
+
+kdeFramework {
+  name = "kcompletion";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ kconfig kwidgetsaddons ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kconfig.nix b/pkgs/desktops/kde-5/frameworks-5.21/kconfig.nix
new file mode 100644
index 000000000000..e132afe59886
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kconfig.nix
@@ -0,0 +1,16 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, makeQtWrapper
+}:
+
+kdeFramework {
+  name = "kconfig";
+  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/kreadconfig5"
+    wrapQtProgram "$out/bin/kwriteconfig5"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/frameworks-5.21/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch
new file mode 100644
index 000000000000..7a6c0ee90534
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch
@@ -0,0 +1,25 @@
+From 4f84780893d505b2d62a14633dd983baa8ec6e28 Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Wed, 14 Oct 2015 06:47:01 -0500
+Subject: [PATCH] qdiriterator follow symlinks
+
+---
+ src/khelpclient.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/khelpclient.cpp b/src/khelpclient.cpp
+index 53a331e..80fbb01 100644
+--- a/src/khelpclient.cpp
++++ b/src/khelpclient.cpp
+@@ -48,7 +48,7 @@ void KHelpClient::invokeHelp(const QString &anchor, const QString &_appname)
+     QString docPath;
+     const QStringList desktopDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation);
+     Q_FOREACH (const QString &dir, desktopDirs) {
+-        QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories);
++        QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
+         while (it.hasNext()) {
+             const QString desktopPath(it.next());
+             KDesktopFile desktopFile(desktopPath);
+-- 
+2.5.2
+
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kconfigwidgets/default.nix b/pkgs/desktops/kde-5/frameworks-5.21/kconfigwidgets/default.nix
new file mode 100644
index 000000000000..3b3bd27cce08
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kconfigwidgets/default.nix
@@ -0,0 +1,18 @@
+{ kdeFramework, lib, extra-cmake-modules, kauth, kcodecs, kconfig
+, kdoctools, kguiaddons, ki18n, kwidgetsaddons, makeQtWrapper
+}:
+
+kdeFramework {
+  name = "kconfigwidgets";
+  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
+  buildInputs = [ kguiaddons ];
+  propagatedBuildInputs = [ kauth kconfig kcodecs ki18n kwidgetsaddons ];
+  patches = [ ./0001-qdiriterator-follow-symlinks.patch ];
+  postInstall = ''
+    moveToOutput "bin/preparetips5" "$dev"
+    wrapQtProgram "$dev/bin/preparetips5"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kcoreaddons.nix b/pkgs/desktops/kde-5/frameworks-5.21/kcoreaddons.nix
new file mode 100644
index 000000000000..f3a1db7bd484
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kcoreaddons.nix
@@ -0,0 +1,16 @@
+{ kdeFramework, lib, makeQtWrapper
+, extra-cmake-modules
+, shared_mime_info
+}:
+
+kdeFramework {
+  name = "kcoreaddons";
+  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
+  buildInputs = [ shared_mime_info ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/desktoptojson"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kcrash.nix b/pkgs/desktops/kde-5/frameworks-5.21/kcrash.nix
new file mode 100644
index 000000000000..bbab78ccb409
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kcrash.nix
@@ -0,0 +1,16 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, kcoreaddons
+, kwindowsystem
+, qtx11extras
+}:
+
+kdeFramework {
+  name = "kcrash";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ kcoreaddons ];
+  propagatedBuildInputs = [ kwindowsystem qtx11extras ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kdbusaddons.nix b/pkgs/desktops/kde-5/frameworks-5.21/kdbusaddons.nix
new file mode 100644
index 000000000000..d2ceab31d14b
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kdbusaddons.nix
@@ -0,0 +1,17 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, makeQtWrapper
+, qtx11extras
+}:
+
+kdeFramework {
+  name = "kdbusaddons";
+  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
+  propagatedBuildInputs = [ qtx11extras ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/kquitapp5"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kdeclarative.nix b/pkgs/desktops/kde-5/frameworks-5.21/kdeclarative.nix
new file mode 100644
index 000000000000..74d107466cfc
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kdeclarative.nix
@@ -0,0 +1,22 @@
+{ kdeFramework, lib, extra-cmake-modules, epoxy, kconfig
+, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kpackage
+, kwidgetsaddons, kwindowsystem, makeQtWrapper, pkgconfig
+, qtdeclarative
+}:
+
+kdeFramework {
+  name = "kdeclarative";
+  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
+  buildInputs = [
+    epoxy kguiaddons kiconthemes kwidgetsaddons
+  ];
+  propagatedBuildInputs = [
+    kconfig kglobalaccel ki18n kio kpackage kwindowsystem qtdeclarative
+  ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/kpackagelauncherqml"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kded.nix b/pkgs/desktops/kde-5/frameworks-5.21/kded.nix
new file mode 100644
index 000000000000..47ae2d68c68e
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kded.nix
@@ -0,0 +1,19 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, kconfig
+, kcoreaddons
+, kcrash
+, kdbusaddons
+, kdoctools
+, kinit
+, kservice
+}:
+
+kdeFramework {
+  name = "kded";
+  buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons kinit kservice ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support.nix b/pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support.nix
new file mode 100644
index 000000000000..e61c4bb86e7c
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support.nix
@@ -0,0 +1,32 @@
+{ kdeFramework, lib, extra-cmake-modules, docbook_xml_dtd_45, kauth
+, karchive, kcompletion, kconfig, kconfigwidgets, kcoreaddons
+, kcrash, kdbusaddons, kded, kdesignerplugin, kdoctools, kemoticons
+, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kitemmodels
+, kinit, knotifications, kparts, kservice, ktextwidgets
+, kunitconversion, kwidgetsaddons, kwindowsystem, kxmlgui
+, networkmanager, qtsvg, qtx11extras, xlibs
+}:
+
+# TODO: debug docbook detection
+
+kdeFramework {
+  name = "kdelibs4support";
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [
+    kcompletion kconfig kded kservice kwidgetsaddons
+    kxmlgui networkmanager qtsvg qtx11extras xlibs.libSM
+  ];
+  propagatedBuildInputs = [
+    kauth karchive kconfigwidgets kcoreaddons kcrash kdbusaddons
+    kdesignerplugin kemoticons kglobalaccel kguiaddons ki18n kio
+    kiconthemes kitemmodels kinit knotifications kparts ktextwidgets
+    kunitconversion kwindowsystem
+  ];
+  cmakeFlags = [
+    "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
+    "-DDocBookXML4_DTD_VERSION=4.5"
+  ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support/default.nix b/pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support/default.nix
new file mode 100644
index 000000000000..843db83a99b2
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support/default.nix
@@ -0,0 +1,36 @@
+{ kdeFramework, lib, copyPathsToStore
+, extra-cmake-modules, docbook_xml_dtd_45, kauth
+, karchive, kcompletion, kconfig, kconfigwidgets, kcoreaddons
+, kcrash, kdbusaddons, kded, kdesignerplugin, kdoctools, kemoticons
+, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kitemmodels
+, kinit, knotifications, kparts, kservice, ktextwidgets
+, kunitconversion, kwidgetsaddons, kwindowsystem, kxmlgui
+, networkmanager, qtsvg, qtx11extras, xlibs
+}:
+
+# TODO: debug docbook detection
+
+kdeFramework {
+  name = "kdelibs4support";
+  outputs = [ "dev" "out" ];
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
+  setupHook = ./setup-hook.sh;
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [
+    kcompletion kconfig kded kservice kwidgetsaddons
+    kxmlgui networkmanager qtsvg qtx11extras xlibs.libSM
+  ];
+  propagatedBuildInputs = [
+    kauth karchive kconfigwidgets kcoreaddons kcrash kdbusaddons
+    kdesignerplugin kemoticons kglobalaccel kguiaddons ki18n kio
+    kiconthemes kitemmodels kinit knotifications kparts ktextwidgets
+    kunitconversion kwindowsystem
+  ];
+  cmakeFlags = [
+    "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
+    "-DDocBookXML4_DTD_VERSION=4.5"
+  ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support/nix-kde-include-dir.patch b/pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support/nix-kde-include-dir.patch
new file mode 100644
index 000000000000..eabb70254483
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support/nix-kde-include-dir.patch
@@ -0,0 +1,13 @@
+Index: kdelibs4support-5.18.0/src/kdecore/kstandarddirs.cpp
+===================================================================
+--- kdelibs4support-5.18.0.orig/src/kdecore/kstandarddirs.cpp
++++ kdelibs4support-5.18.0/src/kdecore/kstandarddirs.cpp
+@@ -292,7 +292,7 @@ static QString relativeInstallPath(const
+             return QFile::decodeName(ICON_INSTALL_DIR "/");
+         }
+         if (strcmp("include", type) == 0) {
+-            return QFile::decodeName(INCLUDE_INSTALL_DIR "/");
++            return QFile::decodeName(qgetenv("NIX_KDE_INCLUDE_DIR"));
+         }
+         break;
+     case 'l':
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support/series b/pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support/series
new file mode 100644
index 000000000000..9b08ab208774
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support/series
@@ -0,0 +1 @@
+nix-kde-include-dir.patch
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support/setup-hook.sh b/pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support/setup-hook.sh
new file mode 100644
index 000000000000..21ac2e83b5da
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support/setup-hook.sh
@@ -0,0 +1 @@
+export NIX_KDE_INCLUDE_DIR="@dev@/include/"  # trailing slash is required!
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kdesignerplugin.nix b/pkgs/desktops/kde-5/frameworks-5.21/kdesignerplugin.nix
new file mode 100644
index 000000000000..cbc114ccca03
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kdesignerplugin.nix
@@ -0,0 +1,34 @@
+{ kdeFramework, lib, makeQtWrapper
+, extra-cmake-modules
+, kcompletion
+, kconfig
+, kconfigwidgets
+, kcoreaddons
+, kdewebkit
+, kdoctools
+, kiconthemes
+, kio
+, kitemviews
+, kplotting
+, ktextwidgets
+, kwidgetsaddons
+, kxmlgui
+, sonnet
+}:
+
+kdeFramework {
+  name = "kdesignerplugin";
+  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
+  buildInputs = [
+    kcompletion kconfig kconfigwidgets kcoreaddons kdewebkit
+    kiconthemes kitemviews kplotting ktextwidgets kwidgetsaddons
+    kxmlgui
+  ];
+  propagatedBuildInputs = [ kio sonnet ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/kgendesignerplugin"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kdesu.nix b/pkgs/desktops/kde-5/frameworks-5.21/kdesu.nix
new file mode 100644
index 000000000000..364fbd6a720b
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kdesu.nix
@@ -0,0 +1,13 @@
+{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n, kpty
+, kservice
+}:
+
+kdeFramework {
+  name = "kdesu";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ kcoreaddons kservice ];
+  propagatedBuildInputs = [ ki18n kpty ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kdewebkit.nix b/pkgs/desktops/kde-5/frameworks-5.21/kdewebkit.nix
new file mode 100644
index 000000000000..d361313d1d49
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kdewebkit.nix
@@ -0,0 +1,13 @@
+{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons
+, ki18n, kio, kjobwidgets, kparts, kservice, kwallet, qtwebkit
+}:
+
+kdeFramework {
+  name = "kdewebkit";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ kconfig kcoreaddons kjobwidgets kparts kservice kwallet ];
+  propagatedBuildInputs = [ ki18n kio qtwebkit ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kdnssd.nix b/pkgs/desktops/kde-5/frameworks-5.21/kdnssd.nix
new file mode 100644
index 000000000000..f00432b0c9ce
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kdnssd.nix
@@ -0,0 +1,13 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, avahi
+}:
+
+kdeFramework {
+  name = "kdnssd";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ avahi ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kdoctools/default.nix b/pkgs/desktops/kde-5/frameworks-5.21/kdoctools/default.nix
new file mode 100644
index 000000000000..f67c19f42395
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kdoctools/default.nix
@@ -0,0 +1,19 @@
+{ kdeFramework, lib, extra-cmake-modules, docbook_xml_dtd_45
+, docbook5_xsl, karchive, ki18n, makeQtWrapper, perl, perlPackages
+}:
+
+kdeFramework {
+  name = "kdoctools";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ karchive ];
+  propagatedBuildInputs = [ ki18n ];
+  propagatedNativeBuildInputs = [ makeQtWrapper perl perlPackages.URI ];
+  cmakeFlags = [
+    "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
+    "-DDocBookXSL_DIR=${docbook5_xsl}/xml/xsl/docbook"
+  ];
+  patches = [ ./kdoctools-no-find-docbook-xml.patch ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kdoctools/kdoctools-no-find-docbook-xml.patch b/pkgs/desktops/kde-5/frameworks-5.21/kdoctools/kdoctools-no-find-docbook-xml.patch
new file mode 100644
index 000000000000..4e3a33efab32
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kdoctools/kdoctools-no-find-docbook-xml.patch
@@ -0,0 +1,12 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5c4863c..f731775 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -46,7 +46,6 @@ set_package_properties(LibXml2 PROPERTIES
+                       )
+ 
+ 
+-find_package(DocBookXML4 "4.5")
+ 
+ set_package_properties(DocBookXML4 PROPERTIES
+                        TYPE REQUIRED
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kdoctools/setup-hook.sh b/pkgs/desktops/kde-5/frameworks-5.21/kdoctools/setup-hook.sh
new file mode 100644
index 000000000000..5cfffbd622d1
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kdoctools/setup-hook.sh
@@ -0,0 +1,5 @@
+addXdgData() {
+    addToSearchPath XDG_DATA_DIRS "$1/share"
+}
+
+envHooks+=(addXdgData)
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kemoticons.nix b/pkgs/desktops/kde-5/frameworks-5.21/kemoticons.nix
new file mode 100644
index 000000000000..d165f84e3a2d
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kemoticons.nix
@@ -0,0 +1,17 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, karchive
+, kconfig
+, kcoreaddons
+, kservice
+}:
+
+kdeFramework {
+  name = "kemoticons";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ karchive kconfig kcoreaddons ];
+  propagatedBuildInputs = [ kservice ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kfilemetadata.nix b/pkgs/desktops/kde-5/frameworks-5.21/kfilemetadata.nix
new file mode 100644
index 000000000000..be99c58d5504
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kfilemetadata.nix
@@ -0,0 +1,13 @@
+{ kdeFramework, lib, extra-cmake-modules, attr, ebook_tools, exiv2
+, ffmpeg, karchive, ki18n, poppler, qtbase, taglib
+}:
+
+kdeFramework {
+  name = "kfilemetadata";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ attr ebook_tools exiv2 ffmpeg karchive poppler taglib ];
+  propagatedBuildInputs = [ qtbase ki18n ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kfilemetadata/cmake-install-paths.patch b/pkgs/desktops/kde-5/frameworks-5.21/kfilemetadata/cmake-install-paths.patch
new file mode 100644
index 000000000000..732f7b69c828
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kfilemetadata/cmake-install-paths.patch
@@ -0,0 +1,13 @@
+Index: kfilemetadata-5.18.0/src/CMakeLists.txt
+===================================================================
+--- kfilemetadata-5.18.0.orig/src/CMakeLists.txt
++++ kfilemetadata-5.18.0/src/CMakeLists.txt
+@@ -49,7 +49,7 @@ install(TARGETS KF5FileMetaData EXPORT K
+ 
+ install(EXPORT KF5FileMetaDataTargets
+         NAMESPACE KF5::
+-        DESTINATION ${LIB_INSTALL_DIR}/cmake/KF5FileMetaData
++        DESTINATION ${KDE_INSTALL_FULL_CMAKEPACKAGEDIR}/KF5FileMetaData
+         FILE KF5FileMetaDataTargets.cmake)
+ 
+ install(FILES
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kfilemetadata/default.nix b/pkgs/desktops/kde-5/frameworks-5.21/kfilemetadata/default.nix
new file mode 100644
index 000000000000..9bb4831cf8da
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kfilemetadata/default.nix
@@ -0,0 +1,14 @@
+{ kdeFramework, lib, copyPathsToStore, extra-cmake-modules
+, attr, ebook_tools, exiv2, ffmpeg, karchive, ki18n, poppler, qtbase, taglib
+}:
+
+kdeFramework {
+  name = "kfilemetadata";
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ attr ebook_tools exiv2 ffmpeg karchive poppler taglib ];
+  propagatedBuildInputs = [ qtbase ki18n ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kfilemetadata/series b/pkgs/desktops/kde-5/frameworks-5.21/kfilemetadata/series
new file mode 100644
index 000000000000..d2689425c387
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kfilemetadata/series
@@ -0,0 +1 @@
+cmake-install-paths.patch
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kglobalaccel.nix b/pkgs/desktops/kde-5/frameworks-5.21/kglobalaccel.nix
new file mode 100644
index 000000000000..c535b3590a38
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kglobalaccel.nix
@@ -0,0 +1,23 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, kconfig
+, kcoreaddons
+, kcrash
+, kdbusaddons
+, kwindowsystem
+, makeQtWrapper
+, qtx11extras
+}:
+
+kdeFramework {
+  name = "kglobalaccel";
+  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
+  buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons ];
+  propagatedBuildInputs = [ kwindowsystem qtx11extras ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/kglobalaccel5"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kguiaddons.nix b/pkgs/desktops/kde-5/frameworks-5.21/kguiaddons.nix
new file mode 100644
index 000000000000..bc4e9ab11843
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kguiaddons.nix
@@ -0,0 +1,13 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, qtx11extras
+}:
+
+kdeFramework {
+  name = "kguiaddons";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ qtx11extras ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/khtml.nix b/pkgs/desktops/kde-5/frameworks-5.21/khtml.nix
new file mode 100644
index 000000000000..d40df466ebbd
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/khtml.nix
@@ -0,0 +1,21 @@
+{ kdeFramework, lib, extra-cmake-modules, giflib, karchive
+, kcodecs, kglobalaccel, ki18n, kiconthemes, kio, kjs
+, knotifications, kparts, ktextwidgets, kwallet, kwidgetsaddons
+, kwindowsystem, kxmlgui, perl, phonon, qtx11extras, sonnet
+}:
+
+kdeFramework {
+  name = "khtml";
+  nativeBuildInputs = [ extra-cmake-modules perl ];
+  buildInputs = [
+    giflib karchive kiconthemes knotifications kwallet kwidgetsaddons
+    kxmlgui phonon
+  ];
+  propagatedBuildInputs = [
+    kcodecs kglobalaccel ki18n kio kjs kparts ktextwidgets
+    kwindowsystem qtx11extras sonnet
+  ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/ki18n.nix b/pkgs/desktops/kde-5/frameworks-5.21/ki18n.nix
new file mode 100644
index 000000000000..268006512e7c
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/ki18n.nix
@@ -0,0 +1,17 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, gettext
+, python
+, qtdeclarative
+, qtscript
+}:
+
+kdeFramework {
+  name = "ki18n";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ qtdeclarative qtscript ];
+  propagatedNativeBuildInputs = [ gettext python ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kiconthemes/default-theme-breeze.patch b/pkgs/desktops/kde-5/frameworks-5.21/kiconthemes/default-theme-breeze.patch
new file mode 100644
index 000000000000..5b3b15d5d5b5
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kiconthemes/default-theme-breeze.patch
@@ -0,0 +1,13 @@
+Index: kiconthemes-5.17.0/src/kicontheme.cpp
+===================================================================
+--- kiconthemes-5.17.0.orig/src/kicontheme.cpp
++++ kiconthemes-5.17.0/src/kicontheme.cpp
+@@ -557,7 +557,7 @@ void KIconTheme::reconfigure()
+ // static
+ QString KIconTheme::defaultThemeName()
+ {
+-    return QStringLiteral("oxygen");
++    return QStringLiteral("breeze");
+ }
+ 
+ void KIconTheme::assignIconsToContextMenu(ContextMenus type,
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kiconthemes/default.nix b/pkgs/desktops/kde-5/frameworks-5.21/kiconthemes/default.nix
new file mode 100644
index 000000000000..b78b25582beb
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kiconthemes/default.nix
@@ -0,0 +1,18 @@
+{ kdeFramework, lib, copyPathsToStore
+, extra-cmake-modules, makeQtWrapper
+, kconfigwidgets, ki18n, breeze-icons, kitemviews, qtsvg
+}:
+
+kdeFramework {
+  name = "kiconthemes";
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
+  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
+  buildInputs = [ kconfigwidgets kitemviews qtsvg ];
+  propagatedBuildInputs = [ breeze-icons ki18n ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/kiconfinder5"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kiconthemes/series b/pkgs/desktops/kde-5/frameworks-5.21/kiconthemes/series
new file mode 100644
index 000000000000..ab5cc8a3edb2
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kiconthemes/series
@@ -0,0 +1 @@
+default-theme-breeze.patch
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kidletime.nix b/pkgs/desktops/kde-5/frameworks-5.21/kidletime.nix
new file mode 100644
index 000000000000..fc0865600239
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kidletime.nix
@@ -0,0 +1,15 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, qtbase
+, qtx11extras
+}:
+
+kdeFramework {
+  name = "kidletime";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ qtx11extras ];
+  propagatedBuildInputs = [ qtbase ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kimageformats.nix b/pkgs/desktops/kde-5/frameworks-5.21/kimageformats.nix
new file mode 100644
index 000000000000..49d66bbcc2c6
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kimageformats.nix
@@ -0,0 +1,13 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, ilmbase
+}:
+
+kdeFramework {
+  name = "kimageformats";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kinit/default.nix b/pkgs/desktops/kde-5/frameworks-5.21/kinit/default.nix
new file mode 100644
index 000000000000..64210ca76051
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kinit/default.nix
@@ -0,0 +1,17 @@
+{ kdeFramework, lib, copyPathsToStore, extra-cmake-modules, kconfig, kcrash
+, kdoctools, ki18n, kio, kservice, kwindowsystem, libcap
+, libcap_progs
+}:
+
+# TODO: setuid wrapper
+
+kdeFramework {
+  name = "kinit";
+  nativeBuildInputs = [ extra-cmake-modules kdoctools libcap_progs ];
+  buildInputs = [ kconfig kcrash kservice libcap ];
+  propagatedBuildInputs = [ ki18n kio kwindowsystem ];
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kinit/kinit-libpath.patch b/pkgs/desktops/kde-5/frameworks-5.21/kinit/kinit-libpath.patch
new file mode 100644
index 000000000000..47538fbe4567
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kinit/kinit-libpath.patch
@@ -0,0 +1,34 @@
+Index: kinit-5.21.0/src/kdeinit/kinit.cpp
+===================================================================
+--- kinit-5.21.0.orig/src/kdeinit/kinit.cpp
++++ kinit-5.21.0/src/kdeinit/kinit.cpp
+@@ -657,19 +657,16 @@ static pid_t launch(int argc, const char
+ 
+         if (!libpath.isEmpty()) {
+             if (libpath_relative) {
+-                // NB: Because Qt makes the actual dlopen() call, the
+-                //     RUNPATH of kdeinit is *not* respected - see
+-                //     https://sourceware.org/bugzilla/show_bug.cgi?id=13945
+-                //     - so we try hacking it in ourselves
+-                QString install_lib_dir = QFile::decodeName(
+-                        CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/");
+-                QString orig_libpath = libpath;
+-                libpath = install_lib_dir + libpath;
+-                l.setFileName(libpath);
+-                if (!l.load()) {
+-                    libpath = orig_libpath;
+-                    l.setFileName(libpath);
+-                    l.load();
++                // Try to load the library relative to the active profiles.
++                QByteArrayList profiles = qgetenv("NIX_PROFILES").split(' ');
++                // Reverse the profile list.
++                std::reverse(profiles.begin(), profiles.end());
++                const QString libdir = QString::fromLatin1("/lib/");
++                Q_FOREACH (const QByteArray &profile, profiles) {
++                    if (!profile.isEmpty()) {
++                        l.setFileName(QFile::decodeName(profile) + libdir + libpath);
++                        if (l.load()) break;
++                    }
+                 }
+             } else {
+                 l.load();
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kinit/series b/pkgs/desktops/kde-5/frameworks-5.21/kinit/series
new file mode 100644
index 000000000000..5faa456366b9
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kinit/series
@@ -0,0 +1 @@
+kinit-libpath.patch
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kio/default.nix b/pkgs/desktops/kde-5/frameworks-5.21/kio/default.nix
new file mode 100644
index 000000000000..a2131ff33850
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kio/default.nix
@@ -0,0 +1,33 @@
+{ kdeFramework, lib, copyPathsToStore
+, extra-cmake-modules, acl, karchive
+, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons
+, kdbusaddons, kdoctools, ki18n, kiconthemes, kitemviews
+, kjobwidgets, knotifications, kservice, ktextwidgets, kwallet
+, kwidgetsaddons, kwindowsystem, kxmlgui, makeQtWrapper
+, qtscript, qtx11extras, solid
+}:
+
+kdeFramework {
+  name = "kio";
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
+  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
+  buildInputs = [
+    acl karchive kconfig kcoreaddons kdbusaddons kiconthemes
+    knotifications ktextwidgets kwallet kwidgetsaddons
+    qtscript
+  ];
+  propagatedBuildInputs = [
+    kbookmarks kcompletion kconfigwidgets ki18n kitemviews kjobwidgets
+    kservice kwindowsystem kxmlgui solid qtx11extras
+  ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/kcookiejar5"
+    wrapQtProgram "$out/bin/ktelnetservice5"
+    wrapQtProgram "$out/bin/ktrash5"
+    wrapQtProgram "$out/bin/kmailservice5"
+    wrapQtProgram "$out/bin/protocoltojson"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kio/samba-search-path.patch b/pkgs/desktops/kde-5/frameworks-5.21/kio/samba-search-path.patch
new file mode 100644
index 000000000000..c9ad46b41bb7
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kio/samba-search-path.patch
@@ -0,0 +1,28 @@
+Index: kio-5.17.0/src/core/ksambashare.cpp
+===================================================================
+--- kio-5.17.0.orig/src/core/ksambashare.cpp
++++ kio-5.17.0/src/core/ksambashare.cpp
+@@ -67,13 +67,18 @@ KSambaSharePrivate::~KSambaSharePrivate(
+ 
+ bool KSambaSharePrivate::isSambaInstalled()
+ {
+-    if (QFile::exists(QStringLiteral("/usr/sbin/smbd"))
+-            || QFile::exists(QStringLiteral("/usr/local/sbin/smbd"))) {
+-        return true;
++    const QByteArray pathEnv = qgetenv("PATH");
++    if (!pathEnv.isEmpty()) {
++        QLatin1Char pathSep(':');
++        QStringList paths = QFile::decodeName(pathEnv).split(pathSep, QString::SkipEmptyParts);
++        for (QStringList::iterator it = paths.begin(); it != paths.end(); ++it) {
++            it->append("/smbd");
++            if (QFile::exists(*it)) {
++                return true;
++            }
++        }
+     }
+ 
+-    //qDebug() << "Samba is not installed!";
+-
+     return false;
+ }
+ 
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kio/series b/pkgs/desktops/kde-5/frameworks-5.21/kio/series
new file mode 100644
index 000000000000..77ca15450047
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kio/series
@@ -0,0 +1 @@
+samba-search-path.patch
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kitemmodels.nix b/pkgs/desktops/kde-5/frameworks-5.21/kitemmodels.nix
new file mode 100644
index 000000000000..a9024d771cc3
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kitemmodels.nix
@@ -0,0 +1,11 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+}:
+
+kdeFramework {
+  name = "kitemmodels";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kitemviews.nix b/pkgs/desktops/kde-5/frameworks-5.21/kitemviews.nix
new file mode 100644
index 000000000000..931019ce495d
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kitemviews.nix
@@ -0,0 +1,11 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+}:
+
+kdeFramework {
+  name = "kitemviews";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kjobwidgets.nix b/pkgs/desktops/kde-5/frameworks-5.21/kjobwidgets.nix
new file mode 100644
index 000000000000..746edf12eea0
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kjobwidgets.nix
@@ -0,0 +1,16 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, kcoreaddons
+, kwidgetsaddons
+, qtx11extras
+}:
+
+kdeFramework {
+  name = "kjobwidgets";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ kcoreaddons kwidgetsaddons ];
+  propagatedBuildInputs = [ qtx11extras ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kjs.nix b/pkgs/desktops/kde-5/frameworks-5.21/kjs.nix
new file mode 100644
index 000000000000..768720f178c8
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kjs.nix
@@ -0,0 +1,16 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, kdoctools
+, makeQtWrapper
+}:
+
+kdeFramework {
+  name = "kjs";
+  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/kjs5"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kjsembed.nix b/pkgs/desktops/kde-5/frameworks-5.21/kjsembed.nix
new file mode 100644
index 000000000000..22eef2d47bde
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kjsembed.nix
@@ -0,0 +1,17 @@
+{ kdeFramework, lib, extra-cmake-modules, kdoctools, ki18n, kjs
+, makeQtWrapper, qtsvg
+}:
+
+kdeFramework {
+  name = "kjsembed";
+  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
+  buildInputs = [ qtsvg ];
+  propagatedBuildInputs = [ ki18n kjs ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/kjscmd5"
+    wrapQtProgram "$out/bin/kjsconsole"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kmediaplayer.nix b/pkgs/desktops/kde-5/frameworks-5.21/kmediaplayer.nix
new file mode 100644
index 000000000000..460458b22323
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kmediaplayer.nix
@@ -0,0 +1,15 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, kparts
+, kxmlgui
+}:
+
+kdeFramework {
+  name = "kmediaplayer";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ kxmlgui ];
+  propagatedBuildInputs = [ kparts ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/knewstuff.nix b/pkgs/desktops/kde-5/frameworks-5.21/knewstuff.nix
new file mode 100644
index 000000000000..5bcd6f301462
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/knewstuff.nix
@@ -0,0 +1,17 @@
+{ kdeFramework, lib, extra-cmake-modules, attica, karchive
+, kcompletion, kconfig, kcoreaddons, ki18n, kiconthemes, kio
+, kitemviews, kservice, ktextwidgets, kwidgetsaddons, kxmlgui
+}:
+
+kdeFramework {
+  name = "knewstuff";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [
+    karchive kcompletion kconfig kcoreaddons kiconthemes
+    kitemviews ktextwidgets kwidgetsaddons
+  ];
+  propagatedBuildInputs = [ attica ki18n kio kservice kxmlgui ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/knotifications.nix b/pkgs/desktops/kde-5/frameworks-5.21/knotifications.nix
new file mode 100644
index 000000000000..7e301dd0f268
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/knotifications.nix
@@ -0,0 +1,21 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, kcodecs
+, kconfig
+, kcoreaddons
+, kwindowsystem
+, phonon
+, qtx11extras
+}:
+
+kdeFramework {
+  name = "knotifications";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [
+    kcodecs kconfig kcoreaddons phonon
+  ];
+  propagatedBuildInputs = [ kwindowsystem qtx11extras ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/knotifyconfig.nix b/pkgs/desktops/kde-5/frameworks-5.21/knotifyconfig.nix
new file mode 100644
index 000000000000..dd99d2d4f1e5
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/knotifyconfig.nix
@@ -0,0 +1,13 @@
+{ kdeFramework, lib, extra-cmake-modules, kcompletion, kconfig
+, ki18n, kio, phonon
+}:
+
+kdeFramework {
+  name = "knotifyconfig";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ kcompletion kconfig phonon ];
+  propagatedBuildInputs = [ ki18n kio ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kpackage/allow-external-paths.patch b/pkgs/desktops/kde-5/frameworks-5.21/kpackage/allow-external-paths.patch
new file mode 100644
index 000000000000..e9d744448148
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kpackage/allow-external-paths.patch
@@ -0,0 +1,13 @@
+Index: kpackage-5.18.0/src/kpackage/package.cpp
+===================================================================
+--- kpackage-5.18.0.orig/src/kpackage/package.cpp
++++ kpackage-5.18.0/src/kpackage/package.cpp
+@@ -808,7 +808,7 @@ PackagePrivate::PackagePrivate()
+     : QSharedData(),
+       fallbackPackage(0),
+       metadata(0),
+-      externalPaths(false),
++      externalPaths(true),
+       valid(false),
+       checkedValid(false)
+ {
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kpackage/default.nix b/pkgs/desktops/kde-5/frameworks-5.21/kpackage/default.nix
new file mode 100644
index 000000000000..aea1b0d31a0d
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kpackage/default.nix
@@ -0,0 +1,23 @@
+{ kdeFramework, lib, copyPathsToStore
+, extra-cmake-modules
+, karchive
+, kconfig
+, kcoreaddons
+, kdoctools
+, ki18n
+, makeQtWrapper
+}:
+
+kdeFramework {
+  name = "kpackage";
+  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
+  buildInputs = [ karchive kconfig ];
+  propagatedBuildInputs = [ kcoreaddons ki18n ];
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
+  postInstall = ''
+    wrapQtProgram "$out/bin/kpackagetool5"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kpackage/qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/frameworks-5.21/kpackage/qdiriterator-follow-symlinks.patch
new file mode 100644
index 000000000000..ddbf17d00064
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kpackage/qdiriterator-follow-symlinks.patch
@@ -0,0 +1,26 @@
+Index: kpackage-5.18.0/src/kpackage/packageloader.cpp
+===================================================================
+--- kpackage-5.18.0.orig/src/kpackage/packageloader.cpp
++++ kpackage-5.18.0/src/kpackage/packageloader.cpp
+@@ -241,7 +241,7 @@ QList<KPluginMetaData> PackageLoader::li
+         } else {
+             //qDebug() << "Not cached";
+             // If there's no cache file, fall back to listing the directory
+-            const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories;
++            const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories | QDirIterator::FollowSymlinks;
+             const QStringList nameFilters = QStringList(QStringLiteral("metadata.desktop")) << QStringLiteral("metadata.json");
+ 
+             QDirIterator it(plugindir, nameFilters, QDir::Files, flags);
+Index: kpackage-5.18.0/src/kpackage/private/packagejobthread.cpp
+===================================================================
+--- kpackage-5.18.0.orig/src/kpackage/private/packagejobthread.cpp
++++ kpackage-5.18.0/src/kpackage/private/packagejobthread.cpp
+@@ -146,7 +146,7 @@ bool indexDirectory(const QString& dir,
+ 
+     QJsonArray plugins;
+ 
+-    QDirIterator it(dir, *metaDataFiles, QDir::Files, QDirIterator::Subdirectories);
++    QDirIterator it(dir, *metaDataFiles, QDir::Files, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
+     while (it.hasNext()) {
+         it.next();
+         const QString path = it.fileInfo().absoluteFilePath();
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kpackage/series b/pkgs/desktops/kde-5/frameworks-5.21/kpackage/series
new file mode 100644
index 000000000000..9b7f076efc70
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kpackage/series
@@ -0,0 +1,2 @@
+allow-external-paths.patch
+qdiriterator-follow-symlinks.patch
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kparts.nix b/pkgs/desktops/kde-5/frameworks-5.21/kparts.nix
new file mode 100644
index 000000000000..1c3e0b2cbc51
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kparts.nix
@@ -0,0 +1,17 @@
+{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons
+, ki18n, kiconthemes, kio, kjobwidgets, knotifications, kservice
+, ktextwidgets, kwidgetsaddons, kxmlgui
+}:
+
+kdeFramework {
+  name = "kparts";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [
+    kconfig kcoreaddons kiconthemes kjobwidgets knotifications
+    kservice kwidgetsaddons
+  ];
+  propagatedBuildInputs = [ ki18n kio ktextwidgets kxmlgui ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kpeople.nix b/pkgs/desktops/kde-5/frameworks-5.21/kpeople.nix
new file mode 100644
index 000000000000..4c3877e7efd2
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kpeople.nix
@@ -0,0 +1,15 @@
+{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n
+, kitemviews, kservice, kwidgetsaddons, qtdeclarative
+}:
+
+kdeFramework {
+  name = "kpeople";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [
+    kcoreaddons kitemviews kservice kwidgetsaddons
+  ];
+  propagatedBuildInputs = [ ki18n qtdeclarative ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kplotting.nix b/pkgs/desktops/kde-5/frameworks-5.21/kplotting.nix
new file mode 100644
index 000000000000..c16f51b5ac3c
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kplotting.nix
@@ -0,0 +1,11 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+}:
+
+kdeFramework {
+  name = "kplotting";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kpty.nix b/pkgs/desktops/kde-5/frameworks-5.21/kpty.nix
new file mode 100644
index 000000000000..2e34e6f674ce
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kpty.nix
@@ -0,0 +1,10 @@
+{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n }:
+
+kdeFramework {
+  name = "kpty";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  propagatedBuildInputs = [ kcoreaddons ki18n ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kross.nix b/pkgs/desktops/kde-5/frameworks-5.21/kross.nix
new file mode 100644
index 000000000000..7c6f079feaa7
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kross.nix
@@ -0,0 +1,14 @@
+{ kdeFramework, lib, extra-cmake-modules, kcompletion, kcoreaddons
+, kdoctools, ki18n, kiconthemes, kio, kparts, kwidgetsaddons
+, kxmlgui, qtscript
+}:
+
+kdeFramework {
+  name = "kross";
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [ kcompletion kcoreaddons kxmlgui ];
+  propagatedBuildInputs = [ ki18n kiconthemes kio kparts kwidgetsaddons qtscript ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/krunner.nix b/pkgs/desktops/kde-5/frameworks-5.21/krunner.nix
new file mode 100644
index 000000000000..12d2b54d0eb3
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/krunner.nix
@@ -0,0 +1,16 @@
+{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons
+, ki18n, kio, kservice, plasma-framework, qtquick1, solid
+, threadweaver
+}:
+
+kdeFramework {
+  name = "krunner";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [
+    kconfig kcoreaddons kservice qtquick1 solid threadweaver
+  ];
+  propagatedBuildInputs = [ ki18n kio plasma-framework ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kservice/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/frameworks-5.21/kservice/0001-qdiriterator-follow-symlinks.patch
new file mode 100644
index 000000000000..3d8397d8ee2d
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kservice/0001-qdiriterator-follow-symlinks.patch
@@ -0,0 +1,25 @@
+From ae8919eb81abad369e4a26ffcd845b140983398d Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Wed, 14 Oct 2015 06:28:57 -0500
+Subject: [PATCH 1/2] qdiriterator follow symlinks
+
+---
+ src/sycoca/kbuildsycoca.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/sycoca/kbuildsycoca.cpp b/src/sycoca/kbuildsycoca.cpp
+index 1deae14..250baa8 100644
+--- a/src/sycoca/kbuildsycoca.cpp
++++ b/src/sycoca/kbuildsycoca.cpp
+@@ -208,7 +208,7 @@ bool KBuildSycoca::build()
+         QStringList relFiles;
+         const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, m_resourceSubdir, QStandardPaths::LocateDirectory);
+         Q_FOREACH (const QString &dir, dirs) {
+-            QDirIterator it(dir, QDirIterator::Subdirectories);
++            QDirIterator it(dir, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
+             while (it.hasNext()) {
+                 const QString filePath = it.next();
+                 Q_ASSERT(filePath.startsWith(dir)); // due to the line below...
+-- 
+2.5.2
+
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kservice/0002-no-canonicalize-path.patch b/pkgs/desktops/kde-5/frameworks-5.21/kservice/0002-no-canonicalize-path.patch
new file mode 100644
index 000000000000..685c68526119
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kservice/0002-no-canonicalize-path.patch
@@ -0,0 +1,25 @@
+From 46d124da602d84b7611a7ff0ac0862168d451cdb Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Wed, 14 Oct 2015 06:31:29 -0500
+Subject: [PATCH 2/2] no canonicalize path
+
+---
+ src/sycoca/vfolder_menu.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/sycoca/vfolder_menu.cpp b/src/sycoca/vfolder_menu.cpp
+index d3e31c3..d15d743 100644
+--- a/src/sycoca/vfolder_menu.cpp
++++ b/src/sycoca/vfolder_menu.cpp
+@@ -415,7 +415,7 @@ VFolderMenu::absoluteDir(const QString &_dir, const QString &baseDir, bool keepR
+     }
+ 
+     if (!relative) {
+-        QString resolved = QDir(dir).canonicalPath();
++      QString resolved = QDir::cleanPath(dir);
+         if (!resolved.isEmpty()) {
+             dir = resolved;
+         }
+-- 
+2.5.2
+
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kservice/default.nix b/pkgs/desktops/kde-5/frameworks-5.21/kservice/default.nix
new file mode 100644
index 000000000000..3a27d85b9166
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kservice/default.nix
@@ -0,0 +1,18 @@
+{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons
+, kcrash, kdbusaddons, kdoctools, ki18n, kwindowsystem
+}:
+
+kdeFramework {
+  name = "kservice";
+  propagatedNativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ kdoctools ];
+  buildInputs = [ kcrash kdbusaddons ];
+  propagatedBuildInputs = [ kconfig kcoreaddons ki18n kwindowsystem ];
+  patches = [
+    ./0001-qdiriterator-follow-symlinks.patch
+    ./0002-no-canonicalize-path.patch
+  ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kservice/setup-hook.sh b/pkgs/desktops/kde-5/frameworks-5.21/kservice/setup-hook.sh
new file mode 100644
index 000000000000..c28e862ff8ae
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kservice/setup-hook.sh
@@ -0,0 +1,43 @@
+addServicePkg() {
+    local propagated
+    for dir in "share/kservices5" "share/kservicetypes5"; do
+        if [[ -d "$1/$dir" ]]; then
+            propagated=
+            for pkg in $propagatedBuildInputs; do
+                if [[ "z$pkg" == "z$1" ]]; then
+                    propagated=1
+                    break
+                fi
+            done
+            if [[ -z $propagated ]]; then
+                propagatedBuildInputs="$propagatedBuildInputs $1"
+            fi
+
+            propagated=
+            for pkg in $propagatedUserEnvPkgs; do
+                if [[ "z$pkg" == "z$1" ]]; then
+                    propagated=1
+                    break
+                fi
+            done
+            if [[ -z $propagated ]]; then
+                propagatedUserEnvPkgs="$propagatedUserEnvPkgs $1"
+            fi
+
+            break
+        fi
+    done
+}
+
+envHooks+=(addServicePkg)
+
+local propagated
+for pkg in $propagatedBuildInputs; do
+    if [[ "z$pkg" == "z@out@" ]]; then
+        propagated=1
+        break
+    fi
+done
+if [[ -z $propagated ]]; then
+    propagatedBuildInputs="$propagatedBuildInputs @out@"
+fi
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/ktexteditor/default.nix b/pkgs/desktops/kde-5/frameworks-5.21/ktexteditor/default.nix
new file mode 100644
index 000000000000..b8df6a5f4c0d
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/ktexteditor/default.nix
@@ -0,0 +1,22 @@
+{ kdeFramework, lib, copyPathsToStore
+, extra-cmake-modules, makeQtWrapper, perl
+, karchive, kconfig, kguiaddons, kiconthemes, kparts
+, libgit2
+, qtscript, qtxmlpatterns
+, ki18n, kio, sonnet
+}:
+
+kdeFramework {
+  name = "ktexteditor";
+  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper perl ];
+  buildInputs = [
+    karchive kconfig kguiaddons kiconthemes kparts
+    libgit2
+    qtscript qtxmlpatterns
+  ];
+  propagatedBuildInputs = [ ki18n kio sonnet ];
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/ktexteditor/no-qcoreapplication.patch b/pkgs/desktops/kde-5/frameworks-5.21/ktexteditor/no-qcoreapplication.patch
new file mode 100644
index 000000000000..19ab1e1e5513
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/ktexteditor/no-qcoreapplication.patch
@@ -0,0 +1,36 @@
+Index: ktexteditor-5.18.0/src/syntax/data/katehighlightingindexer.cpp
+===================================================================
+--- ktexteditor-5.18.0.orig/src/syntax/data/katehighlightingindexer.cpp
++++ ktexteditor-5.18.0/src/syntax/data/katehighlightingindexer.cpp
+@@ -55,19 +55,16 @@ QStringList readListing(const QString &f
+ 
+ int main(int argc, char *argv[])
+ {
+-    // get app instance
+-    QCoreApplication app(argc, argv);
+-
+     // ensure enough arguments are passed
+-    if (app.arguments().size() < 3)
++    if (argc < 3)
+         return 1;
+ 
+     // open schema
+     QXmlSchema schema;
+-    if (!schema.load(QUrl::fromLocalFile(app.arguments().at(2))))
++    if (!schema.load(QUrl::fromLocalFile(QString::fromLocal8Bit(argv[2]))))
+         return 2;
+ 
+-    const QString hlFilenamesListing = app.arguments().value(3);
++    const QString hlFilenamesListing = QString::fromLocal8Bit(argv[3]);
+     if (hlFilenamesListing.isEmpty()) {
+         return 1;
+     }
+@@ -152,7 +149,7 @@ int main(int argc, char *argv[])
+         return anyError;
+ 
+     // create outfile, after all has worked!
+-    QFile outFile(app.arguments().at(1));
++    QFile outFile(QString::fromLocal8Bit(argv[1]));
+     if (!outFile.open(QIODevice::WriteOnly | QIODevice::Truncate))
+         return 7;
+ 
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/ktexteditor/series b/pkgs/desktops/kde-5/frameworks-5.21/ktexteditor/series
new file mode 100644
index 000000000000..46cd23829a2f
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/ktexteditor/series
@@ -0,0 +1 @@
+no-qcoreapplication.patch
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/ktextwidgets.nix b/pkgs/desktops/kde-5/frameworks-5.21/ktextwidgets.nix
new file mode 100644
index 000000000000..e332d4ff9a83
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/ktextwidgets.nix
@@ -0,0 +1,16 @@
+{ kdeFramework, lib, extra-cmake-modules, kcompletion, kconfig
+, kconfigwidgets, ki18n, kiconthemes, kservice, kwindowsystem
+, sonnet
+}:
+
+kdeFramework {
+  name = "ktextwidgets";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [
+    kcompletion kconfig kconfigwidgets kiconthemes kservice
+  ];
+  propagatedBuildInputs = [ ki18n kwindowsystem sonnet ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kunitconversion.nix b/pkgs/desktops/kde-5/frameworks-5.21/kunitconversion.nix
new file mode 100644
index 000000000000..3cf0f847d83d
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kunitconversion.nix
@@ -0,0 +1,10 @@
+{ kdeFramework, lib, extra-cmake-modules, ki18n }:
+
+kdeFramework {
+  name = "kunitconversion";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  propagatedBuildInputs = [ ki18n ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kwallet.nix b/pkgs/desktops/kde-5/frameworks-5.21/kwallet.nix
new file mode 100644
index 000000000000..5ade5f63a8d0
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kwallet.nix
@@ -0,0 +1,21 @@
+{ kdeFramework, lib, extra-cmake-modules, kconfig, kconfigwidgets
+, kcoreaddons , kdbusaddons, kdoctools, ki18n, kiconthemes
+, knotifications , kservice, kwidgetsaddons, kwindowsystem, libgcrypt
+, makeQtWrapper }:
+
+kdeFramework {
+  name = "kwallet";
+  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
+  buildInputs = [
+    kconfig kconfigwidgets kcoreaddons kdbusaddons kiconthemes
+    knotifications kservice kwidgetsaddons libgcrypt
+  ];
+  propagatedBuildInputs = [ ki18n kwindowsystem ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/kwalletd5"
+    wrapQtProgram "$out/bin/kwallet-query"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kwidgetsaddons.nix b/pkgs/desktops/kde-5/frameworks-5.21/kwidgetsaddons.nix
new file mode 100644
index 000000000000..d95f44d3fecf
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kwidgetsaddons.nix
@@ -0,0 +1,11 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+}:
+
+kdeFramework {
+  name = "kwidgetsaddons";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kwindowsystem.nix b/pkgs/desktops/kde-5/frameworks-5.21/kwindowsystem.nix
new file mode 100644
index 000000000000..09ab1f2200de
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kwindowsystem.nix
@@ -0,0 +1,13 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, qtx11extras
+}:
+
+kdeFramework {
+  name = "kwindowsystem";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ qtx11extras ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kxmlgui.nix b/pkgs/desktops/kde-5/frameworks-5.21/kxmlgui.nix
new file mode 100644
index 000000000000..f081d5f9170e
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kxmlgui.nix
@@ -0,0 +1,18 @@
+{ kdeFramework, lib, extra-cmake-modules, attica, kconfig
+, kconfigwidgets, kglobalaccel, ki18n, kiconthemes, kitemviews
+, ktextwidgets, kwindowsystem, sonnet
+}:
+
+kdeFramework {
+  name = "kxmlgui";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [
+    attica kconfig kiconthemes kitemviews ktextwidgets
+  ];
+  propagatedBuildInputs = [
+    kconfigwidgets kglobalaccel ki18n kwindowsystem sonnet
+  ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kxmlrpcclient.nix b/pkgs/desktops/kde-5/frameworks-5.21/kxmlrpcclient.nix
new file mode 100644
index 000000000000..20a300b68bc8
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kxmlrpcclient.nix
@@ -0,0 +1,10 @@
+{ kdeFramework, lib, extra-cmake-modules, ki18n, kio }:
+
+kdeFramework {
+  name = "kxmlrpcclient";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  propagatedBuildInputs = [ ki18n kio ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/modemmanager-qt.nix b/pkgs/desktops/kde-5/frameworks-5.21/modemmanager-qt.nix
new file mode 100644
index 000000000000..7d7f769d6a9b
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/modemmanager-qt.nix
@@ -0,0 +1,13 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, modemmanager
+}:
+
+kdeFramework {
+  name = "modemmanager-qt";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  propagatedBuildInputs = [ modemmanager ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/networkmanager-qt.nix b/pkgs/desktops/kde-5/frameworks-5.21/networkmanager-qt.nix
new file mode 100644
index 000000000000..333378bd1431
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/networkmanager-qt.nix
@@ -0,0 +1,13 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, networkmanager
+}:
+
+kdeFramework {
+  name = "networkmanager-qt";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  propagatedBuildInputs = [ networkmanager ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/oxygen-icons5.nix b/pkgs/desktops/kde-5/frameworks-5.21/oxygen-icons5.nix
new file mode 100644
index 000000000000..ee350f8e1536
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/oxygen-icons5.nix
@@ -0,0 +1,13 @@
+{ kdeFramework
+, lib
+, extra-cmake-modules
+}:
+
+kdeFramework {
+  name = "oxygen-icons5";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  meta = {
+    license = lib.licenses.lgpl3Plus;
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/plasma-framework/default.nix b/pkgs/desktops/kde-5/frameworks-5.21/plasma-framework/default.nix
new file mode 100644
index 000000000000..d8846f777231
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/plasma-framework/default.nix
@@ -0,0 +1,25 @@
+{ kdeFramework, lib, extra-cmake-modules, kactivities, karchive
+, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative
+, kdoctools, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio
+, knotifications, kpackage, kservice, kwindowsystem, kxmlgui
+, makeQtWrapper, qtscript, qtx11extras
+}:
+
+kdeFramework {
+  name = "plasma-framework";
+  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
+  buildInputs = [
+    karchive kconfig kconfigwidgets kcoreaddons kdbusaddons kguiaddons
+    kiconthemes knotifications kxmlgui qtscript
+  ];
+  propagatedBuildInputs = [
+    kactivities kdeclarative kglobalaccel ki18n kio kpackage kservice kwindowsystem
+    qtx11extras
+  ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/plasmapkg2"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/solid.nix b/pkgs/desktops/kde-5/frameworks-5.21/solid.nix
new file mode 100644
index 000000000000..afd125e3c597
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/solid.nix
@@ -0,0 +1,17 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, makeQtWrapper
+, qtdeclarative
+}:
+
+kdeFramework {
+  name = "solid";
+  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
+  buildInputs = [ qtdeclarative ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/solid-hardware5"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/sonnet.nix b/pkgs/desktops/kde-5/frameworks-5.21/sonnet.nix
new file mode 100644
index 000000000000..943fe04a1c92
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/sonnet.nix
@@ -0,0 +1,13 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, hunspell
+}:
+
+kdeFramework {
+  name = "sonnet";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ hunspell ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/srcs.nix b/pkgs/desktops/kde-5/frameworks-5.21/srcs.nix
new file mode 100644
index 000000000000..a4a1f95c52ce
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/srcs.nix
@@ -0,0 +1,573 @@
+# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
+{ fetchurl, mirror }:
+
+{
+  attica = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/attica-5.21.0.tar.xz";
+      sha256 = "1aqfw73g424f60qmpx1lky3qfqrsl1id02388pnlmpa8fnpp940c";
+      name = "attica-5.21.0.tar.xz";
+    };
+  };
+  baloo = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/baloo-5.21.0.tar.xz";
+      sha256 = "1a5sl2bkrs90mfks93q2hrijp6dpapp2l0fhq7km36mvsrc78yqn";
+      name = "baloo-5.21.0.tar.xz";
+    };
+  };
+  bluez-qt = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/bluez-qt-5.21.0.tar.xz";
+      sha256 = "0nsnxa4k31l69fapxn49g112948zprc5xr7v3ggxwnxkb1pll60a";
+      name = "bluez-qt-5.21.0.tar.xz";
+    };
+  };
+  breeze-icons = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/breeze-icons-5.21.0.tar.xz";
+      sha256 = "1a7ikdq8a44n42i6swf29aqyfwjh05ir3ym0lzjzdb6133fzlb01";
+      name = "breeze-icons-5.21.0.tar.xz";
+    };
+  };
+  extra-cmake-modules = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/extra-cmake-modules-5.21.0.tar.xz";
+      sha256 = "1kbc5fkcbz9vkg0jpz10vsfgwajlrsmbl0vrbls5qvrdgbgrwlm3";
+      name = "extra-cmake-modules-5.21.0.tar.xz";
+    };
+  };
+  frameworkintegration = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/frameworkintegration-5.21.0.tar.xz";
+      sha256 = "0mbpn18cjzd8xznk73slvals86lv77ram09px4l44xgyf019xll8";
+      name = "frameworkintegration-5.21.0.tar.xz";
+    };
+  };
+  kactivities = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/kactivities-5.21.0.tar.xz";
+      sha256 = "09jr7m6vaffdb879jph1ckgri0b9pdyh5q39i7fyi6s277rybcyk";
+      name = "kactivities-5.21.0.tar.xz";
+    };
+  };
+  kactivities-stats = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/kactivities-stats-5.21.0.tar.xz";
+      sha256 = "0vd01b812r0ggbnqsq3y6ik68v0668rzx6npl3h11wdrvlidhyqf";
+      name = "kactivities-stats-5.21.0.tar.xz";
+    };
+  };
+  kapidox = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/kapidox-5.21.0.tar.xz";
+      sha256 = "0w3jch93d8vdqd0g4yl2fxmamrg9hnx1lypnpgw7615wlsb02qyx";
+      name = "kapidox-5.21.0.tar.xz";
+    };
+  };
+  karchive = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/karchive-5.21.0.tar.xz";
+      sha256 = "042ww21wmm3sf87zqgr2qiyg2j5mjf1mmqpqhpcax4gnjpck5nvc";
+      name = "karchive-5.21.0.tar.xz";
+    };
+  };
+  kauth = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/kauth-5.21.0.tar.xz";
+      sha256 = "03dy36g9y04p3533l2y0m0jlr91m94y0i4wpnlr5ndgccif2a63r";
+      name = "kauth-5.21.0.tar.xz";
+    };
+  };
+  kbookmarks = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/kbookmarks-5.21.0.tar.xz";
+      sha256 = "0qxq5wbddaj1cpjd34q8k65brfbb677gs0y5zh24mqbwcr0rfs6g";
+      name = "kbookmarks-5.21.0.tar.xz";
+    };
+  };
+  kcmutils = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/kcmutils-5.21.0.tar.xz";
+      sha256 = "01ch3y43r4cb1sj0gy5a8wq3c6wpx2brn96d7rjm3r3hh5n5xdlj";
+      name = "kcmutils-5.21.0.tar.xz";
+    };
+  };
+  kcodecs = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/kcodecs-5.21.0.tar.xz";
+      sha256 = "0wng7kqqxrsz7b4w163j6m2zdhb5pvgbd9n6bn7ggyldn4zl86w7";
+      name = "kcodecs-5.21.0.tar.xz";
+    };
+  };
+  kcompletion = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/kcompletion-5.21.0.tar.xz";
+      sha256 = "0r6gsnsjkfvwhrpkch7y44m2yqyxb42bdkc35jxrm8y7xaa8nwi4";
+      name = "kcompletion-5.21.0.tar.xz";
+    };
+  };
+  kconfig = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/kconfig-5.21.0.tar.xz";
+      sha256 = "0w5wvy3yhgh64k8jghyv5fkx9jr828yl11jlihg24hfplnmihkxw";
+      name = "kconfig-5.21.0.tar.xz";
+    };
+  };
+  kconfigwidgets = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/kconfigwidgets-5.21.0.tar.xz";
+      sha256 = "030iq46bwiaixn2wf6285y2gg7h1y5xqf6d6bg3xcz0v1xjd3n0f";
+      name = "kconfigwidgets-5.21.0.tar.xz";
+    };
+  };
+  kcoreaddons = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/kcoreaddons-5.21.0.tar.xz";
+      sha256 = "16226z60simxgfriwsm6srx39f7wm64mdl39qxaa77wn07i8xmsi";
+      name = "kcoreaddons-5.21.0.tar.xz";
+    };
+  };
+  kcrash = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/kcrash-5.21.0.tar.xz";
+      sha256 = "1mrbmfkzd0dy42ppq8gl1z9liprq722w4f3a499iamqnlsdwq2w8";
+      name = "kcrash-5.21.0.tar.xz";
+    };
+  };
+  kdbusaddons = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/kdbusaddons-5.21.0.tar.xz";
+      sha256 = "1yvpan0plm80sw0wai39ffvpswyzy7xiqra69cb8mfxcdl8acjjw";
+      name = "kdbusaddons-5.21.0.tar.xz";
+    };
+  };
+  kdeclarative = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/kdeclarative-5.21.0.tar.xz";
+      sha256 = "1m61js8kdnif1106vxs5bv830hyj8j2whv5mlshkj9jbpp9v5qkj";
+      name = "kdeclarative-5.21.0.tar.xz";
+    };
+  };
+  kded = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/kded-5.21.0.tar.xz";
+      sha256 = "138svq07zgabn6razkqp5zxdlw9ajr1966icd82mxsxq1cjgfl4g";
+      name = "kded-5.21.0.tar.xz";
+    };
+  };
+  kdelibs4support = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/portingAids/kdelibs4support-5.21.0.tar.xz";
+      sha256 = "1q1wyfry2ypa1mk01rabva0cq1ai9lmq8ygsji413p6c1avfrywc";
+      name = "kdelibs4support-5.21.0.tar.xz";
+    };
+  };
+  kdesignerplugin = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/kdesignerplugin-5.21.0.tar.xz";
+      sha256 = "0rj79mdgdcm0wlramx5s53ba0jkhravcgkl570ds7s3wwa1aa62j";
+      name = "kdesignerplugin-5.21.0.tar.xz";
+    };
+  };
+  kdesu = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/kdesu-5.21.0.tar.xz";
+      sha256 = "13daljcjgrvybj7hbv6l9cwc6cdh45d2zz2ch7cbar46z2zxh5qb";
+      name = "kdesu-5.21.0.tar.xz";
+    };
+  };
+  kdewebkit = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/kdewebkit-5.21.0.tar.xz";
+      sha256 = "1rc5i265sagvbqwy96i4dnksc4vnrq864z3rkxqlrx2blwq08550";
+      name = "kdewebkit-5.21.0.tar.xz";
+    };
+  };
+  kdnssd = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/kdnssd-5.21.0.tar.xz";
+      sha256 = "0k3qia322cd2h9pcf7k0fg7w91jxc503digjv93vhsfzfhbadf9l";
+      name = "kdnssd-5.21.0.tar.xz";
+    };
+  };
+  kdoctools = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/kdoctools-5.21.0.tar.xz";
+      sha256 = "16ysqwvwmxas56rhg68rzkipszqqahh787ww9rkq9ak2r6d29r6c";
+      name = "kdoctools-5.21.0.tar.xz";
+    };
+  };
+  kemoticons = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/kemoticons-5.21.0.tar.xz";
+      sha256 = "1paddfylh1xb4g4h939lzvy7f67syyfsx76gz7w5mdbnqk5xc7fc";
+      name = "kemoticons-5.21.0.tar.xz";
+    };
+  };
+  kfilemetadata = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/kfilemetadata-5.21.0.tar.xz";
+      sha256 = "1jmcvzazcw5klmnzd17a7x6rcwjb6xdrxrn1jjiq8kibdbghx7l0";
+      name = "kfilemetadata-5.21.0.tar.xz";
+    };
+  };
+  kglobalaccel = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/kglobalaccel-5.21.0.tar.xz";
+      sha256 = "1bdd613ybz1cl25sx3ihdfzsjwlxyjx9blidmzbnvv0lb2304hwp";
+      name = "kglobalaccel-5.21.0.tar.xz";
+    };
+  };
+  kguiaddons = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/kguiaddons-5.21.0.tar.xz";
+      sha256 = "01hdrcdsiq3qs620jprv65kk4pvldlm70aghjsi9wk7j3x6qid2x";
+      name = "kguiaddons-5.21.0.tar.xz";
+    };
+  };
+  khtml = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/portingAids/khtml-5.21.0.tar.xz";
+      sha256 = "17xvzklhhp6k9wi94s7agc8qnb7gwvx3aa5jbq6d76qn0rsqbzhv";
+      name = "khtml-5.21.0.tar.xz";
+    };
+  };
+  ki18n = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/ki18n-5.21.0.tar.xz";
+      sha256 = "0qm9p77zqz2jy0j5yfv5v6pqska25p790yy1b6wg1gd67561q5bn";
+      name = "ki18n-5.21.0.tar.xz";
+    };
+  };
+  kiconthemes = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/kiconthemes-5.21.0.tar.xz";
+      sha256 = "14a43jca1cyh45dbz5c9lc5yqc376qg3q2c420bk5s44ynpnhp4i";
+      name = "kiconthemes-5.21.0.tar.xz";
+    };
+  };
+  kidletime = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/kidletime-5.21.0.tar.xz";
+      sha256 = "10vdx2sp3hjp20saqlyqdz83jbqhsqyk7gl063lhz00mnk7nk1mn";
+      name = "kidletime-5.21.0.tar.xz";
+    };
+  };
+  kimageformats = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/kimageformats-5.21.0.tar.xz";
+      sha256 = "09m0w5f39y9gq0g00iapay3v09kk24lqwiyjq4y487il865p22ph";
+      name = "kimageformats-5.21.0.tar.xz";
+    };
+  };
+  kinit = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/kinit-5.21.0.tar.xz";
+      sha256 = "19avsq0bi2ys574n0dcn65chd7wrpyp354xfsw45gig28skjiir5";
+      name = "kinit-5.21.0.tar.xz";
+    };
+  };
+  kio = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/kio-5.21.0.tar.xz";
+      sha256 = "08wrjimkv255gbc9y7pxilwxi9nikg3196rzs0fbw4vqdlzl0gjq";
+      name = "kio-5.21.0.tar.xz";
+    };
+  };
+  kitemmodels = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/kitemmodels-5.21.0.tar.xz";
+      sha256 = "1bp02vp08bwsd64wnrr3ivy4k8g1vzv1s5iyiqj99d1gk0fxvv7d";
+      name = "kitemmodels-5.21.0.tar.xz";
+    };
+  };
+  kitemviews = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/kitemviews-5.21.0.tar.xz";
+      sha256 = "16yzcyrg8wa8fvz749x8dbixyga1ggls1fvjns6gdbz5aqm6ib4d";
+      name = "kitemviews-5.21.0.tar.xz";
+    };
+  };
+  kjobwidgets = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/kjobwidgets-5.21.0.tar.xz";
+      sha256 = "0y8zmz6wx4igbpc0jlsxrr1yxgyq8hsmynl9fqy3lc2bzmwr9wcp";
+      name = "kjobwidgets-5.21.0.tar.xz";
+    };
+  };
+  kjs = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/portingAids/kjs-5.21.0.tar.xz";
+      sha256 = "0vsgmz0yn1if11xfbw3f9p0kg2dv1rb26ging4fc860wv2j5gyln";
+      name = "kjs-5.21.0.tar.xz";
+    };
+  };
+  kjsembed = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/portingAids/kjsembed-5.21.0.tar.xz";
+      sha256 = "1nbc12m86s90y8f5gp62l4f9v4hqy8cmzw4sh0655sczd5vbkvki";
+      name = "kjsembed-5.21.0.tar.xz";
+    };
+  };
+  kmediaplayer = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/portingAids/kmediaplayer-5.21.0.tar.xz";
+      sha256 = "1hz7l95w57z73wg9ypbqpkxvkw42wgbymv67lg4vdxppplnkqriz";
+      name = "kmediaplayer-5.21.0.tar.xz";
+    };
+  };
+  knewstuff = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/knewstuff-5.21.0.tar.xz";
+      sha256 = "05r11r9r789686i36y0x770f1pc7dwvqzdzclrx22r3lbz708pga";
+      name = "knewstuff-5.21.0.tar.xz";
+    };
+  };
+  knotifications = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/knotifications-5.21.0.tar.xz";
+      sha256 = "0iia73ai2s5w8c3j1kmc8bb7yp1d2cv0yd2k3ilaxf3y9wgsp4x8";
+      name = "knotifications-5.21.0.tar.xz";
+    };
+  };
+  knotifyconfig = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/knotifyconfig-5.21.0.tar.xz";
+      sha256 = "1mqal5ndr3v54lp7a9a2fm0c0hsiqb7kziw56rz0xd659328k9ix";
+      name = "knotifyconfig-5.21.0.tar.xz";
+    };
+  };
+  kpackage = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/kpackage-5.21.0.tar.xz";
+      sha256 = "024k15v0b24hivkjpn3gwn2wdfsng9ralz414i858qj0lm688xk5";
+      name = "kpackage-5.21.0.tar.xz";
+    };
+  };
+  kparts = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/kparts-5.21.0.tar.xz";
+      sha256 = "1s1nk1vdnb3g0ilv2b1m783h8g52yr9hpqz0vscj56m9cn2sf8rv";
+      name = "kparts-5.21.0.tar.xz";
+    };
+  };
+  kpeople = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/kpeople-5.21.0.tar.xz";
+      sha256 = "0nfpv4g9zvja9sv3zbpyksbvz1xa8lmncg48awrwbrmf83bxvcjq";
+      name = "kpeople-5.21.0.tar.xz";
+    };
+  };
+  kplotting = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/kplotting-5.21.0.tar.xz";
+      sha256 = "1hrpv1qg6qx4y4wvyq0rxfi0ngq1lgd5l3vwi00ri86xm1qbs4hk";
+      name = "kplotting-5.21.0.tar.xz";
+    };
+  };
+  kpty = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/kpty-5.21.0.tar.xz";
+      sha256 = "1vzgpmagjggssva6r57hd094dv3vxf3gpsr3xpvspa9l1mk4d35c";
+      name = "kpty-5.21.0.tar.xz";
+    };
+  };
+  kross = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/portingAids/kross-5.21.0.tar.xz";
+      sha256 = "0c1gbaifzswz4dcdwzka5mnlm07i463dpwc2fihmzn67skm4ybix";
+      name = "kross-5.21.0.tar.xz";
+    };
+  };
+  krunner = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/portingAids/krunner-5.21.0.tar.xz";
+      sha256 = "1jn8fr83c71kz25yzd1qay9as6dvzl1xvlg1vyspdifxg43vqzq4";
+      name = "krunner-5.21.0.tar.xz";
+    };
+  };
+  kservice = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/kservice-5.21.0.tar.xz";
+      sha256 = "19cnapz23ji5p01r9rgj91rzph3mqqrmnfwprmi9p3h2w68njhv6";
+      name = "kservice-5.21.0.tar.xz";
+    };
+  };
+  ktexteditor = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/ktexteditor-5.21.0.tar.xz";
+      sha256 = "1m9zipx5kisxsy037py709c2ri5qvix6n362l981kbbvcgkpiaq2";
+      name = "ktexteditor-5.21.0.tar.xz";
+    };
+  };
+  ktextwidgets = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/ktextwidgets-5.21.0.tar.xz";
+      sha256 = "11nsi6j9b2678bqaa0ykp8as5lw1v9421b73dd1qxqrpdqfkxyzn";
+      name = "ktextwidgets-5.21.0.tar.xz";
+    };
+  };
+  kunitconversion = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/kunitconversion-5.21.0.tar.xz";
+      sha256 = "03vnls5df0c2bqyw9a04hlc3cn34y6xwx693klh27jmm37r776yh";
+      name = "kunitconversion-5.21.0.tar.xz";
+    };
+  };
+  kwallet = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/kwallet-5.21.0.tar.xz";
+      sha256 = "1rmfy21r2p79gwg1kq26g2fqnclbsww9rz3py368pk4s1lrzafii";
+      name = "kwallet-5.21.0.tar.xz";
+    };
+  };
+  kwidgetsaddons = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/kwidgetsaddons-5.21.0.tar.xz";
+      sha256 = "1gqyc0j77sm6i2511qnz0sllmfxjgjb9qpi8551np16zviqa52k7";
+      name = "kwidgetsaddons-5.21.0.tar.xz";
+    };
+  };
+  kwindowsystem = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/kwindowsystem-5.21.0.tar.xz";
+      sha256 = "13lfwpw5a4in0mp5y8d15jg6xhhrka2qmw73wrdzcvj22n6ldzzi";
+      name = "kwindowsystem-5.21.0.tar.xz";
+    };
+  };
+  kxmlgui = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/kxmlgui-5.21.0.tar.xz";
+      sha256 = "1cb6n016ffvxy8dbbhc3dwlzdqpq0pbvly416qlvlc1lv70lxyfj";
+      name = "kxmlgui-5.21.0.tar.xz";
+    };
+  };
+  kxmlrpcclient = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/kxmlrpcclient-5.21.0.tar.xz";
+      sha256 = "082qpnvgm9r81iip9akakbf5rqmxb0r8y6gp7jk49q29lvkrx1kh";
+      name = "kxmlrpcclient-5.21.0.tar.xz";
+    };
+  };
+  modemmanager-qt = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/modemmanager-qt-5.21.0.tar.xz";
+      sha256 = "1w0kjp2pmgss45g63930lbn1c018ld2snng6h40saxi76n8cv57n";
+      name = "modemmanager-qt-5.21.0.tar.xz";
+    };
+  };
+  networkmanager-qt = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/networkmanager-qt-5.21.0.tar.xz";
+      sha256 = "0iy4a4qb1am2y7w03jg6n7q69c46y4gdpb72r6qjrnm9d4c2xsg1";
+      name = "networkmanager-qt-5.21.0.tar.xz";
+    };
+  };
+  oxygen-icons5 = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/oxygen-icons5-5.21.0.tar.xz";
+      sha256 = "00qh1h3xx392hh73zdlknc1j9i2sck9ys74a9ffkf6an4rl0hws5";
+      name = "oxygen-icons5-5.21.0.tar.xz";
+    };
+  };
+  plasma-framework = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/plasma-framework-5.21.0.tar.xz";
+      sha256 = "006k8y8dnar371b5qhikny6rda3vg810jy53sl9yps695j0y39c0";
+      name = "plasma-framework-5.21.0.tar.xz";
+    };
+  };
+  solid = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/solid-5.21.0.tar.xz";
+      sha256 = "13r9zcf7sr6vg5wlqjms2q7vl4g8gpzqghp3y25ldglhj0z7252r";
+      name = "solid-5.21.0.tar.xz";
+    };
+  };
+  sonnet = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/sonnet-5.21.0.tar.xz";
+      sha256 = "088b87r80lds6jr0lnqxv0bd4isy2mkcgrq7hxfni7r2h6vn3xcd";
+      name = "sonnet-5.21.0.tar.xz";
+    };
+  };
+  threadweaver = {
+    version = "5.21.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.21/threadweaver-5.21.0.tar.xz";
+      sha256 = "17l23jj9bsixhg3gpv5sjrlc6w1kmjwlfb0z17drdkyzs5ak80ry";
+      name = "threadweaver-5.21.0.tar.xz";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/threadweaver.nix b/pkgs/desktops/kde-5/frameworks-5.21/threadweaver.nix
new file mode 100644
index 000000000000..52817921cc72
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/threadweaver.nix
@@ -0,0 +1,11 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+}:
+
+kdeFramework {
+  name = "threadweaver";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 60cfa4c31b51..6dfd259aab9d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15591,7 +15591,7 @@ in
 
   kde5_latest =
     let
-      frameworks = import ../desktops/kde-5/frameworks-5.19 { inherit pkgs; };
+      frameworks = import ../desktops/kde-5/frameworks-5.21 { inherit pkgs; };
       plasma = import ../desktops/kde-5/plasma-5.5 { inherit pkgs; };
       applications = import ../desktops/kde-5/applications-15.12 { inherit pkgs; };
       merged = self:

From 3dded2e72a18644f81a60fa8b63e33b74f66e799 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 21 Apr 2016 11:00:51 -0500
Subject: [PATCH 049/287] kde5_latest.applications: 15.12.03 -> 16.04.0

---
 .../desktops/kde-5/applications-16.04/ark.nix |   58 +
 .../applications-16.04/baloo-widgets.nix      |   35 +
 .../kde-5/applications-16.04/default.nix      |   59 +
 .../applications-16.04/dolphin-plugins.nix    |   31 +
 .../kde-5/applications-16.04/dolphin.nix      |   70 +
 .../kde-5/applications-16.04/fetchsrcs.sh     |   56 +
 .../kde-5/applications-16.04/ffmpegthumbs.nix |   21 +
 .../kde-5/applications-16.04/filelight.nix    |   35 +
 .../kde-5/applications-16.04/gpgmepp.nix      |   21 +
 .../kde-5/applications-16.04/gwenview.nix     |   44 +
 .../kde-5/applications-16.04/kate.nix         |   69 +
 .../kde-5/applications-16.04/kcalc.nix        |   39 +
 .../applications-16.04/kcolorchooser.nix      |   16 +
 .../kde-5/applications-16.04/kde-app.nix      |   25 +
 .../kde-5/applications-16.04/kde-locale-4.nix |   27 +
 .../kde-5/applications-16.04/kde-locale-5.nix |   24 +
 .../kdegraphics-thumbnailers.nix              |   23 +
 .../0001-old-kde4-cmake-policies.patch        |   56 +
 .../kdelibs/0002-polkit-install-path.patch    |   25 +
 .../kdelibs/0003-remove_xdg_impurities.patch  |   47 +
 .../applications-16.04/kdelibs/default.nix    |   45 +
 .../applications-16.04/kdelibs/setup-hook.sh  |   10 +
 .../kdenetwork-filesharing.nix                |   29 +
 .../kde-5/applications-16.04/kgpg.nix         |   38 +
 .../kde-5/applications-16.04/kio-extras.nix   |   42 +
 .../kde-5/applications-16.04/konsole.nix      |   68 +
 .../kde-5/applications-16.04/l10n.nix         |  244 ++
 .../kde-5/applications-16.04/libkdcraw.nix    |   19 +
 .../kde-5/applications-16.04/libkexiv2.nix    |   19 +
 .../kde-5/applications-16.04/libkipi.nix      |   22 +
 .../kde-5/applications-16.04/okular.nix       |   41 +
 .../applications-16.04/print-manager.nix      |   47 +
 .../kde-5/applications-16.04/spectacle.nix    |   35 +
 .../kde-5/applications-16.04/srcs.nix         | 2093 +++++++++++++++++
 pkgs/top-level/all-packages.nix               |    2 +-
 35 files changed, 3534 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/desktops/kde-5/applications-16.04/ark.nix
 create mode 100644 pkgs/desktops/kde-5/applications-16.04/baloo-widgets.nix
 create mode 100644 pkgs/desktops/kde-5/applications-16.04/default.nix
 create mode 100644 pkgs/desktops/kde-5/applications-16.04/dolphin-plugins.nix
 create mode 100644 pkgs/desktops/kde-5/applications-16.04/dolphin.nix
 create mode 100755 pkgs/desktops/kde-5/applications-16.04/fetchsrcs.sh
 create mode 100644 pkgs/desktops/kde-5/applications-16.04/ffmpegthumbs.nix
 create mode 100644 pkgs/desktops/kde-5/applications-16.04/filelight.nix
 create mode 100644 pkgs/desktops/kde-5/applications-16.04/gpgmepp.nix
 create mode 100644 pkgs/desktops/kde-5/applications-16.04/gwenview.nix
 create mode 100644 pkgs/desktops/kde-5/applications-16.04/kate.nix
 create mode 100644 pkgs/desktops/kde-5/applications-16.04/kcalc.nix
 create mode 100644 pkgs/desktops/kde-5/applications-16.04/kcolorchooser.nix
 create mode 100644 pkgs/desktops/kde-5/applications-16.04/kde-app.nix
 create mode 100644 pkgs/desktops/kde-5/applications-16.04/kde-locale-4.nix
 create mode 100644 pkgs/desktops/kde-5/applications-16.04/kde-locale-5.nix
 create mode 100644 pkgs/desktops/kde-5/applications-16.04/kdegraphics-thumbnailers.nix
 create mode 100644 pkgs/desktops/kde-5/applications-16.04/kdelibs/0001-old-kde4-cmake-policies.patch
 create mode 100644 pkgs/desktops/kde-5/applications-16.04/kdelibs/0002-polkit-install-path.patch
 create mode 100644 pkgs/desktops/kde-5/applications-16.04/kdelibs/0003-remove_xdg_impurities.patch
 create mode 100644 pkgs/desktops/kde-5/applications-16.04/kdelibs/default.nix
 create mode 100644 pkgs/desktops/kde-5/applications-16.04/kdelibs/setup-hook.sh
 create mode 100644 pkgs/desktops/kde-5/applications-16.04/kdenetwork-filesharing.nix
 create mode 100644 pkgs/desktops/kde-5/applications-16.04/kgpg.nix
 create mode 100644 pkgs/desktops/kde-5/applications-16.04/kio-extras.nix
 create mode 100644 pkgs/desktops/kde-5/applications-16.04/konsole.nix
 create mode 100644 pkgs/desktops/kde-5/applications-16.04/l10n.nix
 create mode 100644 pkgs/desktops/kde-5/applications-16.04/libkdcraw.nix
 create mode 100644 pkgs/desktops/kde-5/applications-16.04/libkexiv2.nix
 create mode 100644 pkgs/desktops/kde-5/applications-16.04/libkipi.nix
 create mode 100644 pkgs/desktops/kde-5/applications-16.04/okular.nix
 create mode 100644 pkgs/desktops/kde-5/applications-16.04/print-manager.nix
 create mode 100644 pkgs/desktops/kde-5/applications-16.04/spectacle.nix
 create mode 100644 pkgs/desktops/kde-5/applications-16.04/srcs.nix

diff --git a/pkgs/desktops/kde-5/applications-16.04/ark.nix b/pkgs/desktops/kde-5/applications-16.04/ark.nix
new file mode 100644
index 000000000000..9e6f414db9e2
--- /dev/null
+++ b/pkgs/desktops/kde-5/applications-16.04/ark.nix
@@ -0,0 +1,58 @@
+{ kdeApp
+, lib
+, extra-cmake-modules
+, kdoctools
+, karchive
+, kconfig
+, kcrash
+, kdbusaddons
+, ki18n
+, kiconthemes
+, khtml
+, kio
+, kservice
+, kpty
+, kwidgetsaddons
+, libarchive
+, p7zip
+, unrar
+, unzipNLS
+, zip
+}:
+
+let PATH = lib.makeBinPath [
+      p7zip unrar unzipNLS zip
+    ];
+in
+
+kdeApp {
+  name = "ark";
+  nativeBuildInputs = [
+    extra-cmake-modules
+    kdoctools
+  ];
+  buildInputs = [
+    karchive
+    kconfig
+    kcrash
+    kdbusaddons
+    kiconthemes
+    kservice
+    kpty
+    kwidgetsaddons
+    libarchive
+  ];
+  propagatedBuildInputs = [
+    khtml
+    ki18n
+    kio
+  ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/ark" \
+        --prefix PATH : "${PATH}"
+  '';
+  meta = {
+    license = with lib.licenses; [ gpl2 lgpl3 ];
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/applications-16.04/baloo-widgets.nix b/pkgs/desktops/kde-5/applications-16.04/baloo-widgets.nix
new file mode 100644
index 000000000000..a24928160df1
--- /dev/null
+++ b/pkgs/desktops/kde-5/applications-16.04/baloo-widgets.nix
@@ -0,0 +1,35 @@
+{ kdeApp
+, lib
+, extra-cmake-modules
+, kdoctools
+, kconfig
+, kio
+, ki18n
+, kservice
+, kfilemetadata
+, baloo
+, kdelibs4support
+}:
+
+kdeApp {
+  name = "baloo-widgets";
+  nativeBuildInputs = [
+    extra-cmake-modules
+    kdoctools
+  ];
+  buildInputs = [
+    kconfig
+    kservice
+  ];
+  propagatedBuildInputs = [
+    baloo
+    kdelibs4support
+    kfilemetadata
+    ki18n
+    kio
+  ];
+  meta = {
+    license = [ lib.licenses.lgpl21 ];
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/applications-16.04/default.nix b/pkgs/desktops/kde-5/applications-16.04/default.nix
new file mode 100644
index 000000000000..f9d65ac6d87d
--- /dev/null
+++ b/pkgs/desktops/kde-5/applications-16.04/default.nix
@@ -0,0 +1,59 @@
+# Maintainer's Notes:
+#
+# Minor updates:
+#  1. Edit ./manifest.sh to point to the updated URL. Upstream sometimes
+#     releases updates that include only the changed packages; in this case,
+#     multiple URLs can be provided and the results will be merged.
+#  2. Run ./manifest.sh and ./dependencies.sh.
+#  3. Build and enjoy.
+#
+# Major updates:
+#  We prefer not to immediately overwrite older versions with major updates, so
+#  make a copy of this directory first. After copying, be sure to delete ./tmp
+#  if it exists. Then follow the minor update instructions.
+
+{ pkgs, debug ? false }:
+
+let
+
+  inherit (pkgs) lib stdenv;
+
+  srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; };
+  mirror = "mirror://kde";
+
+  packages = self: with self; {
+
+    kdeApp = import ./kde-app.nix {
+      inherit stdenv lib;
+      inherit debug srcs;
+    };
+
+    kdelibs = callPackage ./kdelibs { inherit (pkgs) attica phonon; };
+
+    ark = callPackage ./ark.nix {};
+    baloo-widgets = callPackage ./baloo-widgets.nix {};
+    dolphin = callPackage ./dolphin.nix {};
+    dolphin-plugins = callPackage ./dolphin-plugins.nix {};
+    ffmpegthumbs = callPackage ./ffmpegthumbs.nix {};
+    filelight = callPackage ./filelight.nix {};
+    gpgmepp = callPackage ./gpgmepp.nix {};
+    gwenview = callPackage ./gwenview.nix {};
+    kate = callPackage ./kate.nix {};
+    kcalc = callPackage ./kcalc.nix {};
+    kcolorchooser = callPackage ./kcolorchooser.nix {};
+    kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {};
+    kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {};
+    kgpg = callPackage ./kgpg.nix { inherit (pkgs.kde4) kdepimlibs; };
+    kio-extras = callPackage ./kio-extras.nix {};
+    konsole = callPackage ./konsole.nix {};
+    libkdcraw = callPackage ./libkdcraw.nix {};
+    libkexiv2 = callPackage ./libkexiv2.nix {};
+    libkipi = callPackage ./libkipi.nix {};
+    okular = callPackage ./okular.nix {};
+    print-manager = callPackage ./print-manager.nix {};
+    spectacle = callPackage ./spectacle.nix {};
+
+    l10n = pkgs.recurseIntoAttrs (import ./l10n.nix { inherit callPackage lib pkgs; });
+  };
+
+in packages
diff --git a/pkgs/desktops/kde-5/applications-16.04/dolphin-plugins.nix b/pkgs/desktops/kde-5/applications-16.04/dolphin-plugins.nix
new file mode 100644
index 000000000000..72a08c732614
--- /dev/null
+++ b/pkgs/desktops/kde-5/applications-16.04/dolphin-plugins.nix
@@ -0,0 +1,31 @@
+{ kdeApp
+, lib
+, extra-cmake-modules
+, kdoctools
+, kxmlgui
+, ki18n
+, kio
+, kdelibs4support
+, dolphin
+}:
+
+kdeApp {
+  name = "dolphin-plugins";
+  nativeBuildInputs = [
+    extra-cmake-modules
+    kdoctools
+  ];
+  buildInputs = [
+    kxmlgui
+    dolphin
+  ];
+  propagatedBuildInputs = [
+    kdelibs4support
+    ki18n
+    kio
+  ];
+  meta = {
+    license = [ lib.licenses.gpl2 ];
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/applications-16.04/dolphin.nix b/pkgs/desktops/kde-5/applications-16.04/dolphin.nix
new file mode 100644
index 000000000000..3218146f510e
--- /dev/null
+++ b/pkgs/desktops/kde-5/applications-16.04/dolphin.nix
@@ -0,0 +1,70 @@
+{ kdeApp
+, lib
+, extra-cmake-modules
+, kdoctools
+, makeQtWrapper
+, kinit
+, kcmutils
+, kcoreaddons
+, knewstuff
+, ki18n
+, kdbusaddons
+, kbookmarks
+, kconfig
+, kio
+, kparts
+, solid
+, kiconthemes
+, kcompletion
+, ktexteditor
+, kwindowsystem
+, knotifications
+, kactivities
+, phonon
+, baloo
+, baloo-widgets
+, kfilemetadata
+, kdelibs4support
+}:
+
+kdeApp {
+  name = "dolphin";
+  nativeBuildInputs = [
+    extra-cmake-modules
+    kdoctools
+    makeQtWrapper
+  ];
+  buildInputs = [
+    kinit
+    kcmutils
+    kcoreaddons
+    knewstuff
+    kdbusaddons
+    kbookmarks
+    kconfig
+    kparts
+    solid
+    kiconthemes
+    kcompletion
+    knotifications
+    phonon
+    baloo-widgets
+  ];
+  propagatedBuildInputs = [
+    baloo
+    kactivities
+    kdelibs4support
+    kfilemetadata
+    ki18n
+    kio
+    ktexteditor
+    kwindowsystem
+  ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/dolphin"
+  '';
+  meta = {
+    license = with lib.licenses; [ gpl2 fdl12 ];
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/applications-16.04/fetchsrcs.sh b/pkgs/desktops/kde-5/applications-16.04/fetchsrcs.sh
new file mode 100755
index 000000000000..2b130c7e3aff
--- /dev/null
+++ b/pkgs/desktops/kde-5/applications-16.04/fetchsrcs.sh
@@ -0,0 +1,56 @@
+#! /usr/bin/env nix-shell
+#! nix-shell -i bash -p coreutils findutils gnused nix wget
+
+set -x
+
+# The trailing slash at the end is necessary!
+WGET_ARGS='http://download.kde.org/stable/applications/16.04.0/ -A *.tar.xz'
+
+mkdir tmp; cd tmp
+
+rm -f ../srcs.csv
+
+wget -nH -r -c --no-parent $WGET_ARGS
+
+find . | while read src; do
+    if [[ -f "${src}" ]]; then
+        # Sanitize file name
+        filename=$(basename "$src" | tr '@' '_')
+        nameVersion="${filename%.tar.*}"
+        name=$(echo "$nameVersion" | sed -e 's,-[[:digit:]].*,,' | sed -e 's,-opensource-src$,,')
+        version=$(echo "$nameVersion" | sed -e 's,^\([[:alpha:]][[:alnum:]]*-\)\+,,')
+        echo "$name,$version,$src,$filename" >>../srcs.csv
+    fi
+done
+
+cat >../srcs.nix <<EOF
+# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
+{ fetchurl, mirror }:
+
+{
+EOF
+
+gawk -F , "{ print \$1 }" ../srcs.csv | sort | uniq | while read name; do
+    versions=$(gawk -F , "/^$name,/ { print \$2 }" ../srcs.csv)
+    latestVersion=$(echo "$versions" | sort -rV | head -n 1)
+    src=$(gawk -F , "/^$name,$latestVersion,/ { print \$3 }" ../srcs.csv)
+    filename=$(gawk -F , "/^$name,$latestVersion,/ { print \$4 }" ../srcs.csv)
+    url="${src:2}"
+    sha256=$(nix-hash --type sha256 --base32 --flat "$src")
+    cat >>../srcs.nix <<EOF
+  $name = {
+    version = "$latestVersion";
+    src = fetchurl {
+      url = "\${mirror}/$url";
+      sha256 = "$sha256";
+      name = "$filename";
+    };
+  };
+EOF
+done
+
+echo "}" >>../srcs.nix
+
+rm -f ../srcs.csv
+
+cd ..
diff --git a/pkgs/desktops/kde-5/applications-16.04/ffmpegthumbs.nix b/pkgs/desktops/kde-5/applications-16.04/ffmpegthumbs.nix
new file mode 100644
index 000000000000..53e9d807d647
--- /dev/null
+++ b/pkgs/desktops/kde-5/applications-16.04/ffmpegthumbs.nix
@@ -0,0 +1,21 @@
+{ kdeApp
+, lib
+, extra-cmake-modules
+, ffmpeg
+, kio
+}:
+
+kdeApp {
+  name = "ffmpegthumbs";
+  nativeBuildInputs = [
+    extra-cmake-modules
+  ];
+  buildInputs = [
+    ffmpeg
+    kio
+  ];
+  meta = {
+    license = with lib.licenses; [ gpl2 bsd3 ];
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/applications-16.04/filelight.nix b/pkgs/desktops/kde-5/applications-16.04/filelight.nix
new file mode 100644
index 000000000000..df5e097a540e
--- /dev/null
+++ b/pkgs/desktops/kde-5/applications-16.04/filelight.nix
@@ -0,0 +1,35 @@
+{ kdeApp
+, lib
+, extra-cmake-modules
+, kdoctools
+, makeQtWrapper
+, qtscript
+, kio
+, solid
+, kxmlgui
+, kparts
+}:
+
+kdeApp {
+  name = "filelight";
+  nativeBuildInputs = [
+    extra-cmake-modules
+    kdoctools
+    makeQtWrapper
+  ];
+  buildInputs = [
+    kio
+    kparts
+    qtscript
+    solid
+    kxmlgui
+  ];
+
+  postInstall = ''
+    wrapQtProgram "$out/bin/filelight"
+  '';
+  meta = {
+    license = with lib.licenses; [ gpl2 ];
+    maintainers = with lib.maintainers; [ fridh vcunat ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/applications-16.04/gpgmepp.nix b/pkgs/desktops/kde-5/applications-16.04/gpgmepp.nix
new file mode 100644
index 000000000000..ac14573dcaa3
--- /dev/null
+++ b/pkgs/desktops/kde-5/applications-16.04/gpgmepp.nix
@@ -0,0 +1,21 @@
+{ kdeApp
+, lib
+, extra-cmake-modules
+, boost
+, gpgme
+}:
+
+kdeApp {
+  name = "gpgmepp";
+  nativeBuildInputs = [
+    extra-cmake-modules
+  ];
+  buildInputs = [
+    boost
+    gpgme
+  ];
+  meta = {
+    license = with lib.licenses; [ lgpl21 bsd3 ];
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/applications-16.04/gwenview.nix b/pkgs/desktops/kde-5/applications-16.04/gwenview.nix
new file mode 100644
index 000000000000..732ac11e96d0
--- /dev/null
+++ b/pkgs/desktops/kde-5/applications-16.04/gwenview.nix
@@ -0,0 +1,44 @@
+{ kdeApp
+, lib
+, extra-cmake-modules
+, kdoctools
+, makeQtWrapper
+, baloo
+, exiv2
+, kactivities
+, kdelibs4support
+, kio
+, lcms2
+, phonon
+, qtsvg
+, qtx11extras
+}:
+
+kdeApp {
+  name = "gwenview";
+  nativeBuildInputs = [
+    extra-cmake-modules
+    kdoctools
+    makeQtWrapper
+  ];
+  buildInputs = [
+    exiv2
+    lcms2
+    phonon
+    qtsvg
+  ];
+  propagatedBuildInputs = [
+    baloo
+    kactivities
+    kdelibs4support
+    kio
+    qtx11extras
+  ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/gwenview"
+  '';
+  meta = {
+    license = with lib.licenses; [ gpl2 fdl12 ];
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/applications-16.04/kate.nix b/pkgs/desktops/kde-5/applications-16.04/kate.nix
new file mode 100644
index 000000000000..91eeb2314a4c
--- /dev/null
+++ b/pkgs/desktops/kde-5/applications-16.04/kate.nix
@@ -0,0 +1,69 @@
+{ kdeApp
+, lib
+, extra-cmake-modules
+, kdoctools
+, qtscript
+, kactivities
+, kconfig
+, kcrash
+, kguiaddons
+, kiconthemes
+, ki18n
+, kinit
+, kjobwidgets
+, kio
+, kparts
+, ktexteditor
+, kwindowsystem
+, kxmlgui
+, kdbusaddons
+, kwallet
+, plasma-framework
+, kitemmodels
+, knotifications
+, threadweaver
+, knewstuff
+, libgit2
+}:
+
+kdeApp {
+  name = "kate";
+  nativeBuildInputs = [
+    extra-cmake-modules
+    kdoctools
+  ];
+  buildInputs = [
+    qtscript
+    kconfig
+    kcrash
+    kguiaddons
+    kiconthemes
+    kinit
+    kjobwidgets
+    kparts
+    kxmlgui
+    kdbusaddons
+    kwallet
+    kitemmodels
+    knotifications
+    threadweaver
+    knewstuff
+    libgit2
+  ];
+  propagatedBuildInputs = [
+    kactivities
+    ki18n
+    kio
+    ktexteditor
+    kwindowsystem
+    plasma-framework
+  ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/kate"
+    wrapQtProgram "$out/bin/kwrite"
+  '';
+  meta = {
+    license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ];
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/applications-16.04/kcalc.nix b/pkgs/desktops/kde-5/applications-16.04/kcalc.nix
new file mode 100644
index 000000000000..e4c8e9d69253
--- /dev/null
+++ b/pkgs/desktops/kde-5/applications-16.04/kcalc.nix
@@ -0,0 +1,39 @@
+{ kdeApp
+, lib
+, makeQtWrapper
+, extra-cmake-modules
+, gmp
+, kdoctools
+, kconfig
+, kconfigwidgets
+, kguiaddons
+, kinit
+, knotifications
+}:
+
+kdeApp {
+  name = "kcalc";
+
+  nativeBuildInputs = [
+    extra-cmake-modules
+    kdoctools
+  ];
+
+  buildInputs = [
+    gmp
+    kconfig
+    kconfigwidgets
+    kguiaddons
+    kinit
+    knotifications
+  ];
+
+  postInstall = ''
+    wrapQtProgram "$out/bin/kcalc"
+  '';
+
+  meta = {
+    license = with lib.licenses; [ gpl2 ];
+    maintainers = [ lib.maintainers.fridh ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/applications-16.04/kcolorchooser.nix b/pkgs/desktops/kde-5/applications-16.04/kcolorchooser.nix
new file mode 100644
index 000000000000..0f8e8fbee829
--- /dev/null
+++ b/pkgs/desktops/kde-5/applications-16.04/kcolorchooser.nix
@@ -0,0 +1,16 @@
+{ kdeApp, lib
+, extra-cmake-modules
+, ki18n, kwidgetsaddons, kxmlgui
+}:
+
+kdeApp {
+  name = "kcolorchooser";
+
+  meta = {
+    license = with lib.licenses; [ mit ];
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ ki18n kwidgetsaddons kxmlgui ];
+}
diff --git a/pkgs/desktops/kde-5/applications-16.04/kde-app.nix b/pkgs/desktops/kde-5/applications-16.04/kde-app.nix
new file mode 100644
index 000000000000..2f1fdc1d643c
--- /dev/null
+++ b/pkgs/desktops/kde-5/applications-16.04/kde-app.nix
@@ -0,0 +1,25 @@
+{ stdenv, lib, debug, srcs }:
+
+args:
+
+let
+  inherit (args) name;
+  sname = args.sname or name;
+  inherit (srcs."${sname}") src version;
+in
+stdenv.mkDerivation (args // {
+  name = "${name}-${version}";
+  inherit src;
+
+  outputs = args.outputs or [ "dev" "out" ];
+
+  cmakeFlags =
+    (args.cmakeFlags or [])
+    ++ [ "-DBUILD_TESTING=OFF" ]
+    ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug";
+
+  meta = {
+    platforms = lib.platforms.linux;
+    homepage = "http://www.kde.org";
+  } // (args.meta or {});
+})
diff --git a/pkgs/desktops/kde-5/applications-16.04/kde-locale-4.nix b/pkgs/desktops/kde-5/applications-16.04/kde-locale-4.nix
new file mode 100644
index 000000000000..e83794c60d81
--- /dev/null
+++ b/pkgs/desktops/kde-5/applications-16.04/kde-locale-4.nix
@@ -0,0 +1,27 @@
+name: args:
+
+{ kdeApp, automoc4, cmake, gettext, kdelibs, perl }:
+
+kdeApp (args // {
+  sname = "kde-l10n-${name}";
+  name = "kde-l10n-${name}-qt4";
+
+  outputs = [ "out" ];
+
+  nativeBuildInputs =
+    [ automoc4 cmake gettext perl ]
+    ++ (args.nativeBuildInputs or []);
+  buildInputs =
+    [ kdelibs ]
+    ++ (args.buildInputs or []);
+
+  preConfigure = ''
+    sed -e 's/add_subdirectory(5)//' -i CMakeLists.txt
+    ${args.preConfigure or ""}
+  '';
+
+  preFixup = ''
+    propagatedBuildInputs=
+    propagatedNativeBuildInputs=
+  '';
+})
diff --git a/pkgs/desktops/kde-5/applications-16.04/kde-locale-5.nix b/pkgs/desktops/kde-5/applications-16.04/kde-locale-5.nix
new file mode 100644
index 000000000000..772ebe37e44f
--- /dev/null
+++ b/pkgs/desktops/kde-5/applications-16.04/kde-locale-5.nix
@@ -0,0 +1,24 @@
+name: args:
+
+{ kdeApp, cmake, extra-cmake-modules, gettext, kdoctools }:
+
+kdeApp (args // {
+  sname = "kde-l10n-${name}";
+  name = "kde-l10n-${name}-qt5";
+
+  outputs = [ "out" ];
+
+  nativeBuildInputs =
+    [ cmake extra-cmake-modules gettext kdoctools ]
+    ++ (args.nativeBuildInputs or []);
+
+  preConfigure = ''
+    sed -e 's/add_subdirectory(4)//' -i CMakeLists.txt
+    ${args.preConfigure or ""}
+  '';
+
+  preFixup = ''
+    propagatedBuildInputs=
+    propagatedNativeBuildInputs=
+  '';
+})
diff --git a/pkgs/desktops/kde-5/applications-16.04/kdegraphics-thumbnailers.nix b/pkgs/desktops/kde-5/applications-16.04/kdegraphics-thumbnailers.nix
new file mode 100644
index 000000000000..520bad0d066a
--- /dev/null
+++ b/pkgs/desktops/kde-5/applications-16.04/kdegraphics-thumbnailers.nix
@@ -0,0 +1,23 @@
+{ kdeApp
+, lib
+, extra-cmake-modules
+, kio
+, libkexiv2
+, libkdcraw
+}:
+
+kdeApp {
+  name = "kdegraphics-thumbnailers";
+  nativeBuildInputs = [
+    extra-cmake-modules
+  ];
+  buildInputs = [
+    kio
+    libkexiv2
+    libkdcraw
+  ];
+  meta = {
+    license = [ lib.licenses.lgpl21 ];
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/applications-16.04/kdelibs/0001-old-kde4-cmake-policies.patch b/pkgs/desktops/kde-5/applications-16.04/kdelibs/0001-old-kde4-cmake-policies.patch
new file mode 100644
index 000000000000..b7d7300e9a84
--- /dev/null
+++ b/pkgs/desktops/kde-5/applications-16.04/kdelibs/0001-old-kde4-cmake-policies.patch
@@ -0,0 +1,56 @@
+From b43c49109694940f0a26240753e879eb629dd02d Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Mon, 7 Sep 2015 13:54:57 -0500
+Subject: [PATCH 1/2] old kde4 cmake policies
+
+---
+ cmake/modules/FindKDE4Internal.cmake | 33 +++++++++++++++++++++++++++++++++
+ 1 file changed, 33 insertions(+)
+
+diff --git a/cmake/modules/FindKDE4Internal.cmake b/cmake/modules/FindKDE4Internal.cmake
+index 7d54b9b..c435571 100644
+--- a/cmake/modules/FindKDE4Internal.cmake
++++ b/cmake/modules/FindKDE4Internal.cmake
+@@ -345,6 +345,39 @@
+ # Redistribution and use is allowed according to the terms of the BSD license.
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+ 
++# this is required now by cmake 2.6 and so must not be skipped by if(KDE4_FOUND) below
++cmake_minimum_required(VERSION 2.8.9 FATAL_ERROR)
++# set the cmake policies to the 2.4.x compatibility settings (may change for KDE 4.3)
++cmake_policy(VERSION 2.4.5)
++
++# CMake 2.6, set compatibility behaviour to cmake 2.4
++# this must be executed always, because the CMAKE_MINIMUM_REQUIRED() command above
++# resets the policy settings, so we get a lot of warnings
++
++# CMP0000: don't require cmake_minimum_version() directly in the top level CMakeLists.txt, FindKDE4Internal.cmake is good enough
++cmake_policy(SET CMP0000 OLD)
++# CMP0002: in KDE4 we have multiple targets with the same name for the unit tests
++cmake_policy(SET CMP0002 OLD)
++# CMP0003: add the link paths to the link command as with cmake 2.4
++cmake_policy(SET CMP0003 OLD)
++# CMP0005: keep escaping behaviour for definitions added via add_definitions()
++cmake_policy(SET CMP0005 OLD)
++# since cmake 2.6.3: NEW behaviour is that setting policies doesn't "escape" the file
++# where this is done, macros and functions are executed with the policies as they
++# were when the were defined. Keep the OLD behaviour so we can set the policies here
++# for all KDE software without the big warning
++cmake_policy(SET CMP0011 OLD)
++
++# since cmake 2.8.4: when include()ing from inside cmake's module dir, prefer the files
++# in this directory over those from CMAKE_MODULE_PATH
++cmake_policy(SET CMP0017 NEW)
++
++# since cmake 3.0: use of the LOCATION target property is disallowed while it is used in KDE4Macros.cmake
++if (POLICY CMP0026)
++  cmake_policy(SET CMP0026 OLD)
++endif (POLICY CMP0026)
++
++
+ # Only do something if it hasn't been found yet
+ if(NOT KDE4_FOUND)
+ 
+-- 
+2.5.0
+
diff --git a/pkgs/desktops/kde-5/applications-16.04/kdelibs/0002-polkit-install-path.patch b/pkgs/desktops/kde-5/applications-16.04/kdelibs/0002-polkit-install-path.patch
new file mode 100644
index 000000000000..ff0306ea1488
--- /dev/null
+++ b/pkgs/desktops/kde-5/applications-16.04/kdelibs/0002-polkit-install-path.patch
@@ -0,0 +1,25 @@
+From fab35bac146a817f3af80f45531355fd70cd226b Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Mon, 7 Sep 2015 13:56:03 -0500
+Subject: [PATCH 2/2] polkit install path
+
+---
+ kdecore/auth/ConfigureChecks.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/kdecore/auth/ConfigureChecks.cmake b/kdecore/auth/ConfigureChecks.cmake
+index 7cf9cb5..c8334ae 100644
+--- a/kdecore/auth/ConfigureChecks.cmake
++++ b/kdecore/auth/ConfigureChecks.cmake
+@@ -150,7 +150,7 @@ elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "POLKITQT-1")
+         ${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)
+-- 
+2.5.0
+
diff --git a/pkgs/desktops/kde-5/applications-16.04/kdelibs/0003-remove_xdg_impurities.patch b/pkgs/desktops/kde-5/applications-16.04/kdelibs/0003-remove_xdg_impurities.patch
new file mode 100644
index 000000000000..a79d7b2b7d16
--- /dev/null
+++ b/pkgs/desktops/kde-5/applications-16.04/kdelibs/0003-remove_xdg_impurities.patch
@@ -0,0 +1,47 @@
+diff --git a/kdecore/kernel/kstandarddirs.cpp b/kdecore/kernel/kstandarddirs.cpp
+index ab8f76d..2ae5089 100644
+--- a/kdecore/kernel/kstandarddirs.cpp
++++ b/kdecore/kernel/kstandarddirs.cpp
+@@ -1768,12 +1768,6 @@ void KStandardDirs::addKDEDefaults()
+     else
+     {
+         xdgdirList.clear();
+-        xdgdirList.append(QString::fromLatin1("/etc/xdg"));
+-#ifdef Q_WS_WIN
+-        xdgdirList.append(installPath("kdedir") + QString::fromLatin1("etc/xdg"));
+-#else
+-        xdgdirList.append(QFile::decodeName(KDESYSCONFDIR "/xdg"));
+-#endif
+     }
+ 
+     QString localXdgDir = readEnvPath("XDG_CONFIG_HOME");
+@@ -1821,10 +1815,6 @@ void KStandardDirs::addKDEDefaults()
+         }
+     } else {
+         xdgdirList = kdedirDataDirs;
+-#ifndef Q_WS_WIN
+-        xdgdirList.append(QString::fromLatin1("/usr/local/share/"));
+-        xdgdirList.append(QString::fromLatin1("/usr/share/"));
+-#endif
+     }
+ 
+     localXdgDir = readEnvPath("XDG_DATA_HOME");
+diff --git a/solid/solid/xdgbasedirs.cpp b/solid/solid/xdgbasedirs.cpp
+index 4c9cad9..6849d45 100644
+--- a/solid/solid/xdgbasedirs.cpp
++++ b/solid/solid/xdgbasedirs.cpp
+@@ -70,12 +70,12 @@ QStringList Solid::XdgBaseDirs::systemPathList( const char *resource )
+ {
+   if ( qstrncmp( "data", resource, 4 ) == 0 ) {
+     if ( instance()->mDataDirs.isEmpty() ) {
+-      instance()->mDataDirs = instance()->systemPathList( "XDG_DATA_DIRS", "/usr/local/share:/usr/share" );
++      instance()->mDataDirs = instance()->systemPathList( "XDG_DATA_DIRS", "" );
+     }
+     return instance()->mDataDirs;
+   } else if ( qstrncmp( "config", resource, 6 ) == 0 ) {
+     if ( instance()->mConfigDirs.isEmpty() ) {
+-      instance()->mConfigDirs = instance()->systemPathList( "XDG_CONFIG_DIRS", "/etc/xdg" );
++      instance()->mConfigDirs = instance()->systemPathList( "XDG_CONFIG_DIRS", "" );
+     }
+     return instance()->mConfigDirs;
+   }
diff --git a/pkgs/desktops/kde-5/applications-16.04/kdelibs/default.nix b/pkgs/desktops/kde-5/applications-16.04/kdelibs/default.nix
new file mode 100644
index 000000000000..389362deecc6
--- /dev/null
+++ b/pkgs/desktops/kde-5/applications-16.04/kdelibs/default.nix
@@ -0,0 +1,45 @@
+{ kdeApp, attica, attr, automoc4, avahi, bison, cmake
+, docbook_xml_dtd_42, docbook_xsl, flex, giflib, ilmbase
+, libdbusmenu_qt, libjpeg, libxml2, libxslt, perl, phonon, pkgconfig
+, polkit_qt4, qca2, qt4, shared_desktop_ontologies, shared_mime_info
+, soprano, strigi, udev, xz, pcre
+, lib
+}:
+
+kdeApp {
+  name = "kdelibs";
+
+  outputs = [ "out" ];
+
+  buildInputs = [
+    attica attr avahi giflib libdbusmenu_qt libjpeg libxml2
+    polkit_qt4 qca2 shared_desktop_ontologies udev xz pcre
+  ];
+  propagatedBuildInputs = [ qt4 soprano phonon strigi ];
+  nativeBuildInputs = [
+    automoc4 bison cmake flex libxslt perl pkgconfig shared_mime_info
+  ];
+
+  patches = [
+    ./0001-old-kde4-cmake-policies.patch
+    ./0002-polkit-install-path.patch
+    ./0003-remove_xdg_impurities.patch
+  ];
+
+  # cmake does not detect path to `ilmbase`
+  NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
+
+  cmakeFlags = [
+    "-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook"
+    "-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook"
+    "-DWITH_SOLID_UDISKS2=ON"
+    "-DKDE_DEFAULT_HOME=.kde"
+  ];
+
+  setupHook = ./setup-hook.sh;
+
+  meta = {
+    licenses = with lib.licenses; [ gpl2 fdl12 lgpl21 ];
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/applications-16.04/kdelibs/setup-hook.sh b/pkgs/desktops/kde-5/applications-16.04/kdelibs/setup-hook.sh
new file mode 100644
index 000000000000..e0a75dc8acd0
--- /dev/null
+++ b/pkgs/desktops/kde-5/applications-16.04/kdelibs/setup-hook.sh
@@ -0,0 +1,10 @@
+addQt4Plugins() {
+  if [[ -d "$1/lib/qt4/plugins" ]]; then
+      propagatedUserEnvPkgs+=" $1"
+  fi
+
+  if [[ -d "$1/lib/kde4/plugins" ]]; then
+      propagatedUserEnvPkgs+=" $1"
+  fi
+}
+envHooks+=(addQt4Plugins)
diff --git a/pkgs/desktops/kde-5/applications-16.04/kdenetwork-filesharing.nix b/pkgs/desktops/kde-5/applications-16.04/kdenetwork-filesharing.nix
new file mode 100644
index 000000000000..4e99a43b3913
--- /dev/null
+++ b/pkgs/desktops/kde-5/applications-16.04/kdenetwork-filesharing.nix
@@ -0,0 +1,29 @@
+{ kdeApp
+, lib
+, extra-cmake-modules
+, kdoctools
+, kcoreaddons
+, ki18n
+, kio
+, kwidgetsaddons
+, samba
+}:
+
+kdeApp {
+  name = "kdenetwork-filesharing";
+  nativeBuildInputs = [
+    extra-cmake-modules
+    kdoctools
+  ];
+  buildInputs = [
+    kcoreaddons
+    ki18n
+    kio
+    kwidgetsaddons
+    samba
+  ];
+  meta = {
+    license = [ lib.licenses.gpl2 lib.licenses.lgpl21 ];
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/applications-16.04/kgpg.nix b/pkgs/desktops/kde-5/applications-16.04/kgpg.nix
new file mode 100644
index 000000000000..3ee925197189
--- /dev/null
+++ b/pkgs/desktops/kde-5/applications-16.04/kgpg.nix
@@ -0,0 +1,38 @@
+{ kdeApp
+, lib
+, automoc4
+, cmake
+, makeWrapper
+, perl
+, pkgconfig
+, boost
+, gpgme
+, kdelibs
+, kdepimlibs
+, gnupg
+}:
+
+kdeApp {
+  name = "kgpg";
+  nativeBuildInputs = [
+    automoc4
+    cmake
+    makeWrapper
+    perl
+    pkgconfig
+  ];
+  buildInputs = [
+    boost
+    gpgme
+    kdelibs
+    kdepimlibs
+  ];
+  postInstall = ''
+    wrapProgram "$out/bin/kgpg" \
+        --prefix PATH : "${gnupg}/bin"
+  '';
+  meta = {
+    license = [ lib.licenses.gpl2 ];
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/applications-16.04/kio-extras.nix b/pkgs/desktops/kde-5/applications-16.04/kio-extras.nix
new file mode 100644
index 000000000000..9de84913a250
--- /dev/null
+++ b/pkgs/desktops/kde-5/applications-16.04/kio-extras.nix
@@ -0,0 +1,42 @@
+{ kdeApp, lib
+, extra-cmake-modules, kdoctools
+, shared_mime_info
+, exiv2
+, kactivities, karchive
+, kbookmarks
+, kconfig, kconfigwidgets
+, kcoreaddons, kdbusaddons, kguiaddons
+, kdnssd
+, kiconthemes
+, ki18n
+, kio
+, khtml
+, kdelibs4support
+, kpty
+, libmtp
+, libssh
+, openexr, ilmbase
+, openslp
+, phonon
+, qtsvg
+, samba
+, solid
+}:
+
+kdeApp {
+  name = "kio-extras";
+  meta = {
+    license = with lib.licenses; [ gpl2 lgpl21 ];
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+  nativeBuildInputs = [
+    extra-cmake-modules kdoctools
+    shared_mime_info
+  ];
+  buildInputs = [
+    exiv2 kactivities karchive kbookmarks kconfig kconfigwidgets kcoreaddons
+    kdbusaddons kguiaddons kdnssd kiconthemes ki18n kio khtml kdelibs4support
+    kpty libmtp libssh openexr openslp phonon qtsvg samba solid
+  ];
+  NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev or ilmbase}/include/OpenEXR" ];
+}
diff --git a/pkgs/desktops/kde-5/applications-16.04/konsole.nix b/pkgs/desktops/kde-5/applications-16.04/konsole.nix
new file mode 100644
index 000000000000..4b4cba2a3779
--- /dev/null
+++ b/pkgs/desktops/kde-5/applications-16.04/konsole.nix
@@ -0,0 +1,68 @@
+{ kdeApp
+, lib
+, extra-cmake-modules
+, kdoctools
+, makeQtWrapper
+, qtscript
+, kbookmarks
+, kcompletion
+, kconfig
+, kconfigwidgets
+, kcoreaddons
+, kguiaddons
+, ki18n
+, kiconthemes
+, kinit
+, kdelibs4support
+, kio
+, knotifications
+, knotifyconfig
+, kparts
+, kpty
+, kservice
+, ktextwidgets
+, kwidgetsaddons
+, kwindowsystem
+, kxmlgui
+}:
+
+kdeApp {
+  name = "konsole";
+  nativeBuildInputs = [
+    extra-cmake-modules
+    kdoctools
+    makeQtWrapper
+  ];
+  buildInputs = [
+    qtscript
+    kbookmarks
+    kcompletion
+    kconfig
+    kconfigwidgets
+    kcoreaddons
+    kguiaddons
+    kiconthemes
+    kinit
+    kio
+    knotifications
+    knotifyconfig
+    kparts
+    kpty
+    kservice
+    ktextwidgets
+    kwidgetsaddons
+    kxmlgui
+  ];
+  propagatedBuildInputs = [
+    kdelibs4support
+    ki18n
+    kwindowsystem
+  ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/konsole"
+  '';
+  meta = {
+    license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/applications-16.04/l10n.nix b/pkgs/desktops/kde-5/applications-16.04/l10n.nix
new file mode 100644
index 000000000000..9b211faf4448
--- /dev/null
+++ b/pkgs/desktops/kde-5/applications-16.04/l10n.nix
@@ -0,0 +1,244 @@
+{ callPackage, pkgs, lib }:
+
+let
+
+  kdeLocale4 = import ./kde-locale-4.nix;
+  kdeLocale5 = import ./kde-locale-5.nix;
+
+in
+
+lib.mapAttrs (name: attr: pkgs.recurseIntoAttrs attr) {
+  ar = {
+    qt4 = callPackage (kdeLocale4 "ar" {}) {};
+    qt5 = callPackage (kdeLocale5 "ar" {}) {};
+  };
+  bg = {
+    qt4 = callPackage (kdeLocale4 "bg" {}) {};
+    qt5 = callPackage (kdeLocale5 "bg" {}) {};
+  };
+  bs = {
+    qt4 = callPackage (kdeLocale4 "bs" {}) {};
+    qt5 = callPackage (kdeLocale5 "bs" {}) {};
+  };
+  ca = {
+    qt4 = callPackage (kdeLocale4 "ca" {}) {};
+    qt5 = callPackage (kdeLocale5 "ca" {}) {};
+  };
+  ca_valencia = {
+    qt4 = callPackage (kdeLocale4 "ca_valencia" {}) {};
+    qt5 = callPackage (kdeLocale5 "ca_valencia" {}) {};
+  };
+  cs = {
+    qt4 = callPackage (kdeLocale4 "cs" {}) {};
+    qt5 = callPackage (kdeLocale5 "cs" {}) {};
+  };
+  da = {
+    qt4 = callPackage (kdeLocale4 "da" {}) {};
+    qt5 = callPackage (kdeLocale5 "da" {}) {};
+  };
+  de = {
+    qt4 = callPackage (kdeLocale4 "de" {}) {};
+    qt5 = callPackage (kdeLocale5 "de" {}) {};
+  };
+  el = {
+    qt4 = callPackage (kdeLocale4 "el" {}) {};
+    qt5 = callPackage (kdeLocale5 "el" {}) {};
+  };
+  en_GB = {
+    qt4 = callPackage (kdeLocale4 "en_GB" {}) {};
+    qt5 = callPackage (kdeLocale5 "en_GB" {}) {};
+  };
+  eo = {
+    qt4 = callPackage (kdeLocale4 "eo" {}) {};
+    qt5 = callPackage (kdeLocale5 "eo" {}) {};
+  };
+  es = {
+    qt4 = callPackage (kdeLocale4 "es" {}) {};
+    qt5 = callPackage (kdeLocale5 "es" {}) {};
+  };
+  et = {
+    qt4 = callPackage (kdeLocale4 "et" {}) {};
+    qt5 = callPackage (kdeLocale5 "et" {}) {};
+  };
+  eu = {
+    qt4 = callPackage (kdeLocale4 "eu" {}) {};
+    qt5 = callPackage (kdeLocale5 "eu" {}) {};
+  };
+  fa = {
+    qt4 = callPackage (kdeLocale4 "fa" {}) {};
+    qt5 = callPackage (kdeLocale5 "fa" {}) {};
+  };
+  fi = {
+    qt4 = callPackage (kdeLocale4 "fi" {}) {};
+    qt5 = callPackage (kdeLocale5 "fi" {}) {};
+  };
+  fr = {
+    qt4 = callPackage (kdeLocale4 "fr" {}) {};
+    qt5 = callPackage (kdeLocale5 "fr" {}) {};
+  };
+  ga = {
+    qt4 = callPackage (kdeLocale4 "ga" {}) {};
+    qt5 = callPackage (kdeLocale5 "ga" {}) {};
+  };
+  gl = {
+    qt4 = callPackage (kdeLocale4 "gl" {}) {};
+    qt5 = callPackage (kdeLocale5 "gl" {}) {};
+  };
+  he = {
+    qt4 = callPackage (kdeLocale4 "he" {}) {};
+    qt5 = callPackage (kdeLocale5 "he" {}) {};
+  };
+  hi = {
+    qt4 = callPackage (kdeLocale4 "hi" {}) {};
+    qt5 = callPackage (kdeLocale5 "hi" {}) {};
+  };
+  hr = {
+    qt4 = callPackage (kdeLocale4 "hr" {}) {};
+    qt5 = callPackage (kdeLocale5 "hr" {}) {};
+  };
+  hu = {
+    qt4 = callPackage (kdeLocale4 "hu" {}) {};
+    qt5 = callPackage (kdeLocale5 "hu" {}) {};
+  };
+  ia = {
+    qt4 = callPackage (kdeLocale4 "ia" {}) {};
+    qt5 = callPackage (kdeLocale5 "ia" {}) {};
+  };
+  id = {
+    qt4 = callPackage (kdeLocale4 "id" {}) {};
+    qt5 = callPackage (kdeLocale5 "id" {}) {};
+  };
+  is = {
+    qt4 = callPackage (kdeLocale4 "is" {}) {};
+    qt5 = callPackage (kdeLocale5 "is" {}) {};
+  };
+  it = {
+    qt4 = callPackage (kdeLocale4 "it" {}) {};
+    qt5 = callPackage (kdeLocale5 "it" {}) {};
+  };
+  ja = {
+    qt4 = callPackage (kdeLocale4 "ja" {}) {};
+    qt5 = callPackage (kdeLocale5 "ja" {}) {};
+  };
+  kk = {
+    qt4 = callPackage (kdeLocale4 "kk" {}) {};
+    qt5 = callPackage (kdeLocale5 "kk" {}) {};
+  };
+  km = {
+    qt4 = callPackage (kdeLocale4 "km" {}) {};
+    qt5 = callPackage (kdeLocale5 "km" {}) {};
+  };
+  ko = {
+    qt4 = callPackage (kdeLocale4 "ko" {}) {};
+    qt5 = callPackage (kdeLocale5 "ko" {}) {};
+  };
+  lt = {
+    qt4 = callPackage (kdeLocale4 "lt" {}) {};
+    qt5 = callPackage (kdeLocale5 "lt" {}) {};
+  };
+  lv = {
+    qt4 = callPackage (kdeLocale4 "lv" {}) {};
+    qt5 = callPackage (kdeLocale5 "lv" {}) {};
+  };
+  mr = {
+    qt4 = callPackage (kdeLocale4 "mr" {}) {};
+    qt5 = callPackage (kdeLocale5 "mr" {}) {};
+  };
+  nb = {
+    qt4 = callPackage (kdeLocale4 "nb" {}) {};
+    qt5 = callPackage (kdeLocale5 "nb" {}) {};
+  };
+  nds = {
+    qt4 = callPackage (kdeLocale4 "nds" {}) {};
+    qt5 = callPackage (kdeLocale5 "nds" {}) {};
+  };
+  nl = {
+    qt4 = callPackage (kdeLocale4 "nl" {}) {};
+    qt5 = callPackage (kdeLocale5 "nl" {}) {};
+  };
+  nn = {
+    qt4 = callPackage (kdeLocale4 "nn" {}) {};
+    qt5 = callPackage (kdeLocale5 "nn" {}) {};
+  };
+  pa = {
+    qt4 = callPackage (kdeLocale4 "pa" {}) {};
+    qt5 = callPackage (kdeLocale5 "pa" {}) {};
+  };
+  pl = {
+    qt4 = callPackage (kdeLocale4 "pl" {}) {};
+    qt5 = callPackage (kdeLocale5 "pl" {}) {};
+  };
+  pt = {
+    qt4 = callPackage (kdeLocale4 "pt" {}) {};
+    qt5 = callPackage (kdeLocale5 "pt" {}) {};
+  };
+  pt_BR = {
+    qt4 = callPackage (kdeLocale4 "pt_BR" {}) {};
+    qt5 = callPackage (kdeLocale5 "pt_BR" {}) {};
+  };
+  ro = {
+    qt4 = callPackage (kdeLocale4 "ro" {}) {};
+    qt5 = callPackage (kdeLocale5 "ro" {}) {};
+  };
+  ru = {
+    qt4 = callPackage (kdeLocale4 "ru" {}) {};
+    qt5 = callPackage (kdeLocale5 "ru" {}) {};
+  };
+  sk = {
+    qt4 = callPackage (kdeLocale4 "sk" {}) {};
+    qt5 = callPackage (kdeLocale5 "sk" {}) {};
+  };
+  sl = {
+    qt4 = callPackage (kdeLocale4 "sl" {}) {};
+    qt5 = callPackage (kdeLocale5 "sl" {}) {};
+  };
+  sr = {
+    qt4 = callPackage (kdeLocale4 "sr" {
+      preConfigure = ''
+        patchShebangs \
+            4/sr/sr@latin/scripts/ts-pmap-compile.py \
+            4/sr/scripts/ts-pmap-compile.py \
+            4/sr/data/resolve-sr-hybrid \
+            4/sr/sr@ijekavian/scripts/ts-pmap-compile.py \
+            4/sr/sr@ijekavianlatin/scripts/ts-pmap-compile.py
+        '';
+    }) {};
+    qt5 = callPackage (kdeLocale5 "sr" {
+      preConfigure = ''
+        patchShebangs 5/sr/data/resolve-sr-hybrid
+        sed -e 's/add_subdirectory(kdesdk)//' -i 5/sr/data/CMakeLists.txt
+      '';
+    }) {};
+  };
+  sv = {
+    qt4 = callPackage (kdeLocale4 "sv" {}) {};
+    qt5 = callPackage (kdeLocale5 "sv" {}) {};
+  };
+  tr = {
+    qt4 = callPackage (kdeLocale4 "tr" {}) {};
+    qt5 = callPackage (kdeLocale5 "tr" {}) {};
+  };
+  ug = {
+    qt4 = callPackage (kdeLocale4 "ug" {}) {};
+    qt5 = callPackage (kdeLocale5 "ug" {}) {};
+  };
+  # TODO: build broken in 15.11.80; re-enable in next release
+  /*
+  uk = {
+    qt4 = callPackage (kdeLocale4 "uk" {}) {};
+    qt5 = callPackage (kdeLocale5 "uk" {}) {};
+  };
+  */
+  wa = {
+    qt4 = callPackage (kdeLocale4 "wa" {}) {};
+    qt5 = callPackage (kdeLocale5 "wa" {}) {};
+  };
+  zh_CN = {
+    qt4 = callPackage (kdeLocale4 "zh_CN" {}) {};
+    qt5 = callPackage (kdeLocale5 "zh_CN" {}) {};
+  };
+  zh_TW = {
+    qt4 = callPackage (kdeLocale4 "zh_TW" {}) {};
+    qt5 = callPackage (kdeLocale5 "zh_TW" {}) {};
+  };
+}
diff --git a/pkgs/desktops/kde-5/applications-16.04/libkdcraw.nix b/pkgs/desktops/kde-5/applications-16.04/libkdcraw.nix
new file mode 100644
index 000000000000..319c7fc6583d
--- /dev/null
+++ b/pkgs/desktops/kde-5/applications-16.04/libkdcraw.nix
@@ -0,0 +1,19 @@
+{ kdeApp
+, lib
+, extra-cmake-modules
+, libraw
+}:
+
+kdeApp {
+  name = "libkdcraw";
+  nativeBuildInputs = [
+    extra-cmake-modules
+  ];
+  buildInputs = [
+    libraw
+  ];
+  meta = {
+    license = with lib.licenses; [ gpl2 lgpl21 bsd3 ];
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/applications-16.04/libkexiv2.nix b/pkgs/desktops/kde-5/applications-16.04/libkexiv2.nix
new file mode 100644
index 000000000000..afb1ac836537
--- /dev/null
+++ b/pkgs/desktops/kde-5/applications-16.04/libkexiv2.nix
@@ -0,0 +1,19 @@
+{ kdeApp
+, lib
+, exiv2
+, extra-cmake-modules
+}:
+
+kdeApp {
+  name = "libkexiv2";
+  nativeBuildInputs = [
+    extra-cmake-modules
+  ];
+  buildInputs = [
+    exiv2
+  ];
+  meta = {
+    license = with lib.licenses; [ gpl2 lgpl21 bsd3 ];
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/applications-16.04/libkipi.nix b/pkgs/desktops/kde-5/applications-16.04/libkipi.nix
new file mode 100644
index 000000000000..c23cd8578fb9
--- /dev/null
+++ b/pkgs/desktops/kde-5/applications-16.04/libkipi.nix
@@ -0,0 +1,22 @@
+{ kdeApp
+, lib
+, extra-cmake-modules
+, kconfig
+, ki18n
+, kservice
+, kxmlgui
+}:
+
+kdeApp {
+  name = "libkipi";
+  nativeBuildInputs = [
+    extra-cmake-modules
+  ];
+  buildInputs = [
+    kconfig ki18n kservice kxmlgui
+  ];
+  meta = {
+    license = with lib.licenses; [ gpl2 lgpl21 bsd3 ];
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/applications-16.04/okular.nix b/pkgs/desktops/kde-5/applications-16.04/okular.nix
new file mode 100644
index 000000000000..0691325d7a52
--- /dev/null
+++ b/pkgs/desktops/kde-5/applications-16.04/okular.nix
@@ -0,0 +1,41 @@
+{ kdeApp
+, lib
+, automoc4
+, cmake
+, perl
+, pkgconfig
+, kdelibs
+, qimageblitz
+, poppler_qt4
+, libspectre
+, libkexiv2
+, djvulibre
+, libtiff
+, freetype
+, ebook_tools
+}:
+
+kdeApp {
+  name = "okular";
+  nativeBuildInputs = [
+    automoc4
+    cmake
+    perl
+    pkgconfig
+  ];
+  buildInputs = [
+    kdelibs
+    qimageblitz
+    poppler_qt4
+    libspectre
+    libkexiv2
+    djvulibre
+    libtiff
+    freetype
+    ebook_tools
+  ];
+  meta = {
+    license = with lib.licenses; [ gpl2 lgpl21 fdl12 bsd3 ];
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/applications-16.04/print-manager.nix b/pkgs/desktops/kde-5/applications-16.04/print-manager.nix
new file mode 100644
index 000000000000..b4eab372789d
--- /dev/null
+++ b/pkgs/desktops/kde-5/applications-16.04/print-manager.nix
@@ -0,0 +1,47 @@
+{ kdeApp
+, lib
+, extra-cmake-modules
+, qtdeclarative
+, cups
+, kconfig
+, kconfigwidgets
+, kdbusaddons
+, kiconthemes
+, ki18n
+, kcmutils
+, kio
+, knotifications
+, plasma-framework
+, kwidgetsaddons
+, kwindowsystem
+, kitemviews
+}:
+
+kdeApp {
+  name = "print-manager";
+  nativeBuildInputs = [
+    extra-cmake-modules
+  ];
+  buildInputs = [
+    cups
+    kconfig
+    kconfigwidgets
+    kdbusaddons
+    kiconthemes
+    kcmutils
+    knotifications
+    kwidgetsaddons
+    kitemviews
+  ];
+  propagatedBuildInputs = [
+    ki18n
+    kio
+    kwindowsystem
+    plasma-framework
+    qtdeclarative
+  ];
+  meta = {
+    license = [ lib.licenses.gpl2 ];
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/applications-16.04/spectacle.nix b/pkgs/desktops/kde-5/applications-16.04/spectacle.nix
new file mode 100644
index 000000000000..dc2fb708b531
--- /dev/null
+++ b/pkgs/desktops/kde-5/applications-16.04/spectacle.nix
@@ -0,0 +1,35 @@
+{ kdeApp, lib
+, extra-cmake-modules
+, kdoctools
+, makeQtWrapper
+, kconfig
+, kcoreaddons
+, kdbusaddons
+, kdeclarative
+, ki18n
+, kio
+, knotifications
+, kscreen
+, kwidgetsaddons
+, kwindowsystem
+, kxmlgui
+, libkipi
+, xcb-util-cursor
+}:
+
+kdeApp {
+  name = "spectacle";
+  nativeBuildInputs = [
+    extra-cmake-modules kdoctools makeQtWrapper
+  ];
+  buildInputs = [
+    kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications
+    kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi xcb-util-cursor
+  ];
+  postFixup = ''
+    wrapQtProgram "$out/bin/spectacle"
+  '';
+  meta = with lib; {
+    maintainers = with maintainers; [ ttuegel ];
+  };
+}
diff --git a/pkgs/desktops/kde-5/applications-16.04/srcs.nix b/pkgs/desktops/kde-5/applications-16.04/srcs.nix
new file mode 100644
index 000000000000..0185465e156c
--- /dev/null
+++ b/pkgs/desktops/kde-5/applications-16.04/srcs.nix
@@ -0,0 +1,2093 @@
+# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
+{ fetchurl, mirror }:
+
+{
+  akonadi = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/akonadi-16.04.0.tar.xz";
+      sha256 = "01m032iwy3yylxxfmznhn0aly20yc07h8z0ppzgx9gz8smn8351k";
+      name = "akonadi-16.04.0.tar.xz";
+    };
+  };
+  akonadi-calendar = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/akonadi-calendar-16.04.0.tar.xz";
+      sha256 = "1n06d0m2m553agn95b75sgqaijaaxdrdb6gnv4zizwjxr37cgnwm";
+      name = "akonadi-calendar-16.04.0.tar.xz";
+    };
+  };
+  akonadi-search = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/akonadi-search-16.04.0.tar.xz";
+      sha256 = "101cbms0mlv86g8ld027ras5bkzfil9avbpvfh2rnlfpm2yp3jgq";
+      name = "akonadi-search-16.04.0.tar.xz";
+    };
+  };
+  analitza = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/analitza-16.04.0.tar.xz";
+      sha256 = "0ir7siwxp6fi9gwri9ynp497ppg72vrbqnwaq3fk3rf9i4brib3s";
+      name = "analitza-16.04.0.tar.xz";
+    };
+  };
+  ark = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/ark-16.04.0.tar.xz";
+      sha256 = "07zvnslnxjz0rq90cvba6lh7gcym4z7817fdz56pjdffpcd0j9xa";
+      name = "ark-16.04.0.tar.xz";
+    };
+  };
+  artikulate = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/artikulate-16.04.0.tar.xz";
+      sha256 = "00y47nzlqlhrv3xx0g0h9is2v7v2vch9vk0hmjb4sgmmri21r47i";
+      name = "artikulate-16.04.0.tar.xz";
+    };
+  };
+  audiocd-kio = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/audiocd-kio-16.04.0.tar.xz";
+      sha256 = "1r1x1igihd4bvvjjf8c5xi341y7jn43ba0jh724x82ljhwjjivnh";
+      name = "audiocd-kio-16.04.0.tar.xz";
+    };
+  };
+  baloo-widgets = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/baloo-widgets-16.04.0.tar.xz";
+      sha256 = "0j8l34q0nmprw0y7hcsy5rxisv19zjf757dhy7rwlbvs72a8fyn2";
+      name = "baloo-widgets-16.04.0.tar.xz";
+    };
+  };
+  blinken = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/blinken-16.04.0.tar.xz";
+      sha256 = "1fi0vnxc31nd2hk7yx4gbxlmwsxsrw7yidblv3ly6j3q65ra4cgp";
+      name = "blinken-16.04.0.tar.xz";
+    };
+  };
+  bomber = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/bomber-16.04.0.tar.xz";
+      sha256 = "0rv2mfn8l78zfb0apxpgqfw2zp0zvgrjx5fdqn7mhah6w2wr421i";
+      name = "bomber-16.04.0.tar.xz";
+    };
+  };
+  bovo = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/bovo-16.04.0.tar.xz";
+      sha256 = "1z0wkmlvx052drdjkc3scmbqd299vq26l15qdykf7k7i69abpa91";
+      name = "bovo-16.04.0.tar.xz";
+    };
+  };
+  calendarsupport = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/calendarsupport-16.04.0.tar.xz";
+      sha256 = "1l4hr59r5ns5lhvr4622i8lm99933j72v6fhjv4hmw1yvy0d97kf";
+      name = "calendarsupport-16.04.0.tar.xz";
+    };
+  };
+  cantor = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/cantor-16.04.0.tar.xz";
+      sha256 = "195b974swl1aw9g9l2d4si7zvhb6jahrvkkgjyyzqrkgqj10qjgh";
+      name = "cantor-16.04.0.tar.xz";
+    };
+  };
+  cervisia = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/cervisia-16.04.0.tar.xz";
+      sha256 = "049df86n0mj0jcxlwi64cf1ijm5bilgq0dn0b1av3ivb53c2k8c1";
+      name = "cervisia-16.04.0.tar.xz";
+    };
+  };
+  dolphin = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/dolphin-16.04.0.tar.xz";
+      sha256 = "1cnvlcn5cgy1paxrcv9x8dnjvnivn86pr93gmscwl83p9dg3ly37";
+      name = "dolphin-16.04.0.tar.xz";
+    };
+  };
+  dolphin-plugins = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/dolphin-plugins-16.04.0.tar.xz";
+      sha256 = "0r58i2w7jiznh190jqvdb7rdgyk3rnwb34hxbid02w042hsf06gp";
+      name = "dolphin-plugins-16.04.0.tar.xz";
+    };
+  };
+  dragon = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/dragon-16.04.0.tar.xz";
+      sha256 = "0b81wfpxzx4wnawvkhsj16ijvdajq528m24iswxdss1ya7hcszm2";
+      name = "dragon-16.04.0.tar.xz";
+    };
+  };
+  eventviews = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/eventviews-16.04.0.tar.xz";
+      sha256 = "1gyslz02y0i9fcrxg7xxcag7h7qd1g9amn2ry2rygpxcl98bzcz7";
+      name = "eventviews-16.04.0.tar.xz";
+    };
+  };
+  ffmpegthumbs = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/ffmpegthumbs-16.04.0.tar.xz";
+      sha256 = "0jjq5gm4avi2lli3r6zd1m4v6nzc4dxd2msm6lr35nkhadamihjj";
+      name = "ffmpegthumbs-16.04.0.tar.xz";
+    };
+  };
+  filelight = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/filelight-16.04.0.tar.xz";
+      sha256 = "07k1fkb5nangzzxl00jkz9jqrlzi8g9dvp1qm8s5vbpfww6gaq4a";
+      name = "filelight-16.04.0.tar.xz";
+    };
+  };
+  gpgmepp = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/gpgmepp-16.04.0.tar.xz";
+      sha256 = "0k5wawmqmpsjg3q4wcg54xvs0rlkv26398gkvfhvw5kixcd71kys";
+      name = "gpgmepp-16.04.0.tar.xz";
+    };
+  };
+  granatier = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/granatier-16.04.0.tar.xz";
+      sha256 = "1j5jzhyfp7jy3nzj6y2s8gy4hm1q8z3vwlx7cd7j936vk27r4vw2";
+      name = "granatier-16.04.0.tar.xz";
+    };
+  };
+  grantleetheme = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/grantleetheme-16.04.0.tar.xz";
+      sha256 = "0dccrqa8nsjjljwi9z9yfx71cr6ds74k8kzkyc2bgw4zdcmw62kg";
+      name = "grantleetheme-16.04.0.tar.xz";
+    };
+  };
+  gwenview = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/gwenview-16.04.0.tar.xz";
+      sha256 = "16viz9z4r3mllc4yfw7rirq9hjaxsbfv0vgckrc4mvwbpjhhbl88";
+      name = "gwenview-16.04.0.tar.xz";
+    };
+  };
+  incidenceeditor = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/incidenceeditor-16.04.0.tar.xz";
+      sha256 = "08fvqpr12295dinarcfrh2m95591h1hiqyllc36asc8pwzisfb9f";
+      name = "incidenceeditor-16.04.0.tar.xz";
+    };
+  };
+  jovie = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/jovie-16.04.0.tar.xz";
+      sha256 = "0xvwgpqzh7h2vl2dpzninz4r93z18giwwij4yffl8740k4fk5id5";
+      name = "jovie-16.04.0.tar.xz";
+    };
+  };
+  juk = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/juk-16.04.0.tar.xz";
+      sha256 = "0y4bfq6qza84s0nk6fajwg1bmn0kzjnjj2zjglas322fh8vbdz4n";
+      name = "juk-16.04.0.tar.xz";
+    };
+  };
+  kaccessible = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kaccessible-16.04.0.tar.xz";
+      sha256 = "1glwmqaafvcm6gjvs2m0d2iaglqz3y1mj3g0jqips4sx32zbsgxf";
+      name = "kaccessible-16.04.0.tar.xz";
+    };
+  };
+  kaccounts-integration = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kaccounts-integration-16.04.0.tar.xz";
+      sha256 = "0h84nbibzzlxs0vpklij0yczs2c53gqwdx5yvfhnipbi285wy7km";
+      name = "kaccounts-integration-16.04.0.tar.xz";
+    };
+  };
+  kaccounts-providers = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kaccounts-providers-16.04.0.tar.xz";
+      sha256 = "1bmc5kycmw7r84jy7si0dap6lq011lbq050ldhba6ix5dnx0nsws";
+      name = "kaccounts-providers-16.04.0.tar.xz";
+    };
+  };
+  kajongg = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kajongg-16.04.0.tar.xz";
+      sha256 = "0fasvm8x3cgw0gv1ac38xp12ncms2nf9b5r8hprjxmb5485p7mh6";
+      name = "kajongg-16.04.0.tar.xz";
+    };
+  };
+  kalarmcal = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kalarmcal-16.04.0.tar.xz";
+      sha256 = "03ylk2kaidqi54zmz84alqhzkiq87kw5a0f7qfj76r8mf7lmnlki";
+      name = "kalarmcal-16.04.0.tar.xz";
+    };
+  };
+  kalgebra = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kalgebra-16.04.0.tar.xz";
+      sha256 = "0clcgq89wh451dj7nib7pbbppncslnzkn3532hyw347ckisphyvc";
+      name = "kalgebra-16.04.0.tar.xz";
+    };
+  };
+  kalzium = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kalzium-16.04.0.tar.xz";
+      sha256 = "1cqkgkc5m8fz7l18x0ybh85ldif15mc9gzdak8g2mdjcacxsm9nz";
+      name = "kalzium-16.04.0.tar.xz";
+    };
+  };
+  kamera = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kamera-16.04.0.tar.xz";
+      sha256 = "0n6h7z9dzv2fhwmk41smzv6l1db61334drcgivjmkblmglbdi473";
+      name = "kamera-16.04.0.tar.xz";
+    };
+  };
+  kanagram = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kanagram-16.04.0.tar.xz";
+      sha256 = "0g2d7zcb76a01hgbk0aid64xp8qym64a76k3vixwqzjdwf3jbcfr";
+      name = "kanagram-16.04.0.tar.xz";
+    };
+  };
+  kapman = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kapman-16.04.0.tar.xz";
+      sha256 = "1arb6jiy1ikn96rsvmd87fj35kxnpdq7s0nxn747psc3wvms43wr";
+      name = "kapman-16.04.0.tar.xz";
+    };
+  };
+  kapptemplate = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kapptemplate-16.04.0.tar.xz";
+      sha256 = "0bqrhzl0w499m8370idv76yz1f8n5wv418y82abd2f9qip0xk1sc";
+      name = "kapptemplate-16.04.0.tar.xz";
+    };
+  };
+  kate = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kate-16.04.0.tar.xz";
+      sha256 = "13v8a4p3fnymgi682kfhfvd2h71xmhb5i1739cbf9baixsggcbnh";
+      name = "kate-16.04.0.tar.xz";
+    };
+  };
+  katomic = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/katomic-16.04.0.tar.xz";
+      sha256 = "1g47gxxxy52mdf3lra98fibg93s302vavp0fi73gdy09wvm4nfk1";
+      name = "katomic-16.04.0.tar.xz";
+    };
+  };
+  kblackbox = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kblackbox-16.04.0.tar.xz";
+      sha256 = "0jjyffs1aijvqan9cva6d9cfnskqp4ynvpqkx1rw2mqnvadm59g3";
+      name = "kblackbox-16.04.0.tar.xz";
+    };
+  };
+  kblocks = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kblocks-16.04.0.tar.xz";
+      sha256 = "1c16s7lq4j6ixq8rvqf5cadag8cabzjgyw9hiwqix9k3csbnh5br";
+      name = "kblocks-16.04.0.tar.xz";
+    };
+  };
+  kblog = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kblog-16.04.0.tar.xz";
+      sha256 = "1hhh2f8rj0nfzm1imckhk3iczzda6q1nxnd3v6bp0dnxh14yanwk";
+      name = "kblog-16.04.0.tar.xz";
+    };
+  };
+  kbounce = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kbounce-16.04.0.tar.xz";
+      sha256 = "0sfrlyqkig089kn1d8fvfhl18hwrc3jygbl9sx0r87wg25w8niv7";
+      name = "kbounce-16.04.0.tar.xz";
+    };
+  };
+  kbreakout = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kbreakout-16.04.0.tar.xz";
+      sha256 = "05rbxhifx8nwma1nm0ji28d3jyg6kadgb90ma573xj9i4b97ak74";
+      name = "kbreakout-16.04.0.tar.xz";
+    };
+  };
+  kbruch = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kbruch-16.04.0.tar.xz";
+      sha256 = "1ncfcdcdvxd992q1brqqfq107x8q2y0235dx7z2hxvclf94npigj";
+      name = "kbruch-16.04.0.tar.xz";
+    };
+  };
+  kcachegrind = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kcachegrind-16.04.0.tar.xz";
+      sha256 = "0jks1gc03s2qc6x9klc6x2j8jcx05n13qn0l5qp4sny93mxxyxlv";
+      name = "kcachegrind-16.04.0.tar.xz";
+    };
+  };
+  kcalc = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kcalc-16.04.0.tar.xz";
+      sha256 = "15w0856jqh7vrg3a88b1mcqw63gmady3sdl1zish719jg5hjgw9i";
+      name = "kcalc-16.04.0.tar.xz";
+    };
+  };
+  kcalcore = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kcalcore-16.04.0.tar.xz";
+      sha256 = "1cnp93sgh13aiycwfw9zayzhk6wcxawa8cnvliyfn05809cjffwq";
+      name = "kcalcore-16.04.0.tar.xz";
+    };
+  };
+  kcalutils = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kcalutils-16.04.0.tar.xz";
+      sha256 = "0gz83k11idib66n9m02kql6blfv6h39slmqsx6fkbd6vlajz9wn7";
+      name = "kcalutils-16.04.0.tar.xz";
+    };
+  };
+  kcharselect = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kcharselect-16.04.0.tar.xz";
+      sha256 = "07gnsdnxm84whi2syyj2h2n6sq99mhjx53dndcm3y8c1ry4d2qp5";
+      name = "kcharselect-16.04.0.tar.xz";
+    };
+  };
+  kcolorchooser = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kcolorchooser-16.04.0.tar.xz";
+      sha256 = "0l2ahmqzrl1s3vsiwbgb05rsazqcg5zk8h5n2lg00q30glly24x3";
+      name = "kcolorchooser-16.04.0.tar.xz";
+    };
+  };
+  kcontacts = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kcontacts-16.04.0.tar.xz";
+      sha256 = "1ysism44p2ql95q0fkypa3w1r0fps720yj539a61g60fvdij2nsn";
+      name = "kcontacts-16.04.0.tar.xz";
+    };
+  };
+  kcron = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kcron-16.04.0.tar.xz";
+      sha256 = "0dkrb4h5fnzh81c1i38j62ik5lqfai0hhyjs3zrh9av6ylzmb9yc";
+      name = "kcron-16.04.0.tar.xz";
+    };
+  };
+  kde-baseapps = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kde-baseapps-16.04.0.tar.xz";
+      sha256 = "1py7j2j2nnxih0cyyyv27g6svrga80v4hqsi5gafk843zln5v836";
+      name = "kde-baseapps-16.04.0.tar.xz";
+    };
+  };
+  kdebugsettings = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kdebugsettings-16.04.0.tar.xz";
+      sha256 = "0madfi735qas20dpfx92jfcl6mcl2sfr0z5wxby5k1p1xc0rmm32";
+      name = "kdebugsettings-16.04.0.tar.xz";
+    };
+  };
+  kde-dev-scripts = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kde-dev-scripts-16.04.0.tar.xz";
+      sha256 = "1p4aklykn463f0h6kn0brhm81lli5rl5sh4d5fgaj6r3b5s0l2gf";
+      name = "kde-dev-scripts-16.04.0.tar.xz";
+    };
+  };
+  kde-dev-utils = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kde-dev-utils-16.04.0.tar.xz";
+      sha256 = "0ldmmww497q2lmlj16jm6k2p89931bgn841rvaj7rb6pclms1l49";
+      name = "kde-dev-utils-16.04.0.tar.xz";
+    };
+  };
+  kdeedu-data = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kdeedu-data-16.04.0.tar.xz";
+      sha256 = "01ps6iqdc685q3xpyjfcjy98hz29max0gl9kfppzq4nzx3hiykj9";
+      name = "kdeedu-data-16.04.0.tar.xz";
+    };
+  };
+  kdegraphics-mobipocket = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kdegraphics-mobipocket-16.04.0.tar.xz";
+      sha256 = "0lzj4xyjs91404k7h0mcbg8vc2jd5h2r83w83iq76b4cy2gmqhhd";
+      name = "kdegraphics-mobipocket-16.04.0.tar.xz";
+    };
+  };
+  kdegraphics-strigi-analyzer = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kdegraphics-strigi-analyzer-16.04.0.tar.xz";
+      sha256 = "0ibkbr7z5lz42cz65hwx0j4sjqy7k8rzj304d8ra2732mazamapj";
+      name = "kdegraphics-strigi-analyzer-16.04.0.tar.xz";
+    };
+  };
+  kdegraphics-thumbnailers = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kdegraphics-thumbnailers-16.04.0.tar.xz";
+      sha256 = "0qw0bq9gkasrkd4mxh30k15k50d28jkl7sc88akys91id1wn8mcb";
+      name = "kdegraphics-thumbnailers-16.04.0.tar.xz";
+    };
+  };
+  kde-l10n-ar = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-ar-16.04.0.tar.xz";
+      sha256 = "1rb8vqq06f83w5q81d1r5qf76yzr85kf826a0a47hfly2plaw3lc";
+      name = "kde-l10n-ar-16.04.0.tar.xz";
+    };
+  };
+  kde-l10n-ast = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-ast-16.04.0.tar.xz";
+      sha256 = "1lzlwyxyi9dgds8sgghzjlhkbd18w9plbli4yqrglfbxl8yc60xl";
+      name = "kde-l10n-ast-16.04.0.tar.xz";
+    };
+  };
+  kde-l10n-bg = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-bg-16.04.0.tar.xz";
+      sha256 = "026apn9qz3k29dvk1pvylh9ha1m637gjhnpjmj6i03frh2ai7fqs";
+      name = "kde-l10n-bg-16.04.0.tar.xz";
+    };
+  };
+  kde-l10n-bs = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-bs-16.04.0.tar.xz";
+      sha256 = "0j1i6794rvdpzzqmjqcig6wh1ljrnvygwm6zr0yin4didadm78xm";
+      name = "kde-l10n-bs-16.04.0.tar.xz";
+    };
+  };
+  kde-l10n-ca = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-ca-16.04.0.tar.xz";
+      sha256 = "08wrdlrdqp0w7dg2ygk9pi78ynj6ipzlyxx2mqyplnj1hx2jgrw4";
+      name = "kde-l10n-ca-16.04.0.tar.xz";
+    };
+  };
+  kde-l10n-ca_valencia = {
+    version = "ca_valencia-16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-ca@valencia-16.04.0.tar.xz";
+      sha256 = "0a9dyvqng3gbn5kljq0av93b6wd7l04i57gmac0vz3qja9fyw7px";
+      name = "kde-l10n-ca_valencia-16.04.0.tar.xz";
+    };
+  };
+  kde-l10n-cs = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-cs-16.04.0.tar.xz";
+      sha256 = "1ai2p9hg7l7s77k45gmxdn3lqnv4mh8gdsxhbjdpqcmwxyc2zgwf";
+      name = "kde-l10n-cs-16.04.0.tar.xz";
+    };
+  };
+  kde-l10n-da = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-da-16.04.0.tar.xz";
+      sha256 = "05ncpim4fpyiv2cca4dvn7d8sd031xjc4f85p1yf9inwbsj4nf5x";
+      name = "kde-l10n-da-16.04.0.tar.xz";
+    };
+  };
+  kde-l10n-de = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-de-16.04.0.tar.xz";
+      sha256 = "17cbibk6lqiabyyinnj9by0jjhqzlkn09zr8m0h967704fkhnzjc";
+      name = "kde-l10n-de-16.04.0.tar.xz";
+    };
+  };
+  kde-l10n-el = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-el-16.04.0.tar.xz";
+      sha256 = "15raxjj0cnnrqwr8cfdww5a93k7c17lakb88z65lpafvhnyf6mry";
+      name = "kde-l10n-el-16.04.0.tar.xz";
+    };
+  };
+  kde-l10n-en_GB = {
+    version = "en_GB-16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-en_GB-16.04.0.tar.xz";
+      sha256 = "17dbbwmwm5mqxc0wbc27ys9izfh8jkjbvc2vnw8gd1kxqgfqy49l";
+      name = "kde-l10n-en_GB-16.04.0.tar.xz";
+    };
+  };
+  kde-l10n-eo = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-eo-16.04.0.tar.xz";
+      sha256 = "03bz9hpm36lmh1g2560r2xy8fais0f7wdqj58z82kvxb2lqwr2jg";
+      name = "kde-l10n-eo-16.04.0.tar.xz";
+    };
+  };
+  kde-l10n-es = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-es-16.04.0.tar.xz";
+      sha256 = "0kqvw2a7lgp9qy3ph6f6kxl3mvqlq19r99821w0hbv7qk2p9frbs";
+      name = "kde-l10n-es-16.04.0.tar.xz";
+    };
+  };
+  kde-l10n-et = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-et-16.04.0.tar.xz";
+      sha256 = "1x483l2a39da9kbhh8k20s84x6zjy27f760i7y9mmkah5ryxbn68";
+      name = "kde-l10n-et-16.04.0.tar.xz";
+    };
+  };
+  kde-l10n-eu = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-eu-16.04.0.tar.xz";
+      sha256 = "0z0bqnywx9crk829vdixg5kswf208qmcicvi72fiz2cwjwcqhbyg";
+      name = "kde-l10n-eu-16.04.0.tar.xz";
+    };
+  };
+  kde-l10n-fa = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-fa-16.04.0.tar.xz";
+      sha256 = "1m4vdmzy94jg3rky8d8rbqrkyja6rv6jybfh1q0ydpihz9k5p5hk";
+      name = "kde-l10n-fa-16.04.0.tar.xz";
+    };
+  };
+  kde-l10n-fi = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-fi-16.04.0.tar.xz";
+      sha256 = "1bcblmd3dsx6slvia5x9ammw4054wsyjk6mdzgcabyi86xmm1xj8";
+      name = "kde-l10n-fi-16.04.0.tar.xz";
+    };
+  };
+  kde-l10n-fr = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-fr-16.04.0.tar.xz";
+      sha256 = "1311ymksp37l1yfz8921zvbrcd4g2pygfhilmmjrww0chizxjdjf";
+      name = "kde-l10n-fr-16.04.0.tar.xz";
+    };
+  };
+  kde-l10n-ga = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-ga-16.04.0.tar.xz";
+      sha256 = "0iml1y2xdwchn2gqgbvcvs2fbq78drh2r6068jlrc3hixbf76wsy";
+      name = "kde-l10n-ga-16.04.0.tar.xz";
+    };
+  };
+  kde-l10n-gl = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-gl-16.04.0.tar.xz";
+      sha256 = "1v1hq61fwj2x8iiqjm9fwabzgc7m044narb1108cijl7d76lsn4m";
+      name = "kde-l10n-gl-16.04.0.tar.xz";
+    };
+  };
+  kde-l10n-he = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-he-16.04.0.tar.xz";
+      sha256 = "0q1gj3gffin7l0r7xlp395zj5kdil8bnrl6apk2jslg7pz929dhb";
+      name = "kde-l10n-he-16.04.0.tar.xz";
+    };
+  };
+  kde-l10n-hi = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-hi-16.04.0.tar.xz";
+      sha256 = "19czqc6l4jn321zwygk7b46wgsimcbf8zvl30a0rkdvspwyvaqc5";
+      name = "kde-l10n-hi-16.04.0.tar.xz";
+    };
+  };
+  kde-l10n-hr = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-hr-16.04.0.tar.xz";
+      sha256 = "0bbcjrxgm5yqjz1y4ngm133hcvrp3c2z8lrycpg76g7j50w3fsi5";
+      name = "kde-l10n-hr-16.04.0.tar.xz";
+    };
+  };
+  kde-l10n-hu = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-hu-16.04.0.tar.xz";
+      sha256 = "0iww0m45gdlmf0j1jw8qljqar0dsmax4sxkr6yd3kswwr6m75v2i";
+      name = "kde-l10n-hu-16.04.0.tar.xz";
+    };
+  };
+  kde-l10n-ia = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-ia-16.04.0.tar.xz";
+      sha256 = "0ivgp1gjxshxq1fvn254k4gni30svyqfnlfz7d8niqp3msnfmc2b";
+      name = "kde-l10n-ia-16.04.0.tar.xz";
+    };
+  };
+  kde-l10n-id = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-id-16.04.0.tar.xz";
+      sha256 = "15fnm4isigmgpxsgpqhj6gbvcrlhi51491a6fnxiwa3xmrc2pva8";
+      name = "kde-l10n-id-16.04.0.tar.xz";
+    };
+  };
+  kde-l10n-is = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-is-16.04.0.tar.xz";
+      sha256 = "14bl3j2kqwg6cln84k5kpm400mnm4r81xhgmjpfb3xy92ms3sycr";
+      name = "kde-l10n-is-16.04.0.tar.xz";
+    };
+  };
+  kde-l10n-it = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-it-16.04.0.tar.xz";
+      sha256 = "06akl5x2x0j50gyzw3m1yavxxw3jszyfyychsihn74fk8hslzp6m";
+      name = "kde-l10n-it-16.04.0.tar.xz";
+    };
+  };
+  kde-l10n-ja = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-ja-16.04.0.tar.xz";
+      sha256 = "1kcmryifsjripsxwa7qa7m3ky0wxaipz9smrfhhrnw41i62sfp9a";
+      name = "kde-l10n-ja-16.04.0.tar.xz";
+    };
+  };
+  kde-l10n-kk = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-kk-16.04.0.tar.xz";
+      sha256 = "05c100727ydimn55jlvyynlgxzxncig2y4i4b53aslfi6h17fn0i";
+      name = "kde-l10n-kk-16.04.0.tar.xz";
+    };
+  };
+  kde-l10n-km = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-km-16.04.0.tar.xz";
+      sha256 = "1shbg5vbzbgx07lbgi6ddhphh5b2bm9qd1gavls8alcgpbqj221c";
+      name = "kde-l10n-km-16.04.0.tar.xz";
+    };
+  };
+  kde-l10n-ko = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-ko-16.04.0.tar.xz";
+      sha256 = "1fjavkaivv6zspagqcbdhy7gdkmv38z20bv7fs45qf4470ffmwz5";
+      name = "kde-l10n-ko-16.04.0.tar.xz";
+    };
+  };
+  kde-l10n-lt = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-lt-16.04.0.tar.xz";
+      sha256 = "09n4yc9grd7g3yqkgxj9x6hkygcqbx6dxi0jj6v98a5p50b78a5d";
+      name = "kde-l10n-lt-16.04.0.tar.xz";
+    };
+  };
+  kde-l10n-lv = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-lv-16.04.0.tar.xz";
+      sha256 = "1c86bhsq0j0r2bmc6524g4sxc0bsw5sx6d4fxs6sxzx3bpdml5bq";
+      name = "kde-l10n-lv-16.04.0.tar.xz";
+    };
+  };
+  kde-l10n-mr = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-mr-16.04.0.tar.xz";
+      sha256 = "1xp3fb99crsvf1xl45iy9q31nbs2735hxai1wlfn5h0q9scz2nin";
+      name = "kde-l10n-mr-16.04.0.tar.xz";
+    };
+  };
+  kde-l10n-nb = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-nb-16.04.0.tar.xz";
+      sha256 = "1dkfwqvbh6dxfxg4gznchpkwscc4g6rgwndxzjj53lvfz69611dj";
+      name = "kde-l10n-nb-16.04.0.tar.xz";
+    };
+  };
+  kde-l10n-nds = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-nds-16.04.0.tar.xz";
+      sha256 = "1pma4pn7h1r9y6dxs86xqh0ahvl04rhw8qad3cbyil2r1s7j80ac";
+      name = "kde-l10n-nds-16.04.0.tar.xz";
+    };
+  };
+  kde-l10n-nl = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-nl-16.04.0.tar.xz";
+      sha256 = "0bd49aylsklgp9rqs6nk72n0za9kcp7fjzr5myfavcxliwv8lhqp";
+      name = "kde-l10n-nl-16.04.0.tar.xz";
+    };
+  };
+  kde-l10n-nn = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-nn-16.04.0.tar.xz";
+      sha256 = "14acr8pchds4ib246fz6ml65qjkiifcxfs6r5hqh99l72im30hx1";
+      name = "kde-l10n-nn-16.04.0.tar.xz";
+    };
+  };
+  kde-l10n-pa = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-pa-16.04.0.tar.xz";
+      sha256 = "116dssrchp0yf173m3n8hkcfyr0k02bjlda24ikknjbh50y5kqfk";
+      name = "kde-l10n-pa-16.04.0.tar.xz";
+    };
+  };
+  kde-l10n-pl = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-pl-16.04.0.tar.xz";
+      sha256 = "1gibqcmgqvq9f1573jfchh7nhkd8czdi183n2smld4irsd750la8";
+      name = "kde-l10n-pl-16.04.0.tar.xz";
+    };
+  };
+  kde-l10n-pt = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-pt-16.04.0.tar.xz";
+      sha256 = "1yrjhqcl93fdch9nvzc2yk30rbzxsrya3xsj54xgxv2anggbr3wr";
+      name = "kde-l10n-pt-16.04.0.tar.xz";
+    };
+  };
+  kde-l10n-pt_BR = {
+    version = "pt_BR-16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-pt_BR-16.04.0.tar.xz";
+      sha256 = "0sbg767ddcknzs4k4v76ys00jxgqlxlggf5i9fw3dvaggs78azj7";
+      name = "kde-l10n-pt_BR-16.04.0.tar.xz";
+    };
+  };
+  kde-l10n-ro = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-ro-16.04.0.tar.xz";
+      sha256 = "0bz25pg9xj2n4vl2aadaj02p0jx37j3i37p7bvafsb499qpgprk2";
+      name = "kde-l10n-ro-16.04.0.tar.xz";
+    };
+  };
+  kde-l10n-ru = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-ru-16.04.0.tar.xz";
+      sha256 = "0jkljdc5i3hq7kkkq4gl7rh92ia4vv6m2vd74bsilibgxgb1kmah";
+      name = "kde-l10n-ru-16.04.0.tar.xz";
+    };
+  };
+  kde-l10n-sk = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-sk-16.04.0.tar.xz";
+      sha256 = "06lnlky47xq6fcjj70msc28q97cymsh0g4z06pbc0cyyby85521m";
+      name = "kde-l10n-sk-16.04.0.tar.xz";
+    };
+  };
+  kde-l10n-sl = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-sl-16.04.0.tar.xz";
+      sha256 = "0z2d8jx117prr35malcp0ca93ipbjj55s4dm3iad2iy2q728hkmv";
+      name = "kde-l10n-sl-16.04.0.tar.xz";
+    };
+  };
+  kde-l10n-sr = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-sr-16.04.0.tar.xz";
+      sha256 = "0w24mrb48qyc7diw40hwzplxb2rqlrrymvwnxbdy2d6x35hha0j4";
+      name = "kde-l10n-sr-16.04.0.tar.xz";
+    };
+  };
+  kde-l10n-sv = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-sv-16.04.0.tar.xz";
+      sha256 = "039q4d2y3vwxnpz6rwgf9s1ivhrlz26gp5kx3y9cz8fhcsa4jk8j";
+      name = "kde-l10n-sv-16.04.0.tar.xz";
+    };
+  };
+  kde-l10n-tr = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-tr-16.04.0.tar.xz";
+      sha256 = "1sr5xxxzs29sah0azfc71w01nbm5njhgygpzll3lfx3padsvfz49";
+      name = "kde-l10n-tr-16.04.0.tar.xz";
+    };
+  };
+  kde-l10n-ug = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-ug-16.04.0.tar.xz";
+      sha256 = "16jpax5k3z8anhsf61wsi93n8ail8ybjpi31dnk859g0y50a4nr5";
+      name = "kde-l10n-ug-16.04.0.tar.xz";
+    };
+  };
+  kde-l10n-uk = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-uk-16.04.0.tar.xz";
+      sha256 = "1275347grzcdm0jd9mzm1ww8dsh3g2ws5ppfxs3ip7jdsxgmcqh0";
+      name = "kde-l10n-uk-16.04.0.tar.xz";
+    };
+  };
+  kde-l10n-wa = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-wa-16.04.0.tar.xz";
+      sha256 = "1gz918hj908308fd49pdbw1z8252shjbng5qgfzmdgfp9nvfhc14";
+      name = "kde-l10n-wa-16.04.0.tar.xz";
+    };
+  };
+  kde-l10n-zh_CN = {
+    version = "zh_CN-16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-zh_CN-16.04.0.tar.xz";
+      sha256 = "1kyakzig301vylmib9wjb46llllw0jjiq18wys017hzjxykx170f";
+      name = "kde-l10n-zh_CN-16.04.0.tar.xz";
+    };
+  };
+  kde-l10n-zh_TW = {
+    version = "zh_TW-16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kde-l10n/kde-l10n-zh_TW-16.04.0.tar.xz";
+      sha256 = "0s2m1f4ylm6l3vp67h6v41n06pmk6762lk32wqy0l2fgg4zxrrzl";
+      name = "kde-l10n-zh_TW-16.04.0.tar.xz";
+    };
+  };
+  kdelibs = {
+    version = "4.14.19";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kdelibs-4.14.19.tar.xz";
+      sha256 = "0dfmhivd41y8c9pnag496rc8qlj78dg62liap5zdphgvi2baf8p6";
+      name = "kdelibs-4.14.19.tar.xz";
+    };
+  };
+  kdenetwork-filesharing = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kdenetwork-filesharing-16.04.0.tar.xz";
+      sha256 = "08rlg7ppqbi2xvq6ixjjw1xdr17n7bhzi2ymssxv8q1fmznfqhvp";
+      name = "kdenetwork-filesharing-16.04.0.tar.xz";
+    };
+  };
+  kdenetwork-strigi-analyzers = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kdenetwork-strigi-analyzers-16.04.0.tar.xz";
+      sha256 = "0i08niv87jn6bh6c1fknpqr7mkbg5csd8lgm39bwq551zgn7n6sw";
+      name = "kdenetwork-strigi-analyzers-16.04.0.tar.xz";
+    };
+  };
+  kdenlive = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kdenlive-16.04.0.tar.xz";
+      sha256 = "0ks30as7cnr9jcacj97c720pf2dn1wv8xg9mgxsin7c2lhbz8i5f";
+      name = "kdenlive-16.04.0.tar.xz";
+    };
+  };
+  kdepim = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kdepim-16.04.0.tar.xz";
+      sha256 = "0cd39hgr7gvv78mf5rypj7yjpfrnapd1pxad1aanlsr6ms5qdzyg";
+      name = "kdepim-16.04.0.tar.xz";
+    };
+  };
+  kdepim-addons = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kdepim-addons-16.04.0.tar.xz";
+      sha256 = "1dfvl0pd9269ghpjwydyws40flvw7clq2hq830m4jk6myqjccd4i";
+      name = "kdepim-addons-16.04.0.tar.xz";
+    };
+  };
+  kdepim-apps-libs = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kdepim-apps-libs-16.04.0.tar.xz";
+      sha256 = "1slnsssd242wzk0pga4l6i8q83gdca1vgmqixz82x4pvfj62bw7w";
+      name = "kdepim-apps-libs-16.04.0.tar.xz";
+    };
+  };
+  kdepimlibs = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kdepimlibs-16.04.0.tar.xz";
+      sha256 = "1mk8rjf918c5dfglv1sdrs6wjyf31dry4070ip3fx6kdph2x5akr";
+      name = "kdepimlibs-16.04.0.tar.xz";
+    };
+  };
+  kdepim-runtime = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kdepim-runtime-16.04.0.tar.xz";
+      sha256 = "0siwplwdbrsaikzfxbz9w00wk3xfg4a6y124nlwqx7588ni8brs3";
+      name = "kdepim-runtime-16.04.0.tar.xz";
+    };
+  };
+  kde-runtime = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kde-runtime-16.04.0.tar.xz";
+      sha256 = "0sr06v4z6lbkacqgk8a35m3ldal1fcpvp6n2s8bfa226yck8sdq6";
+      name = "kde-runtime-16.04.0.tar.xz";
+    };
+  };
+  kdesdk-kioslaves = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kdesdk-kioslaves-16.04.0.tar.xz";
+      sha256 = "0lwdy4l48id0p3vkpk92n3ja6ymzxx9zl7iwwszb1rxbr48q4v7l";
+      name = "kdesdk-kioslaves-16.04.0.tar.xz";
+    };
+  };
+  kdesdk-strigi-analyzers = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kdesdk-strigi-analyzers-16.04.0.tar.xz";
+      sha256 = "1bn12pqqq9bgr6y916wd54i0dsw30ab9xhz99mqyjw2fcxpz4mf8";
+      name = "kdesdk-strigi-analyzers-16.04.0.tar.xz";
+    };
+  };
+  kdesdk-thumbnailers = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kdesdk-thumbnailers-16.04.0.tar.xz";
+      sha256 = "1wqlrkgix2nnpvlqqqdja4j5iws4vjglds94ra5s0wmyfk0y9yc2";
+      name = "kdesdk-thumbnailers-16.04.0.tar.xz";
+    };
+  };
+  kdewebdev = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kdewebdev-16.04.0.tar.xz";
+      sha256 = "1xmibm0hi0mdwsvp8h48qph4mjwb1k3q58i9y8s1c7vqczl1q09n";
+      name = "kdewebdev-16.04.0.tar.xz";
+    };
+  };
+  kdf = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kdf-16.04.0.tar.xz";
+      sha256 = "12bcvy6x8wkizjykrc3wmd3lbsj2zmiizxknic5jiwin6zqjrzh4";
+      name = "kdf-16.04.0.tar.xz";
+    };
+  };
+  kdgantt2 = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kdgantt2-16.04.0.tar.xz";
+      sha256 = "0j9b2f5zkvasv5w4paazyc47iph27nqd4l4nrwr3plvdirivdidf";
+      name = "kdgantt2-16.04.0.tar.xz";
+    };
+  };
+  kdiamond = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kdiamond-16.04.0.tar.xz";
+      sha256 = "1alb6hv95whdy15kmc0kzx4758wjni6q2k3dxxpdhw0hq657v508";
+      name = "kdiamond-16.04.0.tar.xz";
+    };
+  };
+  kfloppy = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kfloppy-16.04.0.tar.xz";
+      sha256 = "09jwqbfs0ayswlzih90bq439c8ljhay12jfv73gdnkvf23qiq5vw";
+      name = "kfloppy-16.04.0.tar.xz";
+    };
+  };
+  kfourinline = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kfourinline-16.04.0.tar.xz";
+      sha256 = "13hgwn3gzyhvh4xw7ym80vsbnqbvhlvn3jwzjrxlj377q9q1h6i6";
+      name = "kfourinline-16.04.0.tar.xz";
+    };
+  };
+  kgeography = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kgeography-16.04.0.tar.xz";
+      sha256 = "1pk76akkd5ykh9p1l757cqj8niwwavxdxwinkz51w0dz0n62zb4x";
+      name = "kgeography-16.04.0.tar.xz";
+    };
+  };
+  kget = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kget-16.04.0.tar.xz";
+      sha256 = "17z2n0bgj1dm4d4abprnx8crw30flxxk95w8sv3483zqbk0k3p4i";
+      name = "kget-16.04.0.tar.xz";
+    };
+  };
+  kgoldrunner = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kgoldrunner-16.04.0.tar.xz";
+      sha256 = "019dk1nq1jmk7w3lklxlsy667m7vahspjd0w5rrpas54czl975w8";
+      name = "kgoldrunner-16.04.0.tar.xz";
+    };
+  };
+  kgpg = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kgpg-16.04.0.tar.xz";
+      sha256 = "0qrijbwnrg61kwmv7l5k6796lbr9ry4grmk9jc38cq2g7bi64wz2";
+      name = "kgpg-16.04.0.tar.xz";
+    };
+  };
+  khangman = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/khangman-16.04.0.tar.xz";
+      sha256 = "0ljrap9ybccmwymkay7760rgmpp51cssnvn4lwmd3mig5cfqlavs";
+      name = "khangman-16.04.0.tar.xz";
+    };
+  };
+  khelpcenter = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/khelpcenter-16.04.0.tar.xz";
+      sha256 = "1r6aysdnc0qdg9lbzy1zb6pirfyfah3sbjsqkmrnf63kqsyjvapy";
+      name = "khelpcenter-16.04.0.tar.xz";
+    };
+  };
+  kholidays = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kholidays-16.04.0.tar.xz";
+      sha256 = "04gfy3f5fip79ra08m3f098cbgp0k7v76lam3513r0zvl0h53gad";
+      name = "kholidays-16.04.0.tar.xz";
+    };
+  };
+  kidentitymanagement = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kidentitymanagement-16.04.0.tar.xz";
+      sha256 = "0dhpjgmz7ndbk77syp1zvk5g7sn991wjx5cllk6dx0q9ylfl1895";
+      name = "kidentitymanagement-16.04.0.tar.xz";
+    };
+  };
+  kig = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kig-16.04.0.tar.xz";
+      sha256 = "0rlx7cm41z8zm4v4rdwmwicam2g2ibd0gmzlsnh77s4cv8xhmd7y";
+      name = "kig-16.04.0.tar.xz";
+    };
+  };
+  kigo = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kigo-16.04.0.tar.xz";
+      sha256 = "1cw8hyhayn650j73kqr8aqzj6wd6bq21l5c4ibl2qm90p1byj6zz";
+      name = "kigo-16.04.0.tar.xz";
+    };
+  };
+  killbots = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/killbots-16.04.0.tar.xz";
+      sha256 = "1qnrwj1shy7ah2x0nh03r0zf3h8535qxxg62wgyg675n80ndl6wh";
+      name = "killbots-16.04.0.tar.xz";
+    };
+  };
+  kimap = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kimap-16.04.0.tar.xz";
+      sha256 = "028xpqdxgylab6sznzxdd7pyfm7l27mzj13zzxhd7lc7fqd3xgx9";
+      name = "kimap-16.04.0.tar.xz";
+    };
+  };
+  kio-extras = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kio-extras-16.04.0.tar.xz";
+      sha256 = "0iims3vk5mqz8lnpimwc3kjlvkmfh10287zy4sm5p8kxxfgz88fj";
+      name = "kio-extras-16.04.0.tar.xz";
+    };
+  };
+  kiriki = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kiriki-16.04.0.tar.xz";
+      sha256 = "0bywgx8j1kx5x5j4h5bv8zrf73pkdzd96wharrgia0x55kmnzgn2";
+      name = "kiriki-16.04.0.tar.xz";
+    };
+  };
+  kiten = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kiten-16.04.0.tar.xz";
+      sha256 = "12d0p468439llj5jyxyd7qhr2zavdkbl8s87qcfhw7lngsnssq34";
+      name = "kiten-16.04.0.tar.xz";
+    };
+  };
+  kjumpingcube = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kjumpingcube-16.04.0.tar.xz";
+      sha256 = "1grrcfblnfr2p6a72n38r6awkfm662brnv1r2k4kqbiz0qmwmvyd";
+      name = "kjumpingcube-16.04.0.tar.xz";
+    };
+  };
+  kldap = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kldap-16.04.0.tar.xz";
+      sha256 = "1gbm7rgf2llxdnckzlnsjii9jd8s59hym96hf9v87svbphbm1738";
+      name = "kldap-16.04.0.tar.xz";
+    };
+  };
+  kleopatra = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kleopatra-16.04.0.tar.xz";
+      sha256 = "0rmzsqvp0xwyjr25d2vnslgg6cvni9km8hkijyhz8zrmnmpdm97z";
+      name = "kleopatra-16.04.0.tar.xz";
+    };
+  };
+  klettres = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/klettres-16.04.0.tar.xz";
+      sha256 = "17m30hkjjrk5h4a5z1c96sgl8i0729537q11v9ndj8kh1699sfxs";
+      name = "klettres-16.04.0.tar.xz";
+    };
+  };
+  klickety = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/klickety-16.04.0.tar.xz";
+      sha256 = "0ggj585vki81ds94k9i7b1sawzxz24k582zm5d3lngipcb1x808l";
+      name = "klickety-16.04.0.tar.xz";
+    };
+  };
+  klines = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/klines-16.04.0.tar.xz";
+      sha256 = "1000j5n9hzr3ffpi7mj5aicflr5gvbbd02s4l2qy9ghgxf5ghfzw";
+      name = "klines-16.04.0.tar.xz";
+    };
+  };
+  kmag = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kmag-16.04.0.tar.xz";
+      sha256 = "0z9jrd9a9xmxsbk6xckiqvidd6f9dcj1lfav818fm1wf5jr04v40";
+      name = "kmag-16.04.0.tar.xz";
+    };
+  };
+  kmahjongg = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kmahjongg-16.04.0.tar.xz";
+      sha256 = "0wl7mv20zal3nx3y1cdc8xq0vhkvb8rb8sag8kb66a1ch8zdzw9s";
+      name = "kmahjongg-16.04.0.tar.xz";
+    };
+  };
+  kmailtransport = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kmailtransport-16.04.0.tar.xz";
+      sha256 = "0imw47nlfnd1qq2c91ig7cmwrcm1c9jcqfxvi1svllbwy9bgab3i";
+      name = "kmailtransport-16.04.0.tar.xz";
+    };
+  };
+  kmbox = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kmbox-16.04.0.tar.xz";
+      sha256 = "1w2y6nda7p5wfl76rmirpglgar8qxhyynx66k5qnvfpvk8xa02wk";
+      name = "kmbox-16.04.0.tar.xz";
+    };
+  };
+  kmime = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kmime-16.04.0.tar.xz";
+      sha256 = "04hqdl1kbqv3xm0qvdsrvjs1fnsymqfw2yn286rh7ynlix4p09zz";
+      name = "kmime-16.04.0.tar.xz";
+    };
+  };
+  kmines = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kmines-16.04.0.tar.xz";
+      sha256 = "0q8jqycwsjadi10a1ycxn09507j85lh0zwxq1b374cdb01m7ajzw";
+      name = "kmines-16.04.0.tar.xz";
+    };
+  };
+  kmix = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kmix-16.04.0.tar.xz";
+      sha256 = "0nmfjrxdxpkvxrsp06w6ddcyhfasmzvn8hk44n4wd9v86vgi29cz";
+      name = "kmix-16.04.0.tar.xz";
+    };
+  };
+  kmousetool = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kmousetool-16.04.0.tar.xz";
+      sha256 = "1g2lgmimkq9yb8s1lypwh4cz5zxih4fppcqcjlgwcpg0n4ia2hh7";
+      name = "kmousetool-16.04.0.tar.xz";
+    };
+  };
+  kmouth = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kmouth-16.04.0.tar.xz";
+      sha256 = "0bqqjs2khdhqgd3apk7bd8sayb9dg6mwc8f211z7zb03xvgb95nd";
+      name = "kmouth-16.04.0.tar.xz";
+    };
+  };
+  kmplot = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kmplot-16.04.0.tar.xz";
+      sha256 = "1q76bl3604qcp67w754qsncsg0mw5vm9c5jp8hj6i9vksdl8i3n8";
+      name = "kmplot-16.04.0.tar.xz";
+    };
+  };
+  knavalbattle = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/knavalbattle-16.04.0.tar.xz";
+      sha256 = "0q0k37dvw8pajxcmsv25if726ml9mzdm6am2q22x64hblsgmva0h";
+      name = "knavalbattle-16.04.0.tar.xz";
+    };
+  };
+  knetwalk = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/knetwalk-16.04.0.tar.xz";
+      sha256 = "0i00lnw31jb7lb18r6r8k4k61syjak7pglwxwbah96wxrrmdnvpk";
+      name = "knetwalk-16.04.0.tar.xz";
+    };
+  };
+  kolf = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kolf-16.04.0.tar.xz";
+      sha256 = "1b0247wpnzm9lz82d5v3wv28cacj3b7r5rirdg8plri5y2gks8ql";
+      name = "kolf-16.04.0.tar.xz";
+    };
+  };
+  kollision = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kollision-16.04.0.tar.xz";
+      sha256 = "1hmgw5410xznjddv1x2jg6v1rv6hkksr281ylhdb2ca8zh2wdwqi";
+      name = "kollision-16.04.0.tar.xz";
+    };
+  };
+  kolourpaint = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kolourpaint-16.04.0.tar.xz";
+      sha256 = "13x7r8k60q0nnip37xadqdypm88c2zrfk2nhlllhqb41d23hbbsw";
+      name = "kolourpaint-16.04.0.tar.xz";
+    };
+  };
+  kompare = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kompare-16.04.0.tar.xz";
+      sha256 = "1yd06ykjbi5kvas9vrnhy9svpsvlk4y8xvs963vvi0jdw7x5ylzj";
+      name = "kompare-16.04.0.tar.xz";
+    };
+  };
+  konquest = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/konquest-16.04.0.tar.xz";
+      sha256 = "198s495slqi7fffmsnn6pj90mi51bjw3grkr033l4z0lmxhqljmb";
+      name = "konquest-16.04.0.tar.xz";
+    };
+  };
+  konsole = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/konsole-16.04.0.tar.xz";
+      sha256 = "06c3d01h658g00yi4vhc8rk6ndxs4ha0pj6y0w4d10g78zcnjmd4";
+      name = "konsole-16.04.0.tar.xz";
+    };
+  };
+  kontactinterface = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kontactinterface-16.04.0.tar.xz";
+      sha256 = "1plhya2xpvvsx2japbiq8v5a2c1rbw77jf3q278kqwracrkgsiax";
+      name = "kontactinterface-16.04.0.tar.xz";
+    };
+  };
+  kopete = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kopete-16.04.0.tar.xz";
+      sha256 = "1xcaz0f6cmjxy7sifxhlm7jvndj238azx59xg4glrk4mhrnac5m7";
+      name = "kopete-16.04.0.tar.xz";
+    };
+  };
+  kpat = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kpat-16.04.0.tar.xz";
+      sha256 = "06xsisy0sv8rldpc2fw3hc4dr66wmxbw006x3p9gi1xxwqlp8j3w";
+      name = "kpat-16.04.0.tar.xz";
+    };
+  };
+  kpimtextedit = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kpimtextedit-16.04.0.tar.xz";
+      sha256 = "0wkxqqyifvgd1h2i2q3958diwybff8m2wc7g9grl6wagj0rbr6y8";
+      name = "kpimtextedit-16.04.0.tar.xz";
+    };
+  };
+  kppp = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kppp-16.04.0.tar.xz";
+      sha256 = "0z53n7cppr79z7k8siaadrspl1134gw5a7wx02jigl0kihm9sykf";
+      name = "kppp-16.04.0.tar.xz";
+    };
+  };
+  kqtquickcharts = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kqtquickcharts-16.04.0.tar.xz";
+      sha256 = "12x3mgxba4bfi7imli22a8m3af3hkq3fkx192ij3wx8ils7b6in7";
+      name = "kqtquickcharts-16.04.0.tar.xz";
+    };
+  };
+  krdc = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/krdc-16.04.0.tar.xz";
+      sha256 = "0azlvqai97ki33dc448zw76hqbsqzd6a5k7gj9fsj8pg11m06kn4";
+      name = "krdc-16.04.0.tar.xz";
+    };
+  };
+  kremotecontrol = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kremotecontrol-16.04.0.tar.xz";
+      sha256 = "027ljqfxl9gsn6q5rld0azqzg3a1ky96045i809dzhdwknrz014a";
+      name = "kremotecontrol-16.04.0.tar.xz";
+    };
+  };
+  kreversi = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kreversi-16.04.0.tar.xz";
+      sha256 = "193vj6qdshh0k7jn7ca63yfkb99sbb0xn3fhyd65iimwcyziz6yj";
+      name = "kreversi-16.04.0.tar.xz";
+    };
+  };
+  krfb = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/krfb-16.04.0.tar.xz";
+      sha256 = "1xcnvs9l2w5awfkxzq2yi0chpljip8nkc3zqlzlqnchkzpxy568j";
+      name = "krfb-16.04.0.tar.xz";
+    };
+  };
+  kross-interpreters = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kross-interpreters-16.04.0.tar.xz";
+      sha256 = "18sc600x5yki1rngxa9ng6zrw5yam824sf05filwa6m22kxi91y8";
+      name = "kross-interpreters-16.04.0.tar.xz";
+    };
+  };
+  kruler = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kruler-16.04.0.tar.xz";
+      sha256 = "07p85apr7rvgwphnd7vwpmyn8i26m1px4ssq54wk9kindxcs2awg";
+      name = "kruler-16.04.0.tar.xz";
+    };
+  };
+  ksaneplugin = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/ksaneplugin-16.04.0.tar.xz";
+      sha256 = "0ldgj3pna0y7ayyw8nz2ybj8g6i1i7axd96sgpgx11708jqphy91";
+      name = "ksaneplugin-16.04.0.tar.xz";
+    };
+  };
+  kscd = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kscd-16.04.0.tar.xz";
+      sha256 = "0k1dxi6gimy41d8mjcb371fkv8z64cdjhyisdgsyfqq6klhy93ss";
+      name = "kscd-16.04.0.tar.xz";
+    };
+  };
+  kshisen = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kshisen-16.04.0.tar.xz";
+      sha256 = "1k75l3y89hv0gs08kfczb1avy5i5h964xf4b976hslzhpvwi8w1q";
+      name = "kshisen-16.04.0.tar.xz";
+    };
+  };
+  ksirk = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/ksirk-16.04.0.tar.xz";
+      sha256 = "0hswi5f0r10yjm9rdiffaw96d5wwjwcnv2g07hh7lc1w6irmq7v7";
+      name = "ksirk-16.04.0.tar.xz";
+    };
+  };
+  ksnakeduel = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/ksnakeduel-16.04.0.tar.xz";
+      sha256 = "1666k9q065xrij07fbwv1b1xa23p02qk3b366cfhd38kf1shp9fg";
+      name = "ksnakeduel-16.04.0.tar.xz";
+    };
+  };
+  kspaceduel = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kspaceduel-16.04.0.tar.xz";
+      sha256 = "03jqb8yn5jgdc9pd92bpbkvr8vwr91cpvmzgmmrqi4llj3cjpp9x";
+      name = "kspaceduel-16.04.0.tar.xz";
+    };
+  };
+  ksquares = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/ksquares-16.04.0.tar.xz";
+      sha256 = "11fqvpkghvy54zrvyvwk9kasx3i1clw8rj4bjphif2nr6sc5wdi7";
+      name = "ksquares-16.04.0.tar.xz";
+    };
+  };
+  kstars = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kstars-16.04.0.tar.xz";
+      sha256 = "0h648mnp6l5msv56pmwrm5197hdx20jmw2wzdflx09lj3iir6d1y";
+      name = "kstars-16.04.0.tar.xz";
+    };
+  };
+  ksudoku = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/ksudoku-16.04.0.tar.xz";
+      sha256 = "1d6mwhcsa09yrrd43a842xzyf87hpqwlhp1x82f9kx31hkq1hs6m";
+      name = "ksudoku-16.04.0.tar.xz";
+    };
+  };
+  ksystemlog = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/ksystemlog-16.04.0.tar.xz";
+      sha256 = "0qcycfyj1wk730hcnzjn75wf6vcxd6svmvqz6q3q85rrjjs3am6s";
+      name = "ksystemlog-16.04.0.tar.xz";
+    };
+  };
+  kteatime = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kteatime-16.04.0.tar.xz";
+      sha256 = "0yhldn2d2kz0kf5s1s8wkmmg73v620mf2h5prf59hqygkdzmxq1n";
+      name = "kteatime-16.04.0.tar.xz";
+    };
+  };
+  ktimer = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/ktimer-16.04.0.tar.xz";
+      sha256 = "0p925v4h944vsp8br581wdlnfvp51yq92kf8xfsgc8d7r85h28w4";
+      name = "ktimer-16.04.0.tar.xz";
+    };
+  };
+  ktnef = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/ktnef-16.04.0.tar.xz";
+      sha256 = "1n1hi22l1cgjq989dhglm1m47f8bg3zdpsyh506qa3j7fg2y3rs6";
+      name = "ktnef-16.04.0.tar.xz";
+    };
+  };
+  ktouch = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/ktouch-16.04.0.tar.xz";
+      sha256 = "19n33p2yirxh21i7ij2bncqksz1i2k57c2cwrzzq40a3b9dndimc";
+      name = "ktouch-16.04.0.tar.xz";
+    };
+  };
+  ktp-accounts-kcm = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/ktp-accounts-kcm-16.04.0.tar.xz";
+      sha256 = "1mr7f481dcgg3gyyzycs92n7s2ap5kyv7xy2dmf7rypz1xkp2sya";
+      name = "ktp-accounts-kcm-16.04.0.tar.xz";
+    };
+  };
+  ktp-approver = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/ktp-approver-16.04.0.tar.xz";
+      sha256 = "1mqbvb797mms4mwk5v5xkh2z67fkh1ayhkjq0hgj0wi3a2x65zx8";
+      name = "ktp-approver-16.04.0.tar.xz";
+    };
+  };
+  ktp-auth-handler = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/ktp-auth-handler-16.04.0.tar.xz";
+      sha256 = "1l7rlqiaaffcdpplznkbhhrn41q7f1vx4ripjizj0q8a62fivbr6";
+      name = "ktp-auth-handler-16.04.0.tar.xz";
+    };
+  };
+  ktp-call-ui = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/ktp-call-ui-16.04.0.tar.xz";
+      sha256 = "0ndknp2c3qyd894cavxbp7kfc8rxgz7pcd3gvsrwdgk31k4jajyx";
+      name = "ktp-call-ui-16.04.0.tar.xz";
+    };
+  };
+  ktp-common-internals = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/ktp-common-internals-16.04.0.tar.xz";
+      sha256 = "1q0bwnsna9h7lj8pva1kzmn8qnlgyynbvldgcr85g713jr2lnmr8";
+      name = "ktp-common-internals-16.04.0.tar.xz";
+    };
+  };
+  ktp-contact-list = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/ktp-contact-list-16.04.0.tar.xz";
+      sha256 = "07ffzrzm5y8kgz6cxjsj8kkgsnvprrjkl4ck8y0san47gk2p5rb7";
+      name = "ktp-contact-list-16.04.0.tar.xz";
+    };
+  };
+  ktp-contact-runner = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/ktp-contact-runner-16.04.0.tar.xz";
+      sha256 = "0rcpci13hz9xdc51p364rvyi50vkjjgmf74wkwmaxc57sclf5bwi";
+      name = "ktp-contact-runner-16.04.0.tar.xz";
+    };
+  };
+  ktp-desktop-applets = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/ktp-desktop-applets-16.04.0.tar.xz";
+      sha256 = "01w3cdbrii14211wgn9vl3l108za5bw22f39pyznf1bqjimdz4nh";
+      name = "ktp-desktop-applets-16.04.0.tar.xz";
+    };
+  };
+  ktp-filetransfer-handler = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/ktp-filetransfer-handler-16.04.0.tar.xz";
+      sha256 = "1sf7xg317dgcdvnj2j9hq63633d6iyl7rgn22xryawpq2iw3wz9n";
+      name = "ktp-filetransfer-handler-16.04.0.tar.xz";
+    };
+  };
+  ktp-kded-module = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/ktp-kded-module-16.04.0.tar.xz";
+      sha256 = "13zsgzipmkn15h83ziwa3wg1dcin4lqawmhapkhlf4xxs8wm1mb6";
+      name = "ktp-kded-module-16.04.0.tar.xz";
+    };
+  };
+  ktp-send-file = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/ktp-send-file-16.04.0.tar.xz";
+      sha256 = "0sdwrj644n80xnx8syycpiwwn432ww2i3vvx1v6sj696gcrkv7i4";
+      name = "ktp-send-file-16.04.0.tar.xz";
+    };
+  };
+  ktp-text-ui = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/ktp-text-ui-16.04.0.tar.xz";
+      sha256 = "1pgz1hzrkmx6k88cghgacgjykmkbjvvm1hhyr377hgvdhrfc6scy";
+      name = "ktp-text-ui-16.04.0.tar.xz";
+    };
+  };
+  ktuberling = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/ktuberling-16.04.0.tar.xz";
+      sha256 = "1w7qv0iacjhr9yphm3kxxiwh2c17x6ky4i2yzb178nb5sh6dgdig";
+      name = "ktuberling-16.04.0.tar.xz";
+    };
+  };
+  kturtle = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kturtle-16.04.0.tar.xz";
+      sha256 = "1as62h92dx4f1n1fb1lhsyvx90msl2392b595hfsgkhgqb4spn3y";
+      name = "kturtle-16.04.0.tar.xz";
+    };
+  };
+  kubrick = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kubrick-16.04.0.tar.xz";
+      sha256 = "1vvh3yzpcri1yyc3z4djkr8sjs03pbrwinrz0f4iwah8diyrdpy0";
+      name = "kubrick-16.04.0.tar.xz";
+    };
+  };
+  kuser = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kuser-16.04.0.tar.xz";
+      sha256 = "11fradjslci2znglh24wcljhpld4zp206r0wrp392hjc4i6ck069";
+      name = "kuser-16.04.0.tar.xz";
+    };
+  };
+  kwalletmanager = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kwalletmanager-16.04.0.tar.xz";
+      sha256 = "1wqdhwvkxky0c4lnm9b3akjvb2ydx3qx3hr08959za7kkk976nmb";
+      name = "kwalletmanager-16.04.0.tar.xz";
+    };
+  };
+  kwordquiz = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/kwordquiz-16.04.0.tar.xz";
+      sha256 = "0yk95l6gl57hs62l8xvi9xfrzmkcch0v3ijasqhg20i4w33309z0";
+      name = "kwordquiz-16.04.0.tar.xz";
+    };
+  };
+  libgravatar = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/libgravatar-16.04.0.tar.xz";
+      sha256 = "0kbvy90r5x1s1s3h680cqiqj221gicvy8j0pwid5vr2pxjkdih0l";
+      name = "libgravatar-16.04.0.tar.xz";
+    };
+  };
+  libkcddb = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/libkcddb-16.04.0.tar.xz";
+      sha256 = "1wylsqij5l3w4pvw3g2jkypqpn3a8fg72x7q5dp22l0n9ihrhn8j";
+      name = "libkcddb-16.04.0.tar.xz";
+    };
+  };
+  libkcompactdisc = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/libkcompactdisc-16.04.0.tar.xz";
+      sha256 = "0zf3bry65jak3z4kjhnszjy05h4pvnzzz7nh954cmigv369iwsz8";
+      name = "libkcompactdisc-16.04.0.tar.xz";
+    };
+  };
+  libkdcraw = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/libkdcraw-16.04.0.tar.xz";
+      sha256 = "0l6aa2458apxbz1hm300w3s32ywxjhy80vnm3sxnk3313ba38cml";
+      name = "libkdcraw-16.04.0.tar.xz";
+    };
+  };
+  libkdeedu = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/libkdeedu-16.04.0.tar.xz";
+      sha256 = "16aabzc57qjjzmfmsnb4rjw28w4014l66dsy528rfj5i0wyw40vy";
+      name = "libkdeedu-16.04.0.tar.xz";
+    };
+  };
+  libkdegames = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/libkdegames-16.04.0.tar.xz";
+      sha256 = "0nr3z1plcinx0hw9q1gac32czgy6079q36v57qk76l6531cssk73";
+      name = "libkdegames-16.04.0.tar.xz";
+    };
+  };
+  libkdepim = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/libkdepim-16.04.0.tar.xz";
+      sha256 = "0197r1hdx6cpakmvcp1195bm1vn71y8sprbx23n4m9ak92ak9z6x";
+      name = "libkdepim-16.04.0.tar.xz";
+    };
+  };
+  libkeduvocdocument = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/libkeduvocdocument-16.04.0.tar.xz";
+      sha256 = "0j92kjhj143z4g9702ir4xs0hdpkk74ydi9347cvb1vh8mq7wqn0";
+      name = "libkeduvocdocument-16.04.0.tar.xz";
+    };
+  };
+  libkexiv2 = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/libkexiv2-16.04.0.tar.xz";
+      sha256 = "1n3bhzlw729vka1lc00sw75m7cfg5ibqh2lliv6lv9g9aqb7xk0z";
+      name = "libkexiv2-16.04.0.tar.xz";
+    };
+  };
+  libkface = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/libkface-16.04.0.tar.xz";
+      sha256 = "1vykpj8yws1sd4x3zcpjlrlq9ygybia4wi34qcakx5016fym2qxb";
+      name = "libkface-16.04.0.tar.xz";
+    };
+  };
+  libkgeomap = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/libkgeomap-16.04.0.tar.xz";
+      sha256 = "0kl2wzxmy25398amk3631vql0vh66vd2j9qdxzjb9lvlw7gvn55s";
+      name = "libkgeomap-16.04.0.tar.xz";
+    };
+  };
+  libkipi = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/libkipi-16.04.0.tar.xz";
+      sha256 = "0ffa57f1p86sdqq1spf5bvzh2vfa9wfhm8lrhs6mfrr0nr65v85x";
+      name = "libkipi-16.04.0.tar.xz";
+    };
+  };
+  libkleo = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/libkleo-16.04.0.tar.xz";
+      sha256 = "0yw36vxscwh10bnn20lbas06j1pcwdgd08qhd8hfdl9yajg9jg0w";
+      name = "libkleo-16.04.0.tar.xz";
+    };
+  };
+  libkmahjongg = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/libkmahjongg-16.04.0.tar.xz";
+      sha256 = "08vh9mpxy4i9lnd8a57i443lr77b5am50w4xnpssi0jfy0jjsxkr";
+      name = "libkmahjongg-16.04.0.tar.xz";
+    };
+  };
+  libkomparediff2 = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/libkomparediff2-16.04.0.tar.xz";
+      sha256 = "137p3c07f7ni5khwbnb9fm9i8vprn0y0wzqmlfa2rhc78bn0czsl";
+      name = "libkomparediff2-16.04.0.tar.xz";
+    };
+  };
+  libksane = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/libksane-16.04.0.tar.xz";
+      sha256 = "07944vywdm13swqh5psw6jv36f6hdxqhrb718wicjlr57lbg65mb";
+      name = "libksane-16.04.0.tar.xz";
+    };
+  };
+  libksieve = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/libksieve-16.04.0.tar.xz";
+      sha256 = "15gwg02sand97khvdl22zhqq734n4xdbndldzla0jh2jxixa2ihn";
+      name = "libksieve-16.04.0.tar.xz";
+    };
+  };
+  lokalize = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/lokalize-16.04.0.tar.xz";
+      sha256 = "1r77pmy2dxnbxh1dgcmrpz2d6kpnj6z31yan1lkr8wf0fgh7355i";
+      name = "lokalize-16.04.0.tar.xz";
+    };
+  };
+  lskat = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/lskat-16.04.0.tar.xz";
+      sha256 = "1px4wv9kxqqvrdmk9v4bw212mdjwl0v7qbh8mmyq8j06axf3a6jm";
+      name = "lskat-16.04.0.tar.xz";
+    };
+  };
+  mailcommon = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/mailcommon-16.04.0.tar.xz";
+      sha256 = "0s62kzjas1zs9cm06lfk37d3nx4h0h0m75i3wlj87spd7hg8p2i1";
+      name = "mailcommon-16.04.0.tar.xz";
+    };
+  };
+  mailimporter = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/mailimporter-16.04.0.tar.xz";
+      sha256 = "0ij07frw0bf3h8hlkdacdv8a2czsaipkjqwlscbsl5vcplfxpsxv";
+      name = "mailimporter-16.04.0.tar.xz";
+    };
+  };
+  marble = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/marble-16.04.0.tar.xz";
+      sha256 = "05idh1011njasxr24r2cd16i07720af1qqvba3anfx20nav1sxgr";
+      name = "marble-16.04.0.tar.xz";
+    };
+  };
+  messagelib = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/messagelib-16.04.0.tar.xz";
+      sha256 = "0zh4fxs33yvvn9wgfs47d016bhzss1mr7qjyq023mrlmsl7jnpr8";
+      name = "messagelib-16.04.0.tar.xz";
+    };
+  };
+  minuet = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/minuet-16.04.0.tar.xz";
+      sha256 = "0jyrl2rxl1dllv2d99vrga7jn3dqqkrkvhg3bv7a80w766j9hq8g";
+      name = "minuet-16.04.0.tar.xz";
+    };
+  };
+  mplayerthumbs = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/mplayerthumbs-16.04.0.tar.xz";
+      sha256 = "0mkgnxli1pysrzqbcxky6hsmcvjww7zly82ya2p4nsjr71g8laid";
+      name = "mplayerthumbs-16.04.0.tar.xz";
+    };
+  };
+  okteta = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/okteta-16.04.0.tar.xz";
+      sha256 = "01p4sqd1j75nyg3aax15b5z3dnppnzc27ci61yzsa3jhd0470n3c";
+      name = "okteta-16.04.0.tar.xz";
+    };
+  };
+  okular = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/okular-16.04.0.tar.xz";
+      sha256 = "0dn9vm22hc30v1fhly52fmbvjd6my2zxvl08f44jwimbh7wh9rw0";
+      name = "okular-16.04.0.tar.xz";
+    };
+  };
+  palapeli = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/palapeli-16.04.0.tar.xz";
+      sha256 = "1yrph8a07jm69cg5gj0rgc4mgqfvqg024wald724yyydbcx5i8br";
+      name = "palapeli-16.04.0.tar.xz";
+    };
+  };
+  parley = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/parley-16.04.0.tar.xz";
+      sha256 = "17lwb2vy36hrpgz3f9hrfikp7kz36xq013ym4cijh26xysha2gsx";
+      name = "parley-16.04.0.tar.xz";
+    };
+  };
+  picmi = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/picmi-16.04.0.tar.xz";
+      sha256 = "0w2x9c0bd26b34ckmyzcfn980kbsq0y5zw3kfw3dsh5q8n0c627f";
+      name = "picmi-16.04.0.tar.xz";
+    };
+  };
+  pimcommon = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/pimcommon-16.04.0.tar.xz";
+      sha256 = "0c0xkg2vd5jps0nfy661z2np17gygpyvkdc6cp5ir41b5sk2fz4h";
+      name = "pimcommon-16.04.0.tar.xz";
+    };
+  };
+  poxml = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/poxml-16.04.0.tar.xz";
+      sha256 = "1zwg7b4j5ijs9sry8hl7fnnli8hsw3gy685cdgpairgj46yyryx8";
+      name = "poxml-16.04.0.tar.xz";
+    };
+  };
+  print-manager = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/print-manager-16.04.0.tar.xz";
+      sha256 = "1kl68fz52zjwfs9kprihar0i6n6sg6s40slblfhvi60s1g5krf4m";
+      name = "print-manager-16.04.0.tar.xz";
+    };
+  };
+  rocs = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/rocs-16.04.0.tar.xz";
+      sha256 = "05wc9b93csf7bsbmy99jcnml7n0mgfql1rvrs3z8jcz17jnfcx9s";
+      name = "rocs-16.04.0.tar.xz";
+    };
+  };
+  signon-kwallet-extension = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/signon-kwallet-extension-16.04.0.tar.xz";
+      sha256 = "0a36gklixkkwgnhs3w3z3l14p6x6r0xgzcqw344g36v1x3imvspf";
+      name = "signon-kwallet-extension-16.04.0.tar.xz";
+    };
+  };
+  spectacle = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/spectacle-16.04.0.tar.xz";
+      sha256 = "0c0qmgjd32iam0zd4n08kmajfqpfsa0zphxvgq2rh7plxw3npfga";
+      name = "spectacle-16.04.0.tar.xz";
+    };
+  };
+  step = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/step-16.04.0.tar.xz";
+      sha256 = "18imzm9v2gbf64f3p08a3l7r7axyjsmi2xvbqvg0ir2ly3pabrx0";
+      name = "step-16.04.0.tar.xz";
+    };
+  };
+  svgpart = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/svgpart-16.04.0.tar.xz";
+      sha256 = "11793djb9v499b11kwr1312p9j9hhrjk7i67035s64lblrnbb9yw";
+      name = "svgpart-16.04.0.tar.xz";
+    };
+  };
+  sweeper = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/sweeper-16.04.0.tar.xz";
+      sha256 = "0hahwmiziiwraahssxzsxfzvyli4lmj7fdskqnv9q7b39hai88j7";
+      name = "sweeper-16.04.0.tar.xz";
+    };
+  };
+  syndication = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/syndication-16.04.0.tar.xz";
+      sha256 = "0m8dacbqdg9vya2c8gknckx8xjp6m9s93vxd4j6a78jz28j6yvcc";
+      name = "syndication-16.04.0.tar.xz";
+    };
+  };
+  umbrello = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/umbrello-16.04.0.tar.xz";
+      sha256 = "11b7a7bg9v2gdl4hjpfz06k5ks2v36ai70iri6rcp0lw9bcspig2";
+      name = "umbrello-16.04.0.tar.xz";
+    };
+  };
+  zeroconf-ioslave = {
+    version = "16.04.0";
+    src = fetchurl {
+      url = "${mirror}/stable/applications/16.04.0/src/zeroconf-ioslave-16.04.0.tar.xz";
+      sha256 = "0ablccfi3kq18rcx79jwn9z317qyflb05ck9kalqpr7f8xnmhzn3";
+      name = "zeroconf-ioslave-16.04.0.tar.xz";
+    };
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6dfd259aab9d..81fe6bc5f96a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15593,7 +15593,7 @@ in
     let
       frameworks = import ../desktops/kde-5/frameworks-5.21 { inherit pkgs; };
       plasma = import ../desktops/kde-5/plasma-5.5 { inherit pkgs; };
-      applications = import ../desktops/kde-5/applications-15.12 { inherit pkgs; };
+      applications = import ../desktops/kde-5/applications-16.04 { inherit pkgs; };
       merged = self:
         { plasma = plasma self;
           frameworks = frameworks self;

From c7f0701c872944eb2c46701c316e000fc30a6dfc Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 21 Apr 2016 11:01:22 -0500
Subject: [PATCH 050/287] kde5_latest.plasma: 5.5.5 -> 5.6.3

---
 pkgs/desktops/kde-5/plasma-5.6/bluedevil.nix  |  26 ++
 pkgs/desktops/kde-5/plasma-5.6/breeze-gtk.nix |   8 +
 pkgs/desktops/kde-5/plasma-5.6/breeze-qt4.nix |  29 ++
 pkgs/desktops/kde-5/plasma-5.6/breeze-qt5.nix |  23 ++
 pkgs/desktops/kde-5/plasma-5.6/default.nix    |  88 +++++
 pkgs/desktops/kde-5/plasma-5.6/fetchsrcs.sh   |  57 +++
 .../kde-5/plasma-5.6/kde-cli-tools.nix        |  27 ++
 .../kde-gtk-config/0001-follow-symlinks.patch |  39 ++
 .../plasma-5.6/kde-gtk-config/default.nix     |  28 ++
 .../desktops/kde-5/plasma-5.6/kdecoration.nix |   6 +
 .../kde-5/plasma-5.6/kdeplasma-addons.nix     |  21 +
 pkgs/desktops/kde-5/plasma-5.6/kgamma5.nix    |   9 +
 .../desktops/kde-5/plasma-5.6/khelpcenter.nix |  20 +
 pkgs/desktops/kde-5/plasma-5.6/khotkeys.nix   |  16 +
 .../desktops/kde-5/plasma-5.6/kinfocenter.nix |  24 ++
 pkgs/desktops/kde-5/plasma-5.6/kmenuedit.nix  |  19 +
 pkgs/desktops/kde-5/plasma-5.6/kscreen.nix    |  29 ++
 .../kde-5/plasma-5.6/kscreenlocker.nix        |  19 +
 .../desktops/kde-5/plasma-5.6/ksshaskpass.nix |  13 +
 pkgs/desktops/kde-5/plasma-5.6/ksysguard.nix  |  20 +
 pkgs/desktops/kde-5/plasma-5.6/kwayland.nix   |  14 +
 .../0001-qdiriterator-follow-symlinks.patch   |  25 ++
 .../kde-5/plasma-5.6/kwin/default.nix         |  34 ++
 pkgs/desktops/kde-5/plasma-5.6/kwrited.nix    |  10 +
 .../kde-5/plasma-5.6/libkscreen/default.nix   |  18 +
 .../0001-qdiriterator-follow-symlinks.patch   |  25 ++
 .../kde-5/plasma-5.6/libksysguard/default.nix |  28 ++
 pkgs/desktops/kde-5/plasma-5.6/milou.nix      |  17 +
 pkgs/desktops/kde-5/plasma-5.6/oxygen.nix     |  20 +
 .../0001-qt-5.5-QML-import-paths.patch        |  67 ++++
 .../plasma-desktop/0002-hwclock.patch         |  36 ++
 .../plasma-desktop/0003-tzdir.patch           |  30 ++
 .../plasma-5.6/plasma-desktop/default.nix     |  86 ++++
 .../kde-5/plasma-5.6/plasma-mediacenter.nix   |  20 +
 ...-mobile-broadband-provider-info-path.patch |  25 ++
 .../kde-5/plasma-5.6/plasma-nm/default.nix    |  36 ++
 pkgs/desktops/kde-5/plasma-5.6/plasma-pa.nix  |  18 +
 .../plasma-workspace-wallpapers.nix           |  10 +
 .../plasma-5.6/plasma-workspace/default.nix   |  45 +++
 .../plasma-workspace/qml-import-path.patch    | 104 +++++
 .../kde-5/plasma-5.6/plasma-workspace/series  |   1 +
 .../plasma-workspace/startkde.patch           | 372 ++++++++++++++++++
 .../kde-5/plasma-5.6/polkit-kde-agent.nix     |  31 ++
 pkgs/desktops/kde-5/plasma-5.6/powerdevil.nix |  20 +
 pkgs/desktops/kde-5/plasma-5.6/setup-hook.sh  |   1 +
 pkgs/desktops/kde-5/plasma-5.6/srcs.nix       | 341 ++++++++++++++++
 .../kde-5/plasma-5.6/startkde/default.nix     |  32 ++
 .../kde-5/plasma-5.6/startkde/startkde.sh     | 334 ++++++++++++++++
 .../kde-5/plasma-5.6/systemsettings.nix       |  21 +
 pkgs/top-level/all-packages.nix               |   2 +-
 50 files changed, 2343 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/desktops/kde-5/plasma-5.6/bluedevil.nix
 create mode 100644 pkgs/desktops/kde-5/plasma-5.6/breeze-gtk.nix
 create mode 100644 pkgs/desktops/kde-5/plasma-5.6/breeze-qt4.nix
 create mode 100644 pkgs/desktops/kde-5/plasma-5.6/breeze-qt5.nix
 create mode 100644 pkgs/desktops/kde-5/plasma-5.6/default.nix
 create mode 100755 pkgs/desktops/kde-5/plasma-5.6/fetchsrcs.sh
 create mode 100644 pkgs/desktops/kde-5/plasma-5.6/kde-cli-tools.nix
 create mode 100644 pkgs/desktops/kde-5/plasma-5.6/kde-gtk-config/0001-follow-symlinks.patch
 create mode 100644 pkgs/desktops/kde-5/plasma-5.6/kde-gtk-config/default.nix
 create mode 100644 pkgs/desktops/kde-5/plasma-5.6/kdecoration.nix
 create mode 100644 pkgs/desktops/kde-5/plasma-5.6/kdeplasma-addons.nix
 create mode 100644 pkgs/desktops/kde-5/plasma-5.6/kgamma5.nix
 create mode 100644 pkgs/desktops/kde-5/plasma-5.6/khelpcenter.nix
 create mode 100644 pkgs/desktops/kde-5/plasma-5.6/khotkeys.nix
 create mode 100644 pkgs/desktops/kde-5/plasma-5.6/kinfocenter.nix
 create mode 100644 pkgs/desktops/kde-5/plasma-5.6/kmenuedit.nix
 create mode 100644 pkgs/desktops/kde-5/plasma-5.6/kscreen.nix
 create mode 100644 pkgs/desktops/kde-5/plasma-5.6/kscreenlocker.nix
 create mode 100644 pkgs/desktops/kde-5/plasma-5.6/ksshaskpass.nix
 create mode 100644 pkgs/desktops/kde-5/plasma-5.6/ksysguard.nix
 create mode 100644 pkgs/desktops/kde-5/plasma-5.6/kwayland.nix
 create mode 100644 pkgs/desktops/kde-5/plasma-5.6/kwin/0001-qdiriterator-follow-symlinks.patch
 create mode 100644 pkgs/desktops/kde-5/plasma-5.6/kwin/default.nix
 create mode 100644 pkgs/desktops/kde-5/plasma-5.6/kwrited.nix
 create mode 100644 pkgs/desktops/kde-5/plasma-5.6/libkscreen/default.nix
 create mode 100644 pkgs/desktops/kde-5/plasma-5.6/libksysguard/0001-qdiriterator-follow-symlinks.patch
 create mode 100644 pkgs/desktops/kde-5/plasma-5.6/libksysguard/default.nix
 create mode 100644 pkgs/desktops/kde-5/plasma-5.6/milou.nix
 create mode 100644 pkgs/desktops/kde-5/plasma-5.6/oxygen.nix
 create mode 100644 pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/0001-qt-5.5-QML-import-paths.patch
 create mode 100644 pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/0002-hwclock.patch
 create mode 100644 pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/0003-tzdir.patch
 create mode 100644 pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/default.nix
 create mode 100644 pkgs/desktops/kde-5/plasma-5.6/plasma-mediacenter.nix
 create mode 100644 pkgs/desktops/kde-5/plasma-5.6/plasma-nm/0001-mobile-broadband-provider-info-path.patch
 create mode 100644 pkgs/desktops/kde-5/plasma-5.6/plasma-nm/default.nix
 create mode 100644 pkgs/desktops/kde-5/plasma-5.6/plasma-pa.nix
 create mode 100644 pkgs/desktops/kde-5/plasma-5.6/plasma-workspace-wallpapers.nix
 create mode 100644 pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/default.nix
 create mode 100644 pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/qml-import-path.patch
 create mode 100644 pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/series
 create mode 100644 pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/startkde.patch
 create mode 100644 pkgs/desktops/kde-5/plasma-5.6/polkit-kde-agent.nix
 create mode 100644 pkgs/desktops/kde-5/plasma-5.6/powerdevil.nix
 create mode 100644 pkgs/desktops/kde-5/plasma-5.6/setup-hook.sh
 create mode 100644 pkgs/desktops/kde-5/plasma-5.6/srcs.nix
 create mode 100644 pkgs/desktops/kde-5/plasma-5.6/startkde/default.nix
 create mode 100755 pkgs/desktops/kde-5/plasma-5.6/startkde/startkde.sh
 create mode 100644 pkgs/desktops/kde-5/plasma-5.6/systemsettings.nix

diff --git a/pkgs/desktops/kde-5/plasma-5.6/bluedevil.nix b/pkgs/desktops/kde-5/plasma-5.6/bluedevil.nix
new file mode 100644
index 000000000000..6596c246202f
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma-5.6/bluedevil.nix
@@ -0,0 +1,26 @@
+{ plasmaPackage, extra-cmake-modules, bluez-qt, kcoreaddons
+, kdbusaddons, kded, ki18n, kiconthemes, kio, knotifications
+, kwidgetsaddons, kwindowsystem, makeQtWrapper, plasma-framework
+, qtdeclarative, shared_mime_info
+}:
+
+plasmaPackage {
+  name = "bluedevil";
+  nativeBuildInputs = [
+    extra-cmake-modules makeQtWrapper shared_mime_info
+  ];
+  buildInputs = [
+    kcoreaddons kdbusaddons kded kiconthemes knotifications
+    kwidgetsaddons
+  ];
+  propagatedBuildInputs = [
+    bluez-qt ki18n kio kwindowsystem plasma-framework qtdeclarative
+  ];
+  propagatedUserEnvPkgs = [ bluez-qt ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/bluedevil-wizard"
+    wrapQtProgram "$out/bin/bluedevil-sendfile"
+    # Fix the location of logic.js for the plasmoid
+    ln -s $out/share/plasma/plasmoids/org.kde.plasma.bluetooth/contents/code/logic.js $out/share/plasma/plasmoids/org.kde.plasma.bluetooth/contents/ui/logic.js
+  '';
+}
diff --git a/pkgs/desktops/kde-5/plasma-5.6/breeze-gtk.nix b/pkgs/desktops/kde-5/plasma-5.6/breeze-gtk.nix
new file mode 100644
index 000000000000..179f15dc8763
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma-5.6/breeze-gtk.nix
@@ -0,0 +1,8 @@
+{ plasmaPackage
+, extra-cmake-modules
+}:
+
+plasmaPackage {
+  name = "breeze-gtk";
+  nativeBuildInputs = [ extra-cmake-modules ];
+}
diff --git a/pkgs/desktops/kde-5/plasma-5.6/breeze-qt4.nix b/pkgs/desktops/kde-5/plasma-5.6/breeze-qt4.nix
new file mode 100644
index 000000000000..f8092bc9d376
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma-5.6/breeze-qt4.nix
@@ -0,0 +1,29 @@
+{ plasmaPackage
+, automoc4
+, cmake
+, perl
+, pkgconfig
+, kdelibs
+, qt4
+, xproto
+}:
+
+plasmaPackage {
+  name = "breeze-qt4";
+  sname = "breeze";
+  buildInputs = [
+    kdelibs
+    qt4
+    xproto
+  ];
+  nativeBuildInputs = [
+    automoc4
+    cmake
+    perl
+    pkgconfig
+  ];
+  cmakeFlags = [
+    "-DUSE_KDE4=ON"
+    "-DQT_QMAKE_EXECUTABLE=${qt4}/bin/qmake"
+  ];
+}
diff --git a/pkgs/desktops/kde-5/plasma-5.6/breeze-qt5.nix b/pkgs/desktops/kde-5/plasma-5.6/breeze-qt5.nix
new file mode 100644
index 000000000000..63ade168805d
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma-5.6/breeze-qt5.nix
@@ -0,0 +1,23 @@
+{ plasmaPackage, extra-cmake-modules, frameworkintegration
+, kcmutils, kconfigwidgets, kcoreaddons, kdecoration, kguiaddons
+, ki18n, kwindowsystem, makeQtWrapper, plasma-framework, qtx11extras
+}:
+
+plasmaPackage {
+  name = "breeze-qt5";
+  sname = "breeze";
+  nativeBuildInputs = [
+    extra-cmake-modules
+    makeQtWrapper
+  ];
+  buildInputs = [
+    kcmutils kconfigwidgets kcoreaddons kdecoration kguiaddons
+  ];
+  propagatedBuildInputs = [
+    frameworkintegration ki18n kwindowsystem plasma-framework qtx11extras
+  ];
+  cmakeFlags = [ "-DUSE_Qt4=OFF" ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/breeze-settings5"
+  '';
+}
diff --git a/pkgs/desktops/kde-5/plasma-5.6/default.nix b/pkgs/desktops/kde-5/plasma-5.6/default.nix
new file mode 100644
index 000000000000..a4f5c7c23204
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma-5.6/default.nix
@@ -0,0 +1,88 @@
+# Maintainer's Notes:
+#
+# How To Update
+#  1. Edit the URL in ./manifest.sh
+#  2. Run ./manifest.sh
+#  3. Fix build errors.
+
+{ pkgs, debug ? false }:
+
+let
+
+  inherit (pkgs) lib stdenv symlinkJoin;
+
+  kdeApps = pkgs.kdeApps_15_12;
+
+  srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; };
+  mirror = "mirror://kde";
+
+  packages = self: with self; {
+    plasmaPackage = args:
+      let
+        inherit (args) name;
+        sname = args.sname or name;
+        inherit (srcs."${sname}") src version;
+      in stdenv.mkDerivation (args // {
+        name = "${name}-${version}";
+        inherit src;
+
+        outputs = args.outputs or [ "dev" "out" ];
+
+        cmakeFlags =
+          (args.cmakeFlags or [])
+          ++ [ "-DBUILD_TESTING=OFF" ]
+          ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug";
+
+        meta = {
+          license = with lib.licenses; [
+            lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
+          ];
+          platforms = lib.platforms.linux;
+          maintainers = with lib.maintainers; [ ttuegel ];
+          homepage = "http://www.kde.org";
+        } // (args.meta or {});
+      });
+
+    bluedevil = callPackage ./bluedevil.nix {};
+    breeze-gtk = callPackage ./breeze-gtk.nix {};
+    breeze-qt4 = callPackage ./breeze-qt4.nix {};
+    breeze-qt5 = callPackage ./breeze-qt5.nix {};
+    breeze =
+      let
+        version = (builtins.parseDrvName breeze-qt5.name).version;
+      in
+        symlinkJoin "breeze-${version}"
+        (map (pkg: pkg.out or pkg) [ breeze-gtk breeze-qt4 breeze-qt5 ]);
+    kde-cli-tools = callPackage ./kde-cli-tools.nix {};
+    kde-gtk-config = callPackage ./kde-gtk-config {};
+    kdecoration = callPackage ./kdecoration.nix {};
+    kdeplasma-addons = callPackage ./kdeplasma-addons.nix {};
+    kgamma5 = callPackage ./kgamma5.nix {};
+    khelpcenter = callPackage ./khelpcenter.nix {};
+    khotkeys = callPackage ./khotkeys.nix {};
+    kinfocenter = callPackage ./kinfocenter.nix {};
+    kmenuedit = callPackage ./kmenuedit.nix {};
+    kscreen = callPackage ./kscreen.nix {};
+    kscreenlocker = callPackage ./kscreenlocker.nix {};
+    ksshaskpass = callPackage ./ksshaskpass.nix {};
+    ksysguard = callPackage ./ksysguard.nix {};
+    kwayland = callPackage ./kwayland.nix {};
+    kwin = callPackage ./kwin {};
+    kwrited = callPackage ./kwrited.nix {};
+    libkscreen = callPackage ./libkscreen {};
+    libksysguard = callPackage ./libksysguard {};
+    milou = callPackage ./milou.nix {};
+    oxygen = callPackage ./oxygen.nix {};
+    plasma-desktop = callPackage ./plasma-desktop {};
+    plasma-mediacenter = callPackage ./plasma-mediacenter.nix {};
+    plasma-nm = callPackage ./plasma-nm {};
+    plasma-pa = callPackage ./plasma-pa.nix {};
+    plasma-workspace = callPackage ./plasma-workspace {};
+    plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers.nix {};
+    polkit-kde-agent = callPackage ./polkit-kde-agent.nix {};
+    powerdevil = callPackage ./powerdevil.nix {};
+    startkde = callPackage ./startkde {};
+    systemsettings = callPackage ./systemsettings.nix {};
+  };
+
+in packages
diff --git a/pkgs/desktops/kde-5/plasma-5.6/fetchsrcs.sh b/pkgs/desktops/kde-5/plasma-5.6/fetchsrcs.sh
new file mode 100755
index 000000000000..93f58373ca29
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma-5.6/fetchsrcs.sh
@@ -0,0 +1,57 @@
+#! /usr/bin/env nix-shell
+#! nix-shell -i bash -p coreutils findutils gawk gnused nix wget
+
+set -x
+
+# The trailing slash at the end is necessary!
+RELEASE_URL="http://download.kde.org/stable/plasma/5.6.3/"
+EXTRA_WGET_ARGS='-A *.tar.xz'
+
+mkdir tmp; cd tmp
+
+rm -f ../srcs.csv
+
+wget -nH -r -c --no-parent $RELEASE_URL $EXTRA_WGET_ARGS
+
+find . | while read src; do
+    if [[ -f "${src}" ]]; then
+        # Sanitize file name
+        filename=$(basename "$src" | tr '@' '_')
+        nameVersion="${filename%.tar.*}"
+        name=$(echo "$nameVersion" | sed -e 's,-[[:digit:]].*,,' | sed -e 's,-opensource-src$,,')
+        version=$(echo "$nameVersion" | sed -e 's,^\([[:alpha:]][[:alnum:]]*-\)\+,,')
+        echo "$name,$version,$src,$filename" >>../srcs.csv
+    fi
+done
+
+cat >../srcs.nix <<EOF
+# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
+{ fetchurl, mirror }:
+
+{
+EOF
+
+gawk -F , "{ print \$1 }" ../srcs.csv | sort | uniq | while read name; do
+    versions=$(gawk -F , "/^$name,/ { print \$2 }" ../srcs.csv)
+    latestVersion=$(echo "$versions" | sort -rV | head -n 1)
+    src=$(gawk -F , "/^$name,$latestVersion,/ { print \$3 }" ../srcs.csv)
+    filename=$(gawk -F , "/^$name,$latestVersion,/ { print \$4 }" ../srcs.csv)
+    url="${src:2}"
+    sha256=$(nix-hash --type sha256 --base32 --flat "$src")
+    cat >>../srcs.nix <<EOF
+  $name = {
+    version = "$latestVersion";
+    src = fetchurl {
+      url = "\${mirror}/$url";
+      sha256 = "$sha256";
+      name = "$filename";
+    };
+  };
+EOF
+done
+
+echo "}" >>../srcs.nix
+
+rm -f ../srcs.csv
+
+cd ..
diff --git a/pkgs/desktops/kde-5/plasma-5.6/kde-cli-tools.nix b/pkgs/desktops/kde-5/plasma-5.6/kde-cli-tools.nix
new file mode 100644
index 000000000000..7f19af6959ec
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma-5.6/kde-cli-tools.nix
@@ -0,0 +1,27 @@
+{ plasmaPackage, extra-cmake-modules, kcmutils, kconfig
+, kdelibs4support, kdesu, kdoctools, ki18n, kiconthemes
+, kwindowsystem, makeQtWrapper, qtsvg, qtx11extras
+}:
+
+plasmaPackage {
+  name = "kde-cli-tools";
+  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
+  buildInputs = [
+    kcmutils kconfig kdesu kiconthemes
+  ];
+  propagatedBuildInputs = [
+    kdelibs4support ki18n kwindowsystem qtsvg qtx11extras
+  ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/kmimetypefinder5"
+    wrapQtProgram "$out/bin/ksvgtopng5"
+    wrapQtProgram "$out/bin/ktraderclient5"
+    wrapQtProgram "$out/bin/kioclient5"
+    wrapQtProgram "$out/bin/kdecp5"
+    wrapQtProgram "$out/bin/keditfiletype5"
+    wrapQtProgram "$out/bin/kcmshell5"
+    wrapQtProgram "$out/bin/kdemv5"
+    wrapQtProgram "$out/bin/kstart5"
+    wrapQtProgram "$out/bin/kde-open5"
+  '';
+}
diff --git a/pkgs/desktops/kde-5/plasma-5.6/kde-gtk-config/0001-follow-symlinks.patch b/pkgs/desktops/kde-5/plasma-5.6/kde-gtk-config/0001-follow-symlinks.patch
new file mode 100644
index 000000000000..759eda4cc134
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma-5.6/kde-gtk-config/0001-follow-symlinks.patch
@@ -0,0 +1,39 @@
+From 33b25c2e3c7a002c7f726cd79fc4bab22b1299be Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Tue, 27 Oct 2015 18:07:54 -0500
+Subject: [PATCH] follow symlinks
+
+---
+ src/appearancegtk2.cpp  | 2 +-
+ src/iconthemesmodel.cpp | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/appearancegtk2.cpp b/src/appearancegtk2.cpp
+index b1e0b52..095cddc 100644
+--- a/src/appearancegtk2.cpp
++++ b/src/appearancegtk2.cpp
+@@ -73,7 +73,7 @@ QString AppearanceGTK2::themesGtkrcFile(const QString& themeName) const
+     QStringList themes=installedThemes();
+     themes=themes.filter(QRegExp("/"+themeName+"/?$"));
+     if(themes.size()==1) {
+-        QDirIterator it(themes.first(), QDirIterator::Subdirectories);
++        QDirIterator it(themes.first(), QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
+         while(it.hasNext()) {
+             it.next();
+             if(it.fileName()=="gtkrc") {
+diff --git a/src/iconthemesmodel.cpp b/src/iconthemesmodel.cpp
+index 07c7ad7..b04d978 100644
+--- a/src/iconthemesmodel.cpp
++++ b/src/iconthemesmodel.cpp
+@@ -46,7 +46,7 @@ QList<QDir> IconThemesModel::installedThemesPaths()
+     
+     foreach(const QString& dir, dirs) {
+         QDir userIconsDir(dir);
+-        QDirIterator it(userIconsDir.path(), QDir::NoDotAndDotDot|QDir::AllDirs|QDir::NoSymLinks);
++        QDirIterator it(userIconsDir.path(), QDir::NoDotAndDotDot|QDir::AllDirs);
+         while(it.hasNext()) {
+             QString currentPath = it.next();
+             QDir dir(currentPath);
+-- 
+2.6.2
+
diff --git a/pkgs/desktops/kde-5/plasma-5.6/kde-gtk-config/default.nix b/pkgs/desktops/kde-5/plasma-5.6/kde-gtk-config/default.nix
new file mode 100644
index 000000000000..ab8867520b38
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma-5.6/kde-gtk-config/default.nix
@@ -0,0 +1,28 @@
+{ plasmaPackage
+, extra-cmake-modules
+, glib
+, gtk2
+, gtk3
+, karchive
+, kcmutils
+, kconfigwidgets
+, ki18n
+, kiconthemes
+, kio
+, knewstuff
+}:
+
+plasmaPackage {
+  name = "kde-gtk-config";
+  patches = [ ./0001-follow-symlinks.patch ];
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [
+    glib gtk2 gtk3 karchive kcmutils kconfigwidgets kiconthemes
+    knewstuff
+  ];
+  propagatedBuildInputs = [ ki18n kio ];
+  cmakeFlags = [
+    "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"
+    "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include"
+  ];
+}
diff --git a/pkgs/desktops/kde-5/plasma-5.6/kdecoration.nix b/pkgs/desktops/kde-5/plasma-5.6/kdecoration.nix
new file mode 100644
index 000000000000..eb65f7f90afb
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma-5.6/kdecoration.nix
@@ -0,0 +1,6 @@
+{ plasmaPackage, extra-cmake-modules }:
+
+plasmaPackage {
+  name = "kdecoration";
+  nativeBuildInputs = [ extra-cmake-modules ];
+}
diff --git a/pkgs/desktops/kde-5/plasma-5.6/kdeplasma-addons.nix b/pkgs/desktops/kde-5/plasma-5.6/kdeplasma-addons.nix
new file mode 100644
index 000000000000..d6a96a3276d7
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma-5.6/kdeplasma-addons.nix
@@ -0,0 +1,21 @@
+{ plasmaPackage, extra-cmake-modules, kdoctools, ibus, kconfig
+, kconfigwidgets, kcoreaddons, kcmutils, kdelibs4support, ki18n
+, kio, knewstuff, kross, krunner, kservice, kunitconversion
+, plasma-framework, qtdeclarative, qtx11extras
+}:
+
+plasmaPackage {
+  name = "kdeplasma-addons";
+  nativeBuildInputs = [
+    extra-cmake-modules
+    kdoctools
+  ];
+  buildInputs = [
+    ibus kconfig kconfigwidgets kcoreaddons kcmutils
+    knewstuff kservice kunitconversion
+  ];
+  propagatedBuildInputs = [
+    kdelibs4support kio kross krunner plasma-framework qtdeclarative
+    qtx11extras
+  ];
+}
diff --git a/pkgs/desktops/kde-5/plasma-5.6/kgamma5.nix b/pkgs/desktops/kde-5/plasma-5.6/kgamma5.nix
new file mode 100644
index 000000000000..965c33e6eef8
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma-5.6/kgamma5.nix
@@ -0,0 +1,9 @@
+{ plasmaPackage, extra-cmake-modules, kdoctools, kdelibs4support
+, qtx11extras
+}:
+
+plasmaPackage {
+  name = "kgamma5";
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  propagatedBuildInputs = [ kdelibs4support qtx11extras ];
+}
diff --git a/pkgs/desktops/kde-5/plasma-5.6/khelpcenter.nix b/pkgs/desktops/kde-5/plasma-5.6/khelpcenter.nix
new file mode 100644
index 000000000000..6ba860b9dfb2
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma-5.6/khelpcenter.nix
@@ -0,0 +1,20 @@
+{ plasmaPackage, extra-cmake-modules, kdoctools, kconfig
+, kcoreaddons, kdbusaddons, ki18n, kinit, kcmutils, kdelibs4support
+, khtml, kservice, makeQtWrapper
+}:
+
+plasmaPackage {
+  name = "khelpcenter";
+  nativeBuildInputs = [
+    extra-cmake-modules
+    kdoctools
+    makeQtWrapper
+  ];
+  buildInputs = [
+    kconfig kcoreaddons kdbusaddons kinit kcmutils kservice
+  ];
+  propagatedBuildInputs = [ kdelibs4support khtml ki18n ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/khelpcenter"
+  '';
+}
diff --git a/pkgs/desktops/kde-5/plasma-5.6/khotkeys.nix b/pkgs/desktops/kde-5/plasma-5.6/khotkeys.nix
new file mode 100644
index 000000000000..141320e6b3e6
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma-5.6/khotkeys.nix
@@ -0,0 +1,16 @@
+{ plasmaPackage, extra-cmake-modules, kdoctools, kcmutils
+, kdbusaddons, kdelibs4support, kglobalaccel, ki18n, kio, kxmlgui
+, plasma-framework, plasma-workspace, qtx11extras
+}:
+
+plasmaPackage {
+  name = "khotkeys";
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [
+    kcmutils kdbusaddons kxmlgui
+  ];
+  propagatedBuildInputs = [
+    kdelibs4support kglobalaccel ki18n kio plasma-framework
+    plasma-workspace qtx11extras
+  ];
+}
diff --git a/pkgs/desktops/kde-5/plasma-5.6/kinfocenter.nix b/pkgs/desktops/kde-5/plasma-5.6/kinfocenter.nix
new file mode 100644
index 000000000000..ed717790cd0d
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma-5.6/kinfocenter.nix
@@ -0,0 +1,24 @@
+{ plasmaPackage, extra-cmake-modules, kdoctools, kcmutils
+, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons
+, kdeclarative, kdelibs4support, ki18n, kiconthemes, kio, kpackage
+, kservice, kwidgetsaddons, kxmlgui, libraw1394, makeQtWrapper
+, pciutils, solid
+}:
+
+plasmaPackage {
+  name = "kinfocenter";
+  nativeBuildInputs = [
+    extra-cmake-modules
+    kdoctools
+    makeQtWrapper
+  ];
+  buildInputs = [
+    kcmutils kcompletion kconfig kconfigwidgets kcoreaddons
+    kdbusaddons kiconthemes kpackage kservice kwidgetsaddons
+    kxmlgui libraw1394 pciutils solid
+  ];
+  propagatedBuildInputs = [ kdeclarative kdelibs4support ki18n kio ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/kinfocenter"
+  '';
+}
diff --git a/pkgs/desktops/kde-5/plasma-5.6/kmenuedit.nix b/pkgs/desktops/kde-5/plasma-5.6/kmenuedit.nix
new file mode 100644
index 000000000000..3834ca1328f8
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma-5.6/kmenuedit.nix
@@ -0,0 +1,19 @@
+{ plasmaPackage, extra-cmake-modules, kdoctools, ki18n, kxmlgui
+, kdbusaddons, kiconthemes, kio, sonnet, kdelibs4support, makeQtWrapper
+}:
+
+plasmaPackage {
+  name = "kmenuedit";
+  nativeBuildInputs = [
+    extra-cmake-modules
+    kdoctools
+    makeQtWrapper
+  ];
+  buildInputs = [
+    kxmlgui kdbusaddons kiconthemes
+  ];
+  propagatedBuildInputs = [ kdelibs4support ki18n kio sonnet ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/kmenuedit"
+  '';
+}
diff --git a/pkgs/desktops/kde-5/plasma-5.6/kscreen.nix b/pkgs/desktops/kde-5/plasma-5.6/kscreen.nix
new file mode 100644
index 000000000000..a521a7993628
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma-5.6/kscreen.nix
@@ -0,0 +1,29 @@
+{ plasmaPackage, extra-cmake-modules, kconfig, kconfigwidgets
+, kdbusaddons, kglobalaccel, ki18n, kwidgetsaddons, kxmlgui
+, libkscreen, makeQtWrapper, qtdeclarative, qtgraphicaleffects
+}:
+
+plasmaPackage {
+  name = "kscreen";
+  nativeBuildInputs = [
+    extra-cmake-modules
+    makeQtWrapper
+  ];
+  buildInputs = [
+    kconfig
+    kconfigwidgets
+    kdbusaddons
+    kwidgetsaddons
+    kxmlgui
+  ];
+  propagatedBuildInputs = [
+    kglobalaccel
+    ki18n
+    libkscreen
+    qtdeclarative
+    qtgraphicaleffects
+  ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/kscreen-console"
+  '';
+}
diff --git a/pkgs/desktops/kde-5/plasma-5.6/kscreenlocker.nix b/pkgs/desktops/kde-5/plasma-5.6/kscreenlocker.nix
new file mode 100644
index 000000000000..562797b546e9
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma-5.6/kscreenlocker.nix
@@ -0,0 +1,19 @@
+{ plasmaPackage, extra-cmake-modules, kcmutils, kcrash, kdeclarative
+, kdelibs4support, kdoctools, kglobalaccel, kidletime, kwayland
+, libXcursor, pam, plasma-framework, qtdeclarative, wayland
+}:
+
+plasmaPackage {
+  name = "kscreenlocker";
+  nativeBuildInputs = [
+    extra-cmake-modules
+    kdoctools
+  ];
+  buildInputs = [
+    kcmutils kcrash kdelibs4support kglobalaccel kidletime kwayland
+    libXcursor pam wayland
+  ];
+  propagatedBuildInputs = [
+    kdeclarative plasma-framework qtdeclarative
+  ];
+}
diff --git a/pkgs/desktops/kde-5/plasma-5.6/ksshaskpass.nix b/pkgs/desktops/kde-5/plasma-5.6/ksshaskpass.nix
new file mode 100644
index 000000000000..f274512e027a
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma-5.6/ksshaskpass.nix
@@ -0,0 +1,13 @@
+{ plasmaPackage, extra-cmake-modules, kdoctools, kcoreaddons
+, ki18n, kwallet, kwidgetsaddons, makeQtWrapper
+}:
+
+plasmaPackage {
+  name = "ksshaskpass";
+  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
+  buildInputs = [ kcoreaddons kwallet kwidgetsaddons ];
+  propagatedBuildInputs = [ ki18n ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/ksshaskpass"
+  '';
+}
diff --git a/pkgs/desktops/kde-5/plasma-5.6/ksysguard.nix b/pkgs/desktops/kde-5/plasma-5.6/ksysguard.nix
new file mode 100644
index 000000000000..d47f9215a41a
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma-5.6/ksysguard.nix
@@ -0,0 +1,20 @@
+{ plasmaPackage, extra-cmake-modules, kdoctools, kconfig
+, kcoreaddons, kdelibs4support, ki18n, kitemviews, knewstuff
+, kiconthemes, libksysguard, makeQtWrapper
+}:
+
+plasmaPackage {
+  name = "ksysguard";
+  nativeBuildInputs = [
+    extra-cmake-modules
+    kdoctools
+    makeQtWrapper
+  ];
+  buildInputs = [
+    kconfig kcoreaddons kitemviews knewstuff kiconthemes libksysguard
+  ];
+  propagatedBuildInputs = [ kdelibs4support ki18n ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/ksysguardd"
+  '';
+}
diff --git a/pkgs/desktops/kde-5/plasma-5.6/kwayland.nix b/pkgs/desktops/kde-5/plasma-5.6/kwayland.nix
new file mode 100644
index 000000000000..e4d6eb631f95
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma-5.6/kwayland.nix
@@ -0,0 +1,14 @@
+{ plasmaPackage
+, extra-cmake-modules
+, wayland
+}:
+
+plasmaPackage {
+  name = "kwayland";
+  nativeBuildInputs = [
+    extra-cmake-modules
+  ];
+  buildInputs = [
+    wayland
+  ];
+}
diff --git a/pkgs/desktops/kde-5/plasma-5.6/kwin/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/plasma-5.6/kwin/0001-qdiriterator-follow-symlinks.patch
new file mode 100644
index 000000000000..797a32fc5f83
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma-5.6/kwin/0001-qdiriterator-follow-symlinks.patch
@@ -0,0 +1,25 @@
+From 78a4b554187c18fd86b62089f7730c4273fadd4c Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Wed, 14 Oct 2015 07:05:22 -0500
+Subject: [PATCH] qdiriterator follow symlinks
+
+---
+ clients/aurorae/src/aurorae.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/clients/aurorae/src/aurorae.cpp b/clients/aurorae/src/aurorae.cpp
+index 781c960..ad5f420 100644
+--- a/clients/aurorae/src/aurorae.cpp
++++ b/clients/aurorae/src/aurorae.cpp
+@@ -211,7 +211,7 @@ void Helper::init()
+     // so let's try to locate our plugin:
+     QString pluginPath;
+     for (const QString &path : m_engine->importPathList()) {
+-        QDirIterator it(path, QDirIterator::Subdirectories);
++        QDirIterator it(path, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
+         while (it.hasNext()) {
+             it.next();
+             QFileInfo fileInfo = it.fileInfo();
+-- 
+2.5.2
+
diff --git a/pkgs/desktops/kde-5/plasma-5.6/kwin/default.nix b/pkgs/desktops/kde-5/plasma-5.6/kwin/default.nix
new file mode 100644
index 000000000000..a09acb88aade
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma-5.6/kwin/default.nix
@@ -0,0 +1,34 @@
+{ plasmaPackage, extra-cmake-modules, kdoctools, epoxy
+, kactivities, kcompletion, kcmutils, kconfig, kconfigwidgets
+, kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel
+, ki18n, kiconthemes, kidletime, kinit, kio, knewstuff, knotifications
+, kpackage, kscreenlocker, kservice, kwayland, kwidgetsaddons, kwindowsystem
+, kxmlgui, libinput, libICE, libSM, plasma-framework, qtdeclarative
+, qtmultimedia, qtscript, qtx11extras, udev, wayland, xcb-util-cursor
+, makeQtWrapper
+}:
+
+plasmaPackage {
+  name = "kwin";
+  nativeBuildInputs = [
+    extra-cmake-modules
+    kdoctools
+    makeQtWrapper
+  ];
+  buildInputs = [
+    epoxy kcompletion kcmutils kconfig kconfigwidgets kcoreaddons
+    kcrash kdecoration kiconthemes kidletime kinit knewstuff knotifications
+    kpackage kservice kwayland kwidgetsaddons kxmlgui libinput libICE
+    libSM qtscript udev wayland xcb-util-cursor
+  ];
+  propagatedBuildInputs = [
+    kactivities kdeclarative kglobalaccel ki18n kio kscreenlocker
+    kwindowsystem plasma-framework qtdeclarative qtmultimedia qtx11extras
+  ];
+  patches = [ ./0001-qdiriterator-follow-symlinks.patch ];
+  cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/kwin_x11"
+    wrapQtProgram "$out/bin/kwin_wayland"
+  '';
+}
diff --git a/pkgs/desktops/kde-5/plasma-5.6/kwrited.nix b/pkgs/desktops/kde-5/plasma-5.6/kwrited.nix
new file mode 100644
index 000000000000..a6ed9d9bb287
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma-5.6/kwrited.nix
@@ -0,0 +1,10 @@
+{ plasmaPackage, extra-cmake-modules, kcoreaddons, ki18n, kpty
+, knotifications, kdbusaddons
+}:
+
+plasmaPackage {
+  name = "kwrited";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ kcoreaddons kpty knotifications kdbusaddons ];
+  propagatedBuildInputs = [ ki18n ];
+}
diff --git a/pkgs/desktops/kde-5/plasma-5.6/libkscreen/default.nix b/pkgs/desktops/kde-5/plasma-5.6/libkscreen/default.nix
new file mode 100644
index 000000000000..9fccbd6834c3
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma-5.6/libkscreen/default.nix
@@ -0,0 +1,18 @@
+{ plasmaPackage
+, extra-cmake-modules
+, libXrandr
+, qtx11extras
+}:
+
+plasmaPackage {
+  name = "libkscreen";
+  nativeBuildInputs = [
+    extra-cmake-modules
+  ];
+  buildInputs = [
+    libXrandr
+  ];
+  propagatedBuildInputs = [
+    qtx11extras
+  ];
+}
diff --git a/pkgs/desktops/kde-5/plasma-5.6/libksysguard/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/plasma-5.6/libksysguard/0001-qdiriterator-follow-symlinks.patch
new file mode 100644
index 000000000000..fbbb11ae7556
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma-5.6/libksysguard/0001-qdiriterator-follow-symlinks.patch
@@ -0,0 +1,25 @@
+From 46164a50de4102d02ae9d1d480acdd4b12303db8 Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Wed, 14 Oct 2015 07:07:22 -0500
+Subject: [PATCH] qdiriterator follow symlinks
+
+---
+ processui/scripting.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/processui/scripting.cpp b/processui/scripting.cpp
+index efed8ff..841761a 100644
+--- a/processui/scripting.cpp
++++ b/processui/scripting.cpp
+@@ -167,7 +167,7 @@ void Scripting::loadContextMenu() {
+     QStringList scripts;
+     const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "ksysguard/scripts/", QStandardPaths::LocateDirectory);
+     Q_FOREACH (const QString& dir, dirs) {
+-        QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories);
++        QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
+         while (it.hasNext()) {
+             scripts.append(it.next());
+         }
+-- 
+2.5.2
+
diff --git a/pkgs/desktops/kde-5/plasma-5.6/libksysguard/default.nix b/pkgs/desktops/kde-5/plasma-5.6/libksysguard/default.nix
new file mode 100644
index 000000000000..402b3ce3beee
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma-5.6/libksysguard/default.nix
@@ -0,0 +1,28 @@
+{ fetchpatch, plasmaPackage, extra-cmake-modules, kauth, kcompletion
+, kconfigwidgets, kcoreaddons, kservice, kwidgetsaddons
+, kwindowsystem, plasma-framework, qtscript, qtwebkit, qtx11extras
+, kconfig, ki18n, kiconthemes
+}:
+
+plasmaPackage {
+  name = "libksysguard";
+  patches = [
+    ./0001-qdiriterator-follow-symlinks.patch
+    (fetchpatch { # should be included on update
+      name = "glibc-2.23-isnan.patch";
+      url = https://github.com/KDE/libksysguard/commit/b0578798eb3.patch;
+      sha256 = "1my5nqp58c5azyi265j261a10wh047zxakprrnpl85mlg7bwskdh";
+    })
+  ];
+  nativeBuildInputs = [
+    extra-cmake-modules
+  ];
+  buildInputs = [
+    kcompletion kconfigwidgets kcoreaddons kservice
+    kwidgetsaddons qtscript qtwebkit
+  ];
+  propagatedBuildInputs = [
+    kauth kconfig ki18n kiconthemes kwindowsystem plasma-framework
+    qtx11extras
+  ];
+}
diff --git a/pkgs/desktops/kde-5/plasma-5.6/milou.nix b/pkgs/desktops/kde-5/plasma-5.6/milou.nix
new file mode 100644
index 000000000000..760de2d79ab4
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma-5.6/milou.nix
@@ -0,0 +1,17 @@
+{ plasmaPackage, extra-cmake-modules, qtscript, qtdeclarative
+, kcoreaddons, ki18n, kdeclarative, kservice, plasma-framework
+, krunner
+}:
+
+plasmaPackage {
+  name = "milou";
+  nativeBuildInputs = [
+    extra-cmake-modules
+  ];
+  buildInputs = [
+    qtscript kcoreaddons kservice
+  ];
+  propagatedBuildInputs = [
+    kdeclarative ki18n krunner plasma-framework qtdeclarative
+  ];
+}
diff --git a/pkgs/desktops/kde-5/plasma-5.6/oxygen.nix b/pkgs/desktops/kde-5/plasma-5.6/oxygen.nix
new file mode 100644
index 000000000000..02918100408a
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma-5.6/oxygen.nix
@@ -0,0 +1,20 @@
+{ plasmaPackage, extra-cmake-modules, ki18n, kcmutils, kconfig
+, kdecoration, kguiaddons, kwidgetsaddons, kservice, kcompletion
+, frameworkintegration, kwindowsystem, makeQtWrapper, qtx11extras
+}:
+
+plasmaPackage {
+  name = "oxygen";
+  nativeBuildInputs = [
+    extra-cmake-modules makeQtWrapper
+  ];
+  buildInputs = [
+    kcmutils kconfig kdecoration kguiaddons kwidgetsaddons
+    kservice kcompletion
+  ];
+  propagatedBuildInputs = [ frameworkintegration ki18n kwindowsystem qtx11extras ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/oxygen-demo5"
+    wrapQtProgram "$out/bin/oxygen-settings5"
+  '';
+}
diff --git a/pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/0001-qt-5.5-QML-import-paths.patch b/pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/0001-qt-5.5-QML-import-paths.patch
new file mode 100644
index 000000000000..ead7452daa84
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/0001-qt-5.5-QML-import-paths.patch
@@ -0,0 +1,67 @@
+From 7c379686def9f15be1aa8fa4b5358124f7ed57c6 Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Mon, 19 Oct 2015 18:45:36 -0500
+Subject: [PATCH 1/3] qt-5.5 QML import paths
+
+---
+ applets/pager/package/contents/ui/main.qml              | 2 +-
+ containments/desktop/package/contents/ui/FolderView.qml | 2 +-
+ containments/desktop/package/contents/ui/main.qml       | 2 +-
+ containments/panel/contents/ui/main.qml                 | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/applets/pager/package/contents/ui/main.qml b/applets/pager/package/contents/ui/main.qml
+index 0c367c6..c9a82be 100644
+--- a/applets/pager/package/contents/ui/main.qml
++++ b/applets/pager/package/contents/ui/main.qml
+@@ -23,7 +23,7 @@ import org.kde.plasma.components 2.0 as PlasmaComponents
+ import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddonsComponents
+ import org.kde.draganddrop 2.0
+ import org.kde.plasma.private.pager 2.0
+-import "utils.js" as Utils
++import "../code/utils.js" as Utils
+ 
+ MouseArea {
+     id: root
+diff --git a/containments/desktop/package/contents/ui/FolderView.qml b/containments/desktop/package/contents/ui/FolderView.qml
+index 578ec87..04e088c 100644
+--- a/containments/desktop/package/contents/ui/FolderView.qml
++++ b/containments/desktop/package/contents/ui/FolderView.qml
+@@ -27,7 +27,7 @@ import org.kde.plasma.extras 2.0 as PlasmaExtras
+ import org.kde.kquickcontrolsaddons 2.0
+ 
+ import org.kde.private.desktopcontainment.folder 0.1 as Folder
+-import "FolderTools.js" as FolderTools
++import "../code/FolderTools.js" as FolderTools
+ 
+ Item {
+     id: main
+diff --git a/containments/desktop/package/contents/ui/main.qml b/containments/desktop/package/contents/ui/main.qml
+index 422e8f7..3c8906e 100644
+--- a/containments/desktop/package/contents/ui/main.qml
++++ b/containments/desktop/package/contents/ui/main.qml
+@@ -29,7 +29,7 @@ import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons
+ 
+ import org.kde.private.desktopcontainment.desktop 0.1 as Desktop
+ 
+-import "LayoutManager.js" as LayoutManager
++import "../code/LayoutManager.js" as LayoutManager
+ 
+ DragDrop.DropArea {
+     id: root
+diff --git a/containments/panel/contents/ui/main.qml b/containments/panel/contents/ui/main.qml
+index bad6ba0..b1fc331 100644
+--- a/containments/panel/contents/ui/main.qml
++++ b/containments/panel/contents/ui/main.qml
+@@ -25,7 +25,7 @@ import org.kde.plasma.components 2.0 as PlasmaComponents
+ import org.kde.kquickcontrolsaddons 2.0
+ import org.kde.draganddrop 2.0 as DragDrop
+ 
+-import "LayoutManager.js" as LayoutManager
++import "../code/LayoutManager.js" as LayoutManager
+ 
+ DragDrop.DropArea {
+     id: root
+-- 
+2.6.3
+
diff --git a/pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/0002-hwclock.patch b/pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/0002-hwclock.patch
new file mode 100644
index 000000000000..17b01486d928
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/0002-hwclock.patch
@@ -0,0 +1,36 @@
+From d0056fa6c1158408db169a7f5e6eb75691083094 Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Sun, 22 Nov 2015 09:34:43 -0600
+Subject: [PATCH 2/3] hwclock
+
+---
+ kcms/dateandtime/helper.cpp | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/kcms/dateandtime/helper.cpp b/kcms/dateandtime/helper.cpp
+index e955f0c..5171753 100644
+--- a/kcms/dateandtime/helper.cpp
++++ b/kcms/dateandtime/helper.cpp
+@@ -48,10 +48,6 @@
+ #include <sys/stat.h>
+ #endif
+ 
+-// We cannot rely on the $PATH environment variable, because D-Bus activation
+-// clears it. So we have to use a reasonable default.
+-static const QString exePath = QStringLiteral("/usr/sbin:/usr/bin:/sbin:/bin");
+-
+ int ClockHelper::ntp( const QStringList& ntpServers, bool ntpEnabled )
+ {
+     int ret = 0;
+@@ -227,7 +223,7 @@ int ClockHelper::tzreset()
+ 
+ void ClockHelper::toHwclock()
+ {
+-    QString hwclock = KStandardDirs::findExe(QStringLiteral("hwclock"), exePath);
++    QString hwclock = "@hwclock@";
+     if (!hwclock.isEmpty()) {
+         KProcess::execute(hwclock, QStringList() << QStringLiteral("--systohc"));
+     }
+-- 
+2.6.3
+
diff --git a/pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/0003-tzdir.patch b/pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/0003-tzdir.patch
new file mode 100644
index 000000000000..aba97b032f8a
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/0003-tzdir.patch
@@ -0,0 +1,30 @@
+From 0a8e2ae5cb64c5762408df920d99459b20d52b29 Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Sun, 22 Nov 2015 09:39:24 -0600
+Subject: [PATCH 3/3] tzdir
+
+---
+ kcms/dateandtime/helper.cpp | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/kcms/dateandtime/helper.cpp b/kcms/dateandtime/helper.cpp
+index 5171753..92b5d9e 100644
+--- a/kcms/dateandtime/helper.cpp
++++ b/kcms/dateandtime/helper.cpp
+@@ -181,7 +181,12 @@ int ClockHelper::tz( const QString& selectedzone )
+ 
+     val = selectedzone;
+ #else
+-    QString tz = "/usr/share/zoneinfo/" + selectedzone;
++    QString tzdir = QString::fromLocal8Bit(qgetenv("TZDIR"));
++    QString tz = tzdir + "/" + selectedzone;
++    if (tzdir.isEmpty()) {
++      // Standard Linux path
++      tz = "/usr/share/zoneinfo/" + selectedzone;
++    }
+ 
+     if (QFile::exists(tz)) { // make sure the new TZ really exists
+         QFile::remove(QStringLiteral("/etc/localtime"));
+-- 
+2.6.3
+
diff --git a/pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/default.nix b/pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/default.nix
new file mode 100644
index 000000000000..5f27efc7f24c
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/default.nix
@@ -0,0 +1,86 @@
+{ plasmaPackage, substituteAll, extra-cmake-modules, kdoctools
+, attica, baloo, boost, fontconfig, kactivities, kauth, kcmutils
+, kdbusaddons, kdeclarative, kded, kdelibs4support, kemoticons
+, kglobalaccel, ki18n, kitemmodels, knewstuff, knotifications
+, knotifyconfig, kpeople, krunner, kwallet, kwin, phonon
+, plasma-framework, plasma-workspace, qtdeclarative, qtx11extras
+, qtsvg, libXcursor, libXft, libxkbfile, xf86inputevdev
+, xf86inputsynaptics, xinput, xkeyboard_config, xorgserver
+, libcanberra_kde, libpulseaudio, makeQtWrapper, utillinux
+, qtquick1, qtquickcontrols
+}:
+
+plasmaPackage rec {
+  name = "plasma-desktop";
+  nativeBuildInputs = [
+    extra-cmake-modules
+    kdoctools
+    makeQtWrapper
+  ];
+  buildInputs = [
+    attica
+    boost
+    fontconfig
+    kcmutils
+    kdbusaddons
+    kded
+    kitemmodels
+    knewstuff
+    knotifications
+    knotifyconfig
+    kwallet
+    libcanberra_kde
+    libXcursor
+    libpulseaudio
+    libXft
+    libxkbfile
+    phonon
+    qtsvg
+    xf86inputevdev
+    xf86inputsynaptics
+    xkeyboard_config
+    xinput
+  ];
+  propagatedBuildInputs = [
+    baloo
+    kactivities
+    kauth
+    kdeclarative
+    kdelibs4support
+    kemoticons
+    kglobalaccel
+    ki18n
+    kpeople
+    krunner
+    kwin
+    plasma-framework
+    plasma-workspace
+    qtdeclarative
+    qtquick1
+    qtquickcontrols
+    qtx11extras
+  ];
+  patches = [
+    ./0001-qt-5.5-QML-import-paths.patch
+    (substituteAll {
+      src = ./0002-hwclock.patch;
+      hwclock = "${utillinux}/sbin/hwclock";
+    })
+    ./0003-tzdir.patch
+  ];
+  NIX_CFLAGS_COMPILE = [ "-I${xorgserver}/include/xorg" ];
+  cmakeFlags = [
+    "-DEvdev_INCLUDE_DIRS=${xf86inputevdev}/include/xorg"
+    "-DSynaptics_INCLUDE_DIRS=${xf86inputsynaptics}/include/xorg"
+  ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/kaccess"
+    wrapQtProgram "$out/bin/solid-action-desktop-gen"
+    wrapQtProgram "$out/bin/knetattach"
+    wrapQtProgram "$out/bin/krdb"
+    wrapQtProgram "$out/bin/kapplymousetheme"
+    wrapQtProgram "$out/bin/kfontinst"
+    wrapQtProgram "$out/bin/kcm-touchpad-list-devices"
+    wrapQtProgram "$out/bin/kfontview"
+  '';
+}
diff --git a/pkgs/desktops/kde-5/plasma-5.6/plasma-mediacenter.nix b/pkgs/desktops/kde-5/plasma-5.6/plasma-mediacenter.nix
new file mode 100644
index 000000000000..7088f45d64e2
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma-5.6/plasma-mediacenter.nix
@@ -0,0 +1,20 @@
+{ plasmaPackage, extra-cmake-modules, baloo, kactivities, kconfig
+, kcoreaddons, kdeclarative, kguiaddons, ki18n, kio, kservice
+, kfilemetadata, plasma-framework, qtdeclarative, qtmultimedia
+, taglib
+}:
+
+plasmaPackage rec {
+  name = "plasma-mediacenter";
+  nativeBuildInputs = [
+    extra-cmake-modules
+  ];
+  buildInputs = [
+    kconfig kcoreaddons kguiaddons kservice
+    qtdeclarative qtmultimedia taglib
+  ];
+  propagatedBuildInputs = [
+    baloo kactivities kdeclarative kfilemetadata ki18n kio
+    plasma-framework
+  ];
+}
diff --git a/pkgs/desktops/kde-5/plasma-5.6/plasma-nm/0001-mobile-broadband-provider-info-path.patch b/pkgs/desktops/kde-5/plasma-5.6/plasma-nm/0001-mobile-broadband-provider-info-path.patch
new file mode 100644
index 000000000000..79b5cfb437e2
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma-5.6/plasma-nm/0001-mobile-broadband-provider-info-path.patch
@@ -0,0 +1,25 @@
+From faf13c97ff1192a201843b9d52f4002dbd9022af Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Sun, 25 Oct 2015 09:09:27 -0500
+Subject: [PATCH] mobile-broadband-provider-info path
+
+---
+ libs/editor/mobileproviders.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libs/editor/mobileproviders.cpp b/libs/editor/mobileproviders.cpp
+index 568cb34..98a5992 100644
+--- a/libs/editor/mobileproviders.cpp
++++ b/libs/editor/mobileproviders.cpp
+@@ -26,7 +26,7 @@
+ 
+ #include <KLocale>
+ 
+-const QString MobileProviders::ProvidersFile = "/usr/share/mobile-broadband-provider-info/serviceproviders.xml";
++const QString MobileProviders::ProvidersFile = "@mobile_broadband_provider_info@/share/mobile-broadband-provider-info/serviceproviders.xml";
+ 
+ bool localeAwareCompare(const QString & one, const QString & two) {
+     return one.localeAwareCompare(two) < 0;
+-- 
+2.6.2
+
diff --git a/pkgs/desktops/kde-5/plasma-5.6/plasma-nm/default.nix b/pkgs/desktops/kde-5/plasma-5.6/plasma-nm/default.nix
new file mode 100644
index 000000000000..249c6d8aac94
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma-5.6/plasma-nm/default.nix
@@ -0,0 +1,36 @@
+{ plasmaPackage, substituteAll, extra-cmake-modules, kdoctools
+, kcompletion, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative
+, kdelibs4support, ki18n, kiconthemes, kinit, kio, kitemviews
+, knotifications, kservice, kwallet, kwidgetsaddons, kwindowsystem
+, kxmlgui, makeQtWrapper, mobile_broadband_provider_info
+, modemmanager-qt, networkmanager-qt, openconnect, plasma-framework
+, qca-qt5, qtdeclarative, solid
+}:
+
+plasmaPackage {
+  name = "plasma-nm";
+  patches = [
+    (substituteAll {
+      src = ./0001-mobile-broadband-provider-info-path.patch;
+      inherit mobile_broadband_provider_info;
+    })
+  ];
+  nativeBuildInputs = [
+    extra-cmake-modules
+    kdoctools
+    makeQtWrapper
+  ];
+  buildInputs = [
+    kcompletion kconfigwidgets kcoreaddons kdbusaddons kiconthemes
+    kinit kitemviews knotifications kservice kwallet kwidgetsaddons
+    kxmlgui mobile_broadband_provider_info modemmanager-qt
+    networkmanager-qt openconnect qca-qt5 solid
+  ];
+  propagatedBuildInputs = [
+    kdeclarative kdelibs4support ki18n kio kwindowsystem plasma-framework
+    qtdeclarative
+  ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/kde5-nm-connection-editor"
+  '';
+}
diff --git a/pkgs/desktops/kde-5/plasma-5.6/plasma-pa.nix b/pkgs/desktops/kde-5/plasma-5.6/plasma-pa.nix
new file mode 100644
index 000000000000..ff56d1199b15
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma-5.6/plasma-pa.nix
@@ -0,0 +1,18 @@
+{ plasmaPackage, extra-cmake-modules, glib, kdoctools, kconfigwidgets
+, kcoreaddons, kdeclarative, kglobalaccel, ki18n, libpulseaudio
+, plasma-framework
+}:
+
+plasmaPackage {
+  name = "plasma-pa";
+  nativeBuildInputs = [
+    extra-cmake-modules
+    kdoctools
+  ];
+  buildInputs = [
+    glib kconfigwidgets kcoreaddons libpulseaudio
+  ];
+  propagatedBuildInputs = [
+    kdeclarative kglobalaccel ki18n plasma-framework
+  ];
+}
diff --git a/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace-wallpapers.nix b/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace-wallpapers.nix
new file mode 100644
index 000000000000..bc87abcad153
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace-wallpapers.nix
@@ -0,0 +1,10 @@
+{ plasmaPackage
+, extra-cmake-modules
+}:
+
+plasmaPackage {
+  name = "plasma-workspace-wallpapers";
+  nativeBuildInputs = [
+    extra-cmake-modules
+  ];
+}
diff --git a/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/default.nix b/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/default.nix
new file mode 100644
index 000000000000..1a96c1eced2e
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/default.nix
@@ -0,0 +1,45 @@
+{ plasmaPackage, lib, copyPathsToStore
+, extra-cmake-modules, kdoctools
+, baloo, kactivities, kcmutils, kcrash, kdbusaddons, kdeclarative
+, kdelibs4support, kdesu, kdewebkit, kglobalaccel, kidletime
+, kjsembed, knewstuff, knotifyconfig, kpackage, krunner
+, ktexteditor, ktextwidgets, kwallet, kwayland, kwin, kxmlrpcclient
+, libdbusmenu, libkscreen, libSM, libXcursor, networkmanager-qt
+, pam, phonon, plasma-framework, qtquick1, qtscript, qtx11extras, wayland
+, libksysguard, kconfig, solid, qtquickcontrols
+}:
+
+plasmaPackage {
+  name = "plasma-workspace";
+
+  nativeBuildInputs = [
+    extra-cmake-modules
+    kdoctools
+  ];
+  buildInputs = [
+    kcmutils kconfig kcrash kdbusaddons kdesu kdewebkit
+    kjsembed knewstuff knotifyconfig kpackage
+    ktextwidgets kwallet kwayland kxmlrpcclient libdbusmenu libSM
+    libXcursor networkmanager-qt pam phonon qtscript
+    wayland
+  ];
+  propagatedBuildInputs = [
+    baloo kactivities kdeclarative kdelibs4support kglobalaccel
+    kidletime krunner ktexteditor kwin libkscreen libksysguard
+    plasma-framework qtquick1 qtquickcontrols qtx11extras solid
+  ];
+
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
+
+  postPatch = ''
+    substituteInPlace startkde/kstartupconfig/kstartupconfig.cpp \
+        --replace kdostartupconfig5 $out/bin/kdostartupconfig5
+  '';
+
+  postInstall = ''
+    rm "$out/bin/startkde"
+    rm "$out/bin/startplasmacompositor"
+    rm "$out/lib/libexec/startplasma"
+    rm -r "$out/share/wayland-sessions"
+  '';
+}
diff --git a/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/qml-import-path.patch b/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/qml-import-path.patch
new file mode 100644
index 000000000000..1d34001be597
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/qml-import-path.patch
@@ -0,0 +1,104 @@
+Index: plasma-workspace-5.5.1/applets/analog-clock/contents/ui/analogclock.qml
+===================================================================
+--- plasma-workspace-5.5.1.orig/applets/analog-clock/contents/ui/analogclock.qml
++++ plasma-workspace-5.5.1/applets/analog-clock/contents/ui/analogclock.qml
+@@ -25,7 +25,7 @@ import org.kde.plasma.calendar 2.0 as Pl
+ import QtQuick.Layouts 1.1
+ 
+ import org.kde.plasma.core 2.0 as PlasmaCore
+-import "logic.js" as Logic
++import "../code/logic.js" as Logic
+ 
+ Item {
+     id: analogclock
+Index: plasma-workspace-5.5.1/applets/batterymonitor/package/contents/ui/BatteryItem.qml
+===================================================================
+--- plasma-workspace-5.5.1.orig/applets/batterymonitor/package/contents/ui/BatteryItem.qml
++++ plasma-workspace-5.5.1/applets/batterymonitor/package/contents/ui/BatteryItem.qml
+@@ -26,7 +26,7 @@ import org.kde.plasma.components 2.0 as
+ import org.kde.plasma.extras 2.0 as PlasmaExtras
+ import org.kde.plasma.workspace.components 2.0
+ import org.kde.kcoreaddons 1.0 as KCoreAddons
+-import "logic.js" as Logic
++import "../code/logic.js" as Logic
+ 
+ Item {
+     id: batteryItem
+Index: plasma-workspace-5.5.1/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml
+===================================================================
+--- plasma-workspace-5.5.1.orig/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml
++++ plasma-workspace-5.5.1/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml
+@@ -24,7 +24,7 @@ import QtQuick.Layouts 1.1
+ import org.kde.plasma.core 2.0 as PlasmaCore
+ import org.kde.plasma.components 2.0 as Components
+ import org.kde.plasma.workspace.components 2.0
+-import "logic.js" as Logic
++import "../code/logic.js" as Logic
+ 
+ MouseArea {
+     id: root
+Index: plasma-workspace-5.5.1/applets/batterymonitor/package/contents/ui/PopupDialog.qml
+===================================================================
+--- plasma-workspace-5.5.1.orig/applets/batterymonitor/package/contents/ui/PopupDialog.qml
++++ plasma-workspace-5.5.1/applets/batterymonitor/package/contents/ui/PopupDialog.qml
+@@ -23,7 +23,7 @@ import org.kde.plasma.core 2.0 as Plasma
+ import org.kde.plasma.components 2.0 as Components
+ import org.kde.plasma.extras 2.0 as PlasmaExtras
+ import org.kde.kquickcontrolsaddons 2.0
+-import "logic.js" as Logic
++import "../code/logic.js" as Logic
+ 
+ FocusScope {
+     id: dialog
+Index: plasma-workspace-5.5.1/applets/batterymonitor/package/contents/ui/batterymonitor.qml
+===================================================================
+--- plasma-workspace-5.5.1.orig/applets/batterymonitor/package/contents/ui/batterymonitor.qml
++++ plasma-workspace-5.5.1/applets/batterymonitor/package/contents/ui/batterymonitor.qml
+@@ -25,7 +25,7 @@ import org.kde.plasma.plasmoid 2.0
+ import org.kde.plasma.core 2.0 as PlasmaCore
+ import org.kde.kcoreaddons 1.0 as KCoreAddons
+ import org.kde.kquickcontrolsaddons 2.0
+-import "logic.js" as Logic
++import "../code/logic.js" as Logic
+ 
+ Item {
+     id: batterymonitor
+Index: plasma-workspace-5.5.1/applets/lock_logout/contents/ui/lockout.qml
+===================================================================
+--- plasma-workspace-5.5.1.orig/applets/lock_logout/contents/ui/lockout.qml
++++ plasma-workspace-5.5.1/applets/lock_logout/contents/ui/lockout.qml
+@@ -23,7 +23,7 @@ import org.kde.plasma.plasmoid 2.0
+ import org.kde.plasma.core 2.0 as PlasmaCore
+ import org.kde.plasma.components 2.0
+ import org.kde.kquickcontrolsaddons 2.0
+-import "data.js" as Data
++import "../code/data.js" as Data
+ 
+ Flow {
+     id: lockout
+Index: plasma-workspace-5.5.1/applets/notifications/package/contents/ui/main.qml
+===================================================================
+--- plasma-workspace-5.5.1.orig/applets/notifications/package/contents/ui/main.qml
++++ plasma-workspace-5.5.1/applets/notifications/package/contents/ui/main.qml
+@@ -28,7 +28,7 @@ import org.kde.plasma.extras 2.0 as Plas
+ 
+ import org.kde.plasma.private.notifications 1.0
+ 
+-import "uiproperties.js" as UiProperties
++import "../code/uiproperties.js" as UiProperties
+ 
+ MouseEventListener {
+     id: notificationsApplet
+Index: plasma-workspace-5.5.1/applets/systemtray/package/contents/ui/main.qml
+===================================================================
+--- plasma-workspace-5.5.1.orig/applets/systemtray/package/contents/ui/main.qml
++++ plasma-workspace-5.5.1/applets/systemtray/package/contents/ui/main.qml
+@@ -25,7 +25,7 @@ import org.kde.plasma.core 2.0 as Plasma
+ // import org.kde.plasma.extras 2.0 as PlasmaExtras
+ 
+ import org.kde.private.systemtray 2.0 as SystemTray
+-import "Layout.js" as LayoutManager
++import "../code/Layout.js" as LayoutManager
+ 
+ Item {
+     id: root
diff --git a/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/series b/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/series
new file mode 100644
index 000000000000..b9081298bd69
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/series
@@ -0,0 +1 @@
+qml-import-path.patch
diff --git a/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/startkde.patch b/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/startkde.patch
new file mode 100644
index 000000000000..eea0ae4c199d
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/startkde.patch
@@ -0,0 +1,372 @@
+Index: plasma-workspace-5.5.5/startkde/startkde.cmake
+===================================================================
+--- plasma-workspace-5.5.5.orig/startkde/startkde.cmake
++++ plasma-workspace-5.5.5/startkde/startkde.cmake
+@@ -1,8 +1,36 @@
+-#!/bin/sh
++#!@bash@
+ #
+ #  DEFAULT KDE STARTUP SCRIPT ( @PROJECT_VERSION@ )
+ #
+ 
++set -x
++
++# The KDE icon cache is supposed to update itself
++# automatically, but it uses the timestamp on the icon
++# theme directory as a trigger.  Since in Nix the
++# timestamp is always the same, this doesn't work.  So as
++# a workaround, nuke the icon cache on login.  This isn't
++# perfect, since it may require logging out after
++# installing new applications to update the cache.
++# See http://lists-archives.org/kde-devel/26175-what-when-will-icon-cache-refresh.html
++rm -fv $HOME/.cache/icon-cache.kcache
++
++# Qt writes a weird ‘libraryPath’ line to
++# ~/.config/Trolltech.conf that causes the KDE plugin
++# paths of previous KDE invocations to be searched.
++# Obviously using mismatching KDE libraries is potentially
++# disastrous, so here we nuke references to the Nix store
++# in Trolltech.conf.  A better solution would be to stop
++# Qt from doing this wackiness in the first place.
++if [ -e $HOME/.config/Trolltech.conf ]; then
++    @sed@ -e '/nix\\store\|nix\/store/ d' -i $HOME/.config/Trolltech.conf
++fi
++
++# (NixOS) We run kbuildsycoca5 before starting the user session because things
++# may be missing or moved if they have run nixos-rebuild and it may not be
++# possible for them to start Konsole to run it manually!
++@kbuildsycoca5@
++
+ if test "x$1" = x--failsafe; then
+     KDE_FAILSAFE=1 # General failsafe flag
+     KWIN_COMPOSE=N # Disable KWin's compositing
+@@ -17,29 +45,16 @@ trap 'echo GOT SIGHUP' HUP
+ # we have to unset this for Darwin since it will screw up KDE's dynamic-loading
+ unset DYLD_FORCE_FLAT_NAMESPACE
+ 
+-# in case we have been started with full pathname spec without being in PATH
+-bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
+-if [ -n "$bindir" ]; then
+-  qbindir=`qtpaths --binaries-dir`
+-  qdbus=$qbindir/qdbus
+-  case $PATH in
+-    $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
+-    *) PATH=$bindir:$PATH; export PATH;;
+-  esac
+-else
+-  qdbus=qdbus
+-fi
+-
+ # Check if a KDE session already is running and whether it's possible to connect to X
+-kcheckrunning
++@kcheckrunning@
+ kcheckrunning_result=$?
+ if test $kcheckrunning_result -eq 0 ; then
+-	echo "KDE seems to be already running on this display."
+-	xmessage -geometry 500x100 "KDE seems to be already running on this display." > /dev/null 2>/dev/null
++  echo "KDE seems to be already running on this display."
++  @xmessage@ -geometry 500x100 "KDE seems to be already running on this display."
+ 	exit 1
+ elif test $kcheckrunning_result -eq 2 ; then
+ 	echo "\$DISPLAY is not set or cannot connect to the X server."
+-        exit 1
++  exit 1
+ fi
+ 
+ # Boot sequence:
+@@ -57,13 +72,8 @@ fi
+ # * Then ksmserver is started which takes control of the rest of the startup sequence
+ 
+ # We need to create config folder so we can write startupconfigkeys
+-if [  ${XDG_CONFIG_HOME} ]; then
+-  configDir=$XDG_CONFIG_HOME;
+-else
+-  configDir=${HOME}/.config; #this is the default, http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
+-fi
+-
+-mkdir -p $configDir
++configDir=$(@qtpaths@ --writable-path GenericConfigLocation)
++mkdir -p "$configDir"
+ 
+ #This is basically setting defaults so we can use them with kstartupconfig5
+ cat >$configDir/startupconfigkeys <<EOF
+@@ -102,42 +112,10 @@ XftSubPixel=none
+ EOF
+ }
+ 
+-# Make sure the Oxygen font is installed
+-# This is necessary for setups where CMAKE_INSTALL_PREFIX
+-# is not in /usr. fontconfig looks in /usr, ~/.fonts and
+-# $XDG_DATA_HOME for fonts. In this case, we symlink the
+-# Oxygen font under ${XDG_DATA_HOME} and make it known to
+-# fontconfig
+-
+-usr_share="/usr/share"
+-install_share="@KDE_INSTALL_FULL_DATADIR@"
+-
+-if [ ! $install_share = $usr_share ]; then
+-
+-    if [ ${XDG_DATA_HOME} ]; then
+-        fontsDir="${XDG_DATA_HOME}/fonts"
+-    else
+-        fontsDir="${HOME}/.fonts"
+-    fi
+-
+-    test -d $fontsDir || {
+-        mkdir -p $fontsDir
+-    }
+-
+-    oxygenDir=$fontsDir/oxygen
+-    prefixDir="@KDE_INSTALL_FULL_DATADIR@/fonts/oxygen"
+-
+-    # if the oxygen dir doesn't exist, create a symlink to be sure that the
+-    # Oxygen font is available to the user
+-    test -d $oxygenDir || test -d $prefixDir && {
+-        test -h $oxygenDir || ln -s $prefixDir $oxygenDir && fc-cache $oxygenDir
+-    }
+-fi
+-
+-kstartupconfig5
++@out@/bin/kstartupconfig5
+ returncode=$?
+ if test $returncode -ne 0; then
+-    xmessage -geometry 500x100 "kstartupconfig5 does not exist or fails. The error code is $returncode. Check your installation."
++    @xmessage@ -geometry 500x100 "kstartupconfig5 does not exist or fails. The error code is $returncode. Check your installation."
+     exit 1
+ fi
+ [ -r $configDir/startupconfig ] && . $configDir/startupconfig
+@@ -146,9 +124,11 @@ if test "$kdeglobals_kscreen_scalefactor
+     export QT_DEVICE_PIXEL_RATIO=$kdeglobals_kscreen_scalefactor
+ fi
+ 
++XCURSOR_PATH=~/.icons:$(echo "$XDG_DATA_DIRS" | @tr@ ":" "\n" | @sed@ 's,$,/icons,g' | @tr@ "\n" ":")
++export XCURSOR_PATH
++
+ # XCursor mouse theme needs to be applied here to work even for kded or ksmserver
+ if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then
+-    @EXPORT_XCURSOR_PATH@
+ 
+     kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"
+     if test $? -eq 10; then
+@@ -164,21 +144,39 @@ if test -n "$kcminputrc_mouse_cursorthem
+     fi
+ fi
+ 
+-if test "$kcmfonts_general_forcefontdpi" -ne 0; then
+-    xrdb -quiet -merge -nocpp <<EOF
+-Xft.dpi: $kcmfonts_general_forcefontdpi
+-EOF
+-fi
++# Set a left cursor instead of the standard X11 "X" cursor, since I've heard
++# from some users that they're confused and don't know what to do. This is
++# especially necessary on slow machines, where starting KDE takes one or two
++# minutes until anything appears on the screen.
++#
++# If the user has overwritten fonts, the cursor font may be different now
++# so don't move this up.
++#
++@xsetroot@ -cursor_name left_ptr
+ 
+ dl=$DESKTOP_LOCKED
+ unset DESKTOP_LOCKED # Don't want it in the environment
+ 
++# Make sure that D-Bus is running
++# D-Bus autolaunch is broken
++if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
++    eval `@dbus-launch@ --sh-syntax --exit-with-session`
++fi
++if @qdbus@ >/dev/null 2>/dev/null; then
++    : # ok
++else
++    echo 'startkde: Could not start D-Bus. Can you call qdbus?'  1>&2
++    test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
++    @xmessage@ -geometry 500x100 "Could not start D-Bus. Can you call qdbus?"
++    exit 1
++fi
++
+ ksplash_pid=
+ if test -z "$dl"; then
+   # the splashscreen and progress indicator
+   case "$ksplashrc_ksplash_engine" in
+     KSplashQML)
+-      ksplash_pid=`ksplashqml "${ksplashrc_ksplash_theme}" --pid`
++      ksplash_pid=`@out@/bin/ksplashqml "${ksplashrc_ksplash_theme}" --pid`
+       ;;
+     None)
+       ;;
+@@ -201,8 +199,7 @@ fi
+ # For anything else (that doesn't set env vars, or that needs a window manager),
+ # better use the Autostart folder.
+ 
+-# TODO: Use GenericConfigLocation once we depend on Qt 5.4
+-scriptpath=`qtpaths --paths ConfigLocation | tr ':' '\n' | sed 's,$,/plasma-workspace,g'`
++scriptpath=$(@qtpaths@ --paths GenericConfigLocation | tr ':' '\n' | @sed@ 's,$,/plasma-workspace,g')
+ 
+ # Add /env/ to the directory to locate the scripts to be sourced
+ for prefix in `echo $scriptpath`; do
+@@ -232,7 +229,7 @@ usr_odir=$HOME/.fonts/kde-override
+ usr_fdir=$HOME/.fonts
+ 
+ if test -n "$KDEDIRS"; then
+-  kdedirs_first=`echo "$KDEDIRS"|sed -e 's/:.*//'`
++  kdedirs_first=`echo "$KDEDIRS" | @sed@ -e 's/:.*//'`
+   sys_odir=$kdedirs_first/share/fonts/override
+   sys_fdir=$kdedirs_first/share/fonts
+ else
+@@ -245,23 +242,13 @@ fi
+ # add the user's dirs to the font path, as they might simply have been made
+ # read-only by the administrator, for whatever reason.
+ 
+-test -d "$sys_odir" && xset +fp "$sys_odir"
+-test -d "$usr_odir" && (mkfontdir "$usr_odir" ; xset +fp "$usr_odir")
+-test -d "$usr_fdir" && (mkfontdir "$usr_fdir" ; xset fp+ "$usr_fdir")
+-test -d "$sys_fdir" && xset fp+ "$sys_fdir"
++test -d "$sys_odir" && @xset@ +fp "$sys_odir"
++test -d "$usr_odir" && ( @mkfontdir@ "$usr_odir" ; @xset@ +fp "$usr_odir" )
++test -d "$usr_fdir" && ( @mkfontdir@ "$usr_fdir" ; @xset@ fp+ "$usr_fdir" )
++test -d "$sys_fdir" && @xset@ fp+ "$sys_fdir"
+ 
+ # Ask X11 to rebuild its font list.
+-xset fp rehash
+-
+-# Set a left cursor instead of the standard X11 "X" cursor, since I've heard
+-# from some users that they're confused and don't know what to do. This is
+-# especially necessary on slow machines, where starting KDE takes one or two
+-# minutes until anything appears on the screen.
+-#
+-# If the user has overwritten fonts, the cursor font may be different now
+-# so don't move this up.
+-#
+-xsetroot -cursor_name left_ptr
++@xset@ fp rehash
+ 
+ # Get Ghostscript to look into user's KDE fonts dir for additional Fontmap
+ if test -n "$GS_LIB" ; then
+@@ -274,26 +261,6 @@ fi
+ 
+ echo 'startkde: Starting up...'  1>&2
+ 
+-# Make sure that the KDE prefix is first in XDG_DATA_DIRS and that it's set at all.
+-# The spec allows XDG_DATA_DIRS to be not set, but X session startup scripts tend
+-# to set it to a list of paths *not* including the KDE prefix if it's not /usr or
+-# /usr/local.
+-if test -z "$XDG_DATA_DIRS"; then
+-    XDG_DATA_DIRS="@CMAKE_INSTALL_PREFIX@/@SHARE_INSTALL_PREFIX@:/usr/share:/usr/local/share"
+-fi
+-export XDG_DATA_DIRS
+-
+-# Make sure that D-Bus is running
+-if $qdbus >/dev/null 2>/dev/null; then
+-    : # ok
+-else
+-    echo 'startkde: Could not start D-Bus. Can you call qdbus?'  1>&2
+-    test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
+-    xmessage -geometry 500x100 "Could not start D-Bus. Can you call qdbus?"
+-    exit 1
+-fi
+-
+-
+ # Mark that full KDE session is running (e.g. Konqueror preloading works only
+ # with full KDE running). The KDE_FULL_SESSION property can be detected by
+ # any X client connected to the same X session, even if not launched
+@@ -318,11 +285,11 @@ fi
+ #
+ KDE_FULL_SESSION=true
+ export KDE_FULL_SESSION
+-xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true
++@xprop@ -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true
+ 
+ KDE_SESSION_VERSION=5
+ export KDE_SESSION_VERSION
+-xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5
++@xprop@ -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5
+ 
+ KDE_SESSION_UID=`id -ru`
+ export KDE_SESSION_UID
+@@ -332,11 +299,11 @@ export XDG_CURRENT_DESKTOP
+ 
+ # At this point all the environment is ready, let's send it to kwalletd if running
+ if test -n "$PAM_KWALLET_LOGIN" ; then
+-    env | socat STDIN UNIX-CONNECT:$PAM_KWALLET_LOGIN
++    env | @socat@ STDIN UNIX-CONNECT:$PAM_KWALLET_LOGIN
+ fi
+ # ...and also to kwalletd5
+ if test -n "$PAM_KWALLET5_LOGIN" ; then
+-    env | socat STDIN UNIX-CONNECT:$PAM_KWALLET5_LOGIN
++    env | @socat@ STDIN UNIX-CONNECT:$PAM_KWALLET5_LOGIN
+ fi
+ 
+ # At this point all environment variables are set, let's send it to the DBus session server to update the activation environment
+@@ -349,18 +316,18 @@ if test $? -ne 0; then
+   # Startup error
+   echo 'startkde: Could not sync environment to dbus.'  1>&2
+   test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
+-  xmessage -geometry 500x100 "Could not sync environment to dbus."
++  @xmessage@ -geometry 500x100 "Could not sync environment to dbus."
+   exit 1
+ fi
+ 
+ # We set LD_BIND_NOW to increase the efficiency of kdeinit.
+ # kdeinit unsets this variable before loading applications.
+-LD_BIND_NOW=true @CMAKE_INSTALL_FULL_LIBEXECDIR_KF5@/start_kdeinit_wrapper --kded +kcminit_startup
++LD_BIND_NOW=true @start_kdeinit_wrapper@ --kded +kcminit_startup
+ if test $? -ne 0; then
+   # Startup error
+   echo 'startkde: Could not start kdeinit5. Check your installation.'  1>&2
+   test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
+-  xmessage -geometry 500x100 "Could not start kdeinit5. Check your installation."
++  @xmessage@ -geometry 500x100 "Could not start kdeinit5. Check your installation."
+   exit 1
+ fi
+ 
+@@ -379,27 +346,27 @@ test -n "$KDEWM" && KDEWM="--windowmanag
+ # lock now and do the rest of the KDE startup underneath the locker.
+ KSMSERVEROPTIONS=""
+ test -n "$dl" && KSMSERVEROPTIONS=" --lockscreen"
+-kwrapper5 @CMAKE_INSTALL_FULL_BINDIR@/ksmserver $KDEWM $KSMSERVEROPTIONS
++@kwrapper5@ @CMAKE_INSTALL_FULL_BINDIR@/ksmserver $KDEWM $KSMSERVEROPTIONS
+ if test $? -eq 255; then
+   # Startup error
+   echo 'startkde: Could not start ksmserver. Check your installation.'  1>&2
+   test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
+-  xmessage -geometry 500x100 "Could not start ksmserver. Check your installation."
++  @xmessage@ -geometry 500x100 "Could not start ksmserver. Check your installation."
+ fi
+ 
+-wait_drkonqi=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true`
++wait_drkonqi=`@kreadconfig5@ --file startkderc --group WaitForDrKonqi --key Enabled --default true`
+ 
+ if test x"$wait_drkonqi"x = x"true"x ; then
+     # wait for remaining drkonqi instances with timeout (in seconds)
+-    wait_drkonqi_timeout=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900`
++    wait_drkonqi_timeout=`@kreadconfig5@ --file startkderc --group WaitForDrKonqi --key Timeout --default 900`
+     wait_drkonqi_counter=0
+-    while $qdbus | grep "^[^w]*org.kde.drkonqi" > /dev/null ; do
++    while @qdbus@ | @grep@ "^[^w]*org.kde.drkonqi" > /dev/null ; do
+         sleep 5
+         wait_drkonqi_counter=$((wait_drkonqi_counter+5))
+         if test "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ; then
+             # ask remaining drkonqis to die in a graceful way
+-            $qdbus | grep 'org.kde.drkonqi-' | while read address ; do
+-                $qdbus "$address" "/MainApplication" "quit"
++            @qdbus@ | @grep@ 'org.kde.drkonqi-' | while read address ; do
++                @qdbus@ "$address" "/MainApplication" "quit"
+             done
+             break
+         fi
+@@ -411,12 +378,12 @@ echo 'startkde: Shutting down...'  1>&2
+ test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
+ 
+ # Clean up
+-kdeinit5_shutdown
++@kdeinit5_shutdown@
+ 
+ unset KDE_FULL_SESSION
+-xprop -root -remove KDE_FULL_SESSION
++@xprop@ -root -remove KDE_FULL_SESSION
+ unset KDE_SESSION_VERSION
+-xprop -root -remove KDE_SESSION_VERSION
++@xprop@ -root -remove KDE_SESSION_VERSION
+ unset KDE_SESSION_UID
+ 
+ echo 'startkde: Done.'  1>&2
diff --git a/pkgs/desktops/kde-5/plasma-5.6/polkit-kde-agent.nix b/pkgs/desktops/kde-5/plasma-5.6/polkit-kde-agent.nix
new file mode 100644
index 000000000000..3fc3a441ac34
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma-5.6/polkit-kde-agent.nix
@@ -0,0 +1,31 @@
+{ plasmaPackage
+, extra-cmake-modules
+, ki18n
+, kwindowsystem
+, kdbusaddons
+, kwidgetsaddons
+, kcoreaddons
+, kcrash
+, kconfig
+, kiconthemes
+, knotifications
+, polkit-qt
+}:
+
+plasmaPackage {
+  name = "polkit-kde-agent";
+  nativeBuildInputs = [
+    extra-cmake-modules
+  ];
+  buildInputs = [
+    kdbusaddons
+    kwidgetsaddons
+    kcoreaddons
+    kcrash
+    kconfig
+    kiconthemes
+    knotifications
+    polkit-qt
+  ];
+  propagatedBuildInputs = [ ki18n kwindowsystem ];
+}
diff --git a/pkgs/desktops/kde-5/plasma-5.6/powerdevil.nix b/pkgs/desktops/kde-5/plasma-5.6/powerdevil.nix
new file mode 100644
index 000000000000..475e8878206a
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma-5.6/powerdevil.nix
@@ -0,0 +1,20 @@
+{ plasmaPackage, extra-cmake-modules, kdoctools, kactivities
+, kauth, kconfig, kdbusaddons, kdelibs4support, kglobalaccel, ki18n
+, kidletime, kio, knotifyconfig, kwayland, libkscreen, plasma-workspace
+, qtx11extras, solid, udev
+}:
+
+plasmaPackage {
+  name = "powerdevil";
+  nativeBuildInputs = [
+    extra-cmake-modules
+    kdoctools
+  ];
+  buildInputs = [
+    kconfig kdbusaddons knotifyconfig solid udev
+  ];
+  propagatedBuildInputs = [
+    kactivities kauth kdelibs4support kglobalaccel ki18n kio kidletime
+    kwayland libkscreen plasma-workspace qtx11extras
+  ];
+}
diff --git a/pkgs/desktops/kde-5/plasma-5.6/setup-hook.sh b/pkgs/desktops/kde-5/plasma-5.6/setup-hook.sh
new file mode 100644
index 000000000000..a8d9b7e0e36f
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma-5.6/setup-hook.sh
@@ -0,0 +1 @@
+addToSearchPath XDG_DATA_DIRS @out@/share
diff --git a/pkgs/desktops/kde-5/plasma-5.6/srcs.nix b/pkgs/desktops/kde-5/plasma-5.6/srcs.nix
new file mode 100644
index 000000000000..288378771e50
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma-5.6/srcs.nix
@@ -0,0 +1,341 @@
+# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
+{ fetchurl, mirror }:
+
+{
+  bluedevil = {
+    version = "5.6.3";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.3/bluedevil-5.6.3.tar.xz";
+      sha256 = "1x8rdsk2jhx01pfw5d74ks2240w9pky7c38rwb84w18l3w1mrq6q";
+      name = "bluedevil-5.6.3.tar.xz";
+    };
+  };
+  breeze = {
+    version = "5.6.3";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.3/breeze-5.6.3.tar.xz";
+      sha256 = "191pkbkn1hb1c2k7f5y8x2wm99p4v2rm74jk1ygqk72bh8wpc9zx";
+      name = "breeze-5.6.3.tar.xz";
+    };
+  };
+  breeze-grub = {
+    version = "5.6.3";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.3/breeze-grub-5.6.3.tar.xz";
+      sha256 = "0i4kxjw8rmp3y40z10yyc792kbvyai9pxd4lva24bilzsh3x2g5c";
+      name = "breeze-grub-5.6.3.tar.xz";
+    };
+  };
+  breeze-gtk = {
+    version = "5.6.3";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.3/breeze-gtk-5.6.3.tar.xz";
+      sha256 = "0yr20v5b0hq4jicfx8lxmy23znqwf3d87hz88qiizjiad4fyy4ca";
+      name = "breeze-gtk-5.6.3.tar.xz";
+    };
+  };
+  breeze-plymouth = {
+    version = "5.6.3";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.3/breeze-plymouth-5.6.3.tar.xz";
+      sha256 = "0gkiwravkpxwk9r6l0mzjyr5hc9fpj1d6l5a0i755q7m80h1dahk";
+      name = "breeze-plymouth-5.6.3.tar.xz";
+    };
+  };
+  discover = {
+    version = "5.6.3";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.3/discover-5.6.3.tar.xz";
+      sha256 = "1rpn22xjabsaakqgdsx0vz4h0v40l8ssfrjqahpj95axs14zi2gg";
+      name = "discover-5.6.3.tar.xz";
+    };
+  };
+  kactivitymanagerd = {
+    version = "5.6.3";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.3/kactivitymanagerd-5.6.3.tar.xz";
+      sha256 = "0zs3z4r27iiqz3wjsv09ik3h45g2f08y1p3mr1ihiss07qgknbz6";
+      name = "kactivitymanagerd-5.6.3.tar.xz";
+    };
+  };
+  kde-cli-tools = {
+    version = "5.6.3";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.3/kde-cli-tools-5.6.3.tar.xz";
+      sha256 = "1cxbvgc3nhrr98ygm3i7srr26ds2rmbg6fzjqvdz2z4bz80ai892";
+      name = "kde-cli-tools-5.6.3.tar.xz";
+    };
+  };
+  kdecoration = {
+    version = "5.6.3";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.3/kdecoration-5.6.3.tar.xz";
+      sha256 = "03iryqrkrpphvc8xpqmmpbdgg7rim9yvvyx3kxrjgpbh2xy6rwsr";
+      name = "kdecoration-5.6.3.tar.xz";
+    };
+  };
+  kde-gtk-config = {
+    version = "5.6.3";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.3/kde-gtk-config-5.6.3.tar.xz";
+      sha256 = "0jiraahajpfn5k81j077l4ipfadq9aqnnca0kfyag488mhkgmil1";
+      name = "kde-gtk-config-5.6.3.tar.xz";
+    };
+  };
+  kdeplasma-addons = {
+    version = "5.6.3";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.3/kdeplasma-addons-5.6.3.tar.xz";
+      sha256 = "1p70ms91hd9lhg9fabnrpz1wkc2la9315ffk2wxi334sx4k70gcs";
+      name = "kdeplasma-addons-5.6.3.tar.xz";
+    };
+  };
+  kgamma5 = {
+    version = "5.6.3";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.3/kgamma5-5.6.3.tar.xz";
+      sha256 = "1wv32s6yc4b8qaskdb444r7j918pz0x8mkal5affbr12vzfz8m6r";
+      name = "kgamma5-5.6.3.tar.xz";
+    };
+  };
+  khelpcenter = {
+    version = "5.6.3";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.3/khelpcenter-5.6.3.tar.xz";
+      sha256 = "14mwy1rv04mp92dfci6ak6dvmaqx2vc0yk0zyp1v6s64jiry658g";
+      name = "khelpcenter-5.6.3.tar.xz";
+    };
+  };
+  khotkeys = {
+    version = "5.6.3";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.3/khotkeys-5.6.3.tar.xz";
+      sha256 = "05235ckdr81cl46iyalapjxxmybqd8b2zy1yqclv7fwld2c347pc";
+      name = "khotkeys-5.6.3.tar.xz";
+    };
+  };
+  kinfocenter = {
+    version = "5.6.3";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.3/kinfocenter-5.6.3.tar.xz";
+      sha256 = "1rvixj9sr98abna8ss6bmvf7g7i4nm5xa49dv4d42874kskqjci5";
+      name = "kinfocenter-5.6.3.tar.xz";
+    };
+  };
+  kmenuedit = {
+    version = "5.6.3";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.3/kmenuedit-5.6.3.tar.xz";
+      sha256 = "169ybp4vvay5isfwk2kv73npspiww2abb4vaa7af8rbiv82cwr0g";
+      name = "kmenuedit-5.6.3.tar.xz";
+    };
+  };
+  kscreen = {
+    version = "5.6.3";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.3/kscreen-5.6.3.tar.xz";
+      sha256 = "1cvgxwdh742r7dk59qqa4w28sd7k62gjy7w5hmq3dnhka0nlxr74";
+      name = "kscreen-5.6.3.tar.xz";
+    };
+  };
+  kscreenlocker = {
+    version = "5.6.3";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.3/kscreenlocker-5.6.3.tar.xz";
+      sha256 = "13fqmazqrhcdg32iwdym9rci9fj2jn02mkc01rz8fw9a8fwxzdcn";
+      name = "kscreenlocker-5.6.3.tar.xz";
+    };
+  };
+  ksshaskpass = {
+    version = "5.6.3";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.3/ksshaskpass-5.6.3.tar.xz";
+      sha256 = "0bxpwlylfnicipwkf5fq3s62w9gq8gcxl6iby1lmw8m55fm1xd7y";
+      name = "ksshaskpass-5.6.3.tar.xz";
+    };
+  };
+  ksysguard = {
+    version = "5.6.3";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.3/ksysguard-5.6.3.tar.xz";
+      sha256 = "0vh0wpsv0jlj6lq6fl45k7aivbj2nwq5ksfnyad74v20qhy2069b";
+      name = "ksysguard-5.6.3.tar.xz";
+    };
+  };
+  kwallet-pam = {
+    version = "5.6.3";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.3/kwallet-pam-5.6.3.tar.xz";
+      sha256 = "1zy5s3pv7qlyckzaz7yvqzb0w478q6zldmm5w7m4ax90j16ihg7n";
+      name = "kwallet-pam-5.6.3.tar.xz";
+    };
+  };
+  kwayland = {
+    version = "5.6.3";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.3/kwayland-5.6.3.tar.xz";
+      sha256 = "04rpvgs25dqrac8bg46w1dpxpwavrlrjyc71bxqiddrya798485v";
+      name = "kwayland-5.6.3.tar.xz";
+    };
+  };
+  kwayland-integration = {
+    version = "5.6.3";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.3/kwayland-integration-5.6.3.tar.xz";
+      sha256 = "19p224n7knih7gikcxkx6n4v49ysgkxd6ghpqwnw5y6jx147qyg4";
+      name = "kwayland-integration-5.6.3.tar.xz";
+    };
+  };
+  kwin = {
+    version = "5.6.3";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.3/kwin-5.6.3.tar.xz";
+      sha256 = "0dxscqk5kqkqfq5cs8qpfwi38i20q3w7r8wvq5l8r9q0q56bsnrk";
+      name = "kwin-5.6.3.tar.xz";
+    };
+  };
+  kwrited = {
+    version = "5.6.3";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.3/kwrited-5.6.3.tar.xz";
+      sha256 = "18lqr7an6zzlqs2s50arw5zwfdzxl644c7i00j332nlv23yxc1g3";
+      name = "kwrited-5.6.3.tar.xz";
+    };
+  };
+  libkscreen = {
+    version = "5.6.3";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.3/libkscreen-5.6.3.tar.xz";
+      sha256 = "0w1v432i8xjk0xgs6vbz68myfqfa93kzhhya4mqri7jzjc6nyc1y";
+      name = "libkscreen-5.6.3.tar.xz";
+    };
+  };
+  libksysguard = {
+    version = "5.6.3";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.3/libksysguard-5.6.3.tar.xz";
+      sha256 = "16pf9p9dbq08mlqrcqrxsmwxgi1dp1rzbm4icksr99cjm30zss0g";
+      name = "libksysguard-5.6.3.tar.xz";
+    };
+  };
+  milou = {
+    version = "5.6.3";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.3/milou-5.6.3.tar.xz";
+      sha256 = "18d3knb1ndj39pffy5xsqdyncsym0izv73r0cmmc3mw8x7xshcfc";
+      name = "milou-5.6.3.tar.xz";
+    };
+  };
+  oxygen = {
+    version = "5.6.3";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.3/oxygen-5.6.3.tar.xz";
+      sha256 = "1pnal63by1hnjal356lmadk7sxq2pndi1gfhf8lmqpw0n5dwd9ng";
+      name = "oxygen-5.6.3.tar.xz";
+    };
+  };
+  plasma-desktop = {
+    version = "5.6.3";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.3/plasma-desktop-5.6.3.tar.xz";
+      sha256 = "0dk4ya5srb4czslakbi1f7gyrriv1lb6cdkfirqznax561bk6dk7";
+      name = "plasma-desktop-5.6.3.tar.xz";
+    };
+  };
+  plasma-integration = {
+    version = "5.6.3";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.3/plasma-integration-5.6.3.tar.xz";
+      sha256 = "0wx62s6l8kqhsrc88zji9ydaqgplc9y7l2s52qfwm2g464k4i1qw";
+      name = "plasma-integration-5.6.3.tar.xz";
+    };
+  };
+  plasma-mediacenter = {
+    version = "5.6.3";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.3/plasma-mediacenter-5.6.3.tar.xz";
+      sha256 = "17g5hkpjqsifb413f4p9y10hnbk74k3vbk5srcx46byrsjbkasgq";
+      name = "plasma-mediacenter-5.6.3.tar.xz";
+    };
+  };
+  plasma-nm = {
+    version = "5.6.3";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.3/plasma-nm-5.6.3.tar.xz";
+      sha256 = "0axsv7nxfwqhjq3j5yn30b76wvr8p21p5jlqspq7yxhmxhk88x4j";
+      name = "plasma-nm-5.6.3.tar.xz";
+    };
+  };
+  plasma-pa = {
+    version = "5.6.3";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.3/plasma-pa-5.6.3.tar.xz";
+      sha256 = "1d623xav0ckabckr9v51sg6a6695fi7pkcy86q2lrpg1m6f2m2l3";
+      name = "plasma-pa-5.6.3.tar.xz";
+    };
+  };
+  plasma-sdk = {
+    version = "5.6.3";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.3/plasma-sdk-5.6.3.tar.xz";
+      sha256 = "0w8gcm0hgqk3yqr981zf1xzd024b06y7zxqmzsbzcr3sfh85f0b2";
+      name = "plasma-sdk-5.6.3.tar.xz";
+    };
+  };
+  plasma-workspace = {
+    version = "5.6.3";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.3/plasma-workspace-5.6.3.tar.xz";
+      sha256 = "0p4g15x1ifcc4kn224h66a6fyv3iki1qqpfnihvmkdxmifmbzy2c";
+      name = "plasma-workspace-5.6.3.tar.xz";
+    };
+  };
+  plasma-workspace-wallpapers = {
+    version = "5.6.3";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.3/plasma-workspace-wallpapers-5.6.3.tar.xz";
+      sha256 = "0jdwm01q7h47qrx832kqshrh17dz4dhjbqmy1x17barxd759kd09";
+      name = "plasma-workspace-wallpapers-5.6.3.tar.xz";
+    };
+  };
+  polkit-kde-agent = {
+    version = "1-5.6.3";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.3/polkit-kde-agent-1-5.6.3.tar.xz";
+      sha256 = "1d28v8fb5w5snfn5nwghz8mwvk8p1ahs3kxjkhqkwb6sb6l0kkq1";
+      name = "polkit-kde-agent-1-5.6.3.tar.xz";
+    };
+  };
+  powerdevil = {
+    version = "5.6.3";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.3/powerdevil-5.6.3.tar.xz";
+      sha256 = "1gq04f2pgr3y7wi3jg6xrk8b3fhf1fqn82knv7cix0d5b2khy2lp";
+      name = "powerdevil-5.6.3.tar.xz";
+    };
+  };
+  sddm-kcm = {
+    version = "5.6.3";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.3/sddm-kcm-5.6.3.tar.xz";
+      sha256 = "1kqkl4p65vl2mvgigw24w3p9p4f0j2fz4d2rv1iy2w93kznl9b4s";
+      name = "sddm-kcm-5.6.3.tar.xz";
+    };
+  };
+  systemsettings = {
+    version = "5.6.3";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.3/systemsettings-5.6.3.tar.xz";
+      sha256 = "16fgr1qwfbmzriajisq4sj978lni11d4ig80z7k1h7g5xxhahk9k";
+      name = "systemsettings-5.6.3.tar.xz";
+    };
+  };
+  user-manager = {
+    version = "5.6.3";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.6.3/user-manager-5.6.3.tar.xz";
+      sha256 = "1slvz0nxhafpprbdzf87dpiw62yar62ia78rcr9xabgz2rfl0bhl";
+      name = "user-manager-5.6.3.tar.xz";
+    };
+  };
+}
diff --git a/pkgs/desktops/kde-5/plasma-5.6/startkde/default.nix b/pkgs/desktops/kde-5/plasma-5.6/startkde/default.nix
new file mode 100644
index 000000000000..30e986c21b4b
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma-5.6/startkde/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, lib, runCommand
+, dbus, qttools, socat
+, gnugrep, gnused
+, kconfig, kinit, kservice
+, plasma-workspace
+, xmessage, xprop, xsetroot
+}:
+
+let
+
+  env = {
+    inherit (stdenv) shell;
+    paths = builtins.map (pkg: pkg.out or pkg)
+      [
+        dbus qttools socat
+        gnugrep gnused
+        kconfig kinit kservice
+        plasma-workspace
+        xmessage xprop xsetroot
+      ];
+  };
+
+in runCommand "startkde" env ''
+  prefix_PATH=
+  for pkg in $paths; do
+    addToSearchPath prefix_PATH "$pkg/bin"
+    addToSearchPath prefix_PATH "$pkg/lib/libexec"
+    addToSearchPath prefix_PATH "$pkg/lib/libexec/kf5"
+  done
+  substitute ${./startkde.sh} "$out" --subst-var shell --subst-var prefix_PATH
+  chmod +x "$out"
+''
diff --git a/pkgs/desktops/kde-5/plasma-5.6/startkde/startkde.sh b/pkgs/desktops/kde-5/plasma-5.6/startkde/startkde.sh
new file mode 100755
index 000000000000..d839226a4562
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma-5.6/startkde/startkde.sh
@@ -0,0 +1,334 @@
+#!@shell@
+
+PATH="@prefix_PATH@:$PATH"
+
+# The KDE icon cache is supposed to update itself
+# automatically, but it uses the timestamp on the icon
+# theme directory as a trigger.  Since in Nix the
+# timestamp is always the same, this doesn't work.  So as
+# a workaround, nuke the icon cache on login.  This isn't
+# perfect, since it may require logging out after
+# installing new applications to update the cache.
+# See http://lists-archives.org/kde-devel/26175-what-when-will-icon-cache-refresh.html
+rm -fv $HOME/.cache/icon-cache.kcache
+
+# Qt writes a weird ‘libraryPath’ line to
+# ~/.config/Trolltech.conf that causes the KDE plugin
+# paths of previous KDE invocations to be searched.
+# Obviously using mismatching KDE libraries is potentially
+# disastrous, so here we nuke references to the Nix store
+# in Trolltech.conf.  A better solution would be to stop
+# Qt from doing this wackiness in the first place.
+if [ -e $HOME/.config/Trolltech.conf ]; then
+    sed -e '/nix\\store\|nix\/store/ d' -i $HOME/.config/Trolltech.conf
+fi
+
+if test "x$1" = x--failsafe; then
+    KDE_FAILSAFE=1 # General failsafe flag
+    KWIN_COMPOSE=N # Disable KWin's compositing
+    QT_XCB_FORCE_SOFTWARE_OPENGL=1
+    export KWIN_COMPOSE KDE_FAILSAFE QT_XCB_FORCE_SOFTWARE_OPENGL
+fi
+
+# When the X server dies we get a HUP signal from xinit. We must ignore it
+# because we still need to do some cleanup.
+trap 'echo GOT SIGHUP' HUP
+
+# we have to unset this for Darwin since it will screw up KDE's dynamic-loading
+unset DYLD_FORCE_FLAT_NAMESPACE
+
+# Check if a KDE session already is running and whether it's possible to connect to X
+kcheckrunning
+kcheckrunning_result=$?
+if test $kcheckrunning_result -eq 0 ; then
+    echo "KDE seems to be already running on this display."
+    xmessage -geometry 500x100 "KDE seems to be already running on this display."
+	exit 1
+elif test $kcheckrunning_result -eq 2 ; then
+	echo "\$DISPLAY is not set or cannot connect to the X server."
+    exit 1
+fi
+
+# Boot sequence:
+#
+# kdeinit is used to fork off processes which improves memory usage
+# and startup time.
+#
+# * kdeinit starts klauncher first.
+# * Then kded is started. kded is responsible for keeping the sycoca
+#   database up to date. When an up to date database is present it goes
+#   into the background and the startup continues.
+# * Then kdeinit starts kcminit. kcminit performs initialisation of
+#   certain devices according to the user's settings
+#
+# * Then ksmserver is started which takes control of the rest of the startup sequence
+
+# We need to create config folder so we can write startupconfigkeys
+configDir=$(qtpaths --writable-path GenericConfigLocation)
+mkdir -p "$configDir"
+
+#This is basically setting defaults so we can use them with kstartupconfig5
+cat >$configDir/startupconfigkeys <<EOF
+kcminputrc Mouse cursorTheme 'breeze_cursors'
+kcminputrc Mouse cursorSize ''
+ksplashrc KSplash Theme Breeze
+ksplashrc KSplash Engine KSplashQML
+kdeglobals KScreen ScaleFactor 1
+kcmfonts General forceFontDPI 0
+EOF
+
+# preload the user's locale on first start
+plasmalocalerc=$configDir/plasma-localerc
+test -f $plasmalocalerc || {
+cat >$plasmalocalerc <<EOF
+[Formats]
+LANG=$LANG
+EOF
+}
+
+# export LC_* variables set by kcmshell5 formats into environment
+# so it can be picked up by QLocale and friends.
+exportformatssettings=$configDir/plasma-locale-settings.sh
+test -f $exportformatssettings && {
+    . $exportformatssettings
+}
+
+# Write a default kdeglobals file to set up the font
+kdeglobalsfile=$configDir/kdeglobals
+test -f $kdeglobalsfile || {
+cat >$kdeglobalsfile <<EOF
+[General]
+XftAntialias=true
+XftHintStyle=hintmedium
+XftSubPixel=none
+EOF
+}
+
+kstartupconfig5
+returncode=$?
+if test $returncode -ne 0; then
+    xmessage -geometry 500x100 "kstartupconfig5 does not exist or fails. The error code is $returncode. Check your installation."
+    exit 1
+fi
+[ -r $configDir/startupconfig ] && . $configDir/startupconfig
+
+if test "$kdeglobals_kscreen_scalefactor" -ne 1; then
+    export QT_DEVICE_PIXEL_RATIO=$kdeglobals_kscreen_scalefactor
+fi
+
+XCURSOR_PATH=~/.icons
+IFS=":" read -r -a xdgDirs <<< "$XDG_DATA_DIRS"
+for xdgDir in "${xdgDirs[@]}"; do
+    XCURSOR_PATH="$XCURSOR_PATH:$xdgDir/icons"
+done
+export XCURSOR_PATH
+
+# XCursor mouse theme needs to be applied here to work even for kded or ksmserver
+if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then
+
+    kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"
+    if test $? -eq 10; then
+        XCURSOR_THEME=breeze_cursors
+        export XCURSOR_THEME
+    elif test -n "$kcminputrc_mouse_cursortheme"; then
+        XCURSOR_THEME="$kcminputrc_mouse_cursortheme"
+        export XCURSOR_THEME
+    fi
+    if test -n "$kcminputrc_mouse_cursorsize"; then
+        XCURSOR_SIZE="$kcminputrc_mouse_cursorsize"
+        export XCURSOR_SIZE
+    fi
+fi
+
+# Set a left cursor instead of the standard X11 "X" cursor, since I've heard
+# from some users that they're confused and don't know what to do. This is
+# especially necessary on slow machines, where starting KDE takes one or two
+# minutes until anything appears on the screen.
+#
+# If the user has overwritten fonts, the cursor font may be different now
+# so don't move this up.
+#
+xsetroot -cursor_name left_ptr
+
+dl=$DESKTOP_LOCKED
+unset DESKTOP_LOCKED # Don't want it in the environment
+
+# Make sure that D-Bus is running
+# D-Bus autolaunch is broken
+if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
+    eval $(dbus-launch --sh-syntax --exit-with-session)
+fi
+if qdbus >/dev/null 2>/dev/null; then
+    : # ok
+else
+    echo 'startkde: Could not start D-Bus. Can you call qdbus?'  1>&2
+    test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
+    xmessage -geometry 500x100 "Could not start D-Bus. Can you call qdbus?"
+    exit 1
+fi
+
+ksplash_pid=
+if test -z "$dl"; then
+  # the splashscreen and progress indicator
+  case "$ksplashrc_ksplash_engine" in
+    KSplashQML)
+      ksplash_pid=$(ksplashqml "${ksplashrc_ksplash_theme}" --pid)
+      ;;
+    None)
+      ;;
+    *)
+      ;;
+  esac
+fi
+
+# Source scripts found in <config locations>/plasma-workspace/env/*.sh
+# (where <config locations> correspond to the system and user's configuration
+# directories, as identified by Qt's qtpaths,  e.g.  $HOME/.config
+# and /etc/xdg/ on Linux)
+#
+# This is where you can define environment variables that will be available to
+# all KDE programs, so this is where you can run agents using e.g. eval `ssh-agent`
+# or eval `gpg-agent --daemon`.
+# Note: if you do that, you should also put "ssh-agent -k" as a shutdown script
+#
+# (see end of this file).
+# For anything else (that doesn't set env vars, or that needs a window manager),
+# better use the Autostart folder.
+
+IFS=":" read -r -a scriptpath <<< $(qtpaths --paths GenericConfigLocation)
+# Add /env/ to the directory to locate the scripts to be sourced
+for prefix in "${scriptpath[@]}"; do
+  for file in "$prefix"/plasma-workspace/env/*.sh; do
+    test -r "$file" && . "$file" || true
+  done
+done
+
+echo 'startkde: Starting up...'  1>&2
+
+# Mark that full KDE session is running (e.g. Konqueror preloading works only
+# with full KDE running). The KDE_FULL_SESSION property can be detected by
+# any X client connected to the same X session, even if not launched
+# directly from the KDE session but e.g. using "ssh -X", kdesu. $KDE_FULL_SESSION
+# however guarantees that the application is launched in the same environment
+# like the KDE session and that e.g. KDE utilities/libraries are available.
+# KDE_FULL_SESSION property is also only available since KDE 3.5.5.
+# The matching tests are:
+#   For $KDE_FULL_SESSION:
+#     if test -n "$KDE_FULL_SESSION"; then ... whatever
+#   For KDE_FULL_SESSION property:
+#     xprop -root | grep "^KDE_FULL_SESSION" >/dev/null 2>/dev/null
+#     if test $? -eq 0; then ... whatever
+#
+# Additionally there is (since KDE 3.5.7) $KDE_SESSION_UID with the uid
+# of the user running the KDE session. It should be rarely needed (e.g.
+# after sudo to prevent desktop-wide functionality in the new user's kded).
+#
+# Since KDE4 there is also KDE_SESSION_VERSION, containing the major version number.
+# Note that this didn't exist in KDE3, which can be detected by its absense and
+# the presence of KDE_FULL_SESSION.
+#
+KDE_FULL_SESSION=true
+export KDE_FULL_SESSION
+xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true
+
+KDE_SESSION_VERSION=5
+export KDE_SESSION_VERSION
+xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5
+
+KDE_SESSION_UID=`id -ru`
+export KDE_SESSION_UID
+
+XDG_CURRENT_DESKTOP=KDE
+export XDG_CURRENT_DESKTOP
+
+# At this point all the environment is ready, let's send it to kwalletd if running
+if test -n "$PAM_KWALLET_LOGIN" ; then
+    env | socat STDIN UNIX-CONNECT:$PAM_KWALLET_LOGIN
+fi
+# ...and also to kwalletd5
+if test -n "$PAM_KWALLET5_LOGIN" ; then
+    env | socat STDIN UNIX-CONNECT:$PAM_KWALLET5_LOGIN
+fi
+
+# At this point all environment variables are set, let's send it to the DBus session server to update the activation environment
+ksyncdbusenv
+if test $? -ne 0; then
+  # Startup error
+  echo 'startkde: Could not sync environment to dbus.'  1>&2
+  test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
+  xmessage -geometry 500x100 "Could not sync environment to dbus."
+  exit 1
+fi
+
+# We set LD_BIND_NOW to increase the efficiency of kdeinit.
+# kdeinit unsets this variable before loading applications.
+LD_BIND_NOW=true start_kdeinit_wrapper --kded +kcminit_startup
+if test $? -ne 0; then
+  # Startup error
+  echo 'startkde: Could not start kdeinit5. Check your installation.'  1>&2
+  test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
+  xmessage -geometry 500x100 "Could not start kdeinit5. Check your installation."
+  exit 1
+fi
+
+# (NixOS) Run kbuildsycoca5 before starting the user session because things
+# may be missing or moved if they have run nixos-rebuild and it may not be
+# possible for them to start Konsole to run it manually!
+kbuildsycoca5
+
+# finally, give the session control to the session manager
+# see kdebase/ksmserver for the description of the rest of the startup sequence
+# if the KDEWM environment variable has been set, then it will be used as KDE's
+# window manager instead of kwin.
+# if KDEWM is not set, ksmserver will ensure kwin is started.
+# kwrapper5 is used to reduce startup time and memory usage
+# kwrapper5 does not return useful error codes such as the exit code of ksmserver.
+# We only check for 255 which means that the ksmserver process could not be
+# started, any problems thereafter, e.g. ksmserver failing to initialize,
+# will remain undetected.
+test -n "$KDEWM" && KDEWM="--windowmanager $KDEWM"
+# If the session should be locked from the start (locked autologin),
+# lock now and do the rest of the KDE startup underneath the locker.
+KSMSERVEROPTIONS=""
+test -n "$dl" && KSMSERVEROPTIONS=" --lockscreen"
+kwrapper5 ksmserver $KDEWM $KSMSERVEROPTIONS
+if test $? -eq 255; then
+  # Startup error
+  echo 'startkde: Could not start ksmserver. Check your installation.'  1>&2
+  test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
+  xmessage -geometry 500x100 "Could not start ksmserver. Check your installation."
+fi
+
+wait_drkonqi=$(kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true)
+
+if test x"$wait_drkonqi"x = x"true"x ; then
+    # wait for remaining drkonqi instances with timeout (in seconds)
+    wait_drkonqi_timeout=$(kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900)
+    wait_drkonqi_counter=0
+    while qdbus | grep "^[^w]*org.kde.drkonqi" > /dev/null ; do
+        sleep 5
+        wait_drkonqi_counter=$((wait_drkonqi_counter+5))
+        if test "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ; then
+            # ask remaining drkonqis to die in a graceful way
+            qdbus | grep 'org.kde.drkonqi-' | while read address ; do
+                qdbus "$address" "/MainApplication" "quit"
+            done
+            break
+        fi
+    done
+fi
+
+echo 'startkde: Shutting down...'  1>&2
+# just in case
+test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
+
+# Clean up
+kdeinit5_shutdown
+
+unset KDE_FULL_SESSION
+xprop -root -remove KDE_FULL_SESSION
+unset KDE_SESSION_VERSION
+xprop -root -remove KDE_SESSION_VERSION
+unset KDE_SESSION_UID
+
+echo 'startkde: Done.'  1>&2
diff --git a/pkgs/desktops/kde-5/plasma-5.6/systemsettings.nix b/pkgs/desktops/kde-5/plasma-5.6/systemsettings.nix
new file mode 100644
index 000000000000..a921e153dbc2
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma-5.6/systemsettings.nix
@@ -0,0 +1,21 @@
+{ plasmaPackage, extra-cmake-modules, kdoctools, kitemviews
+, kcmutils, ki18n, kio, kservice, kiconthemes, kwindowsystem
+, kxmlgui, kdbusaddons, kconfig, khtml, makeQtWrapper
+}:
+
+plasmaPackage {
+  name = "systemsettings";
+  nativeBuildInputs = [
+    extra-cmake-modules
+    kdoctools
+    makeQtWrapper
+  ];
+  buildInputs = [
+    kitemviews kcmutils kservice kiconthemes kxmlgui kdbusaddons
+    kconfig
+  ];
+  propagatedBuildInputs = [ khtml ki18n kio kwindowsystem ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/systemsettings5"
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 81fe6bc5f96a..1c4472ae3c91 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15592,7 +15592,7 @@ in
   kde5_latest =
     let
       frameworks = import ../desktops/kde-5/frameworks-5.21 { inherit pkgs; };
-      plasma = import ../desktops/kde-5/plasma-5.5 { inherit pkgs; };
+      plasma = import ../desktops/kde-5/plasma-5.6 { inherit pkgs; };
       applications = import ../desktops/kde-5/applications-16.04 { inherit pkgs; };
       merged = self:
         { plasma = plasma self;

From 19474a7b2a4d8379409dc34ffd926f2641af1bbe Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 21 Apr 2016 14:36:22 -0500
Subject: [PATCH 051/287] kde5_latest.knotifications: include optional
 libdbusmenu input

---
 pkgs/desktops/kde-5/frameworks-5.21/knotifications.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/knotifications.nix b/pkgs/desktops/kde-5/frameworks-5.21/knotifications.nix
index 7e301dd0f268..791caa02edb7 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/knotifications.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/knotifications.nix
@@ -1,9 +1,7 @@
 { kdeFramework, lib
 , extra-cmake-modules
-, kcodecs
-, kconfig
-, kcoreaddons
-, kwindowsystem
+, kcodecs, kconfig, kcoreaddons, kwindowsystem
+, libdbusmenu
 , phonon
 , qtx11extras
 }:
@@ -12,7 +10,7 @@ kdeFramework {
   name = "knotifications";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
-    kcodecs kconfig kcoreaddons phonon
+    kcodecs kconfig kcoreaddons libdbusmenu phonon
   ];
   propagatedBuildInputs = [ kwindowsystem qtx11extras ];
   meta = {

From b61cf1694262b2c44d9d26fa3333b04e53c95d72 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 21 Apr 2016 14:36:56 -0500
Subject: [PATCH 052/287] kde5_latest.libkscreen: remove patches

---
 pkgs/desktops/kde-5/plasma-5.6/default.nix                    | 2 +-
 .../plasma-5.6/{libkscreen/default.nix => libkscreen.nix}     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename pkgs/desktops/kde-5/plasma-5.6/{libkscreen/default.nix => libkscreen.nix} (83%)

diff --git a/pkgs/desktops/kde-5/plasma-5.6/default.nix b/pkgs/desktops/kde-5/plasma-5.6/default.nix
index a4f5c7c23204..89e822fe45f3 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/default.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/default.nix
@@ -69,7 +69,7 @@ let
     kwayland = callPackage ./kwayland.nix {};
     kwin = callPackage ./kwin {};
     kwrited = callPackage ./kwrited.nix {};
-    libkscreen = callPackage ./libkscreen {};
+    libkscreen = callPackage ./libkscreen.nix {};
     libksysguard = callPackage ./libksysguard {};
     milou = callPackage ./milou.nix {};
     oxygen = callPackage ./oxygen.nix {};
diff --git a/pkgs/desktops/kde-5/plasma-5.6/libkscreen/default.nix b/pkgs/desktops/kde-5/plasma-5.6/libkscreen.nix
similarity index 83%
rename from pkgs/desktops/kde-5/plasma-5.6/libkscreen/default.nix
rename to pkgs/desktops/kde-5/plasma-5.6/libkscreen.nix
index 9fccbd6834c3..eddedf969b0e 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/libkscreen/default.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/libkscreen.nix
@@ -1,6 +1,6 @@
 { plasmaPackage
 , extra-cmake-modules
-, libXrandr
+, kwayland, libXrandr
 , qtx11extras
 }:
 
@@ -10,7 +10,7 @@ plasmaPackage {
     extra-cmake-modules
   ];
   buildInputs = [
-    libXrandr
+    kwayland libXrandr
   ];
   propagatedBuildInputs = [
     qtx11extras

From 62945ebabad548d1b4605c0b4f02e8b8a101f27b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 21 Apr 2016 14:37:25 -0500
Subject: [PATCH 053/287] kde5_latest.libksysguard: remove patch now included
 upstream

---
 pkgs/desktops/kde-5/plasma-5.6/libksysguard/default.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/desktops/kde-5/plasma-5.6/libksysguard/default.nix b/pkgs/desktops/kde-5/plasma-5.6/libksysguard/default.nix
index 402b3ce3beee..9c352d76156f 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/libksysguard/default.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/libksysguard/default.nix
@@ -8,11 +8,6 @@ plasmaPackage {
   name = "libksysguard";
   patches = [
     ./0001-qdiriterator-follow-symlinks.patch
-    (fetchpatch { # should be included on update
-      name = "glibc-2.23-isnan.patch";
-      url = https://github.com/KDE/libksysguard/commit/b0578798eb3.patch;
-      sha256 = "1my5nqp58c5azyi265j261a10wh047zxakprrnpl85mlg7bwskdh";
-    })
   ];
   nativeBuildInputs = [
     extra-cmake-modules

From ffc217883c5c792f2876c22e2827d480ae12f6bb Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 21 Apr 2016 14:38:01 -0500
Subject: [PATCH 054/287] kde5_latest.plasma-workspace: remove patches

---
 pkgs/desktops/kde-5/plasma-5.6/default.nix    |   2 +-
 .../default.nix => plasma-workspace.nix}      |   4 +-
 .../plasma-workspace/qml-import-path.patch    | 104 -----
 .../kde-5/plasma-5.6/plasma-workspace/series  |   1 -
 .../plasma-workspace/startkde.patch           | 372 ------------------
 5 files changed, 2 insertions(+), 481 deletions(-)
 rename pkgs/desktops/kde-5/plasma-5.6/{plasma-workspace/default.nix => plasma-workspace.nix} (92%)
 delete mode 100644 pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/qml-import-path.patch
 delete mode 100644 pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/series
 delete mode 100644 pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/startkde.patch

diff --git a/pkgs/desktops/kde-5/plasma-5.6/default.nix b/pkgs/desktops/kde-5/plasma-5.6/default.nix
index 89e822fe45f3..587d2cb520aa 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/default.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/default.nix
@@ -77,7 +77,7 @@ let
     plasma-mediacenter = callPackage ./plasma-mediacenter.nix {};
     plasma-nm = callPackage ./plasma-nm {};
     plasma-pa = callPackage ./plasma-pa.nix {};
-    plasma-workspace = callPackage ./plasma-workspace {};
+    plasma-workspace = callPackage ./plasma-workspace.nix {};
     plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers.nix {};
     polkit-kde-agent = callPackage ./polkit-kde-agent.nix {};
     powerdevil = callPackage ./powerdevil.nix {};
diff --git a/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/default.nix b/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace.nix
similarity index 92%
rename from pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/default.nix
rename to pkgs/desktops/kde-5/plasma-5.6/plasma-workspace.nix
index 1a96c1eced2e..462378aae884 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/default.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace.nix
@@ -1,4 +1,4 @@
-{ plasmaPackage, lib, copyPathsToStore
+{ plasmaPackage, lib
 , extra-cmake-modules, kdoctools
 , baloo, kactivities, kcmutils, kcrash, kdbusaddons, kdeclarative
 , kdelibs4support, kdesu, kdewebkit, kglobalaccel, kidletime
@@ -29,8 +29,6 @@ plasmaPackage {
     plasma-framework qtquick1 qtquickcontrols qtx11extras solid
   ];
 
-  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
-
   postPatch = ''
     substituteInPlace startkde/kstartupconfig/kstartupconfig.cpp \
         --replace kdostartupconfig5 $out/bin/kdostartupconfig5
diff --git a/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/qml-import-path.patch b/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/qml-import-path.patch
deleted file mode 100644
index 1d34001be597..000000000000
--- a/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/qml-import-path.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-Index: plasma-workspace-5.5.1/applets/analog-clock/contents/ui/analogclock.qml
-===================================================================
---- plasma-workspace-5.5.1.orig/applets/analog-clock/contents/ui/analogclock.qml
-+++ plasma-workspace-5.5.1/applets/analog-clock/contents/ui/analogclock.qml
-@@ -25,7 +25,7 @@ import org.kde.plasma.calendar 2.0 as Pl
- import QtQuick.Layouts 1.1
- 
- import org.kde.plasma.core 2.0 as PlasmaCore
--import "logic.js" as Logic
-+import "../code/logic.js" as Logic
- 
- Item {
-     id: analogclock
-Index: plasma-workspace-5.5.1/applets/batterymonitor/package/contents/ui/BatteryItem.qml
-===================================================================
---- plasma-workspace-5.5.1.orig/applets/batterymonitor/package/contents/ui/BatteryItem.qml
-+++ plasma-workspace-5.5.1/applets/batterymonitor/package/contents/ui/BatteryItem.qml
-@@ -26,7 +26,7 @@ import org.kde.plasma.components 2.0 as
- import org.kde.plasma.extras 2.0 as PlasmaExtras
- import org.kde.plasma.workspace.components 2.0
- import org.kde.kcoreaddons 1.0 as KCoreAddons
--import "logic.js" as Logic
-+import "../code/logic.js" as Logic
- 
- Item {
-     id: batteryItem
-Index: plasma-workspace-5.5.1/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml
-===================================================================
---- plasma-workspace-5.5.1.orig/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml
-+++ plasma-workspace-5.5.1/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml
-@@ -24,7 +24,7 @@ import QtQuick.Layouts 1.1
- import org.kde.plasma.core 2.0 as PlasmaCore
- import org.kde.plasma.components 2.0 as Components
- import org.kde.plasma.workspace.components 2.0
--import "logic.js" as Logic
-+import "../code/logic.js" as Logic
- 
- MouseArea {
-     id: root
-Index: plasma-workspace-5.5.1/applets/batterymonitor/package/contents/ui/PopupDialog.qml
-===================================================================
---- plasma-workspace-5.5.1.orig/applets/batterymonitor/package/contents/ui/PopupDialog.qml
-+++ plasma-workspace-5.5.1/applets/batterymonitor/package/contents/ui/PopupDialog.qml
-@@ -23,7 +23,7 @@ import org.kde.plasma.core 2.0 as Plasma
- import org.kde.plasma.components 2.0 as Components
- import org.kde.plasma.extras 2.0 as PlasmaExtras
- import org.kde.kquickcontrolsaddons 2.0
--import "logic.js" as Logic
-+import "../code/logic.js" as Logic
- 
- FocusScope {
-     id: dialog
-Index: plasma-workspace-5.5.1/applets/batterymonitor/package/contents/ui/batterymonitor.qml
-===================================================================
---- plasma-workspace-5.5.1.orig/applets/batterymonitor/package/contents/ui/batterymonitor.qml
-+++ plasma-workspace-5.5.1/applets/batterymonitor/package/contents/ui/batterymonitor.qml
-@@ -25,7 +25,7 @@ import org.kde.plasma.plasmoid 2.0
- import org.kde.plasma.core 2.0 as PlasmaCore
- import org.kde.kcoreaddons 1.0 as KCoreAddons
- import org.kde.kquickcontrolsaddons 2.0
--import "logic.js" as Logic
-+import "../code/logic.js" as Logic
- 
- Item {
-     id: batterymonitor
-Index: plasma-workspace-5.5.1/applets/lock_logout/contents/ui/lockout.qml
-===================================================================
---- plasma-workspace-5.5.1.orig/applets/lock_logout/contents/ui/lockout.qml
-+++ plasma-workspace-5.5.1/applets/lock_logout/contents/ui/lockout.qml
-@@ -23,7 +23,7 @@ import org.kde.plasma.plasmoid 2.0
- import org.kde.plasma.core 2.0 as PlasmaCore
- import org.kde.plasma.components 2.0
- import org.kde.kquickcontrolsaddons 2.0
--import "data.js" as Data
-+import "../code/data.js" as Data
- 
- Flow {
-     id: lockout
-Index: plasma-workspace-5.5.1/applets/notifications/package/contents/ui/main.qml
-===================================================================
---- plasma-workspace-5.5.1.orig/applets/notifications/package/contents/ui/main.qml
-+++ plasma-workspace-5.5.1/applets/notifications/package/contents/ui/main.qml
-@@ -28,7 +28,7 @@ import org.kde.plasma.extras 2.0 as Plas
- 
- import org.kde.plasma.private.notifications 1.0
- 
--import "uiproperties.js" as UiProperties
-+import "../code/uiproperties.js" as UiProperties
- 
- MouseEventListener {
-     id: notificationsApplet
-Index: plasma-workspace-5.5.1/applets/systemtray/package/contents/ui/main.qml
-===================================================================
---- plasma-workspace-5.5.1.orig/applets/systemtray/package/contents/ui/main.qml
-+++ plasma-workspace-5.5.1/applets/systemtray/package/contents/ui/main.qml
-@@ -25,7 +25,7 @@ import org.kde.plasma.core 2.0 as Plasma
- // import org.kde.plasma.extras 2.0 as PlasmaExtras
- 
- import org.kde.private.systemtray 2.0 as SystemTray
--import "Layout.js" as LayoutManager
-+import "../code/Layout.js" as LayoutManager
- 
- Item {
-     id: root
diff --git a/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/series b/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/series
deleted file mode 100644
index b9081298bd69..000000000000
--- a/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/series
+++ /dev/null
@@ -1 +0,0 @@
-qml-import-path.patch
diff --git a/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/startkde.patch b/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/startkde.patch
deleted file mode 100644
index eea0ae4c199d..000000000000
--- a/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/startkde.patch
+++ /dev/null
@@ -1,372 +0,0 @@
-Index: plasma-workspace-5.5.5/startkde/startkde.cmake
-===================================================================
---- plasma-workspace-5.5.5.orig/startkde/startkde.cmake
-+++ plasma-workspace-5.5.5/startkde/startkde.cmake
-@@ -1,8 +1,36 @@
--#!/bin/sh
-+#!@bash@
- #
- #  DEFAULT KDE STARTUP SCRIPT ( @PROJECT_VERSION@ )
- #
- 
-+set -x
-+
-+# The KDE icon cache is supposed to update itself
-+# automatically, but it uses the timestamp on the icon
-+# theme directory as a trigger.  Since in Nix the
-+# timestamp is always the same, this doesn't work.  So as
-+# a workaround, nuke the icon cache on login.  This isn't
-+# perfect, since it may require logging out after
-+# installing new applications to update the cache.
-+# See http://lists-archives.org/kde-devel/26175-what-when-will-icon-cache-refresh.html
-+rm -fv $HOME/.cache/icon-cache.kcache
-+
-+# Qt writes a weird ‘libraryPath’ line to
-+# ~/.config/Trolltech.conf that causes the KDE plugin
-+# paths of previous KDE invocations to be searched.
-+# Obviously using mismatching KDE libraries is potentially
-+# disastrous, so here we nuke references to the Nix store
-+# in Trolltech.conf.  A better solution would be to stop
-+# Qt from doing this wackiness in the first place.
-+if [ -e $HOME/.config/Trolltech.conf ]; then
-+    @sed@ -e '/nix\\store\|nix\/store/ d' -i $HOME/.config/Trolltech.conf
-+fi
-+
-+# (NixOS) We run kbuildsycoca5 before starting the user session because things
-+# may be missing or moved if they have run nixos-rebuild and it may not be
-+# possible for them to start Konsole to run it manually!
-+@kbuildsycoca5@
-+
- if test "x$1" = x--failsafe; then
-     KDE_FAILSAFE=1 # General failsafe flag
-     KWIN_COMPOSE=N # Disable KWin's compositing
-@@ -17,29 +45,16 @@ trap 'echo GOT SIGHUP' HUP
- # we have to unset this for Darwin since it will screw up KDE's dynamic-loading
- unset DYLD_FORCE_FLAT_NAMESPACE
- 
--# in case we have been started with full pathname spec without being in PATH
--bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
--if [ -n "$bindir" ]; then
--  qbindir=`qtpaths --binaries-dir`
--  qdbus=$qbindir/qdbus
--  case $PATH in
--    $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
--    *) PATH=$bindir:$PATH; export PATH;;
--  esac
--else
--  qdbus=qdbus
--fi
--
- # Check if a KDE session already is running and whether it's possible to connect to X
--kcheckrunning
-+@kcheckrunning@
- kcheckrunning_result=$?
- if test $kcheckrunning_result -eq 0 ; then
--	echo "KDE seems to be already running on this display."
--	xmessage -geometry 500x100 "KDE seems to be already running on this display." > /dev/null 2>/dev/null
-+  echo "KDE seems to be already running on this display."
-+  @xmessage@ -geometry 500x100 "KDE seems to be already running on this display."
- 	exit 1
- elif test $kcheckrunning_result -eq 2 ; then
- 	echo "\$DISPLAY is not set or cannot connect to the X server."
--        exit 1
-+  exit 1
- fi
- 
- # Boot sequence:
-@@ -57,13 +72,8 @@ fi
- # * Then ksmserver is started which takes control of the rest of the startup sequence
- 
- # We need to create config folder so we can write startupconfigkeys
--if [  ${XDG_CONFIG_HOME} ]; then
--  configDir=$XDG_CONFIG_HOME;
--else
--  configDir=${HOME}/.config; #this is the default, http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
--fi
--
--mkdir -p $configDir
-+configDir=$(@qtpaths@ --writable-path GenericConfigLocation)
-+mkdir -p "$configDir"
- 
- #This is basically setting defaults so we can use them with kstartupconfig5
- cat >$configDir/startupconfigkeys <<EOF
-@@ -102,42 +112,10 @@ XftSubPixel=none
- EOF
- }
- 
--# Make sure the Oxygen font is installed
--# This is necessary for setups where CMAKE_INSTALL_PREFIX
--# is not in /usr. fontconfig looks in /usr, ~/.fonts and
--# $XDG_DATA_HOME for fonts. In this case, we symlink the
--# Oxygen font under ${XDG_DATA_HOME} and make it known to
--# fontconfig
--
--usr_share="/usr/share"
--install_share="@KDE_INSTALL_FULL_DATADIR@"
--
--if [ ! $install_share = $usr_share ]; then
--
--    if [ ${XDG_DATA_HOME} ]; then
--        fontsDir="${XDG_DATA_HOME}/fonts"
--    else
--        fontsDir="${HOME}/.fonts"
--    fi
--
--    test -d $fontsDir || {
--        mkdir -p $fontsDir
--    }
--
--    oxygenDir=$fontsDir/oxygen
--    prefixDir="@KDE_INSTALL_FULL_DATADIR@/fonts/oxygen"
--
--    # if the oxygen dir doesn't exist, create a symlink to be sure that the
--    # Oxygen font is available to the user
--    test -d $oxygenDir || test -d $prefixDir && {
--        test -h $oxygenDir || ln -s $prefixDir $oxygenDir && fc-cache $oxygenDir
--    }
--fi
--
--kstartupconfig5
-+@out@/bin/kstartupconfig5
- returncode=$?
- if test $returncode -ne 0; then
--    xmessage -geometry 500x100 "kstartupconfig5 does not exist or fails. The error code is $returncode. Check your installation."
-+    @xmessage@ -geometry 500x100 "kstartupconfig5 does not exist or fails. The error code is $returncode. Check your installation."
-     exit 1
- fi
- [ -r $configDir/startupconfig ] && . $configDir/startupconfig
-@@ -146,9 +124,11 @@ if test "$kdeglobals_kscreen_scalefactor
-     export QT_DEVICE_PIXEL_RATIO=$kdeglobals_kscreen_scalefactor
- fi
- 
-+XCURSOR_PATH=~/.icons:$(echo "$XDG_DATA_DIRS" | @tr@ ":" "\n" | @sed@ 's,$,/icons,g' | @tr@ "\n" ":")
-+export XCURSOR_PATH
-+
- # XCursor mouse theme needs to be applied here to work even for kded or ksmserver
- if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then
--    @EXPORT_XCURSOR_PATH@
- 
-     kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"
-     if test $? -eq 10; then
-@@ -164,21 +144,39 @@ if test -n "$kcminputrc_mouse_cursorthem
-     fi
- fi
- 
--if test "$kcmfonts_general_forcefontdpi" -ne 0; then
--    xrdb -quiet -merge -nocpp <<EOF
--Xft.dpi: $kcmfonts_general_forcefontdpi
--EOF
--fi
-+# Set a left cursor instead of the standard X11 "X" cursor, since I've heard
-+# from some users that they're confused and don't know what to do. This is
-+# especially necessary on slow machines, where starting KDE takes one or two
-+# minutes until anything appears on the screen.
-+#
-+# If the user has overwritten fonts, the cursor font may be different now
-+# so don't move this up.
-+#
-+@xsetroot@ -cursor_name left_ptr
- 
- dl=$DESKTOP_LOCKED
- unset DESKTOP_LOCKED # Don't want it in the environment
- 
-+# Make sure that D-Bus is running
-+# D-Bus autolaunch is broken
-+if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
-+    eval `@dbus-launch@ --sh-syntax --exit-with-session`
-+fi
-+if @qdbus@ >/dev/null 2>/dev/null; then
-+    : # ok
-+else
-+    echo 'startkde: Could not start D-Bus. Can you call qdbus?'  1>&2
-+    test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
-+    @xmessage@ -geometry 500x100 "Could not start D-Bus. Can you call qdbus?"
-+    exit 1
-+fi
-+
- ksplash_pid=
- if test -z "$dl"; then
-   # the splashscreen and progress indicator
-   case "$ksplashrc_ksplash_engine" in
-     KSplashQML)
--      ksplash_pid=`ksplashqml "${ksplashrc_ksplash_theme}" --pid`
-+      ksplash_pid=`@out@/bin/ksplashqml "${ksplashrc_ksplash_theme}" --pid`
-       ;;
-     None)
-       ;;
-@@ -201,8 +199,7 @@ fi
- # For anything else (that doesn't set env vars, or that needs a window manager),
- # better use the Autostart folder.
- 
--# TODO: Use GenericConfigLocation once we depend on Qt 5.4
--scriptpath=`qtpaths --paths ConfigLocation | tr ':' '\n' | sed 's,$,/plasma-workspace,g'`
-+scriptpath=$(@qtpaths@ --paths GenericConfigLocation | tr ':' '\n' | @sed@ 's,$,/plasma-workspace,g')
- 
- # Add /env/ to the directory to locate the scripts to be sourced
- for prefix in `echo $scriptpath`; do
-@@ -232,7 +229,7 @@ usr_odir=$HOME/.fonts/kde-override
- usr_fdir=$HOME/.fonts
- 
- if test -n "$KDEDIRS"; then
--  kdedirs_first=`echo "$KDEDIRS"|sed -e 's/:.*//'`
-+  kdedirs_first=`echo "$KDEDIRS" | @sed@ -e 's/:.*//'`
-   sys_odir=$kdedirs_first/share/fonts/override
-   sys_fdir=$kdedirs_first/share/fonts
- else
-@@ -245,23 +242,13 @@ fi
- # add the user's dirs to the font path, as they might simply have been made
- # read-only by the administrator, for whatever reason.
- 
--test -d "$sys_odir" && xset +fp "$sys_odir"
--test -d "$usr_odir" && (mkfontdir "$usr_odir" ; xset +fp "$usr_odir")
--test -d "$usr_fdir" && (mkfontdir "$usr_fdir" ; xset fp+ "$usr_fdir")
--test -d "$sys_fdir" && xset fp+ "$sys_fdir"
-+test -d "$sys_odir" && @xset@ +fp "$sys_odir"
-+test -d "$usr_odir" && ( @mkfontdir@ "$usr_odir" ; @xset@ +fp "$usr_odir" )
-+test -d "$usr_fdir" && ( @mkfontdir@ "$usr_fdir" ; @xset@ fp+ "$usr_fdir" )
-+test -d "$sys_fdir" && @xset@ fp+ "$sys_fdir"
- 
- # Ask X11 to rebuild its font list.
--xset fp rehash
--
--# Set a left cursor instead of the standard X11 "X" cursor, since I've heard
--# from some users that they're confused and don't know what to do. This is
--# especially necessary on slow machines, where starting KDE takes one or two
--# minutes until anything appears on the screen.
--#
--# If the user has overwritten fonts, the cursor font may be different now
--# so don't move this up.
--#
--xsetroot -cursor_name left_ptr
-+@xset@ fp rehash
- 
- # Get Ghostscript to look into user's KDE fonts dir for additional Fontmap
- if test -n "$GS_LIB" ; then
-@@ -274,26 +261,6 @@ fi
- 
- echo 'startkde: Starting up...'  1>&2
- 
--# Make sure that the KDE prefix is first in XDG_DATA_DIRS and that it's set at all.
--# The spec allows XDG_DATA_DIRS to be not set, but X session startup scripts tend
--# to set it to a list of paths *not* including the KDE prefix if it's not /usr or
--# /usr/local.
--if test -z "$XDG_DATA_DIRS"; then
--    XDG_DATA_DIRS="@CMAKE_INSTALL_PREFIX@/@SHARE_INSTALL_PREFIX@:/usr/share:/usr/local/share"
--fi
--export XDG_DATA_DIRS
--
--# Make sure that D-Bus is running
--if $qdbus >/dev/null 2>/dev/null; then
--    : # ok
--else
--    echo 'startkde: Could not start D-Bus. Can you call qdbus?'  1>&2
--    test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
--    xmessage -geometry 500x100 "Could not start D-Bus. Can you call qdbus?"
--    exit 1
--fi
--
--
- # Mark that full KDE session is running (e.g. Konqueror preloading works only
- # with full KDE running). The KDE_FULL_SESSION property can be detected by
- # any X client connected to the same X session, even if not launched
-@@ -318,11 +285,11 @@ fi
- #
- KDE_FULL_SESSION=true
- export KDE_FULL_SESSION
--xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true
-+@xprop@ -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true
- 
- KDE_SESSION_VERSION=5
- export KDE_SESSION_VERSION
--xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5
-+@xprop@ -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5
- 
- KDE_SESSION_UID=`id -ru`
- export KDE_SESSION_UID
-@@ -332,11 +299,11 @@ export XDG_CURRENT_DESKTOP
- 
- # At this point all the environment is ready, let's send it to kwalletd if running
- if test -n "$PAM_KWALLET_LOGIN" ; then
--    env | socat STDIN UNIX-CONNECT:$PAM_KWALLET_LOGIN
-+    env | @socat@ STDIN UNIX-CONNECT:$PAM_KWALLET_LOGIN
- fi
- # ...and also to kwalletd5
- if test -n "$PAM_KWALLET5_LOGIN" ; then
--    env | socat STDIN UNIX-CONNECT:$PAM_KWALLET5_LOGIN
-+    env | @socat@ STDIN UNIX-CONNECT:$PAM_KWALLET5_LOGIN
- fi
- 
- # At this point all environment variables are set, let's send it to the DBus session server to update the activation environment
-@@ -349,18 +316,18 @@ if test $? -ne 0; then
-   # Startup error
-   echo 'startkde: Could not sync environment to dbus.'  1>&2
-   test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
--  xmessage -geometry 500x100 "Could not sync environment to dbus."
-+  @xmessage@ -geometry 500x100 "Could not sync environment to dbus."
-   exit 1
- fi
- 
- # We set LD_BIND_NOW to increase the efficiency of kdeinit.
- # kdeinit unsets this variable before loading applications.
--LD_BIND_NOW=true @CMAKE_INSTALL_FULL_LIBEXECDIR_KF5@/start_kdeinit_wrapper --kded +kcminit_startup
-+LD_BIND_NOW=true @start_kdeinit_wrapper@ --kded +kcminit_startup
- if test $? -ne 0; then
-   # Startup error
-   echo 'startkde: Could not start kdeinit5. Check your installation.'  1>&2
-   test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
--  xmessage -geometry 500x100 "Could not start kdeinit5. Check your installation."
-+  @xmessage@ -geometry 500x100 "Could not start kdeinit5. Check your installation."
-   exit 1
- fi
- 
-@@ -379,27 +346,27 @@ test -n "$KDEWM" && KDEWM="--windowmanag
- # lock now and do the rest of the KDE startup underneath the locker.
- KSMSERVEROPTIONS=""
- test -n "$dl" && KSMSERVEROPTIONS=" --lockscreen"
--kwrapper5 @CMAKE_INSTALL_FULL_BINDIR@/ksmserver $KDEWM $KSMSERVEROPTIONS
-+@kwrapper5@ @CMAKE_INSTALL_FULL_BINDIR@/ksmserver $KDEWM $KSMSERVEROPTIONS
- if test $? -eq 255; then
-   # Startup error
-   echo 'startkde: Could not start ksmserver. Check your installation.'  1>&2
-   test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
--  xmessage -geometry 500x100 "Could not start ksmserver. Check your installation."
-+  @xmessage@ -geometry 500x100 "Could not start ksmserver. Check your installation."
- fi
- 
--wait_drkonqi=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true`
-+wait_drkonqi=`@kreadconfig5@ --file startkderc --group WaitForDrKonqi --key Enabled --default true`
- 
- if test x"$wait_drkonqi"x = x"true"x ; then
-     # wait for remaining drkonqi instances with timeout (in seconds)
--    wait_drkonqi_timeout=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900`
-+    wait_drkonqi_timeout=`@kreadconfig5@ --file startkderc --group WaitForDrKonqi --key Timeout --default 900`
-     wait_drkonqi_counter=0
--    while $qdbus | grep "^[^w]*org.kde.drkonqi" > /dev/null ; do
-+    while @qdbus@ | @grep@ "^[^w]*org.kde.drkonqi" > /dev/null ; do
-         sleep 5
-         wait_drkonqi_counter=$((wait_drkonqi_counter+5))
-         if test "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ; then
-             # ask remaining drkonqis to die in a graceful way
--            $qdbus | grep 'org.kde.drkonqi-' | while read address ; do
--                $qdbus "$address" "/MainApplication" "quit"
-+            @qdbus@ | @grep@ 'org.kde.drkonqi-' | while read address ; do
-+                @qdbus@ "$address" "/MainApplication" "quit"
-             done
-             break
-         fi
-@@ -411,12 +378,12 @@ echo 'startkde: Shutting down...'  1>&2
- test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
- 
- # Clean up
--kdeinit5_shutdown
-+@kdeinit5_shutdown@
- 
- unset KDE_FULL_SESSION
--xprop -root -remove KDE_FULL_SESSION
-+@xprop@ -root -remove KDE_FULL_SESSION
- unset KDE_SESSION_VERSION
--xprop -root -remove KDE_SESSION_VERSION
-+@xprop@ -root -remove KDE_SESSION_VERSION
- unset KDE_SESSION_UID
- 
- echo 'startkde: Done.'  1>&2

From 99c06657dfd220722dd3f70c3afcb23fc484f894 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 21 Apr 2016 15:43:22 -0500
Subject: [PATCH 055/287] kde5_latest.kdeplasma-addons: add plasma-workspace
 input

---
 pkgs/desktops/kde-5/plasma-5.6/kdeplasma-addons.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/kde-5/plasma-5.6/kdeplasma-addons.nix b/pkgs/desktops/kde-5/plasma-5.6/kdeplasma-addons.nix
index d6a96a3276d7..128cfe34d0d7 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/kdeplasma-addons.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/kdeplasma-addons.nix
@@ -1,7 +1,7 @@
 { plasmaPackage, extra-cmake-modules, kdoctools, ibus, kconfig
 , kconfigwidgets, kcoreaddons, kcmutils, kdelibs4support, ki18n
 , kio, knewstuff, kross, krunner, kservice, kunitconversion
-, plasma-framework, qtdeclarative, qtx11extras
+, plasma-framework, plasma-workspace, qtdeclarative, qtx11extras
 }:
 
 plasmaPackage {
@@ -15,7 +15,7 @@ plasmaPackage {
     knewstuff kservice kunitconversion
   ];
   propagatedBuildInputs = [
-    kdelibs4support kio kross krunner plasma-framework qtdeclarative
-    qtx11extras
+    kdelibs4support kio kross krunner plasma-framework plasma-workspace
+    qtdeclarative qtx11extras
   ];
 }

From 5896befee037fc570134cc75297a97fdad187fef Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 21 Apr 2016 15:59:20 -0500
Subject: [PATCH 056/287] nixos/kde5: install kactivitymanagerd

---
 .../modules/services/x11/desktop-managers/kde5.nix |  3 +++
 pkgs/desktops/kde-5/plasma-5.6/default.nix         |  1 +
 .../kde-5/plasma-5.6/kactivitymanagerd.nix         | 14 ++++++++++++++
 3 files changed, 18 insertions(+)
 create mode 100644 pkgs/desktops/kde-5/plasma-5.6/kactivitymanagerd.nix

diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix
index f5d9d8b8e0db..c81046ac4405 100644
--- a/nixos/modules/services/x11/desktop-managers/kde5.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde5.nix
@@ -111,6 +111,9 @@ in
       # Install Breeze icons if available
       ++ lib.optional (lib.hasAttr "breeze-icons" kde5) kde5.breeze-icons
 
+      # Install activity manager if available
+      ++ lib.optional (lib.hasAttr "kactivitymanagerd" kde5) kde5.kactivitymanagerd
+
       # Optional hardware support features
       ++ lib.optional config.hardware.bluetooth.enable kde5.bluedevil
       ++ lib.optional config.networking.networkmanager.enable kde5.plasma-nm
diff --git a/pkgs/desktops/kde-5/plasma-5.6/default.nix b/pkgs/desktops/kde-5/plasma-5.6/default.nix
index 587d2cb520aa..1b777678515f 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/default.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/default.nix
@@ -53,6 +53,7 @@ let
       in
         symlinkJoin "breeze-${version}"
         (map (pkg: pkg.out or pkg) [ breeze-gtk breeze-qt4 breeze-qt5 ]);
+    kactivitymanagerd = callPackage ./kactivitymanagerd.nix {};
     kde-cli-tools = callPackage ./kde-cli-tools.nix {};
     kde-gtk-config = callPackage ./kde-gtk-config {};
     kdecoration = callPackage ./kdecoration.nix {};
diff --git a/pkgs/desktops/kde-5/plasma-5.6/kactivitymanagerd.nix b/pkgs/desktops/kde-5/plasma-5.6/kactivitymanagerd.nix
new file mode 100644
index 000000000000..282e58ecf9e6
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma-5.6/kactivitymanagerd.nix
@@ -0,0 +1,14 @@
+{ plasmaPackage
+, extra-cmake-modules
+, boost, kconfig, kcoreaddons, kdbusaddons, ki18n, kio, kglobalaccel
+, kwindowsystem, kxmlgui
+}:
+
+plasmaPackage {
+  name = "kactivitymanagerd";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  propagatedBuildInputs = [
+    boost kconfig kcoreaddons kdbusaddons kglobalaccel ki18n kio kwindowsystem
+    kxmlgui
+  ];
+}

From 522ed7ce76cc081d31de155813cb66efaad4e1d8 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 22 Apr 2016 16:00:25 -0500
Subject: [PATCH 057/287] nixos/kde5: phonon-backend-gstreamer is not optional

---
 .../services/x11/desktop-managers/kde5.nix    | 32 ++++++++-----------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix
index c81046ac4405..f90f4dc856de 100644
--- a/nixos/modules/services/x11/desktop-managers/kde5.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde5.nix
@@ -102,6 +102,15 @@ in
         pkgs.hicolor_icon_theme
 
         kde5.kde-gtk-config
+
+        pkgs.phonon-backend-gstreamer
+        pkgs.kde5.phonon-backend-gstreamer
+        pkgs.gst_all_1.gstreamer
+        pkgs.gst_all_1.gst-plugins-base
+        pkgs.gst_all_1.gst-plugins-good
+        pkgs.gst_all_1.gst-plugins-ugly
+        pkgs.gst_all_1.gst-plugins-bad
+        pkgs.gst_all_1.gst-libav # for mp3 playback
       ]
 
       # Plasma 5.5 and later has a Breeze GTK theme.
@@ -120,19 +129,7 @@ in
       ++ lib.optional config.hardware.pulseaudio.enable kde5.plasma-pa
       ++ lib.optional config.powerManagement.enable kde5.powerdevil
       ++ lib.optional config.services.colord.enable kde5.colord-kde
-      ++ lib.optionals config.services.samba.enable [ kde5.kdenetwork-filesharing pkgs.samba ]
-
-      ++ lib.optionals cfg.phonon.gstreamer.enable
-        [
-          pkgs.phonon-backend-gstreamer
-          pkgs.kde5.phonon-backend-gstreamer
-          pkgs.gst_all_1.gstreamer
-          pkgs.gst_all_1.gst-plugins-base
-          pkgs.gst_all_1.gst-plugins-good
-          pkgs.gst_all_1.gst-plugins-ugly
-          pkgs.gst_all_1.gst-plugins-bad
-          pkgs.gst_all_1.gst-libav # for mp3 playback
-        ];
+      ++ lib.optionals config.services.samba.enable [ kde5.kdenetwork-filesharing pkgs.samba ];
 
     environment.pathsToLink = [ "/share" ];
 
@@ -141,12 +138,9 @@ in
       target = "X11/xkb";
     };
 
-    environment.profileRelativeEnvVars =
-      mkIf cfg.phonon.gstreamer.enable
-      {
-        GST_PLUGIN_SYSTEM_PATH = [ "/lib/gstreamer-0.10" ];
-        GST_PLUGIN_SYSTEM_PATH_1_0 = [ "/lib/gstreamer-1.0" ];
-      };
+    environment.profileRelativeEnvVars = {
+      GST_PLUGIN_SYSTEM_PATH_1_0 = [ "/lib/gstreamer-1.0" ];
+    };
 
     # Enable GTK applications to load SVG icons
     environment.variables = mkIf (lib.hasAttr "breeze-icons" kde5) {

From a2e40003a19de448bf0988f7c6a429a47b1fad56 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 23 Apr 2016 07:41:50 -0500
Subject: [PATCH 058/287] kde5_latest -> kde5

---
 .../desktops/kde-5/applications-15.12/ark.nix |   58 -
 .../applications-15.12/baloo-widgets.nix      |   35 -
 .../kde-5/applications-15.12/default.nix      |   59 -
 .../applications-15.12/dolphin-plugins.nix    |   31 -
 .../kde-5/applications-15.12/dolphin.nix      |   70 -
 .../kde-5/applications-15.12/fetchsrcs.sh     |   56 -
 .../kde-5/applications-15.12/ffmpegthumbs.nix |   21 -
 .../kde-5/applications-15.12/filelight.nix    |   35 -
 .../kde-5/applications-15.12/gpgmepp.nix      |   21 -
 .../kde-5/applications-15.12/gwenview.nix     |   44 -
 .../kde-5/applications-15.12/kate.nix         |   69 -
 .../kde-5/applications-15.12/kcalc.nix        |   39 -
 .../applications-15.12/kcolorchooser.nix      |   15 -
 .../kde-5/applications-15.12/kde-app.nix      |   25 -
 .../kde-5/applications-15.12/kde-locale-4.nix |   27 -
 .../kde-5/applications-15.12/kde-locale-5.nix |   24 -
 .../kdegraphics-thumbnailers.nix              |   23 -
 .../0001-old-kde4-cmake-policies.patch        |   56 -
 .../kdelibs/0002-polkit-install-path.patch    |   25 -
 .../kdelibs/0003-remove_xdg_impurities.patch  |   47 -
 .../applications-15.12/kdelibs/default.nix    |   45 -
 .../applications-15.12/kdelibs/setup-hook.sh  |   10 -
 .../kdenetwork-filesharing.nix                |   29 -
 .../kde-5/applications-15.12/kgpg.nix         |   38 -
 .../kde-5/applications-15.12/kio-extras.nix   |   58 -
 .../kde-5/applications-15.12/konsole.nix      |   68 -
 .../kde-5/applications-15.12/l10n.nix         |  244 ---
 .../kde-5/applications-15.12/libkdcraw.nix    |   19 -
 .../kde-5/applications-15.12/libkexiv2.nix    |   19 -
 .../kde-5/applications-15.12/libkipi.nix      |   22 -
 .../kde-5/applications-15.12/okular.nix       |   41 -
 .../applications-15.12/print-manager.nix      |   47 -
 .../kde-5/applications-15.12/spectacle.nix    |   46 -
 .../kde-5/applications-15.12/srcs.nix         | 1933 -----------------
 .../desktops/kde-5/frameworks-5.19/attica.nix |   11 -
 pkgs/desktops/kde-5/frameworks-5.19/baloo.nix |   25 -
 .../kde-5/frameworks-5.19/bluez-qt.nix        |   17 -
 .../kde-5/frameworks-5.19/breeze-icons.nix    |   10 -
 .../kde-5/frameworks-5.19/default.nix         |  120 -
 .../extra-cmake-modules/default.nix           |   20 -
 .../extra-cmake-modules/nix-lib-path.patch    |   37 -
 .../extra-cmake-modules/series                |    1 -
 .../extra-cmake-modules/setup-hook.sh         |   80 -
 .../kde-5/frameworks-5.19/fetchsrcs.sh        |   57 -
 .../frameworks-5.19/frameworkintegration.nix  |   17 -
 .../kde-5/frameworks-5.19/kactivities.nix     |   22 -
 .../kde-5/frameworks-5.19/kapidox.nix         |   12 -
 .../kde-5/frameworks-5.19/karchive.nix        |   11 -
 .../kauth/cmake-install-paths.patch           |   17 -
 .../kde-5/frameworks-5.19/kauth/default.nix   |   16 -
 .../kauth/kauth-policy-install.patch          |   13 -
 .../kde-5/frameworks-5.19/kauth/series        |    1 -
 .../kde-5/frameworks-5.19/kbookmarks.nix      |   25 -
 .../0001-qdiriterator-follow-symlinks.patch   |   25 -
 .../frameworks-5.19/kcmutils/default.nix      |   17 -
 .../kde-5/frameworks-5.19/kcodecs.nix         |   11 -
 .../kde-5/frameworks-5.19/kcompletion.nix     |   14 -
 .../kde-5/frameworks-5.19/kconfig.nix         |   16 -
 .../0001-qdiriterator-follow-symlinks.patch   |   25 -
 .../kconfigwidgets/default.nix                |   18 -
 .../kde-5/frameworks-5.19/kcoreaddons.nix     |   16 -
 .../desktops/kde-5/frameworks-5.19/kcrash.nix |   16 -
 .../kde-5/frameworks-5.19/kdbusaddons.nix     |   17 -
 .../kde-5/frameworks-5.19/kdeclarative.nix    |   22 -
 pkgs/desktops/kde-5/frameworks-5.19/kded.nix  |   19 -
 .../kde-5/frameworks-5.19/kdelibs4support.nix |   32 -
 .../kdelibs4support/default.nix               |   36 -
 .../kdelibs4support/nix-kde-include-dir.patch |   13 -
 .../frameworks-5.19/kdelibs4support/series    |    1 -
 .../kdelibs4support/setup-hook.sh             |    1 -
 .../kde-5/frameworks-5.19/kdesignerplugin.nix |   34 -
 pkgs/desktops/kde-5/frameworks-5.19/kdesu.nix |   13 -
 .../kde-5/frameworks-5.19/kdewebkit.nix       |   13 -
 .../desktops/kde-5/frameworks-5.19/kdnssd.nix |   13 -
 .../frameworks-5.19/kdoctools/default.nix     |   19 -
 .../kdoctools-no-find-docbook-xml.patch       |   12 -
 .../frameworks-5.19/kdoctools/setup-hook.sh   |    5 -
 .../kde-5/frameworks-5.19/kemoticons.nix      |   17 -
 .../kde-5/frameworks-5.19/kfilemetadata.nix   |   13 -
 .../kfilemetadata/cmake-install-paths.patch   |   13 -
 .../frameworks-5.19/kfilemetadata/default.nix |   14 -
 .../frameworks-5.19/kfilemetadata/series      |    1 -
 .../kde-5/frameworks-5.19/kglobalaccel.nix    |   23 -
 .../kde-5/frameworks-5.19/kguiaddons.nix      |   13 -
 pkgs/desktops/kde-5/frameworks-5.19/khtml.nix |   21 -
 pkgs/desktops/kde-5/frameworks-5.19/ki18n.nix |   17 -
 .../kiconthemes/default-theme-breeze.patch    |   13 -
 .../frameworks-5.19/kiconthemes/default.nix   |   18 -
 .../kde-5/frameworks-5.19/kiconthemes/series  |    1 -
 .../kde-5/frameworks-5.19/kidletime.nix       |   15 -
 .../kde-5/frameworks-5.19/kimageformats.nix   |   13 -
 .../kde-5/frameworks-5.19/kinit/default.nix   |   17 -
 .../frameworks-5.19/kinit/kinit-libpath.patch |   31 -
 .../kde-5/frameworks-5.19/kinit/series        |    1 -
 .../kde-5/frameworks-5.19/kio/default.nix     |   33 -
 .../kio/samba-search-path.patch               |   28 -
 .../desktops/kde-5/frameworks-5.19/kio/series |    1 -
 .../kde-5/frameworks-5.19/kitemmodels.nix     |   11 -
 .../kde-5/frameworks-5.19/kitemviews.nix      |   11 -
 .../kde-5/frameworks-5.19/kjobwidgets.nix     |   16 -
 pkgs/desktops/kde-5/frameworks-5.19/kjs.nix   |   16 -
 .../kde-5/frameworks-5.19/kjsembed.nix        |   17 -
 .../kde-5/frameworks-5.19/kmediaplayer.nix    |   15 -
 .../kde-5/frameworks-5.19/knewstuff.nix       |   17 -
 .../kde-5/frameworks-5.19/knotifications.nix  |   21 -
 .../kde-5/frameworks-5.19/knotifyconfig.nix   |   13 -
 .../kpackage/allow-external-paths.patch       |   13 -
 .../frameworks-5.19/kpackage/default.nix      |   23 -
 .../qdiriterator-follow-symlinks.patch        |   26 -
 .../kde-5/frameworks-5.19/kpackage/series     |    2 -
 .../desktops/kde-5/frameworks-5.19/kparts.nix |   17 -
 .../kde-5/frameworks-5.19/kpeople.nix         |   15 -
 .../kde-5/frameworks-5.19/kplotting.nix       |   11 -
 pkgs/desktops/kde-5/frameworks-5.19/kpty.nix  |   10 -
 pkgs/desktops/kde-5/frameworks-5.19/kross.nix |   14 -
 .../kde-5/frameworks-5.19/krunner.nix         |   16 -
 .../0001-qdiriterator-follow-symlinks.patch   |   25 -
 .../kservice/0002-no-canonicalize-path.patch  |   25 -
 .../frameworks-5.19/kservice/default.nix      |   18 -
 .../frameworks-5.19/kservice/setup-hook.sh    |   43 -
 .../frameworks-5.19/ktexteditor/default.nix   |   22 -
 .../ktexteditor/no-qcoreapplication.patch     |   36 -
 .../kde-5/frameworks-5.19/ktexteditor/series  |    1 -
 .../kde-5/frameworks-5.19/ktextwidgets.nix    |   16 -
 .../kde-5/frameworks-5.19/kunitconversion.nix |   10 -
 .../kde-5/frameworks-5.19/kwallet.nix         |   21 -
 .../kde-5/frameworks-5.19/kwidgetsaddons.nix  |   11 -
 .../kde-5/frameworks-5.19/kwindowsystem.nix   |   13 -
 .../kde-5/frameworks-5.19/kxmlgui.nix         |   18 -
 .../kde-5/frameworks-5.19/kxmlrpcclient.nix   |   10 -
 .../kde-5/frameworks-5.19/modemmanager-qt.nix |   13 -
 .../frameworks-5.19/networkmanager-qt.nix     |   13 -
 .../kde-5/frameworks-5.19/oxygen-icons5.nix   |   13 -
 .../plasma-framework/default.nix              |   25 -
 pkgs/desktops/kde-5/frameworks-5.19/solid.nix |   17 -
 .../desktops/kde-5/frameworks-5.19/sonnet.nix |   13 -
 pkgs/desktops/kde-5/frameworks-5.19/srcs.nix  |  565 -----
 .../kde-5/frameworks-5.19/threadweaver.nix    |   11 -
 pkgs/desktops/kde-5/plasma-5.5/bluedevil.nix  |   26 -
 pkgs/desktops/kde-5/plasma-5.5/breeze-gtk.nix |    8 -
 pkgs/desktops/kde-5/plasma-5.5/breeze-qt4.nix |   29 -
 pkgs/desktops/kde-5/plasma-5.5/breeze-qt5.nix |   23 -
 pkgs/desktops/kde-5/plasma-5.5/default.nix    |   88 -
 pkgs/desktops/kde-5/plasma-5.5/fetchsrcs.sh   |   57 -
 .../kde-5/plasma-5.5/kde-cli-tools.nix        |   27 -
 .../kde-gtk-config/0001-follow-symlinks.patch |   39 -
 .../plasma-5.5/kde-gtk-config/default.nix     |   28 -
 .../desktops/kde-5/plasma-5.5/kdecoration.nix |    6 -
 .../kde-5/plasma-5.5/kdeplasma-addons.nix     |   21 -
 pkgs/desktops/kde-5/plasma-5.5/kgamma5.nix    |    9 -
 .../desktops/kde-5/plasma-5.5/khelpcenter.nix |   20 -
 pkgs/desktops/kde-5/plasma-5.5/khotkeys.nix   |   16 -
 .../desktops/kde-5/plasma-5.5/kinfocenter.nix |   24 -
 pkgs/desktops/kde-5/plasma-5.5/kmenuedit.nix  |   19 -
 pkgs/desktops/kde-5/plasma-5.5/kscreen.nix    |   29 -
 .../kde-5/plasma-5.5/kscreenlocker.nix        |   19 -
 .../desktops/kde-5/plasma-5.5/ksshaskpass.nix |   13 -
 pkgs/desktops/kde-5/plasma-5.5/ksysguard.nix  |   20 -
 pkgs/desktops/kde-5/plasma-5.5/kwayland.nix   |   14 -
 .../0001-qdiriterator-follow-symlinks.patch   |   25 -
 .../kde-5/plasma-5.5/kwin/default.nix         |   34 -
 pkgs/desktops/kde-5/plasma-5.5/kwrited.nix    |   10 -
 .../kde-5/plasma-5.5/libkscreen/default.nix   |   18 -
 .../0001-qdiriterator-follow-symlinks.patch   |   25 -
 .../kde-5/plasma-5.5/libksysguard/default.nix |   28 -
 pkgs/desktops/kde-5/plasma-5.5/milou.nix      |   17 -
 pkgs/desktops/kde-5/plasma-5.5/oxygen.nix     |   20 -
 .../0001-qt-5.5-QML-import-paths.patch        |   67 -
 .../plasma-desktop/0002-hwclock.patch         |   36 -
 .../plasma-desktop/0003-tzdir.patch           |   30 -
 .../plasma-5.5/plasma-desktop/default.nix     |   86 -
 .../kde-5/plasma-5.5/plasma-mediacenter.nix   |   20 -
 ...-mobile-broadband-provider-info-path.patch |   25 -
 .../kde-5/plasma-5.5/plasma-nm/default.nix    |   36 -
 pkgs/desktops/kde-5/plasma-5.5/plasma-pa.nix  |   18 -
 .../plasma-workspace-wallpapers.nix           |   10 -
 .../plasma-5.5/plasma-workspace/default.nix   |   45 -
 .../plasma-workspace/qml-import-path.patch    |  104 -
 .../kde-5/plasma-5.5/plasma-workspace/series  |    1 -
 .../plasma-workspace/startkde.patch           |  372 ----
 .../kde-5/plasma-5.5/polkit-kde-agent.nix     |   31 -
 pkgs/desktops/kde-5/plasma-5.5/powerdevil.nix |   20 -
 pkgs/desktops/kde-5/plasma-5.5/setup-hook.sh  |    1 -
 pkgs/desktops/kde-5/plasma-5.5/srcs.nix       |  309 ---
 .../kde-5/plasma-5.5/startkde/default.nix     |   32 -
 .../kde-5/plasma-5.5/startkde/startkde.sh     |  334 ---
 .../kde-5/plasma-5.5/systemsettings.nix       |   21 -
 pkgs/top-level/all-packages.nix               |   16 -
 188 files changed, 8171 deletions(-)
 delete mode 100644 pkgs/desktops/kde-5/applications-15.12/ark.nix
 delete mode 100644 pkgs/desktops/kde-5/applications-15.12/baloo-widgets.nix
 delete mode 100644 pkgs/desktops/kde-5/applications-15.12/default.nix
 delete mode 100644 pkgs/desktops/kde-5/applications-15.12/dolphin-plugins.nix
 delete mode 100644 pkgs/desktops/kde-5/applications-15.12/dolphin.nix
 delete mode 100755 pkgs/desktops/kde-5/applications-15.12/fetchsrcs.sh
 delete mode 100644 pkgs/desktops/kde-5/applications-15.12/ffmpegthumbs.nix
 delete mode 100644 pkgs/desktops/kde-5/applications-15.12/filelight.nix
 delete mode 100644 pkgs/desktops/kde-5/applications-15.12/gpgmepp.nix
 delete mode 100644 pkgs/desktops/kde-5/applications-15.12/gwenview.nix
 delete mode 100644 pkgs/desktops/kde-5/applications-15.12/kate.nix
 delete mode 100644 pkgs/desktops/kde-5/applications-15.12/kcalc.nix
 delete mode 100644 pkgs/desktops/kde-5/applications-15.12/kcolorchooser.nix
 delete mode 100644 pkgs/desktops/kde-5/applications-15.12/kde-app.nix
 delete mode 100644 pkgs/desktops/kde-5/applications-15.12/kde-locale-4.nix
 delete mode 100644 pkgs/desktops/kde-5/applications-15.12/kde-locale-5.nix
 delete mode 100644 pkgs/desktops/kde-5/applications-15.12/kdegraphics-thumbnailers.nix
 delete mode 100644 pkgs/desktops/kde-5/applications-15.12/kdelibs/0001-old-kde4-cmake-policies.patch
 delete mode 100644 pkgs/desktops/kde-5/applications-15.12/kdelibs/0002-polkit-install-path.patch
 delete mode 100644 pkgs/desktops/kde-5/applications-15.12/kdelibs/0003-remove_xdg_impurities.patch
 delete mode 100644 pkgs/desktops/kde-5/applications-15.12/kdelibs/default.nix
 delete mode 100644 pkgs/desktops/kde-5/applications-15.12/kdelibs/setup-hook.sh
 delete mode 100644 pkgs/desktops/kde-5/applications-15.12/kdenetwork-filesharing.nix
 delete mode 100644 pkgs/desktops/kde-5/applications-15.12/kgpg.nix
 delete mode 100644 pkgs/desktops/kde-5/applications-15.12/kio-extras.nix
 delete mode 100644 pkgs/desktops/kde-5/applications-15.12/konsole.nix
 delete mode 100644 pkgs/desktops/kde-5/applications-15.12/l10n.nix
 delete mode 100644 pkgs/desktops/kde-5/applications-15.12/libkdcraw.nix
 delete mode 100644 pkgs/desktops/kde-5/applications-15.12/libkexiv2.nix
 delete mode 100644 pkgs/desktops/kde-5/applications-15.12/libkipi.nix
 delete mode 100644 pkgs/desktops/kde-5/applications-15.12/okular.nix
 delete mode 100644 pkgs/desktops/kde-5/applications-15.12/print-manager.nix
 delete mode 100644 pkgs/desktops/kde-5/applications-15.12/spectacle.nix
 delete mode 100644 pkgs/desktops/kde-5/applications-15.12/srcs.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/attica.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/baloo.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/bluez-qt.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/breeze-icons.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/default.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/default.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/nix-lib-path.patch
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/series
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/setup-hook.sh
 delete mode 100755 pkgs/desktops/kde-5/frameworks-5.19/fetchsrcs.sh
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/frameworkintegration.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kactivities.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kapidox.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/karchive.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kauth/cmake-install-paths.patch
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kauth/default.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kauth/kauth-policy-install.patch
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kauth/series
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kbookmarks.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kcmutils/0001-qdiriterator-follow-symlinks.patch
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kcmutils/default.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kcodecs.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kcompletion.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kconfig.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kconfigwidgets/default.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kcoreaddons.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kcrash.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kdbusaddons.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kdeclarative.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kded.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support/default.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support/nix-kde-include-dir.patch
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support/series
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support/setup-hook.sh
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kdesignerplugin.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kdesu.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kdewebkit.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kdnssd.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kdoctools/default.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kdoctools/kdoctools-no-find-docbook-xml.patch
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kdoctools/setup-hook.sh
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kemoticons.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kfilemetadata.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kfilemetadata/cmake-install-paths.patch
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kfilemetadata/default.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kfilemetadata/series
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kglobalaccel.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kguiaddons.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/khtml.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/ki18n.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kiconthemes/default-theme-breeze.patch
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kiconthemes/default.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kiconthemes/series
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kidletime.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kimageformats.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kinit/default.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kinit/kinit-libpath.patch
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kinit/series
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kio/default.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kio/samba-search-path.patch
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kio/series
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kitemmodels.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kitemviews.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kjobwidgets.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kjs.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kjsembed.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kmediaplayer.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/knewstuff.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/knotifications.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/knotifyconfig.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kpackage/allow-external-paths.patch
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kpackage/default.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kpackage/qdiriterator-follow-symlinks.patch
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kpackage/series
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kparts.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kpeople.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kplotting.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kpty.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kross.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/krunner.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kservice/0001-qdiriterator-follow-symlinks.patch
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kservice/0002-no-canonicalize-path.patch
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kservice/default.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kservice/setup-hook.sh
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/ktexteditor/default.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/ktexteditor/no-qcoreapplication.patch
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/ktexteditor/series
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/ktextwidgets.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kunitconversion.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kwallet.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kwidgetsaddons.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kwindowsystem.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kxmlgui.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/kxmlrpcclient.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/modemmanager-qt.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/networkmanager-qt.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/oxygen-icons5.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/plasma-framework/default.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/solid.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/sonnet.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/srcs.nix
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/threadweaver.nix
 delete mode 100644 pkgs/desktops/kde-5/plasma-5.5/bluedevil.nix
 delete mode 100644 pkgs/desktops/kde-5/plasma-5.5/breeze-gtk.nix
 delete mode 100644 pkgs/desktops/kde-5/plasma-5.5/breeze-qt4.nix
 delete mode 100644 pkgs/desktops/kde-5/plasma-5.5/breeze-qt5.nix
 delete mode 100644 pkgs/desktops/kde-5/plasma-5.5/default.nix
 delete mode 100755 pkgs/desktops/kde-5/plasma-5.5/fetchsrcs.sh
 delete mode 100644 pkgs/desktops/kde-5/plasma-5.5/kde-cli-tools.nix
 delete mode 100644 pkgs/desktops/kde-5/plasma-5.5/kde-gtk-config/0001-follow-symlinks.patch
 delete mode 100644 pkgs/desktops/kde-5/plasma-5.5/kde-gtk-config/default.nix
 delete mode 100644 pkgs/desktops/kde-5/plasma-5.5/kdecoration.nix
 delete mode 100644 pkgs/desktops/kde-5/plasma-5.5/kdeplasma-addons.nix
 delete mode 100644 pkgs/desktops/kde-5/plasma-5.5/kgamma5.nix
 delete mode 100644 pkgs/desktops/kde-5/plasma-5.5/khelpcenter.nix
 delete mode 100644 pkgs/desktops/kde-5/plasma-5.5/khotkeys.nix
 delete mode 100644 pkgs/desktops/kde-5/plasma-5.5/kinfocenter.nix
 delete mode 100644 pkgs/desktops/kde-5/plasma-5.5/kmenuedit.nix
 delete mode 100644 pkgs/desktops/kde-5/plasma-5.5/kscreen.nix
 delete mode 100644 pkgs/desktops/kde-5/plasma-5.5/kscreenlocker.nix
 delete mode 100644 pkgs/desktops/kde-5/plasma-5.5/ksshaskpass.nix
 delete mode 100644 pkgs/desktops/kde-5/plasma-5.5/ksysguard.nix
 delete mode 100644 pkgs/desktops/kde-5/plasma-5.5/kwayland.nix
 delete mode 100644 pkgs/desktops/kde-5/plasma-5.5/kwin/0001-qdiriterator-follow-symlinks.patch
 delete mode 100644 pkgs/desktops/kde-5/plasma-5.5/kwin/default.nix
 delete mode 100644 pkgs/desktops/kde-5/plasma-5.5/kwrited.nix
 delete mode 100644 pkgs/desktops/kde-5/plasma-5.5/libkscreen/default.nix
 delete mode 100644 pkgs/desktops/kde-5/plasma-5.5/libksysguard/0001-qdiriterator-follow-symlinks.patch
 delete mode 100644 pkgs/desktops/kde-5/plasma-5.5/libksysguard/default.nix
 delete mode 100644 pkgs/desktops/kde-5/plasma-5.5/milou.nix
 delete mode 100644 pkgs/desktops/kde-5/plasma-5.5/oxygen.nix
 delete mode 100644 pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/0001-qt-5.5-QML-import-paths.patch
 delete mode 100644 pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/0002-hwclock.patch
 delete mode 100644 pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/0003-tzdir.patch
 delete mode 100644 pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/default.nix
 delete mode 100644 pkgs/desktops/kde-5/plasma-5.5/plasma-mediacenter.nix
 delete mode 100644 pkgs/desktops/kde-5/plasma-5.5/plasma-nm/0001-mobile-broadband-provider-info-path.patch
 delete mode 100644 pkgs/desktops/kde-5/plasma-5.5/plasma-nm/default.nix
 delete mode 100644 pkgs/desktops/kde-5/plasma-5.5/plasma-pa.nix
 delete mode 100644 pkgs/desktops/kde-5/plasma-5.5/plasma-workspace-wallpapers.nix
 delete mode 100644 pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/default.nix
 delete mode 100644 pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/qml-import-path.patch
 delete mode 100644 pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/series
 delete mode 100644 pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/startkde.patch
 delete mode 100644 pkgs/desktops/kde-5/plasma-5.5/polkit-kde-agent.nix
 delete mode 100644 pkgs/desktops/kde-5/plasma-5.5/powerdevil.nix
 delete mode 100644 pkgs/desktops/kde-5/plasma-5.5/setup-hook.sh
 delete mode 100644 pkgs/desktops/kde-5/plasma-5.5/srcs.nix
 delete mode 100644 pkgs/desktops/kde-5/plasma-5.5/startkde/default.nix
 delete mode 100755 pkgs/desktops/kde-5/plasma-5.5/startkde/startkde.sh
 delete mode 100644 pkgs/desktops/kde-5/plasma-5.5/systemsettings.nix

diff --git a/pkgs/desktops/kde-5/applications-15.12/ark.nix b/pkgs/desktops/kde-5/applications-15.12/ark.nix
deleted file mode 100644
index 9e6f414db9e2..000000000000
--- a/pkgs/desktops/kde-5/applications-15.12/ark.nix
+++ /dev/null
@@ -1,58 +0,0 @@
-{ kdeApp
-, lib
-, extra-cmake-modules
-, kdoctools
-, karchive
-, kconfig
-, kcrash
-, kdbusaddons
-, ki18n
-, kiconthemes
-, khtml
-, kio
-, kservice
-, kpty
-, kwidgetsaddons
-, libarchive
-, p7zip
-, unrar
-, unzipNLS
-, zip
-}:
-
-let PATH = lib.makeBinPath [
-      p7zip unrar unzipNLS zip
-    ];
-in
-
-kdeApp {
-  name = "ark";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    karchive
-    kconfig
-    kcrash
-    kdbusaddons
-    kiconthemes
-    kservice
-    kpty
-    kwidgetsaddons
-    libarchive
-  ];
-  propagatedBuildInputs = [
-    khtml
-    ki18n
-    kio
-  ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/ark" \
-        --prefix PATH : "${PATH}"
-  '';
-  meta = {
-    license = with lib.licenses; [ gpl2 lgpl3 ];
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/applications-15.12/baloo-widgets.nix b/pkgs/desktops/kde-5/applications-15.12/baloo-widgets.nix
deleted file mode 100644
index a24928160df1..000000000000
--- a/pkgs/desktops/kde-5/applications-15.12/baloo-widgets.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ kdeApp
-, lib
-, extra-cmake-modules
-, kdoctools
-, kconfig
-, kio
-, ki18n
-, kservice
-, kfilemetadata
-, baloo
-, kdelibs4support
-}:
-
-kdeApp {
-  name = "baloo-widgets";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    kconfig
-    kservice
-  ];
-  propagatedBuildInputs = [
-    baloo
-    kdelibs4support
-    kfilemetadata
-    ki18n
-    kio
-  ];
-  meta = {
-    license = [ lib.licenses.lgpl21 ];
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/applications-15.12/default.nix b/pkgs/desktops/kde-5/applications-15.12/default.nix
deleted file mode 100644
index f9d65ac6d87d..000000000000
--- a/pkgs/desktops/kde-5/applications-15.12/default.nix
+++ /dev/null
@@ -1,59 +0,0 @@
-# Maintainer's Notes:
-#
-# Minor updates:
-#  1. Edit ./manifest.sh to point to the updated URL. Upstream sometimes
-#     releases updates that include only the changed packages; in this case,
-#     multiple URLs can be provided and the results will be merged.
-#  2. Run ./manifest.sh and ./dependencies.sh.
-#  3. Build and enjoy.
-#
-# Major updates:
-#  We prefer not to immediately overwrite older versions with major updates, so
-#  make a copy of this directory first. After copying, be sure to delete ./tmp
-#  if it exists. Then follow the minor update instructions.
-
-{ pkgs, debug ? false }:
-
-let
-
-  inherit (pkgs) lib stdenv;
-
-  srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; };
-  mirror = "mirror://kde";
-
-  packages = self: with self; {
-
-    kdeApp = import ./kde-app.nix {
-      inherit stdenv lib;
-      inherit debug srcs;
-    };
-
-    kdelibs = callPackage ./kdelibs { inherit (pkgs) attica phonon; };
-
-    ark = callPackage ./ark.nix {};
-    baloo-widgets = callPackage ./baloo-widgets.nix {};
-    dolphin = callPackage ./dolphin.nix {};
-    dolphin-plugins = callPackage ./dolphin-plugins.nix {};
-    ffmpegthumbs = callPackage ./ffmpegthumbs.nix {};
-    filelight = callPackage ./filelight.nix {};
-    gpgmepp = callPackage ./gpgmepp.nix {};
-    gwenview = callPackage ./gwenview.nix {};
-    kate = callPackage ./kate.nix {};
-    kcalc = callPackage ./kcalc.nix {};
-    kcolorchooser = callPackage ./kcolorchooser.nix {};
-    kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {};
-    kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {};
-    kgpg = callPackage ./kgpg.nix { inherit (pkgs.kde4) kdepimlibs; };
-    kio-extras = callPackage ./kio-extras.nix {};
-    konsole = callPackage ./konsole.nix {};
-    libkdcraw = callPackage ./libkdcraw.nix {};
-    libkexiv2 = callPackage ./libkexiv2.nix {};
-    libkipi = callPackage ./libkipi.nix {};
-    okular = callPackage ./okular.nix {};
-    print-manager = callPackage ./print-manager.nix {};
-    spectacle = callPackage ./spectacle.nix {};
-
-    l10n = pkgs.recurseIntoAttrs (import ./l10n.nix { inherit callPackage lib pkgs; });
-  };
-
-in packages
diff --git a/pkgs/desktops/kde-5/applications-15.12/dolphin-plugins.nix b/pkgs/desktops/kde-5/applications-15.12/dolphin-plugins.nix
deleted file mode 100644
index 72a08c732614..000000000000
--- a/pkgs/desktops/kde-5/applications-15.12/dolphin-plugins.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ kdeApp
-, lib
-, extra-cmake-modules
-, kdoctools
-, kxmlgui
-, ki18n
-, kio
-, kdelibs4support
-, dolphin
-}:
-
-kdeApp {
-  name = "dolphin-plugins";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    kxmlgui
-    dolphin
-  ];
-  propagatedBuildInputs = [
-    kdelibs4support
-    ki18n
-    kio
-  ];
-  meta = {
-    license = [ lib.licenses.gpl2 ];
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/applications-15.12/dolphin.nix b/pkgs/desktops/kde-5/applications-15.12/dolphin.nix
deleted file mode 100644
index 3218146f510e..000000000000
--- a/pkgs/desktops/kde-5/applications-15.12/dolphin.nix
+++ /dev/null
@@ -1,70 +0,0 @@
-{ kdeApp
-, lib
-, extra-cmake-modules
-, kdoctools
-, makeQtWrapper
-, kinit
-, kcmutils
-, kcoreaddons
-, knewstuff
-, ki18n
-, kdbusaddons
-, kbookmarks
-, kconfig
-, kio
-, kparts
-, solid
-, kiconthemes
-, kcompletion
-, ktexteditor
-, kwindowsystem
-, knotifications
-, kactivities
-, phonon
-, baloo
-, baloo-widgets
-, kfilemetadata
-, kdelibs4support
-}:
-
-kdeApp {
-  name = "dolphin";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-    makeQtWrapper
-  ];
-  buildInputs = [
-    kinit
-    kcmutils
-    kcoreaddons
-    knewstuff
-    kdbusaddons
-    kbookmarks
-    kconfig
-    kparts
-    solid
-    kiconthemes
-    kcompletion
-    knotifications
-    phonon
-    baloo-widgets
-  ];
-  propagatedBuildInputs = [
-    baloo
-    kactivities
-    kdelibs4support
-    kfilemetadata
-    ki18n
-    kio
-    ktexteditor
-    kwindowsystem
-  ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/dolphin"
-  '';
-  meta = {
-    license = with lib.licenses; [ gpl2 fdl12 ];
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/applications-15.12/fetchsrcs.sh b/pkgs/desktops/kde-5/applications-15.12/fetchsrcs.sh
deleted file mode 100755
index ff118a53e3ab..000000000000
--- a/pkgs/desktops/kde-5/applications-15.12/fetchsrcs.sh
+++ /dev/null
@@ -1,56 +0,0 @@
-#! /usr/bin/env nix-shell
-#! nix-shell -i bash -p coreutils findutils gnused nix wget
-
-set -x
-
-# The trailing slash at the end is necessary!
-WGET_ARGS='http://download.kde.org/stable/applications/15.12.3/ -A *.tar.xz'
-
-mkdir tmp; cd tmp
-
-rm -f ../srcs.csv
-
-wget -nH -r -c --no-parent $WGET_ARGS
-
-find . | while read src; do
-    if [[ -f "${src}" ]]; then
-        # Sanitize file name
-        filename=$(basename "$src" | tr '@' '_')
-        nameVersion="${filename%.tar.*}"
-        name=$(echo "$nameVersion" | sed -e 's,-[[:digit:]].*,,' | sed -e 's,-opensource-src$,,')
-        version=$(echo "$nameVersion" | sed -e 's,^\([[:alpha:]][[:alnum:]]*-\)\+,,')
-        echo "$name,$version,$src,$filename" >>../srcs.csv
-    fi
-done
-
-cat >../srcs.nix <<EOF
-# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
-{ fetchurl, mirror }:
-
-{
-EOF
-
-gawk -F , "{ print \$1 }" ../srcs.csv | sort | uniq | while read name; do
-    versions=$(gawk -F , "/^$name,/ { print \$2 }" ../srcs.csv)
-    latestVersion=$(echo "$versions" | sort -rV | head -n 1)
-    src=$(gawk -F , "/^$name,$latestVersion,/ { print \$3 }" ../srcs.csv)
-    filename=$(gawk -F , "/^$name,$latestVersion,/ { print \$4 }" ../srcs.csv)
-    url="${src:2}"
-    sha256=$(nix-hash --type sha256 --base32 --flat "$src")
-    cat >>../srcs.nix <<EOF
-  $name = {
-    version = "$latestVersion";
-    src = fetchurl {
-      url = "\${mirror}/$url";
-      sha256 = "$sha256";
-      name = "$filename";
-    };
-  };
-EOF
-done
-
-echo "}" >>../srcs.nix
-
-rm -f ../srcs.csv
-
-cd ..
diff --git a/pkgs/desktops/kde-5/applications-15.12/ffmpegthumbs.nix b/pkgs/desktops/kde-5/applications-15.12/ffmpegthumbs.nix
deleted file mode 100644
index 53e9d807d647..000000000000
--- a/pkgs/desktops/kde-5/applications-15.12/ffmpegthumbs.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ kdeApp
-, lib
-, extra-cmake-modules
-, ffmpeg
-, kio
-}:
-
-kdeApp {
-  name = "ffmpegthumbs";
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    ffmpeg
-    kio
-  ];
-  meta = {
-    license = with lib.licenses; [ gpl2 bsd3 ];
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/applications-15.12/filelight.nix b/pkgs/desktops/kde-5/applications-15.12/filelight.nix
deleted file mode 100644
index df5e097a540e..000000000000
--- a/pkgs/desktops/kde-5/applications-15.12/filelight.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ kdeApp
-, lib
-, extra-cmake-modules
-, kdoctools
-, makeQtWrapper
-, qtscript
-, kio
-, solid
-, kxmlgui
-, kparts
-}:
-
-kdeApp {
-  name = "filelight";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-    makeQtWrapper
-  ];
-  buildInputs = [
-    kio
-    kparts
-    qtscript
-    solid
-    kxmlgui
-  ];
-
-  postInstall = ''
-    wrapQtProgram "$out/bin/filelight"
-  '';
-  meta = {
-    license = with lib.licenses; [ gpl2 ];
-    maintainers = with lib.maintainers; [ fridh vcunat ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/applications-15.12/gpgmepp.nix b/pkgs/desktops/kde-5/applications-15.12/gpgmepp.nix
deleted file mode 100644
index ac14573dcaa3..000000000000
--- a/pkgs/desktops/kde-5/applications-15.12/gpgmepp.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ kdeApp
-, lib
-, extra-cmake-modules
-, boost
-, gpgme
-}:
-
-kdeApp {
-  name = "gpgmepp";
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    boost
-    gpgme
-  ];
-  meta = {
-    license = with lib.licenses; [ lgpl21 bsd3 ];
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/applications-15.12/gwenview.nix b/pkgs/desktops/kde-5/applications-15.12/gwenview.nix
deleted file mode 100644
index 732ac11e96d0..000000000000
--- a/pkgs/desktops/kde-5/applications-15.12/gwenview.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ kdeApp
-, lib
-, extra-cmake-modules
-, kdoctools
-, makeQtWrapper
-, baloo
-, exiv2
-, kactivities
-, kdelibs4support
-, kio
-, lcms2
-, phonon
-, qtsvg
-, qtx11extras
-}:
-
-kdeApp {
-  name = "gwenview";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-    makeQtWrapper
-  ];
-  buildInputs = [
-    exiv2
-    lcms2
-    phonon
-    qtsvg
-  ];
-  propagatedBuildInputs = [
-    baloo
-    kactivities
-    kdelibs4support
-    kio
-    qtx11extras
-  ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/gwenview"
-  '';
-  meta = {
-    license = with lib.licenses; [ gpl2 fdl12 ];
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/applications-15.12/kate.nix b/pkgs/desktops/kde-5/applications-15.12/kate.nix
deleted file mode 100644
index 91eeb2314a4c..000000000000
--- a/pkgs/desktops/kde-5/applications-15.12/kate.nix
+++ /dev/null
@@ -1,69 +0,0 @@
-{ kdeApp
-, lib
-, extra-cmake-modules
-, kdoctools
-, qtscript
-, kactivities
-, kconfig
-, kcrash
-, kguiaddons
-, kiconthemes
-, ki18n
-, kinit
-, kjobwidgets
-, kio
-, kparts
-, ktexteditor
-, kwindowsystem
-, kxmlgui
-, kdbusaddons
-, kwallet
-, plasma-framework
-, kitemmodels
-, knotifications
-, threadweaver
-, knewstuff
-, libgit2
-}:
-
-kdeApp {
-  name = "kate";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    qtscript
-    kconfig
-    kcrash
-    kguiaddons
-    kiconthemes
-    kinit
-    kjobwidgets
-    kparts
-    kxmlgui
-    kdbusaddons
-    kwallet
-    kitemmodels
-    knotifications
-    threadweaver
-    knewstuff
-    libgit2
-  ];
-  propagatedBuildInputs = [
-    kactivities
-    ki18n
-    kio
-    ktexteditor
-    kwindowsystem
-    plasma-framework
-  ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kate"
-    wrapQtProgram "$out/bin/kwrite"
-  '';
-  meta = {
-    license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ];
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/applications-15.12/kcalc.nix b/pkgs/desktops/kde-5/applications-15.12/kcalc.nix
deleted file mode 100644
index e4c8e9d69253..000000000000
--- a/pkgs/desktops/kde-5/applications-15.12/kcalc.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ kdeApp
-, lib
-, makeQtWrapper
-, extra-cmake-modules
-, gmp
-, kdoctools
-, kconfig
-, kconfigwidgets
-, kguiaddons
-, kinit
-, knotifications
-}:
-
-kdeApp {
-  name = "kcalc";
-
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-
-  buildInputs = [
-    gmp
-    kconfig
-    kconfigwidgets
-    kguiaddons
-    kinit
-    knotifications
-  ];
-
-  postInstall = ''
-    wrapQtProgram "$out/bin/kcalc"
-  '';
-
-  meta = {
-    license = with lib.licenses; [ gpl2 ];
-    maintainers = [ lib.maintainers.fridh ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/applications-15.12/kcolorchooser.nix b/pkgs/desktops/kde-5/applications-15.12/kcolorchooser.nix
deleted file mode 100644
index e8eac273cb55..000000000000
--- a/pkgs/desktops/kde-5/applications-15.12/kcolorchooser.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ kdeApp, lib
-, automoc4, cmake, kdelibs
-}:
-
-kdeApp {
-  name = "kcolorchooser";
-
-  nativeBuildInputs = [ automoc4 cmake ];
-  buildInputs = [ kdelibs ];
-
-  meta = {
-    license = with lib.licenses; [ mit ];
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/applications-15.12/kde-app.nix b/pkgs/desktops/kde-5/applications-15.12/kde-app.nix
deleted file mode 100644
index 2f1fdc1d643c..000000000000
--- a/pkgs/desktops/kde-5/applications-15.12/kde-app.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, lib, debug, srcs }:
-
-args:
-
-let
-  inherit (args) name;
-  sname = args.sname or name;
-  inherit (srcs."${sname}") src version;
-in
-stdenv.mkDerivation (args // {
-  name = "${name}-${version}";
-  inherit src;
-
-  outputs = args.outputs or [ "dev" "out" ];
-
-  cmakeFlags =
-    (args.cmakeFlags or [])
-    ++ [ "-DBUILD_TESTING=OFF" ]
-    ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug";
-
-  meta = {
-    platforms = lib.platforms.linux;
-    homepage = "http://www.kde.org";
-  } // (args.meta or {});
-})
diff --git a/pkgs/desktops/kde-5/applications-15.12/kde-locale-4.nix b/pkgs/desktops/kde-5/applications-15.12/kde-locale-4.nix
deleted file mode 100644
index e83794c60d81..000000000000
--- a/pkgs/desktops/kde-5/applications-15.12/kde-locale-4.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-name: args:
-
-{ kdeApp, automoc4, cmake, gettext, kdelibs, perl }:
-
-kdeApp (args // {
-  sname = "kde-l10n-${name}";
-  name = "kde-l10n-${name}-qt4";
-
-  outputs = [ "out" ];
-
-  nativeBuildInputs =
-    [ automoc4 cmake gettext perl ]
-    ++ (args.nativeBuildInputs or []);
-  buildInputs =
-    [ kdelibs ]
-    ++ (args.buildInputs or []);
-
-  preConfigure = ''
-    sed -e 's/add_subdirectory(5)//' -i CMakeLists.txt
-    ${args.preConfigure or ""}
-  '';
-
-  preFixup = ''
-    propagatedBuildInputs=
-    propagatedNativeBuildInputs=
-  '';
-})
diff --git a/pkgs/desktops/kde-5/applications-15.12/kde-locale-5.nix b/pkgs/desktops/kde-5/applications-15.12/kde-locale-5.nix
deleted file mode 100644
index 772ebe37e44f..000000000000
--- a/pkgs/desktops/kde-5/applications-15.12/kde-locale-5.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-name: args:
-
-{ kdeApp, cmake, extra-cmake-modules, gettext, kdoctools }:
-
-kdeApp (args // {
-  sname = "kde-l10n-${name}";
-  name = "kde-l10n-${name}-qt5";
-
-  outputs = [ "out" ];
-
-  nativeBuildInputs =
-    [ cmake extra-cmake-modules gettext kdoctools ]
-    ++ (args.nativeBuildInputs or []);
-
-  preConfigure = ''
-    sed -e 's/add_subdirectory(4)//' -i CMakeLists.txt
-    ${args.preConfigure or ""}
-  '';
-
-  preFixup = ''
-    propagatedBuildInputs=
-    propagatedNativeBuildInputs=
-  '';
-})
diff --git a/pkgs/desktops/kde-5/applications-15.12/kdegraphics-thumbnailers.nix b/pkgs/desktops/kde-5/applications-15.12/kdegraphics-thumbnailers.nix
deleted file mode 100644
index 520bad0d066a..000000000000
--- a/pkgs/desktops/kde-5/applications-15.12/kdegraphics-thumbnailers.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ kdeApp
-, lib
-, extra-cmake-modules
-, kio
-, libkexiv2
-, libkdcraw
-}:
-
-kdeApp {
-  name = "kdegraphics-thumbnailers";
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    kio
-    libkexiv2
-    libkdcraw
-  ];
-  meta = {
-    license = [ lib.licenses.lgpl21 ];
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/applications-15.12/kdelibs/0001-old-kde4-cmake-policies.patch b/pkgs/desktops/kde-5/applications-15.12/kdelibs/0001-old-kde4-cmake-policies.patch
deleted file mode 100644
index b7d7300e9a84..000000000000
--- a/pkgs/desktops/kde-5/applications-15.12/kdelibs/0001-old-kde4-cmake-policies.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From b43c49109694940f0a26240753e879eb629dd02d Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Mon, 7 Sep 2015 13:54:57 -0500
-Subject: [PATCH 1/2] old kde4 cmake policies
-
----
- cmake/modules/FindKDE4Internal.cmake | 33 +++++++++++++++++++++++++++++++++
- 1 file changed, 33 insertions(+)
-
-diff --git a/cmake/modules/FindKDE4Internal.cmake b/cmake/modules/FindKDE4Internal.cmake
-index 7d54b9b..c435571 100644
---- a/cmake/modules/FindKDE4Internal.cmake
-+++ b/cmake/modules/FindKDE4Internal.cmake
-@@ -345,6 +345,39 @@
- # Redistribution and use is allowed according to the terms of the BSD license.
- # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
- 
-+# this is required now by cmake 2.6 and so must not be skipped by if(KDE4_FOUND) below
-+cmake_minimum_required(VERSION 2.8.9 FATAL_ERROR)
-+# set the cmake policies to the 2.4.x compatibility settings (may change for KDE 4.3)
-+cmake_policy(VERSION 2.4.5)
-+
-+# CMake 2.6, set compatibility behaviour to cmake 2.4
-+# this must be executed always, because the CMAKE_MINIMUM_REQUIRED() command above
-+# resets the policy settings, so we get a lot of warnings
-+
-+# CMP0000: don't require cmake_minimum_version() directly in the top level CMakeLists.txt, FindKDE4Internal.cmake is good enough
-+cmake_policy(SET CMP0000 OLD)
-+# CMP0002: in KDE4 we have multiple targets with the same name for the unit tests
-+cmake_policy(SET CMP0002 OLD)
-+# CMP0003: add the link paths to the link command as with cmake 2.4
-+cmake_policy(SET CMP0003 OLD)
-+# CMP0005: keep escaping behaviour for definitions added via add_definitions()
-+cmake_policy(SET CMP0005 OLD)
-+# since cmake 2.6.3: NEW behaviour is that setting policies doesn't "escape" the file
-+# where this is done, macros and functions are executed with the policies as they
-+# were when the were defined. Keep the OLD behaviour so we can set the policies here
-+# for all KDE software without the big warning
-+cmake_policy(SET CMP0011 OLD)
-+
-+# since cmake 2.8.4: when include()ing from inside cmake's module dir, prefer the files
-+# in this directory over those from CMAKE_MODULE_PATH
-+cmake_policy(SET CMP0017 NEW)
-+
-+# since cmake 3.0: use of the LOCATION target property is disallowed while it is used in KDE4Macros.cmake
-+if (POLICY CMP0026)
-+  cmake_policy(SET CMP0026 OLD)
-+endif (POLICY CMP0026)
-+
-+
- # Only do something if it hasn't been found yet
- if(NOT KDE4_FOUND)
- 
--- 
-2.5.0
-
diff --git a/pkgs/desktops/kde-5/applications-15.12/kdelibs/0002-polkit-install-path.patch b/pkgs/desktops/kde-5/applications-15.12/kdelibs/0002-polkit-install-path.patch
deleted file mode 100644
index ff0306ea1488..000000000000
--- a/pkgs/desktops/kde-5/applications-15.12/kdelibs/0002-polkit-install-path.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From fab35bac146a817f3af80f45531355fd70cd226b Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Mon, 7 Sep 2015 13:56:03 -0500
-Subject: [PATCH 2/2] polkit install path
-
----
- kdecore/auth/ConfigureChecks.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/kdecore/auth/ConfigureChecks.cmake b/kdecore/auth/ConfigureChecks.cmake
-index 7cf9cb5..c8334ae 100644
---- a/kdecore/auth/ConfigureChecks.cmake
-+++ b/kdecore/auth/ConfigureChecks.cmake
-@@ -150,7 +150,7 @@ elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "POLKITQT-1")
-         ${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)
--- 
-2.5.0
-
diff --git a/pkgs/desktops/kde-5/applications-15.12/kdelibs/0003-remove_xdg_impurities.patch b/pkgs/desktops/kde-5/applications-15.12/kdelibs/0003-remove_xdg_impurities.patch
deleted file mode 100644
index a79d7b2b7d16..000000000000
--- a/pkgs/desktops/kde-5/applications-15.12/kdelibs/0003-remove_xdg_impurities.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/kdecore/kernel/kstandarddirs.cpp b/kdecore/kernel/kstandarddirs.cpp
-index ab8f76d..2ae5089 100644
---- a/kdecore/kernel/kstandarddirs.cpp
-+++ b/kdecore/kernel/kstandarddirs.cpp
-@@ -1768,12 +1768,6 @@ void KStandardDirs::addKDEDefaults()
-     else
-     {
-         xdgdirList.clear();
--        xdgdirList.append(QString::fromLatin1("/etc/xdg"));
--#ifdef Q_WS_WIN
--        xdgdirList.append(installPath("kdedir") + QString::fromLatin1("etc/xdg"));
--#else
--        xdgdirList.append(QFile::decodeName(KDESYSCONFDIR "/xdg"));
--#endif
-     }
- 
-     QString localXdgDir = readEnvPath("XDG_CONFIG_HOME");
-@@ -1821,10 +1815,6 @@ void KStandardDirs::addKDEDefaults()
-         }
-     } else {
-         xdgdirList = kdedirDataDirs;
--#ifndef Q_WS_WIN
--        xdgdirList.append(QString::fromLatin1("/usr/local/share/"));
--        xdgdirList.append(QString::fromLatin1("/usr/share/"));
--#endif
-     }
- 
-     localXdgDir = readEnvPath("XDG_DATA_HOME");
-diff --git a/solid/solid/xdgbasedirs.cpp b/solid/solid/xdgbasedirs.cpp
-index 4c9cad9..6849d45 100644
---- a/solid/solid/xdgbasedirs.cpp
-+++ b/solid/solid/xdgbasedirs.cpp
-@@ -70,12 +70,12 @@ QStringList Solid::XdgBaseDirs::systemPathList( const char *resource )
- {
-   if ( qstrncmp( "data", resource, 4 ) == 0 ) {
-     if ( instance()->mDataDirs.isEmpty() ) {
--      instance()->mDataDirs = instance()->systemPathList( "XDG_DATA_DIRS", "/usr/local/share:/usr/share" );
-+      instance()->mDataDirs = instance()->systemPathList( "XDG_DATA_DIRS", "" );
-     }
-     return instance()->mDataDirs;
-   } else if ( qstrncmp( "config", resource, 6 ) == 0 ) {
-     if ( instance()->mConfigDirs.isEmpty() ) {
--      instance()->mConfigDirs = instance()->systemPathList( "XDG_CONFIG_DIRS", "/etc/xdg" );
-+      instance()->mConfigDirs = instance()->systemPathList( "XDG_CONFIG_DIRS", "" );
-     }
-     return instance()->mConfigDirs;
-   }
diff --git a/pkgs/desktops/kde-5/applications-15.12/kdelibs/default.nix b/pkgs/desktops/kde-5/applications-15.12/kdelibs/default.nix
deleted file mode 100644
index 389362deecc6..000000000000
--- a/pkgs/desktops/kde-5/applications-15.12/kdelibs/default.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ kdeApp, attica, attr, automoc4, avahi, bison, cmake
-, docbook_xml_dtd_42, docbook_xsl, flex, giflib, ilmbase
-, libdbusmenu_qt, libjpeg, libxml2, libxslt, perl, phonon, pkgconfig
-, polkit_qt4, qca2, qt4, shared_desktop_ontologies, shared_mime_info
-, soprano, strigi, udev, xz, pcre
-, lib
-}:
-
-kdeApp {
-  name = "kdelibs";
-
-  outputs = [ "out" ];
-
-  buildInputs = [
-    attica attr avahi giflib libdbusmenu_qt libjpeg libxml2
-    polkit_qt4 qca2 shared_desktop_ontologies udev xz pcre
-  ];
-  propagatedBuildInputs = [ qt4 soprano phonon strigi ];
-  nativeBuildInputs = [
-    automoc4 bison cmake flex libxslt perl pkgconfig shared_mime_info
-  ];
-
-  patches = [
-    ./0001-old-kde4-cmake-policies.patch
-    ./0002-polkit-install-path.patch
-    ./0003-remove_xdg_impurities.patch
-  ];
-
-  # cmake does not detect path to `ilmbase`
-  NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
-
-  cmakeFlags = [
-    "-DDOCBOOKXML_CURRENTDTD_DIR=${docbook_xml_dtd_42}/xml/dtd/docbook"
-    "-DDOCBOOKXSL_DIR=${docbook_xsl}/xml/xsl/docbook"
-    "-DWITH_SOLID_UDISKS2=ON"
-    "-DKDE_DEFAULT_HOME=.kde"
-  ];
-
-  setupHook = ./setup-hook.sh;
-
-  meta = {
-    licenses = with lib.licenses; [ gpl2 fdl12 lgpl21 ];
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/applications-15.12/kdelibs/setup-hook.sh b/pkgs/desktops/kde-5/applications-15.12/kdelibs/setup-hook.sh
deleted file mode 100644
index e0a75dc8acd0..000000000000
--- a/pkgs/desktops/kde-5/applications-15.12/kdelibs/setup-hook.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-addQt4Plugins() {
-  if [[ -d "$1/lib/qt4/plugins" ]]; then
-      propagatedUserEnvPkgs+=" $1"
-  fi
-
-  if [[ -d "$1/lib/kde4/plugins" ]]; then
-      propagatedUserEnvPkgs+=" $1"
-  fi
-}
-envHooks+=(addQt4Plugins)
diff --git a/pkgs/desktops/kde-5/applications-15.12/kdenetwork-filesharing.nix b/pkgs/desktops/kde-5/applications-15.12/kdenetwork-filesharing.nix
deleted file mode 100644
index 4e99a43b3913..000000000000
--- a/pkgs/desktops/kde-5/applications-15.12/kdenetwork-filesharing.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ kdeApp
-, lib
-, extra-cmake-modules
-, kdoctools
-, kcoreaddons
-, ki18n
-, kio
-, kwidgetsaddons
-, samba
-}:
-
-kdeApp {
-  name = "kdenetwork-filesharing";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    kcoreaddons
-    ki18n
-    kio
-    kwidgetsaddons
-    samba
-  ];
-  meta = {
-    license = [ lib.licenses.gpl2 lib.licenses.lgpl21 ];
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/applications-15.12/kgpg.nix b/pkgs/desktops/kde-5/applications-15.12/kgpg.nix
deleted file mode 100644
index 3ee925197189..000000000000
--- a/pkgs/desktops/kde-5/applications-15.12/kgpg.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ kdeApp
-, lib
-, automoc4
-, cmake
-, makeWrapper
-, perl
-, pkgconfig
-, boost
-, gpgme
-, kdelibs
-, kdepimlibs
-, gnupg
-}:
-
-kdeApp {
-  name = "kgpg";
-  nativeBuildInputs = [
-    automoc4
-    cmake
-    makeWrapper
-    perl
-    pkgconfig
-  ];
-  buildInputs = [
-    boost
-    gpgme
-    kdelibs
-    kdepimlibs
-  ];
-  postInstall = ''
-    wrapProgram "$out/bin/kgpg" \
-        --prefix PATH : "${gnupg}/bin"
-  '';
-  meta = {
-    license = [ lib.licenses.gpl2 ];
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/applications-15.12/kio-extras.nix b/pkgs/desktops/kde-5/applications-15.12/kio-extras.nix
deleted file mode 100644
index 77b42f1fc586..000000000000
--- a/pkgs/desktops/kde-5/applications-15.12/kio-extras.nix
+++ /dev/null
@@ -1,58 +0,0 @@
-{ kdeApp, lib
-, extra-cmake-modules, kdoctools
-, shared_mime_info
-, exiv2
-, karchive
-, kbookmarks
-, kconfig, kconfigwidgets
-, kcoreaddons, kdbusaddons, kguiaddons
-, kdnssd
-, kiconthemes
-, ki18n
-, kio
-, khtml
-, kdelibs4support
-, kpty
-, libmtp
-, libssh
-, openexr
-, openslp
-, phonon
-, qtsvg
-, samba
-, solid
-}:
-
-kdeApp {
-  name = "kio-extras";
-  nativeBuildInputs = [
-    extra-cmake-modules kdoctools
-    shared_mime_info
-  ];
-  buildInputs = [
-    exiv2
-    karchive
-    kbookmarks
-    kconfig kconfigwidgets
-    kcoreaddons kdbusaddons kguiaddons
-    kdnssd
-    kiconthemes
-    ki18n
-    kio
-    khtml
-    kdelibs4support
-    kpty
-    libmtp
-    libssh
-    openexr
-    openslp
-    phonon
-    qtsvg
-    samba
-    solid
-  ];
-  meta = {
-    license = with lib.licenses; [ gpl2 lgpl21 ];
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/applications-15.12/konsole.nix b/pkgs/desktops/kde-5/applications-15.12/konsole.nix
deleted file mode 100644
index 4b4cba2a3779..000000000000
--- a/pkgs/desktops/kde-5/applications-15.12/konsole.nix
+++ /dev/null
@@ -1,68 +0,0 @@
-{ kdeApp
-, lib
-, extra-cmake-modules
-, kdoctools
-, makeQtWrapper
-, qtscript
-, kbookmarks
-, kcompletion
-, kconfig
-, kconfigwidgets
-, kcoreaddons
-, kguiaddons
-, ki18n
-, kiconthemes
-, kinit
-, kdelibs4support
-, kio
-, knotifications
-, knotifyconfig
-, kparts
-, kpty
-, kservice
-, ktextwidgets
-, kwidgetsaddons
-, kwindowsystem
-, kxmlgui
-}:
-
-kdeApp {
-  name = "konsole";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-    makeQtWrapper
-  ];
-  buildInputs = [
-    qtscript
-    kbookmarks
-    kcompletion
-    kconfig
-    kconfigwidgets
-    kcoreaddons
-    kguiaddons
-    kiconthemes
-    kinit
-    kio
-    knotifications
-    knotifyconfig
-    kparts
-    kpty
-    kservice
-    ktextwidgets
-    kwidgetsaddons
-    kxmlgui
-  ];
-  propagatedBuildInputs = [
-    kdelibs4support
-    ki18n
-    kwindowsystem
-  ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/konsole"
-  '';
-  meta = {
-    license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/applications-15.12/l10n.nix b/pkgs/desktops/kde-5/applications-15.12/l10n.nix
deleted file mode 100644
index 9b211faf4448..000000000000
--- a/pkgs/desktops/kde-5/applications-15.12/l10n.nix
+++ /dev/null
@@ -1,244 +0,0 @@
-{ callPackage, pkgs, lib }:
-
-let
-
-  kdeLocale4 = import ./kde-locale-4.nix;
-  kdeLocale5 = import ./kde-locale-5.nix;
-
-in
-
-lib.mapAttrs (name: attr: pkgs.recurseIntoAttrs attr) {
-  ar = {
-    qt4 = callPackage (kdeLocale4 "ar" {}) {};
-    qt5 = callPackage (kdeLocale5 "ar" {}) {};
-  };
-  bg = {
-    qt4 = callPackage (kdeLocale4 "bg" {}) {};
-    qt5 = callPackage (kdeLocale5 "bg" {}) {};
-  };
-  bs = {
-    qt4 = callPackage (kdeLocale4 "bs" {}) {};
-    qt5 = callPackage (kdeLocale5 "bs" {}) {};
-  };
-  ca = {
-    qt4 = callPackage (kdeLocale4 "ca" {}) {};
-    qt5 = callPackage (kdeLocale5 "ca" {}) {};
-  };
-  ca_valencia = {
-    qt4 = callPackage (kdeLocale4 "ca_valencia" {}) {};
-    qt5 = callPackage (kdeLocale5 "ca_valencia" {}) {};
-  };
-  cs = {
-    qt4 = callPackage (kdeLocale4 "cs" {}) {};
-    qt5 = callPackage (kdeLocale5 "cs" {}) {};
-  };
-  da = {
-    qt4 = callPackage (kdeLocale4 "da" {}) {};
-    qt5 = callPackage (kdeLocale5 "da" {}) {};
-  };
-  de = {
-    qt4 = callPackage (kdeLocale4 "de" {}) {};
-    qt5 = callPackage (kdeLocale5 "de" {}) {};
-  };
-  el = {
-    qt4 = callPackage (kdeLocale4 "el" {}) {};
-    qt5 = callPackage (kdeLocale5 "el" {}) {};
-  };
-  en_GB = {
-    qt4 = callPackage (kdeLocale4 "en_GB" {}) {};
-    qt5 = callPackage (kdeLocale5 "en_GB" {}) {};
-  };
-  eo = {
-    qt4 = callPackage (kdeLocale4 "eo" {}) {};
-    qt5 = callPackage (kdeLocale5 "eo" {}) {};
-  };
-  es = {
-    qt4 = callPackage (kdeLocale4 "es" {}) {};
-    qt5 = callPackage (kdeLocale5 "es" {}) {};
-  };
-  et = {
-    qt4 = callPackage (kdeLocale4 "et" {}) {};
-    qt5 = callPackage (kdeLocale5 "et" {}) {};
-  };
-  eu = {
-    qt4 = callPackage (kdeLocale4 "eu" {}) {};
-    qt5 = callPackage (kdeLocale5 "eu" {}) {};
-  };
-  fa = {
-    qt4 = callPackage (kdeLocale4 "fa" {}) {};
-    qt5 = callPackage (kdeLocale5 "fa" {}) {};
-  };
-  fi = {
-    qt4 = callPackage (kdeLocale4 "fi" {}) {};
-    qt5 = callPackage (kdeLocale5 "fi" {}) {};
-  };
-  fr = {
-    qt4 = callPackage (kdeLocale4 "fr" {}) {};
-    qt5 = callPackage (kdeLocale5 "fr" {}) {};
-  };
-  ga = {
-    qt4 = callPackage (kdeLocale4 "ga" {}) {};
-    qt5 = callPackage (kdeLocale5 "ga" {}) {};
-  };
-  gl = {
-    qt4 = callPackage (kdeLocale4 "gl" {}) {};
-    qt5 = callPackage (kdeLocale5 "gl" {}) {};
-  };
-  he = {
-    qt4 = callPackage (kdeLocale4 "he" {}) {};
-    qt5 = callPackage (kdeLocale5 "he" {}) {};
-  };
-  hi = {
-    qt4 = callPackage (kdeLocale4 "hi" {}) {};
-    qt5 = callPackage (kdeLocale5 "hi" {}) {};
-  };
-  hr = {
-    qt4 = callPackage (kdeLocale4 "hr" {}) {};
-    qt5 = callPackage (kdeLocale5 "hr" {}) {};
-  };
-  hu = {
-    qt4 = callPackage (kdeLocale4 "hu" {}) {};
-    qt5 = callPackage (kdeLocale5 "hu" {}) {};
-  };
-  ia = {
-    qt4 = callPackage (kdeLocale4 "ia" {}) {};
-    qt5 = callPackage (kdeLocale5 "ia" {}) {};
-  };
-  id = {
-    qt4 = callPackage (kdeLocale4 "id" {}) {};
-    qt5 = callPackage (kdeLocale5 "id" {}) {};
-  };
-  is = {
-    qt4 = callPackage (kdeLocale4 "is" {}) {};
-    qt5 = callPackage (kdeLocale5 "is" {}) {};
-  };
-  it = {
-    qt4 = callPackage (kdeLocale4 "it" {}) {};
-    qt5 = callPackage (kdeLocale5 "it" {}) {};
-  };
-  ja = {
-    qt4 = callPackage (kdeLocale4 "ja" {}) {};
-    qt5 = callPackage (kdeLocale5 "ja" {}) {};
-  };
-  kk = {
-    qt4 = callPackage (kdeLocale4 "kk" {}) {};
-    qt5 = callPackage (kdeLocale5 "kk" {}) {};
-  };
-  km = {
-    qt4 = callPackage (kdeLocale4 "km" {}) {};
-    qt5 = callPackage (kdeLocale5 "km" {}) {};
-  };
-  ko = {
-    qt4 = callPackage (kdeLocale4 "ko" {}) {};
-    qt5 = callPackage (kdeLocale5 "ko" {}) {};
-  };
-  lt = {
-    qt4 = callPackage (kdeLocale4 "lt" {}) {};
-    qt5 = callPackage (kdeLocale5 "lt" {}) {};
-  };
-  lv = {
-    qt4 = callPackage (kdeLocale4 "lv" {}) {};
-    qt5 = callPackage (kdeLocale5 "lv" {}) {};
-  };
-  mr = {
-    qt4 = callPackage (kdeLocale4 "mr" {}) {};
-    qt5 = callPackage (kdeLocale5 "mr" {}) {};
-  };
-  nb = {
-    qt4 = callPackage (kdeLocale4 "nb" {}) {};
-    qt5 = callPackage (kdeLocale5 "nb" {}) {};
-  };
-  nds = {
-    qt4 = callPackage (kdeLocale4 "nds" {}) {};
-    qt5 = callPackage (kdeLocale5 "nds" {}) {};
-  };
-  nl = {
-    qt4 = callPackage (kdeLocale4 "nl" {}) {};
-    qt5 = callPackage (kdeLocale5 "nl" {}) {};
-  };
-  nn = {
-    qt4 = callPackage (kdeLocale4 "nn" {}) {};
-    qt5 = callPackage (kdeLocale5 "nn" {}) {};
-  };
-  pa = {
-    qt4 = callPackage (kdeLocale4 "pa" {}) {};
-    qt5 = callPackage (kdeLocale5 "pa" {}) {};
-  };
-  pl = {
-    qt4 = callPackage (kdeLocale4 "pl" {}) {};
-    qt5 = callPackage (kdeLocale5 "pl" {}) {};
-  };
-  pt = {
-    qt4 = callPackage (kdeLocale4 "pt" {}) {};
-    qt5 = callPackage (kdeLocale5 "pt" {}) {};
-  };
-  pt_BR = {
-    qt4 = callPackage (kdeLocale4 "pt_BR" {}) {};
-    qt5 = callPackage (kdeLocale5 "pt_BR" {}) {};
-  };
-  ro = {
-    qt4 = callPackage (kdeLocale4 "ro" {}) {};
-    qt5 = callPackage (kdeLocale5 "ro" {}) {};
-  };
-  ru = {
-    qt4 = callPackage (kdeLocale4 "ru" {}) {};
-    qt5 = callPackage (kdeLocale5 "ru" {}) {};
-  };
-  sk = {
-    qt4 = callPackage (kdeLocale4 "sk" {}) {};
-    qt5 = callPackage (kdeLocale5 "sk" {}) {};
-  };
-  sl = {
-    qt4 = callPackage (kdeLocale4 "sl" {}) {};
-    qt5 = callPackage (kdeLocale5 "sl" {}) {};
-  };
-  sr = {
-    qt4 = callPackage (kdeLocale4 "sr" {
-      preConfigure = ''
-        patchShebangs \
-            4/sr/sr@latin/scripts/ts-pmap-compile.py \
-            4/sr/scripts/ts-pmap-compile.py \
-            4/sr/data/resolve-sr-hybrid \
-            4/sr/sr@ijekavian/scripts/ts-pmap-compile.py \
-            4/sr/sr@ijekavianlatin/scripts/ts-pmap-compile.py
-        '';
-    }) {};
-    qt5 = callPackage (kdeLocale5 "sr" {
-      preConfigure = ''
-        patchShebangs 5/sr/data/resolve-sr-hybrid
-        sed -e 's/add_subdirectory(kdesdk)//' -i 5/sr/data/CMakeLists.txt
-      '';
-    }) {};
-  };
-  sv = {
-    qt4 = callPackage (kdeLocale4 "sv" {}) {};
-    qt5 = callPackage (kdeLocale5 "sv" {}) {};
-  };
-  tr = {
-    qt4 = callPackage (kdeLocale4 "tr" {}) {};
-    qt5 = callPackage (kdeLocale5 "tr" {}) {};
-  };
-  ug = {
-    qt4 = callPackage (kdeLocale4 "ug" {}) {};
-    qt5 = callPackage (kdeLocale5 "ug" {}) {};
-  };
-  # TODO: build broken in 15.11.80; re-enable in next release
-  /*
-  uk = {
-    qt4 = callPackage (kdeLocale4 "uk" {}) {};
-    qt5 = callPackage (kdeLocale5 "uk" {}) {};
-  };
-  */
-  wa = {
-    qt4 = callPackage (kdeLocale4 "wa" {}) {};
-    qt5 = callPackage (kdeLocale5 "wa" {}) {};
-  };
-  zh_CN = {
-    qt4 = callPackage (kdeLocale4 "zh_CN" {}) {};
-    qt5 = callPackage (kdeLocale5 "zh_CN" {}) {};
-  };
-  zh_TW = {
-    qt4 = callPackage (kdeLocale4 "zh_TW" {}) {};
-    qt5 = callPackage (kdeLocale5 "zh_TW" {}) {};
-  };
-}
diff --git a/pkgs/desktops/kde-5/applications-15.12/libkdcraw.nix b/pkgs/desktops/kde-5/applications-15.12/libkdcraw.nix
deleted file mode 100644
index 319c7fc6583d..000000000000
--- a/pkgs/desktops/kde-5/applications-15.12/libkdcraw.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ kdeApp
-, lib
-, extra-cmake-modules
-, libraw
-}:
-
-kdeApp {
-  name = "libkdcraw";
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    libraw
-  ];
-  meta = {
-    license = with lib.licenses; [ gpl2 lgpl21 bsd3 ];
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/applications-15.12/libkexiv2.nix b/pkgs/desktops/kde-5/applications-15.12/libkexiv2.nix
deleted file mode 100644
index afb1ac836537..000000000000
--- a/pkgs/desktops/kde-5/applications-15.12/libkexiv2.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ kdeApp
-, lib
-, exiv2
-, extra-cmake-modules
-}:
-
-kdeApp {
-  name = "libkexiv2";
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    exiv2
-  ];
-  meta = {
-    license = with lib.licenses; [ gpl2 lgpl21 bsd3 ];
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/applications-15.12/libkipi.nix b/pkgs/desktops/kde-5/applications-15.12/libkipi.nix
deleted file mode 100644
index c23cd8578fb9..000000000000
--- a/pkgs/desktops/kde-5/applications-15.12/libkipi.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ kdeApp
-, lib
-, extra-cmake-modules
-, kconfig
-, ki18n
-, kservice
-, kxmlgui
-}:
-
-kdeApp {
-  name = "libkipi";
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    kconfig ki18n kservice kxmlgui
-  ];
-  meta = {
-    license = with lib.licenses; [ gpl2 lgpl21 bsd3 ];
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/applications-15.12/okular.nix b/pkgs/desktops/kde-5/applications-15.12/okular.nix
deleted file mode 100644
index 0691325d7a52..000000000000
--- a/pkgs/desktops/kde-5/applications-15.12/okular.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ kdeApp
-, lib
-, automoc4
-, cmake
-, perl
-, pkgconfig
-, kdelibs
-, qimageblitz
-, poppler_qt4
-, libspectre
-, libkexiv2
-, djvulibre
-, libtiff
-, freetype
-, ebook_tools
-}:
-
-kdeApp {
-  name = "okular";
-  nativeBuildInputs = [
-    automoc4
-    cmake
-    perl
-    pkgconfig
-  ];
-  buildInputs = [
-    kdelibs
-    qimageblitz
-    poppler_qt4
-    libspectre
-    libkexiv2
-    djvulibre
-    libtiff
-    freetype
-    ebook_tools
-  ];
-  meta = {
-    license = with lib.licenses; [ gpl2 lgpl21 fdl12 bsd3 ];
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/applications-15.12/print-manager.nix b/pkgs/desktops/kde-5/applications-15.12/print-manager.nix
deleted file mode 100644
index b4eab372789d..000000000000
--- a/pkgs/desktops/kde-5/applications-15.12/print-manager.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ kdeApp
-, lib
-, extra-cmake-modules
-, qtdeclarative
-, cups
-, kconfig
-, kconfigwidgets
-, kdbusaddons
-, kiconthemes
-, ki18n
-, kcmutils
-, kio
-, knotifications
-, plasma-framework
-, kwidgetsaddons
-, kwindowsystem
-, kitemviews
-}:
-
-kdeApp {
-  name = "print-manager";
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    cups
-    kconfig
-    kconfigwidgets
-    kdbusaddons
-    kiconthemes
-    kcmutils
-    knotifications
-    kwidgetsaddons
-    kitemviews
-  ];
-  propagatedBuildInputs = [
-    ki18n
-    kio
-    kwindowsystem
-    plasma-framework
-    qtdeclarative
-  ];
-  meta = {
-    license = [ lib.licenses.gpl2 ];
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/applications-15.12/spectacle.nix b/pkgs/desktops/kde-5/applications-15.12/spectacle.nix
deleted file mode 100644
index 849334fb7364..000000000000
--- a/pkgs/desktops/kde-5/applications-15.12/spectacle.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{ kdeApp, lib
-, extra-cmake-modules
-, kdoctools
-, makeQtWrapper
-, kconfig
-, kcoreaddons
-, kdbusaddons
-, ki18n
-, kio
-, knotifications
-, kscreen
-, kwidgetsaddons
-, kwindowsystem
-, kxmlgui
-, libkipi
-, xcb-util-cursor
-}:
-
-kdeApp {
-  name = "spectacle";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-    makeQtWrapper
-  ];
-  buildInputs = [
-    kconfig
-    kcoreaddons
-    kdbusaddons
-    ki18n
-    kio
-    knotifications
-    kscreen
-    kwidgetsaddons
-    kwindowsystem
-    kxmlgui
-    libkipi
-    xcb-util-cursor
-  ];
-  postFixup = ''
-    wrapQtProgram "$out/bin/spectacle"
-  '';
-  meta = with lib; {
-    maintainers = with maintainers; [ ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/applications-15.12/srcs.nix b/pkgs/desktops/kde-5/applications-15.12/srcs.nix
deleted file mode 100644
index 7db99c26c3c8..000000000000
--- a/pkgs/desktops/kde-5/applications-15.12/srcs.nix
+++ /dev/null
@@ -1,1933 +0,0 @@
-# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
-{ fetchurl, mirror }:
-
-{
-  akonadi = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/akonadi-15.12.3.tar.xz";
-      sha256 = "17qzwsf8x95jm5swbxx5692i5yzwzqylnqrdbx2bflaaw7i2k3by";
-      name = "akonadi-15.12.3.tar.xz";
-    };
-  };
-  akonadi-calendar = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/akonadi-calendar-15.12.3.tar.xz";
-      sha256 = "15algxz73wi143b93yps7dlbac0dp9isaxlf0h9xv1cia8s98a17";
-      name = "akonadi-calendar-15.12.3.tar.xz";
-    };
-  };
-  akonadi-search = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/akonadi-search-15.12.3.tar.xz";
-      sha256 = "0dxr8rppaf0vnfmcys5hp6h936lim3s8f1ykhrygrvjr3va0fw3f";
-      name = "akonadi-search-15.12.3.tar.xz";
-    };
-  };
-  analitza = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/analitza-15.12.3.tar.xz";
-      sha256 = "0hz59vfzh4kysrchafiaa3l8lw2zv0nky1dyi9ybzqwi5ilxcs9b";
-      name = "analitza-15.12.3.tar.xz";
-    };
-  };
-  ark = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/ark-15.12.3.tar.xz";
-      sha256 = "13pl4phk7zg19gc16x1faaycgipdd85xg2s7rj6silmvyxr47kzf";
-      name = "ark-15.12.3.tar.xz";
-    };
-  };
-  artikulate = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/artikulate-15.12.3.tar.xz";
-      sha256 = "00dhgpkzjdqjag6k2m2d8l8pp40grzhqhvvivxzy6lcz67yr68m1";
-      name = "artikulate-15.12.3.tar.xz";
-    };
-  };
-  audiocd-kio = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/audiocd-kio-15.12.3.tar.xz";
-      sha256 = "0ibasnpjqbfhxgkfar88pzmywcnnjpamkkd2arzwgdmrv311f4rj";
-      name = "audiocd-kio-15.12.3.tar.xz";
-    };
-  };
-  baloo-widgets = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/baloo-widgets-15.12.3.tar.xz";
-      sha256 = "19yxc4njgnxyqd7izjkf93mml0wnnl23w58pv44w23a10jihydrg";
-      name = "baloo-widgets-15.12.3.tar.xz";
-    };
-  };
-  blinken = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/blinken-15.12.3.tar.xz";
-      sha256 = "04jkf6gh676ghf6mhgn3pyv2vl6dypja3bxjc2np1j7j44575jx1";
-      name = "blinken-15.12.3.tar.xz";
-    };
-  };
-  bomber = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/bomber-15.12.3.tar.xz";
-      sha256 = "03ydvhdcbgvalkn3ch512s7z7hn2ykamjilbs7iv6p9q21va6iws";
-      name = "bomber-15.12.3.tar.xz";
-    };
-  };
-  bovo = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/bovo-15.12.3.tar.xz";
-      sha256 = "086nxgdl37jgmi5x759ln7ai4nxv6mahzhlkf3m8m3faa6hxm2af";
-      name = "bovo-15.12.3.tar.xz";
-    };
-  };
-  cantor = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/cantor-15.12.3.tar.xz";
-      sha256 = "0fs2zsd8aq5q0l5d2p8343af6cbi4qvi603gvrcjyyyc728djrqc";
-      name = "cantor-15.12.3.tar.xz";
-    };
-  };
-  cervisia = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/cervisia-15.12.3.tar.xz";
-      sha256 = "04gs4yjjdn0ndqfcpr7ww3qwn80929g4ylilznhpp6xp35gb5dsa";
-      name = "cervisia-15.12.3.tar.xz";
-    };
-  };
-  dolphin = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/dolphin-15.12.3.tar.xz";
-      sha256 = "1pdxsf8n5kys7zwlhr71mwj4scwk8qglqml65cb3bijyysxlghr6";
-      name = "dolphin-15.12.3.tar.xz";
-    };
-  };
-  dolphin-plugins = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/dolphin-plugins-15.12.3.tar.xz";
-      sha256 = "179c1k6xd1f1mjrdgx23jfhgn3y72qqwmpnx8pyw83gc8rcjgrzz";
-      name = "dolphin-plugins-15.12.3.tar.xz";
-    };
-  };
-  dragon = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/dragon-15.12.3.tar.xz";
-      sha256 = "0hkm0w85w5bc1pfmbaz64kxcplpm9459ggpv9gfabgg3ydy3k8l7";
-      name = "dragon-15.12.3.tar.xz";
-    };
-  };
-  ffmpegthumbs = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/ffmpegthumbs-15.12.3.tar.xz";
-      sha256 = "1wkxz3xhmfafq52ws9i8401s0nacdh896xfin86ypfqb6dk94119";
-      name = "ffmpegthumbs-15.12.3.tar.xz";
-    };
-  };
-  filelight = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/filelight-15.12.3.tar.xz";
-      sha256 = "1s31q8x2yywi2v8kql7zw5yz9r05v1509334kwlyyfz63zz54kgm";
-      name = "filelight-15.12.3.tar.xz";
-    };
-  };
-  gpgmepp = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/gpgmepp-15.12.3.tar.xz";
-      sha256 = "1vrr3i5d9nfyvn5v1hn6rxi3hkw4gi1bj7plnd4fhbl3s4nfhlsp";
-      name = "gpgmepp-15.12.3.tar.xz";
-    };
-  };
-  granatier = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/granatier-15.12.3.tar.xz";
-      sha256 = "1mjwgw4laxlkpy7zjd0jj7i2nq9mqpzzz048fw0swkndbh1ykrnc";
-      name = "granatier-15.12.3.tar.xz";
-    };
-  };
-  gwenview = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/gwenview-15.12.3.tar.xz";
-      sha256 = "11wia3ljhwxfqbakiavi9b0h59fa2l5i1skgkbpnnglafj6j9dn9";
-      name = "gwenview-15.12.3.tar.xz";
-    };
-  };
-  jovie = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/jovie-15.12.3.tar.xz";
-      sha256 = "07rmig3zfxhipf817gvphc68gm9zkliiwznw06z76zlpavcmmlgp";
-      name = "jovie-15.12.3.tar.xz";
-    };
-  };
-  juk = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/juk-15.12.3.tar.xz";
-      sha256 = "1nbjv5vdxb3n5m213s7srfxh38y7bavvib9v4maabg84q84c4531";
-      name = "juk-15.12.3.tar.xz";
-    };
-  };
-  kaccessible = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kaccessible-15.12.3.tar.xz";
-      sha256 = "0pg7jc7y6c8x246qyn0f9qdl38cg055bj4cfvnlp9bqkq69r4mw4";
-      name = "kaccessible-15.12.3.tar.xz";
-    };
-  };
-  kaccounts-integration = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kaccounts-integration-15.12.3.tar.xz";
-      sha256 = "0l3x3fgj7wvhlzx73qi0qb8yhk305yw71jrv8x4vvaagw0ffmkb9";
-      name = "kaccounts-integration-15.12.3.tar.xz";
-    };
-  };
-  kaccounts-providers = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kaccounts-providers-15.12.3.tar.xz";
-      sha256 = "0lmsv1296zgcrzlsidfwv4wlc6vdiaznbaw45xzfy6ki6yfldwc9";
-      name = "kaccounts-providers-15.12.3.tar.xz";
-    };
-  };
-  kajongg = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kajongg-15.12.3.tar.xz";
-      sha256 = "13r7mgdmcv3ywn6ni7l1y9g021jrqga1lc9q4i4h4pi4ymc8vqn3";
-      name = "kajongg-15.12.3.tar.xz";
-    };
-  };
-  kalarmcal = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kalarmcal-15.12.3.tar.xz";
-      sha256 = "15cby2615r420zzfx7h2fpb0vsmnrbrr1l62arx2vswpb694d0hi";
-      name = "kalarmcal-15.12.3.tar.xz";
-    };
-  };
-  kalgebra = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kalgebra-15.12.3.tar.xz";
-      sha256 = "0da88b30yi0f5h2alysmd1z94bzb9006zbh7939sx1v4fwg8nvha";
-      name = "kalgebra-15.12.3.tar.xz";
-    };
-  };
-  kalzium = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kalzium-15.12.3.tar.xz";
-      sha256 = "0lrca50kczjynhn7c9b2sls6pjr7f86k69yq7b7krf3xk59a1hm1";
-      name = "kalzium-15.12.3.tar.xz";
-    };
-  };
-  kamera = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kamera-15.12.3.tar.xz";
-      sha256 = "1azzvdj0gmafjkq7w19ns1mxjm240p0yx7cpq9dqhz0hhyl63666";
-      name = "kamera-15.12.3.tar.xz";
-    };
-  };
-  kanagram = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kanagram-15.12.3.tar.xz";
-      sha256 = "1adhc1f4hdrgc780v1yadhjpb1dbydwh1xzvgwpd953df7pfxzzj";
-      name = "kanagram-15.12.3.tar.xz";
-    };
-  };
-  kapman = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kapman-15.12.3.tar.xz";
-      sha256 = "0iks3c18dqxds55fmf0fi93lbh14mfdhjh82xx4hc1fn9j8xhfw5";
-      name = "kapman-15.12.3.tar.xz";
-    };
-  };
-  kapptemplate = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kapptemplate-15.12.3.tar.xz";
-      sha256 = "1d1z6j5w80cjs8ls6c44sn0wwa1z4nly9gkk6qr47j8265a1rqnx";
-      name = "kapptemplate-15.12.3.tar.xz";
-    };
-  };
-  kate = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kate-15.12.3.tar.xz";
-      sha256 = "1yxqs6j41cpx4zws5hfs7j01gqn47b6inddifbwglrp5w9j33wpv";
-      name = "kate-15.12.3.tar.xz";
-    };
-  };
-  katomic = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/katomic-15.12.3.tar.xz";
-      sha256 = "0ydflzaxfxbk4yb26j4yziywr72dijva5g3xi9car3b0hckvqpf0";
-      name = "katomic-15.12.3.tar.xz";
-    };
-  };
-  kblackbox = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kblackbox-15.12.3.tar.xz";
-      sha256 = "1yzw61b62plad78wchids243x4lb5bzla3zrlmi3lv5q3g7imz0f";
-      name = "kblackbox-15.12.3.tar.xz";
-    };
-  };
-  kblocks = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kblocks-15.12.3.tar.xz";
-      sha256 = "0hgmm4gyysn9k031im3xk7aiawavv4920y8xd44scxlcwxfid8cw";
-      name = "kblocks-15.12.3.tar.xz";
-    };
-  };
-  kblog = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kblog-15.12.3.tar.xz";
-      sha256 = "01z3n0lzg9d6ygqn87yvi8wg6yyg5b8jhf96ywcmb5zzacamb2hq";
-      name = "kblog-15.12.3.tar.xz";
-    };
-  };
-  kbounce = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kbounce-15.12.3.tar.xz";
-      sha256 = "1gbks7hyis7czvvvqb53qwfkbzmlwg85d51m5mg1m54qixq4blq9";
-      name = "kbounce-15.12.3.tar.xz";
-    };
-  };
-  kbreakout = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kbreakout-15.12.3.tar.xz";
-      sha256 = "01d7i3ga4sdgvvyl4s77i9x15f80nbh3kcqmwmrj511icvynzkl8";
-      name = "kbreakout-15.12.3.tar.xz";
-    };
-  };
-  kbruch = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kbruch-15.12.3.tar.xz";
-      sha256 = "1y4dipifj3dz78y6h7852840msg80iwix427l6wxb8ybyzhapmz1";
-      name = "kbruch-15.12.3.tar.xz";
-    };
-  };
-  kcachegrind = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kcachegrind-15.12.3.tar.xz";
-      sha256 = "0zprqhzqlhgvw3fyvqs4cdkmxgibw8l8i15ng6badnmdyi5dkz29";
-      name = "kcachegrind-15.12.3.tar.xz";
-    };
-  };
-  kcalc = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kcalc-15.12.3.tar.xz";
-      sha256 = "00138746j1j92dkc22c680wi9qqc891040d2b0i5fi1hp1a3z2r4";
-      name = "kcalc-15.12.3.tar.xz";
-    };
-  };
-  kcalcore = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kcalcore-15.12.3.tar.xz";
-      sha256 = "1zdkqxli6gr65947xgwsbyl84ar0px6flbky0zjy1i4h9jiysfan";
-      name = "kcalcore-15.12.3.tar.xz";
-    };
-  };
-  kcalutils = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kcalutils-15.12.3.tar.xz";
-      sha256 = "0l65bc71i734j700akkr1ksjv5q09f7v2dfqcnciabqiphchr5cd";
-      name = "kcalutils-15.12.3.tar.xz";
-    };
-  };
-  kcharselect = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kcharselect-15.12.3.tar.xz";
-      sha256 = "0ahk95k0vssk7kdsdddz1s1n3hzy4049s0dq4j5kiill3j5z47ba";
-      name = "kcharselect-15.12.3.tar.xz";
-    };
-  };
-  kcolorchooser = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kcolorchooser-15.12.3.tar.xz";
-      sha256 = "0paki5clb420w8fhx9y9cyxrf86nz1bp5w6jgkyk5fqdw69d77wk";
-      name = "kcolorchooser-15.12.3.tar.xz";
-    };
-  };
-  kcontacts = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kcontacts-15.12.3.tar.xz";
-      sha256 = "0xavlrf2zxvizv1w620w2wp46qx1267df7qilmws50qmyzdzd8pz";
-      name = "kcontacts-15.12.3.tar.xz";
-    };
-  };
-  kcron = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kcron-15.12.3.tar.xz";
-      sha256 = "1dwcqng0128n2d9lk059b94vzyn98xm0yx34wp5qibqg8c7a2z0z";
-      name = "kcron-15.12.3.tar.xz";
-    };
-  };
-  kde-baseapps = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kde-baseapps-15.12.3.tar.xz";
-      sha256 = "1rqdbv5lhy7k8i4csp1lqvril7df12lz9vvjqnq7ccbbn67yjcfk";
-      name = "kde-baseapps-15.12.3.tar.xz";
-    };
-  };
-  kdebugsettings = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kdebugsettings-15.12.3.tar.xz";
-      sha256 = "1ik2j2i9k3rcfznwia9fxbivsva2ngb31wzrdciircl6i55k4sdd";
-      name = "kdebugsettings-15.12.3.tar.xz";
-    };
-  };
-  kde-dev-scripts = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kde-dev-scripts-15.12.3.tar.xz";
-      sha256 = "0cvcd2yv0xkk0q6zhpyqv0bjnpy6s09aw3kjjyyq5ddai5m5hp4q";
-      name = "kde-dev-scripts-15.12.3.tar.xz";
-    };
-  };
-  kde-dev-utils = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kde-dev-utils-15.12.3.tar.xz";
-      sha256 = "1k0d7z7rm6dgzy56dggxjwzzhz9ar2wfmvjs257l6lbjxxxry2gc";
-      name = "kde-dev-utils-15.12.3.tar.xz";
-    };
-  };
-  kdeedu-data = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kdeedu-data-15.12.3.tar.xz";
-      sha256 = "18jssqnkjxxz98rmzd4gv0ix1zbb60qv22k150lqp32kckmgkn0y";
-      name = "kdeedu-data-15.12.3.tar.xz";
-    };
-  };
-  kdegraphics-mobipocket = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kdegraphics-mobipocket-15.12.3.tar.xz";
-      sha256 = "05fhnh2qs1mgz1hfdvqb5dfd4h2vsz00hb2vl902qprnsjlpc6fb";
-      name = "kdegraphics-mobipocket-15.12.3.tar.xz";
-    };
-  };
-  kdegraphics-strigi-analyzer = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kdegraphics-strigi-analyzer-15.12.3.tar.xz";
-      sha256 = "1bfxmv9pxxd5w2ppm673sdg459w04493p7lp8rwd3n7aa5dhw5fp";
-      name = "kdegraphics-strigi-analyzer-15.12.3.tar.xz";
-    };
-  };
-  kdegraphics-thumbnailers = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kdegraphics-thumbnailers-15.12.3.tar.xz";
-      sha256 = "1limkjpdd8n8hcj3ysr3zwa0fyydfjb1m5rl9lwb9mb08bl5qg70";
-      name = "kdegraphics-thumbnailers-15.12.3.tar.xz";
-    };
-  };
-  kde-l10n-ar = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-ar-15.12.3.tar.xz";
-      sha256 = "1s1xi98zk277rkfiip568712yammb30ld828rspxrl51ysqaj6gs";
-      name = "kde-l10n-ar-15.12.3.tar.xz";
-    };
-  };
-  kde-l10n-bg = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-bg-15.12.3.tar.xz";
-      sha256 = "19yz3x4f2mkqfpa37gzgkqmmka1xs5fnr54w7w0lz7scmi3pfqyp";
-      name = "kde-l10n-bg-15.12.3.tar.xz";
-    };
-  };
-  kde-l10n-bs = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-bs-15.12.3.tar.xz";
-      sha256 = "1k8kawr0psvlg6cgryqwwjb59g209bz08n8h7jg5h6vkb784v3bb";
-      name = "kde-l10n-bs-15.12.3.tar.xz";
-    };
-  };
-  kde-l10n-ca = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-ca-15.12.3.tar.xz";
-      sha256 = "0hf6cml2hw5mj5iwa5cbp56a6ns3qzy21c0c167p6yp2i6kshzcb";
-      name = "kde-l10n-ca-15.12.3.tar.xz";
-    };
-  };
-  kde-l10n-ca_valencia = {
-    version = "ca_valencia-15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-ca@valencia-15.12.3.tar.xz";
-      sha256 = "0ibamck48cklkx6pjvcyw9bjfwnzib82822pagwrzgrr3g51djgf";
-      name = "kde-l10n-ca_valencia-15.12.3.tar.xz";
-    };
-  };
-  kde-l10n-cs = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-cs-15.12.3.tar.xz";
-      sha256 = "1vp1aisfp0qw94w1kn66sxa79askj8yqn70adhf6q37rc8x3hz6z";
-      name = "kde-l10n-cs-15.12.3.tar.xz";
-    };
-  };
-  kde-l10n-da = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-da-15.12.3.tar.xz";
-      sha256 = "0z7p992xinf0hw646mp5bgi93890kivs8kn407m1m4m0334m687c";
-      name = "kde-l10n-da-15.12.3.tar.xz";
-    };
-  };
-  kde-l10n-de = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-de-15.12.3.tar.xz";
-      sha256 = "0f2z6qpv6qzajmh91skqbx6vn14ih74r3yzavj9xwzw940apiw34";
-      name = "kde-l10n-de-15.12.3.tar.xz";
-    };
-  };
-  kde-l10n-el = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-el-15.12.3.tar.xz";
-      sha256 = "0pdx8zlv2vv33iq2581yl67c3ly37s7hhg3m9lnnlm3wnybj658r";
-      name = "kde-l10n-el-15.12.3.tar.xz";
-    };
-  };
-  kde-l10n-en_GB = {
-    version = "en_GB-15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-en_GB-15.12.3.tar.xz";
-      sha256 = "041hwzh05ryqkzll6klva9cq7n0mcyqi8b7pgx0argkc68mn123y";
-      name = "kde-l10n-en_GB-15.12.3.tar.xz";
-    };
-  };
-  kde-l10n-eo = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-eo-15.12.3.tar.xz";
-      sha256 = "1nrrk5a9m15xyj97shpxwnw4vjnafmwh25mq8906z150mr8fy4na";
-      name = "kde-l10n-eo-15.12.3.tar.xz";
-    };
-  };
-  kde-l10n-es = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-es-15.12.3.tar.xz";
-      sha256 = "0bhws59jd9vbfdy7kv8d7gpsg5a39z4jkypd3pyqk98v0ahxlj5p";
-      name = "kde-l10n-es-15.12.3.tar.xz";
-    };
-  };
-  kde-l10n-et = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-et-15.12.3.tar.xz";
-      sha256 = "0lafw4b9qdfy091w5dvhp9idn29p7in05p8jlvpa39v2cxmp271q";
-      name = "kde-l10n-et-15.12.3.tar.xz";
-    };
-  };
-  kde-l10n-eu = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-eu-15.12.3.tar.xz";
-      sha256 = "0p7lrd3k3mjxnhk4mr1p6znjp8j14xr93lg83s3v90w4vd34frsz";
-      name = "kde-l10n-eu-15.12.3.tar.xz";
-    };
-  };
-  kde-l10n-fa = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-fa-15.12.3.tar.xz";
-      sha256 = "0gzx0bz9gv4kwd89ryny9qf4d7fjvicai54ryk3z3qibs3sy3g66";
-      name = "kde-l10n-fa-15.12.3.tar.xz";
-    };
-  };
-  kde-l10n-fi = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-fi-15.12.3.tar.xz";
-      sha256 = "1nh79mkcn5la6wnbpclcbcg6gia6srcv87462wax4sbhmz7b3gh8";
-      name = "kde-l10n-fi-15.12.3.tar.xz";
-    };
-  };
-  kde-l10n-fr = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-fr-15.12.3.tar.xz";
-      sha256 = "1gwwc596p6mqjbjlhcz57hkc30slb5r3qgmnm5x68jlp4glhyyfm";
-      name = "kde-l10n-fr-15.12.3.tar.xz";
-    };
-  };
-  kde-l10n-ga = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-ga-15.12.3.tar.xz";
-      sha256 = "134r2i4f6j2db24rlc2y50da98spjwv5crd3yw27k4m2whw28g1q";
-      name = "kde-l10n-ga-15.12.3.tar.xz";
-    };
-  };
-  kde-l10n-gl = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-gl-15.12.3.tar.xz";
-      sha256 = "1bpki1gk1gc5rqrrwkhil44mxmh76v5fygwvvlglk7rwyxkm0bfn";
-      name = "kde-l10n-gl-15.12.3.tar.xz";
-    };
-  };
-  kde-l10n-he = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-he-15.12.3.tar.xz";
-      sha256 = "12da700i3dbim64f5ybgfp5s8rky8s9828qklsnvrw6gj9i1qdh8";
-      name = "kde-l10n-he-15.12.3.tar.xz";
-    };
-  };
-  kde-l10n-hi = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-hi-15.12.3.tar.xz";
-      sha256 = "0r5z5652j52j16gdb08z1wnfa8vr871f7msip2xikmfm3kcgiwki";
-      name = "kde-l10n-hi-15.12.3.tar.xz";
-    };
-  };
-  kde-l10n-hr = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-hr-15.12.3.tar.xz";
-      sha256 = "1mz95pqd3pslg1f5cl1n8s35j19wijhhqpa64m6ahjm82p3dfqiz";
-      name = "kde-l10n-hr-15.12.3.tar.xz";
-    };
-  };
-  kde-l10n-hu = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-hu-15.12.3.tar.xz";
-      sha256 = "0gz3lvzpf58j0jdzmjg16nkz3078gjzlfwbanx5w6f4dfqp9ha4q";
-      name = "kde-l10n-hu-15.12.3.tar.xz";
-    };
-  };
-  kde-l10n-ia = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-ia-15.12.3.tar.xz";
-      sha256 = "0flv662j20sqfd0cgy2p6wr2fk41sq47sxf2gkbmhr7n7n6an1fr";
-      name = "kde-l10n-ia-15.12.3.tar.xz";
-    };
-  };
-  kde-l10n-id = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-id-15.12.3.tar.xz";
-      sha256 = "07r4y1hnqz3xb649gvp818alwzyci8657fi4f3lpj8z54dngddx0";
-      name = "kde-l10n-id-15.12.3.tar.xz";
-    };
-  };
-  kde-l10n-is = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-is-15.12.3.tar.xz";
-      sha256 = "14xs3n9468l4qgw5bpm57k4xmh37ixjr3sq370fbfmbrifrydrsb";
-      name = "kde-l10n-is-15.12.3.tar.xz";
-    };
-  };
-  kde-l10n-it = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-it-15.12.3.tar.xz";
-      sha256 = "0arvj4ms0qc283i1xqdmh6x8qjgjfsld57y341xk55b1birq87dp";
-      name = "kde-l10n-it-15.12.3.tar.xz";
-    };
-  };
-  kde-l10n-ja = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-ja-15.12.3.tar.xz";
-      sha256 = "1fby4r9aam0f31xlp00lmnhi156wfb3rbvwffvhm9qwam3gnypv2";
-      name = "kde-l10n-ja-15.12.3.tar.xz";
-    };
-  };
-  kde-l10n-kk = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-kk-15.12.3.tar.xz";
-      sha256 = "04yf8m84ywf6bzq3dfxxxcgz2syy4i72q5xjq3sba76p1w9wz8hf";
-      name = "kde-l10n-kk-15.12.3.tar.xz";
-    };
-  };
-  kde-l10n-km = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-km-15.12.3.tar.xz";
-      sha256 = "0q70agf08ln5xfg4hc0rw39qiq4mn0jq418d8f53qkdjvrj07hs2";
-      name = "kde-l10n-km-15.12.3.tar.xz";
-    };
-  };
-  kde-l10n-ko = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-ko-15.12.3.tar.xz";
-      sha256 = "0545nv721g2xlljv1jbq42j9b6g2l19yclv0lmy07dp0fx0ms2kc";
-      name = "kde-l10n-ko-15.12.3.tar.xz";
-    };
-  };
-  kde-l10n-lt = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-lt-15.12.3.tar.xz";
-      sha256 = "0sc9g2iya3k4pzwmlcjlyvf25dag9z2ckbk2gz0fzzrwgvn61875";
-      name = "kde-l10n-lt-15.12.3.tar.xz";
-    };
-  };
-  kde-l10n-lv = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-lv-15.12.3.tar.xz";
-      sha256 = "0mllwxbcvfgvmxcv23azchkvirlamgh16hzi5575qd8mprxxayjx";
-      name = "kde-l10n-lv-15.12.3.tar.xz";
-    };
-  };
-  kde-l10n-mr = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-mr-15.12.3.tar.xz";
-      sha256 = "1sg9s1d6yg6pjjqp986lixg5w8g3y9a0hi15iyv6iww2iwab821w";
-      name = "kde-l10n-mr-15.12.3.tar.xz";
-    };
-  };
-  kde-l10n-nb = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-nb-15.12.3.tar.xz";
-      sha256 = "0841zkw34afiq7kpl65mjxl66fvb7pbc2m5c7cbbpykb92hqy4gw";
-      name = "kde-l10n-nb-15.12.3.tar.xz";
-    };
-  };
-  kde-l10n-nds = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-nds-15.12.3.tar.xz";
-      sha256 = "1y0svbp1fgr6azfqpicvfxz1bbfkkn27l91rl8mhpaqz79zmdsjz";
-      name = "kde-l10n-nds-15.12.3.tar.xz";
-    };
-  };
-  kde-l10n-nl = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-nl-15.12.3.tar.xz";
-      sha256 = "0l2l0hypza8hrrz86pahvkn4qdwg1bzdsv4mk0w3f8anlfv5nlhy";
-      name = "kde-l10n-nl-15.12.3.tar.xz";
-    };
-  };
-  kde-l10n-nn = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-nn-15.12.3.tar.xz";
-      sha256 = "1ryqkbjrc9fam4wlpfx3af5mppajcpf4qj6ghh16y2vjpxmy6226";
-      name = "kde-l10n-nn-15.12.3.tar.xz";
-    };
-  };
-  kde-l10n-pa = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-pa-15.12.3.tar.xz";
-      sha256 = "0dq0sv7yh8xkk5g005q8mh6c5drzp2alday28lz2i4a2wi6m1pbn";
-      name = "kde-l10n-pa-15.12.3.tar.xz";
-    };
-  };
-  kde-l10n-pl = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-pl-15.12.3.tar.xz";
-      sha256 = "186lb0ydgcgwmpjasdjnj1i6cn43m1l26lvh7c97kqmh0k7ixwbl";
-      name = "kde-l10n-pl-15.12.3.tar.xz";
-    };
-  };
-  kde-l10n-pt = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-pt-15.12.3.tar.xz";
-      sha256 = "1s71gn3xb98y5s6ly9qfjh51afk8w8ml3xqiri3vi1c7li3v6kas";
-      name = "kde-l10n-pt-15.12.3.tar.xz";
-    };
-  };
-  kde-l10n-pt_BR = {
-    version = "pt_BR-15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-pt_BR-15.12.3.tar.xz";
-      sha256 = "1iq83ycsilracwa1cml7dliy6vsf7frk4k0rzawnprygnf89iavr";
-      name = "kde-l10n-pt_BR-15.12.3.tar.xz";
-    };
-  };
-  kde-l10n-ro = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-ro-15.12.3.tar.xz";
-      sha256 = "1i4kmxjc9mr8ybg4gnbhdanp7s5illknaxh0av8v45an7j051vjd";
-      name = "kde-l10n-ro-15.12.3.tar.xz";
-    };
-  };
-  kde-l10n-ru = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-ru-15.12.3.tar.xz";
-      sha256 = "1xbd5nvyf6ckdry0c5d52s3qrnqbnmndbnbxz7ayqllz6b61vmp0";
-      name = "kde-l10n-ru-15.12.3.tar.xz";
-    };
-  };
-  kde-l10n-sk = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-sk-15.12.3.tar.xz";
-      sha256 = "03i2ngldf35ix4pgyv6pjjzfg4i330dmyml9rd9v6cspm0vpq7r2";
-      name = "kde-l10n-sk-15.12.3.tar.xz";
-    };
-  };
-  kde-l10n-sl = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-sl-15.12.3.tar.xz";
-      sha256 = "08cp9dzvii5afjck3wx05q7mjwsd10g1yg2bsxw4qldjzad31xhq";
-      name = "kde-l10n-sl-15.12.3.tar.xz";
-    };
-  };
-  kde-l10n-sr = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-sr-15.12.3.tar.xz";
-      sha256 = "0j8gfj1qx10yllj5vq85h4pw2l8hq1kimgm315v4wwyr4jyf4vi7";
-      name = "kde-l10n-sr-15.12.3.tar.xz";
-    };
-  };
-  kde-l10n-sv = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-sv-15.12.3.tar.xz";
-      sha256 = "0ijyxzm7akcpkf5vwppay063vkbn6rz8irc4yi9flc5mm1rpmb64";
-      name = "kde-l10n-sv-15.12.3.tar.xz";
-    };
-  };
-  kde-l10n-tr = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-tr-15.12.3.tar.xz";
-      sha256 = "1yyz8zf10jn8v5vz2h08m88l12gz95hsdvld4h8imbqc4b8ih9xh";
-      name = "kde-l10n-tr-15.12.3.tar.xz";
-    };
-  };
-  kde-l10n-ug = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-ug-15.12.3.tar.xz";
-      sha256 = "0db4pf7j6m376irsby31qz42z4d0m45i1zhqmn5mplrq8hi3sy5n";
-      name = "kde-l10n-ug-15.12.3.tar.xz";
-    };
-  };
-  kde-l10n-uk = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-uk-15.12.3.tar.xz";
-      sha256 = "0xsn75g7dw8p0gxfmk2xkr6cix5wvglj2hhbbcqdzixm0bnshiwj";
-      name = "kde-l10n-uk-15.12.3.tar.xz";
-    };
-  };
-  kde-l10n-wa = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-wa-15.12.3.tar.xz";
-      sha256 = "1zx5k0hnh17015c1jcf3hgbi3abnsrdr5zl9m06lvsccl32rcgla";
-      name = "kde-l10n-wa-15.12.3.tar.xz";
-    };
-  };
-  kde-l10n-zh_CN = {
-    version = "zh_CN-15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-zh_CN-15.12.3.tar.xz";
-      sha256 = "0lfm6q4xk5c5rywivhg6dbs5dczddixz4jjfdz5gb2xmnv5ns9z7";
-      name = "kde-l10n-zh_CN-15.12.3.tar.xz";
-    };
-  };
-  kde-l10n-zh_TW = {
-    version = "zh_TW-15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kde-l10n/kde-l10n-zh_TW-15.12.3.tar.xz";
-      sha256 = "1s0gp678sq6zxk9gkzhmkx1c0nxzx0n08pszv737a76lnnzg0fb0";
-      name = "kde-l10n-zh_TW-15.12.3.tar.xz";
-    };
-  };
-  kdelibs = {
-    version = "4.14.18";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kdelibs-4.14.18.tar.xz";
-      sha256 = "0qyfsci3z4vm79c5xkdk45qlh63as1iyfdgk3iny6q9c5wwqd3kp";
-      name = "kdelibs-4.14.18.tar.xz";
-    };
-  };
-  kdenetwork-filesharing = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kdenetwork-filesharing-15.12.3.tar.xz";
-      sha256 = "0psln12gnyf7pp6r01p7bi5lygqpg5frfkc8hh1wn982i1vbkn8s";
-      name = "kdenetwork-filesharing-15.12.3.tar.xz";
-    };
-  };
-  kdenetwork-strigi-analyzers = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kdenetwork-strigi-analyzers-15.12.3.tar.xz";
-      sha256 = "0yisyhic3nmbj7a0csjafhl3mjcg3hqa8pwfrkwwm848b67n9qls";
-      name = "kdenetwork-strigi-analyzers-15.12.3.tar.xz";
-    };
-  };
-  kdenlive = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kdenlive-15.12.3.tar.xz";
-      sha256 = "0svw8dms0qha4mbnyldm0cwvy52ikly3x26b9q8psayjd0pbbb5p";
-      name = "kdenlive-15.12.3.tar.xz";
-    };
-  };
-  kdepim = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kdepim-15.12.3.tar.xz";
-      sha256 = "0niy2wfrarnrphwwi6jp2g0xj5dbvvcmdjgprdrw3zn7ni7kxa9q";
-      name = "kdepim-15.12.3.tar.xz";
-    };
-  };
-  kdepimlibs = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kdepimlibs-15.12.3.tar.xz";
-      sha256 = "17dn4yals62657dnx5adm9622z5bmwzl2nqgidcvflamvnvjj2b1";
-      name = "kdepimlibs-15.12.3.tar.xz";
-    };
-  };
-  kdepim-runtime = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kdepim-runtime-15.12.3.tar.xz";
-      sha256 = "1ljsn2b5ylzsr8mm48l4k84bgc9d6h9ilv46zgiciisgqs0xd4y3";
-      name = "kdepim-runtime-15.12.3.tar.xz";
-    };
-  };
-  kde-runtime = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kde-runtime-15.12.3.tar.xz";
-      sha256 = "097h9kjqikr4qxj6swkh2r90havaw6zxs12kkic0qkmvbxxa6qdj";
-      name = "kde-runtime-15.12.3.tar.xz";
-    };
-  };
-  kdesdk-kioslaves = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kdesdk-kioslaves-15.12.3.tar.xz";
-      sha256 = "0605aldqng33cd44qap2bargsf99jlrclsw84pv2hh4m33qlxkhi";
-      name = "kdesdk-kioslaves-15.12.3.tar.xz";
-    };
-  };
-  kdesdk-strigi-analyzers = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kdesdk-strigi-analyzers-15.12.3.tar.xz";
-      sha256 = "0jc2dvnpmr6hw58nfmnw7lmys74zgl0m5vbmp27vkain95wab17c";
-      name = "kdesdk-strigi-analyzers-15.12.3.tar.xz";
-    };
-  };
-  kdesdk-thumbnailers = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kdesdk-thumbnailers-15.12.3.tar.xz";
-      sha256 = "0k67zx5c2qsrk3nnnrs5ir0z8c42lp4ig9l82brv35iw3frgfyr9";
-      name = "kdesdk-thumbnailers-15.12.3.tar.xz";
-    };
-  };
-  kdewebdev = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kdewebdev-15.12.3.tar.xz";
-      sha256 = "1hn0s72695mm7b3lqx45d2rbm639p3la1v95274il8nd6qnxfd1h";
-      name = "kdewebdev-15.12.3.tar.xz";
-    };
-  };
-  kdf = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kdf-15.12.3.tar.xz";
-      sha256 = "0h37405qiz5478fdm8k7h5hmpmznzrrb6a55grcc9jnp4qxqhdk7";
-      name = "kdf-15.12.3.tar.xz";
-    };
-  };
-  kdiamond = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kdiamond-15.12.3.tar.xz";
-      sha256 = "1p5a26dw4sasfk0bmf79zwcp60s4wqk65169vn73nn51dkyplr0z";
-      name = "kdiamond-15.12.3.tar.xz";
-    };
-  };
-  kfloppy = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kfloppy-15.12.3.tar.xz";
-      sha256 = "1dsnv89n48aj1pcx6r64ds9pkafb0d8gpmw8ps0mhiwyhzjik0af";
-      name = "kfloppy-15.12.3.tar.xz";
-    };
-  };
-  kfourinline = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kfourinline-15.12.3.tar.xz";
-      sha256 = "1j0yhwwsr6kxynhyj8m9bwckz49rp33y8b7br8s4i186byjviw6f";
-      name = "kfourinline-15.12.3.tar.xz";
-    };
-  };
-  kgeography = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kgeography-15.12.3.tar.xz";
-      sha256 = "19sqrgj08ilf43za4l1apz5whpnxhy9aafygxnklyl6xwkldfa56";
-      name = "kgeography-15.12.3.tar.xz";
-    };
-  };
-  kget = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kget-15.12.3.tar.xz";
-      sha256 = "0ks210pxs4phrc0k05zaf0ip91yzg5xycfdac1rz4snn3wd5x8x5";
-      name = "kget-15.12.3.tar.xz";
-    };
-  };
-  kgoldrunner = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kgoldrunner-15.12.3.tar.xz";
-      sha256 = "19pvabs8fbzq6j9l8v2bdvz8rbzhmav14hymxf0fndg3b5qi1v46";
-      name = "kgoldrunner-15.12.3.tar.xz";
-    };
-  };
-  kgpg = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kgpg-15.12.3.tar.xz";
-      sha256 = "1fw74kpd8f2hm82l2sn8nvi4dzrw1i2xgd5dkfhj1c8frnp4akrn";
-      name = "kgpg-15.12.3.tar.xz";
-    };
-  };
-  khangman = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/khangman-15.12.3.tar.xz";
-      sha256 = "1a0jbg0xfnjji1y946d8c1dmm8awdf6j4r3w226fmci2q764ap4l";
-      name = "khangman-15.12.3.tar.xz";
-    };
-  };
-  kholidays = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kholidays-15.12.3.tar.xz";
-      sha256 = "1hr253vc5r3fq2vkrl175zql8z146h5zpikq6wlxabh86isri07b";
-      name = "kholidays-15.12.3.tar.xz";
-    };
-  };
-  kidentitymanagement = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kidentitymanagement-15.12.3.tar.xz";
-      sha256 = "16v4ykbgiw06xdrd74gnjhwlvdjs926zdfmnn1gzhf2isyz0c4jp";
-      name = "kidentitymanagement-15.12.3.tar.xz";
-    };
-  };
-  kig = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kig-15.12.3.tar.xz";
-      sha256 = "12wf10d9579jhygrch4avacnxkhrmiyp2ci3kccyvva09cjdahpb";
-      name = "kig-15.12.3.tar.xz";
-    };
-  };
-  kigo = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kigo-15.12.3.tar.xz";
-      sha256 = "15n6chq4mjynh5b4g2mbk1qjmgxlfzln5fl19i6qi11xd5yanz50";
-      name = "kigo-15.12.3.tar.xz";
-    };
-  };
-  killbots = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/killbots-15.12.3.tar.xz";
-      sha256 = "14mlmi958sz3nf5l1v2mq5ahfiqnb3m9a32hqfz2d5vzczrvarxv";
-      name = "killbots-15.12.3.tar.xz";
-    };
-  };
-  kimap = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kimap-15.12.3.tar.xz";
-      sha256 = "1qk68zjw31hfxr577idn2rirmb8pwxxqcwz56jg9kc6mxff6k2sw";
-      name = "kimap-15.12.3.tar.xz";
-    };
-  };
-  kio-extras = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kio-extras-15.12.3.tar.xz";
-      sha256 = "1lhg5g9fmfsg7yl0kzi779wilgcfdcx0zhzryqz307dhmvbffs87";
-      name = "kio-extras-15.12.3.tar.xz";
-    };
-  };
-  kiriki = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kiriki-15.12.3.tar.xz";
-      sha256 = "0bff99yxlaqa46d5mgv6qnscyhidbi6kg0zb10b7jl4wr60d1gkm";
-      name = "kiriki-15.12.3.tar.xz";
-    };
-  };
-  kiten = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kiten-15.12.3.tar.xz";
-      sha256 = "067lcpgp3kc4rl2zz4a8rrm0pdgwsm8fwvrzay4dpghwznkmr7s5";
-      name = "kiten-15.12.3.tar.xz";
-    };
-  };
-  kjumpingcube = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kjumpingcube-15.12.3.tar.xz";
-      sha256 = "1b6bsp7vmnik1119yx7vgsgn55pz250mqd5fmqxi9khllz1alsh1";
-      name = "kjumpingcube-15.12.3.tar.xz";
-    };
-  };
-  kldap = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kldap-15.12.3.tar.xz";
-      sha256 = "18rdad71x5h4710bq9b0207rsfnlb7jqriv5zp8qmiz3zf04jwvc";
-      name = "kldap-15.12.3.tar.xz";
-    };
-  };
-  klettres = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/klettres-15.12.3.tar.xz";
-      sha256 = "1a89w5r1in86k101qjg40q32c5rcgp4fbcydysa40knawnryfd1c";
-      name = "klettres-15.12.3.tar.xz";
-    };
-  };
-  klickety = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/klickety-15.12.3.tar.xz";
-      sha256 = "1sa3ilz14y1hd7m2czdqsrc5ih2a9gq8a26xh7wy1g4w32c59qp2";
-      name = "klickety-15.12.3.tar.xz";
-    };
-  };
-  klines = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/klines-15.12.3.tar.xz";
-      sha256 = "1w8vni5m1j2ac6c72z5g6jdd6qml4jqn140a6i8sb5jkr6b8ccwb";
-      name = "klines-15.12.3.tar.xz";
-    };
-  };
-  kmag = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kmag-15.12.3.tar.xz";
-      sha256 = "0ng6rz93hxpzyk9gj91hjlpf7phpcg88wvn00d8f7ddfy0fydnaa";
-      name = "kmag-15.12.3.tar.xz";
-    };
-  };
-  kmahjongg = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kmahjongg-15.12.3.tar.xz";
-      sha256 = "0d6zcyf7l98albi7ikpb16wglvbvh4c2x0y4rpzwy6pbskkmvapd";
-      name = "kmahjongg-15.12.3.tar.xz";
-    };
-  };
-  kmailtransport = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kmailtransport-15.12.3.tar.xz";
-      sha256 = "1p5qkk8qz6072yr6f9gzhzpk05qny8zxaiyaghc9vgh0dq2zpsyq";
-      name = "kmailtransport-15.12.3.tar.xz";
-    };
-  };
-  kmbox = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kmbox-15.12.3.tar.xz";
-      sha256 = "0p2zbxd2my1z48i5xr2nb9fnzqjnvgpfc8m7klp2b443lgmnwg3v";
-      name = "kmbox-15.12.3.tar.xz";
-    };
-  };
-  kmime = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kmime-15.12.3.tar.xz";
-      sha256 = "1as3pql5gxqf9m36qxl78cfzcjxwf41l57b7w9wy4p5wi1izdmba";
-      name = "kmime-15.12.3.tar.xz";
-    };
-  };
-  kmines = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kmines-15.12.3.tar.xz";
-      sha256 = "01090mwigxx5lwrzywnq8qwxqflylrf807rfjqa0s4na9qx2v682";
-      name = "kmines-15.12.3.tar.xz";
-    };
-  };
-  kmix = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kmix-15.12.3.tar.xz";
-      sha256 = "16yrfgg3cvjbypmz6p8zqsvp2qdihlq4d68w46f0m9gnm4dmywf1";
-      name = "kmix-15.12.3.tar.xz";
-    };
-  };
-  kmousetool = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kmousetool-15.12.3.tar.xz";
-      sha256 = "171lcfwrkbfwhvdfi7y2xprv6fb6xn5yd6zi3ifyka1jgl0z3nr8";
-      name = "kmousetool-15.12.3.tar.xz";
-    };
-  };
-  kmouth = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kmouth-15.12.3.tar.xz";
-      sha256 = "1fdgrpv7nqpfcrq5p2d22ysanj3fmwxy1lb2hxy75k1f051jyzvr";
-      name = "kmouth-15.12.3.tar.xz";
-    };
-  };
-  kmplot = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kmplot-15.12.3.tar.xz";
-      sha256 = "1wxw65chz8ibf0ad6262qpr1761kx8k7mdin5wmiczakwkkpn7r1";
-      name = "kmplot-15.12.3.tar.xz";
-    };
-  };
-  knavalbattle = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/knavalbattle-15.12.3.tar.xz";
-      sha256 = "1ma4dvrprlb0rdfq2iy56cvgfv6skm32yv6lk5vbqnp3mw7amyjz";
-      name = "knavalbattle-15.12.3.tar.xz";
-    };
-  };
-  knetwalk = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/knetwalk-15.12.3.tar.xz";
-      sha256 = "1iqvp9pmiav0w03p0xfri7l0dx0h97283pyz6xhfmffvi5vsr1zn";
-      name = "knetwalk-15.12.3.tar.xz";
-    };
-  };
-  kolf = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kolf-15.12.3.tar.xz";
-      sha256 = "0ky9bn8kgirm2shg1vc98q91ab8rx14fm2i4ammx3hjh6qp043hb";
-      name = "kolf-15.12.3.tar.xz";
-    };
-  };
-  kollision = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kollision-15.12.3.tar.xz";
-      sha256 = "0y2bmw2h2big65arfhg8vhppglvw8xf5acmgbx37mnds3pxwqaw1";
-      name = "kollision-15.12.3.tar.xz";
-    };
-  };
-  kolourpaint = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kolourpaint-15.12.3.tar.xz";
-      sha256 = "15ws4hyyq2shygblyp9dvq7dln61dpi3g0frxbxwkk8p3iznwsbw";
-      name = "kolourpaint-15.12.3.tar.xz";
-    };
-  };
-  kompare = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kompare-15.12.3.tar.xz";
-      sha256 = "0lvrhkmdhb74akby2js1hd6avmc5a5w7h2cbb7yw658zmg2xq0lq";
-      name = "kompare-15.12.3.tar.xz";
-    };
-  };
-  konquest = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/konquest-15.12.3.tar.xz";
-      sha256 = "1vgcqmw84ybly4hv8r33jdj0x8dpnfzdl2n7rqxvmb9ma12lc2wy";
-      name = "konquest-15.12.3.tar.xz";
-    };
-  };
-  konsole = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/konsole-15.12.3.tar.xz";
-      sha256 = "1n2zv07hj53yq7msgh2r824c6r9gbvki57njn4c7vpx5fzyiwmjk";
-      name = "konsole-15.12.3.tar.xz";
-    };
-  };
-  kontactinterface = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kontactinterface-15.12.3.tar.xz";
-      sha256 = "0cgb79nmifajs3088pp5qvcbc970grx2irpfdy2nvh451g53jagf";
-      name = "kontactinterface-15.12.3.tar.xz";
-    };
-  };
-  kopete = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kopete-15.12.3.tar.xz";
-      sha256 = "1r8v6l83avyygpw3yjni7bx01jhsnhq41c89c9g800qzl1zy67f8";
-      name = "kopete-15.12.3.tar.xz";
-    };
-  };
-  kpat = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kpat-15.12.3.tar.xz";
-      sha256 = "028vx550fkzqnk4dmkkrmicpr8k8yx9alj6da04p2y8ans70v7q4";
-      name = "kpat-15.12.3.tar.xz";
-    };
-  };
-  kpimtextedit = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kpimtextedit-15.12.3.tar.xz";
-      sha256 = "0jyiwjwz62dk746707z9fs3q0bw6xbz6kg2h92m85060db18vkl5";
-      name = "kpimtextedit-15.12.3.tar.xz";
-    };
-  };
-  kppp = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kppp-15.12.3.tar.xz";
-      sha256 = "17609g9npn8y3wr6zfq00raifw61qmc6qqn0j6mvn47d4942c1zp";
-      name = "kppp-15.12.3.tar.xz";
-    };
-  };
-  kqtquickcharts = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kqtquickcharts-15.12.3.tar.xz";
-      sha256 = "1lyx8m02xqjc8l65plwm12wdyqbspg5qr9hr1wlj6x711amjp7m4";
-      name = "kqtquickcharts-15.12.3.tar.xz";
-    };
-  };
-  krdc = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/krdc-15.12.3.tar.xz";
-      sha256 = "0j05p5j99bbldcnzwd0dqshry7pgb5v2jp2jqg390vfmqmx438sd";
-      name = "krdc-15.12.3.tar.xz";
-    };
-  };
-  kremotecontrol = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kremotecontrol-15.12.3.tar.xz";
-      sha256 = "1yjjb6agh1i3axj82g4zsaygm2x39x1bnq90aiplxn84gh98cnfd";
-      name = "kremotecontrol-15.12.3.tar.xz";
-    };
-  };
-  kreversi = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kreversi-15.12.3.tar.xz";
-      sha256 = "09h1pi4kccy0k0m0zifdlys89j2ybsa9xwp8aqzyifbqi7s874cs";
-      name = "kreversi-15.12.3.tar.xz";
-    };
-  };
-  krfb = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/krfb-15.12.3.tar.xz";
-      sha256 = "1a6ddsjr26lwk7d7isna8shnzciyqghad9nhzn5jgqc56v13hg1m";
-      name = "krfb-15.12.3.tar.xz";
-    };
-  };
-  kross-interpreters = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kross-interpreters-15.12.3.tar.xz";
-      sha256 = "14g1mp0izqqllr75vlbi9yn6awn77zasb42zppqxq1rl11bwp2li";
-      name = "kross-interpreters-15.12.3.tar.xz";
-    };
-  };
-  kruler = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kruler-15.12.3.tar.xz";
-      sha256 = "0i9f2ck55p87npk7xsqgi5zy0a9yiiv4razjdfj7fh8g78xj51yk";
-      name = "kruler-15.12.3.tar.xz";
-    };
-  };
-  ksaneplugin = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/ksaneplugin-15.12.3.tar.xz";
-      sha256 = "0834p0lfbf7l8lknxr0rz1w8j688dld36nyrz6pfk00h06an59h5";
-      name = "ksaneplugin-15.12.3.tar.xz";
-    };
-  };
-  kscd = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kscd-15.12.3.tar.xz";
-      sha256 = "0d82di7sg9mypxk7s24yldjjgwymi2yxwjhai67337wn6ivvw338";
-      name = "kscd-15.12.3.tar.xz";
-    };
-  };
-  kshisen = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kshisen-15.12.3.tar.xz";
-      sha256 = "0aqz8w1rps0g8kvccqpkpmy8g2m5k4bpydz9gdh1nhia5h9558fq";
-      name = "kshisen-15.12.3.tar.xz";
-    };
-  };
-  ksirk = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/ksirk-15.12.3.tar.xz";
-      sha256 = "1z43v25gfv6gzpsm87s84v34389fjvvgq41maa1yzv0p3lj14v86";
-      name = "ksirk-15.12.3.tar.xz";
-    };
-  };
-  ksnakeduel = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/ksnakeduel-15.12.3.tar.xz";
-      sha256 = "1bkbbfvbpihq19z0jvk3ix535y60b7fb943crcflbqyknpnnh038";
-      name = "ksnakeduel-15.12.3.tar.xz";
-    };
-  };
-  kspaceduel = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kspaceduel-15.12.3.tar.xz";
-      sha256 = "0snjlvc56299frj89h41rs6ij85idyzcp8yv6rkc8kqjbdqm8hjj";
-      name = "kspaceduel-15.12.3.tar.xz";
-    };
-  };
-  ksquares = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/ksquares-15.12.3.tar.xz";
-      sha256 = "06ij62n2kbjbgijcw3ddkc3fyl27rgyrkbz3cl5f3ydfyrmsnmzv";
-      name = "ksquares-15.12.3.tar.xz";
-    };
-  };
-  kstars = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kstars-15.12.3.tar.xz";
-      sha256 = "1ka31vbzwdxv16p4nh40g6c6yijczv73y3js1scrc195k6byni5r";
-      name = "kstars-15.12.3.tar.xz";
-    };
-  };
-  ksudoku = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/ksudoku-15.12.3.tar.xz";
-      sha256 = "1132551s0hdabm42jxnbd9q9yiwh40lgfnzm4ccznv02l1g0fp8k";
-      name = "ksudoku-15.12.3.tar.xz";
-    };
-  };
-  ksystemlog = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/ksystemlog-15.12.3.tar.xz";
-      sha256 = "0yiq0kajqjbb3s8ljp11kb83xha4n20v17fk8rnjn9dymvlkmw1j";
-      name = "ksystemlog-15.12.3.tar.xz";
-    };
-  };
-  kteatime = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kteatime-15.12.3.tar.xz";
-      sha256 = "0chf0cbghmf0aj0l0zxinhfpwpr40af3b4r7axkj77lrkkyl1acq";
-      name = "kteatime-15.12.3.tar.xz";
-    };
-  };
-  ktimer = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/ktimer-15.12.3.tar.xz";
-      sha256 = "1sghh5983bzn3qlfm7fs74v6f5djmbixppfw09j8nn9rsmsah30a";
-      name = "ktimer-15.12.3.tar.xz";
-    };
-  };
-  ktnef = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/ktnef-15.12.3.tar.xz";
-      sha256 = "043im3rcw210w90spyxap3pjqfk5dmgk57p2pqkxir6mcsfz9hm8";
-      name = "ktnef-15.12.3.tar.xz";
-    };
-  };
-  ktouch = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/ktouch-15.12.3.tar.xz";
-      sha256 = "1zmzm52pxi3hs7r12qsfmmqf8x7q1aapss2drlmx3r4lfi3hwzsp";
-      name = "ktouch-15.12.3.tar.xz";
-    };
-  };
-  ktp-accounts-kcm = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/ktp-accounts-kcm-15.12.3.tar.xz";
-      sha256 = "1zyprpzwbpvj22wsl6bc75r38bm7rshhl7llyk47rl0v02p8gd7s";
-      name = "ktp-accounts-kcm-15.12.3.tar.xz";
-    };
-  };
-  ktp-approver = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/ktp-approver-15.12.3.tar.xz";
-      sha256 = "01ppnmi7fah8yq4yvhsrz6kask9f1fxhzcvjmjr5igv2d9hfsppw";
-      name = "ktp-approver-15.12.3.tar.xz";
-    };
-  };
-  ktp-auth-handler = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/ktp-auth-handler-15.12.3.tar.xz";
-      sha256 = "1hkc7gkh38vw7l3b8ygywifv60g1chm3xcgklj94dsm3x9j8xbwa";
-      name = "ktp-auth-handler-15.12.3.tar.xz";
-    };
-  };
-  ktp-common-internals = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/ktp-common-internals-15.12.3.tar.xz";
-      sha256 = "13wp73k52nrqml17x9papdi9jymbymrkszag6rmmzmw5rq5kikb6";
-      name = "ktp-common-internals-15.12.3.tar.xz";
-    };
-  };
-  ktp-contact-list = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/ktp-contact-list-15.12.3.tar.xz";
-      sha256 = "1b9ql2435wq410gfxw5ybvlm68pilx8rp8dxbxrs1cw4wrc88mf3";
-      name = "ktp-contact-list-15.12.3.tar.xz";
-    };
-  };
-  ktp-contact-runner = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/ktp-contact-runner-15.12.3.tar.xz";
-      sha256 = "0hnkrnq2kr3jan0pmy82hndji5jvjxpr9sn90s8swwksdv8f2gc9";
-      name = "ktp-contact-runner-15.12.3.tar.xz";
-    };
-  };
-  ktp-desktop-applets = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/ktp-desktop-applets-15.12.3.tar.xz";
-      sha256 = "0pcync77gh55wn9701mviwmnm2ahxqs1rfzw7cxsjvgk4324arzq";
-      name = "ktp-desktop-applets-15.12.3.tar.xz";
-    };
-  };
-  ktp-filetransfer-handler = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/ktp-filetransfer-handler-15.12.3.tar.xz";
-      sha256 = "0ykvly1giqn5nn4vwa7xcdz0q6mrni6raay9krvajk97qcdc5af8";
-      name = "ktp-filetransfer-handler-15.12.3.tar.xz";
-    };
-  };
-  ktp-kded-module = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/ktp-kded-module-15.12.3.tar.xz";
-      sha256 = "0x42cgjiwy4yawial483ilb0sxncnip40ilma0kxzli0nzlbjfq8";
-      name = "ktp-kded-module-15.12.3.tar.xz";
-    };
-  };
-  ktp-send-file = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/ktp-send-file-15.12.3.tar.xz";
-      sha256 = "0bx30sbwbxjgnylx9xzhq5vkisn34xxzqryalvg1lzhqnh338iri";
-      name = "ktp-send-file-15.12.3.tar.xz";
-    };
-  };
-  ktp-text-ui = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/ktp-text-ui-15.12.3.tar.xz";
-      sha256 = "044pfam4i3qs43xgp2q0lsvrfjvbvbywclw4wx22m0i02580llga";
-      name = "ktp-text-ui-15.12.3.tar.xz";
-    };
-  };
-  ktuberling = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/ktuberling-15.12.3.tar.xz";
-      sha256 = "0x73hppzchi5k4y9xd520qllkhn5mhrrmaapnacybb2pbpv58d17";
-      name = "ktuberling-15.12.3.tar.xz";
-    };
-  };
-  kturtle = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kturtle-15.12.3.tar.xz";
-      sha256 = "12x86v658d7by5x1axwchn53fd23yrfavfxn5yy700vbqa6jd8qn";
-      name = "kturtle-15.12.3.tar.xz";
-    };
-  };
-  kubrick = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kubrick-15.12.3.tar.xz";
-      sha256 = "0az5vcg5a565cmzmavzww5sl7wiz6gi2p0h61xl3di1pc8gk8wkp";
-      name = "kubrick-15.12.3.tar.xz";
-    };
-  };
-  kuser = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kuser-15.12.3.tar.xz";
-      sha256 = "0aggk24z6fmsqimj7c3zi0vaq508m3g1956v0kfxd2k5wipb9cfz";
-      name = "kuser-15.12.3.tar.xz";
-    };
-  };
-  kwalletmanager = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kwalletmanager-15.12.3.tar.xz";
-      sha256 = "1qyms04w0xmhxxd4kb9zsdkr50gxbjhs3hjq5vhvbagb05ya8g4m";
-      name = "kwalletmanager-15.12.3.tar.xz";
-    };
-  };
-  kwordquiz = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/kwordquiz-15.12.3.tar.xz";
-      sha256 = "1vhxdng5i9hzx57mj9jfsdc63wbk9xyjhr6f1hq035z0cz4j59r6";
-      name = "kwordquiz-15.12.3.tar.xz";
-    };
-  };
-  libkcddb = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/libkcddb-15.12.3.tar.xz";
-      sha256 = "1m3r5d4jy4n8l29ncm3wnmmnfilr64qn987brm4y16bcbxidigcz";
-      name = "libkcddb-15.12.3.tar.xz";
-    };
-  };
-  libkcompactdisc = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/libkcompactdisc-15.12.3.tar.xz";
-      sha256 = "0cb50346c4jv35125kaz65m8n1bw0rn8wynig6iygp8b2xam9303";
-      name = "libkcompactdisc-15.12.3.tar.xz";
-    };
-  };
-  libkdcraw = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/libkdcraw-15.12.3.tar.xz";
-      sha256 = "1d2l6nk25vj0h0a7slnz6dnlpfr4wyc6rh188vsdm24nz8q89hqf";
-      name = "libkdcraw-15.12.3.tar.xz";
-    };
-  };
-  libkdeedu = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/libkdeedu-15.12.3.tar.xz";
-      sha256 = "1imk40ygm9jndj95hkz1grjrsh9r0adjz41sarkjyfglxw3xwm0c";
-      name = "libkdeedu-15.12.3.tar.xz";
-    };
-  };
-  libkdegames = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/libkdegames-15.12.3.tar.xz";
-      sha256 = "1v3zmg8zb9cnfw3inba68c4v6iv1mqinskvsa61rkzzdhjf1cjj4";
-      name = "libkdegames-15.12.3.tar.xz";
-    };
-  };
-  libkeduvocdocument = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/libkeduvocdocument-15.12.3.tar.xz";
-      sha256 = "1i4s3v9pdn0jrgbdidq1rg9zka9m06h1c1yxrs0j0zscwmnalzlc";
-      name = "libkeduvocdocument-15.12.3.tar.xz";
-    };
-  };
-  libkexiv2 = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/libkexiv2-15.12.3.tar.xz";
-      sha256 = "196sxzhirc1l33jj1zjl6h57w9fyqa0kik0mmwj9w3jbjbsdmazv";
-      name = "libkexiv2-15.12.3.tar.xz";
-    };
-  };
-  libkface = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/libkface-15.12.3.tar.xz";
-      sha256 = "0rsy3xqfj7mbnhwb8gknv0cz20m2nv1zzs9jl39dna381gjh7sw0";
-      name = "libkface-15.12.3.tar.xz";
-    };
-  };
-  libkgeomap = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/libkgeomap-15.12.3.tar.xz";
-      sha256 = "0mm46if7jrf31s9sxn2vpaq6bk4bansbkgjb166anbfb6ywfs30d";
-      name = "libkgeomap-15.12.3.tar.xz";
-    };
-  };
-  libkipi = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/libkipi-15.12.3.tar.xz";
-      sha256 = "0lz8b792gpdgy6nlw50n62jn7fj2bj8znqsln2s2vmibgjscvl55";
-      name = "libkipi-15.12.3.tar.xz";
-    };
-  };
-  libkmahjongg = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/libkmahjongg-15.12.3.tar.xz";
-      sha256 = "0vjzdicqwgz49vykb698b2vgj1vmsxhn2ad8fjw863dqds9979v7";
-      name = "libkmahjongg-15.12.3.tar.xz";
-    };
-  };
-  libkomparediff2 = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/libkomparediff2-15.12.3.tar.xz";
-      sha256 = "1iw60r4rnijsh22mslrcsgrhqndqndvqsin20g0gx8zl6qs680kn";
-      name = "libkomparediff2-15.12.3.tar.xz";
-    };
-  };
-  libksane = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/libksane-15.12.3.tar.xz";
-      sha256 = "0r4v20l6bpv5j0gk0vcm90ag4cd410mllfw03f4v683wsda1phcj";
-      name = "libksane-15.12.3.tar.xz";
-    };
-  };
-  lokalize = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/lokalize-15.12.3.tar.xz";
-      sha256 = "1qnhhvgpigss0ngca7yqwqlwixm2221cynp94nw0csfx72mkbpyl";
-      name = "lokalize-15.12.3.tar.xz";
-    };
-  };
-  lskat = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/lskat-15.12.3.tar.xz";
-      sha256 = "05d40mc8bs4f45jy1sh64chp0ffb0631660wwd4p60d7x0j5as98";
-      name = "lskat-15.12.3.tar.xz";
-    };
-  };
-  marble = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/marble-15.12.3.tar.xz";
-      sha256 = "1gz7nj0jaqg7pbird2rv3cngfifpm9g1dnmx9rykdripv9m4g9am";
-      name = "marble-15.12.3.tar.xz";
-    };
-  };
-  mplayerthumbs = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/mplayerthumbs-15.12.3.tar.xz";
-      sha256 = "0r2v4b1kxrc1rpk771xry1swirf66z9lbrg7qs0an5vgp9wmghzw";
-      name = "mplayerthumbs-15.12.3.tar.xz";
-    };
-  };
-  okteta = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/okteta-15.12.3.tar.xz";
-      sha256 = "1qhrddir85z5c91xrqzndnd3n30vsfw6rafsk55zxwyhkws2jks0";
-      name = "okteta-15.12.3.tar.xz";
-    };
-  };
-  okular = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/okular-15.12.3.tar.xz";
-      sha256 = "1xrw0rvzw2i7289fv2maff3zb7f3vqv50fb88dbx67n9mzib794v";
-      name = "okular-15.12.3.tar.xz";
-    };
-  };
-  palapeli = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/palapeli-15.12.3.tar.xz";
-      sha256 = "08sj1zjd3smfcdgnmj57q9yz3bsd7k654zyh3sqar29yd4ja1b8l";
-      name = "palapeli-15.12.3.tar.xz";
-    };
-  };
-  parley = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/parley-15.12.3.tar.xz";
-      sha256 = "00h83mpkz52ybav8d3c3gv6y53xcz3d5abq11daa6hc171bm35qy";
-      name = "parley-15.12.3.tar.xz";
-    };
-  };
-  picmi = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/picmi-15.12.3.tar.xz";
-      sha256 = "0x952gpdz415pr691bv8x98pnvs1xajgsgk6rm6kx9crm1qm0qfa";
-      name = "picmi-15.12.3.tar.xz";
-    };
-  };
-  poxml = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/poxml-15.12.3.tar.xz";
-      sha256 = "1w3mgz5ayryra844pn5jrhnxnhbz8d8kjg74a9xnw98j81qqjz1y";
-      name = "poxml-15.12.3.tar.xz";
-    };
-  };
-  print-manager = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/print-manager-15.12.3.tar.xz";
-      sha256 = "1xranm7l9bgg9dnpj91d9nmzmbgj52zgzsvvsnp9ygxgcs5bzlhc";
-      name = "print-manager-15.12.3.tar.xz";
-    };
-  };
-  rocs = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/rocs-15.12.3.tar.xz";
-      sha256 = "0pl3ildg2rgnq7ax28ba5ninv8lw7mm5c4zwj63fwz3ds1d4rysq";
-      name = "rocs-15.12.3.tar.xz";
-    };
-  };
-  signon-kwallet-extension = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/signon-kwallet-extension-15.12.3.tar.xz";
-      sha256 = "05y6c4pd833zwxx6fndidxr39w3qxga6nkcjds8ywxrr0968mfi7";
-      name = "signon-kwallet-extension-15.12.3.tar.xz";
-    };
-  };
-  spectacle = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/spectacle-15.12.3.tar.xz";
-      sha256 = "0qyyc30pgybx205a45vj0yqv03csi0dihx012iz3hlnhgr2g586n";
-      name = "spectacle-15.12.3.tar.xz";
-    };
-  };
-  step = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/step-15.12.3.tar.xz";
-      sha256 = "0473n43wqiwsrajy06mr024qnfr2nhhjxwsv1arg2gv7xvzhbgq1";
-      name = "step-15.12.3.tar.xz";
-    };
-  };
-  svgpart = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/svgpart-15.12.3.tar.xz";
-      sha256 = "1lhhjmf2ay9v6p64693kf5rk3jywyyyd18xq9lgqlng0b27acsac";
-      name = "svgpart-15.12.3.tar.xz";
-    };
-  };
-  sweeper = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/sweeper-15.12.3.tar.xz";
-      sha256 = "0wnk6zmf24mpnacsp6wi8c617jl4znk1pbm9jl38ckmg5z56ghz0";
-      name = "sweeper-15.12.3.tar.xz";
-    };
-  };
-  syndication = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/syndication-15.12.3.tar.xz";
-      sha256 = "07xnjxjdf11k0fkpf9xdfvfh176pimx3v4h5y6f7bswsgnld7h38";
-      name = "syndication-15.12.3.tar.xz";
-    };
-  };
-  umbrello = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/umbrello-15.12.3.tar.xz";
-      sha256 = "072nqqjq2cfxwi098kh7m24cvs6f6nss62wxdskvzdkbcd7gfh26";
-      name = "umbrello-15.12.3.tar.xz";
-    };
-  };
-  zeroconf-ioslave = {
-    version = "15.12.3";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.12.3/src/zeroconf-ioslave-15.12.3.tar.xz";
-      sha256 = "1iv4l58v7wg4kjmp7723za84rpns4dm6av6b6cybmj8dzw3jixxf";
-      name = "zeroconf-ioslave-15.12.3.tar.xz";
-    };
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/attica.nix b/pkgs/desktops/kde-5/frameworks-5.19/attica.nix
deleted file mode 100644
index 98721876c120..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/attica.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-}:
-
-kdeFramework {
-  name = "attica";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/baloo.nix b/pkgs/desktops/kde-5/frameworks-5.19/baloo.nix
deleted file mode 100644
index 38c41d9271d8..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/baloo.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kauth, kconfig
-, kcoreaddons, kcrash, kdbusaddons, kfilemetadata, ki18n, kidletime
-, kio, lmdb, makeQtWrapper, qtbase, qtquick1, solid
-}:
-
-kdeFramework {
-  name = "baloo";
-  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
-  buildInputs = [
-    kconfig kcrash kdbusaddons lmdb qtquick1 solid
-  ];
-  propagatedBuildInputs = [
-    kauth kcoreaddons kfilemetadata ki18n kio kidletime qtbase
-  ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/baloo_file"
-    wrapQtProgram "$out/bin/baloo_file_extractor"
-    wrapQtProgram "$out/bin/balooctl"
-    wrapQtProgram "$out/bin/baloosearch"
-    wrapQtProgram "$out/bin/balooshow"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/bluez-qt.nix b/pkgs/desktops/kde-5/frameworks-5.19/bluez-qt.nix
deleted file mode 100644
index f981b0516f72..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/bluez-qt.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, qtdeclarative
-}:
-
-kdeFramework {
-  name = "bluez-qt";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtdeclarative ];
-  preConfigure = ''
-    substituteInPlace CMakeLists.txt \
-      --replace /lib/udev/rules.d "$out/lib/udev/rules.d"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/breeze-icons.nix b/pkgs/desktops/kde-5/frameworks-5.19/breeze-icons.nix
deleted file mode 100644
index 44cc99daf261..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/breeze-icons.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kdeFramework
-, extra-cmake-modules
-, qtsvg
-}:
-
-kdeFramework {
-  name = "breeze-icons";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtsvg ];
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/default.nix
deleted file mode 100644
index 2c15f31a9c9e..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/default.nix
+++ /dev/null
@@ -1,120 +0,0 @@
-# Maintainer's Notes:
-#
-# Minor updates:
-#  1. Edit ./fetchsrcs.sh to point to the updated URL.
-#  2. Run ./fetchsrcs.sh.
-#  3. Build and enjoy.
-#
-# Major updates:
-#  We prefer not to immediately overwrite older versions with major updates, so
-#  make a copy of this directory first. After copying, be sure to delete ./tmp
-#  if it exists. Then follow the minor update instructions. Be sure to check if
-#  any new components have been added and package them as necessary.
-
-{ pkgs, debug ? false }:
-
-let
-
-  inherit (pkgs) lib makeSetupHook stdenv;
-
-  mirror = "mirror://kde";
-  srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; };
-
-  packages = self: with self; {
-    kdeFramework = args:
-      let
-        inherit (args) name;
-        inherit (srcs."${name}") src version;
-      in stdenv.mkDerivation (args // {
-        name = "${name}-${version}";
-        inherit src;
-
-        outputs = args.outputs or [ "dev" "out" ];
-
-        cmakeFlags =
-          (args.cmakeFlags or [])
-          ++ [ "-DBUILD_TESTING=OFF" ]
-          ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug";
-
-        meta = {
-          license = with lib.licenses; [
-            lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
-          ];
-          platforms = lib.platforms.linux;
-          homepage = "http://www.kde.org";
-        } // (args.meta or {});
-      });
-
-    attica = callPackage ./attica.nix {};
-    baloo = callPackage ./baloo.nix {};
-    bluez-qt = callPackage ./bluez-qt.nix {};
-    breeze-icons = callPackage ./breeze-icons.nix {};
-    extra-cmake-modules = callPackage ./extra-cmake-modules {};
-    frameworkintegration = callPackage ./frameworkintegration.nix {};
-    kactivities = callPackage ./kactivities.nix {};
-    kapidox = callPackage ./kapidox.nix {};
-    karchive = callPackage ./karchive.nix {};
-    kauth = callPackage ./kauth {};
-    kbookmarks = callPackage ./kbookmarks.nix {};
-    kcmutils = callPackage ./kcmutils {};
-    kcodecs = callPackage ./kcodecs.nix {};
-    kcompletion = callPackage ./kcompletion.nix {};
-    kconfig = callPackage ./kconfig.nix {};
-    kconfigwidgets = callPackage ./kconfigwidgets {};
-    kcoreaddons = callPackage ./kcoreaddons.nix {};
-    kcrash = callPackage ./kcrash.nix {};
-    kdbusaddons = callPackage ./kdbusaddons.nix {};
-    kdeclarative = callPackage ./kdeclarative.nix {};
-    kded = callPackage ./kded.nix {};
-    kdelibs4support = callPackage ./kdelibs4support {};
-    kdesignerplugin = callPackage ./kdesignerplugin.nix {};
-    kdewebkit = callPackage ./kdewebkit.nix {};
-    kdesu = callPackage ./kdesu.nix {};
-    kdnssd = callPackage ./kdnssd.nix {};
-    kdoctools = callPackage ./kdoctools {};
-    kemoticons = callPackage ./kemoticons.nix {};
-    kfilemetadata = callPackage ./kfilemetadata {};
-    kglobalaccel = callPackage ./kglobalaccel.nix {};
-    kguiaddons = callPackage ./kguiaddons.nix {};
-    khtml = callPackage ./khtml.nix {};
-    ki18n = callPackage ./ki18n.nix {};
-    kiconthemes = callPackage ./kiconthemes {};
-    kidletime = callPackage ./kidletime.nix {};
-    kimageformats = callPackage ./kimageformats.nix {};
-    kinit = callPackage ./kinit {};
-    kio = callPackage ./kio {};
-    kitemmodels = callPackage ./kitemmodels.nix {};
-    kitemviews = callPackage ./kitemviews.nix {};
-    kjobwidgets = callPackage ./kjobwidgets.nix {};
-    kjs = callPackage ./kjs.nix {};
-    kjsembed = callPackage ./kjsembed.nix {};
-    kmediaplayer = callPackage ./kmediaplayer.nix {};
-    knewstuff = callPackage ./knewstuff.nix {};
-    knotifications = callPackage ./knotifications.nix {};
-    knotifyconfig = callPackage ./knotifyconfig.nix {};
-    kpackage = callPackage ./kpackage {};
-    kparts = callPackage ./kparts.nix {};
-    kpeople = callPackage ./kpeople.nix {};
-    kplotting = callPackage ./kplotting.nix {};
-    kpty = callPackage ./kpty.nix {};
-    kross = callPackage ./kross.nix {};
-    krunner = callPackage ./krunner.nix {};
-    kservice = callPackage ./kservice {};
-    ktexteditor = callPackage ./ktexteditor {};
-    ktextwidgets = callPackage ./ktextwidgets.nix {};
-    kunitconversion = callPackage ./kunitconversion.nix {};
-    kwallet = callPackage ./kwallet.nix {};
-    kwidgetsaddons = callPackage ./kwidgetsaddons.nix {};
-    kwindowsystem = callPackage ./kwindowsystem.nix {};
-    kxmlgui = callPackage ./kxmlgui.nix {};
-    kxmlrpcclient = callPackage ./kxmlrpcclient.nix {};
-    modemmanager-qt = callPackage ./modemmanager-qt.nix {};
-    networkmanager-qt = callPackage ./networkmanager-qt.nix {};
-    oxygen-icons5 = callPackage ./oxygen-icons5.nix {};
-    plasma-framework = callPackage ./plasma-framework {};
-    solid = callPackage ./solid.nix {};
-    sonnet = callPackage ./sonnet.nix {};
-    threadweaver = callPackage ./threadweaver.nix {};
-  };
-
-in packages
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/default.nix
deleted file mode 100644
index 1c2ea70442d3..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ kdeFramework, lib, copyPathsToStore, cmake, pkgconfig, qttools }:
-
-kdeFramework {
-  name = "extra-cmake-modules";
-
-  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
-
-  outputs = [ "out" ];  # this package has no runtime components
-  setupHook = ./setup-hook.sh;
-
-  # It is OK to propagate these inputs as long as
-  # extra-cmake-modules is never a propagated input
-  # of some other derivation.
-  propagatedNativeBuildInputs = [ cmake pkgconfig qttools ];
-
-  meta = with lib; {
-    license = licenses.bsd2;
-    maintainers = [ maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/nix-lib-path.patch b/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/nix-lib-path.patch
deleted file mode 100644
index a74340a6dc96..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/nix-lib-path.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Index: extra-cmake-modules-5.18.0/kde-modules/KDEInstallDirs.cmake
-===================================================================
---- extra-cmake-modules-5.18.0.orig/kde-modules/KDEInstallDirs.cmake
-+++ extra-cmake-modules-5.18.0/kde-modules/KDEInstallDirs.cmake
-@@ -200,32 +200,6 @@
- # GNUInstallDirs code deals with re-configuring, but that is dealt with
- # by the _define_* macros in this module).
- set(_LIBDIR_DEFAULT "lib")
--# Override this default 'lib' with 'lib64' iff:
--#  - we are on a Linux, kFreeBSD or Hurd system but NOT cross-compiling
--#  - we are NOT on debian
--#  - we are on a 64 bits system
--# reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf
--# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if
--# CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu"
--# See http://wiki.debian.org/Multiarch
--if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU")
--   AND NOT CMAKE_CROSSCOMPILING)
--  if (EXISTS "/etc/debian_version") # is this a debian system ?
--    if(CMAKE_LIBRARY_ARCHITECTURE)
--      set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
--    endif()
--  else() # not debian, rely on CMAKE_SIZEOF_VOID_P:
--    if(NOT DEFINED CMAKE_SIZEOF_VOID_P)
--      message(AUTHOR_WARNING
--        "Unable to determine default LIB_INSTALL_LIBDIR directory because no target architecture is known. "
--        "Please enable at least one language before including KDEInstallDirs.")
--    else()
--      if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
--        set(_LIBDIR_DEFAULT "lib64")
--      endif()
--    endif()
--  endif()
--endif()
- 
- set(_gnu_install_dirs_vars
-     BINDIR
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/series b/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/series
deleted file mode 100644
index b4569e50a5f7..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/series
+++ /dev/null
@@ -1 +0,0 @@
-nix-lib-path.patch
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/setup-hook.sh b/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/setup-hook.sh
deleted file mode 100644
index 193cb048949a..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/setup-hook.sh
+++ /dev/null
@@ -1,80 +0,0 @@
-_ecmSetXdgDirs() {
-    addToSearchPathOnce XDG_DATA_DIRS "$1/share"
-    addToSearchPathOnce XDG_CONFIG_DIRS "$1/etc/xdg"
-    addToSearchPathOnce NIX_WRAP_XDG_CONFIG_DIRS "$1/etc/xdg"
-}
-
-_ecmPropagateSharedData() {
-    local sharedPaths=( \
-        "config.cfg" \
-        "kconf_update" \
-        "kservices5" \
-        "kservicetypes5" \
-        "kxmlgui5" \
-        "knotifications5" \
-        "icons" \
-        "sounds" \
-        "templates" \
-        "wallpapers" \
-        "applications" \
-        "desktop-directories" \
-        "mime" \
-        "dbus-1" \
-        "interfaces" \
-        "services" \
-        "system-services" )
-    for dir in ${sharedPaths[@]}; do
-        if [ -d "$1/share/$dir" ]; then
-            addToSearchPathOnce NIX_WRAP_XDG_DATA_DIRS "$1/share"
-            propagateOnce propagatedBuildInputs "$1"
-            propagateOnce propagatedUserEnvPkgs "$1"
-            break
-        fi
-    done
-}
-
-_ecmConfig() {
-    # Because we need to use absolute paths here, we must set *all* the paths.
-    cmakeFlags+=" -DKDE_INSTALL_EXECROOTDIR=${!outputBin}"
-    cmakeFlags+=" -DKDE_INSTALL_BINDIR=${!outputBin}/bin"
-    cmakeFlags+=" -DKDE_INSTALL_SBINDIR=${!outputBin}/sbin"
-    cmakeFlags+=" -DKDE_INSTALL_LIBDIR=${!outputLib}/lib"
-    cmakeFlags+=" -DKDE_INSTALL_LIBEXECDIR=${!outputLib}/lib/libexec"
-    cmakeFlags+=" -DKDE_INSTALL_CMAKEPACKAGEDIR=${!outputDev}/lib/cmake"
-    cmakeFlags+=" -DKDE_INSTALL_QTPLUGINDIR=${!outputLib}/lib/qt5/plugins"
-    cmakeFlags+=" -DKDE_INSTALL_PLUGINDIR=${!outputLib}/lib/qt5/plugins"
-    cmakeFlags+=" -DKDE_INSTALL_QTQUICKIMPORTSDIR=${!outputLib}/lib/qt5/imports"
-    cmakeFlags+=" -DKDE_INSTALL_QMLDIR=${!outputLib}/lib/qt5/qml"
-    cmakeFlags+=" -DKDE_INSTALL_INCLUDEDIR=${!outputInclude}/include"
-    cmakeFlags+=" -DKDE_INSTALL_LOCALSTATEDIR=/var"
-    cmakeFlags+=" -DKDE_INSTALL_DATAROOTDIR=${!outputLib}/share"
-    cmakeFlags+=" -DKDE_INSTALL_DATADIR=${!outputLib}/share"
-    cmakeFlags+=" -DKDE_INSTALL_DOCBUNDLEDIR=${!outputLib}/share/doc/HTML"
-    cmakeFlags+=" -DKDE_INSTALL_KCFGDIR=${!outputLib}/share/config.kcfg"
-    cmakeFlags+=" -DKDE_INSTALL_KCONFUPDATEDIR=${!outputLib}/share/kconf_update"
-    cmakeFlags+=" -DKDE_INSTALL_KSERVICES5DIR=${!outputLib}/share/kservices5"
-    cmakeFlags+=" -DKDE_INSTALL_KSERVICETYPES5DIR=${!outputLib}/share/kservicetypes5"
-    cmakeFlags+=" -DKDE_INSTALL_KXMLGUI5DIR=${!outputLib}/share/kxmlgui5"
-    cmakeFlags+=" -DKDE_INSTALL_KNOTIFY5RCDIR=${!outputLib}/share/knotifications5"
-    cmakeFlags+=" -DKDE_INSTALL_ICONDIR=${!outputLib}/share/icons"
-    cmakeFlags+=" -DKDE_INSTALL_LOCALEDIR=${!outputLib}/share/locale"
-    cmakeFlags+=" -DKDE_INSTALL_SOUNDDIR=${!outputLib}/share/sounds"
-    cmakeFlags+=" -DKDE_INSTALL_TEMPLATEDIR=${!outputLib}/share/templates"
-    cmakeFlags+=" -DKDE_INSTALL_WALLPAPERDIR=${!outputLib}/share/wallpapers"
-    cmakeFlags+=" -DKDE_INSTALL_APPDIR=${!outputLib}/share/applications"
-    cmakeFlags+=" -DKDE_INSTALL_DESKTOPDIR=${!outputLib}/share/desktop-directories"
-    cmakeFlags+=" -DKDE_INSTALL_MIMEDIR=${!outputLib}/share/mime/packages"
-    cmakeFlags+=" -DKDE_INSTALL_METAINFODIR=${!outputLib}/share/appdata"
-    cmakeFlags+=" -DKDE_INSTALL_MANDIR=${!outputLib}/share/man"
-    cmakeFlags+=" -DKDE_INSTALL_INFODIR=${!outputLib}/share/info"
-    cmakeFlags+=" -DKDE_INSTALL_DBUSDIR=${!outputLib}/share/dbus-1"
-    cmakeFlags+=" -DKDE_INSTALL_DBUSINTERFACEDIR=${!outputLib}/share/dbus-1/interfaces"
-    cmakeFlags+=" -DKDE_INSTALL_DBUSSERVICEDIR=${!outputLib}/share/dbus-1/services"
-    cmakeFlags+=" -DKDE_INSTALL_DBUSSYSTEMSERVICEDIR=${!outputLib}/share/dbus-1/system-services"
-    cmakeFlags+=" -DKDE_INSTALL_SYSCONFDIR=${!outputLib}/etc"
-    cmakeFlags+=" -DKDE_INSTALL_CONFDIR=${!outputLib}/etc/xdg"
-    cmakeFlags+=" -DKDE_INSTALL_AUTOSTARTDIR=${!outputLib}/etc/xdg/autostart"
-}
-
-envHooks+=(_ecmSetXdgDirs _ecmPropagateSharedData)
-preConfigureHooks+=(_ecmConfig)
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/fetchsrcs.sh b/pkgs/desktops/kde-5/frameworks-5.19/fetchsrcs.sh
deleted file mode 100755
index 7937e6f8bed9..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/fetchsrcs.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#! /usr/bin/env nix-shell
-#! nix-shell -i bash -p coreutils findutils gnused nix wget
-
-set -x
-
-# The trailing slash at the end is necessary!
-RELEASE_URL="http://download.kde.org/stable/frameworks/5.19/"
-EXTRA_WGET_ARGS='-A *.tar.xz'
-
-mkdir tmp; cd tmp
-
-rm -f ../srcs.csv
-
-wget -nH -r -c --no-parent $RELEASE_URL $EXTRA_WGET_ARGS
-
-find . | while read src; do
-    if [[ -f "${src}" ]]; then
-        # Sanitize file name
-        filename=$(basename "$src" | tr '@' '_')
-        nameVersion="${filename%.tar.*}"
-        name=$(echo "$nameVersion" | sed -e 's,-[[:digit:]].*,,' | sed -e 's,-opensource-src$,,')
-        version=$(echo "$nameVersion" | sed -e 's,^\([[:alpha:]][[:alnum:]]*-\)\+,,')
-        echo "$name,$version,$src,$filename" >>../srcs.csv
-    fi
-done
-
-cat >../srcs.nix <<EOF
-# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
-{ fetchurl, mirror }:
-
-{
-EOF
-
-gawk -F , "{ print \$1 }" ../srcs.csv | sort | uniq | while read name; do
-    versions=$(gawk -F , "/^$name,/ { print \$2 }" ../srcs.csv)
-    latestVersion=$(echo "$versions" | sort -rV | head -n 1)
-    src=$(gawk -F , "/^$name,$latestVersion,/ { print \$3 }" ../srcs.csv)
-    filename=$(gawk -F , "/^$name,$latestVersion,/ { print \$4 }" ../srcs.csv)
-    url="${src:2}"
-    sha256=$(nix-hash --type sha256 --base32 --flat "$src")
-    cat >>../srcs.nix <<EOF
-  $name = {
-    version = "$latestVersion";
-    src = fetchurl {
-      url = "\${mirror}/$url";
-      sha256 = "$sha256";
-      name = "$filename";
-    };
-  };
-EOF
-done
-
-echo "}" >>../srcs.nix
-
-rm -f ../srcs.csv
-
-cd ..
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/frameworkintegration.nix b/pkgs/desktops/kde-5/frameworks-5.19/frameworkintegration.nix
deleted file mode 100644
index 26987c385ad5..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/frameworkintegration.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kbookmarks, kcompletion
-, kconfig, kconfigwidgets, ki18n, kiconthemes, kio, knotifications
-, kwidgetsaddons, libXcursor, qtx11extras
-}:
-
-kdeFramework {
-  name = "frameworkintegration";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kbookmarks kcompletion kconfig knotifications kwidgetsaddons
-    libXcursor
-  ];
-  propagatedBuildInputs = [ kconfigwidgets ki18n kio kiconthemes qtx11extras ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kactivities.nix b/pkgs/desktops/kde-5/frameworks-5.19/kactivities.nix
deleted file mode 100644
index 3225098f4398..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kactivities.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, boost, kcmutils, kconfig
-, kcoreaddons, kdbusaddons, kdeclarative, kglobalaccel, ki18n
-, kio, kservice, kwindowsystem, kxmlgui, makeQtWrapper, qtdeclarative
-}:
-
-kdeFramework {
-  name = "kactivities";
-  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
-  buildInputs = [
-    boost kcmutils kconfig kcoreaddons kdbusaddons kservice
-    kxmlgui
-  ];
-  propagatedBuildInputs = [
-    kdeclarative kglobalaccel ki18n kio kwindowsystem qtdeclarative
-  ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kactivitymanagerd"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kapidox.nix b/pkgs/desktops/kde-5/frameworks-5.19/kapidox.nix
deleted file mode 100644
index 647be8f052c3..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kapidox.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, python
-}:
-
-kdeFramework {
-  name = "kapidox";
-  nativeBuildInputs = [ extra-cmake-modules python ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/karchive.nix b/pkgs/desktops/kde-5/frameworks-5.19/karchive.nix
deleted file mode 100644
index a8d9a0003c3b..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/karchive.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-}:
-
-kdeFramework {
-  name = "karchive";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kauth/cmake-install-paths.patch b/pkgs/desktops/kde-5/frameworks-5.19/kauth/cmake-install-paths.patch
deleted file mode 100644
index c66f5ecd008f..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kauth/cmake-install-paths.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: kauth-5.18.0/KF5AuthConfig.cmake.in
-===================================================================
---- kauth-5.18.0.orig/KF5AuthConfig.cmake.in
-+++ kauth-5.18.0/KF5AuthConfig.cmake.in
-@@ -4,9 +4,9 @@ set(KAUTH_STUB_FILES_DIR "@PACKAGE_KDE_I
- 
- set(KAUTH_BACKEND_NAME "@KAUTH_BACKEND_NAME@")
- set(KAUTH_HELPER_BACKEND_NAME "@KAUTH_HELPER_BACKEND_NAME@")
--set(KAUTH_POLICY_FILES_INSTALL_DIR "@KAUTH_POLICY_FILES_INSTALL_DIR@")
--set(KAUTH_HELPER_INSTALL_DIR "@KAUTH_HELPER_INSTALL_DIR@")
--set(KAUTH_HELPER_INSTALL_ABSOLUTE_DIR "@KAUTH_HELPER_INSTALL_ABSOLUTE_DIR@")
-+set(KAUTH_POLICY_FILES_INSTALL_DIR "${KDE_INSTALL_DATADIR}/polkit-1/actions")
-+set(KAUTH_HELPER_INSTALL_DIR "${KDE_INSTALL_LIBEXECDIR}")
-+set(KAUTH_HELPER_INSTALL_ABSOLUTE_DIR "${KDE_INSTALL_LIBEXECDIR}")
- 
- find_dependency(KF5CoreAddons "@KF5_DEP_VERSION@")
- 
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kauth/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kauth/default.nix
deleted file mode 100644
index 1352d8c5821f..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kauth/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kdeFramework, lib, copyPathsToStore
-, extra-cmake-modules
-, kcoreaddons
-, polkit-qt
-}:
-
-kdeFramework {
-  name = "kauth";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ polkit-qt ];
-  propagatedBuildInputs = [ kcoreaddons ];
-  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kauth/kauth-policy-install.patch b/pkgs/desktops/kde-5/frameworks-5.19/kauth/kauth-policy-install.patch
deleted file mode 100644
index 340155256f28..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kauth/kauth-policy-install.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/KF5AuthConfig.cmake.in b/KF5AuthConfig.cmake.in
-index e859ec7..9a8ab18 100644
---- a/KF5AuthConfig.cmake.in
-+++ b/KF5AuthConfig.cmake.in
-@@ -4,7 +4,7 @@ set(KAUTH_STUB_FILES_DIR "${PACKAGE_PREFIX_DIR}/@KF5_DATA_INSTALL_DIR@/kauth/")
- 
- set(KAUTH_BACKEND_NAME "@KAUTH_BACKEND_NAME@")
- set(KAUTH_HELPER_BACKEND_NAME "@KAUTH_HELPER_BACKEND_NAME@")
--set(KAUTH_POLICY_FILES_INSTALL_DIR "@KAUTH_POLICY_FILES_INSTALL_DIR@")
-+set(KAUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions")
- set(KAUTH_HELPER_INSTALL_DIR "@KAUTH_HELPER_INSTALL_DIR@")
- 
- find_dependency(KF5CoreAddons "@KF5_DEP_VERSION@")
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kauth/series b/pkgs/desktops/kde-5/frameworks-5.19/kauth/series
deleted file mode 100644
index d2689425c387..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kauth/series
+++ /dev/null
@@ -1 +0,0 @@
-cmake-install-paths.patch
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kbookmarks.nix b/pkgs/desktops/kde-5/frameworks-5.19/kbookmarks.nix
deleted file mode 100644
index 1a469ab4db6d..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kbookmarks.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, kcodecs
-, kconfig
-, kconfigwidgets
-, kcoreaddons
-, kiconthemes
-, kxmlgui
-}:
-
-kdeFramework {
-  name = "kbookmarks";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kcodecs
-    kconfig
-    kconfigwidgets
-    kcoreaddons
-    kiconthemes
-    kxmlgui
-  ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kcmutils/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/frameworks-5.19/kcmutils/0001-qdiriterator-follow-symlinks.patch
deleted file mode 100644
index 0d861fa95012..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kcmutils/0001-qdiriterator-follow-symlinks.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From f14d2a275323a47104b33eb61c5b6910ae1a9f59 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Wed, 14 Oct 2015 06:43:53 -0500
-Subject: [PATCH] qdiriterator follow symlinks
-
----
- src/kpluginselector.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/kpluginselector.cpp b/src/kpluginselector.cpp
-index 9c3431d..d6b1ee2 100644
---- a/src/kpluginselector.cpp
-+++ b/src/kpluginselector.cpp
-@@ -305,7 +305,7 @@ void KPluginSelector::addPlugins(const QString &componentName,
-     QStringList desktopFileNames;
-     const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, componentName + QStringLiteral("/kpartplugins"), QStandardPaths::LocateDirectory);
-     Q_FOREACH (const QString &dir, dirs) {
--        QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories);
-+      QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
-         while (it.hasNext()) {
-             desktopFileNames.append(it.next());
-         }
--- 
-2.5.2
-
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kcmutils/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kcmutils/default.nix
deleted file mode 100644
index dbbb783ac615..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kcmutils/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kconfigwidgets
-, kcoreaddons, kdeclarative, ki18n, kiconthemes, kitemviews
-, kpackage, kservice, kxmlgui
-}:
-
-kdeFramework {
-  name = "kcmutils";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kcoreaddons kiconthemes kitemviews kpackage kxmlgui
-  ];
-  propagatedBuildInputs = [ kconfigwidgets kdeclarative ki18n kservice ];
-  patches = [ ./0001-qdiriterator-follow-symlinks.patch ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kcodecs.nix b/pkgs/desktops/kde-5/frameworks-5.19/kcodecs.nix
deleted file mode 100644
index 53a69a69b69c..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kcodecs.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-}:
-
-kdeFramework {
-  name = "kcodecs";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kcompletion.nix b/pkgs/desktops/kde-5/frameworks-5.19/kcompletion.nix
deleted file mode 100644
index e393774f16a5..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kcompletion.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, kconfig
-, kwidgetsaddons
-}:
-
-kdeFramework {
-  name = "kcompletion";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kconfig kwidgetsaddons ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kconfig.nix b/pkgs/desktops/kde-5/frameworks-5.19/kconfig.nix
deleted file mode 100644
index e132afe59886..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kconfig.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, makeQtWrapper
-}:
-
-kdeFramework {
-  name = "kconfig";
-  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kreadconfig5"
-    wrapQtProgram "$out/bin/kwriteconfig5"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/frameworks-5.19/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch
deleted file mode 100644
index 7a6c0ee90534..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 4f84780893d505b2d62a14633dd983baa8ec6e28 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Wed, 14 Oct 2015 06:47:01 -0500
-Subject: [PATCH] qdiriterator follow symlinks
-
----
- src/khelpclient.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/khelpclient.cpp b/src/khelpclient.cpp
-index 53a331e..80fbb01 100644
---- a/src/khelpclient.cpp
-+++ b/src/khelpclient.cpp
-@@ -48,7 +48,7 @@ void KHelpClient::invokeHelp(const QString &anchor, const QString &_appname)
-     QString docPath;
-     const QStringList desktopDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation);
-     Q_FOREACH (const QString &dir, desktopDirs) {
--        QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories);
-+        QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
-         while (it.hasNext()) {
-             const QString desktopPath(it.next());
-             KDesktopFile desktopFile(desktopPath);
--- 
-2.5.2
-
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kconfigwidgets/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kconfigwidgets/default.nix
deleted file mode 100644
index 3b3bd27cce08..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kconfigwidgets/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kauth, kcodecs, kconfig
-, kdoctools, kguiaddons, ki18n, kwidgetsaddons, makeQtWrapper
-}:
-
-kdeFramework {
-  name = "kconfigwidgets";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  buildInputs = [ kguiaddons ];
-  propagatedBuildInputs = [ kauth kconfig kcodecs ki18n kwidgetsaddons ];
-  patches = [ ./0001-qdiriterator-follow-symlinks.patch ];
-  postInstall = ''
-    moveToOutput "bin/preparetips5" "$dev"
-    wrapQtProgram "$dev/bin/preparetips5"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kcoreaddons.nix b/pkgs/desktops/kde-5/frameworks-5.19/kcoreaddons.nix
deleted file mode 100644
index f3a1db7bd484..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kcoreaddons.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kdeFramework, lib, makeQtWrapper
-, extra-cmake-modules
-, shared_mime_info
-}:
-
-kdeFramework {
-  name = "kcoreaddons";
-  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
-  buildInputs = [ shared_mime_info ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/desktoptojson"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kcrash.nix b/pkgs/desktops/kde-5/frameworks-5.19/kcrash.nix
deleted file mode 100644
index bbab78ccb409..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kcrash.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, kcoreaddons
-, kwindowsystem
-, qtx11extras
-}:
-
-kdeFramework {
-  name = "kcrash";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kcoreaddons ];
-  propagatedBuildInputs = [ kwindowsystem qtx11extras ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kdbusaddons.nix b/pkgs/desktops/kde-5/frameworks-5.19/kdbusaddons.nix
deleted file mode 100644
index d2ceab31d14b..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kdbusaddons.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, makeQtWrapper
-, qtx11extras
-}:
-
-kdeFramework {
-  name = "kdbusaddons";
-  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
-  propagatedBuildInputs = [ qtx11extras ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kquitapp5"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kdeclarative.nix b/pkgs/desktops/kde-5/frameworks-5.19/kdeclarative.nix
deleted file mode 100644
index 74d107466cfc..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kdeclarative.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, epoxy, kconfig
-, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kpackage
-, kwidgetsaddons, kwindowsystem, makeQtWrapper, pkgconfig
-, qtdeclarative
-}:
-
-kdeFramework {
-  name = "kdeclarative";
-  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
-  buildInputs = [
-    epoxy kguiaddons kiconthemes kwidgetsaddons
-  ];
-  propagatedBuildInputs = [
-    kconfig kglobalaccel ki18n kio kpackage kwindowsystem qtdeclarative
-  ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kpackagelauncherqml"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kded.nix b/pkgs/desktops/kde-5/frameworks-5.19/kded.nix
deleted file mode 100644
index 47ae2d68c68e..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kded.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, kconfig
-, kcoreaddons
-, kcrash
-, kdbusaddons
-, kdoctools
-, kinit
-, kservice
-}:
-
-kdeFramework {
-  name = "kded";
-  buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons kinit kservice ];
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support.nix b/pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support.nix
deleted file mode 100644
index e61c4bb86e7c..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, docbook_xml_dtd_45, kauth
-, karchive, kcompletion, kconfig, kconfigwidgets, kcoreaddons
-, kcrash, kdbusaddons, kded, kdesignerplugin, kdoctools, kemoticons
-, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kitemmodels
-, kinit, knotifications, kparts, kservice, ktextwidgets
-, kunitconversion, kwidgetsaddons, kwindowsystem, kxmlgui
-, networkmanager, qtsvg, qtx11extras, xlibs
-}:
-
-# TODO: debug docbook detection
-
-kdeFramework {
-  name = "kdelibs4support";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  buildInputs = [
-    kcompletion kconfig kded kservice kwidgetsaddons
-    kxmlgui networkmanager qtsvg qtx11extras xlibs.libSM
-  ];
-  propagatedBuildInputs = [
-    kauth karchive kconfigwidgets kcoreaddons kcrash kdbusaddons
-    kdesignerplugin kemoticons kglobalaccel kguiaddons ki18n kio
-    kiconthemes kitemmodels kinit knotifications kparts ktextwidgets
-    kunitconversion kwindowsystem
-  ];
-  cmakeFlags = [
-    "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
-    "-DDocBookXML4_DTD_VERSION=4.5"
-  ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support/default.nix
deleted file mode 100644
index 843db83a99b2..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ kdeFramework, lib, copyPathsToStore
-, extra-cmake-modules, docbook_xml_dtd_45, kauth
-, karchive, kcompletion, kconfig, kconfigwidgets, kcoreaddons
-, kcrash, kdbusaddons, kded, kdesignerplugin, kdoctools, kemoticons
-, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kitemmodels
-, kinit, knotifications, kparts, kservice, ktextwidgets
-, kunitconversion, kwidgetsaddons, kwindowsystem, kxmlgui
-, networkmanager, qtsvg, qtx11extras, xlibs
-}:
-
-# TODO: debug docbook detection
-
-kdeFramework {
-  name = "kdelibs4support";
-  outputs = [ "dev" "out" ];
-  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
-  setupHook = ./setup-hook.sh;
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  buildInputs = [
-    kcompletion kconfig kded kservice kwidgetsaddons
-    kxmlgui networkmanager qtsvg qtx11extras xlibs.libSM
-  ];
-  propagatedBuildInputs = [
-    kauth karchive kconfigwidgets kcoreaddons kcrash kdbusaddons
-    kdesignerplugin kemoticons kglobalaccel kguiaddons ki18n kio
-    kiconthemes kitemmodels kinit knotifications kparts ktextwidgets
-    kunitconversion kwindowsystem
-  ];
-  cmakeFlags = [
-    "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
-    "-DDocBookXML4_DTD_VERSION=4.5"
-  ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support/nix-kde-include-dir.patch b/pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support/nix-kde-include-dir.patch
deleted file mode 100644
index eabb70254483..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support/nix-kde-include-dir.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: kdelibs4support-5.18.0/src/kdecore/kstandarddirs.cpp
-===================================================================
---- kdelibs4support-5.18.0.orig/src/kdecore/kstandarddirs.cpp
-+++ kdelibs4support-5.18.0/src/kdecore/kstandarddirs.cpp
-@@ -292,7 +292,7 @@ static QString relativeInstallPath(const
-             return QFile::decodeName(ICON_INSTALL_DIR "/");
-         }
-         if (strcmp("include", type) == 0) {
--            return QFile::decodeName(INCLUDE_INSTALL_DIR "/");
-+            return QFile::decodeName(qgetenv("NIX_KDE_INCLUDE_DIR"));
-         }
-         break;
-     case 'l':
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support/series b/pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support/series
deleted file mode 100644
index 9b08ab208774..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support/series
+++ /dev/null
@@ -1 +0,0 @@
-nix-kde-include-dir.patch
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support/setup-hook.sh b/pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support/setup-hook.sh
deleted file mode 100644
index 21ac2e83b5da..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support/setup-hook.sh
+++ /dev/null
@@ -1 +0,0 @@
-export NIX_KDE_INCLUDE_DIR="@dev@/include/"  # trailing slash is required!
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kdesignerplugin.nix b/pkgs/desktops/kde-5/frameworks-5.19/kdesignerplugin.nix
deleted file mode 100644
index cbc114ccca03..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kdesignerplugin.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ kdeFramework, lib, makeQtWrapper
-, extra-cmake-modules
-, kcompletion
-, kconfig
-, kconfigwidgets
-, kcoreaddons
-, kdewebkit
-, kdoctools
-, kiconthemes
-, kio
-, kitemviews
-, kplotting
-, ktextwidgets
-, kwidgetsaddons
-, kxmlgui
-, sonnet
-}:
-
-kdeFramework {
-  name = "kdesignerplugin";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  buildInputs = [
-    kcompletion kconfig kconfigwidgets kcoreaddons kdewebkit
-    kiconthemes kitemviews kplotting ktextwidgets kwidgetsaddons
-    kxmlgui
-  ];
-  propagatedBuildInputs = [ kio sonnet ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kgendesignerplugin"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kdesu.nix b/pkgs/desktops/kde-5/frameworks-5.19/kdesu.nix
deleted file mode 100644
index 364fbd6a720b..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kdesu.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n, kpty
-, kservice
-}:
-
-kdeFramework {
-  name = "kdesu";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kcoreaddons kservice ];
-  propagatedBuildInputs = [ ki18n kpty ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kdewebkit.nix b/pkgs/desktops/kde-5/frameworks-5.19/kdewebkit.nix
deleted file mode 100644
index d361313d1d49..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kdewebkit.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons
-, ki18n, kio, kjobwidgets, kparts, kservice, kwallet, qtwebkit
-}:
-
-kdeFramework {
-  name = "kdewebkit";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kconfig kcoreaddons kjobwidgets kparts kservice kwallet ];
-  propagatedBuildInputs = [ ki18n kio qtwebkit ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kdnssd.nix b/pkgs/desktops/kde-5/frameworks-5.19/kdnssd.nix
deleted file mode 100644
index f00432b0c9ce..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kdnssd.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, avahi
-}:
-
-kdeFramework {
-  name = "kdnssd";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ avahi ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kdoctools/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kdoctools/default.nix
deleted file mode 100644
index f67c19f42395..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kdoctools/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, docbook_xml_dtd_45
-, docbook5_xsl, karchive, ki18n, makeQtWrapper, perl, perlPackages
-}:
-
-kdeFramework {
-  name = "kdoctools";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ karchive ];
-  propagatedBuildInputs = [ ki18n ];
-  propagatedNativeBuildInputs = [ makeQtWrapper perl perlPackages.URI ];
-  cmakeFlags = [
-    "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
-    "-DDocBookXSL_DIR=${docbook5_xsl}/xml/xsl/docbook"
-  ];
-  patches = [ ./kdoctools-no-find-docbook-xml.patch ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kdoctools/kdoctools-no-find-docbook-xml.patch b/pkgs/desktops/kde-5/frameworks-5.19/kdoctools/kdoctools-no-find-docbook-xml.patch
deleted file mode 100644
index 4e3a33efab32..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kdoctools/kdoctools-no-find-docbook-xml.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5c4863c..f731775 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -46,7 +46,6 @@ set_package_properties(LibXml2 PROPERTIES
-                       )
- 
- 
--find_package(DocBookXML4 "4.5")
- 
- set_package_properties(DocBookXML4 PROPERTIES
-                        TYPE REQUIRED
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kdoctools/setup-hook.sh b/pkgs/desktops/kde-5/frameworks-5.19/kdoctools/setup-hook.sh
deleted file mode 100644
index 5cfffbd622d1..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kdoctools/setup-hook.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-addXdgData() {
-    addToSearchPath XDG_DATA_DIRS "$1/share"
-}
-
-envHooks+=(addXdgData)
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kemoticons.nix b/pkgs/desktops/kde-5/frameworks-5.19/kemoticons.nix
deleted file mode 100644
index d165f84e3a2d..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kemoticons.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, karchive
-, kconfig
-, kcoreaddons
-, kservice
-}:
-
-kdeFramework {
-  name = "kemoticons";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ karchive kconfig kcoreaddons ];
-  propagatedBuildInputs = [ kservice ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kfilemetadata.nix b/pkgs/desktops/kde-5/frameworks-5.19/kfilemetadata.nix
deleted file mode 100644
index be99c58d5504..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kfilemetadata.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, attr, ebook_tools, exiv2
-, ffmpeg, karchive, ki18n, poppler, qtbase, taglib
-}:
-
-kdeFramework {
-  name = "kfilemetadata";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ attr ebook_tools exiv2 ffmpeg karchive poppler taglib ];
-  propagatedBuildInputs = [ qtbase ki18n ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kfilemetadata/cmake-install-paths.patch b/pkgs/desktops/kde-5/frameworks-5.19/kfilemetadata/cmake-install-paths.patch
deleted file mode 100644
index 732f7b69c828..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kfilemetadata/cmake-install-paths.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: kfilemetadata-5.18.0/src/CMakeLists.txt
-===================================================================
---- kfilemetadata-5.18.0.orig/src/CMakeLists.txt
-+++ kfilemetadata-5.18.0/src/CMakeLists.txt
-@@ -49,7 +49,7 @@ install(TARGETS KF5FileMetaData EXPORT K
- 
- install(EXPORT KF5FileMetaDataTargets
-         NAMESPACE KF5::
--        DESTINATION ${LIB_INSTALL_DIR}/cmake/KF5FileMetaData
-+        DESTINATION ${KDE_INSTALL_FULL_CMAKEPACKAGEDIR}/KF5FileMetaData
-         FILE KF5FileMetaDataTargets.cmake)
- 
- install(FILES
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kfilemetadata/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kfilemetadata/default.nix
deleted file mode 100644
index 9bb4831cf8da..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kfilemetadata/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ kdeFramework, lib, copyPathsToStore, extra-cmake-modules
-, attr, ebook_tools, exiv2, ffmpeg, karchive, ki18n, poppler, qtbase, taglib
-}:
-
-kdeFramework {
-  name = "kfilemetadata";
-  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ attr ebook_tools exiv2 ffmpeg karchive poppler taglib ];
-  propagatedBuildInputs = [ qtbase ki18n ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kfilemetadata/series b/pkgs/desktops/kde-5/frameworks-5.19/kfilemetadata/series
deleted file mode 100644
index d2689425c387..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kfilemetadata/series
+++ /dev/null
@@ -1 +0,0 @@
-cmake-install-paths.patch
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kglobalaccel.nix b/pkgs/desktops/kde-5/frameworks-5.19/kglobalaccel.nix
deleted file mode 100644
index c535b3590a38..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kglobalaccel.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, kconfig
-, kcoreaddons
-, kcrash
-, kdbusaddons
-, kwindowsystem
-, makeQtWrapper
-, qtx11extras
-}:
-
-kdeFramework {
-  name = "kglobalaccel";
-  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
-  buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons ];
-  propagatedBuildInputs = [ kwindowsystem qtx11extras ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kglobalaccel5"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kguiaddons.nix b/pkgs/desktops/kde-5/frameworks-5.19/kguiaddons.nix
deleted file mode 100644
index bc4e9ab11843..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kguiaddons.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, qtx11extras
-}:
-
-kdeFramework {
-  name = "kguiaddons";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtx11extras ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/khtml.nix b/pkgs/desktops/kde-5/frameworks-5.19/khtml.nix
deleted file mode 100644
index d40df466ebbd..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/khtml.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, giflib, karchive
-, kcodecs, kglobalaccel, ki18n, kiconthemes, kio, kjs
-, knotifications, kparts, ktextwidgets, kwallet, kwidgetsaddons
-, kwindowsystem, kxmlgui, perl, phonon, qtx11extras, sonnet
-}:
-
-kdeFramework {
-  name = "khtml";
-  nativeBuildInputs = [ extra-cmake-modules perl ];
-  buildInputs = [
-    giflib karchive kiconthemes knotifications kwallet kwidgetsaddons
-    kxmlgui phonon
-  ];
-  propagatedBuildInputs = [
-    kcodecs kglobalaccel ki18n kio kjs kparts ktextwidgets
-    kwindowsystem qtx11extras sonnet
-  ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/ki18n.nix b/pkgs/desktops/kde-5/frameworks-5.19/ki18n.nix
deleted file mode 100644
index 268006512e7c..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/ki18n.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, gettext
-, python
-, qtdeclarative
-, qtscript
-}:
-
-kdeFramework {
-  name = "ki18n";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtdeclarative qtscript ];
-  propagatedNativeBuildInputs = [ gettext python ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kiconthemes/default-theme-breeze.patch b/pkgs/desktops/kde-5/frameworks-5.19/kiconthemes/default-theme-breeze.patch
deleted file mode 100644
index 5b3b15d5d5b5..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kiconthemes/default-theme-breeze.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: kiconthemes-5.17.0/src/kicontheme.cpp
-===================================================================
---- kiconthemes-5.17.0.orig/src/kicontheme.cpp
-+++ kiconthemes-5.17.0/src/kicontheme.cpp
-@@ -557,7 +557,7 @@ void KIconTheme::reconfigure()
- // static
- QString KIconTheme::defaultThemeName()
- {
--    return QStringLiteral("oxygen");
-+    return QStringLiteral("breeze");
- }
- 
- void KIconTheme::assignIconsToContextMenu(ContextMenus type,
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kiconthemes/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kiconthemes/default.nix
deleted file mode 100644
index b78b25582beb..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kiconthemes/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ kdeFramework, lib, copyPathsToStore
-, extra-cmake-modules, makeQtWrapper
-, kconfigwidgets, ki18n, breeze-icons, kitemviews, qtsvg
-}:
-
-kdeFramework {
-  name = "kiconthemes";
-  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
-  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
-  buildInputs = [ kconfigwidgets kitemviews qtsvg ];
-  propagatedBuildInputs = [ breeze-icons ki18n ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kiconfinder5"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kiconthemes/series b/pkgs/desktops/kde-5/frameworks-5.19/kiconthemes/series
deleted file mode 100644
index ab5cc8a3edb2..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kiconthemes/series
+++ /dev/null
@@ -1 +0,0 @@
-default-theme-breeze.patch
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kidletime.nix b/pkgs/desktops/kde-5/frameworks-5.19/kidletime.nix
deleted file mode 100644
index fc0865600239..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kidletime.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, qtbase
-, qtx11extras
-}:
-
-kdeFramework {
-  name = "kidletime";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtx11extras ];
-  propagatedBuildInputs = [ qtbase ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kimageformats.nix b/pkgs/desktops/kde-5/frameworks-5.19/kimageformats.nix
deleted file mode 100644
index 49d66bbcc2c6..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kimageformats.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, ilmbase
-}:
-
-kdeFramework {
-  name = "kimageformats";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kinit/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kinit/default.nix
deleted file mode 100644
index 64210ca76051..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kinit/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kdeFramework, lib, copyPathsToStore, extra-cmake-modules, kconfig, kcrash
-, kdoctools, ki18n, kio, kservice, kwindowsystem, libcap
-, libcap_progs
-}:
-
-# TODO: setuid wrapper
-
-kdeFramework {
-  name = "kinit";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools libcap_progs ];
-  buildInputs = [ kconfig kcrash kservice libcap ];
-  propagatedBuildInputs = [ ki18n kio kwindowsystem ];
-  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kinit/kinit-libpath.patch b/pkgs/desktops/kde-5/frameworks-5.19/kinit/kinit-libpath.patch
deleted file mode 100644
index 52c5563ea581..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kinit/kinit-libpath.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: kinit-5.19.0/src/kdeinit/kinit.cpp
-===================================================================
---- kinit-5.19.0.orig/src/kdeinit/kinit.cpp
-+++ kinit-5.19.0/src/kdeinit/kinit.cpp
-@@ -658,15 +658,17 @@ static pid_t launch(int argc, const char
-         if (!libpath.isEmpty()) {
-             if (!l.load()) {
-                 if (libpath_relative) {
--                    // NB: Because Qt makes the actual dlopen() call, the
--                    //     RUNPATH of kdeinit is *not* respected - see
--                    //     https://sourceware.org/bugzilla/show_bug.cgi?id=13945
--                    //     - so we try hacking it in ourselves
--                    QString install_lib_dir = QFile::decodeName(
--                            CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/");
--                    libpath = install_lib_dir + libpath;
--                    l.setFileName(libpath);
--                    l.load();
-+                    // Try to load the library relative to the active profiles.
-+                    QByteArrayList profiles = qgetenv("NIX_PROFILES").split(' ');
-+                    // Reverse the profile list.
-+                    std::reverse(profiles.begin(), profiles.end());
-+                    const QString libdir = QString::fromLatin1("/lib/");
-+                    Q_FOREACH (const QByteArray &profile, profiles) {
-+                        if (!profile.isEmpty()) {
-+                            l.setFileName(QFile::decodeName(profile) + libdir + libpath);
-+                            if (l.load()) break;
-+                        }
-+                    }
-                 }
-             }
-             if (!l.isLoaded()) {
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kinit/series b/pkgs/desktops/kde-5/frameworks-5.19/kinit/series
deleted file mode 100644
index 5faa456366b9..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kinit/series
+++ /dev/null
@@ -1 +0,0 @@
-kinit-libpath.patch
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kio/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kio/default.nix
deleted file mode 100644
index a2131ff33850..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kio/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ kdeFramework, lib, copyPathsToStore
-, extra-cmake-modules, acl, karchive
-, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons
-, kdbusaddons, kdoctools, ki18n, kiconthemes, kitemviews
-, kjobwidgets, knotifications, kservice, ktextwidgets, kwallet
-, kwidgetsaddons, kwindowsystem, kxmlgui, makeQtWrapper
-, qtscript, qtx11extras, solid
-}:
-
-kdeFramework {
-  name = "kio";
-  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
-  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  buildInputs = [
-    acl karchive kconfig kcoreaddons kdbusaddons kiconthemes
-    knotifications ktextwidgets kwallet kwidgetsaddons
-    qtscript
-  ];
-  propagatedBuildInputs = [
-    kbookmarks kcompletion kconfigwidgets ki18n kitemviews kjobwidgets
-    kservice kwindowsystem kxmlgui solid qtx11extras
-  ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kcookiejar5"
-    wrapQtProgram "$out/bin/ktelnetservice5"
-    wrapQtProgram "$out/bin/ktrash5"
-    wrapQtProgram "$out/bin/kmailservice5"
-    wrapQtProgram "$out/bin/protocoltojson"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kio/samba-search-path.patch b/pkgs/desktops/kde-5/frameworks-5.19/kio/samba-search-path.patch
deleted file mode 100644
index c9ad46b41bb7..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kio/samba-search-path.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: kio-5.17.0/src/core/ksambashare.cpp
-===================================================================
---- kio-5.17.0.orig/src/core/ksambashare.cpp
-+++ kio-5.17.0/src/core/ksambashare.cpp
-@@ -67,13 +67,18 @@ KSambaSharePrivate::~KSambaSharePrivate(
- 
- bool KSambaSharePrivate::isSambaInstalled()
- {
--    if (QFile::exists(QStringLiteral("/usr/sbin/smbd"))
--            || QFile::exists(QStringLiteral("/usr/local/sbin/smbd"))) {
--        return true;
-+    const QByteArray pathEnv = qgetenv("PATH");
-+    if (!pathEnv.isEmpty()) {
-+        QLatin1Char pathSep(':');
-+        QStringList paths = QFile::decodeName(pathEnv).split(pathSep, QString::SkipEmptyParts);
-+        for (QStringList::iterator it = paths.begin(); it != paths.end(); ++it) {
-+            it->append("/smbd");
-+            if (QFile::exists(*it)) {
-+                return true;
-+            }
-+        }
-     }
- 
--    //qDebug() << "Samba is not installed!";
--
-     return false;
- }
- 
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kio/series b/pkgs/desktops/kde-5/frameworks-5.19/kio/series
deleted file mode 100644
index 77ca15450047..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kio/series
+++ /dev/null
@@ -1 +0,0 @@
-samba-search-path.patch
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kitemmodels.nix b/pkgs/desktops/kde-5/frameworks-5.19/kitemmodels.nix
deleted file mode 100644
index a9024d771cc3..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kitemmodels.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-}:
-
-kdeFramework {
-  name = "kitemmodels";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kitemviews.nix b/pkgs/desktops/kde-5/frameworks-5.19/kitemviews.nix
deleted file mode 100644
index 931019ce495d..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kitemviews.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-}:
-
-kdeFramework {
-  name = "kitemviews";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kjobwidgets.nix b/pkgs/desktops/kde-5/frameworks-5.19/kjobwidgets.nix
deleted file mode 100644
index 746edf12eea0..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kjobwidgets.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, kcoreaddons
-, kwidgetsaddons
-, qtx11extras
-}:
-
-kdeFramework {
-  name = "kjobwidgets";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kcoreaddons kwidgetsaddons ];
-  propagatedBuildInputs = [ qtx11extras ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kjs.nix b/pkgs/desktops/kde-5/frameworks-5.19/kjs.nix
deleted file mode 100644
index 768720f178c8..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kjs.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, kdoctools
-, makeQtWrapper
-}:
-
-kdeFramework {
-  name = "kjs";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kjs5"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kjsembed.nix b/pkgs/desktops/kde-5/frameworks-5.19/kjsembed.nix
deleted file mode 100644
index 22eef2d47bde..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kjsembed.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kdoctools, ki18n, kjs
-, makeQtWrapper, qtsvg
-}:
-
-kdeFramework {
-  name = "kjsembed";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  buildInputs = [ qtsvg ];
-  propagatedBuildInputs = [ ki18n kjs ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kjscmd5"
-    wrapQtProgram "$out/bin/kjsconsole"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kmediaplayer.nix b/pkgs/desktops/kde-5/frameworks-5.19/kmediaplayer.nix
deleted file mode 100644
index 460458b22323..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kmediaplayer.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, kparts
-, kxmlgui
-}:
-
-kdeFramework {
-  name = "kmediaplayer";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kxmlgui ];
-  propagatedBuildInputs = [ kparts ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/knewstuff.nix b/pkgs/desktops/kde-5/frameworks-5.19/knewstuff.nix
deleted file mode 100644
index 5bcd6f301462..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/knewstuff.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, attica, karchive
-, kcompletion, kconfig, kcoreaddons, ki18n, kiconthemes, kio
-, kitemviews, kservice, ktextwidgets, kwidgetsaddons, kxmlgui
-}:
-
-kdeFramework {
-  name = "knewstuff";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    karchive kcompletion kconfig kcoreaddons kiconthemes
-    kitemviews ktextwidgets kwidgetsaddons
-  ];
-  propagatedBuildInputs = [ attica ki18n kio kservice kxmlgui ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/knotifications.nix b/pkgs/desktops/kde-5/frameworks-5.19/knotifications.nix
deleted file mode 100644
index 7e301dd0f268..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/knotifications.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, kcodecs
-, kconfig
-, kcoreaddons
-, kwindowsystem
-, phonon
-, qtx11extras
-}:
-
-kdeFramework {
-  name = "knotifications";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kcodecs kconfig kcoreaddons phonon
-  ];
-  propagatedBuildInputs = [ kwindowsystem qtx11extras ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/knotifyconfig.nix b/pkgs/desktops/kde-5/frameworks-5.19/knotifyconfig.nix
deleted file mode 100644
index dd99d2d4f1e5..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/knotifyconfig.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kcompletion, kconfig
-, ki18n, kio, phonon
-}:
-
-kdeFramework {
-  name = "knotifyconfig";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kcompletion kconfig phonon ];
-  propagatedBuildInputs = [ ki18n kio ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kpackage/allow-external-paths.patch b/pkgs/desktops/kde-5/frameworks-5.19/kpackage/allow-external-paths.patch
deleted file mode 100644
index e9d744448148..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kpackage/allow-external-paths.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: kpackage-5.18.0/src/kpackage/package.cpp
-===================================================================
---- kpackage-5.18.0.orig/src/kpackage/package.cpp
-+++ kpackage-5.18.0/src/kpackage/package.cpp
-@@ -808,7 +808,7 @@ PackagePrivate::PackagePrivate()
-     : QSharedData(),
-       fallbackPackage(0),
-       metadata(0),
--      externalPaths(false),
-+      externalPaths(true),
-       valid(false),
-       checkedValid(false)
- {
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kpackage/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kpackage/default.nix
deleted file mode 100644
index aea1b0d31a0d..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kpackage/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ kdeFramework, lib, copyPathsToStore
-, extra-cmake-modules
-, karchive
-, kconfig
-, kcoreaddons
-, kdoctools
-, ki18n
-, makeQtWrapper
-}:
-
-kdeFramework {
-  name = "kpackage";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  buildInputs = [ karchive kconfig ];
-  propagatedBuildInputs = [ kcoreaddons ki18n ];
-  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
-  postInstall = ''
-    wrapQtProgram "$out/bin/kpackagetool5"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kpackage/qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/frameworks-5.19/kpackage/qdiriterator-follow-symlinks.patch
deleted file mode 100644
index ddbf17d00064..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kpackage/qdiriterator-follow-symlinks.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: kpackage-5.18.0/src/kpackage/packageloader.cpp
-===================================================================
---- kpackage-5.18.0.orig/src/kpackage/packageloader.cpp
-+++ kpackage-5.18.0/src/kpackage/packageloader.cpp
-@@ -241,7 +241,7 @@ QList<KPluginMetaData> PackageLoader::li
-         } else {
-             //qDebug() << "Not cached";
-             // If there's no cache file, fall back to listing the directory
--            const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories;
-+            const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories | QDirIterator::FollowSymlinks;
-             const QStringList nameFilters = QStringList(QStringLiteral("metadata.desktop")) << QStringLiteral("metadata.json");
- 
-             QDirIterator it(plugindir, nameFilters, QDir::Files, flags);
-Index: kpackage-5.18.0/src/kpackage/private/packagejobthread.cpp
-===================================================================
---- kpackage-5.18.0.orig/src/kpackage/private/packagejobthread.cpp
-+++ kpackage-5.18.0/src/kpackage/private/packagejobthread.cpp
-@@ -146,7 +146,7 @@ bool indexDirectory(const QString& dir,
- 
-     QJsonArray plugins;
- 
--    QDirIterator it(dir, *metaDataFiles, QDir::Files, QDirIterator::Subdirectories);
-+    QDirIterator it(dir, *metaDataFiles, QDir::Files, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
-     while (it.hasNext()) {
-         it.next();
-         const QString path = it.fileInfo().absoluteFilePath();
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kpackage/series b/pkgs/desktops/kde-5/frameworks-5.19/kpackage/series
deleted file mode 100644
index 9b7f076efc70..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kpackage/series
+++ /dev/null
@@ -1,2 +0,0 @@
-allow-external-paths.patch
-qdiriterator-follow-symlinks.patch
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kparts.nix b/pkgs/desktops/kde-5/frameworks-5.19/kparts.nix
deleted file mode 100644
index 1c3e0b2cbc51..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kparts.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons
-, ki18n, kiconthemes, kio, kjobwidgets, knotifications, kservice
-, ktextwidgets, kwidgetsaddons, kxmlgui
-}:
-
-kdeFramework {
-  name = "kparts";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kconfig kcoreaddons kiconthemes kjobwidgets knotifications
-    kservice kwidgetsaddons
-  ];
-  propagatedBuildInputs = [ ki18n kio ktextwidgets kxmlgui ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kpeople.nix b/pkgs/desktops/kde-5/frameworks-5.19/kpeople.nix
deleted file mode 100644
index 4c3877e7efd2..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kpeople.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n
-, kitemviews, kservice, kwidgetsaddons, qtdeclarative
-}:
-
-kdeFramework {
-  name = "kpeople";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kcoreaddons kitemviews kservice kwidgetsaddons
-  ];
-  propagatedBuildInputs = [ ki18n qtdeclarative ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kplotting.nix b/pkgs/desktops/kde-5/frameworks-5.19/kplotting.nix
deleted file mode 100644
index c16f51b5ac3c..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kplotting.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-}:
-
-kdeFramework {
-  name = "kplotting";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kpty.nix b/pkgs/desktops/kde-5/frameworks-5.19/kpty.nix
deleted file mode 100644
index 2e34e6f674ce..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kpty.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n }:
-
-kdeFramework {
-  name = "kpty";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ kcoreaddons ki18n ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kross.nix b/pkgs/desktops/kde-5/frameworks-5.19/kross.nix
deleted file mode 100644
index 7c6f079feaa7..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kross.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kcompletion, kcoreaddons
-, kdoctools, ki18n, kiconthemes, kio, kparts, kwidgetsaddons
-, kxmlgui, qtscript
-}:
-
-kdeFramework {
-  name = "kross";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  buildInputs = [ kcompletion kcoreaddons kxmlgui ];
-  propagatedBuildInputs = [ ki18n kiconthemes kio kparts kwidgetsaddons qtscript ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/krunner.nix b/pkgs/desktops/kde-5/frameworks-5.19/krunner.nix
deleted file mode 100644
index 12d2b54d0eb3..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/krunner.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons
-, ki18n, kio, kservice, plasma-framework, qtquick1, solid
-, threadweaver
-}:
-
-kdeFramework {
-  name = "krunner";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kconfig kcoreaddons kservice qtquick1 solid threadweaver
-  ];
-  propagatedBuildInputs = [ ki18n kio plasma-framework ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kservice/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/frameworks-5.19/kservice/0001-qdiriterator-follow-symlinks.patch
deleted file mode 100644
index 3d8397d8ee2d..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kservice/0001-qdiriterator-follow-symlinks.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From ae8919eb81abad369e4a26ffcd845b140983398d Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Wed, 14 Oct 2015 06:28:57 -0500
-Subject: [PATCH 1/2] qdiriterator follow symlinks
-
----
- src/sycoca/kbuildsycoca.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/sycoca/kbuildsycoca.cpp b/src/sycoca/kbuildsycoca.cpp
-index 1deae14..250baa8 100644
---- a/src/sycoca/kbuildsycoca.cpp
-+++ b/src/sycoca/kbuildsycoca.cpp
-@@ -208,7 +208,7 @@ bool KBuildSycoca::build()
-         QStringList relFiles;
-         const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, m_resourceSubdir, QStandardPaths::LocateDirectory);
-         Q_FOREACH (const QString &dir, dirs) {
--            QDirIterator it(dir, QDirIterator::Subdirectories);
-+            QDirIterator it(dir, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
-             while (it.hasNext()) {
-                 const QString filePath = it.next();
-                 Q_ASSERT(filePath.startsWith(dir)); // due to the line below...
--- 
-2.5.2
-
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kservice/0002-no-canonicalize-path.patch b/pkgs/desktops/kde-5/frameworks-5.19/kservice/0002-no-canonicalize-path.patch
deleted file mode 100644
index 685c68526119..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kservice/0002-no-canonicalize-path.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 46d124da602d84b7611a7ff0ac0862168d451cdb Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Wed, 14 Oct 2015 06:31:29 -0500
-Subject: [PATCH 2/2] no canonicalize path
-
----
- src/sycoca/vfolder_menu.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/sycoca/vfolder_menu.cpp b/src/sycoca/vfolder_menu.cpp
-index d3e31c3..d15d743 100644
---- a/src/sycoca/vfolder_menu.cpp
-+++ b/src/sycoca/vfolder_menu.cpp
-@@ -415,7 +415,7 @@ VFolderMenu::absoluteDir(const QString &_dir, const QString &baseDir, bool keepR
-     }
- 
-     if (!relative) {
--        QString resolved = QDir(dir).canonicalPath();
-+      QString resolved = QDir::cleanPath(dir);
-         if (!resolved.isEmpty()) {
-             dir = resolved;
-         }
--- 
-2.5.2
-
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kservice/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kservice/default.nix
deleted file mode 100644
index 3a27d85b9166..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kservice/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons
-, kcrash, kdbusaddons, kdoctools, ki18n, kwindowsystem
-}:
-
-kdeFramework {
-  name = "kservice";
-  propagatedNativeBuildInputs = [ extra-cmake-modules ];
-  nativeBuildInputs = [ kdoctools ];
-  buildInputs = [ kcrash kdbusaddons ];
-  propagatedBuildInputs = [ kconfig kcoreaddons ki18n kwindowsystem ];
-  patches = [
-    ./0001-qdiriterator-follow-symlinks.patch
-    ./0002-no-canonicalize-path.patch
-  ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kservice/setup-hook.sh b/pkgs/desktops/kde-5/frameworks-5.19/kservice/setup-hook.sh
deleted file mode 100644
index c28e862ff8ae..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kservice/setup-hook.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-addServicePkg() {
-    local propagated
-    for dir in "share/kservices5" "share/kservicetypes5"; do
-        if [[ -d "$1/$dir" ]]; then
-            propagated=
-            for pkg in $propagatedBuildInputs; do
-                if [[ "z$pkg" == "z$1" ]]; then
-                    propagated=1
-                    break
-                fi
-            done
-            if [[ -z $propagated ]]; then
-                propagatedBuildInputs="$propagatedBuildInputs $1"
-            fi
-
-            propagated=
-            for pkg in $propagatedUserEnvPkgs; do
-                if [[ "z$pkg" == "z$1" ]]; then
-                    propagated=1
-                    break
-                fi
-            done
-            if [[ -z $propagated ]]; then
-                propagatedUserEnvPkgs="$propagatedUserEnvPkgs $1"
-            fi
-
-            break
-        fi
-    done
-}
-
-envHooks+=(addServicePkg)
-
-local propagated
-for pkg in $propagatedBuildInputs; do
-    if [[ "z$pkg" == "z@out@" ]]; then
-        propagated=1
-        break
-    fi
-done
-if [[ -z $propagated ]]; then
-    propagatedBuildInputs="$propagatedBuildInputs @out@"
-fi
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/ktexteditor/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/ktexteditor/default.nix
deleted file mode 100644
index b8df6a5f4c0d..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/ktexteditor/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ kdeFramework, lib, copyPathsToStore
-, extra-cmake-modules, makeQtWrapper, perl
-, karchive, kconfig, kguiaddons, kiconthemes, kparts
-, libgit2
-, qtscript, qtxmlpatterns
-, ki18n, kio, sonnet
-}:
-
-kdeFramework {
-  name = "ktexteditor";
-  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper perl ];
-  buildInputs = [
-    karchive kconfig kguiaddons kiconthemes kparts
-    libgit2
-    qtscript qtxmlpatterns
-  ];
-  propagatedBuildInputs = [ ki18n kio sonnet ];
-  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/ktexteditor/no-qcoreapplication.patch b/pkgs/desktops/kde-5/frameworks-5.19/ktexteditor/no-qcoreapplication.patch
deleted file mode 100644
index 19ab1e1e5513..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/ktexteditor/no-qcoreapplication.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Index: ktexteditor-5.18.0/src/syntax/data/katehighlightingindexer.cpp
-===================================================================
---- ktexteditor-5.18.0.orig/src/syntax/data/katehighlightingindexer.cpp
-+++ ktexteditor-5.18.0/src/syntax/data/katehighlightingindexer.cpp
-@@ -55,19 +55,16 @@ QStringList readListing(const QString &f
- 
- int main(int argc, char *argv[])
- {
--    // get app instance
--    QCoreApplication app(argc, argv);
--
-     // ensure enough arguments are passed
--    if (app.arguments().size() < 3)
-+    if (argc < 3)
-         return 1;
- 
-     // open schema
-     QXmlSchema schema;
--    if (!schema.load(QUrl::fromLocalFile(app.arguments().at(2))))
-+    if (!schema.load(QUrl::fromLocalFile(QString::fromLocal8Bit(argv[2]))))
-         return 2;
- 
--    const QString hlFilenamesListing = app.arguments().value(3);
-+    const QString hlFilenamesListing = QString::fromLocal8Bit(argv[3]);
-     if (hlFilenamesListing.isEmpty()) {
-         return 1;
-     }
-@@ -152,7 +149,7 @@ int main(int argc, char *argv[])
-         return anyError;
- 
-     // create outfile, after all has worked!
--    QFile outFile(app.arguments().at(1));
-+    QFile outFile(QString::fromLocal8Bit(argv[1]));
-     if (!outFile.open(QIODevice::WriteOnly | QIODevice::Truncate))
-         return 7;
- 
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/ktexteditor/series b/pkgs/desktops/kde-5/frameworks-5.19/ktexteditor/series
deleted file mode 100644
index 46cd23829a2f..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/ktexteditor/series
+++ /dev/null
@@ -1 +0,0 @@
-no-qcoreapplication.patch
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/ktextwidgets.nix b/pkgs/desktops/kde-5/frameworks-5.19/ktextwidgets.nix
deleted file mode 100644
index e332d4ff9a83..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/ktextwidgets.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kcompletion, kconfig
-, kconfigwidgets, ki18n, kiconthemes, kservice, kwindowsystem
-, sonnet
-}:
-
-kdeFramework {
-  name = "ktextwidgets";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kcompletion kconfig kconfigwidgets kiconthemes kservice
-  ];
-  propagatedBuildInputs = [ ki18n kwindowsystem sonnet ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kunitconversion.nix b/pkgs/desktops/kde-5/frameworks-5.19/kunitconversion.nix
deleted file mode 100644
index 3cf0f847d83d..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kunitconversion.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, ki18n }:
-
-kdeFramework {
-  name = "kunitconversion";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ ki18n ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kwallet.nix b/pkgs/desktops/kde-5/frameworks-5.19/kwallet.nix
deleted file mode 100644
index 5ade5f63a8d0..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kwallet.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kconfig, kconfigwidgets
-, kcoreaddons , kdbusaddons, kdoctools, ki18n, kiconthemes
-, knotifications , kservice, kwidgetsaddons, kwindowsystem, libgcrypt
-, makeQtWrapper }:
-
-kdeFramework {
-  name = "kwallet";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  buildInputs = [
-    kconfig kconfigwidgets kcoreaddons kdbusaddons kiconthemes
-    knotifications kservice kwidgetsaddons libgcrypt
-  ];
-  propagatedBuildInputs = [ ki18n kwindowsystem ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kwalletd5"
-    wrapQtProgram "$out/bin/kwallet-query"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kwidgetsaddons.nix b/pkgs/desktops/kde-5/frameworks-5.19/kwidgetsaddons.nix
deleted file mode 100644
index d95f44d3fecf..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kwidgetsaddons.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-}:
-
-kdeFramework {
-  name = "kwidgetsaddons";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kwindowsystem.nix b/pkgs/desktops/kde-5/frameworks-5.19/kwindowsystem.nix
deleted file mode 100644
index 09ab1f2200de..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kwindowsystem.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, qtx11extras
-}:
-
-kdeFramework {
-  name = "kwindowsystem";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtx11extras ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kxmlgui.nix b/pkgs/desktops/kde-5/frameworks-5.19/kxmlgui.nix
deleted file mode 100644
index f081d5f9170e..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kxmlgui.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, attica, kconfig
-, kconfigwidgets, kglobalaccel, ki18n, kiconthemes, kitemviews
-, ktextwidgets, kwindowsystem, sonnet
-}:
-
-kdeFramework {
-  name = "kxmlgui";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    attica kconfig kiconthemes kitemviews ktextwidgets
-  ];
-  propagatedBuildInputs = [
-    kconfigwidgets kglobalaccel ki18n kwindowsystem sonnet
-  ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kxmlrpcclient.nix b/pkgs/desktops/kde-5/frameworks-5.19/kxmlrpcclient.nix
deleted file mode 100644
index 20a300b68bc8..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/kxmlrpcclient.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, ki18n, kio }:
-
-kdeFramework {
-  name = "kxmlrpcclient";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ ki18n kio ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/modemmanager-qt.nix b/pkgs/desktops/kde-5/frameworks-5.19/modemmanager-qt.nix
deleted file mode 100644
index 7d7f769d6a9b..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/modemmanager-qt.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, modemmanager
-}:
-
-kdeFramework {
-  name = "modemmanager-qt";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ modemmanager ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/networkmanager-qt.nix b/pkgs/desktops/kde-5/frameworks-5.19/networkmanager-qt.nix
deleted file mode 100644
index 333378bd1431..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/networkmanager-qt.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, networkmanager
-}:
-
-kdeFramework {
-  name = "networkmanager-qt";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ networkmanager ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/oxygen-icons5.nix b/pkgs/desktops/kde-5/frameworks-5.19/oxygen-icons5.nix
deleted file mode 100644
index ee350f8e1536..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/oxygen-icons5.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kdeFramework
-, lib
-, extra-cmake-modules
-}:
-
-kdeFramework {
-  name = "oxygen-icons5";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    license = lib.licenses.lgpl3Plus;
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/plasma-framework/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/plasma-framework/default.nix
deleted file mode 100644
index d8846f777231..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/plasma-framework/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kactivities, karchive
-, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative
-, kdoctools, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio
-, knotifications, kpackage, kservice, kwindowsystem, kxmlgui
-, makeQtWrapper, qtscript, qtx11extras
-}:
-
-kdeFramework {
-  name = "plasma-framework";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  buildInputs = [
-    karchive kconfig kconfigwidgets kcoreaddons kdbusaddons kguiaddons
-    kiconthemes knotifications kxmlgui qtscript
-  ];
-  propagatedBuildInputs = [
-    kactivities kdeclarative kglobalaccel ki18n kio kpackage kservice kwindowsystem
-    qtx11extras
-  ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/plasmapkg2"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/solid.nix b/pkgs/desktops/kde-5/frameworks-5.19/solid.nix
deleted file mode 100644
index afd125e3c597..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/solid.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, makeQtWrapper
-, qtdeclarative
-}:
-
-kdeFramework {
-  name = "solid";
-  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
-  buildInputs = [ qtdeclarative ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/solid-hardware5"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/sonnet.nix b/pkgs/desktops/kde-5/frameworks-5.19/sonnet.nix
deleted file mode 100644
index 943fe04a1c92..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/sonnet.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, hunspell
-}:
-
-kdeFramework {
-  name = "sonnet";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ hunspell ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/srcs.nix b/pkgs/desktops/kde-5/frameworks-5.19/srcs.nix
deleted file mode 100644
index b86c0b71224d..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/srcs.nix
+++ /dev/null
@@ -1,565 +0,0 @@
-# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
-{ fetchurl, mirror }:
-
-{
-  attica = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/attica-5.19.0.tar.xz";
-      sha256 = "0cbvjnv2fcqsxspiy5pzmnnzrpfamlsc9j927kd6gpzai1ckf1lv";
-      name = "attica-5.19.0.tar.xz";
-    };
-  };
-  baloo = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/baloo-5.19.0.tar.xz";
-      sha256 = "02yy0w13h5wxm74a87zi439f6yd9miid6rb54nia0pgvcka98svg";
-      name = "baloo-5.19.0.tar.xz";
-    };
-  };
-  bluez-qt = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/bluez-qt-5.19.0.tar.xz";
-      sha256 = "0609i7rzhnnnp4fqnwscwp6y646ji8kl2hw5sy7azc87yllisnyv";
-      name = "bluez-qt-5.19.0.tar.xz";
-    };
-  };
-  breeze-icons = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/breeze-icons-5.19.0.tar.xz";
-      sha256 = "0bwix0jl1dscqfb7ygn9drpd9ivfx4g15vz6h01mswvxa9lz1vj0";
-      name = "breeze-icons-5.19.0.tar.xz";
-    };
-  };
-  extra-cmake-modules = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/extra-cmake-modules-5.19.0.tar.xz";
-      sha256 = "1dl3hhbara7iswb5wsc5dp17ar3ljw5f0nrncl8vry9smaz2zl63";
-      name = "extra-cmake-modules-5.19.0.tar.xz";
-    };
-  };
-  frameworkintegration = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/frameworkintegration-5.19.0.tar.xz";
-      sha256 = "00la7p7wcyqpxyi73h4fjrmm9d2gqzdaljn4468xya4bfns5ijy3";
-      name = "frameworkintegration-5.19.0.tar.xz";
-    };
-  };
-  kactivities = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kactivities-5.19.0.tar.xz";
-      sha256 = "0yml1sbn3z4jd4vsfs25kqrl03pmlcgamzbgpw3248sabhyg7ks3";
-      name = "kactivities-5.19.0.tar.xz";
-    };
-  };
-  kapidox = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kapidox-5.19.0.tar.xz";
-      sha256 = "0a9731xrkd6mnqh72592rx6gfnxxdfd7xl8pdpgdn7qs3394k1yz";
-      name = "kapidox-5.19.0.tar.xz";
-    };
-  };
-  karchive = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/karchive-5.19.0.tar.xz";
-      sha256 = "043spmi7s2d1bj8d3wbgzbhisip6h92kqjhlvg8gyv0a7vy54ymv";
-      name = "karchive-5.19.0.tar.xz";
-    };
-  };
-  kauth = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kauth-5.19.0.tar.xz";
-      sha256 = "0fm9ih2hkh2rpmlf98yw8z1r5bn2qmpva2k7mrv6ijd5h767fxss";
-      name = "kauth-5.19.0.tar.xz";
-    };
-  };
-  kbookmarks = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kbookmarks-5.19.0.tar.xz";
-      sha256 = "0q418jpdc348nqgdavsmxxka4g8sldpdi9n89i1pllfmq10kw9sd";
-      name = "kbookmarks-5.19.0.tar.xz";
-    };
-  };
-  kcmutils = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kcmutils-5.19.0.tar.xz";
-      sha256 = "0qhdjb3zvqq9ycfgb52lz4flgipyplj5ksz8h8y71bbs4w6lazd8";
-      name = "kcmutils-5.19.0.tar.xz";
-    };
-  };
-  kcodecs = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kcodecs-5.19.0.tar.xz";
-      sha256 = "1rzp314fv9n5168j7nhv1c8fjaszpmgdx6javrx4w0hyrjdfkg66";
-      name = "kcodecs-5.19.0.tar.xz";
-    };
-  };
-  kcompletion = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kcompletion-5.19.0.tar.xz";
-      sha256 = "05n0y5kf3bcc4wgn6k0js5cravv1k93xxzrgapm21323qgvfagwd";
-      name = "kcompletion-5.19.0.tar.xz";
-    };
-  };
-  kconfig = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kconfig-5.19.0.tar.xz";
-      sha256 = "0nk5hfl8yh0kgaa7xi0cc05dl6nf7prvbvxv0i99207xh9dafdmm";
-      name = "kconfig-5.19.0.tar.xz";
-    };
-  };
-  kconfigwidgets = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kconfigwidgets-5.19.0.tar.xz";
-      sha256 = "1nld27chcjwjgwv76s2j77ifmca235yp10bm08rjmvnfn6778ypv";
-      name = "kconfigwidgets-5.19.0.tar.xz";
-    };
-  };
-  kcoreaddons = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kcoreaddons-5.19.0.tar.xz";
-      sha256 = "07sm0givfdx28p302fkynzsd3xkpn1hbs43d4rscyx18yxfsldcw";
-      name = "kcoreaddons-5.19.0.tar.xz";
-    };
-  };
-  kcrash = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kcrash-5.19.0.tar.xz";
-      sha256 = "1dy03gp1sj96wn0zfa0dpbvz8pz0ia1j7p1wcif3iqk55pjxdgyl";
-      name = "kcrash-5.19.0.tar.xz";
-    };
-  };
-  kdbusaddons = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kdbusaddons-5.19.0.tar.xz";
-      sha256 = "1bb5aik0kl3kab5399drfjxrm8iysgkf813xgr0y4k64c9kwfp28";
-      name = "kdbusaddons-5.19.0.tar.xz";
-    };
-  };
-  kdeclarative = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kdeclarative-5.19.0.tar.xz";
-      sha256 = "03g02zy7wjzmpvqzxx32z8ap7jyj9sf432g1d3csb0dcbx2ny52g";
-      name = "kdeclarative-5.19.0.tar.xz";
-    };
-  };
-  kded = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kded-5.19.0.tar.xz";
-      sha256 = "0nyvg0h2aqy7qr57bad6wyc2rmcv9nhdq0py4fxc3irb6516p9hz";
-      name = "kded-5.19.0.tar.xz";
-    };
-  };
-  kdelibs4support = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/portingAids/kdelibs4support-5.19.0.tar.xz";
-      sha256 = "0iqnb2j6gfy8006arwv65vljfhxdnk6aia0zppngb481jnd9n2pn";
-      name = "kdelibs4support-5.19.0.tar.xz";
-    };
-  };
-  kdesignerplugin = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kdesignerplugin-5.19.0.tar.xz";
-      sha256 = "11inmvyair796rx4842naf1dnxqvc6bqqzrv700ycvisad646ws5";
-      name = "kdesignerplugin-5.19.0.tar.xz";
-    };
-  };
-  kdesu = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kdesu-5.19.0.tar.xz";
-      sha256 = "19w8m7ji61bpd368lzkwlizcwa1l968l568lksgm2mm9pnyjjhgz";
-      name = "kdesu-5.19.0.tar.xz";
-    };
-  };
-  kdewebkit = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kdewebkit-5.19.0.tar.xz";
-      sha256 = "04b5qanhxggffnvmi28lspyi8kj4kq7mxhxndar9fmkzzgvy70hj";
-      name = "kdewebkit-5.19.0.tar.xz";
-    };
-  };
-  kdnssd = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kdnssd-5.19.0.tar.xz";
-      sha256 = "15a8w2i29mrbhadw6y123mr0cc45ijabnwdfp3lbkd40lk8nq314";
-      name = "kdnssd-5.19.0.tar.xz";
-    };
-  };
-  kdoctools = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kdoctools-5.19.0.tar.xz";
-      sha256 = "06g77n9wxpiv4skc1kz794ppfb2mkmd3fgn6an5kr301xc76cnpn";
-      name = "kdoctools-5.19.0.tar.xz";
-    };
-  };
-  kemoticons = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kemoticons-5.19.0.tar.xz";
-      sha256 = "0fiix2sf2wrvmrpx8whdr1bzm7gbv7pvg02y47w5bl6s9gh176g5";
-      name = "kemoticons-5.19.0.tar.xz";
-    };
-  };
-  kfilemetadata = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kfilemetadata-5.19.0.tar.xz";
-      sha256 = "11j8if3xhp3xxwibwm6nxb4lh8wx40ni3zf5hki327pxv4vpq3qr";
-      name = "kfilemetadata-5.19.0.tar.xz";
-    };
-  };
-  kglobalaccel = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kglobalaccel-5.19.0.tar.xz";
-      sha256 = "021j98f7217m83aqxpamg0lzlaiskdaqsd9iabc8wrp1g0nkm05d";
-      name = "kglobalaccel-5.19.0.tar.xz";
-    };
-  };
-  kguiaddons = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kguiaddons-5.19.0.tar.xz";
-      sha256 = "019xaf7vpgifcw8wibli9d2b50brhgdaypsqknh6mqq8q9g06jhy";
-      name = "kguiaddons-5.19.0.tar.xz";
-    };
-  };
-  khtml = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/portingAids/khtml-5.19.0.tar.xz";
-      sha256 = "0hqa54a9nxy954vy8gf52y89xd3ibz9b4jgh6w347b1alp1zn145";
-      name = "khtml-5.19.0.tar.xz";
-    };
-  };
-  ki18n = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/ki18n-5.19.0.tar.xz";
-      sha256 = "0v3arc20y5d8afm9zfrz1skd2xg3ng62cq1xvxiq645w6mxf7y05";
-      name = "ki18n-5.19.0.tar.xz";
-    };
-  };
-  kiconthemes = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kiconthemes-5.19.0.tar.xz";
-      sha256 = "0riicirgda3w2b30dzsa2lq9xrr4y04qwhxyzq1p8gn2x4pp3g3n";
-      name = "kiconthemes-5.19.0.tar.xz";
-    };
-  };
-  kidletime = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kidletime-5.19.0.tar.xz";
-      sha256 = "0jlbzqv36ddhfhk8xkkgw0xhq8s371z9ama1cyv2xq8kk4vjywc6";
-      name = "kidletime-5.19.0.tar.xz";
-    };
-  };
-  kimageformats = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kimageformats-5.19.0.tar.xz";
-      sha256 = "1ydizc6b0ncndazk62h8y249yfcx381pwzyivfpka1f69zfgyvv5";
-      name = "kimageformats-5.19.0.tar.xz";
-    };
-  };
-  kinit = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kinit-5.19.0.tar.xz";
-      sha256 = "03l7pijqdnnsfg6yz9p73p7xa86sldayggl6rc5hpkzmgyczcfzm";
-      name = "kinit-5.19.0.tar.xz";
-    };
-  };
-  kio = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kio-5.19.0.tar.xz";
-      sha256 = "0c7smp7cajivx53shy65mp9zcc51pha9iyvh37dggfflxy3xf9nv";
-      name = "kio-5.19.0.tar.xz";
-    };
-  };
-  kitemmodels = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kitemmodels-5.19.0.tar.xz";
-      sha256 = "0skmim986qnncbzd84vm1wp1fr41jn04af2dgckirsk23d35bln7";
-      name = "kitemmodels-5.19.0.tar.xz";
-    };
-  };
-  kitemviews = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kitemviews-5.19.0.tar.xz";
-      sha256 = "118zv46mvrfwbvl06bb1m8axv92wnp4pfs36hsxvnjl7gfjk5xjn";
-      name = "kitemviews-5.19.0.tar.xz";
-    };
-  };
-  kjobwidgets = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kjobwidgets-5.19.0.tar.xz";
-      sha256 = "1qzf8nzy8rxkdai9aj2lyrww90245v0p2q115xiz73bsg9rahmji";
-      name = "kjobwidgets-5.19.0.tar.xz";
-    };
-  };
-  kjs = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/portingAids/kjs-5.19.0.tar.xz";
-      sha256 = "08m01762hb25vm020g3v37bh40cgvcfrj45ql135klx96x9imfaf";
-      name = "kjs-5.19.0.tar.xz";
-    };
-  };
-  kjsembed = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/portingAids/kjsembed-5.19.0.tar.xz";
-      sha256 = "1wmkgy8jgm21y2cvcbv1fdv29dxxla8n6ws78kzzbbw4cgqwwl48";
-      name = "kjsembed-5.19.0.tar.xz";
-    };
-  };
-  kmediaplayer = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/portingAids/kmediaplayer-5.19.0.tar.xz";
-      sha256 = "1vhqr2c7q8vwzdj29vpmfjfhyal8wp9ffirrnqc98vb6sffs85ay";
-      name = "kmediaplayer-5.19.0.tar.xz";
-    };
-  };
-  knewstuff = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/knewstuff-5.19.0.tar.xz";
-      sha256 = "12acd12vxk9z83zg3yz8lvmmb8737z9lzd4hs9a3jcs1z5k2nhb4";
-      name = "knewstuff-5.19.0.tar.xz";
-    };
-  };
-  knotifications = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/knotifications-5.19.0.tar.xz";
-      sha256 = "0grgm0ws16gp2j77nslqpl1jpxbi0m6g59zr7v1xnmzdk2j6n4av";
-      name = "knotifications-5.19.0.tar.xz";
-    };
-  };
-  knotifyconfig = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/knotifyconfig-5.19.0.tar.xz";
-      sha256 = "161brvryxzdkny7sf6icn1jpyi6rnw6jc808gdf5g41v50xpnxfj";
-      name = "knotifyconfig-5.19.0.tar.xz";
-    };
-  };
-  kpackage = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kpackage-5.19.0.tar.xz";
-      sha256 = "1km4sjgxfljp2pnjnzj48q3c574zvj7341a57n4ifhjwj37yzxdv";
-      name = "kpackage-5.19.0.tar.xz";
-    };
-  };
-  kparts = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kparts-5.19.0.tar.xz";
-      sha256 = "05g59x2mrqygawzcwgw3igl5n96l649h0kpzh37sfq4i8kg15g7l";
-      name = "kparts-5.19.0.tar.xz";
-    };
-  };
-  kpeople = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kpeople-5.19.0.tar.xz";
-      sha256 = "1ksf6g71li1xk4q98cvwkam8m8g32x2815kj1gfwbg4g6iw74w98";
-      name = "kpeople-5.19.0.tar.xz";
-    };
-  };
-  kplotting = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kplotting-5.19.0.tar.xz";
-      sha256 = "169x4m9ms8yhfha8zclnl8wrnfhfqshpwwg4b5bd046pcrkqmnqq";
-      name = "kplotting-5.19.0.tar.xz";
-    };
-  };
-  kpty = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kpty-5.19.0.tar.xz";
-      sha256 = "0289vzfjwppwqj9h03flzhwm18dnxz11hqhdhr9990x7rw6a4n03";
-      name = "kpty-5.19.0.tar.xz";
-    };
-  };
-  kross = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/portingAids/kross-5.19.0.tar.xz";
-      sha256 = "1nv7mrhn7wa4bs2a164x42d3b37akyvhkxqs8cg5fqp4vr2wkw0p";
-      name = "kross-5.19.0.tar.xz";
-    };
-  };
-  krunner = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/portingAids/krunner-5.19.0.tar.xz";
-      sha256 = "054s8309lxi27gpbg7iygbcxsp0pwrzbzww3h8zp2a9yiic4s5mx";
-      name = "krunner-5.19.0.tar.xz";
-    };
-  };
-  kservice = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kservice-5.19.0.tar.xz";
-      sha256 = "02lbia26r2462nwksizaxjfkhxfqqs732dp495yx8bjc7wcv3srm";
-      name = "kservice-5.19.0.tar.xz";
-    };
-  };
-  ktexteditor = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/ktexteditor-5.19.0.tar.xz";
-      sha256 = "0v3l44w4k43ajs81i8386hszk3x7rajjlb6z3jb7q98vhp91b5dp";
-      name = "ktexteditor-5.19.0.tar.xz";
-    };
-  };
-  ktextwidgets = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/ktextwidgets-5.19.0.tar.xz";
-      sha256 = "1xydb76r6x1p10bkr2nlqg3md78jw8zvqad0h42dgvl4f5xvjknp";
-      name = "ktextwidgets-5.19.0.tar.xz";
-    };
-  };
-  kunitconversion = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kunitconversion-5.19.0.tar.xz";
-      sha256 = "11g1vhqkrb1k748drj7klkbb7jca3dybakcmcgqf53g8vxfih8kb";
-      name = "kunitconversion-5.19.0.tar.xz";
-    };
-  };
-  kwallet = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kwallet-5.19.0.tar.xz";
-      sha256 = "0z0c62fdfx9syrq6z7bk0ihac4yqyxpycll7h3mijj29km4jnpjm";
-      name = "kwallet-5.19.0.tar.xz";
-    };
-  };
-  kwidgetsaddons = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kwidgetsaddons-5.19.0.tar.xz";
-      sha256 = "0b85ng0dj5gpzifqmhyzgx61nb37vq7d0gvfpfazlcp5n27ywivm";
-      name = "kwidgetsaddons-5.19.0.tar.xz";
-    };
-  };
-  kwindowsystem = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kwindowsystem-5.19.0.tar.xz";
-      sha256 = "115xs34r74j9zcsw69glnh8w59iyh764n3gniawwrk23c6yb8fch";
-      name = "kwindowsystem-5.19.0.tar.xz";
-    };
-  };
-  kxmlgui = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kxmlgui-5.19.0.tar.xz";
-      sha256 = "1al2xifiyvl3zpva9nqap8gb6vqfgmf2fnhkmymm02rwg4yn4gah";
-      name = "kxmlgui-5.19.0.tar.xz";
-    };
-  };
-  kxmlrpcclient = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/kxmlrpcclient-5.19.0.tar.xz";
-      sha256 = "0lji7cxvh2lmjz42lx6ymz962gr4cyqfzksz0n5vgzfk5z0vq98g";
-      name = "kxmlrpcclient-5.19.0.tar.xz";
-    };
-  };
-  modemmanager-qt = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/modemmanager-qt-5.19.0.tar.xz";
-      sha256 = "05x9jicryjw9fj02arpya8xsh79rsnljnqjfpwbb7pi38f9i8v4w";
-      name = "modemmanager-qt-5.19.0.tar.xz";
-    };
-  };
-  networkmanager-qt = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/networkmanager-qt-5.19.0.tar.xz";
-      sha256 = "0wi0mkygzbvvyil1nyzc3ihgilvpx6j7caqaa9k38p85g93vsq13";
-      name = "networkmanager-qt-5.19.0.tar.xz";
-    };
-  };
-  oxygen-icons5 = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/oxygen-icons5-5.19.0.tar.xz";
-      sha256 = "09vfwcyidj3bl0qr4sq78bkc69zp9x8dwp8bsay5y05q8591dkg0";
-      name = "oxygen-icons5-5.19.0.tar.xz";
-    };
-  };
-  plasma-framework = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/plasma-framework-5.19.0.tar.xz";
-      sha256 = "1588r1jag0s9hhw4qq7mr2mcdd3d9az5ngb3z1l58xdhvfcc4497";
-      name = "plasma-framework-5.19.0.tar.xz";
-    };
-  };
-  solid = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/solid-5.19.0.tar.xz";
-      sha256 = "02bnvhscb55r6q5hkyh7rqi6zsc3r974y3x9shi8l0xbs78snkgz";
-      name = "solid-5.19.0.tar.xz";
-    };
-  };
-  sonnet = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/sonnet-5.19.0.tar.xz";
-      sha256 = "02ringh0wyiq1n19c200bcyf5x2w5jhw0pcxvfjzjai1sjig03x7";
-      name = "sonnet-5.19.0.tar.xz";
-    };
-  };
-  threadweaver = {
-    version = "5.19.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.19/threadweaver-5.19.0.tar.xz";
-      sha256 = "1jm1sw7xq76s2ggghm6qqdn7452myy9n7p5zzdb01qbaw2y1x4pw";
-      name = "threadweaver-5.19.0.tar.xz";
-    };
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/threadweaver.nix b/pkgs/desktops/kde-5/frameworks-5.19/threadweaver.nix
deleted file mode 100644
index 52817921cc72..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/threadweaver.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-}:
-
-kdeFramework {
-  name = "threadweaver";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/plasma-5.5/bluedevil.nix b/pkgs/desktops/kde-5/plasma-5.5/bluedevil.nix
deleted file mode 100644
index 6596c246202f..000000000000
--- a/pkgs/desktops/kde-5/plasma-5.5/bluedevil.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ plasmaPackage, extra-cmake-modules, bluez-qt, kcoreaddons
-, kdbusaddons, kded, ki18n, kiconthemes, kio, knotifications
-, kwidgetsaddons, kwindowsystem, makeQtWrapper, plasma-framework
-, qtdeclarative, shared_mime_info
-}:
-
-plasmaPackage {
-  name = "bluedevil";
-  nativeBuildInputs = [
-    extra-cmake-modules makeQtWrapper shared_mime_info
-  ];
-  buildInputs = [
-    kcoreaddons kdbusaddons kded kiconthemes knotifications
-    kwidgetsaddons
-  ];
-  propagatedBuildInputs = [
-    bluez-qt ki18n kio kwindowsystem plasma-framework qtdeclarative
-  ];
-  propagatedUserEnvPkgs = [ bluez-qt ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/bluedevil-wizard"
-    wrapQtProgram "$out/bin/bluedevil-sendfile"
-    # Fix the location of logic.js for the plasmoid
-    ln -s $out/share/plasma/plasmoids/org.kde.plasma.bluetooth/contents/code/logic.js $out/share/plasma/plasmoids/org.kde.plasma.bluetooth/contents/ui/logic.js
-  '';
-}
diff --git a/pkgs/desktops/kde-5/plasma-5.5/breeze-gtk.nix b/pkgs/desktops/kde-5/plasma-5.5/breeze-gtk.nix
deleted file mode 100644
index 179f15dc8763..000000000000
--- a/pkgs/desktops/kde-5/plasma-5.5/breeze-gtk.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ plasmaPackage
-, extra-cmake-modules
-}:
-
-plasmaPackage {
-  name = "breeze-gtk";
-  nativeBuildInputs = [ extra-cmake-modules ];
-}
diff --git a/pkgs/desktops/kde-5/plasma-5.5/breeze-qt4.nix b/pkgs/desktops/kde-5/plasma-5.5/breeze-qt4.nix
deleted file mode 100644
index f8092bc9d376..000000000000
--- a/pkgs/desktops/kde-5/plasma-5.5/breeze-qt4.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ plasmaPackage
-, automoc4
-, cmake
-, perl
-, pkgconfig
-, kdelibs
-, qt4
-, xproto
-}:
-
-plasmaPackage {
-  name = "breeze-qt4";
-  sname = "breeze";
-  buildInputs = [
-    kdelibs
-    qt4
-    xproto
-  ];
-  nativeBuildInputs = [
-    automoc4
-    cmake
-    perl
-    pkgconfig
-  ];
-  cmakeFlags = [
-    "-DUSE_KDE4=ON"
-    "-DQT_QMAKE_EXECUTABLE=${qt4}/bin/qmake"
-  ];
-}
diff --git a/pkgs/desktops/kde-5/plasma-5.5/breeze-qt5.nix b/pkgs/desktops/kde-5/plasma-5.5/breeze-qt5.nix
deleted file mode 100644
index 63ade168805d..000000000000
--- a/pkgs/desktops/kde-5/plasma-5.5/breeze-qt5.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ plasmaPackage, extra-cmake-modules, frameworkintegration
-, kcmutils, kconfigwidgets, kcoreaddons, kdecoration, kguiaddons
-, ki18n, kwindowsystem, makeQtWrapper, plasma-framework, qtx11extras
-}:
-
-plasmaPackage {
-  name = "breeze-qt5";
-  sname = "breeze";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    makeQtWrapper
-  ];
-  buildInputs = [
-    kcmutils kconfigwidgets kcoreaddons kdecoration kguiaddons
-  ];
-  propagatedBuildInputs = [
-    frameworkintegration ki18n kwindowsystem plasma-framework qtx11extras
-  ];
-  cmakeFlags = [ "-DUSE_Qt4=OFF" ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/breeze-settings5"
-  '';
-}
diff --git a/pkgs/desktops/kde-5/plasma-5.5/default.nix b/pkgs/desktops/kde-5/plasma-5.5/default.nix
deleted file mode 100644
index a4f5c7c23204..000000000000
--- a/pkgs/desktops/kde-5/plasma-5.5/default.nix
+++ /dev/null
@@ -1,88 +0,0 @@
-# Maintainer's Notes:
-#
-# How To Update
-#  1. Edit the URL in ./manifest.sh
-#  2. Run ./manifest.sh
-#  3. Fix build errors.
-
-{ pkgs, debug ? false }:
-
-let
-
-  inherit (pkgs) lib stdenv symlinkJoin;
-
-  kdeApps = pkgs.kdeApps_15_12;
-
-  srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; };
-  mirror = "mirror://kde";
-
-  packages = self: with self; {
-    plasmaPackage = args:
-      let
-        inherit (args) name;
-        sname = args.sname or name;
-        inherit (srcs."${sname}") src version;
-      in stdenv.mkDerivation (args // {
-        name = "${name}-${version}";
-        inherit src;
-
-        outputs = args.outputs or [ "dev" "out" ];
-
-        cmakeFlags =
-          (args.cmakeFlags or [])
-          ++ [ "-DBUILD_TESTING=OFF" ]
-          ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug";
-
-        meta = {
-          license = with lib.licenses; [
-            lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
-          ];
-          platforms = lib.platforms.linux;
-          maintainers = with lib.maintainers; [ ttuegel ];
-          homepage = "http://www.kde.org";
-        } // (args.meta or {});
-      });
-
-    bluedevil = callPackage ./bluedevil.nix {};
-    breeze-gtk = callPackage ./breeze-gtk.nix {};
-    breeze-qt4 = callPackage ./breeze-qt4.nix {};
-    breeze-qt5 = callPackage ./breeze-qt5.nix {};
-    breeze =
-      let
-        version = (builtins.parseDrvName breeze-qt5.name).version;
-      in
-        symlinkJoin "breeze-${version}"
-        (map (pkg: pkg.out or pkg) [ breeze-gtk breeze-qt4 breeze-qt5 ]);
-    kde-cli-tools = callPackage ./kde-cli-tools.nix {};
-    kde-gtk-config = callPackage ./kde-gtk-config {};
-    kdecoration = callPackage ./kdecoration.nix {};
-    kdeplasma-addons = callPackage ./kdeplasma-addons.nix {};
-    kgamma5 = callPackage ./kgamma5.nix {};
-    khelpcenter = callPackage ./khelpcenter.nix {};
-    khotkeys = callPackage ./khotkeys.nix {};
-    kinfocenter = callPackage ./kinfocenter.nix {};
-    kmenuedit = callPackage ./kmenuedit.nix {};
-    kscreen = callPackage ./kscreen.nix {};
-    kscreenlocker = callPackage ./kscreenlocker.nix {};
-    ksshaskpass = callPackage ./ksshaskpass.nix {};
-    ksysguard = callPackage ./ksysguard.nix {};
-    kwayland = callPackage ./kwayland.nix {};
-    kwin = callPackage ./kwin {};
-    kwrited = callPackage ./kwrited.nix {};
-    libkscreen = callPackage ./libkscreen {};
-    libksysguard = callPackage ./libksysguard {};
-    milou = callPackage ./milou.nix {};
-    oxygen = callPackage ./oxygen.nix {};
-    plasma-desktop = callPackage ./plasma-desktop {};
-    plasma-mediacenter = callPackage ./plasma-mediacenter.nix {};
-    plasma-nm = callPackage ./plasma-nm {};
-    plasma-pa = callPackage ./plasma-pa.nix {};
-    plasma-workspace = callPackage ./plasma-workspace {};
-    plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers.nix {};
-    polkit-kde-agent = callPackage ./polkit-kde-agent.nix {};
-    powerdevil = callPackage ./powerdevil.nix {};
-    startkde = callPackage ./startkde {};
-    systemsettings = callPackage ./systemsettings.nix {};
-  };
-
-in packages
diff --git a/pkgs/desktops/kde-5/plasma-5.5/fetchsrcs.sh b/pkgs/desktops/kde-5/plasma-5.5/fetchsrcs.sh
deleted file mode 100755
index d2b426b85d60..000000000000
--- a/pkgs/desktops/kde-5/plasma-5.5/fetchsrcs.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#! /usr/bin/env nix-shell
-#! nix-shell -i bash -p coreutils findutils gawk gnused nix wget
-
-set -x
-
-# The trailing slash at the end is necessary!
-RELEASE_URL="http://download.kde.org/stable/plasma/5.5.5/"
-EXTRA_WGET_ARGS='-A *.tar.xz'
-
-mkdir tmp; cd tmp
-
-rm -f ../srcs.csv
-
-wget -nH -r -c --no-parent $RELEASE_URL $EXTRA_WGET_ARGS
-
-find . | while read src; do
-    if [[ -f "${src}" ]]; then
-        # Sanitize file name
-        filename=$(basename "$src" | tr '@' '_')
-        nameVersion="${filename%.tar.*}"
-        name=$(echo "$nameVersion" | sed -e 's,-[[:digit:]].*,,' | sed -e 's,-opensource-src$,,')
-        version=$(echo "$nameVersion" | sed -e 's,^\([[:alpha:]][[:alnum:]]*-\)\+,,')
-        echo "$name,$version,$src,$filename" >>../srcs.csv
-    fi
-done
-
-cat >../srcs.nix <<EOF
-# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
-{ fetchurl, mirror }:
-
-{
-EOF
-
-gawk -F , "{ print \$1 }" ../srcs.csv | sort | uniq | while read name; do
-    versions=$(gawk -F , "/^$name,/ { print \$2 }" ../srcs.csv)
-    latestVersion=$(echo "$versions" | sort -rV | head -n 1)
-    src=$(gawk -F , "/^$name,$latestVersion,/ { print \$3 }" ../srcs.csv)
-    filename=$(gawk -F , "/^$name,$latestVersion,/ { print \$4 }" ../srcs.csv)
-    url="${src:2}"
-    sha256=$(nix-hash --type sha256 --base32 --flat "$src")
-    cat >>../srcs.nix <<EOF
-  $name = {
-    version = "$latestVersion";
-    src = fetchurl {
-      url = "\${mirror}/$url";
-      sha256 = "$sha256";
-      name = "$filename";
-    };
-  };
-EOF
-done
-
-echo "}" >>../srcs.nix
-
-rm -f ../srcs.csv
-
-cd ..
diff --git a/pkgs/desktops/kde-5/plasma-5.5/kde-cli-tools.nix b/pkgs/desktops/kde-5/plasma-5.5/kde-cli-tools.nix
deleted file mode 100644
index 7f19af6959ec..000000000000
--- a/pkgs/desktops/kde-5/plasma-5.5/kde-cli-tools.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ plasmaPackage, extra-cmake-modules, kcmutils, kconfig
-, kdelibs4support, kdesu, kdoctools, ki18n, kiconthemes
-, kwindowsystem, makeQtWrapper, qtsvg, qtx11extras
-}:
-
-plasmaPackage {
-  name = "kde-cli-tools";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  buildInputs = [
-    kcmutils kconfig kdesu kiconthemes
-  ];
-  propagatedBuildInputs = [
-    kdelibs4support ki18n kwindowsystem qtsvg qtx11extras
-  ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kmimetypefinder5"
-    wrapQtProgram "$out/bin/ksvgtopng5"
-    wrapQtProgram "$out/bin/ktraderclient5"
-    wrapQtProgram "$out/bin/kioclient5"
-    wrapQtProgram "$out/bin/kdecp5"
-    wrapQtProgram "$out/bin/keditfiletype5"
-    wrapQtProgram "$out/bin/kcmshell5"
-    wrapQtProgram "$out/bin/kdemv5"
-    wrapQtProgram "$out/bin/kstart5"
-    wrapQtProgram "$out/bin/kde-open5"
-  '';
-}
diff --git a/pkgs/desktops/kde-5/plasma-5.5/kde-gtk-config/0001-follow-symlinks.patch b/pkgs/desktops/kde-5/plasma-5.5/kde-gtk-config/0001-follow-symlinks.patch
deleted file mode 100644
index 759eda4cc134..000000000000
--- a/pkgs/desktops/kde-5/plasma-5.5/kde-gtk-config/0001-follow-symlinks.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 33b25c2e3c7a002c7f726cd79fc4bab22b1299be Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Tue, 27 Oct 2015 18:07:54 -0500
-Subject: [PATCH] follow symlinks
-
----
- src/appearancegtk2.cpp  | 2 +-
- src/iconthemesmodel.cpp | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/appearancegtk2.cpp b/src/appearancegtk2.cpp
-index b1e0b52..095cddc 100644
---- a/src/appearancegtk2.cpp
-+++ b/src/appearancegtk2.cpp
-@@ -73,7 +73,7 @@ QString AppearanceGTK2::themesGtkrcFile(const QString& themeName) const
-     QStringList themes=installedThemes();
-     themes=themes.filter(QRegExp("/"+themeName+"/?$"));
-     if(themes.size()==1) {
--        QDirIterator it(themes.first(), QDirIterator::Subdirectories);
-+        QDirIterator it(themes.first(), QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
-         while(it.hasNext()) {
-             it.next();
-             if(it.fileName()=="gtkrc") {
-diff --git a/src/iconthemesmodel.cpp b/src/iconthemesmodel.cpp
-index 07c7ad7..b04d978 100644
---- a/src/iconthemesmodel.cpp
-+++ b/src/iconthemesmodel.cpp
-@@ -46,7 +46,7 @@ QList<QDir> IconThemesModel::installedThemesPaths()
-     
-     foreach(const QString& dir, dirs) {
-         QDir userIconsDir(dir);
--        QDirIterator it(userIconsDir.path(), QDir::NoDotAndDotDot|QDir::AllDirs|QDir::NoSymLinks);
-+        QDirIterator it(userIconsDir.path(), QDir::NoDotAndDotDot|QDir::AllDirs);
-         while(it.hasNext()) {
-             QString currentPath = it.next();
-             QDir dir(currentPath);
--- 
-2.6.2
-
diff --git a/pkgs/desktops/kde-5/plasma-5.5/kde-gtk-config/default.nix b/pkgs/desktops/kde-5/plasma-5.5/kde-gtk-config/default.nix
deleted file mode 100644
index ab8867520b38..000000000000
--- a/pkgs/desktops/kde-5/plasma-5.5/kde-gtk-config/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ plasmaPackage
-, extra-cmake-modules
-, glib
-, gtk2
-, gtk3
-, karchive
-, kcmutils
-, kconfigwidgets
-, ki18n
-, kiconthemes
-, kio
-, knewstuff
-}:
-
-plasmaPackage {
-  name = "kde-gtk-config";
-  patches = [ ./0001-follow-symlinks.patch ];
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    glib gtk2 gtk3 karchive kcmutils kconfigwidgets kiconthemes
-    knewstuff
-  ];
-  propagatedBuildInputs = [ ki18n kio ];
-  cmakeFlags = [
-    "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"
-    "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include"
-  ];
-}
diff --git a/pkgs/desktops/kde-5/plasma-5.5/kdecoration.nix b/pkgs/desktops/kde-5/plasma-5.5/kdecoration.nix
deleted file mode 100644
index eb65f7f90afb..000000000000
--- a/pkgs/desktops/kde-5/plasma-5.5/kdecoration.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ plasmaPackage, extra-cmake-modules }:
-
-plasmaPackage {
-  name = "kdecoration";
-  nativeBuildInputs = [ extra-cmake-modules ];
-}
diff --git a/pkgs/desktops/kde-5/plasma-5.5/kdeplasma-addons.nix b/pkgs/desktops/kde-5/plasma-5.5/kdeplasma-addons.nix
deleted file mode 100644
index d6a96a3276d7..000000000000
--- a/pkgs/desktops/kde-5/plasma-5.5/kdeplasma-addons.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ plasmaPackage, extra-cmake-modules, kdoctools, ibus, kconfig
-, kconfigwidgets, kcoreaddons, kcmutils, kdelibs4support, ki18n
-, kio, knewstuff, kross, krunner, kservice, kunitconversion
-, plasma-framework, qtdeclarative, qtx11extras
-}:
-
-plasmaPackage {
-  name = "kdeplasma-addons";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    ibus kconfig kconfigwidgets kcoreaddons kcmutils
-    knewstuff kservice kunitconversion
-  ];
-  propagatedBuildInputs = [
-    kdelibs4support kio kross krunner plasma-framework qtdeclarative
-    qtx11extras
-  ];
-}
diff --git a/pkgs/desktops/kde-5/plasma-5.5/kgamma5.nix b/pkgs/desktops/kde-5/plasma-5.5/kgamma5.nix
deleted file mode 100644
index 965c33e6eef8..000000000000
--- a/pkgs/desktops/kde-5/plasma-5.5/kgamma5.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ plasmaPackage, extra-cmake-modules, kdoctools, kdelibs4support
-, qtx11extras
-}:
-
-plasmaPackage {
-  name = "kgamma5";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  propagatedBuildInputs = [ kdelibs4support qtx11extras ];
-}
diff --git a/pkgs/desktops/kde-5/plasma-5.5/khelpcenter.nix b/pkgs/desktops/kde-5/plasma-5.5/khelpcenter.nix
deleted file mode 100644
index 6ba860b9dfb2..000000000000
--- a/pkgs/desktops/kde-5/plasma-5.5/khelpcenter.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ plasmaPackage, extra-cmake-modules, kdoctools, kconfig
-, kcoreaddons, kdbusaddons, ki18n, kinit, kcmutils, kdelibs4support
-, khtml, kservice, makeQtWrapper
-}:
-
-plasmaPackage {
-  name = "khelpcenter";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-    makeQtWrapper
-  ];
-  buildInputs = [
-    kconfig kcoreaddons kdbusaddons kinit kcmutils kservice
-  ];
-  propagatedBuildInputs = [ kdelibs4support khtml ki18n ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/khelpcenter"
-  '';
-}
diff --git a/pkgs/desktops/kde-5/plasma-5.5/khotkeys.nix b/pkgs/desktops/kde-5/plasma-5.5/khotkeys.nix
deleted file mode 100644
index 141320e6b3e6..000000000000
--- a/pkgs/desktops/kde-5/plasma-5.5/khotkeys.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ plasmaPackage, extra-cmake-modules, kdoctools, kcmutils
-, kdbusaddons, kdelibs4support, kglobalaccel, ki18n, kio, kxmlgui
-, plasma-framework, plasma-workspace, qtx11extras
-}:
-
-plasmaPackage {
-  name = "khotkeys";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  buildInputs = [
-    kcmutils kdbusaddons kxmlgui
-  ];
-  propagatedBuildInputs = [
-    kdelibs4support kglobalaccel ki18n kio plasma-framework
-    plasma-workspace qtx11extras
-  ];
-}
diff --git a/pkgs/desktops/kde-5/plasma-5.5/kinfocenter.nix b/pkgs/desktops/kde-5/plasma-5.5/kinfocenter.nix
deleted file mode 100644
index ed717790cd0d..000000000000
--- a/pkgs/desktops/kde-5/plasma-5.5/kinfocenter.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ plasmaPackage, extra-cmake-modules, kdoctools, kcmutils
-, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons
-, kdeclarative, kdelibs4support, ki18n, kiconthemes, kio, kpackage
-, kservice, kwidgetsaddons, kxmlgui, libraw1394, makeQtWrapper
-, pciutils, solid
-}:
-
-plasmaPackage {
-  name = "kinfocenter";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-    makeQtWrapper
-  ];
-  buildInputs = [
-    kcmutils kcompletion kconfig kconfigwidgets kcoreaddons
-    kdbusaddons kiconthemes kpackage kservice kwidgetsaddons
-    kxmlgui libraw1394 pciutils solid
-  ];
-  propagatedBuildInputs = [ kdeclarative kdelibs4support ki18n kio ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kinfocenter"
-  '';
-}
diff --git a/pkgs/desktops/kde-5/plasma-5.5/kmenuedit.nix b/pkgs/desktops/kde-5/plasma-5.5/kmenuedit.nix
deleted file mode 100644
index 3834ca1328f8..000000000000
--- a/pkgs/desktops/kde-5/plasma-5.5/kmenuedit.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ plasmaPackage, extra-cmake-modules, kdoctools, ki18n, kxmlgui
-, kdbusaddons, kiconthemes, kio, sonnet, kdelibs4support, makeQtWrapper
-}:
-
-plasmaPackage {
-  name = "kmenuedit";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-    makeQtWrapper
-  ];
-  buildInputs = [
-    kxmlgui kdbusaddons kiconthemes
-  ];
-  propagatedBuildInputs = [ kdelibs4support ki18n kio sonnet ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kmenuedit"
-  '';
-}
diff --git a/pkgs/desktops/kde-5/plasma-5.5/kscreen.nix b/pkgs/desktops/kde-5/plasma-5.5/kscreen.nix
deleted file mode 100644
index a521a7993628..000000000000
--- a/pkgs/desktops/kde-5/plasma-5.5/kscreen.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ plasmaPackage, extra-cmake-modules, kconfig, kconfigwidgets
-, kdbusaddons, kglobalaccel, ki18n, kwidgetsaddons, kxmlgui
-, libkscreen, makeQtWrapper, qtdeclarative, qtgraphicaleffects
-}:
-
-plasmaPackage {
-  name = "kscreen";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    makeQtWrapper
-  ];
-  buildInputs = [
-    kconfig
-    kconfigwidgets
-    kdbusaddons
-    kwidgetsaddons
-    kxmlgui
-  ];
-  propagatedBuildInputs = [
-    kglobalaccel
-    ki18n
-    libkscreen
-    qtdeclarative
-    qtgraphicaleffects
-  ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kscreen-console"
-  '';
-}
diff --git a/pkgs/desktops/kde-5/plasma-5.5/kscreenlocker.nix b/pkgs/desktops/kde-5/plasma-5.5/kscreenlocker.nix
deleted file mode 100644
index 562797b546e9..000000000000
--- a/pkgs/desktops/kde-5/plasma-5.5/kscreenlocker.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ plasmaPackage, extra-cmake-modules, kcmutils, kcrash, kdeclarative
-, kdelibs4support, kdoctools, kglobalaccel, kidletime, kwayland
-, libXcursor, pam, plasma-framework, qtdeclarative, wayland
-}:
-
-plasmaPackage {
-  name = "kscreenlocker";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    kcmutils kcrash kdelibs4support kglobalaccel kidletime kwayland
-    libXcursor pam wayland
-  ];
-  propagatedBuildInputs = [
-    kdeclarative plasma-framework qtdeclarative
-  ];
-}
diff --git a/pkgs/desktops/kde-5/plasma-5.5/ksshaskpass.nix b/pkgs/desktops/kde-5/plasma-5.5/ksshaskpass.nix
deleted file mode 100644
index f274512e027a..000000000000
--- a/pkgs/desktops/kde-5/plasma-5.5/ksshaskpass.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ plasmaPackage, extra-cmake-modules, kdoctools, kcoreaddons
-, ki18n, kwallet, kwidgetsaddons, makeQtWrapper
-}:
-
-plasmaPackage {
-  name = "ksshaskpass";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  buildInputs = [ kcoreaddons kwallet kwidgetsaddons ];
-  propagatedBuildInputs = [ ki18n ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/ksshaskpass"
-  '';
-}
diff --git a/pkgs/desktops/kde-5/plasma-5.5/ksysguard.nix b/pkgs/desktops/kde-5/plasma-5.5/ksysguard.nix
deleted file mode 100644
index d47f9215a41a..000000000000
--- a/pkgs/desktops/kde-5/plasma-5.5/ksysguard.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ plasmaPackage, extra-cmake-modules, kdoctools, kconfig
-, kcoreaddons, kdelibs4support, ki18n, kitemviews, knewstuff
-, kiconthemes, libksysguard, makeQtWrapper
-}:
-
-plasmaPackage {
-  name = "ksysguard";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-    makeQtWrapper
-  ];
-  buildInputs = [
-    kconfig kcoreaddons kitemviews knewstuff kiconthemes libksysguard
-  ];
-  propagatedBuildInputs = [ kdelibs4support ki18n ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/ksysguardd"
-  '';
-}
diff --git a/pkgs/desktops/kde-5/plasma-5.5/kwayland.nix b/pkgs/desktops/kde-5/plasma-5.5/kwayland.nix
deleted file mode 100644
index e4d6eb631f95..000000000000
--- a/pkgs/desktops/kde-5/plasma-5.5/kwayland.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ plasmaPackage
-, extra-cmake-modules
-, wayland
-}:
-
-plasmaPackage {
-  name = "kwayland";
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    wayland
-  ];
-}
diff --git a/pkgs/desktops/kde-5/plasma-5.5/kwin/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/plasma-5.5/kwin/0001-qdiriterator-follow-symlinks.patch
deleted file mode 100644
index 797a32fc5f83..000000000000
--- a/pkgs/desktops/kde-5/plasma-5.5/kwin/0001-qdiriterator-follow-symlinks.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 78a4b554187c18fd86b62089f7730c4273fadd4c Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Wed, 14 Oct 2015 07:05:22 -0500
-Subject: [PATCH] qdiriterator follow symlinks
-
----
- clients/aurorae/src/aurorae.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/clients/aurorae/src/aurorae.cpp b/clients/aurorae/src/aurorae.cpp
-index 781c960..ad5f420 100644
---- a/clients/aurorae/src/aurorae.cpp
-+++ b/clients/aurorae/src/aurorae.cpp
-@@ -211,7 +211,7 @@ void Helper::init()
-     // so let's try to locate our plugin:
-     QString pluginPath;
-     for (const QString &path : m_engine->importPathList()) {
--        QDirIterator it(path, QDirIterator::Subdirectories);
-+        QDirIterator it(path, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
-         while (it.hasNext()) {
-             it.next();
-             QFileInfo fileInfo = it.fileInfo();
--- 
-2.5.2
-
diff --git a/pkgs/desktops/kde-5/plasma-5.5/kwin/default.nix b/pkgs/desktops/kde-5/plasma-5.5/kwin/default.nix
deleted file mode 100644
index a09acb88aade..000000000000
--- a/pkgs/desktops/kde-5/plasma-5.5/kwin/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ plasmaPackage, extra-cmake-modules, kdoctools, epoxy
-, kactivities, kcompletion, kcmutils, kconfig, kconfigwidgets
-, kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel
-, ki18n, kiconthemes, kidletime, kinit, kio, knewstuff, knotifications
-, kpackage, kscreenlocker, kservice, kwayland, kwidgetsaddons, kwindowsystem
-, kxmlgui, libinput, libICE, libSM, plasma-framework, qtdeclarative
-, qtmultimedia, qtscript, qtx11extras, udev, wayland, xcb-util-cursor
-, makeQtWrapper
-}:
-
-plasmaPackage {
-  name = "kwin";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-    makeQtWrapper
-  ];
-  buildInputs = [
-    epoxy kcompletion kcmutils kconfig kconfigwidgets kcoreaddons
-    kcrash kdecoration kiconthemes kidletime kinit knewstuff knotifications
-    kpackage kservice kwayland kwidgetsaddons kxmlgui libinput libICE
-    libSM qtscript udev wayland xcb-util-cursor
-  ];
-  propagatedBuildInputs = [
-    kactivities kdeclarative kglobalaccel ki18n kio kscreenlocker
-    kwindowsystem plasma-framework qtdeclarative qtmultimedia qtx11extras
-  ];
-  patches = [ ./0001-qdiriterator-follow-symlinks.patch ];
-  cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kwin_x11"
-    wrapQtProgram "$out/bin/kwin_wayland"
-  '';
-}
diff --git a/pkgs/desktops/kde-5/plasma-5.5/kwrited.nix b/pkgs/desktops/kde-5/plasma-5.5/kwrited.nix
deleted file mode 100644
index a6ed9d9bb287..000000000000
--- a/pkgs/desktops/kde-5/plasma-5.5/kwrited.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ plasmaPackage, extra-cmake-modules, kcoreaddons, ki18n, kpty
-, knotifications, kdbusaddons
-}:
-
-plasmaPackage {
-  name = "kwrited";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kcoreaddons kpty knotifications kdbusaddons ];
-  propagatedBuildInputs = [ ki18n ];
-}
diff --git a/pkgs/desktops/kde-5/plasma-5.5/libkscreen/default.nix b/pkgs/desktops/kde-5/plasma-5.5/libkscreen/default.nix
deleted file mode 100644
index 9fccbd6834c3..000000000000
--- a/pkgs/desktops/kde-5/plasma-5.5/libkscreen/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ plasmaPackage
-, extra-cmake-modules
-, libXrandr
-, qtx11extras
-}:
-
-plasmaPackage {
-  name = "libkscreen";
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    libXrandr
-  ];
-  propagatedBuildInputs = [
-    qtx11extras
-  ];
-}
diff --git a/pkgs/desktops/kde-5/plasma-5.5/libksysguard/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/plasma-5.5/libksysguard/0001-qdiriterator-follow-symlinks.patch
deleted file mode 100644
index fbbb11ae7556..000000000000
--- a/pkgs/desktops/kde-5/plasma-5.5/libksysguard/0001-qdiriterator-follow-symlinks.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 46164a50de4102d02ae9d1d480acdd4b12303db8 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Wed, 14 Oct 2015 07:07:22 -0500
-Subject: [PATCH] qdiriterator follow symlinks
-
----
- processui/scripting.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/processui/scripting.cpp b/processui/scripting.cpp
-index efed8ff..841761a 100644
---- a/processui/scripting.cpp
-+++ b/processui/scripting.cpp
-@@ -167,7 +167,7 @@ void Scripting::loadContextMenu() {
-     QStringList scripts;
-     const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "ksysguard/scripts/", QStandardPaths::LocateDirectory);
-     Q_FOREACH (const QString& dir, dirs) {
--        QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories);
-+        QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
-         while (it.hasNext()) {
-             scripts.append(it.next());
-         }
--- 
-2.5.2
-
diff --git a/pkgs/desktops/kde-5/plasma-5.5/libksysguard/default.nix b/pkgs/desktops/kde-5/plasma-5.5/libksysguard/default.nix
deleted file mode 100644
index 402b3ce3beee..000000000000
--- a/pkgs/desktops/kde-5/plasma-5.5/libksysguard/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ fetchpatch, plasmaPackage, extra-cmake-modules, kauth, kcompletion
-, kconfigwidgets, kcoreaddons, kservice, kwidgetsaddons
-, kwindowsystem, plasma-framework, qtscript, qtwebkit, qtx11extras
-, kconfig, ki18n, kiconthemes
-}:
-
-plasmaPackage {
-  name = "libksysguard";
-  patches = [
-    ./0001-qdiriterator-follow-symlinks.patch
-    (fetchpatch { # should be included on update
-      name = "glibc-2.23-isnan.patch";
-      url = https://github.com/KDE/libksysguard/commit/b0578798eb3.patch;
-      sha256 = "1my5nqp58c5azyi265j261a10wh047zxakprrnpl85mlg7bwskdh";
-    })
-  ];
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    kcompletion kconfigwidgets kcoreaddons kservice
-    kwidgetsaddons qtscript qtwebkit
-  ];
-  propagatedBuildInputs = [
-    kauth kconfig ki18n kiconthemes kwindowsystem plasma-framework
-    qtx11extras
-  ];
-}
diff --git a/pkgs/desktops/kde-5/plasma-5.5/milou.nix b/pkgs/desktops/kde-5/plasma-5.5/milou.nix
deleted file mode 100644
index 760de2d79ab4..000000000000
--- a/pkgs/desktops/kde-5/plasma-5.5/milou.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ plasmaPackage, extra-cmake-modules, qtscript, qtdeclarative
-, kcoreaddons, ki18n, kdeclarative, kservice, plasma-framework
-, krunner
-}:
-
-plasmaPackage {
-  name = "milou";
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    qtscript kcoreaddons kservice
-  ];
-  propagatedBuildInputs = [
-    kdeclarative ki18n krunner plasma-framework qtdeclarative
-  ];
-}
diff --git a/pkgs/desktops/kde-5/plasma-5.5/oxygen.nix b/pkgs/desktops/kde-5/plasma-5.5/oxygen.nix
deleted file mode 100644
index 02918100408a..000000000000
--- a/pkgs/desktops/kde-5/plasma-5.5/oxygen.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ plasmaPackage, extra-cmake-modules, ki18n, kcmutils, kconfig
-, kdecoration, kguiaddons, kwidgetsaddons, kservice, kcompletion
-, frameworkintegration, kwindowsystem, makeQtWrapper, qtx11extras
-}:
-
-plasmaPackage {
-  name = "oxygen";
-  nativeBuildInputs = [
-    extra-cmake-modules makeQtWrapper
-  ];
-  buildInputs = [
-    kcmutils kconfig kdecoration kguiaddons kwidgetsaddons
-    kservice kcompletion
-  ];
-  propagatedBuildInputs = [ frameworkintegration ki18n kwindowsystem qtx11extras ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/oxygen-demo5"
-    wrapQtProgram "$out/bin/oxygen-settings5"
-  '';
-}
diff --git a/pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/0001-qt-5.5-QML-import-paths.patch b/pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/0001-qt-5.5-QML-import-paths.patch
deleted file mode 100644
index ead7452daa84..000000000000
--- a/pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/0001-qt-5.5-QML-import-paths.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 7c379686def9f15be1aa8fa4b5358124f7ed57c6 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Mon, 19 Oct 2015 18:45:36 -0500
-Subject: [PATCH 1/3] qt-5.5 QML import paths
-
----
- applets/pager/package/contents/ui/main.qml              | 2 +-
- containments/desktop/package/contents/ui/FolderView.qml | 2 +-
- containments/desktop/package/contents/ui/main.qml       | 2 +-
- containments/panel/contents/ui/main.qml                 | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/applets/pager/package/contents/ui/main.qml b/applets/pager/package/contents/ui/main.qml
-index 0c367c6..c9a82be 100644
---- a/applets/pager/package/contents/ui/main.qml
-+++ b/applets/pager/package/contents/ui/main.qml
-@@ -23,7 +23,7 @@ import org.kde.plasma.components 2.0 as PlasmaComponents
- import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddonsComponents
- import org.kde.draganddrop 2.0
- import org.kde.plasma.private.pager 2.0
--import "utils.js" as Utils
-+import "../code/utils.js" as Utils
- 
- MouseArea {
-     id: root
-diff --git a/containments/desktop/package/contents/ui/FolderView.qml b/containments/desktop/package/contents/ui/FolderView.qml
-index 578ec87..04e088c 100644
---- a/containments/desktop/package/contents/ui/FolderView.qml
-+++ b/containments/desktop/package/contents/ui/FolderView.qml
-@@ -27,7 +27,7 @@ import org.kde.plasma.extras 2.0 as PlasmaExtras
- import org.kde.kquickcontrolsaddons 2.0
- 
- import org.kde.private.desktopcontainment.folder 0.1 as Folder
--import "FolderTools.js" as FolderTools
-+import "../code/FolderTools.js" as FolderTools
- 
- Item {
-     id: main
-diff --git a/containments/desktop/package/contents/ui/main.qml b/containments/desktop/package/contents/ui/main.qml
-index 422e8f7..3c8906e 100644
---- a/containments/desktop/package/contents/ui/main.qml
-+++ b/containments/desktop/package/contents/ui/main.qml
-@@ -29,7 +29,7 @@ import org.kde.kquickcontrolsaddons 2.0 as KQuickControlsAddons
- 
- import org.kde.private.desktopcontainment.desktop 0.1 as Desktop
- 
--import "LayoutManager.js" as LayoutManager
-+import "../code/LayoutManager.js" as LayoutManager
- 
- DragDrop.DropArea {
-     id: root
-diff --git a/containments/panel/contents/ui/main.qml b/containments/panel/contents/ui/main.qml
-index bad6ba0..b1fc331 100644
---- a/containments/panel/contents/ui/main.qml
-+++ b/containments/panel/contents/ui/main.qml
-@@ -25,7 +25,7 @@ import org.kde.plasma.components 2.0 as PlasmaComponents
- import org.kde.kquickcontrolsaddons 2.0
- import org.kde.draganddrop 2.0 as DragDrop
- 
--import "LayoutManager.js" as LayoutManager
-+import "../code/LayoutManager.js" as LayoutManager
- 
- DragDrop.DropArea {
-     id: root
--- 
-2.6.3
-
diff --git a/pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/0002-hwclock.patch b/pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/0002-hwclock.patch
deleted file mode 100644
index 17b01486d928..000000000000
--- a/pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/0002-hwclock.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From d0056fa6c1158408db169a7f5e6eb75691083094 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Sun, 22 Nov 2015 09:34:43 -0600
-Subject: [PATCH 2/3] hwclock
-
----
- kcms/dateandtime/helper.cpp | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/kcms/dateandtime/helper.cpp b/kcms/dateandtime/helper.cpp
-index e955f0c..5171753 100644
---- a/kcms/dateandtime/helper.cpp
-+++ b/kcms/dateandtime/helper.cpp
-@@ -48,10 +48,6 @@
- #include <sys/stat.h>
- #endif
- 
--// We cannot rely on the $PATH environment variable, because D-Bus activation
--// clears it. So we have to use a reasonable default.
--static const QString exePath = QStringLiteral("/usr/sbin:/usr/bin:/sbin:/bin");
--
- int ClockHelper::ntp( const QStringList& ntpServers, bool ntpEnabled )
- {
-     int ret = 0;
-@@ -227,7 +223,7 @@ int ClockHelper::tzreset()
- 
- void ClockHelper::toHwclock()
- {
--    QString hwclock = KStandardDirs::findExe(QStringLiteral("hwclock"), exePath);
-+    QString hwclock = "@hwclock@";
-     if (!hwclock.isEmpty()) {
-         KProcess::execute(hwclock, QStringList() << QStringLiteral("--systohc"));
-     }
--- 
-2.6.3
-
diff --git a/pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/0003-tzdir.patch b/pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/0003-tzdir.patch
deleted file mode 100644
index aba97b032f8a..000000000000
--- a/pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/0003-tzdir.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 0a8e2ae5cb64c5762408df920d99459b20d52b29 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Sun, 22 Nov 2015 09:39:24 -0600
-Subject: [PATCH 3/3] tzdir
-
----
- kcms/dateandtime/helper.cpp | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/kcms/dateandtime/helper.cpp b/kcms/dateandtime/helper.cpp
-index 5171753..92b5d9e 100644
---- a/kcms/dateandtime/helper.cpp
-+++ b/kcms/dateandtime/helper.cpp
-@@ -181,7 +181,12 @@ int ClockHelper::tz( const QString& selectedzone )
- 
-     val = selectedzone;
- #else
--    QString tz = "/usr/share/zoneinfo/" + selectedzone;
-+    QString tzdir = QString::fromLocal8Bit(qgetenv("TZDIR"));
-+    QString tz = tzdir + "/" + selectedzone;
-+    if (tzdir.isEmpty()) {
-+      // Standard Linux path
-+      tz = "/usr/share/zoneinfo/" + selectedzone;
-+    }
- 
-     if (QFile::exists(tz)) { // make sure the new TZ really exists
-         QFile::remove(QStringLiteral("/etc/localtime"));
--- 
-2.6.3
-
diff --git a/pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/default.nix b/pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/default.nix
deleted file mode 100644
index 5f27efc7f24c..000000000000
--- a/pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/default.nix
+++ /dev/null
@@ -1,86 +0,0 @@
-{ plasmaPackage, substituteAll, extra-cmake-modules, kdoctools
-, attica, baloo, boost, fontconfig, kactivities, kauth, kcmutils
-, kdbusaddons, kdeclarative, kded, kdelibs4support, kemoticons
-, kglobalaccel, ki18n, kitemmodels, knewstuff, knotifications
-, knotifyconfig, kpeople, krunner, kwallet, kwin, phonon
-, plasma-framework, plasma-workspace, qtdeclarative, qtx11extras
-, qtsvg, libXcursor, libXft, libxkbfile, xf86inputevdev
-, xf86inputsynaptics, xinput, xkeyboard_config, xorgserver
-, libcanberra_kde, libpulseaudio, makeQtWrapper, utillinux
-, qtquick1, qtquickcontrols
-}:
-
-plasmaPackage rec {
-  name = "plasma-desktop";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-    makeQtWrapper
-  ];
-  buildInputs = [
-    attica
-    boost
-    fontconfig
-    kcmutils
-    kdbusaddons
-    kded
-    kitemmodels
-    knewstuff
-    knotifications
-    knotifyconfig
-    kwallet
-    libcanberra_kde
-    libXcursor
-    libpulseaudio
-    libXft
-    libxkbfile
-    phonon
-    qtsvg
-    xf86inputevdev
-    xf86inputsynaptics
-    xkeyboard_config
-    xinput
-  ];
-  propagatedBuildInputs = [
-    baloo
-    kactivities
-    kauth
-    kdeclarative
-    kdelibs4support
-    kemoticons
-    kglobalaccel
-    ki18n
-    kpeople
-    krunner
-    kwin
-    plasma-framework
-    plasma-workspace
-    qtdeclarative
-    qtquick1
-    qtquickcontrols
-    qtx11extras
-  ];
-  patches = [
-    ./0001-qt-5.5-QML-import-paths.patch
-    (substituteAll {
-      src = ./0002-hwclock.patch;
-      hwclock = "${utillinux}/sbin/hwclock";
-    })
-    ./0003-tzdir.patch
-  ];
-  NIX_CFLAGS_COMPILE = [ "-I${xorgserver}/include/xorg" ];
-  cmakeFlags = [
-    "-DEvdev_INCLUDE_DIRS=${xf86inputevdev}/include/xorg"
-    "-DSynaptics_INCLUDE_DIRS=${xf86inputsynaptics}/include/xorg"
-  ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kaccess"
-    wrapQtProgram "$out/bin/solid-action-desktop-gen"
-    wrapQtProgram "$out/bin/knetattach"
-    wrapQtProgram "$out/bin/krdb"
-    wrapQtProgram "$out/bin/kapplymousetheme"
-    wrapQtProgram "$out/bin/kfontinst"
-    wrapQtProgram "$out/bin/kcm-touchpad-list-devices"
-    wrapQtProgram "$out/bin/kfontview"
-  '';
-}
diff --git a/pkgs/desktops/kde-5/plasma-5.5/plasma-mediacenter.nix b/pkgs/desktops/kde-5/plasma-5.5/plasma-mediacenter.nix
deleted file mode 100644
index 7088f45d64e2..000000000000
--- a/pkgs/desktops/kde-5/plasma-5.5/plasma-mediacenter.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ plasmaPackage, extra-cmake-modules, baloo, kactivities, kconfig
-, kcoreaddons, kdeclarative, kguiaddons, ki18n, kio, kservice
-, kfilemetadata, plasma-framework, qtdeclarative, qtmultimedia
-, taglib
-}:
-
-plasmaPackage rec {
-  name = "plasma-mediacenter";
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    kconfig kcoreaddons kguiaddons kservice
-    qtdeclarative qtmultimedia taglib
-  ];
-  propagatedBuildInputs = [
-    baloo kactivities kdeclarative kfilemetadata ki18n kio
-    plasma-framework
-  ];
-}
diff --git a/pkgs/desktops/kde-5/plasma-5.5/plasma-nm/0001-mobile-broadband-provider-info-path.patch b/pkgs/desktops/kde-5/plasma-5.5/plasma-nm/0001-mobile-broadband-provider-info-path.patch
deleted file mode 100644
index 79b5cfb437e2..000000000000
--- a/pkgs/desktops/kde-5/plasma-5.5/plasma-nm/0001-mobile-broadband-provider-info-path.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From faf13c97ff1192a201843b9d52f4002dbd9022af Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Sun, 25 Oct 2015 09:09:27 -0500
-Subject: [PATCH] mobile-broadband-provider-info path
-
----
- libs/editor/mobileproviders.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libs/editor/mobileproviders.cpp b/libs/editor/mobileproviders.cpp
-index 568cb34..98a5992 100644
---- a/libs/editor/mobileproviders.cpp
-+++ b/libs/editor/mobileproviders.cpp
-@@ -26,7 +26,7 @@
- 
- #include <KLocale>
- 
--const QString MobileProviders::ProvidersFile = "/usr/share/mobile-broadband-provider-info/serviceproviders.xml";
-+const QString MobileProviders::ProvidersFile = "@mobile_broadband_provider_info@/share/mobile-broadband-provider-info/serviceproviders.xml";
- 
- bool localeAwareCompare(const QString & one, const QString & two) {
-     return one.localeAwareCompare(two) < 0;
--- 
-2.6.2
-
diff --git a/pkgs/desktops/kde-5/plasma-5.5/plasma-nm/default.nix b/pkgs/desktops/kde-5/plasma-5.5/plasma-nm/default.nix
deleted file mode 100644
index 249c6d8aac94..000000000000
--- a/pkgs/desktops/kde-5/plasma-5.5/plasma-nm/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ plasmaPackage, substituteAll, extra-cmake-modules, kdoctools
-, kcompletion, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative
-, kdelibs4support, ki18n, kiconthemes, kinit, kio, kitemviews
-, knotifications, kservice, kwallet, kwidgetsaddons, kwindowsystem
-, kxmlgui, makeQtWrapper, mobile_broadband_provider_info
-, modemmanager-qt, networkmanager-qt, openconnect, plasma-framework
-, qca-qt5, qtdeclarative, solid
-}:
-
-plasmaPackage {
-  name = "plasma-nm";
-  patches = [
-    (substituteAll {
-      src = ./0001-mobile-broadband-provider-info-path.patch;
-      inherit mobile_broadband_provider_info;
-    })
-  ];
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-    makeQtWrapper
-  ];
-  buildInputs = [
-    kcompletion kconfigwidgets kcoreaddons kdbusaddons kiconthemes
-    kinit kitemviews knotifications kservice kwallet kwidgetsaddons
-    kxmlgui mobile_broadband_provider_info modemmanager-qt
-    networkmanager-qt openconnect qca-qt5 solid
-  ];
-  propagatedBuildInputs = [
-    kdeclarative kdelibs4support ki18n kio kwindowsystem plasma-framework
-    qtdeclarative
-  ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kde5-nm-connection-editor"
-  '';
-}
diff --git a/pkgs/desktops/kde-5/plasma-5.5/plasma-pa.nix b/pkgs/desktops/kde-5/plasma-5.5/plasma-pa.nix
deleted file mode 100644
index ff56d1199b15..000000000000
--- a/pkgs/desktops/kde-5/plasma-5.5/plasma-pa.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ plasmaPackage, extra-cmake-modules, glib, kdoctools, kconfigwidgets
-, kcoreaddons, kdeclarative, kglobalaccel, ki18n, libpulseaudio
-, plasma-framework
-}:
-
-plasmaPackage {
-  name = "plasma-pa";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    glib kconfigwidgets kcoreaddons libpulseaudio
-  ];
-  propagatedBuildInputs = [
-    kdeclarative kglobalaccel ki18n plasma-framework
-  ];
-}
diff --git a/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace-wallpapers.nix b/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace-wallpapers.nix
deleted file mode 100644
index bc87abcad153..000000000000
--- a/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace-wallpapers.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ plasmaPackage
-, extra-cmake-modules
-}:
-
-plasmaPackage {
-  name = "plasma-workspace-wallpapers";
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-}
diff --git a/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/default.nix b/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/default.nix
deleted file mode 100644
index 1a96c1eced2e..000000000000
--- a/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/default.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ plasmaPackage, lib, copyPathsToStore
-, extra-cmake-modules, kdoctools
-, baloo, kactivities, kcmutils, kcrash, kdbusaddons, kdeclarative
-, kdelibs4support, kdesu, kdewebkit, kglobalaccel, kidletime
-, kjsembed, knewstuff, knotifyconfig, kpackage, krunner
-, ktexteditor, ktextwidgets, kwallet, kwayland, kwin, kxmlrpcclient
-, libdbusmenu, libkscreen, libSM, libXcursor, networkmanager-qt
-, pam, phonon, plasma-framework, qtquick1, qtscript, qtx11extras, wayland
-, libksysguard, kconfig, solid, qtquickcontrols
-}:
-
-plasmaPackage {
-  name = "plasma-workspace";
-
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    kcmutils kconfig kcrash kdbusaddons kdesu kdewebkit
-    kjsembed knewstuff knotifyconfig kpackage
-    ktextwidgets kwallet kwayland kxmlrpcclient libdbusmenu libSM
-    libXcursor networkmanager-qt pam phonon qtscript
-    wayland
-  ];
-  propagatedBuildInputs = [
-    baloo kactivities kdeclarative kdelibs4support kglobalaccel
-    kidletime krunner ktexteditor kwin libkscreen libksysguard
-    plasma-framework qtquick1 qtquickcontrols qtx11extras solid
-  ];
-
-  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
-
-  postPatch = ''
-    substituteInPlace startkde/kstartupconfig/kstartupconfig.cpp \
-        --replace kdostartupconfig5 $out/bin/kdostartupconfig5
-  '';
-
-  postInstall = ''
-    rm "$out/bin/startkde"
-    rm "$out/bin/startplasmacompositor"
-    rm "$out/lib/libexec/startplasma"
-    rm -r "$out/share/wayland-sessions"
-  '';
-}
diff --git a/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/qml-import-path.patch b/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/qml-import-path.patch
deleted file mode 100644
index 1d34001be597..000000000000
--- a/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/qml-import-path.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-Index: plasma-workspace-5.5.1/applets/analog-clock/contents/ui/analogclock.qml
-===================================================================
---- plasma-workspace-5.5.1.orig/applets/analog-clock/contents/ui/analogclock.qml
-+++ plasma-workspace-5.5.1/applets/analog-clock/contents/ui/analogclock.qml
-@@ -25,7 +25,7 @@ import org.kde.plasma.calendar 2.0 as Pl
- import QtQuick.Layouts 1.1
- 
- import org.kde.plasma.core 2.0 as PlasmaCore
--import "logic.js" as Logic
-+import "../code/logic.js" as Logic
- 
- Item {
-     id: analogclock
-Index: plasma-workspace-5.5.1/applets/batterymonitor/package/contents/ui/BatteryItem.qml
-===================================================================
---- plasma-workspace-5.5.1.orig/applets/batterymonitor/package/contents/ui/BatteryItem.qml
-+++ plasma-workspace-5.5.1/applets/batterymonitor/package/contents/ui/BatteryItem.qml
-@@ -26,7 +26,7 @@ import org.kde.plasma.components 2.0 as
- import org.kde.plasma.extras 2.0 as PlasmaExtras
- import org.kde.plasma.workspace.components 2.0
- import org.kde.kcoreaddons 1.0 as KCoreAddons
--import "logic.js" as Logic
-+import "../code/logic.js" as Logic
- 
- Item {
-     id: batteryItem
-Index: plasma-workspace-5.5.1/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml
-===================================================================
---- plasma-workspace-5.5.1.orig/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml
-+++ plasma-workspace-5.5.1/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml
-@@ -24,7 +24,7 @@ import QtQuick.Layouts 1.1
- import org.kde.plasma.core 2.0 as PlasmaCore
- import org.kde.plasma.components 2.0 as Components
- import org.kde.plasma.workspace.components 2.0
--import "logic.js" as Logic
-+import "../code/logic.js" as Logic
- 
- MouseArea {
-     id: root
-Index: plasma-workspace-5.5.1/applets/batterymonitor/package/contents/ui/PopupDialog.qml
-===================================================================
---- plasma-workspace-5.5.1.orig/applets/batterymonitor/package/contents/ui/PopupDialog.qml
-+++ plasma-workspace-5.5.1/applets/batterymonitor/package/contents/ui/PopupDialog.qml
-@@ -23,7 +23,7 @@ import org.kde.plasma.core 2.0 as Plasma
- import org.kde.plasma.components 2.0 as Components
- import org.kde.plasma.extras 2.0 as PlasmaExtras
- import org.kde.kquickcontrolsaddons 2.0
--import "logic.js" as Logic
-+import "../code/logic.js" as Logic
- 
- FocusScope {
-     id: dialog
-Index: plasma-workspace-5.5.1/applets/batterymonitor/package/contents/ui/batterymonitor.qml
-===================================================================
---- plasma-workspace-5.5.1.orig/applets/batterymonitor/package/contents/ui/batterymonitor.qml
-+++ plasma-workspace-5.5.1/applets/batterymonitor/package/contents/ui/batterymonitor.qml
-@@ -25,7 +25,7 @@ import org.kde.plasma.plasmoid 2.0
- import org.kde.plasma.core 2.0 as PlasmaCore
- import org.kde.kcoreaddons 1.0 as KCoreAddons
- import org.kde.kquickcontrolsaddons 2.0
--import "logic.js" as Logic
-+import "../code/logic.js" as Logic
- 
- Item {
-     id: batterymonitor
-Index: plasma-workspace-5.5.1/applets/lock_logout/contents/ui/lockout.qml
-===================================================================
---- plasma-workspace-5.5.1.orig/applets/lock_logout/contents/ui/lockout.qml
-+++ plasma-workspace-5.5.1/applets/lock_logout/contents/ui/lockout.qml
-@@ -23,7 +23,7 @@ import org.kde.plasma.plasmoid 2.0
- import org.kde.plasma.core 2.0 as PlasmaCore
- import org.kde.plasma.components 2.0
- import org.kde.kquickcontrolsaddons 2.0
--import "data.js" as Data
-+import "../code/data.js" as Data
- 
- Flow {
-     id: lockout
-Index: plasma-workspace-5.5.1/applets/notifications/package/contents/ui/main.qml
-===================================================================
---- plasma-workspace-5.5.1.orig/applets/notifications/package/contents/ui/main.qml
-+++ plasma-workspace-5.5.1/applets/notifications/package/contents/ui/main.qml
-@@ -28,7 +28,7 @@ import org.kde.plasma.extras 2.0 as Plas
- 
- import org.kde.plasma.private.notifications 1.0
- 
--import "uiproperties.js" as UiProperties
-+import "../code/uiproperties.js" as UiProperties
- 
- MouseEventListener {
-     id: notificationsApplet
-Index: plasma-workspace-5.5.1/applets/systemtray/package/contents/ui/main.qml
-===================================================================
---- plasma-workspace-5.5.1.orig/applets/systemtray/package/contents/ui/main.qml
-+++ plasma-workspace-5.5.1/applets/systemtray/package/contents/ui/main.qml
-@@ -25,7 +25,7 @@ import org.kde.plasma.core 2.0 as Plasma
- // import org.kde.plasma.extras 2.0 as PlasmaExtras
- 
- import org.kde.private.systemtray 2.0 as SystemTray
--import "Layout.js" as LayoutManager
-+import "../code/Layout.js" as LayoutManager
- 
- Item {
-     id: root
diff --git a/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/series b/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/series
deleted file mode 100644
index b9081298bd69..000000000000
--- a/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/series
+++ /dev/null
@@ -1 +0,0 @@
-qml-import-path.patch
diff --git a/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/startkde.patch b/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/startkde.patch
deleted file mode 100644
index eea0ae4c199d..000000000000
--- a/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/startkde.patch
+++ /dev/null
@@ -1,372 +0,0 @@
-Index: plasma-workspace-5.5.5/startkde/startkde.cmake
-===================================================================
---- plasma-workspace-5.5.5.orig/startkde/startkde.cmake
-+++ plasma-workspace-5.5.5/startkde/startkde.cmake
-@@ -1,8 +1,36 @@
--#!/bin/sh
-+#!@bash@
- #
- #  DEFAULT KDE STARTUP SCRIPT ( @PROJECT_VERSION@ )
- #
- 
-+set -x
-+
-+# The KDE icon cache is supposed to update itself
-+# automatically, but it uses the timestamp on the icon
-+# theme directory as a trigger.  Since in Nix the
-+# timestamp is always the same, this doesn't work.  So as
-+# a workaround, nuke the icon cache on login.  This isn't
-+# perfect, since it may require logging out after
-+# installing new applications to update the cache.
-+# See http://lists-archives.org/kde-devel/26175-what-when-will-icon-cache-refresh.html
-+rm -fv $HOME/.cache/icon-cache.kcache
-+
-+# Qt writes a weird ‘libraryPath’ line to
-+# ~/.config/Trolltech.conf that causes the KDE plugin
-+# paths of previous KDE invocations to be searched.
-+# Obviously using mismatching KDE libraries is potentially
-+# disastrous, so here we nuke references to the Nix store
-+# in Trolltech.conf.  A better solution would be to stop
-+# Qt from doing this wackiness in the first place.
-+if [ -e $HOME/.config/Trolltech.conf ]; then
-+    @sed@ -e '/nix\\store\|nix\/store/ d' -i $HOME/.config/Trolltech.conf
-+fi
-+
-+# (NixOS) We run kbuildsycoca5 before starting the user session because things
-+# may be missing or moved if they have run nixos-rebuild and it may not be
-+# possible for them to start Konsole to run it manually!
-+@kbuildsycoca5@
-+
- if test "x$1" = x--failsafe; then
-     KDE_FAILSAFE=1 # General failsafe flag
-     KWIN_COMPOSE=N # Disable KWin's compositing
-@@ -17,29 +45,16 @@ trap 'echo GOT SIGHUP' HUP
- # we have to unset this for Darwin since it will screw up KDE's dynamic-loading
- unset DYLD_FORCE_FLAT_NAMESPACE
- 
--# in case we have been started with full pathname spec without being in PATH
--bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
--if [ -n "$bindir" ]; then
--  qbindir=`qtpaths --binaries-dir`
--  qdbus=$qbindir/qdbus
--  case $PATH in
--    $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
--    *) PATH=$bindir:$PATH; export PATH;;
--  esac
--else
--  qdbus=qdbus
--fi
--
- # Check if a KDE session already is running and whether it's possible to connect to X
--kcheckrunning
-+@kcheckrunning@
- kcheckrunning_result=$?
- if test $kcheckrunning_result -eq 0 ; then
--	echo "KDE seems to be already running on this display."
--	xmessage -geometry 500x100 "KDE seems to be already running on this display." > /dev/null 2>/dev/null
-+  echo "KDE seems to be already running on this display."
-+  @xmessage@ -geometry 500x100 "KDE seems to be already running on this display."
- 	exit 1
- elif test $kcheckrunning_result -eq 2 ; then
- 	echo "\$DISPLAY is not set or cannot connect to the X server."
--        exit 1
-+  exit 1
- fi
- 
- # Boot sequence:
-@@ -57,13 +72,8 @@ fi
- # * Then ksmserver is started which takes control of the rest of the startup sequence
- 
- # We need to create config folder so we can write startupconfigkeys
--if [  ${XDG_CONFIG_HOME} ]; then
--  configDir=$XDG_CONFIG_HOME;
--else
--  configDir=${HOME}/.config; #this is the default, http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
--fi
--
--mkdir -p $configDir
-+configDir=$(@qtpaths@ --writable-path GenericConfigLocation)
-+mkdir -p "$configDir"
- 
- #This is basically setting defaults so we can use them with kstartupconfig5
- cat >$configDir/startupconfigkeys <<EOF
-@@ -102,42 +112,10 @@ XftSubPixel=none
- EOF
- }
- 
--# Make sure the Oxygen font is installed
--# This is necessary for setups where CMAKE_INSTALL_PREFIX
--# is not in /usr. fontconfig looks in /usr, ~/.fonts and
--# $XDG_DATA_HOME for fonts. In this case, we symlink the
--# Oxygen font under ${XDG_DATA_HOME} and make it known to
--# fontconfig
--
--usr_share="/usr/share"
--install_share="@KDE_INSTALL_FULL_DATADIR@"
--
--if [ ! $install_share = $usr_share ]; then
--
--    if [ ${XDG_DATA_HOME} ]; then
--        fontsDir="${XDG_DATA_HOME}/fonts"
--    else
--        fontsDir="${HOME}/.fonts"
--    fi
--
--    test -d $fontsDir || {
--        mkdir -p $fontsDir
--    }
--
--    oxygenDir=$fontsDir/oxygen
--    prefixDir="@KDE_INSTALL_FULL_DATADIR@/fonts/oxygen"
--
--    # if the oxygen dir doesn't exist, create a symlink to be sure that the
--    # Oxygen font is available to the user
--    test -d $oxygenDir || test -d $prefixDir && {
--        test -h $oxygenDir || ln -s $prefixDir $oxygenDir && fc-cache $oxygenDir
--    }
--fi
--
--kstartupconfig5
-+@out@/bin/kstartupconfig5
- returncode=$?
- if test $returncode -ne 0; then
--    xmessage -geometry 500x100 "kstartupconfig5 does not exist or fails. The error code is $returncode. Check your installation."
-+    @xmessage@ -geometry 500x100 "kstartupconfig5 does not exist or fails. The error code is $returncode. Check your installation."
-     exit 1
- fi
- [ -r $configDir/startupconfig ] && . $configDir/startupconfig
-@@ -146,9 +124,11 @@ if test "$kdeglobals_kscreen_scalefactor
-     export QT_DEVICE_PIXEL_RATIO=$kdeglobals_kscreen_scalefactor
- fi
- 
-+XCURSOR_PATH=~/.icons:$(echo "$XDG_DATA_DIRS" | @tr@ ":" "\n" | @sed@ 's,$,/icons,g' | @tr@ "\n" ":")
-+export XCURSOR_PATH
-+
- # XCursor mouse theme needs to be applied here to work even for kded or ksmserver
- if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then
--    @EXPORT_XCURSOR_PATH@
- 
-     kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"
-     if test $? -eq 10; then
-@@ -164,21 +144,39 @@ if test -n "$kcminputrc_mouse_cursorthem
-     fi
- fi
- 
--if test "$kcmfonts_general_forcefontdpi" -ne 0; then
--    xrdb -quiet -merge -nocpp <<EOF
--Xft.dpi: $kcmfonts_general_forcefontdpi
--EOF
--fi
-+# Set a left cursor instead of the standard X11 "X" cursor, since I've heard
-+# from some users that they're confused and don't know what to do. This is
-+# especially necessary on slow machines, where starting KDE takes one or two
-+# minutes until anything appears on the screen.
-+#
-+# If the user has overwritten fonts, the cursor font may be different now
-+# so don't move this up.
-+#
-+@xsetroot@ -cursor_name left_ptr
- 
- dl=$DESKTOP_LOCKED
- unset DESKTOP_LOCKED # Don't want it in the environment
- 
-+# Make sure that D-Bus is running
-+# D-Bus autolaunch is broken
-+if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
-+    eval `@dbus-launch@ --sh-syntax --exit-with-session`
-+fi
-+if @qdbus@ >/dev/null 2>/dev/null; then
-+    : # ok
-+else
-+    echo 'startkde: Could not start D-Bus. Can you call qdbus?'  1>&2
-+    test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
-+    @xmessage@ -geometry 500x100 "Could not start D-Bus. Can you call qdbus?"
-+    exit 1
-+fi
-+
- ksplash_pid=
- if test -z "$dl"; then
-   # the splashscreen and progress indicator
-   case "$ksplashrc_ksplash_engine" in
-     KSplashQML)
--      ksplash_pid=`ksplashqml "${ksplashrc_ksplash_theme}" --pid`
-+      ksplash_pid=`@out@/bin/ksplashqml "${ksplashrc_ksplash_theme}" --pid`
-       ;;
-     None)
-       ;;
-@@ -201,8 +199,7 @@ fi
- # For anything else (that doesn't set env vars, or that needs a window manager),
- # better use the Autostart folder.
- 
--# TODO: Use GenericConfigLocation once we depend on Qt 5.4
--scriptpath=`qtpaths --paths ConfigLocation | tr ':' '\n' | sed 's,$,/plasma-workspace,g'`
-+scriptpath=$(@qtpaths@ --paths GenericConfigLocation | tr ':' '\n' | @sed@ 's,$,/plasma-workspace,g')
- 
- # Add /env/ to the directory to locate the scripts to be sourced
- for prefix in `echo $scriptpath`; do
-@@ -232,7 +229,7 @@ usr_odir=$HOME/.fonts/kde-override
- usr_fdir=$HOME/.fonts
- 
- if test -n "$KDEDIRS"; then
--  kdedirs_first=`echo "$KDEDIRS"|sed -e 's/:.*//'`
-+  kdedirs_first=`echo "$KDEDIRS" | @sed@ -e 's/:.*//'`
-   sys_odir=$kdedirs_first/share/fonts/override
-   sys_fdir=$kdedirs_first/share/fonts
- else
-@@ -245,23 +242,13 @@ fi
- # add the user's dirs to the font path, as they might simply have been made
- # read-only by the administrator, for whatever reason.
- 
--test -d "$sys_odir" && xset +fp "$sys_odir"
--test -d "$usr_odir" && (mkfontdir "$usr_odir" ; xset +fp "$usr_odir")
--test -d "$usr_fdir" && (mkfontdir "$usr_fdir" ; xset fp+ "$usr_fdir")
--test -d "$sys_fdir" && xset fp+ "$sys_fdir"
-+test -d "$sys_odir" && @xset@ +fp "$sys_odir"
-+test -d "$usr_odir" && ( @mkfontdir@ "$usr_odir" ; @xset@ +fp "$usr_odir" )
-+test -d "$usr_fdir" && ( @mkfontdir@ "$usr_fdir" ; @xset@ fp+ "$usr_fdir" )
-+test -d "$sys_fdir" && @xset@ fp+ "$sys_fdir"
- 
- # Ask X11 to rebuild its font list.
--xset fp rehash
--
--# Set a left cursor instead of the standard X11 "X" cursor, since I've heard
--# from some users that they're confused and don't know what to do. This is
--# especially necessary on slow machines, where starting KDE takes one or two
--# minutes until anything appears on the screen.
--#
--# If the user has overwritten fonts, the cursor font may be different now
--# so don't move this up.
--#
--xsetroot -cursor_name left_ptr
-+@xset@ fp rehash
- 
- # Get Ghostscript to look into user's KDE fonts dir for additional Fontmap
- if test -n "$GS_LIB" ; then
-@@ -274,26 +261,6 @@ fi
- 
- echo 'startkde: Starting up...'  1>&2
- 
--# Make sure that the KDE prefix is first in XDG_DATA_DIRS and that it's set at all.
--# The spec allows XDG_DATA_DIRS to be not set, but X session startup scripts tend
--# to set it to a list of paths *not* including the KDE prefix if it's not /usr or
--# /usr/local.
--if test -z "$XDG_DATA_DIRS"; then
--    XDG_DATA_DIRS="@CMAKE_INSTALL_PREFIX@/@SHARE_INSTALL_PREFIX@:/usr/share:/usr/local/share"
--fi
--export XDG_DATA_DIRS
--
--# Make sure that D-Bus is running
--if $qdbus >/dev/null 2>/dev/null; then
--    : # ok
--else
--    echo 'startkde: Could not start D-Bus. Can you call qdbus?'  1>&2
--    test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
--    xmessage -geometry 500x100 "Could not start D-Bus. Can you call qdbus?"
--    exit 1
--fi
--
--
- # Mark that full KDE session is running (e.g. Konqueror preloading works only
- # with full KDE running). The KDE_FULL_SESSION property can be detected by
- # any X client connected to the same X session, even if not launched
-@@ -318,11 +285,11 @@ fi
- #
- KDE_FULL_SESSION=true
- export KDE_FULL_SESSION
--xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true
-+@xprop@ -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true
- 
- KDE_SESSION_VERSION=5
- export KDE_SESSION_VERSION
--xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5
-+@xprop@ -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5
- 
- KDE_SESSION_UID=`id -ru`
- export KDE_SESSION_UID
-@@ -332,11 +299,11 @@ export XDG_CURRENT_DESKTOP
- 
- # At this point all the environment is ready, let's send it to kwalletd if running
- if test -n "$PAM_KWALLET_LOGIN" ; then
--    env | socat STDIN UNIX-CONNECT:$PAM_KWALLET_LOGIN
-+    env | @socat@ STDIN UNIX-CONNECT:$PAM_KWALLET_LOGIN
- fi
- # ...and also to kwalletd5
- if test -n "$PAM_KWALLET5_LOGIN" ; then
--    env | socat STDIN UNIX-CONNECT:$PAM_KWALLET5_LOGIN
-+    env | @socat@ STDIN UNIX-CONNECT:$PAM_KWALLET5_LOGIN
- fi
- 
- # At this point all environment variables are set, let's send it to the DBus session server to update the activation environment
-@@ -349,18 +316,18 @@ if test $? -ne 0; then
-   # Startup error
-   echo 'startkde: Could not sync environment to dbus.'  1>&2
-   test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
--  xmessage -geometry 500x100 "Could not sync environment to dbus."
-+  @xmessage@ -geometry 500x100 "Could not sync environment to dbus."
-   exit 1
- fi
- 
- # We set LD_BIND_NOW to increase the efficiency of kdeinit.
- # kdeinit unsets this variable before loading applications.
--LD_BIND_NOW=true @CMAKE_INSTALL_FULL_LIBEXECDIR_KF5@/start_kdeinit_wrapper --kded +kcminit_startup
-+LD_BIND_NOW=true @start_kdeinit_wrapper@ --kded +kcminit_startup
- if test $? -ne 0; then
-   # Startup error
-   echo 'startkde: Could not start kdeinit5. Check your installation.'  1>&2
-   test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
--  xmessage -geometry 500x100 "Could not start kdeinit5. Check your installation."
-+  @xmessage@ -geometry 500x100 "Could not start kdeinit5. Check your installation."
-   exit 1
- fi
- 
-@@ -379,27 +346,27 @@ test -n "$KDEWM" && KDEWM="--windowmanag
- # lock now and do the rest of the KDE startup underneath the locker.
- KSMSERVEROPTIONS=""
- test -n "$dl" && KSMSERVEROPTIONS=" --lockscreen"
--kwrapper5 @CMAKE_INSTALL_FULL_BINDIR@/ksmserver $KDEWM $KSMSERVEROPTIONS
-+@kwrapper5@ @CMAKE_INSTALL_FULL_BINDIR@/ksmserver $KDEWM $KSMSERVEROPTIONS
- if test $? -eq 255; then
-   # Startup error
-   echo 'startkde: Could not start ksmserver. Check your installation.'  1>&2
-   test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
--  xmessage -geometry 500x100 "Could not start ksmserver. Check your installation."
-+  @xmessage@ -geometry 500x100 "Could not start ksmserver. Check your installation."
- fi
- 
--wait_drkonqi=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true`
-+wait_drkonqi=`@kreadconfig5@ --file startkderc --group WaitForDrKonqi --key Enabled --default true`
- 
- if test x"$wait_drkonqi"x = x"true"x ; then
-     # wait for remaining drkonqi instances with timeout (in seconds)
--    wait_drkonqi_timeout=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900`
-+    wait_drkonqi_timeout=`@kreadconfig5@ --file startkderc --group WaitForDrKonqi --key Timeout --default 900`
-     wait_drkonqi_counter=0
--    while $qdbus | grep "^[^w]*org.kde.drkonqi" > /dev/null ; do
-+    while @qdbus@ | @grep@ "^[^w]*org.kde.drkonqi" > /dev/null ; do
-         sleep 5
-         wait_drkonqi_counter=$((wait_drkonqi_counter+5))
-         if test "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ; then
-             # ask remaining drkonqis to die in a graceful way
--            $qdbus | grep 'org.kde.drkonqi-' | while read address ; do
--                $qdbus "$address" "/MainApplication" "quit"
-+            @qdbus@ | @grep@ 'org.kde.drkonqi-' | while read address ; do
-+                @qdbus@ "$address" "/MainApplication" "quit"
-             done
-             break
-         fi
-@@ -411,12 +378,12 @@ echo 'startkde: Shutting down...'  1>&2
- test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
- 
- # Clean up
--kdeinit5_shutdown
-+@kdeinit5_shutdown@
- 
- unset KDE_FULL_SESSION
--xprop -root -remove KDE_FULL_SESSION
-+@xprop@ -root -remove KDE_FULL_SESSION
- unset KDE_SESSION_VERSION
--xprop -root -remove KDE_SESSION_VERSION
-+@xprop@ -root -remove KDE_SESSION_VERSION
- unset KDE_SESSION_UID
- 
- echo 'startkde: Done.'  1>&2
diff --git a/pkgs/desktops/kde-5/plasma-5.5/polkit-kde-agent.nix b/pkgs/desktops/kde-5/plasma-5.5/polkit-kde-agent.nix
deleted file mode 100644
index 3fc3a441ac34..000000000000
--- a/pkgs/desktops/kde-5/plasma-5.5/polkit-kde-agent.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ plasmaPackage
-, extra-cmake-modules
-, ki18n
-, kwindowsystem
-, kdbusaddons
-, kwidgetsaddons
-, kcoreaddons
-, kcrash
-, kconfig
-, kiconthemes
-, knotifications
-, polkit-qt
-}:
-
-plasmaPackage {
-  name = "polkit-kde-agent";
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    kdbusaddons
-    kwidgetsaddons
-    kcoreaddons
-    kcrash
-    kconfig
-    kiconthemes
-    knotifications
-    polkit-qt
-  ];
-  propagatedBuildInputs = [ ki18n kwindowsystem ];
-}
diff --git a/pkgs/desktops/kde-5/plasma-5.5/powerdevil.nix b/pkgs/desktops/kde-5/plasma-5.5/powerdevil.nix
deleted file mode 100644
index 475e8878206a..000000000000
--- a/pkgs/desktops/kde-5/plasma-5.5/powerdevil.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ plasmaPackage, extra-cmake-modules, kdoctools, kactivities
-, kauth, kconfig, kdbusaddons, kdelibs4support, kglobalaccel, ki18n
-, kidletime, kio, knotifyconfig, kwayland, libkscreen, plasma-workspace
-, qtx11extras, solid, udev
-}:
-
-plasmaPackage {
-  name = "powerdevil";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    kconfig kdbusaddons knotifyconfig solid udev
-  ];
-  propagatedBuildInputs = [
-    kactivities kauth kdelibs4support kglobalaccel ki18n kio kidletime
-    kwayland libkscreen plasma-workspace qtx11extras
-  ];
-}
diff --git a/pkgs/desktops/kde-5/plasma-5.5/setup-hook.sh b/pkgs/desktops/kde-5/plasma-5.5/setup-hook.sh
deleted file mode 100644
index a8d9b7e0e36f..000000000000
--- a/pkgs/desktops/kde-5/plasma-5.5/setup-hook.sh
+++ /dev/null
@@ -1 +0,0 @@
-addToSearchPath XDG_DATA_DIRS @out@/share
diff --git a/pkgs/desktops/kde-5/plasma-5.5/srcs.nix b/pkgs/desktops/kde-5/plasma-5.5/srcs.nix
deleted file mode 100644
index f27b39033e2a..000000000000
--- a/pkgs/desktops/kde-5/plasma-5.5/srcs.nix
+++ /dev/null
@@ -1,309 +0,0 @@
-# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
-{ fetchurl, mirror }:
-
-{
-  bluedevil = {
-    version = "5.5.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.5/bluedevil-5.5.5.tar.xz";
-      sha256 = "10fm3gf28c4hwy628z8wy82j6n00z6xf0vad52jahwzz98w5xy9l";
-      name = "bluedevil-5.5.5.tar.xz";
-    };
-  };
-  breeze = {
-    version = "5.5.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.5/breeze-5.5.5.tar.xz";
-      sha256 = "0xxfykg1gsr65jb8jmkk6qr991cvdfibpb9228kb16kpfn73k45l";
-      name = "breeze-5.5.5.tar.xz";
-    };
-  };
-  breeze-gtk = {
-    version = "5.5.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.5/breeze-gtk-5.5.5.tar.xz";
-      sha256 = "047b5xrbpk2d1x1srxpx2j5sp0kjzfvgh1xaldirxpcla6jpjj65";
-      name = "breeze-gtk-5.5.5.tar.xz";
-    };
-  };
-  discover = {
-    version = "5.5.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.5/discover-5.5.5.tar.xz";
-      sha256 = "0asbn69k4agr0jyw249bnw8xhi9hnj18asij0h1a8r5wlqbqj22a";
-      name = "discover-5.5.5.tar.xz";
-    };
-  };
-  kde-cli-tools = {
-    version = "5.5.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.5/kde-cli-tools-5.5.5.tar.xz";
-      sha256 = "19iggnanlxz1j2xx9l2p7wwf1471yic9fyjfhhk0wfj2z3ickmsh";
-      name = "kde-cli-tools-5.5.5.tar.xz";
-    };
-  };
-  kdecoration = {
-    version = "5.5.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.5/kdecoration-5.5.5.tar.xz";
-      sha256 = "0ix4jnqm5jpfdhgr6r8j1mwasics22i63hacd6h8gj5klhbgsqvc";
-      name = "kdecoration-5.5.5.tar.xz";
-    };
-  };
-  kde-gtk-config = {
-    version = "5.5.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.5/kde-gtk-config-5.5.5.tar.xz";
-      sha256 = "0b6xkpfy4da3vign82z186ghg61l6k9sisppmfgmy5ycqjp4yghq";
-      name = "kde-gtk-config-5.5.5.tar.xz";
-    };
-  };
-  kdeplasma-addons = {
-    version = "5.5.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.5/kdeplasma-addons-5.5.5.tar.xz";
-      sha256 = "1l327fi0x3vljkj7f3113ryynxrsk16qhn0vpsdxc7f169vf4isx";
-      name = "kdeplasma-addons-5.5.5.tar.xz";
-    };
-  };
-  kgamma5 = {
-    version = "5.5.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.5/kgamma5-5.5.5.tar.xz";
-      sha256 = "1597q98iw4dmkzm40525xlcjj3xfrgsmhp8djgm2yk92bjxy7ydj";
-      name = "kgamma5-5.5.5.tar.xz";
-    };
-  };
-  khelpcenter = {
-    version = "5.5.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.5/khelpcenter-5.5.5.tar.xz";
-      sha256 = "04q5rj5g882qzdzvxxil6668x77iwvbpqx0z8jzm5z80x0xrg44p";
-      name = "khelpcenter-5.5.5.tar.xz";
-    };
-  };
-  khotkeys = {
-    version = "5.5.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.5/khotkeys-5.5.5.tar.xz";
-      sha256 = "12rrgs7slais8xagv3rn06him4qq21cahlb1yh3gpz571mhyl1nj";
-      name = "khotkeys-5.5.5.tar.xz";
-    };
-  };
-  kinfocenter = {
-    version = "5.5.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.5/kinfocenter-5.5.5.tar.xz";
-      sha256 = "1j76cfpilhjy97541l90fm6nsamlwa4q4ap7hrp65cdwi5lb08c2";
-      name = "kinfocenter-5.5.5.tar.xz";
-    };
-  };
-  kmenuedit = {
-    version = "5.5.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.5/kmenuedit-5.5.5.tar.xz";
-      sha256 = "010fdfp7kawwhvg76ypzq4rs047xkc2gxz3cfifaybiz5z1y4mdj";
-      name = "kmenuedit-5.5.5.tar.xz";
-    };
-  };
-  kscreen = {
-    version = "5.5.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.5/kscreen-5.5.5.tar.xz";
-      sha256 = "1a0fq2x30nnrq2r4slgmfziibbdjmbzh1n8q8ym1lj18j5zyhqcz";
-      name = "kscreen-5.5.5.tar.xz";
-    };
-  };
-  kscreenlocker = {
-    version = "5.5.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.5/kscreenlocker-5.5.5.tar.xz";
-      sha256 = "00sq4ddb30sxdp6br9h8r4rb07hra3vqv0kxvqfdr50hhcq8dbbw";
-      name = "kscreenlocker-5.5.5.tar.xz";
-    };
-  };
-  ksshaskpass = {
-    version = "5.5.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.5/ksshaskpass-5.5.5.tar.xz";
-      sha256 = "0szw50wfwh8dvwm61m3azk96di6fr0ymvjhjqffy6ja41kslhp4a";
-      name = "ksshaskpass-5.5.5.tar.xz";
-    };
-  };
-  ksysguard = {
-    version = "5.5.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.5/ksysguard-5.5.5.tar.xz";
-      sha256 = "020b5fkkj3baqg7clhkvpjhqp5xl0gdzyh75b19sx4ba3akpqx5m";
-      name = "ksysguard-5.5.5.tar.xz";
-    };
-  };
-  kwallet-pam = {
-    version = "5.5.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.5/kwallet-pam-5.5.5.tar.xz";
-      sha256 = "0dlkm1dm60fbnwdmfhiql6mkqrqkdpqi04qa6xxpccijb6h57h8r";
-      name = "kwallet-pam-5.5.5.tar.xz";
-    };
-  };
-  kwayland = {
-    version = "5.5.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.5/kwayland-5.5.5.tar.xz";
-      sha256 = "04p6m9fgllarh7l449injjn5426bqfjwyab0d739p0ys6kdm9hqh";
-      name = "kwayland-5.5.5.tar.xz";
-    };
-  };
-  kwayland-integration = {
-    version = "5.5.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.5/kwayland-integration-5.5.5.tar.xz";
-      sha256 = "1ijllnfxy5ackz6bbxffi31ibpsrmgg3abm74x1p2m6a5r4f6bj8";
-      name = "kwayland-integration-5.5.5.tar.xz";
-    };
-  };
-  kwin = {
-    version = "5.5.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.5/kwin-5.5.5.tar.xz";
-      sha256 = "1i79qq9p0rfz6gjjx9m1kjskrnh2kkpvkgp20cw8akn1cgi755vm";
-      name = "kwin-5.5.5.tar.xz";
-    };
-  };
-  kwrited = {
-    version = "5.5.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.5/kwrited-5.5.5.tar.xz";
-      sha256 = "17hq5jknqaqdf571m3ahdf3dwvphrmxj3jxgl5bhrb9zh5whjsi3";
-      name = "kwrited-5.5.5.tar.xz";
-    };
-  };
-  libkscreen = {
-    version = "5.5.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.5/libkscreen-5.5.5.tar.xz";
-      sha256 = "1djv0h6vw4ijfsd281pxr3yxi24rjbg7kshpm6qhfn3gbhz7qbqv";
-      name = "libkscreen-5.5.5.tar.xz";
-    };
-  };
-  libksysguard = {
-    version = "5.5.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.5/libksysguard-5.5.5.tar.xz";
-      sha256 = "16ky6xmd60ga2a09kgd4111rhly1p26dv72xmda4n40zswd6k1j2";
-      name = "libksysguard-5.5.5.tar.xz";
-    };
-  };
-  milou = {
-    version = "5.5.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.5/milou-5.5.5.tar.xz";
-      sha256 = "1fzbni8lyrx858pd3b1365x84pmyjamxa5f56q2h3ahzdhb726l5";
-      name = "milou-5.5.5.tar.xz";
-    };
-  };
-  oxygen = {
-    version = "5.5.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.5/oxygen-5.5.5.tar.xz";
-      sha256 = "1hmzvpsh0rpp2aps77cs9w4fqdfa3y5fbq7mpx97sp2z072x6i12";
-      name = "oxygen-5.5.5.tar.xz";
-    };
-  };
-  plasma-desktop = {
-    version = "5.5.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.5/plasma-desktop-5.5.5.tar.xz";
-      sha256 = "12za7c6c28iccw0b7ccrwz0hj2pa71387334jdinl2a1f60xljb6";
-      name = "plasma-desktop-5.5.5.tar.xz";
-    };
-  };
-  plasma-mediacenter = {
-    version = "5.5.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.5/plasma-mediacenter-5.5.5.tar.xz";
-      sha256 = "1yixqsajxf9jp5n16n0zg53iypmp9c114lbnhlr5ni1a0dqgfc8j";
-      name = "plasma-mediacenter-5.5.5.tar.xz";
-    };
-  };
-  plasma-nm = {
-    version = "5.5.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.5/plasma-nm-5.5.5.tar.xz";
-      sha256 = "0xffyfw1pb53h686lfc1v9k5f2p3mjqgzi49h6j46l2zxd2wi9w4";
-      name = "plasma-nm-5.5.5.tar.xz";
-    };
-  };
-  plasma-pa = {
-    version = "5.5.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.5/plasma-pa-5.5.5.tar.xz";
-      sha256 = "1msmnci4id2qxj1453qizx3zsmdf2rpryy83c7j192izc25ry6sh";
-      name = "plasma-pa-5.5.5.tar.xz";
-    };
-  };
-  plasma-sdk = {
-    version = "5.5.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.5/plasma-sdk-5.5.5.tar.xz";
-      sha256 = "0301h0h1z5id0win0599qwhvxdxz6m881qadyzwxrvhysj3r1sd8";
-      name = "plasma-sdk-5.5.5.tar.xz";
-    };
-  };
-  plasma-workspace = {
-    version = "5.5.5.2";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.5/plasma-workspace-5.5.5.2.tar.xz";
-      sha256 = "09kvzv2cjlv0bglik7723m373nvhvh3c4aaip2xkv5lbhxfydldy";
-      name = "plasma-workspace-5.5.5.2.tar.xz";
-    };
-  };
-  plasma-workspace-wallpapers = {
-    version = "5.5.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.5/plasma-workspace-wallpapers-5.5.5.tar.xz";
-      sha256 = "01mrrz6y81ypsd33ldpcz1llj13faqmrip5fg9fxqf6vjbh7jlcp";
-      name = "plasma-workspace-wallpapers-5.5.5.tar.xz";
-    };
-  };
-  polkit-kde-agent = {
-    version = "1-5.5.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.5/polkit-kde-agent-1-5.5.5.tar.xz";
-      sha256 = "0pcwzb747gjp2s68i3apv5q2cfl3igkf1hsx0v1j1y7sk4diqkj9";
-      name = "polkit-kde-agent-1-5.5.5.tar.xz";
-    };
-  };
-  powerdevil = {
-    version = "5.5.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.5/powerdevil-5.5.5.tar.xz";
-      sha256 = "1sb046pyir6x75r2gpqcq6765igpdc0hl9g5jams6j3l65ivzgvk";
-      name = "powerdevil-5.5.5.tar.xz";
-    };
-  };
-  sddm-kcm = {
-    version = "5.5.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.5/sddm-kcm-5.5.5.tar.xz";
-      sha256 = "0zpl6wfpgvmkf80aqn4b46wrpk1a81yz7srxcnw857xyhvw31m6g";
-      name = "sddm-kcm-5.5.5.tar.xz";
-    };
-  };
-  systemsettings = {
-    version = "5.5.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.5/systemsettings-5.5.5.tar.xz";
-      sha256 = "183sb898f1452ljdk11k6wqy4dgzlgnicjlrygjfgvw9sz0vgn90";
-      name = "systemsettings-5.5.5.tar.xz";
-    };
-  };
-  user-manager = {
-    version = "5.5.5";
-    src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.5/user-manager-5.5.5.tar.xz";
-      sha256 = "1g9fm1i05mzmjs3c5fsg45pf8nd28vhh7g5awbpd397z586gr44y";
-      name = "user-manager-5.5.5.tar.xz";
-    };
-  };
-}
diff --git a/pkgs/desktops/kde-5/plasma-5.5/startkde/default.nix b/pkgs/desktops/kde-5/plasma-5.5/startkde/default.nix
deleted file mode 100644
index 30e986c21b4b..000000000000
--- a/pkgs/desktops/kde-5/plasma-5.5/startkde/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ stdenv, lib, runCommand
-, dbus, qttools, socat
-, gnugrep, gnused
-, kconfig, kinit, kservice
-, plasma-workspace
-, xmessage, xprop, xsetroot
-}:
-
-let
-
-  env = {
-    inherit (stdenv) shell;
-    paths = builtins.map (pkg: pkg.out or pkg)
-      [
-        dbus qttools socat
-        gnugrep gnused
-        kconfig kinit kservice
-        plasma-workspace
-        xmessage xprop xsetroot
-      ];
-  };
-
-in runCommand "startkde" env ''
-  prefix_PATH=
-  for pkg in $paths; do
-    addToSearchPath prefix_PATH "$pkg/bin"
-    addToSearchPath prefix_PATH "$pkg/lib/libexec"
-    addToSearchPath prefix_PATH "$pkg/lib/libexec/kf5"
-  done
-  substitute ${./startkde.sh} "$out" --subst-var shell --subst-var prefix_PATH
-  chmod +x "$out"
-''
diff --git a/pkgs/desktops/kde-5/plasma-5.5/startkde/startkde.sh b/pkgs/desktops/kde-5/plasma-5.5/startkde/startkde.sh
deleted file mode 100755
index d839226a4562..000000000000
--- a/pkgs/desktops/kde-5/plasma-5.5/startkde/startkde.sh
+++ /dev/null
@@ -1,334 +0,0 @@
-#!@shell@
-
-PATH="@prefix_PATH@:$PATH"
-
-# The KDE icon cache is supposed to update itself
-# automatically, but it uses the timestamp on the icon
-# theme directory as a trigger.  Since in Nix the
-# timestamp is always the same, this doesn't work.  So as
-# a workaround, nuke the icon cache on login.  This isn't
-# perfect, since it may require logging out after
-# installing new applications to update the cache.
-# See http://lists-archives.org/kde-devel/26175-what-when-will-icon-cache-refresh.html
-rm -fv $HOME/.cache/icon-cache.kcache
-
-# Qt writes a weird ‘libraryPath’ line to
-# ~/.config/Trolltech.conf that causes the KDE plugin
-# paths of previous KDE invocations to be searched.
-# Obviously using mismatching KDE libraries is potentially
-# disastrous, so here we nuke references to the Nix store
-# in Trolltech.conf.  A better solution would be to stop
-# Qt from doing this wackiness in the first place.
-if [ -e $HOME/.config/Trolltech.conf ]; then
-    sed -e '/nix\\store\|nix\/store/ d' -i $HOME/.config/Trolltech.conf
-fi
-
-if test "x$1" = x--failsafe; then
-    KDE_FAILSAFE=1 # General failsafe flag
-    KWIN_COMPOSE=N # Disable KWin's compositing
-    QT_XCB_FORCE_SOFTWARE_OPENGL=1
-    export KWIN_COMPOSE KDE_FAILSAFE QT_XCB_FORCE_SOFTWARE_OPENGL
-fi
-
-# When the X server dies we get a HUP signal from xinit. We must ignore it
-# because we still need to do some cleanup.
-trap 'echo GOT SIGHUP' HUP
-
-# we have to unset this for Darwin since it will screw up KDE's dynamic-loading
-unset DYLD_FORCE_FLAT_NAMESPACE
-
-# Check if a KDE session already is running and whether it's possible to connect to X
-kcheckrunning
-kcheckrunning_result=$?
-if test $kcheckrunning_result -eq 0 ; then
-    echo "KDE seems to be already running on this display."
-    xmessage -geometry 500x100 "KDE seems to be already running on this display."
-	exit 1
-elif test $kcheckrunning_result -eq 2 ; then
-	echo "\$DISPLAY is not set or cannot connect to the X server."
-    exit 1
-fi
-
-# Boot sequence:
-#
-# kdeinit is used to fork off processes which improves memory usage
-# and startup time.
-#
-# * kdeinit starts klauncher first.
-# * Then kded is started. kded is responsible for keeping the sycoca
-#   database up to date. When an up to date database is present it goes
-#   into the background and the startup continues.
-# * Then kdeinit starts kcminit. kcminit performs initialisation of
-#   certain devices according to the user's settings
-#
-# * Then ksmserver is started which takes control of the rest of the startup sequence
-
-# We need to create config folder so we can write startupconfigkeys
-configDir=$(qtpaths --writable-path GenericConfigLocation)
-mkdir -p "$configDir"
-
-#This is basically setting defaults so we can use them with kstartupconfig5
-cat >$configDir/startupconfigkeys <<EOF
-kcminputrc Mouse cursorTheme 'breeze_cursors'
-kcminputrc Mouse cursorSize ''
-ksplashrc KSplash Theme Breeze
-ksplashrc KSplash Engine KSplashQML
-kdeglobals KScreen ScaleFactor 1
-kcmfonts General forceFontDPI 0
-EOF
-
-# preload the user's locale on first start
-plasmalocalerc=$configDir/plasma-localerc
-test -f $plasmalocalerc || {
-cat >$plasmalocalerc <<EOF
-[Formats]
-LANG=$LANG
-EOF
-}
-
-# export LC_* variables set by kcmshell5 formats into environment
-# so it can be picked up by QLocale and friends.
-exportformatssettings=$configDir/plasma-locale-settings.sh
-test -f $exportformatssettings && {
-    . $exportformatssettings
-}
-
-# Write a default kdeglobals file to set up the font
-kdeglobalsfile=$configDir/kdeglobals
-test -f $kdeglobalsfile || {
-cat >$kdeglobalsfile <<EOF
-[General]
-XftAntialias=true
-XftHintStyle=hintmedium
-XftSubPixel=none
-EOF
-}
-
-kstartupconfig5
-returncode=$?
-if test $returncode -ne 0; then
-    xmessage -geometry 500x100 "kstartupconfig5 does not exist or fails. The error code is $returncode. Check your installation."
-    exit 1
-fi
-[ -r $configDir/startupconfig ] && . $configDir/startupconfig
-
-if test "$kdeglobals_kscreen_scalefactor" -ne 1; then
-    export QT_DEVICE_PIXEL_RATIO=$kdeglobals_kscreen_scalefactor
-fi
-
-XCURSOR_PATH=~/.icons
-IFS=":" read -r -a xdgDirs <<< "$XDG_DATA_DIRS"
-for xdgDir in "${xdgDirs[@]}"; do
-    XCURSOR_PATH="$XCURSOR_PATH:$xdgDir/icons"
-done
-export XCURSOR_PATH
-
-# XCursor mouse theme needs to be applied here to work even for kded or ksmserver
-if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then
-
-    kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"
-    if test $? -eq 10; then
-        XCURSOR_THEME=breeze_cursors
-        export XCURSOR_THEME
-    elif test -n "$kcminputrc_mouse_cursortheme"; then
-        XCURSOR_THEME="$kcminputrc_mouse_cursortheme"
-        export XCURSOR_THEME
-    fi
-    if test -n "$kcminputrc_mouse_cursorsize"; then
-        XCURSOR_SIZE="$kcminputrc_mouse_cursorsize"
-        export XCURSOR_SIZE
-    fi
-fi
-
-# Set a left cursor instead of the standard X11 "X" cursor, since I've heard
-# from some users that they're confused and don't know what to do. This is
-# especially necessary on slow machines, where starting KDE takes one or two
-# minutes until anything appears on the screen.
-#
-# If the user has overwritten fonts, the cursor font may be different now
-# so don't move this up.
-#
-xsetroot -cursor_name left_ptr
-
-dl=$DESKTOP_LOCKED
-unset DESKTOP_LOCKED # Don't want it in the environment
-
-# Make sure that D-Bus is running
-# D-Bus autolaunch is broken
-if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
-    eval $(dbus-launch --sh-syntax --exit-with-session)
-fi
-if qdbus >/dev/null 2>/dev/null; then
-    : # ok
-else
-    echo 'startkde: Could not start D-Bus. Can you call qdbus?'  1>&2
-    test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
-    xmessage -geometry 500x100 "Could not start D-Bus. Can you call qdbus?"
-    exit 1
-fi
-
-ksplash_pid=
-if test -z "$dl"; then
-  # the splashscreen and progress indicator
-  case "$ksplashrc_ksplash_engine" in
-    KSplashQML)
-      ksplash_pid=$(ksplashqml "${ksplashrc_ksplash_theme}" --pid)
-      ;;
-    None)
-      ;;
-    *)
-      ;;
-  esac
-fi
-
-# Source scripts found in <config locations>/plasma-workspace/env/*.sh
-# (where <config locations> correspond to the system and user's configuration
-# directories, as identified by Qt's qtpaths,  e.g.  $HOME/.config
-# and /etc/xdg/ on Linux)
-#
-# This is where you can define environment variables that will be available to
-# all KDE programs, so this is where you can run agents using e.g. eval `ssh-agent`
-# or eval `gpg-agent --daemon`.
-# Note: if you do that, you should also put "ssh-agent -k" as a shutdown script
-#
-# (see end of this file).
-# For anything else (that doesn't set env vars, or that needs a window manager),
-# better use the Autostart folder.
-
-IFS=":" read -r -a scriptpath <<< $(qtpaths --paths GenericConfigLocation)
-# Add /env/ to the directory to locate the scripts to be sourced
-for prefix in "${scriptpath[@]}"; do
-  for file in "$prefix"/plasma-workspace/env/*.sh; do
-    test -r "$file" && . "$file" || true
-  done
-done
-
-echo 'startkde: Starting up...'  1>&2
-
-# Mark that full KDE session is running (e.g. Konqueror preloading works only
-# with full KDE running). The KDE_FULL_SESSION property can be detected by
-# any X client connected to the same X session, even if not launched
-# directly from the KDE session but e.g. using "ssh -X", kdesu. $KDE_FULL_SESSION
-# however guarantees that the application is launched in the same environment
-# like the KDE session and that e.g. KDE utilities/libraries are available.
-# KDE_FULL_SESSION property is also only available since KDE 3.5.5.
-# The matching tests are:
-#   For $KDE_FULL_SESSION:
-#     if test -n "$KDE_FULL_SESSION"; then ... whatever
-#   For KDE_FULL_SESSION property:
-#     xprop -root | grep "^KDE_FULL_SESSION" >/dev/null 2>/dev/null
-#     if test $? -eq 0; then ... whatever
-#
-# Additionally there is (since KDE 3.5.7) $KDE_SESSION_UID with the uid
-# of the user running the KDE session. It should be rarely needed (e.g.
-# after sudo to prevent desktop-wide functionality in the new user's kded).
-#
-# Since KDE4 there is also KDE_SESSION_VERSION, containing the major version number.
-# Note that this didn't exist in KDE3, which can be detected by its absense and
-# the presence of KDE_FULL_SESSION.
-#
-KDE_FULL_SESSION=true
-export KDE_FULL_SESSION
-xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true
-
-KDE_SESSION_VERSION=5
-export KDE_SESSION_VERSION
-xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5
-
-KDE_SESSION_UID=`id -ru`
-export KDE_SESSION_UID
-
-XDG_CURRENT_DESKTOP=KDE
-export XDG_CURRENT_DESKTOP
-
-# At this point all the environment is ready, let's send it to kwalletd if running
-if test -n "$PAM_KWALLET_LOGIN" ; then
-    env | socat STDIN UNIX-CONNECT:$PAM_KWALLET_LOGIN
-fi
-# ...and also to kwalletd5
-if test -n "$PAM_KWALLET5_LOGIN" ; then
-    env | socat STDIN UNIX-CONNECT:$PAM_KWALLET5_LOGIN
-fi
-
-# At this point all environment variables are set, let's send it to the DBus session server to update the activation environment
-ksyncdbusenv
-if test $? -ne 0; then
-  # Startup error
-  echo 'startkde: Could not sync environment to dbus.'  1>&2
-  test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
-  xmessage -geometry 500x100 "Could not sync environment to dbus."
-  exit 1
-fi
-
-# We set LD_BIND_NOW to increase the efficiency of kdeinit.
-# kdeinit unsets this variable before loading applications.
-LD_BIND_NOW=true start_kdeinit_wrapper --kded +kcminit_startup
-if test $? -ne 0; then
-  # Startup error
-  echo 'startkde: Could not start kdeinit5. Check your installation.'  1>&2
-  test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
-  xmessage -geometry 500x100 "Could not start kdeinit5. Check your installation."
-  exit 1
-fi
-
-# (NixOS) Run kbuildsycoca5 before starting the user session because things
-# may be missing or moved if they have run nixos-rebuild and it may not be
-# possible for them to start Konsole to run it manually!
-kbuildsycoca5
-
-# finally, give the session control to the session manager
-# see kdebase/ksmserver for the description of the rest of the startup sequence
-# if the KDEWM environment variable has been set, then it will be used as KDE's
-# window manager instead of kwin.
-# if KDEWM is not set, ksmserver will ensure kwin is started.
-# kwrapper5 is used to reduce startup time and memory usage
-# kwrapper5 does not return useful error codes such as the exit code of ksmserver.
-# We only check for 255 which means that the ksmserver process could not be
-# started, any problems thereafter, e.g. ksmserver failing to initialize,
-# will remain undetected.
-test -n "$KDEWM" && KDEWM="--windowmanager $KDEWM"
-# If the session should be locked from the start (locked autologin),
-# lock now and do the rest of the KDE startup underneath the locker.
-KSMSERVEROPTIONS=""
-test -n "$dl" && KSMSERVEROPTIONS=" --lockscreen"
-kwrapper5 ksmserver $KDEWM $KSMSERVEROPTIONS
-if test $? -eq 255; then
-  # Startup error
-  echo 'startkde: Could not start ksmserver. Check your installation.'  1>&2
-  test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
-  xmessage -geometry 500x100 "Could not start ksmserver. Check your installation."
-fi
-
-wait_drkonqi=$(kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true)
-
-if test x"$wait_drkonqi"x = x"true"x ; then
-    # wait for remaining drkonqi instances with timeout (in seconds)
-    wait_drkonqi_timeout=$(kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900)
-    wait_drkonqi_counter=0
-    while qdbus | grep "^[^w]*org.kde.drkonqi" > /dev/null ; do
-        sleep 5
-        wait_drkonqi_counter=$((wait_drkonqi_counter+5))
-        if test "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ; then
-            # ask remaining drkonqis to die in a graceful way
-            qdbus | grep 'org.kde.drkonqi-' | while read address ; do
-                qdbus "$address" "/MainApplication" "quit"
-            done
-            break
-        fi
-    done
-fi
-
-echo 'startkde: Shutting down...'  1>&2
-# just in case
-test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
-
-# Clean up
-kdeinit5_shutdown
-
-unset KDE_FULL_SESSION
-xprop -root -remove KDE_FULL_SESSION
-unset KDE_SESSION_VERSION
-xprop -root -remove KDE_SESSION_VERSION
-unset KDE_SESSION_UID
-
-echo 'startkde: Done.'  1>&2
diff --git a/pkgs/desktops/kde-5/plasma-5.5/systemsettings.nix b/pkgs/desktops/kde-5/plasma-5.5/systemsettings.nix
deleted file mode 100644
index a921e153dbc2..000000000000
--- a/pkgs/desktops/kde-5/plasma-5.5/systemsettings.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ plasmaPackage, extra-cmake-modules, kdoctools, kitemviews
-, kcmutils, ki18n, kio, kservice, kiconthemes, kwindowsystem
-, kxmlgui, kdbusaddons, kconfig, khtml, makeQtWrapper
-}:
-
-plasmaPackage {
-  name = "systemsettings";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-    makeQtWrapper
-  ];
-  buildInputs = [
-    kitemviews kcmutils kservice kiconthemes kxmlgui kdbusaddons
-    kconfig
-  ];
-  propagatedBuildInputs = [ khtml ki18n kio kwindowsystem ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/systemsettings5"
-  '';
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1c4472ae3c91..ff6c926dfadf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15574,22 +15574,6 @@ in
   };
 
   kde5 =
-    let
-      frameworks = import ../desktops/kde-5/frameworks-5.19 { inherit pkgs; };
-      plasma = import ../desktops/kde-5/plasma-5.5 { inherit pkgs; };
-      applications = import ../desktops/kde-5/applications-15.12 { inherit pkgs; };
-      merged = self:
-        { plasma = plasma self;
-          frameworks = frameworks self;
-          applications = applications self; }
-        // frameworks self
-        // plasma self
-        // applications self
-        // kde5PackagesFun self;
-    in
-      recurseIntoAttrs (lib.makeScope qt55.newScope merged);
-
-  kde5_latest =
     let
       frameworks = import ../desktops/kde-5/frameworks-5.21 { inherit pkgs; };
       plasma = import ../desktops/kde-5/plasma-5.6 { inherit pkgs; };

From 6a64edfa0e38b599ee15f7582d3dbe62b2b884af Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 24 Apr 2016 07:39:30 -0500
Subject: [PATCH 059/287] gstreamer-1.0: multiple outputs

---
 pkgs/development/libraries/gstreamer/bad/default.nix       | 2 ++
 pkgs/development/libraries/gstreamer/base/default.nix      | 4 +++-
 pkgs/development/libraries/gstreamer/core/default.nix      | 7 +++++++
 pkgs/development/libraries/gstreamer/ges/default.nix       | 2 ++
 pkgs/development/libraries/gstreamer/gnonlin/default.nix   | 2 ++
 pkgs/development/libraries/gstreamer/good/default.nix      | 7 +++++++
 .../libraries/gstreamer/gstreamermm/default.nix            | 6 ++++--
 pkgs/development/libraries/gstreamer/libav/default.nix     | 2 ++
 pkgs/development/libraries/gstreamer/python/default.nix    | 2 ++
 .../libraries/gstreamer/qt-gstreamer/default.nix           | 2 ++
 pkgs/development/libraries/gstreamer/ugly/default.nix      | 2 ++
 pkgs/development/libraries/gstreamer/vaapi/default.nix     | 2 ++
 pkgs/development/libraries/gstreamer/validate/default.nix  | 2 ++
 13 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix
index add3026275f6..c47de95c2ad0 100644
--- a/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -34,6 +34,8 @@ stdenv.mkDerivation rec {
     sha256 = "03m99igngm37653353n5d724bcqw7p6hw6xjw0i2824523fpcqqi";
   };
 
+  outputs = [ "dev" "out" ];
+
   nativeBuildInputs = [ pkgconfig python ];
 
   buildInputs = [
diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix
index b2fff30197c2..176eb404f004 100644
--- a/pkgs/development/libraries/gstreamer/base/default.nix
+++ b/pkgs/development/libraries/gstreamer/base/default.nix
@@ -18,6 +18,8 @@ stdenv.mkDerivation rec {
     sha256 = "08hmg7fp519wim1fm04r7f2q2020ssdninawqsbrqjsvs70srh5b";
   };
 
+  outputs = [ "dev" "out" ];
+
   nativeBuildInputs = [
     pkgconfig python gobjectIntrospection
   ];
@@ -31,7 +33,7 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ gstreamer ];
 
-  configureFlags = if stdenv.isDarwin then [ 
+  configureFlags = if stdenv.isDarwin then [
     # Does not currently build on Darwin
     "--disable-libvisual"
     # Undefined symbols _cdda_identify and _cdda_identify_scsi in cdparanoia
diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix
index 40caf4093f05..162f407dd59e 100644
--- a/pkgs/development/libraries/gstreamer/core/default.nix
+++ b/pkgs/development/libraries/gstreamer/core/default.nix
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
     sha256 = "1p5y9bbrhywng0prmpxv29p6jsz6vd039d49bnc98p9b45532yll";
   };
 
+  outputs = [ "dev" "out" ];
+
   nativeBuildInputs = [
     pkgconfig perl bison flex python gobjectIntrospection makeWrapper
   ];
@@ -29,5 +31,10 @@ stdenv.mkDerivation rec {
     done
   '';
 
+  preFixup = ''
+    moveToOutput "bin" "$dev"
+    moveToOutput "share/bash-completion" "$dev"
+  '';
+
   setupHook = ./setup-hook.sh;
 }
diff --git a/pkgs/development/libraries/gstreamer/ges/default.nix b/pkgs/development/libraries/gstreamer/ges/default.nix
index e47ecfa01aa3..0b48d87b90a9 100644
--- a/pkgs/development/libraries/gstreamer/ges/default.nix
+++ b/pkgs/development/libraries/gstreamer/ges/default.nix
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
     sha256 = "1gisdfa91kq89bsmbvb47alaxh8lpqmr6f3dzlwmf389nkandw2h";
   };
 
+  outputs = [ "dev" "out" ];
+
   nativeBuildInputs = [ pkgconfig python gobjectIntrospection flex perl ];
 
   propagatedBuildInputs = [ gnonlin libxml2 ];
diff --git a/pkgs/development/libraries/gstreamer/gnonlin/default.nix b/pkgs/development/libraries/gstreamer/gnonlin/default.nix
index 9d43f3ac23c3..db29413476f6 100644
--- a/pkgs/development/libraries/gstreamer/gnonlin/default.nix
+++ b/pkgs/development/libraries/gstreamer/gnonlin/default.nix
@@ -22,6 +22,8 @@ stdenv.mkDerivation rec {
     sha256 = "0zv60rq2h736a6fivd3a3wp59dj1jar7b2vwzykahvl168b7wrid";
   };
 
+  outputs = [ "dev" "out" ];
+
   nativeBuildInputs = [ pkgconfig ];
 
   propagatedBuildInputs = [ gst-plugins-base ];
diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix
index 54175fb83fbe..d14a99ce56bf 100644
--- a/pkgs/development/libraries/gstreamer/good/default.nix
+++ b/pkgs/development/libraries/gstreamer/good/default.nix
@@ -29,6 +29,8 @@ stdenv.mkDerivation rec {
     sha256 = "0kczdvqxvl8kxiy2d7czv16jp73hv9k3nykh47ckihnv8x6i6362";
   };
 
+  outputs = [ "dev" "out" ];
+
   nativeBuildInputs = [ pkgconfig python ];
 
   buildInputs = [
@@ -40,5 +42,10 @@ stdenv.mkDerivation rec {
   ++ libintlOrEmpty
   ++ optionals stdenv.isLinux [ libv4l libpulseaudio libavc1394 libiec61883 ];
 
+  preFixup = ''
+    mkdir -p "$dev/lib/gstreamer-1.0"
+    mv "$out/lib/gstreamer-1.0/"*.la "$dev/lib/gstreamer-1.0"
+  '';
+
   LDFLAGS = optionalString stdenv.isDarwin "-lintl";
 }
diff --git a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix
index 692310be0bad..9b7db6d47324 100644
--- a/pkgs/development/libraries/gstreamer/gstreamermm/default.nix
+++ b/pkgs/development/libraries/gstreamer/gstreamermm/default.nix
@@ -11,13 +11,15 @@ stdenv.mkDerivation rec {
     url    = "mirror://gnome/sources/gstreamermm/${ver_maj}/${name}.tar.xz";
     sha256 = "0bj6and9b26d32bq90l8nx5wqh2ikkh8dm7qwxyxfdvmrzhixhgi";
   };
- 
+
+  outputs = [ "dev" "out" ];
+
   nativeBuildInputs = [ pkgconfig file ];
 
   propagatedBuildInputs = [ glibmm gst_all_1.gst-plugins-base ];
 
   enableParallelBuilding = true;
- 
+
   meta = with stdenv.lib; {
     description = "C++ interface for GStreamer";
     homepage = http://gstreamer.freedesktop.org/bindings/cplusplus.html;
diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix
index e4daa642ba06..ad3bdb81858e 100644
--- a/pkgs/development/libraries/gstreamer/libav/default.nix
+++ b/pkgs/development/libraries/gstreamer/libav/default.nix
@@ -22,6 +22,8 @@ stdenv.mkDerivation rec {
     sha256 = "0719njp8aarhvn038pijq6dmsnli0zlg146hyfs3rsdffs4f472s";
   };
 
+  outputs = [ "dev" "out" ];
+
   configureFlags = stdenv.lib.optionalString withSystemLibav
     "--with-system-libav";
 
diff --git a/pkgs/development/libraries/gstreamer/python/default.nix b/pkgs/development/libraries/gstreamer/python/default.nix
index 5320fdfaced1..6d018c36f569 100644
--- a/pkgs/development/libraries/gstreamer/python/default.nix
+++ b/pkgs/development/libraries/gstreamer/python/default.nix
@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
 
   patches = [ ./different-path-with-pygobject.patch ];
 
+  outputs = [ "dev" "out" ];
+
   nativeBuildInputs = [ pkgconfig python ];
 
   # XXX: in the Libs.private field of python3.pc
diff --git a/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix b/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix
index 3bd840dcd7ee..675fdf322e87 100644
--- a/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix
+++ b/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
     })
   ];
 
+  outputs = [ "dev" "out" ];
+
   buildInputs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base glib qt4 ];
   propagatedBuildInputs = [ boost ];
   nativeBuildInputs = [ cmake automoc4 flex bison pkgconfig ];
diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix
index 8f8437ad4ac3..3b17c548ba21 100644
--- a/pkgs/development/libraries/gstreamer/ugly/default.nix
+++ b/pkgs/development/libraries/gstreamer/ugly/default.nix
@@ -25,6 +25,8 @@ stdenv.mkDerivation rec {
     sha256 = "137b6kqykh5nwbmiv28nn1pc1d2x2rb2xxg382pc9pa9gpxpyrak";
   };
 
+  outputs = [ "dev" "out" ];
+
   nativeBuildInputs = [ pkgconfig python ];
 
   buildInputs = [
diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix
index a9aa3d73fa2e..18394193706a 100644
--- a/pkgs/development/libraries/gstreamer/vaapi/default.nix
+++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix
@@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
     sha256 = "14jal2g5mf8r59w8420ixl3kg50vcmy56446ncwd0xrizd6yms5b";
   };
 
+  outputs = [ "dev" "out" ];
+
   nativeBuildInputs = with stdenv.lib; [ pkgconfig bzip2 ];
 
   buildInputs = [
diff --git a/pkgs/development/libraries/gstreamer/validate/default.nix b/pkgs/development/libraries/gstreamer/validate/default.nix
index 1c1236216648..02ce69af907a 100644
--- a/pkgs/development/libraries/gstreamer/validate/default.nix
+++ b/pkgs/development/libraries/gstreamer/validate/default.nix
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
     sha256 = "1pcy9pfffyk6xiw6aq38kbv7k24x2rljdy8fabjfy1abpmvvfrkn";
   };
 
+  outputs = [ "dev" "out" ];
+
   nativeBuildInputs = [
     pkgconfig gobjectIntrospection
   ];

From 160bf21b3a97c1d7fb4281c4d55efad06149ae2f Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 24 Apr 2016 07:58:04 -0500
Subject: [PATCH 060/287] librsvg: multiple outputs

---
 pkgs/development/libraries/librsvg/default.nix | 2 ++
 pkgs/tools/inputmethods/ibus/wrapper.nix       | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix
index 0768a21bf543..6147e847b33d 100644
--- a/pkgs/development/libraries/librsvg/default.nix
+++ b/pkgs/development/libraries/librsvg/default.nix
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
 
   NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;
 
+  outputs = [ "dev" "out" ];
+
   buildInputs = [ libxml2 libgsf bzip2 libcroco pango libintlOrEmpty ]
     ++ stdenv.lib.optional enableIntrospection [ gobjectIntrospection ];
 
diff --git a/pkgs/tools/inputmethods/ibus/wrapper.nix b/pkgs/tools/inputmethods/ibus/wrapper.nix
index 632f46f81e94..690043791b20 100644
--- a/pkgs/tools/inputmethods/ibus/wrapper.nix
+++ b/pkgs/tools/inputmethods/ibus/wrapper.nix
@@ -23,7 +23,7 @@ let
 
     for prog in ibus ibus-daemon ibus-setup; do
         wrapProgram "$out/bin/$prog" \
-          --prefix GDK_PIXBUF_MODULE_FILE : ${librsvg}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \
+          --prefix GDK_PIXBUF_MODULE_FILE : ${librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \
           --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH:$out/lib/girepository-1.0" \
           --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" \
           --set IBUS_COMPONENT_PATH "$out/share/ibus/component/" \

From f11c043fa2bded6ec2588a5be8cf49434891081c Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 24 Apr 2016 12:20:28 -0500
Subject: [PATCH 061/287] glibmm: multiple outputs

---
 pkgs/development/libraries/glibmm/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix
index 8417179dde19..6d15faf95490 100644
--- a/pkgs/development/libraries/glibmm/default.nix
+++ b/pkgs/development/libraries/glibmm/default.nix
@@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
     sha256 = "c78654addeb27a1213bedd7cd21904a45bbb98a5ba2f2f0de2b2f1a5682d86cf";
   };
 
+  outputs = [ "dev" "out" ];
+
   nativeBuildInputs = [ pkgconfig gnum4 ];
   propagatedBuildInputs = [ glib libsigcxx ];
 

From e0a2224f1e2b06dd118906dfce564b6130eb2a95 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 24 Apr 2016 12:33:54 -0500
Subject: [PATCH 062/287] v4l-utils: multiple outputs

---
 pkgs/os-specific/linux/v4l-utils/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix
index 17b21f92c171..476f3ffcac6c 100644
--- a/pkgs/os-specific/linux/v4l-utils/default.nix
+++ b/pkgs/os-specific/linux/v4l-utils/default.nix
@@ -23,6 +23,8 @@ stdenv.mkDerivation rec {
     sha256 = "0k46z5gqjzg702m2vs4sv6sxynq1sj14m0pgwvl2gkgg3dfbyjhn";
   };
 
+  outputs = [ "dev" "out" ];
+
   configureFlags = [
     "--enable-libv4l"
   ] ++ (if (alsaLib != null && libX11 != null && (qt4 != null || qt5 != null)) then [
@@ -36,15 +38,15 @@ stdenv.mkDerivation rec {
     "--disable-qv4l2"
   ]);
 
-  postInstall = ''
+  postFixup = ''
     # Create symlink for V4l1 compatibility
-    ln -s $out/include/libv4l1-videodev.h $out/include/videodev.h
+    ln -s "$dev/include/libv4l1-videodev.h" "$dev/include/videodev.h"
   '';
 
   nativeBuildInputs = [ pkgconfig ];
 
   buildInputs = [ alsaLib libX11 qt4 qt5 ];
-  
+
   propagatedBuildInputs = [ libjpeg ];
 
   meta = with stdenv.lib; {

From 70936ce3f8691f868f9bac0eb3668f9f4af386af Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 24 Apr 2016 19:17:42 -0500
Subject: [PATCH 063/287] bluez5: multiple outputs

---
 pkgs/os-specific/linux/bluez/bluez5.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/os-specific/linux/bluez/bluez5.nix b/pkgs/os-specific/linux/bluez/bluez5.nix
index 9750a2a76499..a7e36d21dd48 100644
--- a/pkgs/os-specific/linux/bluez/bluez5.nix
+++ b/pkgs/os-specific/linux/bluez/bluez5.nix
@@ -6,7 +6,7 @@ assert stdenv.isLinux;
 
 stdenv.mkDerivation rec {
   name = "bluez-5.37";
-   
+
   src = fetchurl {
     url = "mirror://kernel/linux/bluetooth/${name}.tar.xz";
     sha256 = "c14ba9ddcb0055522073477b8fd8bf1ddf5d219e75fdfd4699b7e0ce5350d6b0";
@@ -20,11 +20,13 @@ stdenv.mkDerivation rec {
       readline libsndfile udev libical
       # Disables GStreamer; not clear what it gains us other than a
       # zillion extra dependencies.
-      # gstreamer gst_plugins_base 
+      # gstreamer gst_plugins_base
     ];
 
+  outputs = [ "dev" "out" "test" ];
+
   patches = [ ./bluez-5.37-obexd_without_systemd-1.patch ];
-    
+
   preConfigure = ''
       substituteInPlace tools/hid2hci.rules --replace /sbin/udevadm ${systemd}/bin/udevadm
       substituteInPlace tools/hid2hci.rules --replace "hid2hci " "$out/lib/udev/hid2hci "
@@ -51,9 +53,9 @@ stdenv.mkDerivation rec {
   # FIXME: Move these into a separate package to prevent Bluez from
   # depending on Python etc.
   postInstall = ''
-    mkdir $out/test
-    cp -a test $out
-    pushd $out/test
+    mkdir -p $test/test
+    cp -a test $test
+    pushd $test/test
     for a in \
             simple-agent \
             test-adapter \
@@ -65,7 +67,7 @@ stdenv.mkDerivation rec {
       ln -s ../test/$a $out/bin/bluez-$a
     done
     popd
-    wrapPythonProgramsIn $out/test "$out/test $pythonPath"
+    wrapPythonProgramsIn $test/test "$test/test $pythonPath"
 
     # for bluez4 compatibility for NixOS
     mkdir $out/sbin

From c25907d072742e9720b713d7116793e0d8a623c5 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 24 Apr 2016 19:17:55 -0500
Subject: [PATCH 064/287] network-manager: multiple outputs

---
 nixos/modules/services/networking/networkmanager.nix | 2 +-
 pkgs/tools/networking/network-manager/default.nix    | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index 9912ad9ae3fc..d0b86b4cbdba 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -114,7 +114,7 @@ in {
       # Ugly hack for using the correct gnome3 packageSet
       basePackages = mkOption {
         type = types.attrsOf types.package;
-        default = { inherit networkmanager modemmanager wpa_supplicant
+        default = { inherit networkmanager.out modemmanager wpa_supplicant
                             networkmanager_openvpn networkmanager_vpnc
                             networkmanager_openconnect
                             networkmanager_pptp networkmanager_l2tp; };
diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index afdca314ae64..ecc8f1908de0 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
     sha256 = "17jan0g5jzp8mrpklyacwdgnnw016m1c5pc4az5im6qhc260yirs";
   };
 
+  outputs = [ "dev" "out" ];
+
   preConfigure = ''
     substituteInPlace configure --replace /usr/bin/uname ${coreutils}/bin/uname
     substituteInPlace configure --replace /usr/bin/file ${file}/bin/file

From 668f93c719773a66448a757de80bb166b38c729c Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 25 Apr 2016 06:51:01 -0500
Subject: [PATCH 065/287] xcb-util-cursor: multiple outputs

---
 pkgs/development/libraries/xcb-util-cursor/HEAD.nix | 6 ++++--
 pkgs/servers/x11/xorg/overrides.nix                 | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix
index cf14490c5147..8bd7a90ad5a6 100644
--- a/pkgs/development/libraries/xcb-util-cursor/HEAD.nix
+++ b/pkgs/development/libraries/xcb-util-cursor/HEAD.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, bashInteractive, autoconf, automake, libtool, pkgconfig
+{ stdenv, fetchgit, autoconf, automake, libtool, pkgconfig
 , git, xorg, gnum4, libxcb, gperf }:
 
 stdenv.mkDerivation rec {
@@ -18,6 +18,8 @@ stdenv.mkDerivation rec {
     platforms   = platforms.linux ++ platforms.darwin;
   };
 
+  outputs = [ "dev" "out" ];
+
   buildInputs = [
     autoconf
     automake
@@ -34,6 +36,6 @@ stdenv.mkDerivation rec {
   configurePhase = ''
     sed -i '15 i\
       LT_INIT' configure.ac
-    ${bashInteractive}/bin/bash autogen.sh --prefix="$out"
+    ${stdenv.shell} autogen.sh --prefix="$out"
   '';
 }
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index a0405ec077f3..a19f479bf2ea 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -265,6 +265,7 @@ in
   };
 
   xcbutilcursor = attrs: attrs // {
+    outputs = [ "dev" "out" ];
     meta.maintainers = [ stdenv.lib.maintainers.lovek323 ];
   };
 

From b06f9aa015521bb41e516e01a60d427a0ab7e178 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 25 Apr 2016 06:51:15 -0500
Subject: [PATCH 066/287] openjpeg: multiple outputs

---
 pkgs/development/libraries/openjpeg/generic.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/openjpeg/generic.nix b/pkgs/development/libraries/openjpeg/generic.nix
index 1b4b4af7f41c..b01ff527d8cd 100644
--- a/pkgs/development/libraries/openjpeg/generic.nix
+++ b/pkgs/development/libraries/openjpeg/generic.nix
@@ -25,12 +25,14 @@ in
 
 stdenv.mkDerivation rec {
   name = "openjpeg-${version}";
-  
+
   src = fetchurl {
     url = "mirror://sourceforge/openjpeg.mirror/${version}/openjpeg-${version}.tar.gz";
     inherit sha256;
   };
 
+  outputs = [ "dev" "out" ];
+
   cmakeFlags = [
     "-DCMAKE_INSTALL_NAME_DIR=\${CMAKE_INSTALL_PREFIX}/lib"
     "-DBUILD_SHARED_LIBS=ON"

From 2a16c9d52bf3aa7e0206578faf6153e42d5d671a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 25 Apr 2016 06:51:29 -0500
Subject: [PATCH 067/287] libzip: multiple outputs

---
 pkgs/development/libraries/libzip/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix
index 4af9278c7b1b..fff155ca81e7 100644
--- a/pkgs/development/libraries/libzip/default.nix
+++ b/pkgs/development/libraries/libzip/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "1mcqrz37vjrfr4gnss37z1m7xih9x9miq3mms78zf7wn7as1znw3";
   };
 
+  outputs = [ "dev" "out" ];
+
   # fix CVE-2015-2331 taken from Debian patch:
   # https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=12;filename=libzip-0.11.2-1.2-nmu.diff;att=1;bug=780756
   postPatch = ''
@@ -22,7 +24,7 @@ stdenv.mkDerivation rec {
   # At least mysqlWorkbench cannot find zipconf.h; I think also openoffice
   # had this same problem.  This links it somewhere that mysqlworkbench looks.
   postInstall = ''
-    ( cd $out/include ; ln -s ../lib/libzip/include/zipconf.h zipconf.h )
+    ( cd $dev/include ; ln -s ../lib/libzip/include/zipconf.h zipconf.h )
   '';
 
   meta = {

From 6651b53bddb288c6c6acb9e49ce966c455874047 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 25 Apr 2016 06:51:41 -0500
Subject: [PATCH 068/287] libinput: multiple outputs

---
 pkgs/development/libraries/libinput/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix
index 2c29482227a8..82dca85c0404 100644
--- a/pkgs/development/libraries/libinput/default.nix
+++ b/pkgs/development/libraries/libinput/default.nix
@@ -22,6 +22,8 @@ stdenv.mkDerivation rec {
     sha256 = "1wp937sn2dzqhrbl2bhapqb0pvybc80z8ynw7yfkm5ycl39skch9";
   };
 
+  outputs = [ "dev" "out" ];
+
   configureFlags = [
     (mkFlag documentationSupport "documentation")
     (mkFlag eventGUISupport "event-gui")

From fad200eb7ce68cdd958d1b39fb1a184aa88aa3eb Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 25 Apr 2016 06:51:53 -0500
Subject: [PATCH 069/287] exiv2: multiple outputs

---
 pkgs/development/libraries/exiv2/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix
index e1af46cc3ed0..af17c9ae0f0f 100644
--- a/pkgs/development/libraries/exiv2/default.nix
+++ b/pkgs/development/libraries/exiv2/default.nix
@@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
   };
   postPatch = "patchShebangs ./src/svn_version.sh";
 
+  outputs = [ "dev" "out" ];
+
   nativeBuildInputs = [ gettext ];
   propagatedBuildInputs = [ zlib expat ];
 

From 626e5bd4dd94b04f51638cc48ac85fc658c7cc3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 26 Apr 2016 10:40:39 +0200
Subject: [PATCH 070/287] python3: fix build after 5ff40dded, refactor

The path list was passed in a format not suitable for gcc command-line.
Also, let's utilize that we had `with stdenv.lib;`.
/cc @abbradar.
---
 .../interpreters/python/3.4/default.nix          | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/interpreters/python/3.4/default.nix b/pkgs/development/interpreters/python/3.4/default.nix
index 6a3ab25c5d40..517dfc3d8b27 100644
--- a/pkgs/development/interpreters/python/3.4/default.nix
+++ b/pkgs/development/interpreters/python/3.4/default.nix
@@ -35,16 +35,16 @@ stdenv.mkDerivation {
   pythonVersion = majorVersion;
   inherit majorVersion version;
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CF configd ];
+  buildInputs = optionals stdenv.isDarwin [ CF configd ];
 
   src = fetchurl {
     url = "http://www.python.org/ftp/python/${version}/Python-${fullVersion}.tar.xz";
     sha256 = "18kb5c29w04rj4gyz3jngm72sy8izfnbjlm6ajv6rv2m061d75x7";
   };
 
-  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
+  NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s";
 
-  prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
+  prePatch = optionalString stdenv.isDarwin ''
     substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"'
   '';
 
@@ -58,8 +58,8 @@ stdenv.mkDerivation {
      ''}
 
     configureFlagsArray=( --enable-shared --with-threads
-                          CPPFLAGS="${makeSearchPathOutput "dev" "include" buildInputs}"
-                          LDFLAGS="${makeLibraryPath buildInputs}"
+                          CPPFLAGS="${concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs)}"
+                          LDFLAGS="${concatStringsSep " " (map (p: "-L${getLib p}/lib") buildInputs)}"
                           LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}"
                         )
   '';
@@ -113,8 +113,8 @@ stdenv.mkDerivation {
       hierarchical packages; exception-based error handling; and very
       high level dynamic data types.
     '';
-    license = stdenv.lib.licenses.psfl;
-    platforms = with stdenv.lib.platforms; linux ++ darwin;
-    maintainers = with stdenv.lib.maintainers; [ simons chaoflow iElectric cstrahan ];
+    license = licenses.psfl;
+    platforms = with platforms; linux ++ darwin;
+    maintainers = with maintainers; [ simons chaoflow iElectric cstrahan ];
   };
 }

From 387915e99c5c90d8200ef3e86e9f42d8568dbf31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 26 Apr 2016 10:50:48 +0200
Subject: [PATCH 071/287] python3*: port the fix from parent commit

I really love such copied expressions...
but this case was easy compared to usual consequences
of file-copying in long-running branches.
---
 .../interpreters/python/3.2/default.nix          |  4 ++--
 .../interpreters/python/3.3/default.nix          |  4 ++--
 .../interpreters/python/3.5/default.nix          | 16 ++++++++--------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/interpreters/python/3.2/default.nix b/pkgs/development/interpreters/python/3.2/default.nix
index 91f962efcf4a..8a2d24d76f98 100644
--- a/pkgs/development/interpreters/python/3.2/default.nix
+++ b/pkgs/development/interpreters/python/3.2/default.nix
@@ -44,8 +44,8 @@ stdenv.mkDerivation {
     ${optionalString stdenv.isDarwin ''export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2"''}
 
     configureFlagsArray=( --enable-shared --with-threads --with-wide-unicode
-                          CPPFLAGS="${makeSearchPathOutput "dev" "include" buildInputs}"
-                          LDFLAGS="${makeLibraryPath buildInputs}"
+                          CPPFLAGS="${concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs)}"
+                          LDFLAGS="${concatStringsSep " " (map (p: "-L${getLib p}/lib") buildInputs)}"
                           LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}"
                         )
   '';
diff --git a/pkgs/development/interpreters/python/3.3/default.nix b/pkgs/development/interpreters/python/3.3/default.nix
index b9cb46562122..60d56597ea0f 100644
--- a/pkgs/development/interpreters/python/3.3/default.nix
+++ b/pkgs/development/interpreters/python/3.3/default.nix
@@ -46,8 +46,8 @@ stdenv.mkDerivation {
     ${optionalString stdenv.isDarwin ''export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2"''}
 
     configureFlagsArray=( --enable-shared --with-threads
-                          CPPFLAGS="${makeSearchPathOutput "dev" "include" buildInputs}"
-                          LDFLAGS="${makeLibraryPath buildInputs}"
+                          CPPFLAGS="${concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs)}"
+                          LDFLAGS="${concatStringsSep " " (map (p: "-L${getLib p}/lib") buildInputs)}"
                           LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}"
                         )
   '';
diff --git a/pkgs/development/interpreters/python/3.5/default.nix b/pkgs/development/interpreters/python/3.5/default.nix
index 504c85ac38d2..15e02d1ab3ed 100644
--- a/pkgs/development/interpreters/python/3.5/default.nix
+++ b/pkgs/development/interpreters/python/3.5/default.nix
@@ -35,16 +35,16 @@ stdenv.mkDerivation {
   pythonVersion = majorVersion;
   inherit majorVersion version;
 
-  buildInputs = stdenv.lib.optionals stdenv.isDarwin [ CF configd ];
+  buildInputs = optionals stdenv.isDarwin [ CF configd ];
 
   src = fetchurl {
     url = "http://www.python.org/ftp/python/${version}/Python-${fullVersion}.tar.xz";
     sha256 = "1j95yx32ggqx8jf13h3c8qfp34ixpyg8ipqcdjmn143d6q67rmf6";
   };
 
-  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s";
+  NIX_LDFLAGS = optionalString stdenv.isLinux "-lgcc_s";
 
-  prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
+  prePatch = optionalString stdenv.isDarwin ''
     substituteInPlace configure --replace '`/usr/bin/arch`' '"i386"'
   '';
 
@@ -58,8 +58,8 @@ stdenv.mkDerivation {
      ''}
 
     configureFlagsArray=( --enable-shared --with-threads
-                          CPPFLAGS="${makeSearchPathOutput "dev" "include" buildInputs}"
-                          LDFLAGS="${makeLibraryPath buildInputs}"
+                          CPPFLAGS="${concatStringsSep " " (map (p: "-I${getDev p}/include") buildInputs)}"
+                          LDFLAGS="${concatStringsSep " " (map (p: "-L${getLib p}/lib") buildInputs)}"
                           LIBS="${optionalString (!stdenv.isDarwin) "-lcrypt"} ${optionalString (ncurses != null) "-lncurses"}"
                         )
   '';
@@ -113,8 +113,8 @@ stdenv.mkDerivation {
       hierarchical packages; exception-based error handling; and very
       high level dynamic data types.
     '';
-    license = stdenv.lib.licenses.psfl;
-    platforms = with stdenv.lib.platforms; linux ++ darwin;
-    maintainers = with stdenv.lib.maintainers; [ simons chaoflow iElectric cstrahan ];
+    license = licenses.psfl;
+    platforms = with platforms; linux ++ darwin;
+    maintainers = with maintainers; [ simons chaoflow iElectric cstrahan ];
   };
 }

From 2c32607650ddb6e6adbc2b22d785139f065eb18c Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Wed, 27 Apr 2016 03:46:36 +0300
Subject: [PATCH 072/287] libzip: 0.11.2 -> 1.1.2

---
 pkgs/development/libraries/libzip/default.nix | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix
index fff155ca81e7..2afc0e47ca32 100644
--- a/pkgs/development/libraries/libzip/default.nix
+++ b/pkgs/development/libraries/libzip/default.nix
@@ -1,26 +1,23 @@
-{ stdenv, fetchurl, zlib }:
+{ stdenv, fetchurl, perl, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "libzip-0.11.2";
+  name = "libzip-${version}";
+  version = "1.1.2";
 
   src = fetchurl {
     url = "http://www.nih.at/libzip/${name}.tar.gz";
-    sha256 = "1mcqrz37vjrfr4gnss37z1m7xih9x9miq3mms78zf7wn7as1znw3";
+    sha256 = "08b26qbfxq6z5xf36y1d8insm5valv83dhj933iag6man04prb2r";
   };
 
   outputs = [ "dev" "out" ];
 
-  # fix CVE-2015-2331 taken from Debian patch:
-  # https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=12;filename=libzip-0.11.2-1.2-nmu.diff;att=1;bug=780756
-  postPatch = ''
-    substituteInPlace lib/zip_dirent.c --replace \
-      'else if ((cd->entry=(struct zip_entry *)' \
-      'else if (nentry > ((size_t)-1)/sizeof(*(cd->entry)) || (cd->entry=(struct zip_entry *)'
-    cat lib/zip_dirent.c
-  '';
-
+  nativeBuildInputs = [ perl ];
   propagatedBuildInputs = [ zlib ];
 
+  preInstall = ''
+    patchShebangs man/handle_links
+  '';
+
   # At least mysqlWorkbench cannot find zipconf.h; I think also openoffice
   # had this same problem.  This links it somewhere that mysqlworkbench looks.
   postInstall = ''

From 519dd711fe33cfe73e450b5f62925e8fab955bb3 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Wed, 27 Apr 2016 03:48:59 +0300
Subject: [PATCH 073/287] libzip: Move directory containing zipconf.h to $dev

http://hydra.nixos.org/build/34979863/nixlog/1/raw
---
 pkgs/development/libraries/libzip/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix
index 2afc0e47ca32..2b962425e425 100644
--- a/pkgs/development/libraries/libzip/default.nix
+++ b/pkgs/development/libraries/libzip/default.nix
@@ -21,6 +21,8 @@ stdenv.mkDerivation rec {
   # At least mysqlWorkbench cannot find zipconf.h; I think also openoffice
   # had this same problem.  This links it somewhere that mysqlworkbench looks.
   postInstall = ''
+    mkdir -p $dev/lib
+    mv $out/lib/libzip $dev/lib/libzip
     ( cd $dev/include ; ln -s ../lib/libzip/include/zipconf.h zipconf.h )
   '';
 

From 25b55e740933b4f8c76a4535e50f4afbfbc7a931 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Wed, 27 Apr 2016 04:10:42 +0300
Subject: [PATCH 074/287] gegl: Add platforms

---
 pkgs/development/libraries/gegl/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix
index 38432f68273a..70b731f56dd1 100644
--- a/pkgs/development/libraries/gegl/default.nix
+++ b/pkgs/development/libraries/gegl/default.nix
@@ -29,5 +29,6 @@ stdenv.mkDerivation rec {
     description = "Graph-based image processing framework";
     homepage = http://www.gegl.org;
     license = stdenv.lib.licenses.gpl3;
+    platforms = stdenv.lib.platforms.unix;
   };
 }

From 15f68398ef2195859f26da570f44d48fb17f9167 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Wed, 27 Apr 2016 04:10:54 +0300
Subject: [PATCH 075/287] libzip: Add platforms

---
 pkgs/development/libraries/libzip/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/libzip/default.nix b/pkgs/development/libraries/libzip/default.nix
index 2b962425e425..714745c432eb 100644
--- a/pkgs/development/libraries/libzip/default.nix
+++ b/pkgs/development/libraries/libzip/default.nix
@@ -29,5 +29,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.nih.at/libzip;
     description = "A C library for reading, creating and modifying zip archives";
+    platforms = stdenv.lib.platforms.unix;
   };
 }

From 7f63790f258efd7793a348938013c5e8984a5317 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Wed, 27 Apr 2016 04:19:16 +0300
Subject: [PATCH 076/287] fuse-zip: Add dashed variant (and one with underscore
 for compat)

---
 pkgs/top-level/aliases.nix      | 1 +
 pkgs/top-level/all-packages.nix | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index cd60573f99e9..723411f3f55d 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -43,6 +43,7 @@ doNotDisplayTwice rec {
   firefox-wrapper = firefox;          # 2016-01
   firefoxWrapper = firefox;           # 2015-09
   fuse_exfat = exfat;                   # 2015-09-11
+  fuse_zip = fuse-zip; # added 2016-04-27
   gettextWithExpat = gettext; # 2016-02-19
   grantlee5 = qt5.grantlee;  # added 2015-12-19
   gupnptools = gupnp-tools;  # added 2015-12-19
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ff6c926dfadf..0a175b530e07 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1574,7 +1574,7 @@ in
 
   fuse-7z-ng = callPackage ../tools/filesystems/fuse-7z-ng { };
 
-  fuse_zip = callPackage ../tools/filesystems/fuse-zip { };
+  fuse-zip = callPackage ../tools/filesystems/fuse-zip { };
 
   exfat = callPackage ../tools/filesystems/exfat { };
 

From 584d884bd7010fb6a990978dec03a4ffe22d2fba Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Tue, 26 Apr 2016 21:39:57 +0300
Subject: [PATCH 077/287] gstreamer: Fix multiple outputs split
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Explicitly moving the files breaks them, because the wrappers
  reference the files by absolute path.  Also this automatically
  moves the manpages to $dev as well.
- Need to explicitly set --exec-prefix since the pkgconfig file has
  `toolsdir=${exec_prefix}/bin`, breaking totem:

http://hydra.nixos.org/build/34980617/nixlog/1/raw

````
checking for BACKEND_TEST... yes
checking GStreamer 1.0 inspection tool... no
configure: error:
		Cannot find required GStreamer-1.0 tool 'gst-inspect-1.0'.
		It should be part of gstreamer-1_0-utils. Please install it.

builder for ‘/nix/store/npq2ihlsdniv4j3wbyparq9byjxqdi15-totem-3.18.1.drv’ failed with exit code 1
````

While at it, enable parallel build.
---
 pkgs/development/libraries/gstreamer/core/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix
index 162f407dd59e..bbd4bcde785b 100644
--- a/pkgs/development/libraries/gstreamer/core/default.nix
+++ b/pkgs/development/libraries/gstreamer/core/default.nix
@@ -18,6 +18,7 @@ stdenv.mkDerivation rec {
   };
 
   outputs = [ "dev" "out" ];
+  outputBin = "dev";
 
   nativeBuildInputs = [
     pkgconfig perl bison flex python gobjectIntrospection makeWrapper
@@ -25,6 +26,12 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ glib ];
 
+  enableParallelBuilding = true;
+
+  preConfigure = ''
+    configureFlagsArray+=("--exec-prefix=$dev")
+  '';
+
   postInstall = ''
     for prog in "$out/bin/"*; do
         wrapProgram "$prog" --prefix GST_PLUGIN_SYSTEM_PATH : "\$(unset _tmp; for profile in \$NIX_PROFILES; do _tmp="\$profile/lib/gstreamer-1.0''$\{_tmp:+:\}\$_tmp"; done; printf "\$_tmp")"
@@ -32,7 +39,6 @@ stdenv.mkDerivation rec {
   '';
 
   preFixup = ''
-    moveToOutput "bin" "$dev"
     moveToOutput "share/bash-completion" "$dev"
   '';
 

From 16bdef135089513223bf567a1ee843009eb132ca Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 27 Apr 2016 13:48:06 +0300
Subject: [PATCH 078/287] bluetooth service: fix w.r.t. multiple outputs

---
 nixos/modules/services/hardware/bluetooth.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/hardware/bluetooth.nix b/nixos/modules/services/hardware/bluetooth.nix
index fc95c4910bf7..2c271b328179 100644
--- a/nixos/modules/services/hardware/bluetooth.nix
+++ b/nixos/modules/services/hardware/bluetooth.nix
@@ -9,7 +9,7 @@ let
         serviceConfig = {
           Type = "dbus";
           BusName = "org.bluez";
-          ExecStart = "${bluez-bluetooth}/sbin/bluetoothd -n";
+          ExecStart = "${getBin bluez-bluetooth}/bin/bluetoothd -n";
         };
         wantedBy = [ "bluetooth.target" ];
     };
@@ -19,7 +19,7 @@ let
         serviceConfig = {
           Type = "dbus";
           BusName = "org.bluez";
-          ExecStart = "${bluez-bluetooth}/sbin/bluetoothd -n";
+          ExecStart = "${getBin bluez-bluetooth}/bin/bluetoothd -n";
           NotifyAccess="main";
           CapabilityBoundingSet="CAP_NET_ADMIN CAP_NET_BIND_SERVICE";
           LimitNPROC=1;
@@ -32,7 +32,7 @@ let
         serviceConfig = {
           Type = "dbus";
           BusName = "org.bluez.obex";
-          ExecStart = "${bluez-bluetooth}/sbin/obexd";
+          ExecStart = "${getBin bluez-bluetooth}/bin/obexd";
         };
     };
 

From 7ac1ef05fa162d8e3c35925034df72288df77c8b Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 27 Apr 2016 13:51:43 +0300
Subject: [PATCH 079/287] networkmanager service: fixup

---
 nixos/modules/services/networking/networkmanager.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index d0b86b4cbdba..b83b8b91c678 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -114,7 +114,7 @@ in {
       # Ugly hack for using the correct gnome3 packageSet
       basePackages = mkOption {
         type = types.attrsOf types.package;
-        default = { inherit networkmanager.out modemmanager wpa_supplicant
+        default = { inherit networkmanager modemmanager wpa_supplicant
                             networkmanager_openvpn networkmanager_vpnc
                             networkmanager_openconnect
                             networkmanager_pptp networkmanager_l2tp; };
@@ -187,7 +187,7 @@ in {
 
     boot.kernelModules = [ "ppp_mppe" ]; # Needed for most (all?) PPTP VPN connections.
 
-    environment.etc = with cfg.basePackages; [
+    environment.etc = with mapAttrs (name: getBin) cfg.basePackages; [
       { source = ipUpScript;
         target = "NetworkManager/dispatcher.d/01nixos-ip-up";
       }

From b465dc202f0ba6e5ce465c5dabca2b2a3560cad6 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Thu, 28 Apr 2016 00:41:28 +0300
Subject: [PATCH 080/287] boost: Kill unnecessary 'lib' output

This was split in somewhere pre-2014 without the current infra which
automates parts of this, in particular the output propagation.
---
 pkgs/applications/altcoins/bitcoin-classic.nix        |  2 +-
 pkgs/applications/altcoins/bitcoin-xt.nix             |  2 +-
 pkgs/applications/altcoins/bitcoin.nix                |  2 +-
 pkgs/applications/altcoins/dashpay.nix                |  2 +-
 pkgs/applications/altcoins/dogecoin.nix               |  2 +-
 pkgs/applications/altcoins/litecoin.nix               |  2 +-
 pkgs/applications/altcoins/memorycoin.nix             |  2 +-
 pkgs/applications/altcoins/primecoin.nix              |  2 +-
 pkgs/applications/graphics/synfigstudio/default.nix   |  2 +-
 .../networking/instant-messengers/ekiga/default.nix   |  2 +-
 .../networking/p2p/qbittorrent/default.nix            |  2 +-
 pkgs/applications/networking/p2p/twister/default.nix  |  2 +-
 pkgs/applications/office/libreoffice/default.nix      |  2 +-
 pkgs/applications/office/libreoffice/still.nix        |  2 +-
 .../version-management/gource/default.nix             |  2 +-
 pkgs/applications/video/aegisub/default.nix           |  2 +-
 pkgs/applications/video/mkvtoolnix/default.nix        |  2 +-
 pkgs/development/interpreters/pixie/default.nix       |  4 ++--
 pkgs/development/libraries/audio/lvtk/default.nix     |  2 +-
 pkgs/development/libraries/blitz/default.nix          |  4 ++--
 pkgs/development/libraries/boost/generic.nix          | 11 +++--------
 pkgs/development/libraries/folly/default.nix          |  2 +-
 .../libraries/libtorrent-rasterbar/generic.nix        |  2 +-
 pkgs/development/libraries/ndn-cxx/default.nix        |  2 +-
 pkgs/development/libraries/swiften/default.nix        |  2 +-
 pkgs/development/r-modules/default.nix                |  2 +-
 pkgs/tools/filesystems/ceph/generic.nix               |  2 +-
 pkgs/tools/filesystems/xtreemfs/default.nix           |  2 +-
 pkgs/tools/text/source-highlight/default.nix          |  2 +-
 29 files changed, 33 insertions(+), 38 deletions(-)

diff --git a/pkgs/applications/altcoins/bitcoin-classic.nix b/pkgs/applications/altcoins/bitcoin-classic.nix
index 62fe41979294..0c8753085029 100644
--- a/pkgs/applications/altcoins/bitcoin-classic.nix
+++ b/pkgs/applications/altcoins/bitcoin-classic.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
                   miniupnpc utillinux protobuf ]
                   ++ optionals withGui [ qt4 qrencode ];
 
-  configureFlags = [ "--with-boost-libdir=${boost.lib}/lib" ]
+  configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]
                      ++ optionals withGui [ "--with-gui=qt4" ];
 
   meta = {
diff --git a/pkgs/applications/altcoins/bitcoin-xt.nix b/pkgs/applications/altcoins/bitcoin-xt.nix
index e678d6e4acb3..fd2d2f35bcb4 100644
--- a/pkgs/applications/altcoins/bitcoin-xt.nix
+++ b/pkgs/applications/altcoins/bitcoin-xt.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec{
                   ++ optionals withGui [ qt4 qrencode ];
 
   configureFlags = [
-    "--with-boost-libdir=${boost.lib}/lib"
+    "--with-boost-libdir=${boost.out}/lib"
     "--with-libcurl-headers=${curl.dev}/include"
   ] ++ optionals withGui [ "--with-gui=qt4" ];
 
diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix
index 1a5746357113..7b4e7d54f323 100644
--- a/pkgs/applications/altcoins/bitcoin.nix
+++ b/pkgs/applications/altcoins/bitcoin.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec{
                   ++ optionals stdenv.isLinux [ utillinux ]
                   ++ optionals withGui [ qt4 qrencode ];
 
-  configureFlags = [ "--with-boost-libdir=${boost.lib}/lib" ]
+  configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]
                      ++ optionals withGui [ "--with-gui=qt4" ];
 
   meta = {
diff --git a/pkgs/applications/altcoins/dashpay.nix b/pkgs/applications/altcoins/dashpay.nix
index 2e9f17017a2d..ef42560ee9aa 100644
--- a/pkgs/applications/altcoins/dashpay.nix
+++ b/pkgs/applications/altcoins/dashpay.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ pkgconfig autoreconfHook glib openssl db48 yasm
                   boost zlib miniupnpc protobuf qt4 qrencode utillinux ];
 
-  configureFlags = [ "--with-boost-libdir=${boost.lib}/lib" ];
+  configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ];
 
   meta = with stdenv.lib; {
     version = "0.12.0.55";
diff --git a/pkgs/applications/altcoins/dogecoin.nix b/pkgs/applications/altcoins/dogecoin.nix
index cf2f25bfeeef..c74f7ce7f241 100644
--- a/pkgs/applications/altcoins/dogecoin.nix
+++ b/pkgs/applications/altcoins/dogecoin.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   '';
 
   configureFlags = [ "--with-incompatible-bdb"
-                     "--with-boost-libdir=${boost.lib}/lib" ]
+                     "--with-boost-libdir=${boost.out}/lib" ]
                      ++ optionals withGui [ "--with-gui" ];
 
   meta = {
diff --git a/pkgs/applications/altcoins/litecoin.nix b/pkgs/applications/altcoins/litecoin.nix
index 4e0198b972d4..38e671e89940 100644
--- a/pkgs/applications/altcoins/litecoin.nix
+++ b/pkgs/applications/altcoins/litecoin.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
                   openssl db48 boost zlib miniupnpc glib protobuf utillinux ]
                   ++ optionals withGui [ qt4 qrencode ];
 
-  configureFlags = [ "--with-boost-libdir=${boost.lib}/lib" ]
+  configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]
                      ++ optionals withGui [ "--with-gui=qt4" ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/altcoins/memorycoin.nix b/pkgs/applications/altcoins/memorycoin.nix
index 0470fd21eaea..d30133fa5511 100644
--- a/pkgs/applications/altcoins/memorycoin.nix
+++ b/pkgs/applications/altcoins/memorycoin.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec{
                   miniupnpc utillinux protobuf ]
                   ++ optionals withGui [ qt4 qmake4Hook qrencode ];
 
-  configureFlags = [ "--with-boost-libdir=${boost.lib}/lib" ]
+  configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]
                      ++ optionals withGui [ "--with-gui=qt4" ];
 
   preBuild = optional (!withGui) "cd src; cp makefile.unix Makefile";
diff --git a/pkgs/applications/altcoins/primecoin.nix b/pkgs/applications/altcoins/primecoin.nix
index 360a39a4fd81..7d25a26fba25 100644
--- a/pkgs/applications/altcoins/primecoin.nix
+++ b/pkgs/applications/altcoins/primecoin.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec{
                   miniupnpc utillinux protobuf ]
                   ++ optionals withGui [ qt4 qmake4Hook qrencode ];
 
-  configureFlags = [ "--with-boost-libdir=${boost.lib}/lib" ]
+  configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ]
                      ++ optionals withGui [ "--with-gui=qt4" ];
 
   preBuild = optional (!withGui) "cd src; cp makefile.unix Makefile";
diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix
index 0dd4eab35f1e..28a264af965c 100644
--- a/pkgs/applications/graphics/synfigstudio/default.nix
+++ b/pkgs/applications/graphics/synfigstudio/default.nix
@@ -35,7 +35,7 @@ let
 
     configureFlags = [
       "--with-boost=${boost.dev}"
-      "--with-boost-libdir=${boost.lib}/lib"
+      "--with-boost-libdir=${boost.out}/lib"
     ];
 
     buildInputs = [
diff --git a/pkgs/applications/networking/instant-messengers/ekiga/default.nix b/pkgs/applications/networking/instant-messengers/ekiga/default.nix
index b7b923159117..da6bf44ced11 100644
--- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ekiga/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--with-ldap-dir=${openldap}"
     "--with-libsasl2-dir=${cyrus_sasl}"
-    "--with-boost-libdir=${boost.lib}/lib"
+    "--with-boost-libdir=${boost.out}/lib"
     "--disable-gconf"
   ];
 
diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix
index 31931aa75d92..f08595028cb3 100644
--- a/pkgs/applications/networking/p2p/qbittorrent/default.nix
+++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     ++ optional guiSupport dbus_libs;
 
   configureFlags = [
-    "--with-boost-libdir=${boost.lib}/lib"
+    "--with-boost-libdir=${boost.out}/lib"
     "--with-boost=${boost.dev}"
     (if guiSupport then "" else "--disable-gui")
     (if webuiSupport then "" else "--disable-webui")
diff --git a/pkgs/applications/networking/p2p/twister/default.nix b/pkgs/applications/networking/p2p/twister/default.nix
index d8685da8d81f..6f8ebb994c5f 100644
--- a/pkgs/applications/networking/p2p/twister/default.nix
+++ b/pkgs/applications/networking/p2p/twister/default.nix
@@ -29,7 +29,7 @@ in stdenv.mkDerivation rec {
     "--disable-deprecated-functions"
     "--enable-tests"
     "--enable-python-binding"
-    "--with-boost-libdir=${boost.lib}/lib"
+    "--with-boost-libdir=${boost.out}/lib"
   ];
 
   buildInputs = [
diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 450c15bb65e3..c2ad0929f016 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -172,7 +172,7 @@ in stdenv.mkDerivation rec {
   configureFlags = [
     "${if withHelp then "" else "--without-help"}"
     "--with-boost=${boost.dev}"
-    "--with-boost-libdir=${boost.lib}/lib"
+    "--with-boost-libdir=${boost.out}/lib"
     "--with-beanshell-jar=${bsh}"
     "--with-vendor=NixOS"
     "--with-commons-logging-jar=${commonsLogging}/share/java/commons-logging-1.2.jar"
diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix
index 0e4d2d797629..e6296bb045bb 100644
--- a/pkgs/applications/office/libreoffice/still.nix
+++ b/pkgs/applications/office/libreoffice/still.nix
@@ -172,7 +172,7 @@ in stdenv.mkDerivation rec {
   configureFlags = [
     "${if withHelp then "" else "--without-help"}"
     "--with-boost=${boost.dev}"
-    "--with-boost-libdir=${boost.lib}/lib"
+    "--with-boost-libdir=${boost.out}/lib"
     "--with-beanshell-jar=${bsh}"
     "--with-vendor=NixOS"
     "--with-commons-logging-jar=${commonsLogging}/share/java/commons-logging-1.2.jar"
diff --git a/pkgs/applications/version-management/gource/default.nix b/pkgs/applications/version-management/gource/default.nix
index 82b3f7aed095..0e30f0239bfc 100644
--- a/pkgs/applications/version-management/gource/default.nix
+++ b/pkgs/applications/version-management/gource/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     boost glm
   ];
 
-  configureFlags = [ "--with-boost-libdir=${boost.lib}/lib" ];
+  configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ];
 
   NIX_CFLAGS_COMPILE = "-fpermissive " + # fix build with newer gcc versions
                        "-std=c++11"; # fix build with glm >= 0.9.6.0
diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix
index a5c14d0888ff..92a2f4fb6343 100644
--- a/pkgs/applications/video/aegisub/default.nix
+++ b/pkgs/applications/video/aegisub/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = with stdenv.lib;
   [ pkgconfig intltool libX11 wxGTK fontconfig freetype mesa
-    libass fftw ffms ffmpeg zlib icu boost boost.lib libiconv
+    libass fftw ffms ffmpeg zlib icu boost boost.out libiconv
   ]
     ++ optional spellcheckSupport hunspell
     ++ optional automationSupport lua
diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix
index 05bd5ad980bd..ca86906d3e19 100644
--- a/pkgs/applications/video/mkvtoolnix/default.nix
+++ b/pkgs/applications/video/mkvtoolnix/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--enable-magic"
     "--enable-optimization"
-    "--with-boost-libdir=${boost.lib}/lib"
+    "--with-boost-libdir=${boost.out}/lib"
     "--disable-debug"
     "--disable-profiling"
     "--disable-precompiled-headers"
diff --git a/pkgs/development/interpreters/pixie/default.nix b/pkgs/development/interpreters/pixie/default.nix
index c4086078d7d6..6a7424eb5cdf 100644
--- a/pkgs/development/interpreters/pixie/default.nix
+++ b/pkgs/development/interpreters/pixie/default.nix
@@ -22,7 +22,7 @@ let
     url = "https://bitbucket.org/pypy/pypy/get/${pypy-tag}.tar.bz2";
     sha256 = "1cs9xqs1rmzdcnwxxkbvy064s5cbp6vvzhn2jmyzh5kg4di1r3bn";
   };
-  libs = [ libffi libedit libuv boost.dev boost.lib zlib ];
+  libs = [ libffi libedit libuv boost.dev boost.out zlib ];
   include-path = stdenv.lib.concatStringsSep ":"
                    (map (p: "${p}/include") libs);
   library-path = stdenv.lib.concatStringsSep ":"
@@ -47,7 +47,7 @@ let
     patchPhase = ''
       (cd pixie-src
        patch -p1 < ${./load_paths.patch}
-       libraryPaths='["${libuv}" "${libedit}" "${libffi}" "${boost.dev}" "${boost.lib}" "${zlib}"]'
+       libraryPaths='["${libuv}" "${libedit}" "${libffi}" "${boost.dev}" "${boost.out}" "${zlib}"]'
        export libraryPaths
        substituteAllInPlace ./pixie/ffi-infer.pxi)
     '';
diff --git a/pkgs/development/libraries/audio/lvtk/default.nix b/pkgs/development/libraries/audio/lvtk/default.nix
index 401743ac517f..a56425b8425b 100644
--- a/pkgs/development/libraries/audio/lvtk/default.nix
+++ b/pkgs/development/libraries/audio/lvtk/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   configurePhase = ''
     python waf configure --prefix=$out \
       --boost-includes="${boost.dev}/include" \
-      --boost-libs="${boost.lib}/lib"
+      --boost-libs="${boost.out}/lib"
   '';
 
   buildPhase = "python waf";
diff --git a/pkgs/development/libraries/blitz/default.nix b/pkgs/development/libraries/blitz/default.nix
index e6f59ca8efeb..ab34f64dfbfc 100644
--- a/pkgs/development/libraries/blitz/default.nix
+++ b/pkgs/development/libraries/blitz/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   patches = [ ./blitz-gcc47.patch ./blitz-testsuite-stencil-et.patch ];
 
   buildInputs = [ pkgconfig gfortran texinfo ]
-    ++ optional (boost != null) [ boost.lib ];
+    ++ optional (boost != null) [ boost.out ];
 
   configureFlags =
     [ "--enable-shared"
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
     ++ optional enablePadding "--enable-array-length-padding"
     ++ optional enableSerialization "--enable-serialization"
     ++ optionals (boost != null) [ "--with-boost=${boost.dev}"
-                                   "--with-boost-libdir=${boost.lib}/lib" ]
+                                   "--with-boost-libdir=${boost.out}/lib" ]
     ++ optional stdenv.is64bit "--enable-64bit"
     ;
 
diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix
index 5b0c06bd6bb2..931a2ad8db63 100644
--- a/pkgs/development/libraries/boost/generic.nix
+++ b/pkgs/development/libraries/boost/generic.nix
@@ -53,7 +53,7 @@ let
 
   genericB2Flags = [
     "--includedir=$dev/include"
-    "--libdir=$lib/lib"
+    "--libdir=$out/lib"
     "-j$NIX_BUILD_CORES"
     "--layout=${layout}"
     "variant=${variant}"
@@ -90,10 +90,6 @@ let
 
     # Let boost install everything else
     ./b2 ${b2Args} install
-
-    # Create a derivation which encompasses everything, making buildInputs nicer
-    mkdir -p $out/nix-support
-    echo "$dev $lib" > $out/nix-support/propagated-native-build-inputs
   '';
 
   commonConfigureFlags = [
@@ -127,10 +123,9 @@ stdenv.mkDerivation {
   };
 
   preConfigure = ''
-    NIX_LDFLAGS="$(echo $NIX_LDFLAGS | sed "s,$out,$lib,g")"
     if test -f tools/build/src/tools/clang-darwin.jam ; then
         substituteInPlace tools/build/src/tools/clang-darwin.jam \
-          --replace '@rpath/$(<[1]:D=)' "$lib/lib/\$(<[1]:D=)";
+          --replace '@rpath/$(<[1]:D=)' "$out/lib/\$(<[1]:D=)";
     fi;
   '' + optionalString (mpi != null) ''
     cat << EOF > user-config.jam
@@ -158,7 +153,7 @@ stdenv.mkDerivation {
 
   postFixup = fixup;
 
-  outputs = [ "out" "dev" "lib" ];
+  outputs = [ "dev" "out" ];
   setOutputFlags = false;
 
   crossAttrs = rec {
diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix
index 046b7f97ba44..63fb8de0fffc 100644
--- a/pkgs/development/libraries/folly/default.nix
+++ b/pkgs/development/libraries/folly/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     patchShebangs build
   '';
 
-  configureFlags = [ "--with-boost-libdir=${boost.lib}/lib" ];
+  configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/libraries/libtorrent-rasterbar/generic.nix b/pkgs/development/libraries/libtorrent-rasterbar/generic.nix
index a5bb258af1a9..d840487b4a53 100644
--- a/pkgs/development/libraries/libtorrent-rasterbar/generic.nix
+++ b/pkgs/development/libraries/libtorrent-rasterbar/generic.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     "--with-libgeoip=system"
     "--with-libiconv=yes"
     "--with-boost=${boost.dev}"
-    "--with-boost-libdir=${boost.lib}/lib"
+    "--with-boost-libdir=${boost.out}/lib"
     "--with-libiconv=yes"
   ];
 
diff --git a/pkgs/development/libraries/ndn-cxx/default.nix b/pkgs/development/libraries/ndn-cxx/default.nix
index d95443da359d..87aaaece53f6 100644
--- a/pkgs/development/libraries/ndn-cxx/default.nix
+++ b/pkgs/development/libraries/ndn-cxx/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
     ./waf configure \
       --with-cryptopp=${cryptopp} \
       --boost-includes=${boost.dev}/include \
-      --boost-libs=${boost.lib}/lib \
+      --boost-libs=${boost.out}/lib \
       --with-examples \
       --prefix=$out
   '';
diff --git a/pkgs/development/libraries/swiften/default.nix b/pkgs/development/libraries/swiften/default.nix
index 64ea6fa0e74b..46ecada96687 100644
--- a/pkgs/development/libraries/swiften/default.nix
+++ b/pkgs/development/libraries/swiften/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     patchShebangs ./scons
     ./scons openssl=${openssl} \
             boost_includedir=${boost.dev}/include \
-            boost_libdir=${boost.lib}/lib \
+            boost_libdir=${boost.out}/lib \
             boost_bundled_enable=false \
             SWIFTEN_INSTALLDIR=$out $out
   '';
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 955dd9ed667d..99cb9d03ab61 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -1866,7 +1866,7 @@ let
 
     RVowpalWabbit = old.RVowpalWabbit.overrideDerivation (attrs: {
       configureFlags = [
-        "--with-boost=${pkgs.boost.dev}" "--with-boost-libdir=${pkgs.boost.lib}/lib"
+        "--with-boost=${pkgs.boost.dev}" "--with-boost-libdir=${pkgs.boost.out}/lib"
       ];
     });
 
diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix
index 19457e136556..ad237e408c66 100644
--- a/pkgs/tools/filesystems/ceph/generic.nix
+++ b/pkgs/tools/filesystems/ceph/generic.nix
@@ -267,7 +267,7 @@ stdenv.mkDerivation {
 
     # Fix .la file link dependencies
     find "$lib/lib" -name \*.la | xargs sed -i \
-      -e 's,-lboost_[a-z]*,-L${boost.lib}/lib \0,g' \
+      -e 's,-lboost_[a-z]*,-L${boost.out}/lib \0,g' \
   '' + optionalString (cryptoStr == "cryptopp") ''
       -e 's,-lcryptopp,-L${optCryptopp}/lib \0,g' \
   '' + optionalString (cryptoStr == "nss") ''
diff --git a/pkgs/tools/filesystems/xtreemfs/default.nix b/pkgs/tools/filesystems/xtreemfs/default.nix
index 556cb674212d..bbd4b185d5ec 100644
--- a/pkgs/tools/filesystems/xtreemfs/default.nix
+++ b/pkgs/tools/filesystems/xtreemfs/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     export ANT_HOME=${ant}
 
     export BOOST_INCLUDEDIR=${boost.dev}/include
-    export BOOST_LIBRARYDIR=${boost.lib}/lib
+    export BOOST_LIBRARYDIR=${boost.out}/lib
     export OPENSSL_ROOT_DIR=${openssl}
 
     substituteInPlace cpp/cmake/FindValgrind.cmake \
diff --git a/pkgs/tools/text/source-highlight/default.nix b/pkgs/tools/text/source-highlight/default.nix
index d5530a3df916..5015a220afb5 100644
--- a/pkgs/tools/text/source-highlight/default.nix
+++ b/pkgs/tools/text/source-highlight/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
 
   buildInputs = [ boost ];
 
-  configureFlags = [ "--with-boost=${boost.lib}" ];
+  configureFlags = [ "--with-boost=${boost.out}" ];
 
   enableParallelBuilding = false;
 

From 279a01d0dcbe4629687c95d897069ac6351d3c86 Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Wed, 27 Apr 2016 23:19:02 -0400
Subject: [PATCH 081/287] util-linux: 2.27.1 -> 2.28

---
 pkgs/os-specific/linux/util-linux/default.nix |  9 +++---
 .../rtcwake-search-PATH-for-shutdown.patch    | 29 ++++++++++---------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix
index 263fa4490dc8..62290df1a6e8 100644
--- a/pkgs/os-specific/linux/util-linux/default.nix
+++ b/pkgs/os-specific/linux/util-linux/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, pkgconfig, zlib, ncurses ? null, perl ? null, pam, systemd }:
 
 stdenv.mkDerivation rec {
-  name = "util-linux-2.27.1";
+  name = "util-linux-${version}";
+  version = "2.28";
 
   src = fetchurl {
-    url = "mirror://kernel/linux/utils/util-linux/v2.27/${name}.tar.xz";
-    sha256 = "1452hz5zx56a3mad8yrg5wb0vy5zi19mpjp6zx1yr6p9xp6qz08a";
+    url = "mirror://kernel/linux/utils/util-linux/v${version}/${name}.tar.xz";
+    sha512 = "251zv6lk6b8ip38w2h0w2rpnly38nzh96945mbpssvwjv8fgr5bnhj3207aingyybik79761zngk981wl0rblq5f7l5v655znyi3yd1";
   };
 
   patches = [
@@ -63,7 +64,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = http://www.kernel.org/pub/linux/utils/util-linux/;
+    homepage = https://www.kernel.org/pub/linux/utils/util-linux/;
     description = "A set of system utilities for Linux";
     license = licenses.gpl2; # also contains parts under more permissive licenses
     platforms = platforms.linux;
diff --git a/pkgs/os-specific/linux/util-linux/rtcwake-search-PATH-for-shutdown.patch b/pkgs/os-specific/linux/util-linux/rtcwake-search-PATH-for-shutdown.patch
index 68970c655f15..3615984ed0cb 100644
--- a/pkgs/os-specific/linux/util-linux/rtcwake-search-PATH-for-shutdown.patch
+++ b/pkgs/os-specific/linux/util-linux/rtcwake-search-PATH-for-shutdown.patch
@@ -3,23 +3,24 @@ which isn't valid on NixOS (and a compatibility link on most other modern
 distros anyway).
 
   -- nckx <tobias.geerinckx.rice@gmail.com>
-
-diff -ru util-linux-2.27-orig/include/pathnames.h util-linux-2.27/include/pathnames.h
---- util-linux-2.27-orig/include/pathnames.h	2015-06-29 13:13:14.669847478 +0200
-+++ util-linux-2.27/include/pathnames.h	2015-10-07 20:09:17.401022602 +0200
-@@ -54,7 +54,7 @@
- #define _PATH_INITTAB		"/etc/inittab"
- #define _PATH_RC		"/etc/rc"
- #define _PATH_REBOOT		"/sbin/reboot"
+diff --git a/include/pathnames.h b/include/pathnames.h
+index de6a13c..0c1aeb9 100644
+--- a/include/pathnames.h
++++ b/include/pathnames.h
+@@ -50,7 +50,7 @@
+ #define	_PATH_VAR_NOLOGIN	"/var/run/nologin"
+ 
+ #define _PATH_LOGIN		"/bin/login"
 -#define _PATH_SHUTDOWN		"/sbin/shutdown"
 +#define _PATH_SHUTDOWN		"shutdown"
- #define _PATH_SINGLE		"/etc/singleboot"
- #define _PATH_SHUTDOWN_CONF	"/etc/shutdown.conf"
  
-diff -ru util-linux-2.27-orig/sys-utils/rtcwake.c util-linux-2.27/sys-utils/rtcwake.c
---- util-linux-2.27-orig/sys-utils/rtcwake.c	2015-08-05 11:32:44.453821232 +0200
-+++ util-linux-2.27/sys-utils/rtcwake.c	2015-10-07 20:09:37.834032536 +0200
-@@ -576,7 +576,7 @@
+ #define _PATH_TERMCOLORS_DIRNAME "terminal-colors.d"
+ #define _PATH_TERMCOLORS_DIR	"/etc/" _PATH_TERMCOLORS_DIRNAME
+diff --git a/sys-utils/rtcwake.c b/sys-utils/rtcwake.c
+index 7c748dc..9a99a7c 100644
+--- a/sys-utils/rtcwake.c
++++ b/sys-utils/rtcwake.c
+@@ -575,7 +575,7 @@ int main(int argc, char **argv)
  		arg[i++] = "now";
  		arg[i]   = NULL;
  		if (!ctl.dryrun) {

From d619a75da17371e21845fff2a6f9d8b547e46c45 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 28 Apr 2016 16:42:16 +0300
Subject: [PATCH 082/287] pulseaudio: select correct outputs

Original fixes by ttuegel and peterhoeg.
---
 nixos/modules/config/pulseaudio.nix                  | 12 ++++++------
 nixos/modules/services/x11/desktop-managers/kde4.nix |  2 +-
 nixos/modules/services/x11/desktop-managers/kde5.nix |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix
index f2db428a4441..a964e04531c1 100644
--- a/nixos/modules/config/pulseaudio.nix
+++ b/nixos/modules/config/pulseaudio.nix
@@ -98,9 +98,9 @@ in {
 
       package = mkOption {
         type = types.package;
-        default = pulseaudioLight.out;
-        defaultText = "pkgs.pulseaudioLight.out";
-        example = literalExample "pkgs.pulseaudioFull.out";
+        default = pulseaudioLight;
+        defaultText = "pkgs.pulseaudioLight";
+        example = literalExample "pkgs.pulseaudioFull";
         description = ''
           The PulseAudio derivation to use.  This can be used to enable
           features (such as JACK support, Bluetooth) via the
@@ -130,7 +130,7 @@ in {
         source = clientConf;
       };
 
-      hardware.pulseaudio.configFile = mkDefault "${cfg.package.out}/etc/pulse/default.pa";
+      hardware.pulseaudio.configFile = mkDefault "${getBin cfg.package}/etc/pulse/default.pa";
     }
 
     (mkIf cfg.enable {
@@ -158,7 +158,7 @@ in {
           wantedBy = [ "default.target" ];
           serviceConfig = {
             Type = "notify";
-            ExecStart = "${cfg.package.out}/bin/pulseaudio --daemonize=no";
+            ExecStart = "${getBin cfg.package}/bin/pulseaudio --daemonize=no";
             Restart = "on-failure";
           };
         };
@@ -195,7 +195,7 @@ in {
         environment.PULSE_RUNTIME_PATH = stateDir;
         serviceConfig = {
           Type = "notify";
-          ExecStart = "${cfg.package.out}/bin/pulseaudio --daemonize=no --log-level=${cfg.daemon.logLevel} --system -n --file=${cfg.configFile}";
+          ExecStart = "${getBin cfg.package}/bin/pulseaudio --daemonize=no --log-level=${cfg.daemon.logLevel} --system -n --file=${cfg.configFile}";
           Restart = "on-failure";
         };
       };
diff --git a/nixos/modules/services/x11/desktop-managers/kde4.nix b/nixos/modules/services/x11/desktop-managers/kde4.nix
index 3b639f672170..1927341e45d4 100644
--- a/nixos/modules/services/x11/desktop-managers/kde4.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde4.nix
@@ -111,7 +111,7 @@ in
             # Load PulseAudio module for routing support.
             # See http://colin.guthr.ie/2009/10/so-how-does-the-kde-pulseaudio-support-work-anyway/
             ${optionalString config.hardware.pulseaudio.enable ''
-              ${config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1"
+              ${getBin config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1"
             ''}
 
             # Start KDE.
diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix
index f90f4dc856de..56b45609a2cd 100644
--- a/nixos/modules/services/x11/desktop-managers/kde5.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde5.nix
@@ -39,7 +39,7 @@ in
         # Load PulseAudio module for routing support.
         # See http://colin.guthr.ie/2009/10/so-how-does-the-kde-pulseaudio-support-work-anyway/
         ${optionalString config.hardware.pulseaudio.enable ''
-          ${config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1"
+          ${getBin config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1"
         ''}
 
         exec "${kde5.startkde}"

From 8a67abb820cc8b489a93b0afd73869ef1f222bd3 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Wed, 27 Apr 2016 13:59:40 +0200
Subject: [PATCH 083/287] pkgs.gzip: 1.7 -> 1.8

See http://lists.gnu.org/archive/html/info-gnu/2016-04/msg00012.html
---
 pkgs/tools/compression/gzip/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix
index cf09ec8bf739..31a67b1baf94 100644
--- a/pkgs/tools/compression/gzip/default.nix
+++ b/pkgs/tools/compression/gzip/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "gzip-${version}";
-  version = "1.7";
+  version = "1.8";
 
   src = fetchurl {
     url = "mirror://gnu/gzip/${name}.tar.xz";
-    sha256 = "1as1ddq58spflzz5kxm0ni0xfpswrkkrncjpxyb3aw77gizcacgv";
+    sha256 = "1lxv3p4iyx7833mlihkn5wfwmz4cys5nybwpz3dfawag8kn6f5zz";
   };
 
   outputs = [ "out" "man" "info" ];

From df42fe15828b39b7c4d72acba0c22afe237d826b Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Wed, 27 Apr 2016 14:17:05 +0200
Subject: [PATCH 084/287] pkgs.gnugrep: 2.22 -> 2.25

All releases between 2.22 and 2.25 are all bugfix releases:
- 2.23: http://lists.gnu.org/archive/html/info-gnu/2016-02/msg00000.html
- 2.24: http://lists.gnu.org/archive/html/info-gnu/2016-03/msg00004.html
- 2.25: http://lists.gnu.org/archive/html/info-gnu/2016-04/msg00010.html
---
 pkgs/tools/text/gnugrep/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/tools/text/gnugrep/default.nix
index d618f842a4a5..3e714871827d 100644
--- a/pkgs/tools/text/gnugrep/default.nix
+++ b/pkgs/tools/text/gnugrep/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, pcre, libiconv, perl }:
 
-let version = "2.22"; in
+let version = "2.25"; in
 
 stdenv.mkDerivation {
   name = "gnugrep-${version}";
 
   src = fetchurl {
     url = "mirror://gnu/grep/grep-${version}.tar.xz";
-    sha256 = "1srn321x7whlhs5ks36zlcrrmj4iahll8fxwsh1vbz3v04px54fa";
+    sha256 = "0c38b67cnwchwzv4wq2gpz6smkhdxrac2hhssv8f0l04qnx867p2";
   };
 
   # Perl is needed for testing

From 42f46936bbc83438011fa0d96013f92fd7fec6c4 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Fri, 29 Apr 2016 03:29:30 +0000
Subject: [PATCH 085/287] libarchive: add propagatedBuildInputs for attr and
 acl to appease pkgconfig dependencies

---
 pkgs/development/libraries/libarchive/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/libarchive/default.nix b/pkgs/development/libraries/libarchive/default.nix
index 467dd87f43e9..55ff770f4bd9 100644
--- a/pkgs/development/libraries/libarchive/default.nix
+++ b/pkgs/development/libraries/libarchive/default.nix
@@ -21,6 +21,9 @@ stdenv.mkDerivation rec {
   buildInputs = [ sharutils libxml2 zlib bzip2 openssl xz lzo ] ++
     stdenv.lib.optionals stdenv.isLinux [ e2fsprogs attr acl ];
 
+  # Without this, pkgconfig-based dependencies are unhappy
+  propagatedBuildInputs = stdenv.lib.optionals stdenv.isLinux [ attr acl ];
+
   preBuild = if stdenv.isCygwin then ''
     echo "#include <windows.h>" >> config.h
   '' else null;

From 36d50d2e6c2b2d6829763ef52e75b47ac32b372d Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 30 Apr 2016 05:01:55 +0300
Subject: [PATCH 086/287] nodejs-0_10: fix build

---
 pkgs/development/web/nodejs/v0_10.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/web/nodejs/v0_10.nix b/pkgs/development/web/nodejs/v0_10.nix
index 3196153b6047..9845aa3bf8c8 100644
--- a/pkgs/development/web/nodejs/v0_10.nix
+++ b/pkgs/development/web/nodejs/v0_10.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openssl, python, zlib, v8, utillinux, http-parser, c-ares
+{ stdenv, lib, fetchurl, openssl, python, zlib, v8, utillinux, http-parser, c-ares
 , pkgconfig, runCommand, which, libtool
 
 # apple frameworks
@@ -20,10 +20,10 @@ let
   })
   // ({ cares = c-ares; });
 
-  sharedConfigureFlags = name: [
+  sharedConfigureFlags = name: let drv = builtins.getAttr name deps; in [
     "--shared-${name}"
-    "--shared-${name}-includes=${builtins.getAttr name deps}/include"
-    "--shared-${name}-libpath=${builtins.getAttr name deps}/lib"
+    "--shared-${name}-includes=${lib.getDev drv}/include"
+    "--shared-${name}-libpath=${lib.getLib drv}/lib"
   ];
 
   inherit (stdenv.lib) concatMap optional optionals maintainers licenses platforms;

From 2875293615adabba44dac3a222e3d483c3f9e6f7 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 25 Apr 2016 20:18:56 -0500
Subject: [PATCH 087/287] nixos/networkmanager: fix syntax error

---
 nixos/modules/services/networking/networkmanager.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index b83b8b91c678..e9eea6a2cae1 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -114,10 +114,12 @@ in {
       # Ugly hack for using the correct gnome3 packageSet
       basePackages = mkOption {
         type = types.attrsOf types.package;
-        default = { inherit networkmanager modemmanager wpa_supplicant
+        default = { inherit modemmanager wpa_supplicant
                             networkmanager_openvpn networkmanager_vpnc
                             networkmanager_openconnect
-                            networkmanager_pptp networkmanager_l2tp; };
+                            networkmanager_pptp networkmanager_l2tp;
+                    networkmanager = networkmanager.out;
+                  };
         internal = true;
       };
 

From f67be473334dbc463c8cb6dd9b6579da720357e2 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 26 Apr 2016 14:19:25 -0500
Subject: [PATCH 088/287] ORBit2: multiple outputs

---
 pkgs/desktops/gnome-2/platform/ORBit2/default.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix
index 754a3ce68f65..27233f4993cd 100644
--- a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix
+++ b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix
@@ -9,16 +9,22 @@ stdenv.mkDerivation rec {
     sha256 = "0l3mhpyym9m5iz09fz0rgiqxl2ym6kpkwpsp1xrr4aa80nlh1jam";
   };
 
+  nativeBuildInputs = [ pkgconfig ];
+  propagatedBuildInputs = [ glib libIDL ] ++ libintlOrEmpty;
+
+  outputs = [ "dev" "out" ];
+
   preBuild = ''
     sed 's/-DG_DISABLE_DEPRECATED//' -i linc2/src/Makefile
   '';
 
-  nativeBuildInputs = [ pkgconfig ];
-  propagatedBuildInputs = [ glib libIDL ] ++ libintlOrEmpty;
+  preFixup = ''
+    moveToOutput "bin/orbit2-config" "$dev"
+  '';
 
   meta = with stdenv.lib; {
     homepage    = https://projects.gnome.org/ORBit2/;
-    description = "A a CORBA 2.4-compliant Object Request Broker";
+    description = "A CORBA 2.4-compliant Object Request Broker";
     platforms   = platforms.unix;
     maintainers = with maintainers; [ lovek323 ];
 

From 97d9368471542388dd761a1a4654c52cd7ddbea7 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 26 Apr 2016 14:20:32 -0500
Subject: [PATCH 089/287] qmakeHook: move libtool archives and qmake project
 files to $dev/lib

---
 pkgs/development/libraries/qt-5/5.5/default.nix     |  1 -
 pkgs/development/libraries/qt-5/5.5/qmake-hook.sh   | 11 +++++++++++
 .../libraries/qt-5/5.5/qtbase/default.nix           | 13 +++++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/qt-5/5.5/default.nix b/pkgs/development/libraries/qt-5/5.5/default.nix
index 034e25662ea1..9cfc052e730e 100644
--- a/pkgs/development/libraries/qt-5/5.5/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/default.nix
@@ -45,7 +45,6 @@ let
       nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ self.fixQtModuleCMakeConfig self.qmakeHook ];
 
       NIX_QT_SUBMODULE = args.NIX_QT_SUBMODULE or true;
-      dontFixLibtool = args.dontFixLibtool or true;
 
       outputs = args.outputs or [ "dev" "out" ];
       setOutputFlags = args.setOutputFlags or false;
diff --git a/pkgs/development/libraries/qt-5/5.5/qmake-hook.sh b/pkgs/development/libraries/qt-5/5.5/qmake-hook.sh
index f059c19e03bb..aa20779f4ec0 100644
--- a/pkgs/development/libraries/qt-5/5.5/qmake-hook.sh
+++ b/pkgs/development/libraries/qt-5/5.5/qmake-hook.sh
@@ -53,6 +53,17 @@ _qtMultioutModuleDevs() {
     # The destination directory must exist or moveToOutput will do nothing
     mkdir -p "${!outputDev}/share"
     moveToOutput "share/doc" "${!outputDev}"
+
+    # Move libtool archives and qmake project files to $dev/lib
+    if [ "z${!outputLib}" != "z${!outputDev}" ]; then
+        pushd "${!outputLib}"
+        find lib -name '*.a' -o -name '*.la' -o -name '*.prl' -print0 | \
+            while read -r -d $'\0' file; do
+                mkdir -p "${!outputDev}/$(dirname "$file")"
+                mv "${!outputLib}/$file" "${!outputDev}/$file"
+            done
+        popd
+    fi
 }
 
 qmakeConfigurePhase() {
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
index 7d68116d7168..f8dd82c88226 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
@@ -235,6 +235,19 @@ stdenv.mkDerivation {
   # freetype-2.5.4 changed signedness of some struct fields
   NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare";
 
+  preFixup = ''
+    # Move libtool archives and qmake projects
+    if [ "z''${!outputLib}" != "z''${!outputDev}" ]; then
+        pushd "''${!outputLib}"
+        find lib -name '*.a' -o -name '*.la' -o -name '*.prl' | \
+            while read -r file; do
+                mkdir -p "''${!outputDev}/$(dirname "$file")"
+                mv "''${!outputLib}/$file" "''${!outputDev}/$file"
+            done
+        popd
+    fi
+  '';
+
   postFixup =
     ''
       # Don't retain build-time dependencies like gdb and ruby.

From 008b3d5d84ad300095eeee0b84ef1b5adb04c395 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 26 Apr 2016 14:21:10 -0500
Subject: [PATCH 090/287] qt55.qtbase: move moveToOutput hooks

---
 .../libraries/qt-5/5.5/qtbase/default.nix     | 23 ++++++++-----------
 1 file changed, 10 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
index f8dd82c88226..f2071fa6f8fc 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
@@ -111,19 +111,6 @@ stdenv.mkDerivation {
     export LD_LIBRARY_PATH="$PWD/qtbase/lib:$PWD/qtbase/plugins/platforms:$LD_LIBRARY_PATH"
     export MAKEFLAGS=-j$NIX_BUILD_CORES
 
-    _multioutQtDevs() {
-        # We cannot simply set these paths in configureFlags because libQtCore retains
-        # references to the paths it was built with.
-        moveToOutput "bin" "$dev"
-        moveToOutput "include" "$dev"
-        moveToOutput "mkspecs" "$dev"
-
-        # The destination directory must exist or moveToOutput will do nothing
-        mkdir -p "$dev/share"
-        moveToOutput "share/doc" "$dev"
-    }
-    preFixupHooks+=(_multioutQtDevs)
-
     configureFlags+="\
         -plugindir $out/lib/qt5/plugins \
         -importdir $out/lib/qt5/imports \
@@ -236,6 +223,16 @@ stdenv.mkDerivation {
   NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare";
 
   preFixup = ''
+    # We cannot simply set these paths in configureFlags because libQtCore retains
+    # references to the paths it was built with.
+    moveToOutput "bin" "$dev"
+    moveToOutput "include" "$dev"
+    moveToOutput "mkspecs" "$dev"
+
+    # The destination directory must exist or moveToOutput will do nothing
+    mkdir -p "$dev/share"
+    moveToOutput "share/doc" "$dev"
+
     # Move libtool archives and qmake projects
     if [ "z''${!outputLib}" != "z''${!outputDev}" ]; then
         pushd "''${!outputLib}"

From 3f6a2b944101a22db3325d1c676978831d2ddc9c Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 26 Apr 2016 14:21:41 -0500
Subject: [PATCH 091/287] qt55.qtbase: build QGtkStyle by default

---
 .../libraries/qt-5/5.5/qtbase/default.nix     | 37 ++++++++++++-------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
index f2071fa6f8fc..2cd129acab1d 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
@@ -8,7 +8,7 @@
 , zlib, libjpeg, libpng, libtiff, sqlite, icu
 
 , coreutils, bison, flex, gdb, gperf, lndir, ruby
-, python, perl, pkgconfig
+, patchelf, perl, pkgconfig, python
 
 # optional dependencies
 , cups ? null
@@ -19,7 +19,7 @@
 , buildExamples ? false
 , buildTests ? false
 , developerBuild ? false
-, gtkStyle ? false, libgnomeui, GConf, gnome_vfs, gtk
+, gtkStyle ? true, libgnomeui, GConf, gnome_vfs, gtk
 , decryptSslTraffic ? false
 }:
 
@@ -27,6 +27,9 @@ let
   inherit (srcs.qt5) version;
   system-x86_64 = lib.elem stdenv.system lib.platforms.x86_64;
 
+  # Search path for Gtk plugin
+  gtkLibPath = lib.makeLibraryPath [ gtk.out gnome_vfs.out libgnomeui.out GConf.out ];
+
   dontInvalidateBacking = fetchurl {
     url = "https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=patch;h=0f68f8920573cdce1729a285a92ac8582df32841;hp=24c50f8dcf7fa61ac3c3d4d6295c259a104a2b8c";
     name = "qtbug-48321-dont-invalidate-backing-store.patch";
@@ -43,7 +46,7 @@ stdenv.mkDerivation {
 
   sourceRoot = "qt-everywhere-opensource-src-${version}";
 
-  outputs = [ "dev" "out" ];
+  outputs = [ "dev" "out" "gtk" ];
 
   postUnpack = ''
     mv qtbase-opensource-src-${version} ./qt-everywhere-opensource-src-${version}/qtbase
@@ -51,7 +54,6 @@ stdenv.mkDerivation {
 
   patches =
     copyPathsToStore (lib.readPathsFromFile ./. ./series)
-    ++ lib.optional gtkStyle ./dlopen-gtkstyle.patch
     ++ lib.optional decryptSslTraffic ./decrypt-ssl-traffic.patch
     ++ lib.optional mesaSupported [ ./dlopen-gl.patch ./mkspecs-libgl.patch ];
 
@@ -89,14 +91,6 @@ stdenv.mkDerivation {
         qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp \
         --replace "@libX11@" "${libX11.out}"
     ''
-    + lib.optionalString gtkStyle ''
-      substituteInPlace qtbase/src/widgets/styles/qgtk2painter.cpp --replace "@gtk@" "${gtk.out}"
-      substituteInPlace qtbase/src/widgets/styles/qgtkstyle_p.cpp \
-        --replace "@gtk@" "${gtk.out}" \
-        --replace "@gnome_vfs@" "${gnome_vfs.out}" \
-        --replace "@libgnomeui@" "${libgnomeui.out}" \
-        --replace "@gconf@" "${GConf.out}"
-    ''
     + lib.optionalString mesaSupported ''
       substituteInPlace \
         qtbase/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp \
@@ -106,6 +100,7 @@ stdenv.mkDerivation {
         --replace "@mesa_inc@" "${mesa.dev}"
     '';
 
+
   setOutputFlags = false;
   preConfigure = ''
     export LD_LIBRARY_PATH="$PWD/qtbase/lib:$PWD/qtbase/plugins/platforms:$LD_LIBRARY_PATH"
@@ -217,7 +212,7 @@ stdenv.mkDerivation {
     ++ lib.optional (postgresql != null) postgresql
     ++ lib.optionals gtkStyle [gnome_vfs.out libgnomeui.out gtk GConf];
 
-  nativeBuildInputs = [ fixQtModuleCMakeConfig lndir python perl pkgconfig ];
+  nativeBuildInputs = [ fixQtModuleCMakeConfig lndir patchelf perl pkgconfig python ];
 
   # freetype-2.5.4 changed signedness of some struct fields
   NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare";
@@ -243,6 +238,22 @@ stdenv.mkDerivation {
             done
         popd
     fi
+
+    # Move the QGtkStyle plugin to the gtk output
+    mkdir -p "$gtk/lib/qt5/plugins/platformthemes"
+    mv "$out/lib/qt5/plugins/platformthemes/libqgtk2.so" "$gtk/lib/qt5/plugins/platformthemes"
+    rm "$out/lib/cmake/Qt5Gui/Qt5Gui_QGtk2ThemePlugin.cmake"
+
+    # Set RPATH for QGtkStyle plugin
+    qgtk2="$gtk/lib/qt5/plugins/platformthemes/libqgtk2.so"
+    qgtk2_RPATH="$(patchelf --print-rpath "$qgtk2")"
+    qgtk2_RPATH="$qgtk2_RPATH''${qgtk2_RPATH:+:}${gtkLibPath}"
+    patchelf "$qgtk2" \
+        --add-needed libgtk-x11-2.0.so \
+        --add-needed libgnomeui-2.so \
+        --add-needed libgnomevfs-2.so \
+        --add-needed libgconf-2.so \
+        --set-rpath "$qgtk2_RPATH"
   '';
 
   postFixup =

From a15fa4533c929375ec226fe0b6213099af063ebe Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 26 Apr 2016 20:04:26 -0500
Subject: [PATCH 092/287] GConf: multiple outputs

---
 pkgs/desktops/gnome-2/platform/GConf/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-2/platform/GConf/default.nix b/pkgs/desktops/gnome-2/platform/GConf/default.nix
index db51a5f8962a..30f92e4e054e 100644
--- a/pkgs/desktops/gnome-2/platform/GConf/default.nix
+++ b/pkgs/desktops/gnome-2/platform/GConf/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
     sha256 = "09ch709cb9fniwc4221xgkq0jf0x0lxs814sqig8p2dcll0llvzk";
   };
 
-  outputs = [ "out" "doc" ];
+  outputs = [ "dev" "out" "doc" ];
 
   buildInputs = [ ORBit2 dbus_libs dbus_glib libxml2 ]
     # polkit requires pam, which requires shadow.h, which is not available on

From 1b57ef0baa685770f09d9204b064c63526caa3b0 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 26 Apr 2016 20:04:37 -0500
Subject: [PATCH 093/287] gnome-vfs: multiple outputs

---
 pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
index 692233930603..340c14e914f6 100644
--- a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
+++ b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
     sha256 = "1ajg8jb8k3snxc7rrgczlh8daxkjidmcv3zr9w809sq4p2sn9pk2";
   };
 
+  outputs = [ "dev" "out" ];
+
   buildInputs =
     [ pkgconfig libxml2 bzip2 openssl samba dbus_glib fam cdparanoia
       intltool gnome_mime_data avahi acl

From c9e929bbbd602381f3b49ac3cfa9135ac0a97030 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 26 Apr 2016 20:04:48 -0500
Subject: [PATCH 094/287] libbonobo: multiple outputs

---
 pkgs/desktops/gnome-2/platform/libbonobo/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/desktops/gnome-2/platform/libbonobo/default.nix b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix
index add013e64cdb..af1960af36ac 100644
--- a/pkgs/desktops/gnome-2/platform/libbonobo/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
     sha256 = "0swp4kk6x7hy1rvd1f9jba31lvfc6qvafkvbpg9h0r34fzrd8q4i";
   };
 
+  outputs = [ "dev" "out" ];
+
   preConfigure = # still using stuff deprecated in new glib versions
     "sed 's/-DG_DISABLE_DEPRECATED//g' -i configure activation-server/Makefile.in";
 

From ce367a7a9be516f0a5f2454e096fbc24a453906c Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 26 Apr 2016 20:05:00 -0500
Subject: [PATCH 095/287] libglade: multiple outputs

---
 pkgs/desktops/gnome-2/platform/libglade/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-2/platform/libglade/default.nix b/pkgs/desktops/gnome-2/platform/libglade/default.nix
index 5e5bae4d1813..ce1da95762ff 100644
--- a/pkgs/desktops/gnome-2/platform/libglade/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libglade/default.nix
@@ -2,12 +2,14 @@
 
 stdenv.mkDerivation {
   name = "libglade-2.6.4";
-  
+
   src = fetchurl {
     url = mirror://gnome/sources/libglade/2.6/libglade-2.6.4.tar.bz2;
     sha256 = "1v2x2s04jry4gpabws92i0wq2ghd47yr5n9nhgnkd7c38xv1wdk4";
   };
-  
+
+  outputs = [ "dev" "out" ];
+
   buildInputs = [ pkgconfig gtk python gettext ];
 
   propagatedBuildInputs = [ libxml2 ];

From 79c9949d385d936a92060ebe4912a7d7e4049840 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 26 Apr 2016 20:05:16 -0500
Subject: [PATCH 096/287] libgnome: multiple outputs

---
 pkgs/desktops/gnome-2/platform/libgnome/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/desktops/gnome-2/platform/libgnome/default.nix b/pkgs/desktops/gnome-2/platform/libgnome/default.nix
index 4612e6aee6f5..d0a4d1787c6c 100644
--- a/pkgs/desktops/gnome-2/platform/libgnome/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libgnome/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "197pnq8y0knqjhm2fg4j6hbqqm3qfzfnd0irhwxpk1b4hqb3kimj";
   };
 
+  outputs = [ "dev" "out" ];
+
   patches = [ ./new-glib.patch ];
 
   nativeBuildInputs = [ pkgconfig ];

From b6bd3ea805dc231fd58fbb6112e4eda7d2b5fe1b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 26 Apr 2016 20:05:28 -0500
Subject: [PATCH 097/287] libgnomecanvas: multiple outputs

---
 pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix b/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix
index 8c12754f112b..5b5e7af5431a 100644
--- a/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix
@@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "0h6xvswbqspdifnyh5pm2pqq55yp3kn6yrswq7ay9z49hkh7i6w5";
   };
 
+  outputs = [ "dev" "out" ];
+
   buildInputs = [ libglade ];
   nativeBuildInputs = [ pkgconfig intltool ];
   propagatedBuildInputs = [ libart_lgpl gtk ];

From 1051cfa1811275a07d00218e75a13c939242a7f0 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 26 Apr 2016 20:05:42 -0500
Subject: [PATCH 098/287] libgnome-keyring: multiple outputs

---
 pkgs/development/libraries/libgnome-keyring/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/libgnome-keyring/default.nix b/pkgs/development/libraries/libgnome-keyring/default.nix
index 4aadafff8441..95de49186685 100644
--- a/pkgs/development/libraries/libgnome-keyring/default.nix
+++ b/pkgs/development/libraries/libgnome-keyring/default.nix
@@ -9,6 +9,8 @@ stdenv.mkDerivation {
     sha256 = "030gka96kzqg1r19b4xrmac89hf1xj1kr5p461yvbzfxh46qqf2n";
   };
 
+  outputs = [ "dev" "out" ];
+
   propagatedBuildInputs = [ glib dbus_libs libgcrypt ];
   nativeBuildInputs = [ pkgconfig intltool ];
 

From 5c7783427cbf681edad43c3e8e088de08bdc59fd Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 27 Apr 2016 06:54:44 -0500
Subject: [PATCH 099/287] extra-cmake-modules: assume propagatedBuildInputs

The KDE build system assumes buildInputs = propagatedBuildInputs.
---
 .../kde-5/frameworks-5.21/extra-cmake-modules/setup-hook.sh | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/extra-cmake-modules/setup-hook.sh b/pkgs/desktops/kde-5/frameworks-5.21/extra-cmake-modules/setup-hook.sh
index 193cb048949a..49ac5d0c8b5f 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/extra-cmake-modules/setup-hook.sh
+++ b/pkgs/desktops/kde-5/frameworks-5.21/extra-cmake-modules/setup-hook.sh
@@ -10,12 +10,7 @@ _ecmPropagateSharedData() {
         "kconf_update" \
         "kservices5" \
         "kservicetypes5" \
-        "kxmlgui5" \
         "knotifications5" \
-        "icons" \
-        "sounds" \
-        "templates" \
-        "wallpapers" \
         "applications" \
         "desktop-directories" \
         "mime" \
@@ -26,7 +21,6 @@ _ecmPropagateSharedData() {
     for dir in ${sharedPaths[@]}; do
         if [ -d "$1/share/$dir" ]; then
             addToSearchPathOnce NIX_WRAP_XDG_DATA_DIRS "$1/share"
-            propagateOnce propagatedBuildInputs "$1"
             propagateOnce propagatedUserEnvPkgs "$1"
             break
         fi

From 2272ef72995d350de47fb988ed36f31d44baf4d8 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 27 Apr 2016 06:55:21 -0500
Subject: [PATCH 100/287] kde5.plasma-workspace: propagate all buildInputs

---
 .../kde-5/plasma-5.6/plasma-workspace.nix     | 29 ++++++++-----------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace.nix b/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace.nix
index 462378aae884..059af52e6788 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace.nix
@@ -1,12 +1,11 @@
 { plasmaPackage, lib
 , extra-cmake-modules, kdoctools
-, baloo, kactivities, kcmutils, kcrash, kdbusaddons, kdeclarative
-, kdelibs4support, kdesu, kdewebkit, kglobalaccel, kidletime
-, kjsembed, knewstuff, knotifyconfig, kpackage, krunner
-, ktexteditor, ktextwidgets, kwallet, kwayland, kwin, kxmlrpcclient
-, libdbusmenu, libkscreen, libSM, libXcursor, networkmanager-qt
-, pam, phonon, plasma-framework, qtquick1, qtscript, qtx11extras, wayland
-, libksysguard, kconfig, solid, qtquickcontrols
+, baloo, kactivities, kcmutils, kconfig, kcrash, kdbusaddons, kdeclarative
+, kdelibs4support, kdesu, kdewebkit, kglobalaccel, kidletime, kjsembed, knewstuff
+, knotifyconfig, kpackage, krunner, ktexteditor, ktextwidgets, kwallet, kwayland
+, kwin, kxmlrpcclient, libdbusmenu, libkscreen, libksysguard, libSM, libXcursor
+, networkmanager-qt, pam, phonon, plasma-framework, qtquick1, qtquickcontrols
+, qtscript, qtx11extras, solid, wayland
 }:
 
 plasmaPackage {
@@ -16,17 +15,13 @@ plasmaPackage {
     extra-cmake-modules
     kdoctools
   ];
-  buildInputs = [
-    kcmutils kconfig kcrash kdbusaddons kdesu kdewebkit
-    kjsembed knewstuff knotifyconfig kpackage
-    ktextwidgets kwallet kwayland kxmlrpcclient libdbusmenu libSM
-    libXcursor networkmanager-qt pam phonon qtscript
-    wayland
-  ];
   propagatedBuildInputs = [
-    baloo kactivities kdeclarative kdelibs4support kglobalaccel
-    kidletime krunner ktexteditor kwin libkscreen libksysguard
-    plasma-framework qtquick1 qtquickcontrols qtx11extras solid
+    baloo kactivities kcmutils kconfig kcrash kdbusaddons kdeclarative
+    kdelibs4support kdesu kdewebkit kglobalaccel kidletime kjsembed knewstuff
+    knotifyconfig kpackage krunner ktexteditor ktextwidgets kwallet kwayland
+    kwin kxmlrpcclient libdbusmenu libkscreen libksysguard libSM libXcursor
+    networkmanager-qt pam phonon plasma-framework qtquick1 qtquickcontrols
+    qtscript qtx11extras solid wayland
   ];
 
   postPatch = ''

From 0e660bf27f204ed82ca9ed66c5c7b711373180e4 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 27 Apr 2016 06:55:41 -0500
Subject: [PATCH 101/287] kde5.plasma-workspace: wrap Qt programs

---
 .../kde-5/plasma-5.6/plasma-workspace.nix       | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace.nix b/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace.nix
index 059af52e6788..b8761998faea 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace.nix
@@ -35,4 +35,21 @@ plasmaPackage {
     rm "$out/lib/libexec/startplasma"
     rm -r "$out/share/wayland-sessions"
   '';
+
+  preFixup = ''
+    wrapQtProgram $out/bin/kcheckrunning
+    wrapQtProgram $out/bin/kcminit
+    wrapQtProgram $out/bin/kcminit_startup
+    wrapQtProgram $out/bin/kdostartupconfig5
+    wrapQtProgram $out/bin/klipper
+    wrapQtProgram $out/bin/krunner
+    wrapQtProgram $out/bin/ksmserver
+    wrapQtProgram $out/bin/ksplashqml
+    wrapQtProgram $out/bin/kstartupconfig5
+    wrapQtProgram $out/bin/kuiserver5
+    wrapQtProgram $out/bin/plasmashell
+    wrapQtProgram $out/bin/plasmawindowed
+    wrapQtProgram $out/bin/systemmonitor
+    wrapQtProgram $out/bin/xembedsniproxy
+  '';
 }

From 3a948d4786dd1b2fd72eaebee4cd994eacef5da1 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 27 Apr 2016 06:56:44 -0500
Subject: [PATCH 102/287] kde5.baloo: propagate all buildInputs

---
 pkgs/desktops/kde-5/frameworks-5.21/baloo.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/baloo.nix b/pkgs/desktops/kde-5/frameworks-5.21/baloo.nix
index 38c41d9271d8..a4fdf9bb6652 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/baloo.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/baloo.nix
@@ -6,11 +6,9 @@
 kdeFramework {
   name = "baloo";
   nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
-  buildInputs = [
-    kconfig kcrash kdbusaddons lmdb qtquick1 solid
-  ];
   propagatedBuildInputs = [
-    kauth kcoreaddons kfilemetadata ki18n kio kidletime qtbase
+    kauth kconfig kcoreaddons kcrash kdbusaddons kfilemetadata ki18n kio
+    kidletime lmdb qtbase qtquick1 solid
   ];
   postInstall = ''
     wrapQtProgram "$out/bin/baloo_file"

From e5274b2fee37c622aa925e0dda4740581bce3568 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 27 Apr 2016 07:05:17 -0500
Subject: [PATCH 103/287] kde5.kdelibs4support: propagate all buildInputs

---
 .../kde-5/frameworks-5.21/kdelibs4support.nix | 32 -------------------
 .../kdelibs4support/default.nix               | 17 ++++------
 2 files changed, 6 insertions(+), 43 deletions(-)
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support.nix

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support.nix b/pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support.nix
deleted file mode 100644
index e61c4bb86e7c..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, docbook_xml_dtd_45, kauth
-, karchive, kcompletion, kconfig, kconfigwidgets, kcoreaddons
-, kcrash, kdbusaddons, kded, kdesignerplugin, kdoctools, kemoticons
-, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kitemmodels
-, kinit, knotifications, kparts, kservice, ktextwidgets
-, kunitconversion, kwidgetsaddons, kwindowsystem, kxmlgui
-, networkmanager, qtsvg, qtx11extras, xlibs
-}:
-
-# TODO: debug docbook detection
-
-kdeFramework {
-  name = "kdelibs4support";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  buildInputs = [
-    kcompletion kconfig kded kservice kwidgetsaddons
-    kxmlgui networkmanager qtsvg qtx11extras xlibs.libSM
-  ];
-  propagatedBuildInputs = [
-    kauth karchive kconfigwidgets kcoreaddons kcrash kdbusaddons
-    kdesignerplugin kemoticons kglobalaccel kguiaddons ki18n kio
-    kiconthemes kitemmodels kinit knotifications kparts ktextwidgets
-    kunitconversion kwindowsystem
-  ];
-  cmakeFlags = [
-    "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
-    "-DDocBookXML4_DTD_VERSION=4.5"
-  ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support/default.nix b/pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support/default.nix
index 843db83a99b2..1765ffa9a39f 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kdelibs4support/default.nix
@@ -12,25 +12,20 @@
 
 kdeFramework {
   name = "kdelibs4support";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   outputs = [ "dev" "out" ];
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   setupHook = ./setup-hook.sh;
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  buildInputs = [
-    kcompletion kconfig kded kservice kwidgetsaddons
-    kxmlgui networkmanager qtsvg qtx11extras xlibs.libSM
-  ];
   propagatedBuildInputs = [
-    kauth karchive kconfigwidgets kcoreaddons kcrash kdbusaddons
-    kdesignerplugin kemoticons kglobalaccel kguiaddons ki18n kio
-    kiconthemes kitemmodels kinit knotifications kparts ktextwidgets
-    kunitconversion kwindowsystem
+    kauth karchive kcompletion kconfig kconfigwidgets kcoreaddons kcrash
+    kdbusaddons kded kdesignerplugin kemoticons kglobalaccel kguiaddons ki18n
+    kio kiconthemes kitemmodels kinit knotifications kparts kservice
+    ktextwidgets kunitconversion kwidgetsaddons kwindowsystem kxmlgui
+    networkmanager qtsvg qtx11extras xlibs.libSM
   ];
   cmakeFlags = [
     "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
     "-DDocBookXML4_DTD_VERSION=4.5"
   ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

From 01e82f9256de42efe1c7e3f454323505444fe73d Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 27 Apr 2016 08:46:38 -0500
Subject: [PATCH 104/287] kde5.kfilemetadata propagate all buildInputs

---
 .../kde-5/frameworks-5.21/kfilemetadata.nix         | 13 -------------
 .../kde-5/frameworks-5.21/kfilemetadata/default.nix | 10 +++++-----
 2 files changed, 5 insertions(+), 18 deletions(-)
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kfilemetadata.nix

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kfilemetadata.nix b/pkgs/desktops/kde-5/frameworks-5.21/kfilemetadata.nix
deleted file mode 100644
index be99c58d5504..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.21/kfilemetadata.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, attr, ebook_tools, exiv2
-, ffmpeg, karchive, ki18n, poppler, qtbase, taglib
-}:
-
-kdeFramework {
-  name = "kfilemetadata";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ attr ebook_tools exiv2 ffmpeg karchive poppler taglib ];
-  propagatedBuildInputs = [ qtbase ki18n ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kfilemetadata/default.nix b/pkgs/desktops/kde-5/frameworks-5.21/kfilemetadata/default.nix
index 9bb4831cf8da..c00a4c288e80 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kfilemetadata/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kfilemetadata/default.nix
@@ -4,11 +4,11 @@
 
 kdeFramework {
   name = "kfilemetadata";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ attr ebook_tools exiv2 ffmpeg karchive poppler taglib ];
-  propagatedBuildInputs = [ qtbase ki18n ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
+  buildInputs = [ ];
+  propagatedBuildInputs = [
+    attr ebook_tools exiv2 ffmpeg karchive ki18n poppler qtbase taglib
+  ];
 }

From ff87134c912ce1aecf08646d8d39635d5f429bd0 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 10:45:00 -0500
Subject: [PATCH 105/287] kde5.plasma-framework: remove patches

---
 pkgs/desktops/kde-5/frameworks-5.21/default.nix                 | 2 +-
 .../{plasma-framework/default.nix => plasma-framework.nix}      | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/desktops/kde-5/frameworks-5.21/{plasma-framework/default.nix => plasma-framework.nix} (100%)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/default.nix b/pkgs/desktops/kde-5/frameworks-5.21/default.nix
index e88538a78b32..f7c43f73e9f9 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/default.nix
@@ -112,7 +112,7 @@ let
     modemmanager-qt = callPackage ./modemmanager-qt.nix {};
     networkmanager-qt = callPackage ./networkmanager-qt.nix {};
     oxygen-icons5 = callPackage ./oxygen-icons5.nix {};
-    plasma-framework = callPackage ./plasma-framework {};
+    plasma-framework = callPackage ./plasma-framework.nix {};
     solid = callPackage ./solid.nix {};
     sonnet = callPackage ./sonnet.nix {};
     threadweaver = callPackage ./threadweaver.nix {};
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/plasma-framework/default.nix b/pkgs/desktops/kde-5/frameworks-5.21/plasma-framework.nix
similarity index 100%
rename from pkgs/desktops/kde-5/frameworks-5.21/plasma-framework/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.21/plasma-framework.nix

From 068bbfa22dd063eb9e2fdaa4170d0fd3a2a55322 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 10:46:55 -0500
Subject: [PATCH 106/287] kde5.bluez-qt: propagate all buildInputs

---
 pkgs/desktops/kde-5/frameworks-5.21/bluez-qt.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/bluez-qt.nix b/pkgs/desktops/kde-5/frameworks-5.21/bluez-qt.nix
index f981b0516f72..26490167dbdb 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/bluez-qt.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/bluez-qt.nix
@@ -6,7 +6,7 @@
 kdeFramework {
   name = "bluez-qt";
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtdeclarative ];
+  propagatedBuildInputs = [ qtdeclarative ];
   preConfigure = ''
     substituteInPlace CMakeLists.txt \
       --replace /lib/udev/rules.d "$out/lib/udev/rules.d"

From 5560c4a28b36d243f5053fc33961706c148e89a7 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 10:47:15 -0500
Subject: [PATCH 107/287] kde5.breeze-icons: propagate all buildInputs

---
 pkgs/desktops/kde-5/frameworks-5.21/breeze-icons.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/breeze-icons.nix b/pkgs/desktops/kde-5/frameworks-5.21/breeze-icons.nix
index 44cc99daf261..3524962087e6 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/breeze-icons.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/breeze-icons.nix
@@ -6,5 +6,5 @@
 kdeFramework {
   name = "breeze-icons";
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtsvg ];
+  propagatedBuildInputs = [ qtsvg ];
 }

From b4a4fa4bc6c0a6c7544b2d0e5ea34b6eb5977d58 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 10:47:32 -0500
Subject: [PATCH 108/287] kde5.frameworkintegration: propagate all buildInputs

---
 .../kde-5/frameworks-5.21/frameworkintegration.nix    | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/frameworkintegration.nix b/pkgs/desktops/kde-5/frameworks-5.21/frameworkintegration.nix
index 26987c385ad5..ee1b188d4073 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/frameworkintegration.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/frameworkintegration.nix
@@ -5,13 +5,10 @@
 
 kdeFramework {
   name = "frameworkintegration";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kbookmarks kcompletion kconfig knotifications kwidgetsaddons
-    libXcursor
+  propagatedBuildInputs = [
+    kbookmarks kcompletion kconfig kconfigwidgets knotifications ki18n kio
+    kiconthemes kwidgetsaddons libXcursor qtx11extras
   ];
-  propagatedBuildInputs = [ kconfigwidgets ki18n kio kiconthemes qtx11extras ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

From ff846b3dc168407db6932d809cadbf3c30a4e538 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 10:47:49 -0500
Subject: [PATCH 109/287] kde5.kactivities-stats: propagate all buildInputs

---
 pkgs/desktops/kde-5/frameworks-5.21/kactivities-stats.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kactivities-stats.nix b/pkgs/desktops/kde-5/frameworks-5.21/kactivities-stats.nix
index c8405ce31b08..0080c5c31649 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kactivities-stats.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kactivities-stats.nix
@@ -5,5 +5,5 @@ kdeFramework {
   name = "kactivities-stats";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ boost kactivities kconfig ];
+  propagatedBuildInputs = [ boost kactivities kconfig ];
 }

From a1d47d0f152c3af0555ce4a2c3e7250809e9a493 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 10:48:11 -0500
Subject: [PATCH 110/287] kde5.kactivities: propagate all buildInputs

---
 pkgs/desktops/kde-5/frameworks-5.21/kactivities.nix | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kactivities.nix b/pkgs/desktops/kde-5/frameworks-5.21/kactivities.nix
index 7c01073e078d..167c3f15bbda 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kactivities.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kactivities.nix
@@ -5,15 +5,10 @@
 
 kdeFramework {
   name = "kactivities";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    boost kcmutils kconfig kcoreaddons kdbusaddons kservice
-    kxmlgui
-  ];
   propagatedBuildInputs = [
-    kdeclarative kglobalaccel ki18n kio kwindowsystem qtdeclarative
+    boost kcmutils kconfig kcoreaddons kdbusaddons kdeclarative kglobalaccel
+    ki18n kio kservice kwindowsystem kxmlgui qtdeclarative
   ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

From 634b995589d722ebd984b00c143d5ae3fd2b4635 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 10:48:26 -0500
Subject: [PATCH 111/287] kde5.kapidox: propagate all buildInputs

---
 pkgs/desktops/kde-5/frameworks-5.21/kapidox.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kapidox.nix b/pkgs/desktops/kde-5/frameworks-5.21/kapidox.nix
index 647be8f052c3..f78a5ea08a49 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kapidox.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kapidox.nix
@@ -5,8 +5,6 @@
 
 kdeFramework {
   name = "kapidox";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules python ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

From 55a6f7916421e853c7acbc2d61a0db414a69e3b0 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 10:48:40 -0500
Subject: [PATCH 112/287] kde5.karchive: propagate all buildInputs

---
 pkgs/desktops/kde-5/frameworks-5.21/karchive.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/karchive.nix b/pkgs/desktops/kde-5/frameworks-5.21/karchive.nix
index a8d9a0003c3b..bec44a6d6874 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/karchive.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/karchive.nix
@@ -4,8 +4,6 @@
 
 kdeFramework {
   name = "karchive";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

From 44da4d92e31e7cc341b4a9012fa696e78e7fd6f6 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 10:48:55 -0500
Subject: [PATCH 113/287] kde5.kauth: propagate all buildInputs

---
 pkgs/desktops/kde-5/frameworks-5.21/kauth/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kauth/default.nix b/pkgs/desktops/kde-5/frameworks-5.21/kauth/default.nix
index 1352d8c5821f..4bdba88bc3bb 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kauth/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kauth/default.nix
@@ -6,11 +6,8 @@
 
 kdeFramework {
   name = "kauth";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ polkit-qt ];
-  propagatedBuildInputs = [ kcoreaddons ];
+  propagatedBuildInputs = [ kcoreaddons polkit-qt ];
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

From 5fe38a707b9c4ecf67e35fd9aae4eefc502059df Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 10:49:08 -0500
Subject: [PATCH 114/287] kde5.kbookmarks: propagate all buildInputs

---
 pkgs/desktops/kde-5/frameworks-5.21/kbookmarks.nix | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kbookmarks.nix b/pkgs/desktops/kde-5/frameworks-5.21/kbookmarks.nix
index 1a469ab4db6d..7348e591d9cb 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kbookmarks.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kbookmarks.nix
@@ -10,16 +10,9 @@
 
 kdeFramework {
   name = "kbookmarks";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kcodecs
-    kconfig
-    kconfigwidgets
-    kcoreaddons
-    kiconthemes
-    kxmlgui
+  propagatedBuildInputs = [
+    kcodecs kconfig kconfigwidgets kcoreaddons kiconthemes kxmlgui
   ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

From d7e71a3a1cf7028f1654c356c7d62b87ccfe3e7e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 10:49:25 -0500
Subject: [PATCH 115/287] kde5.kcmutils: propagate all buildInputs

---
 .../kde-5/frameworks-5.21/kcmutils/default.nix         | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kcmutils/default.nix b/pkgs/desktops/kde-5/frameworks-5.21/kcmutils/default.nix
index dbbb783ac615..fdf55174548e 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kcmutils/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kcmutils/default.nix
@@ -5,13 +5,11 @@
 
 kdeFramework {
   name = "kcmutils";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kcoreaddons kiconthemes kitemviews kpackage kxmlgui
+  propagatedBuildInputs = [
+    kconfigwidgets kcoreaddons kdeclarative ki18n kiconthemes kitemviews
+    kpackage kservice kxmlgui
   ];
-  propagatedBuildInputs = [ kconfigwidgets kdeclarative ki18n kservice ];
   patches = [ ./0001-qdiriterator-follow-symlinks.patch ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

From db7c96221f9074b9d12585424927023748e38695 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 10:49:38 -0500
Subject: [PATCH 116/287] kde5.kcompletion: propagate all buildInputs

---
 pkgs/desktops/kde-5/frameworks-5.21/kcompletion.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kcompletion.nix b/pkgs/desktops/kde-5/frameworks-5.21/kcompletion.nix
index e393774f16a5..8c45bed25856 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kcompletion.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kcompletion.nix
@@ -6,9 +6,7 @@
 
 kdeFramework {
   name = "kcompletion";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kconfig kwidgetsaddons ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
+  propagatedBuildInputs = [ kconfig kwidgetsaddons ];
 }

From 1f27e8cfd541694e9aa66048351700aa62a21389 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 10:49:54 -0500
Subject: [PATCH 117/287] kde5.kconfigwidgets: propagate all buildInputs

---
 .../kde-5/frameworks-5.21/kconfigwidgets/default.nix       | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kconfigwidgets/default.nix b/pkgs/desktops/kde-5/frameworks-5.21/kconfigwidgets/default.nix
index 3b3bd27cce08..1e6976113de6 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kconfigwidgets/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kconfigwidgets/default.nix
@@ -4,15 +4,12 @@
 
 kdeFramework {
   name = "kconfigwidgets";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  buildInputs = [ kguiaddons ];
-  propagatedBuildInputs = [ kauth kconfig kcodecs ki18n kwidgetsaddons ];
+  propagatedBuildInputs = [ kauth kconfig kcodecs kguiaddons ki18n kwidgetsaddons ];
   patches = [ ./0001-qdiriterator-follow-symlinks.patch ];
   postInstall = ''
     moveToOutput "bin/preparetips5" "$dev"
     wrapQtProgram "$dev/bin/preparetips5"
   '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

From 2c0231e0b0b896bb7b999134e413a16800156032 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 10:50:12 -0500
Subject: [PATCH 118/287] kde5.kcoreaddons: propagate all buildInputs

---
 pkgs/desktops/kde-5/frameworks-5.21/kcoreaddons.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kcoreaddons.nix b/pkgs/desktops/kde-5/frameworks-5.21/kcoreaddons.nix
index f3a1db7bd484..846b187c866c 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kcoreaddons.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kcoreaddons.nix
@@ -5,12 +5,10 @@
 
 kdeFramework {
   name = "kcoreaddons";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
-  buildInputs = [ shared_mime_info ];
+  propagatedBuildInputs = [ shared_mime_info ];
   postInstall = ''
     wrapQtProgram "$out/bin/desktoptojson"
   '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

From d1ec927a09c261e1250d86b4a7c99ac3554f161e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 10:50:26 -0500
Subject: [PATCH 119/287] kde5.kcrash: propagate all buildInputs

---
 pkgs/desktops/kde-5/frameworks-5.21/kcrash.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kcrash.nix b/pkgs/desktops/kde-5/frameworks-5.21/kcrash.nix
index bbab78ccb409..133a81c60c18 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kcrash.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kcrash.nix
@@ -7,10 +7,7 @@
 
 kdeFramework {
   name = "kcrash";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kcoreaddons ];
-  propagatedBuildInputs = [ kwindowsystem qtx11extras ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
+  propagatedBuildInputs = [ kcoreaddons kwindowsystem qtx11extras ];
 }

From 99c50e45c7985bc36efe13ee3f521d00f2343c25 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 10:50:39 -0500
Subject: [PATCH 120/287] kde5.kdeclarative: propagate all buildInputs

---
 pkgs/desktops/kde-5/frameworks-5.21/kdeclarative.nix | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kdeclarative.nix b/pkgs/desktops/kde-5/frameworks-5.21/kdeclarative.nix
index 74d107466cfc..af9a009b82e5 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kdeclarative.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kdeclarative.nix
@@ -6,17 +6,13 @@
 
 kdeFramework {
   name = "kdeclarative";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
-  buildInputs = [
-    epoxy kguiaddons kiconthemes kwidgetsaddons
-  ];
   propagatedBuildInputs = [
-    kconfig kglobalaccel ki18n kio kpackage kwindowsystem qtdeclarative
+    epoxy kconfig kglobalaccel kguiaddons ki18n kiconthemes kio kpackage
+    kwidgetsaddons kwindowsystem qtdeclarative
   ];
   postInstall = ''
     wrapQtProgram "$out/bin/kpackagelauncherqml"
   '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

From f60d19ba86be9ebc2e20051f7abfe14a54890d19 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 10:50:54 -0500
Subject: [PATCH 121/287] kde5.kded: propagate all buildInputs

---
 pkgs/desktops/kde-5/frameworks-5.21/kded.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kded.nix b/pkgs/desktops/kde-5/frameworks-5.21/kded.nix
index 47ae2d68c68e..fd286accb9ff 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kded.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kded.nix
@@ -11,9 +11,7 @@
 
 kdeFramework {
   name = "kded";
-  buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons kinit kservice ];
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
+  propagatedBuildInputs = [ kconfig kcoreaddons kcrash kdbusaddons kinit kservice ];
 }

From be1091d46cd94bfeda04ed64649d339ccc21b0c2 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 10:51:08 -0500
Subject: [PATCH 122/287] kde5.kdesignerplugin: propagate all buildInputs

---
 .../kde-5/frameworks-5.21/kdesignerplugin.nix        | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kdesignerplugin.nix b/pkgs/desktops/kde-5/frameworks-5.21/kdesignerplugin.nix
index cbc114ccca03..d6e03e174729 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kdesignerplugin.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kdesignerplugin.nix
@@ -18,17 +18,13 @@
 
 kdeFramework {
   name = "kdesignerplugin";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  buildInputs = [
-    kcompletion kconfig kconfigwidgets kcoreaddons kdewebkit
-    kiconthemes kitemviews kplotting ktextwidgets kwidgetsaddons
-    kxmlgui
+  propagatedBuildInputs = [
+    kcompletion kconfig kconfigwidgets kcoreaddons kdewebkit kiconthemes kio
+    kitemviews kplotting ktextwidgets kwidgetsaddons kxmlgui sonnet
   ];
-  propagatedBuildInputs = [ kio sonnet ];
   postInstall = ''
     wrapQtProgram "$out/bin/kgendesignerplugin"
   '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

From e6a1d1c3d09098777d292057d382d43eff008252 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 10:51:24 -0500
Subject: [PATCH 123/287] kde5.kdesu: propagate all buildInputs

---
 pkgs/desktops/kde-5/frameworks-5.21/kdesu.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kdesu.nix b/pkgs/desktops/kde-5/frameworks-5.21/kdesu.nix
index 364fbd6a720b..fcccea9161f1 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kdesu.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kdesu.nix
@@ -4,10 +4,7 @@
 
 kdeFramework {
   name = "kdesu";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kcoreaddons kservice ];
-  propagatedBuildInputs = [ ki18n kpty ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
+  propagatedBuildInputs = [ kcoreaddons ki18n kpty kservice ];
 }

From 1acadc22559226a95057dcc4d53facb03661d346 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 10:51:39 -0500
Subject: [PATCH 124/287] kde5.kdewebkit: propagate all buildInputs

---
 pkgs/desktops/kde-5/frameworks-5.21/kdewebkit.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kdewebkit.nix b/pkgs/desktops/kde-5/frameworks-5.21/kdewebkit.nix
index d361313d1d49..3c0e4ba3f562 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kdewebkit.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kdewebkit.nix
@@ -4,10 +4,9 @@
 
 kdeFramework {
   name = "kdewebkit";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kconfig kcoreaddons kjobwidgets kparts kservice kwallet ];
-  propagatedBuildInputs = [ ki18n kio qtwebkit ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
+  propagatedBuildInputs = [
+    kconfig kcoreaddons ki18n kio kjobwidgets kparts kservice kwallet qtwebkit
+  ];
 }

From f8c51488257860da16d549a701014a343aa12ce4 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 10:51:54 -0500
Subject: [PATCH 125/287] kde5.kdnssd: propagate all buildInputs

---
 pkgs/desktops/kde-5/frameworks-5.21/kdnssd.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kdnssd.nix b/pkgs/desktops/kde-5/frameworks-5.21/kdnssd.nix
index f00432b0c9ce..8fda4e63e3a6 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kdnssd.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kdnssd.nix
@@ -5,9 +5,7 @@
 
 kdeFramework {
   name = "kdnssd";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ avahi ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
+  propagatedBuildInputs = [ avahi ];
 }

From e7f42467e347bd95eb1236b252d7d54e59e9a86c Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 10:52:09 -0500
Subject: [PATCH 126/287] kde5.kdoctools: propagate all buildInputs

---
 pkgs/desktops/kde-5/frameworks-5.21/kdoctools/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kdoctools/default.nix b/pkgs/desktops/kde-5/frameworks-5.21/kdoctools/default.nix
index f67c19f42395..0ed249da9a4c 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kdoctools/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kdoctools/default.nix
@@ -4,16 +4,13 @@
 
 kdeFramework {
   name = "kdoctools";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ karchive ];
-  propagatedBuildInputs = [ ki18n ];
+  propagatedBuildInputs = [ karchive ki18n ];
   propagatedNativeBuildInputs = [ makeQtWrapper perl perlPackages.URI ];
   cmakeFlags = [
     "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
     "-DDocBookXSL_DIR=${docbook5_xsl}/xml/xsl/docbook"
   ];
   patches = [ ./kdoctools-no-find-docbook-xml.patch ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

From 9f9ab4aa25f57d02563b4ed0494a036a3284bf8a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 10:52:22 -0500
Subject: [PATCH 127/287] kde5.kemoticons: propagate all buildInputs

---
 pkgs/desktops/kde-5/frameworks-5.21/kemoticons.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kemoticons.nix b/pkgs/desktops/kde-5/frameworks-5.21/kemoticons.nix
index d165f84e3a2d..1e31277172d7 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kemoticons.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kemoticons.nix
@@ -8,10 +8,7 @@
 
 kdeFramework {
   name = "kemoticons";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ karchive kconfig kcoreaddons ];
-  propagatedBuildInputs = [ kservice ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
+  propagatedBuildInputs = [ karchive kconfig kcoreaddons kservice ];
 }

From 0e94f263822cddbee204f0e920c5085ab5a59956 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 10:52:39 -0500
Subject: [PATCH 128/287] kde5.kfilemetadata: propagate all buildInputs

---
 pkgs/desktops/kde-5/frameworks-5.21/kfilemetadata/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kfilemetadata/default.nix b/pkgs/desktops/kde-5/frameworks-5.21/kfilemetadata/default.nix
index c00a4c288e80..bc7349e7453f 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kfilemetadata/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kfilemetadata/default.nix
@@ -7,7 +7,6 @@ kdeFramework {
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ ];
   propagatedBuildInputs = [
     attr ebook_tools exiv2 ffmpeg karchive ki18n poppler qtbase taglib
   ];

From f3bf03250e7abaedae6c6f94fd77d9d64e3520cf Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 10:52:59 -0500
Subject: [PATCH 129/287] kde5.kglobalaccel: propagate all buildInputs

---
 pkgs/desktops/kde-5/frameworks-5.21/kglobalaccel.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kglobalaccel.nix b/pkgs/desktops/kde-5/frameworks-5.21/kglobalaccel.nix
index c535b3590a38..79db990f191c 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kglobalaccel.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kglobalaccel.nix
@@ -11,13 +11,12 @@
 
 kdeFramework {
   name = "kglobalaccel";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
-  buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons ];
-  propagatedBuildInputs = [ kwindowsystem qtx11extras ];
+  propagatedBuildInputs = [
+    kconfig kcoreaddons kcrash kdbusaddons kwindowsystem qtx11extras
+  ];
   postInstall = ''
     wrapQtProgram "$out/bin/kglobalaccel5"
   '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

From 7689b8317e3d7eb7dfda2e983cd5ccb866c7457a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 10:53:14 -0500
Subject: [PATCH 130/287] kde5.kguiaddons: propagate all buildInputs

---
 pkgs/desktops/kde-5/frameworks-5.21/kguiaddons.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kguiaddons.nix b/pkgs/desktops/kde-5/frameworks-5.21/kguiaddons.nix
index bc4e9ab11843..6ebfd1104f70 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kguiaddons.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kguiaddons.nix
@@ -5,9 +5,7 @@
 
 kdeFramework {
   name = "kguiaddons";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtx11extras ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
+  propagatedBuildInputs = [ qtx11extras ];
 }

From 670123464bb28404ebe1ec4ceac5513faa4bc4c6 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 10:53:29 -0500
Subject: [PATCH 131/287] kde5.khtml: propagate all buildInputs

---
 pkgs/desktops/kde-5/frameworks-5.21/khtml.nix | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/khtml.nix b/pkgs/desktops/kde-5/frameworks-5.21/khtml.nix
index d40df466ebbd..99f6fe31e0d7 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/khtml.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/khtml.nix
@@ -6,16 +6,11 @@
 
 kdeFramework {
   name = "khtml";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules perl ];
-  buildInputs = [
-    giflib karchive kiconthemes knotifications kwallet kwidgetsaddons
-    kxmlgui phonon
-  ];
   propagatedBuildInputs = [
-    kcodecs kglobalaccel ki18n kio kjs kparts ktextwidgets
-    kwindowsystem qtx11extras sonnet
+    giflib karchive kcodecs kglobalaccel ki18n kiconthemes kio kjs
+    knotifications kparts ktextwidgets kwallet kwidgetsaddons kwindowsystem
+    kxmlgui phonon qtx11extras sonnet
   ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

From ad2671f73ca6227c81391c6e02bcb915ac7284ff Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 10:53:44 -0500
Subject: [PATCH 132/287] kde5.ki18n: propagate all buildInputs

---
 pkgs/desktops/kde-5/frameworks-5.21/ki18n.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/ki18n.nix b/pkgs/desktops/kde-5/frameworks-5.21/ki18n.nix
index 268006512e7c..2698a97fd33f 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/ki18n.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/ki18n.nix
@@ -8,10 +8,8 @@
 
 kdeFramework {
   name = "ki18n";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtdeclarative qtscript ];
+  propagatedBuildInputs = [ qtdeclarative qtscript ];
   propagatedNativeBuildInputs = [ gettext python ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

From 22300d7c59bbe3552f592593cd8cb64bbeb353cb Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 10:53:57 -0500
Subject: [PATCH 133/287] kde5.kiconthemes: propagate all buildInputs

---
 .../desktops/kde-5/frameworks-5.21/kiconthemes/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kiconthemes/default.nix b/pkgs/desktops/kde-5/frameworks-5.21/kiconthemes/default.nix
index b78b25582beb..4e8684806365 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kiconthemes/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kiconthemes/default.nix
@@ -5,14 +5,11 @@
 
 kdeFramework {
   name = "kiconthemes";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
-  buildInputs = [ kconfigwidgets kitemviews qtsvg ];
-  propagatedBuildInputs = [ breeze-icons ki18n ];
+  propagatedBuildInputs = [ breeze-icons kconfigwidgets ki18n kitemviews qtsvg ];
   postInstall = ''
     wrapQtProgram "$out/bin/kiconfinder5"
   '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

From 6187ae6c023d0fdd6980972b053190f72b3ce7fe Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 10:54:11 -0500
Subject: [PATCH 134/287] kde5.kidletime: propagate all buildInputs

---
 pkgs/desktops/kde-5/frameworks-5.21/kidletime.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kidletime.nix b/pkgs/desktops/kde-5/frameworks-5.21/kidletime.nix
index fc0865600239..758260517e7d 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kidletime.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kidletime.nix
@@ -6,10 +6,7 @@
 
 kdeFramework {
   name = "kidletime";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtx11extras ];
-  propagatedBuildInputs = [ qtbase ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
+  propagatedBuildInputs = [ qtbase qtx11extras ];
 }

From 4986a452e617cc7b6899a88a21ebf7d5d365bc27 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 10:54:30 -0500
Subject: [PATCH 135/287] kde5.kimageformats: propagate all buildInputs

---
 pkgs/desktops/kde-5/frameworks-5.21/kimageformats.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kimageformats.nix b/pkgs/desktops/kde-5/frameworks-5.21/kimageformats.nix
index 49d66bbcc2c6..fbc8d092f865 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kimageformats.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kimageformats.nix
@@ -5,9 +5,7 @@
 
 kdeFramework {
   name = "kimageformats";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
   NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

From c9202600fa2f76dd49b882b3f806c17fec41cd5c Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 10:55:29 -0500
Subject: [PATCH 136/287] kde5.kinit: propagate all buildInputs

---
 pkgs/desktops/kde-5/frameworks-5.21/kinit/default.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kinit/default.nix b/pkgs/desktops/kde-5/frameworks-5.21/kinit/default.nix
index 64210ca76051..454e3977c3a8 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kinit/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kinit/default.nix
@@ -3,15 +3,12 @@
 , libcap_progs
 }:
 
-# TODO: setuid wrapper
-
 kdeFramework {
   name = "kinit";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools libcap_progs ];
-  buildInputs = [ kconfig kcrash kservice libcap ];
-  propagatedBuildInputs = [ ki18n kio kwindowsystem ];
+  propagatedBuildInputs = [
+    kconfig kcrash ki18n kio kservice kwindowsystem libcap
+  ];
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

From 6c103125db4ea32906da3fe97c328719d1c72f5b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 10:55:42 -0500
Subject: [PATCH 137/287] kde5.kio: propagate all buildInputs

---
 .../kde-5/frameworks-5.21/kio/default.nix       | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kio/default.nix b/pkgs/desktops/kde-5/frameworks-5.21/kio/default.nix
index a2131ff33850..cfa597e9cd10 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kio/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kio/default.nix
@@ -9,17 +9,15 @@
 
 kdeFramework {
   name = "kio";
-  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  buildInputs = [
-    acl karchive kconfig kcoreaddons kdbusaddons kiconthemes
-    knotifications ktextwidgets kwallet kwidgetsaddons
-    qtscript
-  ];
   propagatedBuildInputs = [
-    kbookmarks kcompletion kconfigwidgets ki18n kitemviews kjobwidgets
-    kservice kwindowsystem kxmlgui solid qtx11extras
+    acl karchive kbookmarks kcompletion kconfig kconfigwidgets kcoreaddons
+    kdbusaddons ki18n kiconthemes kitemviews kjobwidgets knotifications kservice
+    ktextwidgets kwallet kwidgetsaddons kwindowsystem kxmlgui solid qtscript
+    qtx11extras
   ];
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   postInstall = ''
     wrapQtProgram "$out/bin/kcookiejar5"
     wrapQtProgram "$out/bin/ktelnetservice5"
@@ -27,7 +25,4 @@ kdeFramework {
     wrapQtProgram "$out/bin/kmailservice5"
     wrapQtProgram "$out/bin/protocoltojson"
   '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

From 83fff10a6698367417c48a598b599a9b70e2afba Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 10:55:55 -0500
Subject: [PATCH 138/287] kde5.kitemmodels: propagate all buildInputs

---
 pkgs/desktops/kde-5/frameworks-5.21/kitemmodels.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kitemmodels.nix b/pkgs/desktops/kde-5/frameworks-5.21/kitemmodels.nix
index a9024d771cc3..7dff10b7fe06 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kitemmodels.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kitemmodels.nix
@@ -4,8 +4,6 @@
 
 kdeFramework {
   name = "kitemmodels";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

From f4a5078245a1af77baa413a3d95b3ebf6a641e65 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 10:56:09 -0500
Subject: [PATCH 139/287] kde5.kitemviews: propagate all buildInputs

---
 pkgs/desktops/kde-5/frameworks-5.21/kitemviews.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kitemviews.nix b/pkgs/desktops/kde-5/frameworks-5.21/kitemviews.nix
index 931019ce495d..77f4b6621604 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kitemviews.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kitemviews.nix
@@ -4,8 +4,6 @@
 
 kdeFramework {
   name = "kitemviews";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

From 4e983f65b945d31027c98e106ee95a9bc23fbba4 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 10:56:25 -0500
Subject: [PATCH 140/287] kde5.kjobwidgets: propagate all buildInputs

---
 pkgs/desktops/kde-5/frameworks-5.21/kjobwidgets.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kjobwidgets.nix b/pkgs/desktops/kde-5/frameworks-5.21/kjobwidgets.nix
index 746edf12eea0..2692458b8be7 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kjobwidgets.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kjobwidgets.nix
@@ -7,10 +7,7 @@
 
 kdeFramework {
   name = "kjobwidgets";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kcoreaddons kwidgetsaddons ];
-  propagatedBuildInputs = [ qtx11extras ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
+  propagatedBuildInputs = [ kcoreaddons kwidgetsaddons qtx11extras ];
 }

From 27078990f9a07207fed1559b0be40666567e6fb8 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 10:56:40 -0500
Subject: [PATCH 141/287] kde5.kjs: propagate all buildInputs

---
 pkgs/desktops/kde-5/frameworks-5.21/kjs.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kjs.nix b/pkgs/desktops/kde-5/frameworks-5.21/kjs.nix
index 768720f178c8..1a8750ea74fd 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kjs.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kjs.nix
@@ -6,11 +6,9 @@
 
 kdeFramework {
   name = "kjs";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
   postInstall = ''
     wrapQtProgram "$out/bin/kjs5"
   '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

From 7490f3662cd39f4fce0d460348fb1cfe1a06947e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 10:57:06 -0500
Subject: [PATCH 142/287] kde5.kjsembed: propagate all buildInputs

---
 pkgs/desktops/kde-5/frameworks-5.21/kjsembed.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kjsembed.nix b/pkgs/desktops/kde-5/frameworks-5.21/kjsembed.nix
index 22eef2d47bde..7611b8310075 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kjsembed.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kjsembed.nix
@@ -4,14 +4,11 @@
 
 kdeFramework {
   name = "kjsembed";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  buildInputs = [ qtsvg ];
-  propagatedBuildInputs = [ ki18n kjs ];
+  propagatedBuildInputs = [ ki18n kjs qtsvg ];
   postInstall = ''
     wrapQtProgram "$out/bin/kjscmd5"
     wrapQtProgram "$out/bin/kjsconsole"
   '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

From 40786c0990e9e2afbbbb5e8af16b7b5bbf23f7d3 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 10:57:59 -0500
Subject: [PATCH 143/287] kde5.kmediaplayer: propagate all buildInputs

---
 pkgs/desktops/kde-5/frameworks-5.21/kmediaplayer.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kmediaplayer.nix b/pkgs/desktops/kde-5/frameworks-5.21/kmediaplayer.nix
index 460458b22323..93a6b450f762 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kmediaplayer.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kmediaplayer.nix
@@ -6,10 +6,7 @@
 
 kdeFramework {
   name = "kmediaplayer";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kxmlgui ];
-  propagatedBuildInputs = [ kparts ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
+  propagatedBuildInputs = [ kparts kxmlgui ];
 }

From 3cfdad0a9a103f8ea5853bb138462489f5228399 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 10:58:14 -0500
Subject: [PATCH 144/287] kde5.knewstuff: propagate all buildInputs

---
 pkgs/desktops/kde-5/frameworks-5.21/knewstuff.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/knewstuff.nix b/pkgs/desktops/kde-5/frameworks-5.21/knewstuff.nix
index 5bcd6f301462..002418c65ad0 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/knewstuff.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/knewstuff.nix
@@ -5,13 +5,10 @@
 
 kdeFramework {
   name = "knewstuff";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    karchive kcompletion kconfig kcoreaddons kiconthemes
-    kitemviews ktextwidgets kwidgetsaddons
+  propagatedBuildInputs = [
+    attica karchive kcompletion kconfig kcoreaddons ki18n kiconthemes kio
+    kitemviews kservice ktextwidgets kwidgetsaddons kxmlgui
   ];
-  propagatedBuildInputs = [ attica ki18n kio kservice kxmlgui ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

From 35692118cd972785c59cdee27fd087617f4e404f Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 10:58:28 -0500
Subject: [PATCH 145/287] kde5.knotifications: propagate all buildInputs

---
 pkgs/desktops/kde-5/frameworks-5.21/knotifications.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/knotifications.nix b/pkgs/desktops/kde-5/frameworks-5.21/knotifications.nix
index 791caa02edb7..7196832495f3 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/knotifications.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/knotifications.nix
@@ -8,12 +8,9 @@
 
 kdeFramework {
   name = "knotifications";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kcodecs kconfig kcoreaddons libdbusmenu phonon
+  propagatedBuildInputs = [
+    kcodecs kconfig kcoreaddons kwindowsystem libdbusmenu phonon qtx11extras
   ];
-  propagatedBuildInputs = [ kwindowsystem qtx11extras ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

From de47317ef2d763079c9be38eb469a83acd083bd2 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 10:58:50 -0500
Subject: [PATCH 146/287] kde5.knotifyconfig: propagate all buildInputs

---
 pkgs/desktops/kde-5/frameworks-5.21/knotifyconfig.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/knotifyconfig.nix b/pkgs/desktops/kde-5/frameworks-5.21/knotifyconfig.nix
index dd99d2d4f1e5..0e357aecb999 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/knotifyconfig.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/knotifyconfig.nix
@@ -4,10 +4,7 @@
 
 kdeFramework {
   name = "knotifyconfig";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kcompletion kconfig phonon ];
-  propagatedBuildInputs = [ ki18n kio ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
+  propagatedBuildInputs = [ kcompletion kconfig ki18n kio phonon ];
 }

From 5a4f8bb04bc34ced4a5b4cb68dfbce94e8c3331d Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 10:59:07 -0500
Subject: [PATCH 147/287] kde5.kpackage: propagate all buildInputs

---
 pkgs/desktops/kde-5/frameworks-5.21/kpackage/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kpackage/default.nix b/pkgs/desktops/kde-5/frameworks-5.21/kpackage/default.nix
index aea1b0d31a0d..874bb380d736 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kpackage/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kpackage/default.nix
@@ -10,14 +10,11 @@
 
 kdeFramework {
   name = "kpackage";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  buildInputs = [ karchive kconfig ];
-  propagatedBuildInputs = [ kcoreaddons ki18n ];
+  propagatedBuildInputs = [ karchive kconfig kcoreaddons ki18n ];
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   postInstall = ''
     wrapQtProgram "$out/bin/kpackagetool5"
   '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

From 6a235b3e7fa4601a862a7ff828e06e85e4335ebb Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 10:59:22 -0500
Subject: [PATCH 148/287] kde5.kparts: propagate all buildInputs

---
 pkgs/desktops/kde-5/frameworks-5.21/kparts.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kparts.nix b/pkgs/desktops/kde-5/frameworks-5.21/kparts.nix
index 1c3e0b2cbc51..ad6ea2dbc305 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kparts.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kparts.nix
@@ -5,13 +5,10 @@
 
 kdeFramework {
   name = "kparts";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kconfig kcoreaddons kiconthemes kjobwidgets knotifications
-    kservice kwidgetsaddons
+  propagatedBuildInputs = [
+    kconfig kcoreaddons ki18n kiconthemes kio kjobwidgets knotifications
+    kservice ktextwidgets kwidgetsaddons kxmlgui
   ];
-  propagatedBuildInputs = [ ki18n kio ktextwidgets kxmlgui ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

From aa8d2d180da69bed3ce0bf920aec78955232fe19 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 10:59:36 -0500
Subject: [PATCH 149/287] kde5.kpeople: propagate all buildInputs

---
 pkgs/desktops/kde-5/frameworks-5.21/kpeople.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kpeople.nix b/pkgs/desktops/kde-5/frameworks-5.21/kpeople.nix
index 4c3877e7efd2..6acb5e2eed51 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kpeople.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kpeople.nix
@@ -4,12 +4,9 @@
 
 kdeFramework {
   name = "kpeople";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kcoreaddons kitemviews kservice kwidgetsaddons
+  propagatedBuildInputs = [
+    kcoreaddons ki18n kitemviews kservice kwidgetsaddons qtdeclarative
   ];
-  propagatedBuildInputs = [ ki18n qtdeclarative ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

From 0d01e89a19f1ee639c06b130103ef5f9275116ae Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 10:59:51 -0500
Subject: [PATCH 150/287] kde5.kplotting: propagate all buildInputs

---
 pkgs/desktops/kde-5/frameworks-5.21/kplotting.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kplotting.nix b/pkgs/desktops/kde-5/frameworks-5.21/kplotting.nix
index c16f51b5ac3c..601f1778db7d 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kplotting.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kplotting.nix
@@ -4,8 +4,6 @@
 
 kdeFramework {
   name = "kplotting";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

From 86d9ef9c0fd4bce914442ef964361a5f43b6d616 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 11:00:04 -0500
Subject: [PATCH 151/287] kde5.kpty: propagate all buildInputs

---
 pkgs/desktops/kde-5/frameworks-5.21/kpty.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kpty.nix b/pkgs/desktops/kde-5/frameworks-5.21/kpty.nix
index 2e34e6f674ce..8bdaacb85f82 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kpty.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kpty.nix
@@ -2,9 +2,7 @@
 
 kdeFramework {
   name = "kpty";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [ kcoreaddons ki18n ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

From 29b2d93bbf7963e3fb4f5a757e77830abc3eef18 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 11:00:18 -0500
Subject: [PATCH 152/287] kde5.kross: propagate all buildInputs

---
 pkgs/desktops/kde-5/frameworks-5.21/kross.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kross.nix b/pkgs/desktops/kde-5/frameworks-5.21/kross.nix
index 7c6f079feaa7..0e66d95b5cce 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kross.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kross.nix
@@ -5,10 +5,10 @@
 
 kdeFramework {
   name = "kross";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  buildInputs = [ kcompletion kcoreaddons kxmlgui ];
-  propagatedBuildInputs = [ ki18n kiconthemes kio kparts kwidgetsaddons qtscript ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
+  propagatedBuildInputs = [
+    kcompletion kcoreaddons ki18n kiconthemes kio kparts kwidgetsaddons kxmlgui
+    qtscript
+  ];
 }

From ca55273431f17277b902d0065f8a6d6928b08797 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 11:02:03 -0500
Subject: [PATCH 153/287] kde5.krunner: propagate buildInputs

---
 pkgs/desktops/kde-5/frameworks-5.21/krunner.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/krunner.nix b/pkgs/desktops/kde-5/frameworks-5.21/krunner.nix
index 12d2b54d0eb3..f07a0c31c296 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/krunner.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/krunner.nix
@@ -5,12 +5,10 @@
 
 kdeFramework {
   name = "krunner";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kconfig kcoreaddons kservice qtquick1 solid threadweaver
+  propagatedBuildInputs = [
+    kconfig kcoreaddons ki18n kio kservice plasma-framework qtquick1 solid
+    threadweaver
   ];
-  propagatedBuildInputs = [ ki18n kio plasma-framework ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

From de14d6898487addbd27e593ee16cde9a7761d43c Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 11:02:20 -0500
Subject: [PATCH 154/287] kde5.kservice: propagate all buildInputs

---
 pkgs/desktops/kde-5/frameworks-5.21/kservice/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kservice/default.nix b/pkgs/desktops/kde-5/frameworks-5.21/kservice/default.nix
index 3a27d85b9166..bbb4f5fae58c 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kservice/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kservice/default.nix
@@ -4,15 +4,12 @@
 
 kdeFramework {
   name = "kservice";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   propagatedNativeBuildInputs = [ extra-cmake-modules ];
   nativeBuildInputs = [ kdoctools ];
-  buildInputs = [ kcrash kdbusaddons ];
-  propagatedBuildInputs = [ kconfig kcoreaddons ki18n kwindowsystem ];
+  propagatedBuildInputs = [ kconfig kcoreaddons kcrash kdbusaddons ki18n kwindowsystem ];
   patches = [
     ./0001-qdiriterator-follow-symlinks.patch
     ./0002-no-canonicalize-path.patch
   ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

From ce8f20ff0ae1528060ec4d55d1f5ae126476db15 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 11:02:33 -0500
Subject: [PATCH 155/287] kde5.ktexteditor: propagate all buildInputs

---
 .../kde-5/frameworks-5.21/ktexteditor/default.nix    | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/ktexteditor/default.nix b/pkgs/desktops/kde-5/frameworks-5.21/ktexteditor/default.nix
index b8df6a5f4c0d..e1a5e8b2339a 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/ktexteditor/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/ktexteditor/default.nix
@@ -8,15 +8,11 @@
 
 kdeFramework {
   name = "ktexteditor";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules makeQtWrapper perl ];
-  buildInputs = [
-    karchive kconfig kguiaddons kiconthemes kparts
-    libgit2
-    qtscript qtxmlpatterns
+  propagatedBuildInputs = [
+    karchive kconfig kguiaddons ki18n kiconthemes kio kparts libgit2 qtscript
+    qtxmlpatterns sonnet
   ];
-  propagatedBuildInputs = [ ki18n kio sonnet ];
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

From fd26b47be4ca265725f109834056409b8ae9217d Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 11:02:52 -0500
Subject: [PATCH 156/287] kde5.ktextwidgets: propagate all buildInputs

---
 pkgs/desktops/kde-5/frameworks-5.21/ktextwidgets.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/ktextwidgets.nix b/pkgs/desktops/kde-5/frameworks-5.21/ktextwidgets.nix
index e332d4ff9a83..25954c603971 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/ktextwidgets.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/ktextwidgets.nix
@@ -5,12 +5,10 @@
 
 kdeFramework {
   name = "ktextwidgets";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kcompletion kconfig kconfigwidgets kiconthemes kservice
+  propagatedBuildInputs = [
+    kcompletion kconfig kconfigwidgets ki18n kiconthemes kservice kwindowsystem
+    sonnet
   ];
-  propagatedBuildInputs = [ ki18n kwindowsystem sonnet ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

From 7bda979a1ac340ac2bb8aac1da33dcd3a29a1d05 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 11:03:05 -0500
Subject: [PATCH 157/287] kde5.kunitconversion: propagate all buildInputs

---
 pkgs/desktops/kde-5/frameworks-5.21/kunitconversion.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kunitconversion.nix b/pkgs/desktops/kde-5/frameworks-5.21/kunitconversion.nix
index 3cf0f847d83d..c04ded722aa4 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kunitconversion.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kunitconversion.nix
@@ -2,9 +2,7 @@
 
 kdeFramework {
   name = "kunitconversion";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [ ki18n ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

From b0cfdf77ef2907e2cb72693e702259f96e4ffae9 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 11:03:19 -0500
Subject: [PATCH 158/287] kde5.kwallet: propagate all buildInputs

---
 pkgs/desktops/kde-5/frameworks-5.21/kwallet.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kwallet.nix b/pkgs/desktops/kde-5/frameworks-5.21/kwallet.nix
index 5ade5f63a8d0..3bb99df39a7d 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kwallet.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kwallet.nix
@@ -5,17 +5,14 @@
 
 kdeFramework {
   name = "kwallet";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  buildInputs = [
-    kconfig kconfigwidgets kcoreaddons kdbusaddons kiconthemes
-    knotifications kservice kwidgetsaddons libgcrypt
+  propagatedBuildInputs = [
+    kconfig kconfigwidgets kcoreaddons kdbusaddons ki18n kiconthemes
+    knotifications kservice kwidgetsaddons kwindowsystem libgcrypt
   ];
-  propagatedBuildInputs = [ ki18n kwindowsystem ];
   postInstall = ''
     wrapQtProgram "$out/bin/kwalletd5"
     wrapQtProgram "$out/bin/kwallet-query"
   '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

From 7ab37acfce1b86742b843e03fcdc50a10c1be2cc Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 11:03:36 -0500
Subject: [PATCH 159/287] kde5.kwidgetsaddons: propagate all buildInputs

---
 pkgs/desktops/kde-5/frameworks-5.21/kwidgetsaddons.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kwidgetsaddons.nix b/pkgs/desktops/kde-5/frameworks-5.21/kwidgetsaddons.nix
index d95f44d3fecf..7f2b35d8f7b5 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kwidgetsaddons.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kwidgetsaddons.nix
@@ -4,8 +4,6 @@
 
 kdeFramework {
   name = "kwidgetsaddons";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

From 48f4e043f48cb7b9d3c7417f16fc046d15456402 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 11:03:50 -0500
Subject: [PATCH 160/287] kde5.kwindowsystem: propagate all buildInputs

---
 pkgs/desktops/kde-5/frameworks-5.21/kwindowsystem.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kwindowsystem.nix b/pkgs/desktops/kde-5/frameworks-5.21/kwindowsystem.nix
index 09ab1f2200de..6acab52d1353 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kwindowsystem.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kwindowsystem.nix
@@ -5,9 +5,7 @@
 
 kdeFramework {
   name = "kwindowsystem";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtx11extras ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
+  propagatedBuildInputs = [ qtx11extras ];
 }

From b8b755a869cf351f23923c9aa2a757b035200040 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 11:04:22 -0500
Subject: [PATCH 161/287] kde5.kxmlgui: propagate all buildInputs

---
 pkgs/desktops/kde-5/frameworks-5.21/kxmlgui.nix | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kxmlgui.nix b/pkgs/desktops/kde-5/frameworks-5.21/kxmlgui.nix
index f081d5f9170e..ea800bf58ae0 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kxmlgui.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kxmlgui.nix
@@ -5,14 +5,10 @@
 
 kdeFramework {
   name = "kxmlgui";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    attica kconfig kiconthemes kitemviews ktextwidgets
-  ];
   propagatedBuildInputs = [
-    kconfigwidgets kglobalaccel ki18n kwindowsystem sonnet
+    attica kconfig kconfigwidgets kglobalaccel ki18n kiconthemes kitemviews
+    ktextwidgets kwindowsystem sonnet
   ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

From 02f34bbcbc4062a58ed917a76668ad67af70b0b8 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 11:04:34 -0500
Subject: [PATCH 162/287] kde5.kxmlrpcclient: propagate all buildInputs

---
 pkgs/desktops/kde-5/frameworks-5.21/kxmlrpcclient.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kxmlrpcclient.nix b/pkgs/desktops/kde-5/frameworks-5.21/kxmlrpcclient.nix
index 20a300b68bc8..f20f4a223945 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kxmlrpcclient.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kxmlrpcclient.nix
@@ -2,9 +2,7 @@
 
 kdeFramework {
   name = "kxmlrpcclient";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [ ki18n kio ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

From a630b4ec5759da71539cc4ce221da3707ce4e7ec Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 11:04:47 -0500
Subject: [PATCH 163/287] kde5.modemmanager-qt: propagate all buildInputs

---
 pkgs/desktops/kde-5/frameworks-5.21/modemmanager-qt.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/modemmanager-qt.nix b/pkgs/desktops/kde-5/frameworks-5.21/modemmanager-qt.nix
index 7d7f769d6a9b..e03254a71edd 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/modemmanager-qt.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/modemmanager-qt.nix
@@ -5,9 +5,7 @@
 
 kdeFramework {
   name = "modemmanager-qt";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [ modemmanager ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

From fbd7c269d13ea8381f71cb4952f235978e7be13c Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 11:05:02 -0500
Subject: [PATCH 164/287] kde5.networkmanager-qt: propagate all buildInputs

---
 pkgs/desktops/kde-5/frameworks-5.21/networkmanager-qt.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/networkmanager-qt.nix b/pkgs/desktops/kde-5/frameworks-5.21/networkmanager-qt.nix
index 333378bd1431..0515509a77c5 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/networkmanager-qt.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/networkmanager-qt.nix
@@ -5,9 +5,7 @@
 
 kdeFramework {
   name = "networkmanager-qt";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [ networkmanager ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

From c79a6ae2ac49b10422aff8c3819bed1c210cbfd7 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 11:05:16 -0500
Subject: [PATCH 165/287] kde5.oxygen-icons5: propagate all buildInputs

---
 pkgs/desktops/kde-5/frameworks-5.21/oxygen-icons5.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/oxygen-icons5.nix b/pkgs/desktops/kde-5/frameworks-5.21/oxygen-icons5.nix
index ee350f8e1536..0e5198984380 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/oxygen-icons5.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/oxygen-icons5.nix
@@ -5,9 +5,9 @@
 
 kdeFramework {
   name = "oxygen-icons5";
-  nativeBuildInputs = [ extra-cmake-modules ];
   meta = {
     license = lib.licenses.lgpl3Plus;
     maintainers = [ lib.maintainers.ttuegel ];
   };
+  nativeBuildInputs = [ extra-cmake-modules ];
 }

From 5698bb9c735aa454915b3bd9ca1932edee5d0c21 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 11:05:30 -0500
Subject: [PATCH 166/287] kde5.plasma-framework: propagate all buildInputs

---
 .../kde-5/frameworks-5.21/plasma-framework.nix      | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/plasma-framework.nix b/pkgs/desktops/kde-5/frameworks-5.21/plasma-framework.nix
index d8846f777231..2a8762c814f3 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/plasma-framework.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/plasma-framework.nix
@@ -7,19 +7,14 @@
 
 kdeFramework {
   name = "plasma-framework";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  buildInputs = [
-    karchive kconfig kconfigwidgets kcoreaddons kdbusaddons kguiaddons
-    kiconthemes knotifications kxmlgui qtscript
-  ];
   propagatedBuildInputs = [
-    kactivities kdeclarative kglobalaccel ki18n kio kpackage kservice kwindowsystem
-    qtx11extras
+    kactivities karchive kconfig kconfigwidgets kcoreaddons kdbusaddons
+    kdeclarative kglobalaccel kguiaddons ki18n kiconthemes kio knotifications
+    kpackage kservice kwindowsystem kxmlgui qtscript qtx11extras
   ];
   postInstall = ''
     wrapQtProgram "$out/bin/plasmapkg2"
   '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

From e5eada7ab815978badc46c2b51574d96c6196a4a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 11:05:44 -0500
Subject: [PATCH 167/287] kde5.solid: propagate all buildInputs

---
 pkgs/desktops/kde-5/frameworks-5.21/solid.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/solid.nix b/pkgs/desktops/kde-5/frameworks-5.21/solid.nix
index afd125e3c597..f1db5c35c10a 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/solid.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/solid.nix
@@ -6,12 +6,10 @@
 
 kdeFramework {
   name = "solid";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
-  buildInputs = [ qtdeclarative ];
+  propagatedBuildInputs = [ qtdeclarative ];
   postInstall = ''
     wrapQtProgram "$out/bin/solid-hardware5"
   '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

From c78bae87ce27cb6fc1c4d20d7395962fc4dec9ca Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 11:05:56 -0500
Subject: [PATCH 168/287] kde5.sonnet: propagate all buildInputs

---
 pkgs/desktops/kde-5/frameworks-5.21/sonnet.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/sonnet.nix b/pkgs/desktops/kde-5/frameworks-5.21/sonnet.nix
index 943fe04a1c92..28c24302abc4 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/sonnet.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/sonnet.nix
@@ -5,9 +5,7 @@
 
 kdeFramework {
   name = "sonnet";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ hunspell ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

From 6d01760dd4739829bd7bf4a2ae3bb79a147200c8 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 11:06:08 -0500
Subject: [PATCH 169/287] kde5.threadweaver: propagate buildInputs

---
 pkgs/desktops/kde-5/frameworks-5.21/threadweaver.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/threadweaver.nix b/pkgs/desktops/kde-5/frameworks-5.21/threadweaver.nix
index 52817921cc72..b8f2939e8b59 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/threadweaver.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/threadweaver.nix
@@ -5,7 +5,5 @@
 kdeFramework {
   name = "threadweaver";
   nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
 }

From 3f753a655d22b468043fe95860d754a6b8a19f59 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 11:10:42 -0500
Subject: [PATCH 170/287] kde5.kservice: add patch to increase buffer size

Fixes #15044.
---
 .../0001-qdiriterator-follow-symlinks.patch   | 25 -------------------
 .../kservice/0002-no-canonicalize-path.patch  | 25 -------------------
 .../frameworks-5.21/kservice/default.nix      |  7 ++----
 .../kservice/ksycoca-buffer-size.patch        | 25 +++++++++++++++++++
 .../kservice/no-canonicalize-path.patch       | 13 ++++++++++
 .../qdiriterator-follow-symlinks.patch        | 13 ++++++++++
 .../kde-5/frameworks-5.21/kservice/series     |  3 +++
 7 files changed, 56 insertions(+), 55 deletions(-)
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kservice/0001-qdiriterator-follow-symlinks.patch
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kservice/0002-no-canonicalize-path.patch
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kservice/ksycoca-buffer-size.patch
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kservice/no-canonicalize-path.patch
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kservice/qdiriterator-follow-symlinks.patch
 create mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kservice/series

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kservice/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/frameworks-5.21/kservice/0001-qdiriterator-follow-symlinks.patch
deleted file mode 100644
index 3d8397d8ee2d..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.21/kservice/0001-qdiriterator-follow-symlinks.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From ae8919eb81abad369e4a26ffcd845b140983398d Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Wed, 14 Oct 2015 06:28:57 -0500
-Subject: [PATCH 1/2] qdiriterator follow symlinks
-
----
- src/sycoca/kbuildsycoca.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/sycoca/kbuildsycoca.cpp b/src/sycoca/kbuildsycoca.cpp
-index 1deae14..250baa8 100644
---- a/src/sycoca/kbuildsycoca.cpp
-+++ b/src/sycoca/kbuildsycoca.cpp
-@@ -208,7 +208,7 @@ bool KBuildSycoca::build()
-         QStringList relFiles;
-         const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, m_resourceSubdir, QStandardPaths::LocateDirectory);
-         Q_FOREACH (const QString &dir, dirs) {
--            QDirIterator it(dir, QDirIterator::Subdirectories);
-+            QDirIterator it(dir, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
-             while (it.hasNext()) {
-                 const QString filePath = it.next();
-                 Q_ASSERT(filePath.startsWith(dir)); // due to the line below...
--- 
-2.5.2
-
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kservice/0002-no-canonicalize-path.patch b/pkgs/desktops/kde-5/frameworks-5.21/kservice/0002-no-canonicalize-path.patch
deleted file mode 100644
index 685c68526119..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.21/kservice/0002-no-canonicalize-path.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 46d124da602d84b7611a7ff0ac0862168d451cdb Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Wed, 14 Oct 2015 06:31:29 -0500
-Subject: [PATCH 2/2] no canonicalize path
-
----
- src/sycoca/vfolder_menu.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/sycoca/vfolder_menu.cpp b/src/sycoca/vfolder_menu.cpp
-index d3e31c3..d15d743 100644
---- a/src/sycoca/vfolder_menu.cpp
-+++ b/src/sycoca/vfolder_menu.cpp
-@@ -415,7 +415,7 @@ VFolderMenu::absoluteDir(const QString &_dir, const QString &baseDir, bool keepR
-     }
- 
-     if (!relative) {
--        QString resolved = QDir(dir).canonicalPath();
-+      QString resolved = QDir::cleanPath(dir);
-         if (!resolved.isEmpty()) {
-             dir = resolved;
-         }
--- 
-2.5.2
-
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kservice/default.nix b/pkgs/desktops/kde-5/frameworks-5.21/kservice/default.nix
index bbb4f5fae58c..484be4087943 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kservice/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kservice/default.nix
@@ -1,4 +1,4 @@
-{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons
+{ kdeFramework, lib, copyPathsToStore, extra-cmake-modules, kconfig, kcoreaddons
 , kcrash, kdbusaddons, kdoctools, ki18n, kwindowsystem
 }:
 
@@ -8,8 +8,5 @@ kdeFramework {
   propagatedNativeBuildInputs = [ extra-cmake-modules ];
   nativeBuildInputs = [ kdoctools ];
   propagatedBuildInputs = [ kconfig kcoreaddons kcrash kdbusaddons ki18n kwindowsystem ];
-  patches = [
-    ./0001-qdiriterator-follow-symlinks.patch
-    ./0002-no-canonicalize-path.patch
-  ];
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kservice/ksycoca-buffer-size.patch b/pkgs/desktops/kde-5/frameworks-5.21/kservice/ksycoca-buffer-size.patch
new file mode 100644
index 000000000000..e65d4505ed26
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kservice/ksycoca-buffer-size.patch
@@ -0,0 +1,25 @@
+Index: kservice-5.21.0/src/sycoca/ksycocautils.cpp
+===================================================================
+--- kservice-5.21.0.orig/src/sycoca/ksycocautils.cpp
++++ kservice-5.21.0/src/sycoca/ksycocautils.cpp
+@@ -24,9 +24,10 @@
+ 
+ void KSycocaUtilsPrivate::read(QDataStream &s, QString &str)
+ {
++    const qint32 bufferSize = 65528;
+     quint32 bytes;
+     s >> bytes;                          // read size of string
+-    if (bytes > 8192) {                  // null string or too big
++    if (bytes > bufferSize) {                  // null string or too big
+         if (bytes != 0xffffffff) {
+             KSycoca::flagError();
+         }
+@@ -35,7 +36,7 @@ void KSycocaUtilsPrivate::read(QDataStre
+         int bt = bytes / 2;
+         str.resize(bt);
+         QChar *ch = str.data();
+-        char t[8192];
++        char t[bufferSize];
+         char *b = t;
+         s.readRawData(b, bytes);
+         while (bt--) {
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kservice/no-canonicalize-path.patch b/pkgs/desktops/kde-5/frameworks-5.21/kservice/no-canonicalize-path.patch
new file mode 100644
index 000000000000..cf98ffb9067f
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kservice/no-canonicalize-path.patch
@@ -0,0 +1,13 @@
+Index: kservice-5.21.0/src/sycoca/vfolder_menu.cpp
+===================================================================
+--- kservice-5.21.0.orig/src/sycoca/vfolder_menu.cpp
++++ kservice-5.21.0/src/sycoca/vfolder_menu.cpp
+@@ -415,7 +415,7 @@ VFolderMenu::absoluteDir(const QString &
+     }
+ 
+     if (!relative) {
+-        QString resolved = QDir(dir).canonicalPath();
++      QString resolved = QDir::cleanPath(dir);
+         if (!resolved.isEmpty()) {
+             dir = resolved;
+         }
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kservice/qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/frameworks-5.21/kservice/qdiriterator-follow-symlinks.patch
new file mode 100644
index 000000000000..cbe13b709508
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kservice/qdiriterator-follow-symlinks.patch
@@ -0,0 +1,13 @@
+Index: kservice-5.21.0/src/sycoca/kbuildsycoca.cpp
+===================================================================
+--- kservice-5.21.0.orig/src/sycoca/kbuildsycoca.cpp
++++ kservice-5.21.0/src/sycoca/kbuildsycoca.cpp
+@@ -203,7 +203,7 @@ bool KBuildSycoca::build()
+         QSet<QString> relFiles;
+         const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, m_resourceSubdir, QStandardPaths::LocateDirectory);
+         Q_FOREACH (const QString &dir, dirs) {
+-            QDirIterator it(dir, QDirIterator::Subdirectories);
++            QDirIterator it(dir, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
+             while (it.hasNext()) {
+                 const QString filePath = it.next();
+                 Q_ASSERT(filePath.startsWith(dir)); // due to the line below...
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kservice/series b/pkgs/desktops/kde-5/frameworks-5.21/kservice/series
new file mode 100644
index 000000000000..c1655f686064
--- /dev/null
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kservice/series
@@ -0,0 +1,3 @@
+qdiriterator-follow-symlinks.patch
+no-canonicalize-path.patch
+ksycoca-buffer-size.patch

From f79ace27289ac60e71c7be743602b52d21df1fae Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 11:51:08 -0500
Subject: [PATCH 171/287] qt55.poppler: compile with -DQT_NO_DEBUG

Qt's debugging messages cause the qtbase.dev output to be retained by
poppler.out.
---
 pkgs/development/libraries/poppler/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index ebcdcc2b3efd..bb3458d62dd4 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -29,11 +29,14 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig libiconv ] ++ libintlOrEmpty;
 
+  NIX_CFLAGS_COMPILE = [ "-DQT_NO_DEBUG" ];
+
   configureFlags = with lib;
     [
       "--enable-xpdf-headers"
       "--enable-libcurl"
       "--enable-zlib"
+      "--enable-build-type=release"
     ]
     ++ optionals minimal [ "--disable-poppler-glib" "--disable-poppler-cpp" ]
     ++ optional (!utils) "--disable-utils";

From ff7c15b41dd0ebc0ea4589a7399c22b198d38bd4 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 12:48:59 -0500
Subject: [PATCH 172/287] kde5.bluedevil: propagate all buildInputs

---
 pkgs/desktops/kde-5/plasma-5.6/bluedevil.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/kde-5/plasma-5.6/bluedevil.nix b/pkgs/desktops/kde-5/plasma-5.6/bluedevil.nix
index 6596c246202f..3bfac828084d 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/bluedevil.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/bluedevil.nix
@@ -9,12 +9,9 @@ plasmaPackage {
   nativeBuildInputs = [
     extra-cmake-modules makeQtWrapper shared_mime_info
   ];
-  buildInputs = [
-    kcoreaddons kdbusaddons kded kiconthemes knotifications
-    kwidgetsaddons
-  ];
   propagatedBuildInputs = [
-    bluez-qt ki18n kio kwindowsystem plasma-framework qtdeclarative
+    bluez-qt ki18n kio kwindowsystem plasma-framework qtdeclarative kcoreaddons
+    kdbusaddons kded kiconthemes knotifications kwidgetsaddons
   ];
   propagatedUserEnvPkgs = [ bluez-qt ];
   postInstall = ''

From 3f4e8ab4677ae71917a4a5fc8fed2bdb72c39bcc Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 12:49:41 -0500
Subject: [PATCH 173/287] kde5.breeze-qt5: propagate all buildInputs

---
 pkgs/desktops/kde-5/plasma-5.6/breeze-qt5.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/desktops/kde-5/plasma-5.6/breeze-qt5.nix b/pkgs/desktops/kde-5/plasma-5.6/breeze-qt5.nix
index 63ade168805d..f641b48c82bc 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/breeze-qt5.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/breeze-qt5.nix
@@ -10,11 +10,9 @@ plasmaPackage {
     extra-cmake-modules
     makeQtWrapper
   ];
-  buildInputs = [
-    kcmutils kconfigwidgets kcoreaddons kdecoration kguiaddons
-  ];
   propagatedBuildInputs = [
     frameworkintegration ki18n kwindowsystem plasma-framework qtx11extras
+    kcmutils kconfigwidgets kcoreaddons kdecoration kguiaddons
   ];
   cmakeFlags = [ "-DUSE_Qt4=OFF" ];
   postInstall = ''

From 9b5161e3aaac98cf20f94484f174502b2d448afa Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 12:50:10 -0500
Subject: [PATCH 174/287] kde5.kde-cli-tools: propagate all buildInputs

---
 pkgs/desktops/kde-5/plasma-5.6/kde-cli-tools.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/kde-5/plasma-5.6/kde-cli-tools.nix b/pkgs/desktops/kde-5/plasma-5.6/kde-cli-tools.nix
index 7f19af6959ec..d95db120dec4 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/kde-cli-tools.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/kde-cli-tools.nix
@@ -6,11 +6,9 @@
 plasmaPackage {
   name = "kde-cli-tools";
   nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  buildInputs = [
-    kcmutils kconfig kdesu kiconthemes
-  ];
   propagatedBuildInputs = [
-    kdelibs4support ki18n kwindowsystem qtsvg qtx11extras
+    kdelibs4support ki18n kwindowsystem qtsvg qtx11extras kcmutils kconfig kdesu
+    kiconthemes
   ];
   postInstall = ''
     wrapQtProgram "$out/bin/kmimetypefinder5"

From a43ef07c72e1fa36759fab0b90af7387e811390c Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 12:50:55 -0500
Subject: [PATCH 175/287] kde5.kde-gtk-config: propagate all buildInputs

---
 pkgs/desktops/kde-5/plasma-5.6/kde-gtk-config/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/kde-5/plasma-5.6/kde-gtk-config/default.nix b/pkgs/desktops/kde-5/plasma-5.6/kde-gtk-config/default.nix
index ab8867520b38..f482f2a6a3f3 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/kde-gtk-config/default.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/kde-gtk-config/default.nix
@@ -16,11 +16,10 @@ plasmaPackage {
   name = "kde-gtk-config";
   patches = [ ./0001-follow-symlinks.patch ];
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    glib gtk2 gtk3 karchive kcmutils kconfigwidgets kiconthemes
+  propagatedBuildInputs = [
+    ki18n kio glib gtk2 gtk3 karchive kcmutils kconfigwidgets kiconthemes
     knewstuff
   ];
-  propagatedBuildInputs = [ ki18n kio ];
   cmakeFlags = [
     "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"
     "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include"

From b6aeb8e01119684417af4eaa90aa43af773cc2f3 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 12:51:34 -0500
Subject: [PATCH 176/287] kde5.kdeplasma-addons: propagate all buildInputs

---
 pkgs/desktops/kde-5/plasma-5.6/kdeplasma-addons.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/kde-5/plasma-5.6/kdeplasma-addons.nix b/pkgs/desktops/kde-5/plasma-5.6/kdeplasma-addons.nix
index 128cfe34d0d7..570112e44804 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/kdeplasma-addons.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/kdeplasma-addons.nix
@@ -10,12 +10,9 @@ plasmaPackage {
     extra-cmake-modules
     kdoctools
   ];
-  buildInputs = [
-    ibus kconfig kconfigwidgets kcoreaddons kcmutils
-    knewstuff kservice kunitconversion
-  ];
   propagatedBuildInputs = [
     kdelibs4support kio kross krunner plasma-framework plasma-workspace
-    qtdeclarative qtx11extras
+    qtdeclarative qtx11extras ibus kconfig kconfigwidgets kcoreaddons kcmutils
+    knewstuff kservice kunitconversion
   ];
 }

From 188ad5dbb67ad3fc5bc5b02c178276a59d22a7ad Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 12:52:18 -0500
Subject: [PATCH 177/287] kde5.khelpcenter: propagate all buildInputs

---
 pkgs/desktops/kde-5/plasma-5.6/khelpcenter.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/kde-5/plasma-5.6/khelpcenter.nix b/pkgs/desktops/kde-5/plasma-5.6/khelpcenter.nix
index 6ba860b9dfb2..3ded239b09b5 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/khelpcenter.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/khelpcenter.nix
@@ -10,10 +10,10 @@ plasmaPackage {
     kdoctools
     makeQtWrapper
   ];
-  buildInputs = [
-    kconfig kcoreaddons kdbusaddons kinit kcmutils kservice
+  propagatedBuildInputs = [
+    kdelibs4support khtml ki18n kconfig kcoreaddons kdbusaddons kinit kcmutils
+    kservice
   ];
-  propagatedBuildInputs = [ kdelibs4support khtml ki18n ];
   postInstall = ''
     wrapQtProgram "$out/bin/khelpcenter"
   '';

From e3e387f5bd4d98c6228249c790fc8f6042c5b196 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 12:52:42 -0500
Subject: [PATCH 178/287] kde5.khotkeys: propagate buildInputs

---
 pkgs/desktops/kde-5/plasma-5.6/khotkeys.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/kde-5/plasma-5.6/khotkeys.nix b/pkgs/desktops/kde-5/plasma-5.6/khotkeys.nix
index 141320e6b3e6..1666692c928b 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/khotkeys.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/khotkeys.nix
@@ -6,11 +6,8 @@
 plasmaPackage {
   name = "khotkeys";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  buildInputs = [
-    kcmutils kdbusaddons kxmlgui
-  ];
   propagatedBuildInputs = [
-    kdelibs4support kglobalaccel ki18n kio plasma-framework
-    plasma-workspace qtx11extras
+    kdelibs4support kglobalaccel ki18n kio plasma-framework plasma-workspace
+    qtx11extras kcmutils kdbusaddons kxmlgui
   ];
 }

From a9c93158f21dbc7d49ccce5b39beed1d3aa1b342 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 12:53:11 -0500
Subject: [PATCH 179/287] kde5.kinfocenter: propagate all buildInputs

---
 pkgs/desktops/kde-5/plasma-5.6/kinfocenter.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/kde-5/plasma-5.6/kinfocenter.nix b/pkgs/desktops/kde-5/plasma-5.6/kinfocenter.nix
index ed717790cd0d..c6a86fc05f63 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/kinfocenter.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/kinfocenter.nix
@@ -12,12 +12,11 @@ plasmaPackage {
     kdoctools
     makeQtWrapper
   ];
-  buildInputs = [
-    kcmutils kcompletion kconfig kconfigwidgets kcoreaddons
-    kdbusaddons kiconthemes kpackage kservice kwidgetsaddons
-    kxmlgui libraw1394 pciutils solid
+  propagatedBuildInputs = [
+    kdeclarative kdelibs4support ki18n kio kcmutils kcompletion kconfig
+    kconfigwidgets kcoreaddons kdbusaddons kiconthemes kpackage kservice
+    kwidgetsaddons kxmlgui libraw1394 pciutils solid
   ];
-  propagatedBuildInputs = [ kdeclarative kdelibs4support ki18n kio ];
   postInstall = ''
     wrapQtProgram "$out/bin/kinfocenter"
   '';

From 289e0bab8e149ee972e6e2d852359371a7df3ba9 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 12:53:43 -0500
Subject: [PATCH 180/287] kde5.kmenuedit: propagate all buildInputs

---
 pkgs/desktops/kde-5/plasma-5.6/kmenuedit.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/kde-5/plasma-5.6/kmenuedit.nix b/pkgs/desktops/kde-5/plasma-5.6/kmenuedit.nix
index 3834ca1328f8..09224a487167 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/kmenuedit.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/kmenuedit.nix
@@ -9,10 +9,9 @@ plasmaPackage {
     kdoctools
     makeQtWrapper
   ];
-  buildInputs = [
-    kxmlgui kdbusaddons kiconthemes
+  propagatedBuildInputs = [
+    kdelibs4support ki18n kio sonnet kxmlgui kdbusaddons kiconthemes
   ];
-  propagatedBuildInputs = [ kdelibs4support ki18n kio sonnet ];
   postInstall = ''
     wrapQtProgram "$out/bin/kmenuedit"
   '';

From 21710ee0124c8a5719210dbe1bf83133cfc70b99 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 12:54:15 -0500
Subject: [PATCH 181/287] kde5.kscreenlocker: propagate all buildInputs

---
 pkgs/desktops/kde-5/plasma-5.6/kscreenlocker.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/kde-5/plasma-5.6/kscreenlocker.nix b/pkgs/desktops/kde-5/plasma-5.6/kscreenlocker.nix
index 562797b546e9..2cb3aac0f559 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/kscreenlocker.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/kscreenlocker.nix
@@ -9,11 +9,8 @@ plasmaPackage {
     extra-cmake-modules
     kdoctools
   ];
-  buildInputs = [
-    kcmutils kcrash kdelibs4support kglobalaccel kidletime kwayland
-    libXcursor pam wayland
-  ];
   propagatedBuildInputs = [
-    kdeclarative plasma-framework qtdeclarative
+    kdeclarative plasma-framework qtdeclarative kcmutils kcrash kdelibs4support
+    kglobalaccel kidletime kwayland libXcursor pam wayland
   ];
 }

From 483ed9427fa26fea6dc887c9e5af399b57254429 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 12:54:44 -0500
Subject: [PATCH 182/287] kde5.kscreen: propagate all buildInputs

---
 pkgs/desktops/kde-5/plasma-5.6/kscreen.nix | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/pkgs/desktops/kde-5/plasma-5.6/kscreen.nix b/pkgs/desktops/kde-5/plasma-5.6/kscreen.nix
index a521a7993628..117a39c3be32 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/kscreen.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/kscreen.nix
@@ -9,19 +9,9 @@ plasmaPackage {
     extra-cmake-modules
     makeQtWrapper
   ];
-  buildInputs = [
-    kconfig
-    kconfigwidgets
-    kdbusaddons
-    kwidgetsaddons
-    kxmlgui
-  ];
   propagatedBuildInputs = [
-    kglobalaccel
-    ki18n
-    libkscreen
-    qtdeclarative
-    qtgraphicaleffects
+    kglobalaccel ki18n libkscreen qtdeclarative qtgraphicaleffects kconfig
+    kconfigwidgets kdbusaddons kwidgetsaddons kxmlgui
   ];
   postInstall = ''
     wrapQtProgram "$out/bin/kscreen-console"

From b63b3485a076c36b500c1d0f63076fe6b50d8ff1 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 12:55:09 -0500
Subject: [PATCH 183/287] kde5.ksshaskpass: propagate all buildInputs

---
 pkgs/desktops/kde-5/plasma-5.6/ksshaskpass.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/desktops/kde-5/plasma-5.6/ksshaskpass.nix b/pkgs/desktops/kde-5/plasma-5.6/ksshaskpass.nix
index f274512e027a..8fe7cecd5a80 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/ksshaskpass.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/ksshaskpass.nix
@@ -5,8 +5,7 @@
 plasmaPackage {
   name = "ksshaskpass";
   nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  buildInputs = [ kcoreaddons kwallet kwidgetsaddons ];
-  propagatedBuildInputs = [ ki18n ];
+  propagatedBuildInputs = [ kcoreaddons ki18n kwallet kwidgetsaddons ];
   postInstall = ''
     wrapQtProgram "$out/bin/ksshaskpass"
   '';

From bb74e9afa59e59be069f24f4fdfff79c42f8eefe Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 12:55:47 -0500
Subject: [PATCH 184/287] kde5.ksysguard: propagate all buildInputs

---
 pkgs/desktops/kde-5/plasma-5.6/ksysguard.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/kde-5/plasma-5.6/ksysguard.nix b/pkgs/desktops/kde-5/plasma-5.6/ksysguard.nix
index d47f9215a41a..637d539189d5 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/ksysguard.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/ksysguard.nix
@@ -10,10 +10,10 @@ plasmaPackage {
     kdoctools
     makeQtWrapper
   ];
-  buildInputs = [
+  propagatedBuildInputs = [
     kconfig kcoreaddons kitemviews knewstuff kiconthemes libksysguard
+    kdelibs4support ki18n
   ];
-  propagatedBuildInputs = [ kdelibs4support ki18n ];
   postInstall = ''
     wrapQtProgram "$out/bin/ksysguardd"
   '';

From 27aca6670ced3e488977bd64f75b4803af058f91 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 12:56:15 -0500
Subject: [PATCH 185/287] kde5.kwayland: propagate all buildInputs

---
 pkgs/desktops/kde-5/plasma-5.6/kwayland.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/kde-5/plasma-5.6/kwayland.nix b/pkgs/desktops/kde-5/plasma-5.6/kwayland.nix
index e4d6eb631f95..3c2788237fc8 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/kwayland.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/kwayland.nix
@@ -8,7 +8,7 @@ plasmaPackage {
   nativeBuildInputs = [
     extra-cmake-modules
   ];
-  buildInputs = [
+  propagatedBuildInputs = [
     wayland
   ];
 }

From e4d3699976d58f454c488e91e2d225a03bdf510d Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 12:56:40 -0500
Subject: [PATCH 186/287] kde5.kwin: propagate all buildInputs

---
 pkgs/desktops/kde-5/plasma-5.6/kwin/default.nix | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/desktops/kde-5/plasma-5.6/kwin/default.nix b/pkgs/desktops/kde-5/plasma-5.6/kwin/default.nix
index a09acb88aade..8c85981de7e8 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/kwin/default.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/kwin/default.nix
@@ -15,15 +15,13 @@ plasmaPackage {
     kdoctools
     makeQtWrapper
   ];
-  buildInputs = [
-    epoxy kcompletion kcmutils kconfig kconfigwidgets kcoreaddons
-    kcrash kdecoration kiconthemes kidletime kinit knewstuff knotifications
-    kpackage kservice kwayland kwidgetsaddons kxmlgui libinput libICE
-    libSM qtscript udev wayland xcb-util-cursor
-  ];
   propagatedBuildInputs = [
-    kactivities kdeclarative kglobalaccel ki18n kio kscreenlocker
-    kwindowsystem plasma-framework qtdeclarative qtmultimedia qtx11extras
+    kactivities kdeclarative kglobalaccel ki18n kio kscreenlocker kwindowsystem
+    plasma-framework qtdeclarative qtmultimedia qtx11extras epoxy kcompletion
+    kcmutils kconfig kconfigwidgets kcoreaddons kcrash kdecoration kiconthemes
+    kidletime kinit knewstuff knotifications kpackage kservice kwayland
+    kwidgetsaddons kxmlgui libinput libICE libSM qtscript udev wayland
+    xcb-util-cursor
   ];
   patches = [ ./0001-qdiriterator-follow-symlinks.patch ];
   cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" ];

From 0dc8b5f32c8e533d62fe686e81042694496afa89 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 12:57:06 -0500
Subject: [PATCH 187/287] kde5.kwrited: propagate all buildInputs

---
 pkgs/desktops/kde-5/plasma-5.6/kwrited.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/desktops/kde-5/plasma-5.6/kwrited.nix b/pkgs/desktops/kde-5/plasma-5.6/kwrited.nix
index a6ed9d9bb287..29498e93404d 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/kwrited.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/kwrited.nix
@@ -5,6 +5,5 @@
 plasmaPackage {
   name = "kwrited";
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kcoreaddons kpty knotifications kdbusaddons ];
-  propagatedBuildInputs = [ ki18n ];
+  propagatedBuildInputs = [ kcoreaddons ki18n kpty knotifications kdbusaddons ];
 }

From 56dd0c254187b07a4c548123a342ef4ccf7a5ee8 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 12:57:28 -0500
Subject: [PATCH 188/287] kde5.libkscreen: propagate all buildInputs

---
 pkgs/desktops/kde-5/plasma-5.6/libkscreen.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/desktops/kde-5/plasma-5.6/libkscreen.nix b/pkgs/desktops/kde-5/plasma-5.6/libkscreen.nix
index eddedf969b0e..4e04fd5ed1d9 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/libkscreen.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/libkscreen.nix
@@ -9,10 +9,7 @@ plasmaPackage {
   nativeBuildInputs = [
     extra-cmake-modules
   ];
-  buildInputs = [
-    kwayland libXrandr
-  ];
   propagatedBuildInputs = [
-    qtx11extras
+    kwayland libXrandr qtx11extras
   ];
 }

From 5addd165de7e68d6b1fb4f5ec6fd53a2b7c85e8e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 12:57:53 -0500
Subject: [PATCH 189/287] kde5.libksysguard: propagate all buildInputs

---
 pkgs/desktops/kde-5/plasma-5.6/libksysguard/default.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/kde-5/plasma-5.6/libksysguard/default.nix b/pkgs/desktops/kde-5/plasma-5.6/libksysguard/default.nix
index 9c352d76156f..679ba61e3e29 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/libksysguard/default.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/libksysguard/default.nix
@@ -12,12 +12,9 @@ plasmaPackage {
   nativeBuildInputs = [
     extra-cmake-modules
   ];
-  buildInputs = [
-    kcompletion kconfigwidgets kcoreaddons kservice
-    kwidgetsaddons qtscript qtwebkit
-  ];
   propagatedBuildInputs = [
-    kauth kconfig ki18n kiconthemes kwindowsystem plasma-framework
-    qtx11extras
+    kauth kconfig ki18n kiconthemes kwindowsystem plasma-framework qtx11extras
+    kcompletion kconfigwidgets kcoreaddons kservice kwidgetsaddons qtscript
+    qtwebkit
   ];
 }

From 8fb25cb4c2b2fe15a01f4d7e8429fc74e3f99154 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 12:58:17 -0500
Subject: [PATCH 190/287] kde5.milou: propagate all buildInputs

---
 pkgs/desktops/kde-5/plasma-5.6/milou.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/kde-5/plasma-5.6/milou.nix b/pkgs/desktops/kde-5/plasma-5.6/milou.nix
index 760de2d79ab4..43f78d9e2a97 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/milou.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/milou.nix
@@ -8,10 +8,8 @@ plasmaPackage {
   nativeBuildInputs = [
     extra-cmake-modules
   ];
-  buildInputs = [
-    qtscript kcoreaddons kservice
-  ];
   propagatedBuildInputs = [
-    kdeclarative ki18n krunner plasma-framework qtdeclarative
+    kdeclarative ki18n krunner plasma-framework qtdeclarative qtscript
+    kcoreaddons kservice
   ];
 }

From cfc28505b5a366e8dd0c09213553055492d35817 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 12:58:47 -0500
Subject: [PATCH 191/287] kde5.oxygen: propagate all buildInputs

---
 pkgs/desktops/kde-5/plasma-5.6/oxygen.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/kde-5/plasma-5.6/oxygen.nix b/pkgs/desktops/kde-5/plasma-5.6/oxygen.nix
index 02918100408a..5a783ca65027 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/oxygen.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/oxygen.nix
@@ -8,11 +8,10 @@ plasmaPackage {
   nativeBuildInputs = [
     extra-cmake-modules makeQtWrapper
   ];
-  buildInputs = [
-    kcmutils kconfig kdecoration kguiaddons kwidgetsaddons
-    kservice kcompletion
+  propagatedBuildInputs = [
+    kcmutils kconfig kdecoration kguiaddons kwidgetsaddons kservice kcompletion
+    frameworkintegration ki18n kwindowsystem qtx11extras
   ];
-  propagatedBuildInputs = [ frameworkintegration ki18n kwindowsystem qtx11extras ];
   postInstall = ''
     wrapQtProgram "$out/bin/oxygen-demo5"
     wrapQtProgram "$out/bin/oxygen-settings5"

From 747daca4079f2c4150b978ad2972fbec0fa6ab0a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 12:59:24 -0500
Subject: [PATCH 192/287] kde5.plasma-desktop: propagate all buildInputs

---
 .../plasma-5.6/plasma-desktop/default.nix     | 48 +++----------------
 1 file changed, 7 insertions(+), 41 deletions(-)

diff --git a/pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/default.nix b/pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/default.nix
index 5f27efc7f24c..3475f53e858e 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/default.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/default.nix
@@ -17,48 +17,14 @@ plasmaPackage rec {
     kdoctools
     makeQtWrapper
   ];
-  buildInputs = [
-    attica
-    boost
-    fontconfig
-    kcmutils
-    kdbusaddons
-    kded
-    kitemmodels
-    knewstuff
-    knotifications
-    knotifyconfig
-    kwallet
-    libcanberra_kde
-    libXcursor
-    libpulseaudio
-    libXft
-    libxkbfile
-    phonon
-    qtsvg
-    xf86inputevdev
-    xf86inputsynaptics
-    xkeyboard_config
-    xinput
-  ];
   propagatedBuildInputs = [
-    baloo
-    kactivities
-    kauth
-    kdeclarative
-    kdelibs4support
-    kemoticons
-    kglobalaccel
-    ki18n
-    kpeople
-    krunner
-    kwin
-    plasma-framework
-    plasma-workspace
-    qtdeclarative
-    qtquick1
-    qtquickcontrols
-    qtx11extras
+    attica boost fontconfig kcmutils kdbusaddons kded kitemmodels knewstuff
+    knotifications knotifyconfig kwallet libcanberra_kde libXcursor
+    libpulseaudio libXft libxkbfile phonon qtsvg xf86inputevdev
+    xf86inputsynaptics xkeyboard_config xinput baloo kactivities kauth
+    kdeclarative kdelibs4support kemoticons kglobalaccel ki18n kpeople krunner
+    kwin plasma-framework plasma-workspace qtdeclarative qtquick1
+    qtquickcontrols qtx11extras
   ];
   patches = [
     ./0001-qt-5.5-QML-import-paths.patch

From 9f0feebeebce5f2cc4698d67b44b80b590c59073 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 12:59:49 -0500
Subject: [PATCH 193/287] kde5.plasma-mediacenter: propagate all buildInputs

---
 pkgs/desktops/kde-5/plasma-5.6/plasma-mediacenter.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/kde-5/plasma-5.6/plasma-mediacenter.nix b/pkgs/desktops/kde-5/plasma-5.6/plasma-mediacenter.nix
index 7088f45d64e2..a1e1cf8a127e 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/plasma-mediacenter.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/plasma-mediacenter.nix
@@ -9,12 +9,8 @@ plasmaPackage rec {
   nativeBuildInputs = [
     extra-cmake-modules
   ];
-  buildInputs = [
-    kconfig kcoreaddons kguiaddons kservice
-    qtdeclarative qtmultimedia taglib
-  ];
   propagatedBuildInputs = [
-    baloo kactivities kdeclarative kfilemetadata ki18n kio
-    plasma-framework
+    baloo kactivities kdeclarative kfilemetadata ki18n kio plasma-framework
+    kconfig kcoreaddons kguiaddons kservice qtdeclarative qtmultimedia taglib
   ];
 }

From a022895db1ba6924f174192b76489fdbae258108 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 13:00:16 -0500
Subject: [PATCH 194/287] kde5.plasma-nm: propagate all buildInputs

---
 pkgs/desktops/kde-5/plasma-5.6/plasma-nm/default.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/desktops/kde-5/plasma-5.6/plasma-nm/default.nix b/pkgs/desktops/kde-5/plasma-5.6/plasma-nm/default.nix
index 249c6d8aac94..0ea2ab49f557 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/plasma-nm/default.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/plasma-nm/default.nix
@@ -20,15 +20,12 @@ plasmaPackage {
     kdoctools
     makeQtWrapper
   ];
-  buildInputs = [
-    kcompletion kconfigwidgets kcoreaddons kdbusaddons kiconthemes
-    kinit kitemviews knotifications kservice kwallet kwidgetsaddons
-    kxmlgui mobile_broadband_provider_info modemmanager-qt
-    networkmanager-qt openconnect qca-qt5 solid
-  ];
   propagatedBuildInputs = [
     kdeclarative kdelibs4support ki18n kio kwindowsystem plasma-framework
-    qtdeclarative
+    qtdeclarative kcompletion kconfigwidgets kcoreaddons kdbusaddons kiconthemes
+    kinit kitemviews knotifications kservice kwallet kwidgetsaddons kxmlgui
+    mobile_broadband_provider_info modemmanager-qt networkmanager-qt openconnect
+    qca-qt5 solid
   ];
   postInstall = ''
     wrapQtProgram "$out/bin/kde5-nm-connection-editor"

From ee5cc8f5ce8e031d81391f8ec1f2527baa856a79 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 13:00:41 -0500
Subject: [PATCH 195/287] kde5.plasma-pa: propagate all buildInputs

---
 pkgs/desktops/kde-5/plasma-5.6/plasma-pa.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/kde-5/plasma-5.6/plasma-pa.nix b/pkgs/desktops/kde-5/plasma-5.6/plasma-pa.nix
index ff56d1199b15..1712dab773db 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/plasma-pa.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/plasma-pa.nix
@@ -9,10 +9,8 @@ plasmaPackage {
     extra-cmake-modules
     kdoctools
   ];
-  buildInputs = [
-    glib kconfigwidgets kcoreaddons libpulseaudio
-  ];
   propagatedBuildInputs = [
-    kdeclarative kglobalaccel ki18n plasma-framework
+    glib kconfigwidgets kcoreaddons libpulseaudio kdeclarative kglobalaccel
+    ki18n plasma-framework
   ];
 }

From 758e28728e1bd87f395838bc067a4ae111b25901 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 13:01:27 -0500
Subject: [PATCH 196/287] kde5.polkit-kde-agent: propagate all buildInputs

---
 pkgs/desktops/kde-5/plasma-5.6/polkit-kde-agent.nix | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/pkgs/desktops/kde-5/plasma-5.6/polkit-kde-agent.nix b/pkgs/desktops/kde-5/plasma-5.6/polkit-kde-agent.nix
index 3fc3a441ac34..68bb3a9ef3dc 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/polkit-kde-agent.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/polkit-kde-agent.nix
@@ -17,15 +17,8 @@ plasmaPackage {
   nativeBuildInputs = [
     extra-cmake-modules
   ];
-  buildInputs = [
-    kdbusaddons
-    kwidgetsaddons
-    kcoreaddons
-    kcrash
-    kconfig
-    kiconthemes
-    knotifications
-    polkit-qt
+  propagatedBuildInputs = [
+    kdbusaddons kwidgetsaddons kcoreaddons kcrash kconfig ki18n kiconthemes
+    knotifications kwindowsystem polkit-qt
   ];
-  propagatedBuildInputs = [ ki18n kwindowsystem ];
 }

From d4842648cefcc391a5672b13f686f00617dcfc0d Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 13:01:58 -0500
Subject: [PATCH 197/287] kde5.powerdevil: propagate buildInputs

---
 pkgs/desktops/kde-5/plasma-5.6/powerdevil.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/kde-5/plasma-5.6/powerdevil.nix b/pkgs/desktops/kde-5/plasma-5.6/powerdevil.nix
index 475e8878206a..8f3b354b9478 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/powerdevil.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/powerdevil.nix
@@ -10,11 +10,9 @@ plasmaPackage {
     extra-cmake-modules
     kdoctools
   ];
-  buildInputs = [
-    kconfig kdbusaddons knotifyconfig solid udev
-  ];
   propagatedBuildInputs = [
-    kactivities kauth kdelibs4support kglobalaccel ki18n kio kidletime
-    kwayland libkscreen plasma-workspace qtx11extras
+    kconfig kdbusaddons knotifyconfig solid udev kactivities kauth
+    kdelibs4support kglobalaccel ki18n kio kidletime kwayland libkscreen
+    plasma-workspace qtx11extras
   ];
 }

From a19690156626dfabbd10756a6db606de2c093c84 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 13:03:12 -0500
Subject: [PATCH 198/287] pkgs/desktops/kde-5/plasma-5.6: remove obsolete
 setup-hook.sh

---
 pkgs/desktops/kde-5/plasma-5.6/setup-hook.sh | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 pkgs/desktops/kde-5/plasma-5.6/setup-hook.sh

diff --git a/pkgs/desktops/kde-5/plasma-5.6/setup-hook.sh b/pkgs/desktops/kde-5/plasma-5.6/setup-hook.sh
deleted file mode 100644
index a8d9b7e0e36f..000000000000
--- a/pkgs/desktops/kde-5/plasma-5.6/setup-hook.sh
+++ /dev/null
@@ -1 +0,0 @@
-addToSearchPath XDG_DATA_DIRS @out@/share

From fd272ea970df5c23857a825d723a68bdabc32c61 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 13:03:34 -0500
Subject: [PATCH 199/287] kde5.systemsettings: propagate all buildInputs

---
 pkgs/desktops/kde-5/plasma-5.6/systemsettings.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/kde-5/plasma-5.6/systemsettings.nix b/pkgs/desktops/kde-5/plasma-5.6/systemsettings.nix
index a921e153dbc2..47264cf38fd7 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/systemsettings.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/systemsettings.nix
@@ -11,10 +11,11 @@ plasmaPackage {
     makeQtWrapper
   ];
   buildInputs = [
-    kitemviews kcmutils kservice kiconthemes kxmlgui kdbusaddons
-    kconfig
   ];
-  propagatedBuildInputs = [ khtml ki18n kio kwindowsystem ];
+  propagatedBuildInputs = [
+    khtml ki18n kio kwindowsystem kitemviews kcmutils kservice kiconthemes
+    kxmlgui kdbusaddons kconfig
+  ];
   postInstall = ''
     wrapQtProgram "$out/bin/systemsettings5"
   '';

From 16ab7492988c1c8deb093df274757323f4feb3a3 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 13:05:54 -0500
Subject: [PATCH 200/287] kde5.ark: propagate all buildInputs

---
 pkgs/desktops/kde-5/applications-16.04/ark.nix | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/pkgs/desktops/kde-5/applications-16.04/ark.nix b/pkgs/desktops/kde-5/applications-16.04/ark.nix
index 9e6f414db9e2..331c8c647ca2 100644
--- a/pkgs/desktops/kde-5/applications-16.04/ark.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/ark.nix
@@ -31,21 +31,9 @@ kdeApp {
     extra-cmake-modules
     kdoctools
   ];
-  buildInputs = [
-    karchive
-    kconfig
-    kcrash
-    kdbusaddons
-    kiconthemes
-    kservice
-    kpty
-    kwidgetsaddons
-    libarchive
-  ];
   propagatedBuildInputs = [
-    khtml
-    ki18n
-    kio
+    khtml ki18n kio karchive kconfig kcrash kdbusaddons kiconthemes kservice
+    kpty kwidgetsaddons libarchive
   ];
   postInstall = ''
     wrapQtProgram "$out/bin/ark" \

From a2e48213111092c97351d3075579703c51730ec4 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 13:06:26 -0500
Subject: [PATCH 201/287] kde5.baloo-widgets: propagate all buildInputs

---
 .../applications-16.04/baloo-widgets.nix      | 22 ++++++-------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/pkgs/desktops/kde-5/applications-16.04/baloo-widgets.nix b/pkgs/desktops/kde-5/applications-16.04/baloo-widgets.nix
index a24928160df1..fc91c92dbe6d 100644
--- a/pkgs/desktops/kde-5/applications-16.04/baloo-widgets.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/baloo-widgets.nix
@@ -13,23 +13,15 @@
 
 kdeApp {
   name = "baloo-widgets";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    kconfig
-    kservice
-  ];
-  propagatedBuildInputs = [
-    baloo
-    kdelibs4support
-    kfilemetadata
-    ki18n
-    kio
-  ];
   meta = {
     license = [ lib.licenses.lgpl21 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
+  nativeBuildInputs = [
+    extra-cmake-modules
+    kdoctools
+  ];
+  propagatedBuildInputs = [
+    baloo kconfig kservice kdelibs4support kfilemetadata ki18n kio
+  ];
 }

From a742a3e98f267a172d262be314154d031ea2b213 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 13:07:05 -0500
Subject: [PATCH 202/287] kde5.dolphin: propagate all buildInputs

---
 .../kde-5/applications-16.04/dolphin.nix      | 34 ++++---------------
 1 file changed, 7 insertions(+), 27 deletions(-)

diff --git a/pkgs/desktops/kde-5/applications-16.04/dolphin.nix b/pkgs/desktops/kde-5/applications-16.04/dolphin.nix
index 3218146f510e..168854383faf 100644
--- a/pkgs/desktops/kde-5/applications-16.04/dolphin.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/dolphin.nix
@@ -29,42 +29,22 @@
 
 kdeApp {
   name = "dolphin";
+  meta = {
+    license = with lib.licenses; [ gpl2 fdl12 ];
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
   nativeBuildInputs = [
     extra-cmake-modules
     kdoctools
     makeQtWrapper
   ];
-  buildInputs = [
-    kinit
-    kcmutils
-    kcoreaddons
-    knewstuff
-    kdbusaddons
-    kbookmarks
-    kconfig
-    kparts
-    solid
-    kiconthemes
-    kcompletion
-    knotifications
-    phonon
-    baloo-widgets
-  ];
   propagatedBuildInputs = [
-    baloo
-    kactivities
-    kdelibs4support
-    kfilemetadata
-    ki18n
-    kio
-    ktexteditor
+    kinit kcmutils kcoreaddons knewstuff kdbusaddons kbookmarks kconfig kparts
+    solid kiconthemes kcompletion knotifications phonon baloo-widgets baloo
+    kactivities kdelibs4support kfilemetadata ki18n kio ktexteditor
     kwindowsystem
   ];
   postInstall = ''
     wrapQtProgram "$out/bin/dolphin"
   '';
-  meta = {
-    license = with lib.licenses; [ gpl2 fdl12 ];
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

From aa8d8addeb6b2a1ecf7036004b383e1b4e446c75 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 13:07:33 -0500
Subject: [PATCH 203/287] kde5.dolphin-plugins: propagate all buildInputs

---
 .../applications-16.04/dolphin-plugins.nix    | 20 +++++++------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/pkgs/desktops/kde-5/applications-16.04/dolphin-plugins.nix b/pkgs/desktops/kde-5/applications-16.04/dolphin-plugins.nix
index 72a08c732614..962dd2ba7205 100644
--- a/pkgs/desktops/kde-5/applications-16.04/dolphin-plugins.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/dolphin-plugins.nix
@@ -11,21 +11,15 @@
 
 kdeApp {
   name = "dolphin-plugins";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    kxmlgui
-    dolphin
-  ];
-  propagatedBuildInputs = [
-    kdelibs4support
-    ki18n
-    kio
-  ];
   meta = {
     license = [ lib.licenses.gpl2 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
+  nativeBuildInputs = [
+    extra-cmake-modules
+    kdoctools
+  ];
+  propagatedBuildInputs = [
+    kdelibs4support ki18n kio kxmlgui dolphin
+  ];
 }

From d4819465d8ad8bca848ee78753c81bcfa6e2c911 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 13:08:04 -0500
Subject: [PATCH 204/287] kde5.ffmpegthumbs: propagate all buildInputs

---
 .../kde-5/applications-16.04/ffmpegthumbs.nix      | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/desktops/kde-5/applications-16.04/ffmpegthumbs.nix b/pkgs/desktops/kde-5/applications-16.04/ffmpegthumbs.nix
index 53e9d807d647..feacf7e437e7 100644
--- a/pkgs/desktops/kde-5/applications-16.04/ffmpegthumbs.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/ffmpegthumbs.nix
@@ -7,15 +7,15 @@
 
 kdeApp {
   name = "ffmpegthumbs";
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    ffmpeg
-    kio
-  ];
   meta = {
     license = with lib.licenses; [ gpl2 bsd3 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
+  nativeBuildInputs = [
+    extra-cmake-modules
+  ];
+  propagatedBuildInputs = [
+    ffmpeg
+    kio
+  ];
 }

From 1ebcb5f67fc6762ed1210d1302e7c23fcf6b4b49 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 13:08:37 -0500
Subject: [PATCH 205/287] kde5.filelight: propagate all buildInputs

---
 .../kde-5/applications-16.04/filelight.nix      | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/pkgs/desktops/kde-5/applications-16.04/filelight.nix b/pkgs/desktops/kde-5/applications-16.04/filelight.nix
index df5e097a540e..5ac101fa5018 100644
--- a/pkgs/desktops/kde-5/applications-16.04/filelight.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/filelight.nix
@@ -12,24 +12,19 @@
 
 kdeApp {
   name = "filelight";
+  meta = {
+    license = with lib.licenses; [ gpl2 ];
+    maintainers = with lib.maintainers; [ fridh vcunat ];
+  };
   nativeBuildInputs = [
     extra-cmake-modules
     kdoctools
     makeQtWrapper
   ];
-  buildInputs = [
-    kio
-    kparts
-    qtscript
-    solid
-    kxmlgui
+  propagatedBuildInputs = [
+    kio kparts qtscript solid kxmlgui
   ];
-
   postInstall = ''
     wrapQtProgram "$out/bin/filelight"
   '';
-  meta = {
-    license = with lib.licenses; [ gpl2 ];
-    maintainers = with lib.maintainers; [ fridh vcunat ];
-  };
 }

From fc6606adaf63f3dacf10529670fc746146e10475 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 13:09:05 -0500
Subject: [PATCH 206/287] kde5.gpgmepp: propagate all buildInputs

---
 pkgs/desktops/kde-5/applications-16.04/gpgmepp.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/desktops/kde-5/applications-16.04/gpgmepp.nix b/pkgs/desktops/kde-5/applications-16.04/gpgmepp.nix
index ac14573dcaa3..8d6f11879d3b 100644
--- a/pkgs/desktops/kde-5/applications-16.04/gpgmepp.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/gpgmepp.nix
@@ -7,15 +7,14 @@
 
 kdeApp {
   name = "gpgmepp";
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    boost
-    gpgme
-  ];
   meta = {
     license = with lib.licenses; [ lgpl21 bsd3 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
+  nativeBuildInputs = [
+    extra-cmake-modules
+  ];
+  propagatedBuildInputs = [
+    boost gpgme
+  ];
 }

From fd129bd97a82ab683e8c57dab1b55edb036717fc Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 13:09:36 -0500
Subject: [PATCH 207/287] kde5.gwenview: propagate all buildInputs

---
 .../kde-5/applications-16.04/gwenview.nix     | 20 +++++--------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/pkgs/desktops/kde-5/applications-16.04/gwenview.nix b/pkgs/desktops/kde-5/applications-16.04/gwenview.nix
index 732ac11e96d0..20fc554d01a3 100644
--- a/pkgs/desktops/kde-5/applications-16.04/gwenview.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/gwenview.nix
@@ -16,29 +16,19 @@
 
 kdeApp {
   name = "gwenview";
+  meta = {
+    license = with lib.licenses; [ gpl2 fdl12 ];
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
   nativeBuildInputs = [
     extra-cmake-modules
     kdoctools
     makeQtWrapper
   ];
-  buildInputs = [
-    exiv2
-    lcms2
-    phonon
-    qtsvg
-  ];
   propagatedBuildInputs = [
-    baloo
-    kactivities
-    kdelibs4support
-    kio
-    qtx11extras
+    baloo kactivities kdelibs4support kio qtx11extras exiv2 lcms2 phonon qtsvg
   ];
   postInstall = ''
     wrapQtProgram "$out/bin/gwenview"
   '';
-  meta = {
-    license = with lib.licenses; [ gpl2 fdl12 ];
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

From fa758af5d85868e367cdf366a3be1060ddb8cbc3 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 13:10:10 -0500
Subject: [PATCH 208/287] kde5.kate: propagate all buildInputs

---
 .../kde-5/applications-16.04/kate.nix         | 36 +++++--------------
 1 file changed, 8 insertions(+), 28 deletions(-)

diff --git a/pkgs/desktops/kde-5/applications-16.04/kate.nix b/pkgs/desktops/kde-5/applications-16.04/kate.nix
index 91eeb2314a4c..e368483771f0 100644
--- a/pkgs/desktops/kde-5/applications-16.04/kate.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/kate.nix
@@ -28,42 +28,22 @@
 
 kdeApp {
   name = "kate";
+  meta = {
+    license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ];
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
   nativeBuildInputs = [
     extra-cmake-modules
     kdoctools
   ];
-  buildInputs = [
-    qtscript
-    kconfig
-    kcrash
-    kguiaddons
-    kiconthemes
-    kinit
-    kjobwidgets
-    kparts
-    kxmlgui
-    kdbusaddons
-    kwallet
-    kitemmodels
-    knotifications
-    threadweaver
-    knewstuff
-    libgit2
-  ];
   propagatedBuildInputs = [
-    kactivities
-    ki18n
-    kio
-    ktexteditor
-    kwindowsystem
-    plasma-framework
+    kactivities ki18n kio ktexteditor kwindowsystem plasma-framework qtscript
+    kconfig kcrash kguiaddons kiconthemes kinit kjobwidgets kparts kxmlgui
+    kdbusaddons kwallet kitemmodels knotifications threadweaver knewstuff
+    libgit2
   ];
   postInstall = ''
     wrapQtProgram "$out/bin/kate"
     wrapQtProgram "$out/bin/kwrite"
   '';
-  meta = {
-    license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ];
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
 }

From d3b1d5740e9836bbc1a4cb2223f05db9eeeb88cf Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 13:10:53 -0500
Subject: [PATCH 209/287] kde5.kcalc: propagate buildInputs

---
 .../kde-5/applications-16.04/kcalc.nix        | 29 +++++++------------
 1 file changed, 10 insertions(+), 19 deletions(-)

diff --git a/pkgs/desktops/kde-5/applications-16.04/kcalc.nix b/pkgs/desktops/kde-5/applications-16.04/kcalc.nix
index e4c8e9d69253..ce9cf46d4899 100644
--- a/pkgs/desktops/kde-5/applications-16.04/kcalc.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/kcalc.nix
@@ -13,27 +13,18 @@
 
 kdeApp {
   name = "kcalc";
-
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-
-  buildInputs = [
-    gmp
-    kconfig
-    kconfigwidgets
-    kguiaddons
-    kinit
-    knotifications
-  ];
-
-  postInstall = ''
-    wrapQtProgram "$out/bin/kcalc"
-  '';
-
   meta = {
     license = with lib.licenses; [ gpl2 ];
     maintainers = [ lib.maintainers.fridh ];
   };
+  nativeBuildInputs = [
+    extra-cmake-modules
+    kdoctools
+  ];
+  propagatedBuildInputs = [
+    gmp kconfig kconfigwidgets kguiaddons kinit knotifications
+  ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/kcalc"
+  '';
 }

From 6cef508a393a1422afeee681d9b07b132d85a286 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 13:11:19 -0500
Subject: [PATCH 210/287] kde5.kcolorchooser: propagate all buildInputs

---
 pkgs/desktops/kde-5/applications-16.04/kcolorchooser.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/desktops/kde-5/applications-16.04/kcolorchooser.nix b/pkgs/desktops/kde-5/applications-16.04/kcolorchooser.nix
index 0f8e8fbee829..8726f6870ca3 100644
--- a/pkgs/desktops/kde-5/applications-16.04/kcolorchooser.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/kcolorchooser.nix
@@ -5,12 +5,10 @@
 
 kdeApp {
   name = "kcolorchooser";
-
   meta = {
     license = with lib.licenses; [ mit ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
-
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ ki18n kwidgetsaddons kxmlgui ];
+  propagatedBuildInputs = [ ki18n kwidgetsaddons kxmlgui ];
 }

From e14c14e6b9b6542f86c42e19f9684f06f920dda9 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 13:11:48 -0500
Subject: [PATCH 211/287] kde5.kdegraphics-thumbnailers: propagate all
 buildInputs

---
 .../kdegraphics-thumbnailers.nix                   | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/desktops/kde-5/applications-16.04/kdegraphics-thumbnailers.nix b/pkgs/desktops/kde-5/applications-16.04/kdegraphics-thumbnailers.nix
index 520bad0d066a..cddf064e47b7 100644
--- a/pkgs/desktops/kde-5/applications-16.04/kdegraphics-thumbnailers.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/kdegraphics-thumbnailers.nix
@@ -8,16 +8,14 @@
 
 kdeApp {
   name = "kdegraphics-thumbnailers";
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    kio
-    libkexiv2
-    libkdcraw
-  ];
   meta = {
     license = [ lib.licenses.lgpl21 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
+  nativeBuildInputs = [
+    extra-cmake-modules
+  ];
+  propagatedBuildInputs = [
+    kio libkexiv2 libkdcraw
+  ];
 }

From 303071c14c8268d80e20f4971e56cb2af7ec453c Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 13:12:29 -0500
Subject: [PATCH 212/287] kde5.kdenetwork-filesharing: propagate all
 buildInputs

---
 .../kdenetwork-filesharing.nix                 | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/pkgs/desktops/kde-5/applications-16.04/kdenetwork-filesharing.nix b/pkgs/desktops/kde-5/applications-16.04/kdenetwork-filesharing.nix
index 4e99a43b3913..2190ab8ea644 100644
--- a/pkgs/desktops/kde-5/applications-16.04/kdenetwork-filesharing.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/kdenetwork-filesharing.nix
@@ -11,19 +11,15 @@
 
 kdeApp {
   name = "kdenetwork-filesharing";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  buildInputs = [
-    kcoreaddons
-    ki18n
-    kio
-    kwidgetsaddons
-    samba
-  ];
   meta = {
     license = [ lib.licenses.gpl2 lib.licenses.lgpl21 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
+  nativeBuildInputs = [
+    extra-cmake-modules
+    kdoctools
+  ];
+  propagatedBuildInputs = [
+    kcoreaddons ki18n kio kwidgetsaddons samba
+  ];
 }

From 1e5bee0b238f225a26510adf7c770277c932bad4 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 13:13:14 -0500
Subject: [PATCH 213/287] kde5.kio-extras: propagate all buildInputs

---
 pkgs/desktops/kde-5/applications-16.04/kio-extras.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/kde-5/applications-16.04/kio-extras.nix b/pkgs/desktops/kde-5/applications-16.04/kio-extras.nix
index 9de84913a250..9d28066cae92 100644
--- a/pkgs/desktops/kde-5/applications-16.04/kio-extras.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/kio-extras.nix
@@ -33,7 +33,7 @@ kdeApp {
     extra-cmake-modules kdoctools
     shared_mime_info
   ];
-  buildInputs = [
+  propagatedBuildInputs = [
     exiv2 kactivities karchive kbookmarks kconfig kconfigwidgets kcoreaddons
     kdbusaddons kguiaddons kdnssd kiconthemes ki18n kio khtml kdelibs4support
     kpty libmtp libssh openexr openslp phonon qtsvg samba solid

From 6c721ce8495d31907bb0b690da7af80edaee6f75 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 13:13:57 -0500
Subject: [PATCH 214/287] kde5.konsole: propagate all buildInputs

---
 .../kde-5/applications-16.04/konsole.nix      | 44 +++++--------------
 1 file changed, 11 insertions(+), 33 deletions(-)

diff --git a/pkgs/desktops/kde-5/applications-16.04/konsole.nix b/pkgs/desktops/kde-5/applications-16.04/konsole.nix
index 4b4cba2a3779..2042611f61b2 100644
--- a/pkgs/desktops/kde-5/applications-16.04/konsole.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/konsole.nix
@@ -28,41 +28,19 @@
 
 kdeApp {
   name = "konsole";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-    makeQtWrapper
-  ];
-  buildInputs = [
-    qtscript
-    kbookmarks
-    kcompletion
-    kconfig
-    kconfigwidgets
-    kcoreaddons
-    kguiaddons
-    kiconthemes
-    kinit
-    kio
-    knotifications
-    knotifyconfig
-    kparts
-    kpty
-    kservice
-    ktextwidgets
-    kwidgetsaddons
-    kxmlgui
-  ];
-  propagatedBuildInputs = [
-    kdelibs4support
-    ki18n
-    kwindowsystem
-  ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/konsole"
-  '';
   meta = {
     license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
+  nativeBuildInputs = [
+    extra-cmake-modules kdoctools makeQtWrapper
+  ];
+  propagatedBuildInputs = [
+    kdelibs4support ki18n kwindowsystem qtscript kbookmarks kcompletion kconfig
+    kconfigwidgets kcoreaddons kguiaddons kiconthemes kinit kio knotifications
+    knotifyconfig kparts kpty kservice ktextwidgets kwidgetsaddons kxmlgui
+  ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/konsole"
+  '';
 }

From 6d74e3a619518b3b9c7d0b5eb118b4731e00cf90 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 13:14:28 -0500
Subject: [PATCH 215/287] kde5.libkdcraw: propagate all buildInputs

---
 pkgs/desktops/kde-5/applications-16.04/libkdcraw.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/kde-5/applications-16.04/libkdcraw.nix b/pkgs/desktops/kde-5/applications-16.04/libkdcraw.nix
index 319c7fc6583d..1c1ef7dc9968 100644
--- a/pkgs/desktops/kde-5/applications-16.04/libkdcraw.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/libkdcraw.nix
@@ -6,14 +6,14 @@
 
 kdeApp {
   name = "libkdcraw";
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    libraw
-  ];
   meta = {
     license = with lib.licenses; [ gpl2 lgpl21 bsd3 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
+  nativeBuildInputs = [
+    extra-cmake-modules
+  ];
+  propagatedBuildInputs = [
+    libraw
+  ];
 }

From 3c6065bc5b820d683e2a06d3b441e897866b06b3 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 13:14:59 -0500
Subject: [PATCH 216/287] kde5.libkexiv2: propagate all buildInputs

---
 pkgs/desktops/kde-5/applications-16.04/libkexiv2.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/kde-5/applications-16.04/libkexiv2.nix b/pkgs/desktops/kde-5/applications-16.04/libkexiv2.nix
index afb1ac836537..5a46912a109e 100644
--- a/pkgs/desktops/kde-5/applications-16.04/libkexiv2.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/libkexiv2.nix
@@ -6,14 +6,14 @@
 
 kdeApp {
   name = "libkexiv2";
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    exiv2
-  ];
   meta = {
     license = with lib.licenses; [ gpl2 lgpl21 bsd3 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
+  nativeBuildInputs = [
+    extra-cmake-modules
+  ];
+  propagatedBuildInputs = [
+    exiv2
+  ];
 }

From a5aaea3fb5653b7fefa21f84cbf0898021fb41af Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 13:15:26 -0500
Subject: [PATCH 217/287] kde5.libkipi: propagate all buildInputs

---
 pkgs/desktops/kde-5/applications-16.04/libkipi.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/desktops/kde-5/applications-16.04/libkipi.nix b/pkgs/desktops/kde-5/applications-16.04/libkipi.nix
index c23cd8578fb9..33903463714a 100644
--- a/pkgs/desktops/kde-5/applications-16.04/libkipi.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/libkipi.nix
@@ -9,14 +9,14 @@
 
 kdeApp {
   name = "libkipi";
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    kconfig ki18n kservice kxmlgui
-  ];
   meta = {
     license = with lib.licenses; [ gpl2 lgpl21 bsd3 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
+  nativeBuildInputs = [
+    extra-cmake-modules
+  ];
+  propagatedBuildInputs = [
+    kconfig ki18n kservice kxmlgui
+  ];
 }

From fa410d5ba13f58f6d72d8a312f5be3241ac98f6f Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 13:16:00 -0500
Subject: [PATCH 218/287] kde5.print-manager: propagate all buildInputs

---
 .../applications-16.04/print-manager.nix      | 29 +++++--------------
 1 file changed, 8 insertions(+), 21 deletions(-)

diff --git a/pkgs/desktops/kde-5/applications-16.04/print-manager.nix b/pkgs/desktops/kde-5/applications-16.04/print-manager.nix
index b4eab372789d..cf0703b7d2c3 100644
--- a/pkgs/desktops/kde-5/applications-16.04/print-manager.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/print-manager.nix
@@ -19,29 +19,16 @@
 
 kdeApp {
   name = "print-manager";
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  buildInputs = [
-    cups
-    kconfig
-    kconfigwidgets
-    kdbusaddons
-    kiconthemes
-    kcmutils
-    knotifications
-    kwidgetsaddons
-    kitemviews
-  ];
-  propagatedBuildInputs = [
-    ki18n
-    kio
-    kwindowsystem
-    plasma-framework
-    qtdeclarative
-  ];
   meta = {
     license = [ lib.licenses.gpl2 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
+  nativeBuildInputs = [
+    extra-cmake-modules
+  ];
+  propagatedBuildInputs = [
+    cups kconfig kconfigwidgets kdbusaddons kiconthemes kcmutils knotifications
+    kwidgetsaddons kitemviews ki18n kio kwindowsystem plasma-framework
+    qtdeclarative
+  ];
 }

From 7027f7df7c5a20cd49ffdc9f3e08dc67f6a23e7f Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 13:16:28 -0500
Subject: [PATCH 219/287] kde5.spectacle: propagate all buildInputs

---
 pkgs/desktops/kde-5/applications-16.04/spectacle.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/kde-5/applications-16.04/spectacle.nix b/pkgs/desktops/kde-5/applications-16.04/spectacle.nix
index dc2fb708b531..7e324f2b3fc5 100644
--- a/pkgs/desktops/kde-5/applications-16.04/spectacle.nix
+++ b/pkgs/desktops/kde-5/applications-16.04/spectacle.nix
@@ -19,17 +19,17 @@
 
 kdeApp {
   name = "spectacle";
+  meta = with lib; {
+    maintainers = with maintainers; [ ttuegel ];
+  };
   nativeBuildInputs = [
     extra-cmake-modules kdoctools makeQtWrapper
   ];
-  buildInputs = [
+  propagatedBuildInputs = [
     kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications
     kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi xcb-util-cursor
   ];
   postFixup = ''
     wrapQtProgram "$out/bin/spectacle"
   '';
-  meta = with lib; {
-    maintainers = with maintainers; [ ttuegel ];
-  };
 }

From ccd46cc4b5b8c1810c26512181ed37e0914b76f4 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 13:17:49 -0500
Subject: [PATCH 220/287] Revert "kde5_latest.plasma-workspace: remove patches"

This reverts commit ffc217883c5c792f2876c22e2827d480ae12f6bb.
---
 pkgs/desktops/kde-5/plasma-5.6/default.nix    |   2 +-
 .../default.nix}                              |   4 +-
 .../plasma-workspace/qml-import-path.patch    | 104 +++++
 .../kde-5/plasma-5.6/plasma-workspace/series  |   1 +
 .../plasma-workspace/startkde.patch           | 372 ++++++++++++++++++
 5 files changed, 481 insertions(+), 2 deletions(-)
 rename pkgs/desktops/kde-5/plasma-5.6/{plasma-workspace.nix => plasma-workspace/default.nix} (94%)
 create mode 100644 pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/qml-import-path.patch
 create mode 100644 pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/series
 create mode 100644 pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/startkde.patch

diff --git a/pkgs/desktops/kde-5/plasma-5.6/default.nix b/pkgs/desktops/kde-5/plasma-5.6/default.nix
index 5270d2531648..27274654ce2a 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/default.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/default.nix
@@ -80,7 +80,7 @@ let
     plasma-mediacenter = callPackage ./plasma-mediacenter.nix {};
     plasma-nm = callPackage ./plasma-nm {};
     plasma-pa = callPackage ./plasma-pa.nix {};
-    plasma-workspace = callPackage ./plasma-workspace.nix {};
+    plasma-workspace = callPackage ./plasma-workspace {};
     plasma-workspace-wallpapers = callPackage ./plasma-workspace-wallpapers.nix {};
     polkit-kde-agent = callPackage ./polkit-kde-agent.nix {};
     powerdevil = callPackage ./powerdevil.nix {};
diff --git a/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace.nix b/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/default.nix
similarity index 94%
rename from pkgs/desktops/kde-5/plasma-5.6/plasma-workspace.nix
rename to pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/default.nix
index b8761998faea..73a842746426 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/default.nix
@@ -1,4 +1,4 @@
-{ plasmaPackage, lib
+{ plasmaPackage, lib, copyPathsToStore
 , extra-cmake-modules, kdoctools
 , baloo, kactivities, kcmutils, kconfig, kcrash, kdbusaddons, kdeclarative
 , kdelibs4support, kdesu, kdewebkit, kglobalaccel, kidletime, kjsembed, knewstuff
@@ -24,6 +24,8 @@ plasmaPackage {
     qtscript qtx11extras solid wayland
   ];
 
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
+
   postPatch = ''
     substituteInPlace startkde/kstartupconfig/kstartupconfig.cpp \
         --replace kdostartupconfig5 $out/bin/kdostartupconfig5
diff --git a/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/qml-import-path.patch b/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/qml-import-path.patch
new file mode 100644
index 000000000000..1d34001be597
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/qml-import-path.patch
@@ -0,0 +1,104 @@
+Index: plasma-workspace-5.5.1/applets/analog-clock/contents/ui/analogclock.qml
+===================================================================
+--- plasma-workspace-5.5.1.orig/applets/analog-clock/contents/ui/analogclock.qml
++++ plasma-workspace-5.5.1/applets/analog-clock/contents/ui/analogclock.qml
+@@ -25,7 +25,7 @@ import org.kde.plasma.calendar 2.0 as Pl
+ import QtQuick.Layouts 1.1
+ 
+ import org.kde.plasma.core 2.0 as PlasmaCore
+-import "logic.js" as Logic
++import "../code/logic.js" as Logic
+ 
+ Item {
+     id: analogclock
+Index: plasma-workspace-5.5.1/applets/batterymonitor/package/contents/ui/BatteryItem.qml
+===================================================================
+--- plasma-workspace-5.5.1.orig/applets/batterymonitor/package/contents/ui/BatteryItem.qml
++++ plasma-workspace-5.5.1/applets/batterymonitor/package/contents/ui/BatteryItem.qml
+@@ -26,7 +26,7 @@ import org.kde.plasma.components 2.0 as
+ import org.kde.plasma.extras 2.0 as PlasmaExtras
+ import org.kde.plasma.workspace.components 2.0
+ import org.kde.kcoreaddons 1.0 as KCoreAddons
+-import "logic.js" as Logic
++import "../code/logic.js" as Logic
+ 
+ Item {
+     id: batteryItem
+Index: plasma-workspace-5.5.1/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml
+===================================================================
+--- plasma-workspace-5.5.1.orig/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml
++++ plasma-workspace-5.5.1/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml
+@@ -24,7 +24,7 @@ import QtQuick.Layouts 1.1
+ import org.kde.plasma.core 2.0 as PlasmaCore
+ import org.kde.plasma.components 2.0 as Components
+ import org.kde.plasma.workspace.components 2.0
+-import "logic.js" as Logic
++import "../code/logic.js" as Logic
+ 
+ MouseArea {
+     id: root
+Index: plasma-workspace-5.5.1/applets/batterymonitor/package/contents/ui/PopupDialog.qml
+===================================================================
+--- plasma-workspace-5.5.1.orig/applets/batterymonitor/package/contents/ui/PopupDialog.qml
++++ plasma-workspace-5.5.1/applets/batterymonitor/package/contents/ui/PopupDialog.qml
+@@ -23,7 +23,7 @@ import org.kde.plasma.core 2.0 as Plasma
+ import org.kde.plasma.components 2.0 as Components
+ import org.kde.plasma.extras 2.0 as PlasmaExtras
+ import org.kde.kquickcontrolsaddons 2.0
+-import "logic.js" as Logic
++import "../code/logic.js" as Logic
+ 
+ FocusScope {
+     id: dialog
+Index: plasma-workspace-5.5.1/applets/batterymonitor/package/contents/ui/batterymonitor.qml
+===================================================================
+--- plasma-workspace-5.5.1.orig/applets/batterymonitor/package/contents/ui/batterymonitor.qml
++++ plasma-workspace-5.5.1/applets/batterymonitor/package/contents/ui/batterymonitor.qml
+@@ -25,7 +25,7 @@ import org.kde.plasma.plasmoid 2.0
+ import org.kde.plasma.core 2.0 as PlasmaCore
+ import org.kde.kcoreaddons 1.0 as KCoreAddons
+ import org.kde.kquickcontrolsaddons 2.0
+-import "logic.js" as Logic
++import "../code/logic.js" as Logic
+ 
+ Item {
+     id: batterymonitor
+Index: plasma-workspace-5.5.1/applets/lock_logout/contents/ui/lockout.qml
+===================================================================
+--- plasma-workspace-5.5.1.orig/applets/lock_logout/contents/ui/lockout.qml
++++ plasma-workspace-5.5.1/applets/lock_logout/contents/ui/lockout.qml
+@@ -23,7 +23,7 @@ import org.kde.plasma.plasmoid 2.0
+ import org.kde.plasma.core 2.0 as PlasmaCore
+ import org.kde.plasma.components 2.0
+ import org.kde.kquickcontrolsaddons 2.0
+-import "data.js" as Data
++import "../code/data.js" as Data
+ 
+ Flow {
+     id: lockout
+Index: plasma-workspace-5.5.1/applets/notifications/package/contents/ui/main.qml
+===================================================================
+--- plasma-workspace-5.5.1.orig/applets/notifications/package/contents/ui/main.qml
++++ plasma-workspace-5.5.1/applets/notifications/package/contents/ui/main.qml
+@@ -28,7 +28,7 @@ import org.kde.plasma.extras 2.0 as Plas
+ 
+ import org.kde.plasma.private.notifications 1.0
+ 
+-import "uiproperties.js" as UiProperties
++import "../code/uiproperties.js" as UiProperties
+ 
+ MouseEventListener {
+     id: notificationsApplet
+Index: plasma-workspace-5.5.1/applets/systemtray/package/contents/ui/main.qml
+===================================================================
+--- plasma-workspace-5.5.1.orig/applets/systemtray/package/contents/ui/main.qml
++++ plasma-workspace-5.5.1/applets/systemtray/package/contents/ui/main.qml
+@@ -25,7 +25,7 @@ import org.kde.plasma.core 2.0 as Plasma
+ // import org.kde.plasma.extras 2.0 as PlasmaExtras
+ 
+ import org.kde.private.systemtray 2.0 as SystemTray
+-import "Layout.js" as LayoutManager
++import "../code/Layout.js" as LayoutManager
+ 
+ Item {
+     id: root
diff --git a/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/series b/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/series
new file mode 100644
index 000000000000..b9081298bd69
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/series
@@ -0,0 +1 @@
+qml-import-path.patch
diff --git a/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/startkde.patch b/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/startkde.patch
new file mode 100644
index 000000000000..eea0ae4c199d
--- /dev/null
+++ b/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/startkde.patch
@@ -0,0 +1,372 @@
+Index: plasma-workspace-5.5.5/startkde/startkde.cmake
+===================================================================
+--- plasma-workspace-5.5.5.orig/startkde/startkde.cmake
++++ plasma-workspace-5.5.5/startkde/startkde.cmake
+@@ -1,8 +1,36 @@
+-#!/bin/sh
++#!@bash@
+ #
+ #  DEFAULT KDE STARTUP SCRIPT ( @PROJECT_VERSION@ )
+ #
+ 
++set -x
++
++# The KDE icon cache is supposed to update itself
++# automatically, but it uses the timestamp on the icon
++# theme directory as a trigger.  Since in Nix the
++# timestamp is always the same, this doesn't work.  So as
++# a workaround, nuke the icon cache on login.  This isn't
++# perfect, since it may require logging out after
++# installing new applications to update the cache.
++# See http://lists-archives.org/kde-devel/26175-what-when-will-icon-cache-refresh.html
++rm -fv $HOME/.cache/icon-cache.kcache
++
++# Qt writes a weird ‘libraryPath’ line to
++# ~/.config/Trolltech.conf that causes the KDE plugin
++# paths of previous KDE invocations to be searched.
++# Obviously using mismatching KDE libraries is potentially
++# disastrous, so here we nuke references to the Nix store
++# in Trolltech.conf.  A better solution would be to stop
++# Qt from doing this wackiness in the first place.
++if [ -e $HOME/.config/Trolltech.conf ]; then
++    @sed@ -e '/nix\\store\|nix\/store/ d' -i $HOME/.config/Trolltech.conf
++fi
++
++# (NixOS) We run kbuildsycoca5 before starting the user session because things
++# may be missing or moved if they have run nixos-rebuild and it may not be
++# possible for them to start Konsole to run it manually!
++@kbuildsycoca5@
++
+ if test "x$1" = x--failsafe; then
+     KDE_FAILSAFE=1 # General failsafe flag
+     KWIN_COMPOSE=N # Disable KWin's compositing
+@@ -17,29 +45,16 @@ trap 'echo GOT SIGHUP' HUP
+ # we have to unset this for Darwin since it will screw up KDE's dynamic-loading
+ unset DYLD_FORCE_FLAT_NAMESPACE
+ 
+-# in case we have been started with full pathname spec without being in PATH
+-bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
+-if [ -n "$bindir" ]; then
+-  qbindir=`qtpaths --binaries-dir`
+-  qdbus=$qbindir/qdbus
+-  case $PATH in
+-    $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
+-    *) PATH=$bindir:$PATH; export PATH;;
+-  esac
+-else
+-  qdbus=qdbus
+-fi
+-
+ # Check if a KDE session already is running and whether it's possible to connect to X
+-kcheckrunning
++@kcheckrunning@
+ kcheckrunning_result=$?
+ if test $kcheckrunning_result -eq 0 ; then
+-	echo "KDE seems to be already running on this display."
+-	xmessage -geometry 500x100 "KDE seems to be already running on this display." > /dev/null 2>/dev/null
++  echo "KDE seems to be already running on this display."
++  @xmessage@ -geometry 500x100 "KDE seems to be already running on this display."
+ 	exit 1
+ elif test $kcheckrunning_result -eq 2 ; then
+ 	echo "\$DISPLAY is not set or cannot connect to the X server."
+-        exit 1
++  exit 1
+ fi
+ 
+ # Boot sequence:
+@@ -57,13 +72,8 @@ fi
+ # * Then ksmserver is started which takes control of the rest of the startup sequence
+ 
+ # We need to create config folder so we can write startupconfigkeys
+-if [  ${XDG_CONFIG_HOME} ]; then
+-  configDir=$XDG_CONFIG_HOME;
+-else
+-  configDir=${HOME}/.config; #this is the default, http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html
+-fi
+-
+-mkdir -p $configDir
++configDir=$(@qtpaths@ --writable-path GenericConfigLocation)
++mkdir -p "$configDir"
+ 
+ #This is basically setting defaults so we can use them with kstartupconfig5
+ cat >$configDir/startupconfigkeys <<EOF
+@@ -102,42 +112,10 @@ XftSubPixel=none
+ EOF
+ }
+ 
+-# Make sure the Oxygen font is installed
+-# This is necessary for setups where CMAKE_INSTALL_PREFIX
+-# is not in /usr. fontconfig looks in /usr, ~/.fonts and
+-# $XDG_DATA_HOME for fonts. In this case, we symlink the
+-# Oxygen font under ${XDG_DATA_HOME} and make it known to
+-# fontconfig
+-
+-usr_share="/usr/share"
+-install_share="@KDE_INSTALL_FULL_DATADIR@"
+-
+-if [ ! $install_share = $usr_share ]; then
+-
+-    if [ ${XDG_DATA_HOME} ]; then
+-        fontsDir="${XDG_DATA_HOME}/fonts"
+-    else
+-        fontsDir="${HOME}/.fonts"
+-    fi
+-
+-    test -d $fontsDir || {
+-        mkdir -p $fontsDir
+-    }
+-
+-    oxygenDir=$fontsDir/oxygen
+-    prefixDir="@KDE_INSTALL_FULL_DATADIR@/fonts/oxygen"
+-
+-    # if the oxygen dir doesn't exist, create a symlink to be sure that the
+-    # Oxygen font is available to the user
+-    test -d $oxygenDir || test -d $prefixDir && {
+-        test -h $oxygenDir || ln -s $prefixDir $oxygenDir && fc-cache $oxygenDir
+-    }
+-fi
+-
+-kstartupconfig5
++@out@/bin/kstartupconfig5
+ returncode=$?
+ if test $returncode -ne 0; then
+-    xmessage -geometry 500x100 "kstartupconfig5 does not exist or fails. The error code is $returncode. Check your installation."
++    @xmessage@ -geometry 500x100 "kstartupconfig5 does not exist or fails. The error code is $returncode. Check your installation."
+     exit 1
+ fi
+ [ -r $configDir/startupconfig ] && . $configDir/startupconfig
+@@ -146,9 +124,11 @@ if test "$kdeglobals_kscreen_scalefactor
+     export QT_DEVICE_PIXEL_RATIO=$kdeglobals_kscreen_scalefactor
+ fi
+ 
++XCURSOR_PATH=~/.icons:$(echo "$XDG_DATA_DIRS" | @tr@ ":" "\n" | @sed@ 's,$,/icons,g' | @tr@ "\n" ":")
++export XCURSOR_PATH
++
+ # XCursor mouse theme needs to be applied here to work even for kded or ksmserver
+ if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then
+-    @EXPORT_XCURSOR_PATH@
+ 
+     kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"
+     if test $? -eq 10; then
+@@ -164,21 +144,39 @@ if test -n "$kcminputrc_mouse_cursorthem
+     fi
+ fi
+ 
+-if test "$kcmfonts_general_forcefontdpi" -ne 0; then
+-    xrdb -quiet -merge -nocpp <<EOF
+-Xft.dpi: $kcmfonts_general_forcefontdpi
+-EOF
+-fi
++# Set a left cursor instead of the standard X11 "X" cursor, since I've heard
++# from some users that they're confused and don't know what to do. This is
++# especially necessary on slow machines, where starting KDE takes one or two
++# minutes until anything appears on the screen.
++#
++# If the user has overwritten fonts, the cursor font may be different now
++# so don't move this up.
++#
++@xsetroot@ -cursor_name left_ptr
+ 
+ dl=$DESKTOP_LOCKED
+ unset DESKTOP_LOCKED # Don't want it in the environment
+ 
++# Make sure that D-Bus is running
++# D-Bus autolaunch is broken
++if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
++    eval `@dbus-launch@ --sh-syntax --exit-with-session`
++fi
++if @qdbus@ >/dev/null 2>/dev/null; then
++    : # ok
++else
++    echo 'startkde: Could not start D-Bus. Can you call qdbus?'  1>&2
++    test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
++    @xmessage@ -geometry 500x100 "Could not start D-Bus. Can you call qdbus?"
++    exit 1
++fi
++
+ ksplash_pid=
+ if test -z "$dl"; then
+   # the splashscreen and progress indicator
+   case "$ksplashrc_ksplash_engine" in
+     KSplashQML)
+-      ksplash_pid=`ksplashqml "${ksplashrc_ksplash_theme}" --pid`
++      ksplash_pid=`@out@/bin/ksplashqml "${ksplashrc_ksplash_theme}" --pid`
+       ;;
+     None)
+       ;;
+@@ -201,8 +199,7 @@ fi
+ # For anything else (that doesn't set env vars, or that needs a window manager),
+ # better use the Autostart folder.
+ 
+-# TODO: Use GenericConfigLocation once we depend on Qt 5.4
+-scriptpath=`qtpaths --paths ConfigLocation | tr ':' '\n' | sed 's,$,/plasma-workspace,g'`
++scriptpath=$(@qtpaths@ --paths GenericConfigLocation | tr ':' '\n' | @sed@ 's,$,/plasma-workspace,g')
+ 
+ # Add /env/ to the directory to locate the scripts to be sourced
+ for prefix in `echo $scriptpath`; do
+@@ -232,7 +229,7 @@ usr_odir=$HOME/.fonts/kde-override
+ usr_fdir=$HOME/.fonts
+ 
+ if test -n "$KDEDIRS"; then
+-  kdedirs_first=`echo "$KDEDIRS"|sed -e 's/:.*//'`
++  kdedirs_first=`echo "$KDEDIRS" | @sed@ -e 's/:.*//'`
+   sys_odir=$kdedirs_first/share/fonts/override
+   sys_fdir=$kdedirs_first/share/fonts
+ else
+@@ -245,23 +242,13 @@ fi
+ # add the user's dirs to the font path, as they might simply have been made
+ # read-only by the administrator, for whatever reason.
+ 
+-test -d "$sys_odir" && xset +fp "$sys_odir"
+-test -d "$usr_odir" && (mkfontdir "$usr_odir" ; xset +fp "$usr_odir")
+-test -d "$usr_fdir" && (mkfontdir "$usr_fdir" ; xset fp+ "$usr_fdir")
+-test -d "$sys_fdir" && xset fp+ "$sys_fdir"
++test -d "$sys_odir" && @xset@ +fp "$sys_odir"
++test -d "$usr_odir" && ( @mkfontdir@ "$usr_odir" ; @xset@ +fp "$usr_odir" )
++test -d "$usr_fdir" && ( @mkfontdir@ "$usr_fdir" ; @xset@ fp+ "$usr_fdir" )
++test -d "$sys_fdir" && @xset@ fp+ "$sys_fdir"
+ 
+ # Ask X11 to rebuild its font list.
+-xset fp rehash
+-
+-# Set a left cursor instead of the standard X11 "X" cursor, since I've heard
+-# from some users that they're confused and don't know what to do. This is
+-# especially necessary on slow machines, where starting KDE takes one or two
+-# minutes until anything appears on the screen.
+-#
+-# If the user has overwritten fonts, the cursor font may be different now
+-# so don't move this up.
+-#
+-xsetroot -cursor_name left_ptr
++@xset@ fp rehash
+ 
+ # Get Ghostscript to look into user's KDE fonts dir for additional Fontmap
+ if test -n "$GS_LIB" ; then
+@@ -274,26 +261,6 @@ fi
+ 
+ echo 'startkde: Starting up...'  1>&2
+ 
+-# Make sure that the KDE prefix is first in XDG_DATA_DIRS and that it's set at all.
+-# The spec allows XDG_DATA_DIRS to be not set, but X session startup scripts tend
+-# to set it to a list of paths *not* including the KDE prefix if it's not /usr or
+-# /usr/local.
+-if test -z "$XDG_DATA_DIRS"; then
+-    XDG_DATA_DIRS="@CMAKE_INSTALL_PREFIX@/@SHARE_INSTALL_PREFIX@:/usr/share:/usr/local/share"
+-fi
+-export XDG_DATA_DIRS
+-
+-# Make sure that D-Bus is running
+-if $qdbus >/dev/null 2>/dev/null; then
+-    : # ok
+-else
+-    echo 'startkde: Could not start D-Bus. Can you call qdbus?'  1>&2
+-    test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
+-    xmessage -geometry 500x100 "Could not start D-Bus. Can you call qdbus?"
+-    exit 1
+-fi
+-
+-
+ # Mark that full KDE session is running (e.g. Konqueror preloading works only
+ # with full KDE running). The KDE_FULL_SESSION property can be detected by
+ # any X client connected to the same X session, even if not launched
+@@ -318,11 +285,11 @@ fi
+ #
+ KDE_FULL_SESSION=true
+ export KDE_FULL_SESSION
+-xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true
++@xprop@ -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true
+ 
+ KDE_SESSION_VERSION=5
+ export KDE_SESSION_VERSION
+-xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5
++@xprop@ -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5
+ 
+ KDE_SESSION_UID=`id -ru`
+ export KDE_SESSION_UID
+@@ -332,11 +299,11 @@ export XDG_CURRENT_DESKTOP
+ 
+ # At this point all the environment is ready, let's send it to kwalletd if running
+ if test -n "$PAM_KWALLET_LOGIN" ; then
+-    env | socat STDIN UNIX-CONNECT:$PAM_KWALLET_LOGIN
++    env | @socat@ STDIN UNIX-CONNECT:$PAM_KWALLET_LOGIN
+ fi
+ # ...and also to kwalletd5
+ if test -n "$PAM_KWALLET5_LOGIN" ; then
+-    env | socat STDIN UNIX-CONNECT:$PAM_KWALLET5_LOGIN
++    env | @socat@ STDIN UNIX-CONNECT:$PAM_KWALLET5_LOGIN
+ fi
+ 
+ # At this point all environment variables are set, let's send it to the DBus session server to update the activation environment
+@@ -349,18 +316,18 @@ if test $? -ne 0; then
+   # Startup error
+   echo 'startkde: Could not sync environment to dbus.'  1>&2
+   test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
+-  xmessage -geometry 500x100 "Could not sync environment to dbus."
++  @xmessage@ -geometry 500x100 "Could not sync environment to dbus."
+   exit 1
+ fi
+ 
+ # We set LD_BIND_NOW to increase the efficiency of kdeinit.
+ # kdeinit unsets this variable before loading applications.
+-LD_BIND_NOW=true @CMAKE_INSTALL_FULL_LIBEXECDIR_KF5@/start_kdeinit_wrapper --kded +kcminit_startup
++LD_BIND_NOW=true @start_kdeinit_wrapper@ --kded +kcminit_startup
+ if test $? -ne 0; then
+   # Startup error
+   echo 'startkde: Could not start kdeinit5. Check your installation.'  1>&2
+   test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
+-  xmessage -geometry 500x100 "Could not start kdeinit5. Check your installation."
++  @xmessage@ -geometry 500x100 "Could not start kdeinit5. Check your installation."
+   exit 1
+ fi
+ 
+@@ -379,27 +346,27 @@ test -n "$KDEWM" && KDEWM="--windowmanag
+ # lock now and do the rest of the KDE startup underneath the locker.
+ KSMSERVEROPTIONS=""
+ test -n "$dl" && KSMSERVEROPTIONS=" --lockscreen"
+-kwrapper5 @CMAKE_INSTALL_FULL_BINDIR@/ksmserver $KDEWM $KSMSERVEROPTIONS
++@kwrapper5@ @CMAKE_INSTALL_FULL_BINDIR@/ksmserver $KDEWM $KSMSERVEROPTIONS
+ if test $? -eq 255; then
+   # Startup error
+   echo 'startkde: Could not start ksmserver. Check your installation.'  1>&2
+   test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
+-  xmessage -geometry 500x100 "Could not start ksmserver. Check your installation."
++  @xmessage@ -geometry 500x100 "Could not start ksmserver. Check your installation."
+ fi
+ 
+-wait_drkonqi=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true`
++wait_drkonqi=`@kreadconfig5@ --file startkderc --group WaitForDrKonqi --key Enabled --default true`
+ 
+ if test x"$wait_drkonqi"x = x"true"x ; then
+     # wait for remaining drkonqi instances with timeout (in seconds)
+-    wait_drkonqi_timeout=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900`
++    wait_drkonqi_timeout=`@kreadconfig5@ --file startkderc --group WaitForDrKonqi --key Timeout --default 900`
+     wait_drkonqi_counter=0
+-    while $qdbus | grep "^[^w]*org.kde.drkonqi" > /dev/null ; do
++    while @qdbus@ | @grep@ "^[^w]*org.kde.drkonqi" > /dev/null ; do
+         sleep 5
+         wait_drkonqi_counter=$((wait_drkonqi_counter+5))
+         if test "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ; then
+             # ask remaining drkonqis to die in a graceful way
+-            $qdbus | grep 'org.kde.drkonqi-' | while read address ; do
+-                $qdbus "$address" "/MainApplication" "quit"
++            @qdbus@ | @grep@ 'org.kde.drkonqi-' | while read address ; do
++                @qdbus@ "$address" "/MainApplication" "quit"
+             done
+             break
+         fi
+@@ -411,12 +378,12 @@ echo 'startkde: Shutting down...'  1>&2
+ test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
+ 
+ # Clean up
+-kdeinit5_shutdown
++@kdeinit5_shutdown@
+ 
+ unset KDE_FULL_SESSION
+-xprop -root -remove KDE_FULL_SESSION
++@xprop@ -root -remove KDE_FULL_SESSION
+ unset KDE_SESSION_VERSION
+-xprop -root -remove KDE_SESSION_VERSION
++@xprop@ -root -remove KDE_SESSION_VERSION
+ unset KDE_SESSION_UID
+ 
+ echo 'startkde: Done.'  1>&2

From bad36556fe33c5500a69136858b86771c569bbd2 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Apr 2016 14:26:18 -0500
Subject: [PATCH 221/287] kde5.plasma-workspace: update import path patch

---
 .../plasma-workspace/qml-import-path.patch    | 52 +++++++++----------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/qml-import-path.patch b/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/qml-import-path.patch
index 1d34001be597..7842109669a2 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/qml-import-path.patch
+++ b/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/qml-import-path.patch
@@ -1,20 +1,20 @@
-Index: plasma-workspace-5.5.1/applets/analog-clock/contents/ui/analogclock.qml
+Index: plasma-workspace-5.6.3/applets/analog-clock/contents/ui/analogclock.qml
 ===================================================================
---- plasma-workspace-5.5.1.orig/applets/analog-clock/contents/ui/analogclock.qml
-+++ plasma-workspace-5.5.1/applets/analog-clock/contents/ui/analogclock.qml
-@@ -25,7 +25,7 @@ import org.kde.plasma.calendar 2.0 as Pl
- import QtQuick.Layouts 1.1
+--- plasma-workspace-5.6.3.orig/applets/analog-clock/contents/ui/analogclock.qml
++++ plasma-workspace-5.6.3/applets/analog-clock/contents/ui/analogclock.qml
+@@ -26,7 +26,7 @@ import QtQuick.Layouts 1.1
  
  import org.kde.plasma.core 2.0 as PlasmaCore
+ import org.kde.plasma.components 2.0 as PlasmaComponents
 -import "logic.js" as Logic
 +import "../code/logic.js" as Logic
  
  Item {
      id: analogclock
-Index: plasma-workspace-5.5.1/applets/batterymonitor/package/contents/ui/BatteryItem.qml
+Index: plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/BatteryItem.qml
 ===================================================================
---- plasma-workspace-5.5.1.orig/applets/batterymonitor/package/contents/ui/BatteryItem.qml
-+++ plasma-workspace-5.5.1/applets/batterymonitor/package/contents/ui/BatteryItem.qml
+--- plasma-workspace-5.6.3.orig/applets/batterymonitor/package/contents/ui/BatteryItem.qml
++++ plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/BatteryItem.qml
 @@ -26,7 +26,7 @@ import org.kde.plasma.components 2.0 as
  import org.kde.plasma.extras 2.0 as PlasmaExtras
  import org.kde.plasma.workspace.components 2.0
@@ -24,10 +24,10 @@ Index: plasma-workspace-5.5.1/applets/batterymonitor/package/contents/ui/Battery
  
  Item {
      id: batteryItem
-Index: plasma-workspace-5.5.1/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml
+Index: plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml
 ===================================================================
---- plasma-workspace-5.5.1.orig/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml
-+++ plasma-workspace-5.5.1/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml
+--- plasma-workspace-5.6.3.orig/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml
++++ plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/CompactRepresentation.qml
 @@ -24,7 +24,7 @@ import QtQuick.Layouts 1.1
  import org.kde.plasma.core 2.0 as PlasmaCore
  import org.kde.plasma.components 2.0 as Components
@@ -37,10 +37,10 @@ Index: plasma-workspace-5.5.1/applets/batterymonitor/package/contents/ui/Compact
  
  MouseArea {
      id: root
-Index: plasma-workspace-5.5.1/applets/batterymonitor/package/contents/ui/PopupDialog.qml
+Index: plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/PopupDialog.qml
 ===================================================================
---- plasma-workspace-5.5.1.orig/applets/batterymonitor/package/contents/ui/PopupDialog.qml
-+++ plasma-workspace-5.5.1/applets/batterymonitor/package/contents/ui/PopupDialog.qml
+--- plasma-workspace-5.6.3.orig/applets/batterymonitor/package/contents/ui/PopupDialog.qml
++++ plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/PopupDialog.qml
 @@ -23,7 +23,7 @@ import org.kde.plasma.core 2.0 as Plasma
  import org.kde.plasma.components 2.0 as Components
  import org.kde.plasma.extras 2.0 as PlasmaExtras
@@ -50,10 +50,10 @@ Index: plasma-workspace-5.5.1/applets/batterymonitor/package/contents/ui/PopupDi
  
  FocusScope {
      id: dialog
-Index: plasma-workspace-5.5.1/applets/batterymonitor/package/contents/ui/batterymonitor.qml
+Index: plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/batterymonitor.qml
 ===================================================================
---- plasma-workspace-5.5.1.orig/applets/batterymonitor/package/contents/ui/batterymonitor.qml
-+++ plasma-workspace-5.5.1/applets/batterymonitor/package/contents/ui/batterymonitor.qml
+--- plasma-workspace-5.6.3.orig/applets/batterymonitor/package/contents/ui/batterymonitor.qml
++++ plasma-workspace-5.6.3/applets/batterymonitor/package/contents/ui/batterymonitor.qml
 @@ -25,7 +25,7 @@ import org.kde.plasma.plasmoid 2.0
  import org.kde.plasma.core 2.0 as PlasmaCore
  import org.kde.kcoreaddons 1.0 as KCoreAddons
@@ -63,10 +63,10 @@ Index: plasma-workspace-5.5.1/applets/batterymonitor/package/contents/ui/battery
  
  Item {
      id: batterymonitor
-Index: plasma-workspace-5.5.1/applets/lock_logout/contents/ui/lockout.qml
+Index: plasma-workspace-5.6.3/applets/lock_logout/contents/ui/lockout.qml
 ===================================================================
---- plasma-workspace-5.5.1.orig/applets/lock_logout/contents/ui/lockout.qml
-+++ plasma-workspace-5.5.1/applets/lock_logout/contents/ui/lockout.qml
+--- plasma-workspace-5.6.3.orig/applets/lock_logout/contents/ui/lockout.qml
++++ plasma-workspace-5.6.3/applets/lock_logout/contents/ui/lockout.qml
 @@ -23,7 +23,7 @@ import org.kde.plasma.plasmoid 2.0
  import org.kde.plasma.core 2.0 as PlasmaCore
  import org.kde.plasma.components 2.0
@@ -76,10 +76,10 @@ Index: plasma-workspace-5.5.1/applets/lock_logout/contents/ui/lockout.qml
  
  Flow {
      id: lockout
-Index: plasma-workspace-5.5.1/applets/notifications/package/contents/ui/main.qml
+Index: plasma-workspace-5.6.3/applets/notifications/package/contents/ui/main.qml
 ===================================================================
---- plasma-workspace-5.5.1.orig/applets/notifications/package/contents/ui/main.qml
-+++ plasma-workspace-5.5.1/applets/notifications/package/contents/ui/main.qml
+--- plasma-workspace-5.6.3.orig/applets/notifications/package/contents/ui/main.qml
++++ plasma-workspace-5.6.3/applets/notifications/package/contents/ui/main.qml
 @@ -28,7 +28,7 @@ import org.kde.plasma.extras 2.0 as Plas
  
  import org.kde.plasma.private.notifications 1.0
@@ -89,10 +89,10 @@ Index: plasma-workspace-5.5.1/applets/notifications/package/contents/ui/main.qml
  
  MouseEventListener {
      id: notificationsApplet
-Index: plasma-workspace-5.5.1/applets/systemtray/package/contents/ui/main.qml
+Index: plasma-workspace-5.6.3/applets/systemtray/package/contents/ui/main.qml
 ===================================================================
---- plasma-workspace-5.5.1.orig/applets/systemtray/package/contents/ui/main.qml
-+++ plasma-workspace-5.5.1/applets/systemtray/package/contents/ui/main.qml
+--- plasma-workspace-5.6.3.orig/applets/systemtray/package/contents/ui/main.qml
++++ plasma-workspace-5.6.3/applets/systemtray/package/contents/ui/main.qml
 @@ -25,7 +25,7 @@ import org.kde.plasma.core 2.0 as Plasma
  // import org.kde.plasma.extras 2.0 as PlasmaExtras
  

From 370120bd5f0b0d95af6d123653a3a3dfc358111b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 30 Apr 2016 12:16:52 -0500
Subject: [PATCH 222/287] kde5: don't install GStreamer modules system-wide

---
 .../services/x11/desktop-managers/kde5.nix    | 29 ++++++++++---------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix
index 56b45609a2cd..2e9183da970a 100644
--- a/nixos/modules/services/x11/desktop-managers/kde5.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde5.nix
@@ -105,12 +105,6 @@ in
 
         pkgs.phonon-backend-gstreamer
         pkgs.kde5.phonon-backend-gstreamer
-        pkgs.gst_all_1.gstreamer
-        pkgs.gst_all_1.gst-plugins-base
-        pkgs.gst_all_1.gst-plugins-good
-        pkgs.gst_all_1.gst-plugins-ugly
-        pkgs.gst_all_1.gst-plugins-bad
-        pkgs.gst_all_1.gst-libav # for mp3 playback
       ]
 
       # Plasma 5.5 and later has a Breeze GTK theme.
@@ -138,14 +132,23 @@ in
       target = "X11/xkb";
     };
 
-    environment.profileRelativeEnvVars = {
-      GST_PLUGIN_SYSTEM_PATH_1_0 = [ "/lib/gstreamer-1.0" ];
-    };
-
     # Enable GTK applications to load SVG icons
-    environment.variables = mkIf (lib.hasAttr "breeze-icons" kde5) {
-      GDK_PIXBUF_MODULE_FILE = "${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache";
-    };
+    environment.variables =
+      {
+        GST_PLUGIN_SYSTEM_PATH_1_0 =
+          lib.makeSearchPath "/lib/gstreamer-1.0"
+          (builtins.map (pkg: pkg.out) (with pkgs.gst_all_1; [
+            gstreamer
+            gst-plugins-base
+            gst-plugins-good
+            gst-plugins-ugly
+            gst-plugins-bad
+            gst-libav # for mp3 playback
+          ]));
+      }
+      // (if (lib.hasAttr "breeze-icons" kde5)
+          then { GDK_PIXBUF_MODULE_FILE = "${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache"; }
+          else { });
 
     fonts.fonts = [ (kde5.oxygen-fonts or pkgs.noto-fonts) ];
 

From 609a251ee98b17ceb6d5ad8852b3f8fe269923a8 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 30 Apr 2016 14:46:12 -0500
Subject: [PATCH 223/287] kde5.breeze-icons: no dev output

---
 pkgs/desktops/kde-5/frameworks-5.21/breeze-icons.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/breeze-icons.nix b/pkgs/desktops/kde-5/frameworks-5.21/breeze-icons.nix
index 3524962087e6..773261638c98 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/breeze-icons.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/breeze-icons.nix
@@ -5,6 +5,7 @@
 
 kdeFramework {
   name = "breeze-icons";
+  outputs = [ "out" ];
   nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [ qtsvg ];
 }

From f90a7bf354779e95791feb220dbce1c363c2eaf6 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 30 Apr 2016 14:46:31 -0500
Subject: [PATCH 224/287] kde5.oxygen-icons5: no dev output

---
 pkgs/desktops/kde-5/frameworks-5.21/oxygen-icons5.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/oxygen-icons5.nix b/pkgs/desktops/kde-5/frameworks-5.21/oxygen-icons5.nix
index 0e5198984380..0b5c75b960d3 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/oxygen-icons5.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/oxygen-icons5.nix
@@ -9,5 +9,6 @@ kdeFramework {
     license = lib.licenses.lgpl3Plus;
     maintainers = [ lib.maintainers.ttuegel ];
   };
+  outputs = [ "out" ];
   nativeBuildInputs = [ extra-cmake-modules ];
 }

From f04e0e70e8ddb82686a2f660d292e7338ed564d2 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 2 May 2016 13:01:59 -0500
Subject: [PATCH 225/287] Revert "Revert "dbus: 1.8.20 -> 1.10.8""

This reverts commit 9eb107dc52409c5f438402eadf48b5dcd64da6ac.
---
 pkgs/development/libraries/dbus/default.nix   |  7 +++---
 .../dbus/ignore-missing-includedirs.patch     | 23 -------------------
 2 files changed, 3 insertions(+), 27 deletions(-)
 delete mode 100644 pkgs/development/libraries/dbus/ignore-missing-includedirs.patch

diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix
index 83635d9739f1..dd86ca540815 100644
--- a/pkgs/development/libraries/dbus/default.nix
+++ b/pkgs/development/libraries/dbus/default.nix
@@ -6,8 +6,8 @@ assert x11Support -> libX11 != null
                   && libSM != null;
 
 let
-  version = "1.8.20";
-  sha256 = "0fkh3d5r57a659hw9lqnw4v0bc5556vx54fsf7l9c732ci6byksw";
+  version = "1.10.8";
+  sha256 = "0560y3hxpgh346w6avcrcz79c8ansmn771y5xpcvvlr6m8mx5wxs";
 
 self =  stdenv.mkDerivation {
     name = "dbus-${version}";
@@ -17,8 +17,7 @@ self =  stdenv.mkDerivation {
       inherit sha256;
     };
 
-    patches = [ ./ignore-missing-includedirs.patch ]
-      ++ lib.optional stdenv.isSunOS ./implement-getgrouplist.patch;
+    patches = lib.optional stdenv.isSunOS ./implement-getgrouplist.patch;
     postPatch = ''
       substituteInPlace tools/Makefile.in \
         --replace 'install-localstatelibDATA:' 'disabled:' \
diff --git a/pkgs/development/libraries/dbus/ignore-missing-includedirs.patch b/pkgs/development/libraries/dbus/ignore-missing-includedirs.patch
deleted file mode 100644
index 2781f4ae3de5..000000000000
--- a/pkgs/development/libraries/dbus/ignore-missing-includedirs.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -ru -x '*~' dbus-1.2.24-orig/bus/config-parser.c dbus-1.2.24/bus/config-parser.c
---- dbus-1.2.24-orig/bus/config-parser.c	2010-03-23 20:01:27.000000000 +0100
-+++ dbus-1.2.24/bus/config-parser.c	2010-07-20 14:17:20.000000000 +0200
-@@ -2159,12 +2159,16 @@
- 
-   retval = FALSE;
-   
--  dir = _dbus_directory_open (dirname, error);
-+  dbus_error_init (&tmp_error);
-+  
-+  dir = _dbus_directory_open (dirname, &tmp_error);
- 
-   if (dir == NULL)
--    goto failed;
-+    {
-+      retval = TRUE;
-+      goto failed;
-+    }
- 
--  dbus_error_init (&tmp_error);
-   while (_dbus_directory_get_next_file (dir, &filename, &tmp_error))
-     {
-       DBusString full_path;

From 60b34849284db4aec8f4fdab722273096e1ed002 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 6 Mar 2016 17:38:53 -0800
Subject: [PATCH 226/287] dbus: Fix for new 1.10 version

(cherry picked from commit 68a4a6df3971d66aa988bba680351a30fbadbed3)
---
 nixos/modules/services/system/dbus.nix | 68 +++++++++-----------------
 nixos/modules/system/boot/systemd.nix  |  2 +
 2 files changed, 26 insertions(+), 44 deletions(-)

diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix
index 59c2e482e1ad..434211aaac41 100644
--- a/nixos/modules/services/system/dbus.nix
+++ b/nixos/modules/services/system/dbus.nix
@@ -10,6 +10,16 @@ let
 
   homeDir = "/var/run/dbus";
 
+  systemExtraxml = concatStrings (flip concatMap cfg.packages (d: [
+    "<servicedir>${d}/share/dbus-1/system-services</servicedir>"
+    "<includedir>${d}/etc/dbus-1/system.d</includedir>"
+  ]));
+
+  sessionExtraxml = concatStrings (flip concatMap cfg.packages (d: [
+    "<servicedir>${d}/share/dbus-1/services</servicedir>"
+    "<includedir>${d}/etc/dbus-1/session.d</includedir>"
+  ]));
+
   configDir = pkgs.stdenv.mkDerivation {
     name = "dbus-conf";
 
@@ -19,47 +29,17 @@ let
     buildCommand = ''
       mkdir -p $out
 
-      cp -v ${pkgs.dbus.daemon}/etc/dbus-1/system.conf $out/system.conf
+      sed '${./dbus-system-local.conf.in}' \
+        -e 's,@servicehelper@,${config.security.wrapperDir}/dbus-daemon-launch-helper,g' \
+        -e 's,@extra@,${systemExtraxml},' \
+        > "$out/system-local.conf"
 
-      # !!! Hm, these `sed' calls are rather error-prone...
-
-      # Tell the daemon where the setuid wrapper around
-      # dbus-daemon-launch-helper lives.
-      sed -i $out/system.conf \
-          -e 's|<servicehelper>.*/libexec/dbus-daemon-launch-helper|<servicehelper>${config.security.wrapperDir}/dbus-daemon-launch-helper|'
-
-      # Add the system-services and system.d directories to the system
-      # bus search path.
-      sed -i $out/system.conf \
-          -e 's|<standard_system_servicedirs/>|${systemServiceDirs}|' \
-          -e 's|<includedir>system.d</includedir>|${systemIncludeDirs}|'
-
-      cp ${pkgs.dbus.daemon}/etc/dbus-1/session.conf $out/session.conf
-
-      # Add the services and session.d directories to the session bus
-      # search path.
-      sed -i $out/session.conf \
-          -e 's|<standard_session_servicedirs />|${sessionServiceDirs}&|' \
-          -e 's|<includedir>session.d</includedir>|${sessionIncludeDirs}|'
-    ''; # */
+      sed '${./dbus-session-local.conf.in}' \
+        -e 's,@extra@,${sessionExtraxml},' \
+        > "$out/session-local.conf"
+    '';
   };
 
-  systemServiceDirs = concatMapStrings
-    (d: "<servicedir>${d}/share/dbus-1/system-services</servicedir> ")
-    cfg.packages;
-
-  systemIncludeDirs = concatMapStrings
-    (d: "<includedir>${d}/etc/dbus-1/system.d</includedir> ")
-    cfg.packages;
-
-  sessionServiceDirs = concatMapStrings
-    (d: "<servicedir>${d}/share/dbus-1/services</servicedir> ")
-    cfg.packages;
-
-  sessionIncludeDirs = concatMapStrings
-    (d: "<includedir>${d}/etc/dbus-1/session.d</includedir> ")
-    cfg.packages;
-
 in
 
 {
@@ -72,7 +52,7 @@ in
 
       enable = mkOption {
         type = types.bool;
-        default = true;
+        default = false;
         internal = true;
         description = ''
           Whether to start the D-Bus message bus daemon, which is
@@ -82,7 +62,7 @@ in
 
       packages = mkOption {
         type = types.listOf types.path;
-        default = [];
+        default = [ ];
         description = ''
           Packages whose D-Bus configuration files should be included in
           the configuration of the D-Bus system-wide message bus.
@@ -129,10 +109,10 @@ in
         permissions = "u+rx,g+rx,o-rx";
       };
 
-    services.dbus.packages =
-      [ "/nix/var/nix/profiles/default"
-        config.system.path
-      ];
+    services.dbus.packages = [
+      pkgs.dbus
+      config.system.path
+    ];
 
     # Don't restart dbus-daemon. Bad things tend to happen if we do.
     systemd.services.dbus.reloadIfChanged = true;
diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 3f497566ff11..e7f892945315 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -689,6 +689,8 @@ in
       "systemd/system-generators" = { source = generators; };
     });
 
+    services.dbus.enable = true;
+
     system.activationScripts.systemd = stringAfter [ "groups" ]
       ''
         mkdir -m 0755 -p /var/lib/udev

From 4dc716115f93d11b4d65201a33542e095e85a168 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Sun, 6 Mar 2016 17:44:56 -0800
Subject: [PATCH 227/287] Add missing files

(cherry picked from commit 5917fc2f50c87bbdd6ba0be339849a030a7eba10)
---
 nixos/modules/services/system/dbus-session-local.conf.in | 5 +++++
 nixos/modules/services/system/dbus-system-local.conf.in  | 6 ++++++
 2 files changed, 11 insertions(+)
 create mode 100644 nixos/modules/services/system/dbus-session-local.conf.in
 create mode 100644 nixos/modules/services/system/dbus-system-local.conf.in

diff --git a/nixos/modules/services/system/dbus-session-local.conf.in b/nixos/modules/services/system/dbus-session-local.conf.in
new file mode 100644
index 000000000000..5fd6f80a3539
--- /dev/null
+++ b/nixos/modules/services/system/dbus-session-local.conf.in
@@ -0,0 +1,5 @@
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+  @extra@
+</busconfig>
diff --git a/nixos/modules/services/system/dbus-system-local.conf.in b/nixos/modules/services/system/dbus-system-local.conf.in
new file mode 100644
index 000000000000..edbb476f585a
--- /dev/null
+++ b/nixos/modules/services/system/dbus-system-local.conf.in
@@ -0,0 +1,6 @@
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+  <servicehelper>@servicehelper@</servicehelper>
+  @extra@
+</busconfig>

From 2362891dc815160e343e52458f25db22508ac487 Mon Sep 17 00:00:00 2001
From: Guillaume Maudoux <layus.on@gmail.com>
Date: Thu, 28 Apr 2016 23:48:13 +0200
Subject: [PATCH 228/287] Just strip everything by default

Run strip of each file and discard expected failure types.
Also default to stripping the entire output.
---
 pkgs/build-support/setup-hooks/strip.sh | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/setup-hooks/strip.sh b/pkgs/build-support/setup-hooks/strip.sh
index 6860c9b9cb9a..33ef85e436e2 100644
--- a/pkgs/build-support/setup-hooks/strip.sh
+++ b/pkgs/build-support/setup-hooks/strip.sh
@@ -4,7 +4,7 @@ fixupOutputHooks+=(_doStrip)
 
 _doStrip() {
     if [ -z "$dontStrip" ]; then
-        stripDebugList=${stripDebugList:-lib lib32 lib64 libexec bin sbin}
+        stripDebugList=${stripDebugList:-.}
         if [ -n "$stripDebugList" ]; then
             stripDirs "$stripDebugList" "${stripDebugFlags:--S}"
         fi
@@ -29,8 +29,20 @@ stripDirs() {
     dirs=${dirsNew}
 
     if [ -n "${dirs}" ]; then
-        header "stripping (with flags $stripFlags) in$dirs"
-        find $dirs -type f -print0 | xargs -0 ${xargsFlags:--r} strip $commonStripFlags $stripFlags || true
+        header "Stripping (with flags $stripFlags) in$dirs"
+        while IFS= read -r -d $'\0' f; do
+            if out=$(strip $commonStripFlags $stripFlags "$f" 2>&1); then
+                echo "Stripped $f"
+            else
+                # Ignore failures on files that cannot be stripped.
+                if [ "$out" = "strip:$f: File format not recognized" ]; then
+                    continue
+                fi
+
+                echo "Strip failed on file $f: $out"
+                false # fail !
+            fi
+        done < <(find $dirs -type f -print0)
         stopNest
     fi
 }

From 9820cb1bf24254199db05856bbb4919378ac75cb Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 4 May 2016 10:08:35 +0000
Subject: [PATCH 229/287] use dontBuild instead of hacks

changes:
 * buildPhase = "true"
 * buildPhase = ":"
---
 pkgs/applications/audio/baudline/default.nix  |  2 +-
 pkgs/applications/audio/faust/faust1.nix      |  5 +-
 pkgs/applications/audio/faust/faust2.nix      |  4 +-
 .../sane/backends/brscan4/default.nix         | 15 +---
 .../backends/brscan4/udev_rules_type1.nix     |  9 +-
 .../applications/misc/jbidwatcher/default.nix |  4 +-
 .../misc/terminal-notifier/default.nix        |  2 +-
 .../version-management/cvs2svn/default.nix    |  2 +-
 .../git-and-tools/fast-export/default.nix     |  2 +-
 .../git-and-tools/svn2git/default.nix         | 25 +++---
 .../version-management/gitolite/default.nix   |  3 +-
 pkgs/data/fonts/aurulent-sans/default.nix     |  2 +-
 pkgs/data/fonts/bakoma-ttf/default.nix        | 12 ++-
 pkgs/data/fonts/dosemu-fonts/default.nix      |  3 +-
 pkgs/data/fonts/powerline-fonts/default.nix   | 27 +++---
 .../data/fonts/ttf-bitstream-vera/default.nix |  6 +-
 pkgs/data/fonts/vista-fonts/default.nix       | 12 +--
 .../stylesheets/xslt/docbook-xsl/default.nix  | 21 +++--
 .../compilers/ghc/6.10.2-binary.nix           |  2 +-
 .../compilers/ghc/7.0.4-binary.nix            |  2 +-
 .../compilers/ghc/7.4.2-binary.nix            |  2 +-
 pkgs/development/libraries/fmod/4.24.16.nix   |  3 +-
 pkgs/development/libraries/fmod/default.nix   |  3 +-
 .../libraries/libspotify/default.nix          | 15 ++--
 pkgs/development/libraries/uthash/default.nix |  2 +-
 .../libraries/xlibs-wrapper/default.nix       |  5 +-
 .../mobile/titaniumenv/cli/node-env.nix       | 84 +++++++++----------
 .../python-modules/stringtemplate/default.nix | 19 +++--
 .../tools/analysis/clang-analyzer/default.nix |  3 +-
 .../tools/build-managers/gradle/default.nix   |  2 +-
 .../development/tools/misc/sqitch/default.nix |  8 +-
 pkgs/development/web/grails/default.nix       |  2 +-
 .../drivers/brgenml1cupswrapper/default.nix   |  9 +-
 .../misc/cups/drivers/brgenml1lpr/default.nix |  8 +-
 .../darwin/install_name_tool/default.nix      |  4 +-
 pkgs/os-specific/darwin/osx-sdk/default.nix   |  5 +-
 pkgs/os-specific/gnu/hurd/default.nix         |  2 +-
 pkgs/os-specific/gnu/libpthread/default.nix   |  2 +-
 pkgs/os-specific/gnu/mach/default.nix         |  2 +-
 .../linux/firmware/zd1211/default.nix         |  7 +-
 pkgs/servers/monitoring/longview/default.nix  | 18 ++--
 pkgs/servers/rt/default.nix                   |  3 +-
 pkgs/servers/sql/monetdb/default.nix          |  7 +-
 pkgs/servers/x11/xquartz/default.nix          |  7 +-
 pkgs/tools/admin/sec/default.nix              |  7 +-
 pkgs/tools/misc/debootstrap/default.nix       | 15 +---
 pkgs/tools/networking/swec/default.nix        | 37 ++++----
 .../package-management/nix-repl/default.nix   | 19 ++---
 .../package-management/nix-serve/default.nix  | 23 +++--
 pkgs/tools/security/pius/default.nix          | 20 ++---
 pkgs/tools/text/xidel/default.nix             |  2 +-
 pkgs/tools/text/xml/basex/default.nix         |  5 +-
 pkgs/tools/typesetting/pygmentex/default.nix  |  7 +-
 .../tools/typesetting/tex/dblatex/default.nix |  2 +-
 pkgs/tools/typesetting/tex/pgf/1.x.nix        |  4 +-
 pkgs/tools/typesetting/tex/pgf/2.x.nix        |  3 +-
 pkgs/tools/typesetting/tex/pgf/3.x.nix        |  3 +-
 .../typesetting/tex/pgfplots/default.nix      | 11 +--
 58 files changed, 263 insertions(+), 277 deletions(-)

diff --git a/pkgs/applications/audio/baudline/default.nix b/pkgs/applications/audio/baudline/default.nix
index 2d6b0434d6a1..e3cef30ccdaa 100644
--- a/pkgs/applications/audio/baudline/default.nix
+++ b/pkgs/applications/audio/baudline/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   # Prebuilt binary distribution.
   # "patchelf --set-rpath" seems to break the application (cannot start), using
   # LD_LIBRARY_PATH wrapper script instead.
-  buildPhase = "true";
+  dontBuild = true;
   installPhase = ''
     mkdir -p "$out/bin"
     mkdir -p "$out/libexec/baudline"
diff --git a/pkgs/applications/audio/faust/faust1.nix b/pkgs/applications/audio/faust/faust1.nix
index 56f7ac50227e..20ba1c14745a 100644
--- a/pkgs/applications/audio/faust/faust1.nix
+++ b/pkgs/applications/audio/faust/faust1.nix
@@ -25,7 +25,6 @@ let
   };
 
   faust = stdenv.mkDerivation {
-
     name = "faust-${version}";
 
     inherit src;
@@ -107,9 +106,7 @@ let
 
       inherit src;
 
-      configurePhase = ":";
-
-      buildPhase = ":";
+      dontBuild = true;
 
       installPhase = ''
         runHook preInstall
diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix
index 612a3dab99fe..3953eb2b7e05 100644
--- a/pkgs/applications/audio/faust/faust2.nix
+++ b/pkgs/applications/audio/faust/faust2.nix
@@ -132,9 +132,7 @@ let
 
       inherit src;
 
-      configurePhase = ":";
-
-      buildPhase = ":";
+      dontBuild = true;
 
       installPhase = ''
         runHook preInstall
diff --git a/pkgs/applications/graphics/sane/backends/brscan4/default.nix b/pkgs/applications/graphics/sane/backends/brscan4/default.nix
index 7b22e88bb840..8561c2a4ccf6 100644
--- a/pkgs/applications/graphics/sane/backends/brscan4/default.nix
+++ b/pkgs/applications/graphics/sane/backends/brscan4/default.nix
@@ -1,12 +1,6 @@
 { stdenv, fetchurl, callPackage, patchelf, makeWrapper, coreutils, libusb }:
 
-/*
-
-
-*/
-
 let
-
   myPatchElf = file: with stdenv.lib; ''
     patchelf --set-interpreter \
       ${stdenv.glibc}/lib/ld-linux${optionalString stdenv.is64bit "-x86-64"}.so.2 \
@@ -15,10 +9,7 @@ let
 
   udevRules = callPackage ./udev_rules_type1.nix {};
 
-in
-
-stdenv.mkDerivation rec {
-
+in stdenv.mkDerivation rec {
   name = "brscan4-0.4.3-3";
   src = fetchurl {
     url = "http://download.brother.com/welcome/dlf006645/${name}.amd64.deb";
@@ -32,8 +23,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ makeWrapper patchelf coreutils udevRules ];
   buildInputs = [ libusb ];
-  buildPhase = ":";
-
+  dontBuild = true;
 
   patchPhase = ''
     ${myPatchElf "opt/brother/scanner/brscan4/brsaneconfig4"}
@@ -47,7 +37,6 @@ stdenv.mkDerivation rec {
   '';
 
   installPhase = ''
-
     PATH_TO_BRSCAN4="opt/brother/scanner/brscan4"
     mkdir -p $out/$PATH_TO_BRSCAN4
     cp -rp $PATH_TO_BRSCAN4/* $out/$PATH_TO_BRSCAN4
diff --git a/pkgs/applications/graphics/sane/backends/brscan4/udev_rules_type1.nix b/pkgs/applications/graphics/sane/backends/brscan4/udev_rules_type1.nix
index 873240e81fca..da136a7f9e1e 100644
--- a/pkgs/applications/graphics/sane/backends/brscan4/udev_rules_type1.nix
+++ b/pkgs/applications/graphics/sane/backends/brscan4/udev_rules_type1.nix
@@ -1,8 +1,6 @@
 { stdenv, fetchurl, libsaneUDevRuleNumber ? "49"}:
 
-
 stdenv.mkDerivation rec {
-
   name = "brother-udev-rule-type1-1.0.0-1";
 
   src = fetchurl {
@@ -10,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "0i0x5jw135pli4jl9mgnr5n2rrdvml57nw84yq2999r4frza53xi";
   };
 
-  buildInputs = [ ];
+  dontBuild = true;
 
   unpackPhase = ''
     ar x $src
@@ -37,9 +35,6 @@ stdenv.mkDerivation rec {
     sed -i -e s/SYSFS/ATTR/g opt/brother/scanner/udev-rules/type1/*.rules
   '';
 
-
-  buildPhase = ":";
-
   installPhase = ''
     mkdir -p $out/etc/udev/rules.d
     cp opt/brother/scanner/udev-rules/type1/NN-brother-mfp-type1.rules \
@@ -57,4 +52,4 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.unfree;
     maintainers = with stdenv.lib.maintainers; [ jraygauthier ];
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/misc/jbidwatcher/default.nix b/pkgs/applications/misc/jbidwatcher/default.nix
index 9b74b0c93a97..a933befec5f4 100644
--- a/pkgs/applications/misc/jbidwatcher/default.nix
+++ b/pkgs/applications/misc/jbidwatcher/default.nix
@@ -15,9 +15,9 @@ stdenv.mkDerivation rec {
 
   jarfile = "$out/share/java/${pname}/JBidwatcher.jar";
 
-  unpackPhase = "true";
+#  unpackPhase = "true";
 
-  buildPhase = "true";
+  dontBuild = true;
 
   installPhase = ''
     mkdir -p "$out/bin"
diff --git a/pkgs/applications/misc/terminal-notifier/default.nix b/pkgs/applications/misc/terminal-notifier/default.nix
index 57ff213ae80e..d9046c55e12a 100644
--- a/pkgs/applications/misc/terminal-notifier/default.nix
+++ b/pkgs/applications/misc/terminal-notifier/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "09x7vl0kddivqq3pyrk6sg1f0sv5l7nj0bmblq222zk3b09bgg8p";
   };
 
-  buildPhase = "true";
+  dontBuild = true;
 
   installPhase = ''
     mkdir -p $out/Applications
diff --git a/pkgs/applications/version-management/cvs2svn/default.nix b/pkgs/applications/version-management/cvs2svn/default.nix
index 85749f978d1c..952d9b7f21ae 100644
--- a/pkgs/applications/version-management/cvs2svn/default.nix
+++ b/pkgs/applications/version-management/cvs2svn/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [python makeWrapper];
 
-  buildPhase = "true";
+  dontBuild = true;
   installPhase = ''
     python ./setup.py install --prefix=$out
     for i in bzr svn git; do
diff --git a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/fast-export/default.nix
index 5bd6995d2046..ef681c9ba7dd 100644
--- a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/fast-export/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   buildInputs = [mercurial.python mercurial makeWrapper subversion];
 
-  buildPhase="true"; # skip svn for now
+  dontBuild = true; # skip svn for now
 
   # TODO also support svn stuff
   # moving .py files into lib directory so that you can't pick the wrong file from PATH.
diff --git a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix
index c735ef4506a4..9a19b358c90c 100644
--- a/pkgs/applications/version-management/git-and-tools/svn2git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/svn2git/default.nix
@@ -13,22 +13,21 @@ stdenv.mkDerivation {
 
   buildInputs = [ ruby makeWrapper ];
 
-  buildPhase = "true";
+  dontBuild = true;
 
-  installPhase =
-    ''
-      mkdir -p $out
-      cp -r lib $out/
+  installPhase = ''
+    mkdir -p $out
+    cp -r lib $out/
 
-      mkdir -p $out/bin
-      substituteInPlace bin/svn2git --replace '/usr/bin/env ruby' ${ruby}/bin/ruby
-      cp bin/svn2git $out/bin/
-      chmod +x $out/bin/svn2git
+    mkdir -p $out/bin
+    substituteInPlace bin/svn2git --replace '/usr/bin/env ruby' ${ruby}/bin/ruby
+    cp bin/svn2git $out/bin/
+    chmod +x $out/bin/svn2git
 
-      wrapProgram $out/bin/svn2git \
-        --set RUBYLIB $out/lib \
-        --prefix PATH : ${git}/bin
-    '';
+    wrapProgram $out/bin/svn2git \
+      --set RUBYLIB $out/lib \
+      --prefix PATH : ${git}/bin
+  '';
 
   meta = {
     homepage = https://github.com/nirvdrum/svn2git;
diff --git a/pkgs/applications/version-management/gitolite/default.nix b/pkgs/applications/version-management/gitolite/default.nix
index 60e0a7947058..5e1feacd83d4 100644
--- a/pkgs/applications/version-management/gitolite/default.nix
+++ b/pkgs/applications/version-management/gitolite/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ git nettools perl ];
-  buildPhase = "true";
+
+  dontBuild = true;
 
   patchPhase = ''
     substituteInPlace ./install --replace " 2>/dev/null" ""
diff --git a/pkgs/data/fonts/aurulent-sans/default.nix b/pkgs/data/fonts/aurulent-sans/default.nix
index f57f3de7f829..9941b4791b58 100644
--- a/pkgs/data/fonts/aurulent-sans/default.nix
+++ b/pkgs/data/fonts/aurulent-sans/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "01hvpvbrks40g9k1xr2f1gxnd5wd0sxidgfbwrm94pdi1a36xxrk";
   };
 
-  buildPhase = "true";
+  dontBuild = true;
 
   installPhase = ''
     fontDir=$out/share/fonts/opentype
diff --git a/pkgs/data/fonts/bakoma-ttf/default.nix b/pkgs/data/fonts/bakoma-ttf/default.nix
index 8b607adaaae8..fb1459831f66 100644
--- a/pkgs/data/fonts/bakoma-ttf/default.nix
+++ b/pkgs/data/fonts/bakoma-ttf/default.nix
@@ -2,14 +2,18 @@
 
 stdenv.mkDerivation {
   name = "bakoma-ttf";
-  
+
   src = fetchurl {
     url = http://tarballs.nixos.org/bakoma-ttf.tar.bz2;
     sha256 = "1j1y3cq6ys30m734axc0brdm2q9n2as4h32jws15r7w5fwr991km";
   };
-  
-  buildPhase = "true";
-  installPhase = "mkdir -p $out/share/fonts/truetype; cp ttf/*.ttf $out/share/fonts/truetype";
+
+  dontBuild = true;
+
+  installPhase = ''
+    mkdir -p $out/share/fonts/truetype
+    cp ttf/*.ttf $out/share/fonts/truetype
+  '';
 
   meta = {
     description = "TrueType versions of the Computer Modern and AMS TeX Fonts";
diff --git a/pkgs/data/fonts/dosemu-fonts/default.nix b/pkgs/data/fonts/dosemu-fonts/default.nix
index 97fb0b82c744..decfaf63aef9 100644
--- a/pkgs/data/fonts/dosemu-fonts/default.nix
+++ b/pkgs/data/fonts/dosemu-fonts/default.nix
@@ -9,8 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0l1zwmw42mpakjrzmbygshcg2qzq9mv8lx42738rz3j9hrqzg4pw";
   };
 
-  configurePhase = "true";
-  buildPhase = "true";
+  dontBuild = true;
 
   buildInputs = [bdftopcf mkfontdir mkfontscale];
 
diff --git a/pkgs/data/fonts/powerline-fonts/default.nix b/pkgs/data/fonts/powerline-fonts/default.nix
index 2e576cf6dc8b..dbfb49f1bedd 100644
--- a/pkgs/data/fonts/powerline-fonts/default.nix
+++ b/pkgs/data/fonts/powerline-fonts/default.nix
@@ -10,25 +10,24 @@ stdenv.mkDerivation {
     sha256 = "1pwz83yh28yd8aj6fbyfz8z3q3v67psszpd9mp4vv0ms9w8b5ajn";
   };
 
-  buildPhase = "true";
+  dontBuild = true;
 
-  installPhase =
-    ''
-      mkdir -p $out/share/fonts/opentype
-      cp -v */*.otf $out/share/fonts/opentype
+  installPhase = ''
+    mkdir -p $out/share/fonts/opentype
+    cp -v */*.otf $out/share/fonts/opentype
 
-      mkdir -p $out/share/fonts/truetype
-      cp -v */*.ttf $out/share/fonts/truetype
+    mkdir -p $out/share/fonts/truetype
+    cp -v */*.ttf $out/share/fonts/truetype
 
-      mkdir -p $out/share/fonts/bdf
-      cp -v */BDF/*.bdf $out/share/fonts/bdf
+    mkdir -p $out/share/fonts/bdf
+    cp -v */BDF/*.bdf $out/share/fonts/bdf
 
-      mkdir -p $out/share/fonts/pcf
-      cp -v */PCF/*.pcf.gz $out/share/fonts/pcf
+    mkdir -p $out/share/fonts/pcf
+    cp -v */PCF/*.pcf.gz $out/share/fonts/pcf
 
-      mkdir -p $out/share/fonts/psf
-      cp -v */PSF/*.psf.gz $out/share/fonts/psf
-    '';
+    mkdir -p $out/share/fonts/psf
+    cp -v */PSF/*.psf.gz $out/share/fonts/psf
+  '';
 
   meta = with stdenv.lib; {
     homepage = https://github.com/powerline/fonts;
diff --git a/pkgs/data/fonts/ttf-bitstream-vera/default.nix b/pkgs/data/fonts/ttf-bitstream-vera/default.nix
index 10766d9fa788..d448aa558eb2 100644
--- a/pkgs/data/fonts/ttf-bitstream-vera/default.nix
+++ b/pkgs/data/fonts/ttf-bitstream-vera/default.nix
@@ -8,11 +8,11 @@ stdenv.mkDerivation {
     sha256 = "1p3qs51x5327gnk71yq8cvmxc6wgx79sqxfvxcv80cdvgggjfnyv";
   };
 
-  buildPhase = "true";
+  dontBuild = true;
 
-  installPhase = "
+  installPhase = ''
     fontDir=$out/share/fonts/truetype
     mkdir -p $fontDir
     cp *.ttf $fontDir
-  ";
+  '';
 }
diff --git a/pkgs/data/fonts/vista-fonts/default.nix b/pkgs/data/fonts/vista-fonts/default.nix
index f3165b33ccaf..b2854b399f68 100644
--- a/pkgs/data/fonts/vista-fonts/default.nix
+++ b/pkgs/data/fonts/vista-fonts/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation {
   name = "vista-fonts-1";
-  
+
   src = fetchurl {
     url = http://download.microsoft.com/download/f/5/a/f5a3df76-d856-4a61-a6bd-722f52a5be26/PowerPointViewer.exe;
     sha256 = "07vhjdw8iip7gxk6wvp4myhvbn9619g10j9qvpbzz4ihima57ry4";
@@ -10,14 +10,14 @@ stdenv.mkDerivation {
 
   buildInputs = [cabextract];
 
-  unpackPhase = "
+  unpackPhase = ''
     cabextract --lowercase --filter ppviewer.cab $src
     cabextract --lowercase --filter '*.TTF' ppviewer.cab
     sourceRoot=.
-  ";
-  
-  buildPhase = "true";
-  
+  '';
+
+  dontBuild = true;
+
   installPhase = ''
     mkdir -p $out/share/fonts/truetype
     cp *.ttf $out/share/fonts/truetype
diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix
index 863f60444025..77cd666b8c6d 100644
--- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix
+++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl/default.nix
@@ -10,19 +10,18 @@ let
       inherit sha256;
     };
 
-    buildPhase = "true";
+    dontBuild = true;
 
-    installPhase =
-      ''
-        dst=$out/share/xml/${pname}
-        mkdir -p $dst
-        rm -rf RELEASE* README* INSTALL TODO NEWS* BUGS install.sh svn* tools log Makefile tests extensions webhelp
-        mv * $dst/
+    installPhase = ''
+      dst=$out/share/xml/${pname}
+      mkdir -p $dst
+      rm -rf RELEASE* README* INSTALL TODO NEWS* BUGS install.sh svn* tools log Makefile tests extensions webhelp
+      mv * $dst/
 
-        # Backwards compatibility. Will remove eventually.
-        mkdir -p $out/xml/xsl
-        ln -s $dst $out/xml/xsl/docbook
-      '';
+      # Backwards compatibility. Will remove eventually.
+      mkdir -p $out/xml/xsl
+      ln -s $dst $out/xml/xsl/docbook
+    '';
 
     meta = {
       homepage = http://wiki.docbook.org/topic/DocBookXslStylesheets;
diff --git a/pkgs/development/compilers/ghc/6.10.2-binary.nix b/pkgs/development/compilers/ghc/6.10.2-binary.nix
index 045b9142ef3b..81bdebdcbd47 100644
--- a/pkgs/development/compilers/ghc/6.10.2-binary.nix
+++ b/pkgs/development/compilers/ghc/6.10.2-binary.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
 
   # No building is necessary, but calling make without flags ironically
   # calls install-strip ...
-  buildPhase = "true";
+  dontBuild = true;
 
   # The binaries for Darwin use frameworks, so fake those frameworks,
   # and create some wrapper scripts that set DYLD_FRAMEWORK_PATH so
diff --git a/pkgs/development/compilers/ghc/7.0.4-binary.nix b/pkgs/development/compilers/ghc/7.0.4-binary.nix
index c03cfbaaadda..77e5229a2a0a 100644
--- a/pkgs/development/compilers/ghc/7.0.4-binary.nix
+++ b/pkgs/development/compilers/ghc/7.0.4-binary.nix
@@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
 
   # No building is necessary, but calling make without flags ironically
   # calls install-strip ...
-  buildPhase = "true";
+  dontBuild = true;
 
   postInstall =
       ''
diff --git a/pkgs/development/compilers/ghc/7.4.2-binary.nix b/pkgs/development/compilers/ghc/7.4.2-binary.nix
index cf21a61b1b39..c9f281980d95 100644
--- a/pkgs/development/compilers/ghc/7.4.2-binary.nix
+++ b/pkgs/development/compilers/ghc/7.4.2-binary.nix
@@ -101,7 +101,7 @@ stdenv.mkDerivation rec {
 
   # No building is necessary, but calling make without flags ironically
   # calls install-strip ...
-  buildPhase = "true";
+  dontBuild = true;
 
   preInstall = stdenv.lib.optionalString stdenv.isDarwin ''
     mkdir -p $out/lib/ghc-7.4.2
diff --git a/pkgs/development/libraries/fmod/4.24.16.nix b/pkgs/development/libraries/fmod/4.24.16.nix
index 191db2f6f6dd..b45ec24ca6bd 100644
--- a/pkgs/development/libraries/fmod/4.24.16.nix
+++ b/pkgs/development/libraries/fmod/4.24.16.nix
@@ -29,11 +29,10 @@ stdenv.mkDerivation rec {
 
   dontStrip = true;
   dontPatchELF = true;
+  dontBuild = true;
 
   makeFlags = [ "DESTLIBDIR=$(out)/lib" "DESTHDRDIR=$(out)/include" ];
 
-  buildPhase = "true";
-
   preInstall = ''
     mkdir -p $out/lib
   '';
diff --git a/pkgs/development/libraries/fmod/default.nix b/pkgs/development/libraries/fmod/default.nix
index 621d6dc405fe..af9460195401 100644
--- a/pkgs/development/libraries/fmod/default.nix
+++ b/pkgs/development/libraries/fmod/default.nix
@@ -18,7 +18,8 @@ stdenv.mkDerivation rec {
   };
 
   dontStrip = true;
-  buildPhase = "true";
+  dontBuild = true;
+
   installPhase = ''
     mkdir -p $out/lib $out/include/fmodex
 
diff --git a/pkgs/development/libraries/libspotify/default.nix b/pkgs/development/libraries/libspotify/default.nix
index 02bd1f966e6e..951a939cbfbf 100644
--- a/pkgs/development/libraries/libspotify/default.nix
+++ b/pkgs/development/libraries/libspotify/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, libspotify, alsaLib, readline, pkgconfig, apiKey, unzip, gnused }:
 
-let 
-  version = "12.1.51"; 
+let
+  version = "12.1.51";
   isLinux = (stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux");
 in
 
@@ -29,13 +29,8 @@ else stdenv.mkDerivation {
     else
       null;
 
-  # common
-  buildPhase = "true";
-  # no patch or build phase for darwin
-  phases = 
-    [ "unpackPhase" ] ++ 
-    (stdenv.lib.optionals (isLinux) [ "patchPhase" "buildPhase" ]) ++
-    [ "installPhase" ];
+  dontBuild = true;
+
   installPhase = if (isLinux)
     then "installPhase"
     else ''
@@ -48,7 +43,7 @@ else stdenv.mkDerivation {
       mkdir -p "$out"/share/man
       mv -v man3 "$out"/share/man
     '';
- 
+
 
   # darwin-specific
   buildInputs = stdenv.lib.optional (stdenv.system == "x86_64-darwin") unzip;
diff --git a/pkgs/development/libraries/uthash/default.nix b/pkgs/development/libraries/uthash/default.nix
index 5f3b71131e0c..511129de1e8d 100644
--- a/pkgs/development/libraries/uthash/default.nix
+++ b/pkgs/development/libraries/uthash/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "035z3cs5ignywgh4wqxx358a2nhn3lj0x1ifij6vj0yyyhah3wgj";
   };
 
-  buildPhase = ":";
+  dontBuild = false;
 
   buildInputs = stdenv.lib.optional doCheck perl;
 
diff --git a/pkgs/development/libraries/xlibs-wrapper/default.nix b/pkgs/development/libraries/xlibs-wrapper/default.nix
index fcdab133e2f8..ffc58d9ad4b9 100644
--- a/pkgs/development/libraries/xlibs-wrapper/default.nix
+++ b/pkgs/development/libraries/xlibs-wrapper/default.nix
@@ -2,9 +2,12 @@
 
 stdenv.mkDerivation {
   name = "xlibs-wrapper";
-  buildPhase = "true";
+
+  dontBuild = true;
+
   installPhase = "mkdir -p $out";
   unpackPhase = "sourceRoot=.";
+
   propagatedBuildInputs = packages;
 
   preferLocalBuild = true;
diff --git a/pkgs/development/mobile/titaniumenv/cli/node-env.nix b/pkgs/development/mobile/titaniumenv/cli/node-env.nix
index 7af18c034f24..c6d56c9e0747 100644
--- a/pkgs/development/mobile/titaniumenv/cli/node-env.nix
+++ b/pkgs/development/mobile/titaniumenv/cli/node-env.nix
@@ -4,7 +4,7 @@ let
   # Function that generates a TGZ file from a NPM project
   buildNodeSourceDist =
     { name, version, src }:
-    
+
     stdenv.mkDerivation {
       name = "node-tarball-${name}-${version}";
       inherit src;
@@ -30,7 +30,7 @@ let
       sha1 = "77466de589cd5d3c95f138aa78bc569a3cb5d27a";
     };
   } {};
-  
+
   # Function that produces a deployed NPM package in the Nix store
   buildNodePackage =
     { name, version, src, dependencies ? {}, buildInputs ? [], production ? true, npmFlags ? "", meta ? {}, linkDependencies ? false }:
@@ -42,8 +42,8 @@ let
       #
       # It uses the semver utility to check whether a version range matches any
       # of the provided dependencies.
-  
-      analysedDependencies = 
+
+      analysedDependencies =
         if dependencies == {} then {}
         else
           import (stdenv.mkDerivation {
@@ -63,14 +63,14 @@ let
                     let
                       providedDependency = builtins.getAttr dependencyName providedDependencies;
                       versions = builtins.attrNames providedDependency;
-                      
+
                       # If there is a version range match, add the dependency to
                       # the set of shimmed dependencies.
                       # Otherwise, it is a required dependency.
                     in
                     ''
                       $(latestVersion=$(semver -r '${versionSpec}' ${stdenv.lib.concatMapStrings (version: " '${version}'") versions} | tail -1 | tr -d '\n')
-                      
+
                       if semver -r '${versionSpec}' ${stdenv.lib.concatMapStrings (version: " '${version}'") versions} >/dev/null
                       then
                           echo "shimmedDependencies.\"${dependencyName}\".\"$latestVersion\" = true;"
@@ -86,7 +86,7 @@ let
               EOF
             '';
           });
-    
+
       requiredDependencies = analysedDependencies.requiredDependencies or {};
       shimmedDependencies = analysedDependencies.shimmedDependencies or {};
 
@@ -95,11 +95,11 @@ let
         tar --no-same-owner --no-same-permissions -xf ${nodejs.src}
         mv node-* $out
       '';
-  
+
       # Compose dependency information that this package must propagate to its
       # dependencies, so that provided dependencies are not included a second time.
       # This prevents cycles and wildcard version mismatches.
-  
+
       propagatedProvidedDependencies =
         (stdenv.lib.mapAttrs (dependencyName: dependency:
           builtins.listToAttrs (map (versionSpec:
@@ -110,20 +110,20 @@ let
         ) dependencies) //
         providedDependencies //
         { "${name}"."${version}" = true; };
-        
+
       # Create a node_modules folder containing all required dependencies of the
       # package
-      
+
       nodeDependencies = stdenv.mkDerivation {
         name = "node-dependencies-${name}-${version}";
         inherit src;
         buildCommand = ''
           mkdir -p $out/lib/node_modules
           cd $out/lib/node_modules
-          
+
           # Create copies of (or symlinks to) the dependencies that must be deployed in this package's private node_modules folder.
           # This package's private dependencies are NPM packages that have not been provided by any of the includers.
-          
+
           ${stdenv.lib.concatMapStrings (requiredDependencyName:
             stdenv.lib.concatMapStrings (versionSpec:
               let
@@ -133,7 +133,7 @@ let
               in
               ''
                 depPath=$(echo ${dependency}/lib/node_modules/*)
-                
+
                 ${if linkDependencies then ''
                   ln -s $depPath .
                 '' else ''
@@ -144,35 +144,35 @@ let
           ) (builtins.attrNames requiredDependencies)}
         '';
       };
-    
+
       # Deploy the Node package with some tricks
       self = stdenv.lib.makeOverridable stdenv.mkDerivation {
         inherit src meta;
         dontStrip = true;
-      
+
         name = "node-${name}-${version}";
         buildInputs = [ nodejs python ] ++ stdenv.lib.optional (stdenv.isLinux) utillinux ++ buildInputs;
-        buildPhase = "true";
-    
+        dontBuild = true;
+
         installPhase = ''
           # Move the contents of the tarball into the output folder
           mkdir -p "$out/lib/node_modules/${name}"
           mv * "$out/lib/node_modules/${name}"
-          
+
           # Enter the target directory
           cd "$out/lib/node_modules/${name}"
-          
+
           # Patch the shebangs of the bundled modules. For "regular" dependencies
           # this is step is not required, because it has already been done by the generic builder.
-          
+
           if [ -d node_modules ]
           then
               patchShebangs node_modules
           fi
-          
+
           # Copy the required dependencies
           mkdir -p node_modules
-          
+
           ${stdenv.lib.optionalString (requiredDependencies != {}) ''
             for i in ${nodeDependencies}/lib/node_modules/*
             do
@@ -182,9 +182,9 @@ let
                 fi
             done
           ''}
-          
+
           # Create shims for the packages that have been provided by earlier includers to allow the NPM install operation to still succeed
-          
+
           ${stdenv.lib.concatMapStrings (shimmedDependencyName:
             stdenv.lib.concatMapStrings (versionSpec:
               ''
@@ -198,24 +198,24 @@ let
               ''
             ) (builtins.attrNames (shimmedDependencies."${shimmedDependencyName}"))
           ) (builtins.attrNames shimmedDependencies)}
-          
+
           # Ignore npm-shrinkwrap.json for now. Ideally, it should be supported as well
           rm -f npm-shrinkwrap.json
-          
+
           # Some version specifiers (latest, unstable, URLs, file paths) force NPM to make remote connections or consult paths outside the Nix store.
           # The following JavaScript replaces these by * to prevent that:
-          
+
           (
           cat <<EOF
           var fs = require('fs');
           var url = require('url');
-          
+
           /*
            * Replaces an impure version specification by *
            */
           function replaceImpureVersionSpec(versionSpec) {
               var parsedUrl = url.parse(versionSpec);
-              
+
               if(versionSpec == "latest" || versionSpec == "unstable" ||
                   versionSpec.substr(0, 2) == ".." || dependency.substr(0, 2) == "./" || dependency.substr(0, 2) == "~/" || dependency.substr(0, 1) == '/')
                   return '*';
@@ -225,9 +225,9 @@ let
               else
                   return versionSpec;
           }
-          
+
           var packageObj = JSON.parse(fs.readFileSync('./package.json'));
-          
+
           /* Replace dependencies */
           if(packageObj.dependencies !== undefined) {
               for(var dependency in packageObj.dependencies) {
@@ -235,7 +235,7 @@ let
                   packageObj.dependencies[dependency] = replaceImpureVersionSpec(versionSpec);
               }
           }
-          
+
           /* Replace development dependencies */
           if(packageObj.devDependencies !== undefined) {
               for(var dependency in packageObj.devDependencies) {
@@ -243,7 +243,7 @@ let
                   packageObj.devDependencies[dependency] = replaceImpureVersionSpec(versionSpec);
               }
           }
-          
+
           /* Replace optional dependencies */
           if(packageObj.optionalDependencies !== undefined) {
               for(var dependency in packageObj.optionalDependencies) {
@@ -251,19 +251,19 @@ let
                   packageObj.optionalDependencies[dependency] = replaceImpureVersionSpec(versionSpec);
               }
           }
-          
+
           /* Write the fixed JSON file */
           fs.writeFileSync("package.json", JSON.stringify(packageObj));
           EOF
           ) | node
-          
+
           # Deploy the Node.js package by running npm install. Since the dependencies have been symlinked, it should not attempt to install them again,
           # which is good, because we want to make it Nix's responsibility. If it needs to install any dependencies anyway (e.g. because the dependency
           # parameters are incomplete/incorrect), it fails.
-          
+
           export HOME=$TMPDIR
           npm --registry http://www.example.com --nodedir=${nodeSources} ${npmFlags} ${stdenv.lib.optionalString production "--production"} install
-          
+
           # After deployment of the NPM package, we must remove the shims again
           ${stdenv.lib.concatMapStrings (shimmedDependencyName:
             ''
@@ -271,19 +271,19 @@ let
               rmdir node_modules/${shimmedDependencyName}
             ''
           ) (builtins.attrNames shimmedDependencies)}
-          
+
           # It makes no sense to keep an empty node_modules folder around, so delete it if this is the case
           if [ -d node_modules ]
           then
               rmdir --ignore-fail-on-non-empty node_modules
           fi
-          
+
           # Create symlink to the deployed executable folder, if applicable
           if [ -d "$out/lib/node_modules/.bin" ]
           then
               ln -s $out/lib/node_modules/.bin $out/bin
           fi
-          
+
           # Create symlinks to the deployed manual page folders, if applicable
           if [ -d "$out/lib/node_modules/${name}/man" ]
           then
@@ -298,7 +298,7 @@ let
               done
           fi
         '';
-        
+
         shellHook = stdenv.lib.optionalString (requiredDependencies != {}) ''
           export NODE_PATH=${nodeDependencies}/lib/node_modules
         '';
diff --git a/pkgs/development/python-modules/stringtemplate/default.nix b/pkgs/development/python-modules/stringtemplate/default.nix
index f70888f102fc..5e372535b8ec 100644
--- a/pkgs/development/python-modules/stringtemplate/default.nix
+++ b/pkgs/development/python-modules/stringtemplate/default.nix
@@ -3,15 +3,22 @@
 stdenv.mkDerivation rec {
   name = "PyStringTemplate-${version}";
   version = "3.2b1";
-  meta = {
-    homepage = "http://www.stringtemplate.org/";
-    description = "Text Templating Library";
-  };
+
   src = fetchurl {
     url = "http://www.stringtemplate.org/download/${name}.tar.gz";
     sha256 = "0lbib0l8c1q7i1j610rwcdagymr1idahrql4dkgnm5rzyg2vk3ml";
   };
+
   propagatedBuildInputs = [python antlr];
-  buildPhase = "true";
-  installPhase = "python setup.py install --prefix=$out --install-lib=$(toPythonPath $out) -O1";
+
+  dontBuild = true;
+
+  installPhase = ''
+    python setup.py install --prefix=$out --install-lib=$(toPythonPath $out) -O1
+  '';
+
+  meta = {
+    homepage = "http://www.stringtemplate.org/";
+    description = "Text Templating Library";
+  };
 }
diff --git a/pkgs/development/tools/analysis/clang-analyzer/default.nix b/pkgs/development/tools/analysis/clang-analyzer/default.nix
index 50583f65f602..2e01e4d8f28e 100644
--- a/pkgs/development/tools/analysis/clang-analyzer/default.nix
+++ b/pkgs/development/tools/analysis/clang-analyzer/default.nix
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
 
   patches = [ ./0001-Fix-scan-build-to-use-NIX_CFLAGS_COMPILE.patch ];
   buildInputs = [ clang llvmPackages.clang perl makeWrapper ];
-  buildPhase = "true";
+
+  dontBuild = true;
 
   installPhase = ''
     mkdir -p $out/bin $out/libexec
diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index 730d42073759..7fae5604e2a9 100644
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.nix
@@ -4,7 +4,7 @@ rec {
   gradleGen = {name, src} : stdenv.mkDerivation rec {
     inherit name src;
 
-    buildPhase = ":";
+    dontBuild = true;
 
     installPhase = ''
       mkdir -pv $out/lib/gradle/
diff --git a/pkgs/development/tools/misc/sqitch/default.nix b/pkgs/development/tools/misc/sqitch/default.nix
index 0a1032cecf81..bcdba402b2e0 100644
--- a/pkgs/development/tools/misc/sqitch/default.nix
+++ b/pkgs/development/tools/misc/sqitch/default.nix
@@ -1,9 +1,13 @@
 { name, stdenv, perl, makeWrapper, sqitchModule, databaseModule }:
+
 stdenv.mkDerivation {
   name = "${name}-${sqitchModule.version}";
+
   buildInputs = [ perl makeWrapper sqitchModule databaseModule ];
-  unpackPhase = ":";
-  buildPhase = ":";
+
+  src = sqitchModule;
+  dontBuild = true;
+
   installPhase = ''
     mkdir -p $out/bin
     for d in bin/sqitch etc lib share ; do
diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix
index 5b9e27b4829f..ef8ac133b2c3 100644
--- a/pkgs/development/web/grails/default.nix
+++ b/pkgs/development/web/grails/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ unzip ];
 
-  buildPhase = "true";
+  dontBuild = true;
 
   installPhase = ''
     mkdir -p "$out"
diff --git a/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix b/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix
index 3623f78eb200..db60ece128f5 100644
--- a/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix
+++ b/pkgs/misc/cups/drivers/brgenml1cupswrapper/default.nix
@@ -9,7 +9,7 @@
 
     Logging
     -------
-    
+
     `/tmp/br_cupswrapper_ml1.log` when `DEBUG > 0` in `brother_lpdwrapper_BrGenML1`.
     Note that when `DEBUG > 1` the wrapper stops performing its function. Better
     keep `DEBUG == 1` unless this is desirable.
@@ -29,7 +29,7 @@
         Fixed.
 
      3.  >  perl: warning: Falling back to the standard locale ("C").
-    
+
             are supported and installed on your system.
             LANG = "en_US.UTF-8"
             LC_ALL = (unset),
@@ -67,12 +67,11 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ cups perl coreutils gnused gnugrep brgenml1lpr ];
 
-  configurePhase = ":";
-  buildPhase = ":";
+  dontBuild = true;
 
   patchPhase = ''
     WRAPPER=opt/brother/Printers/BrGenML1/cupswrapper/brother_lpdwrapper_BrGenML1
-    PAPER_CFG=opt/brother/Printers/BrGenML1/cupswrapper/paperconfigml1  
+    PAPER_CFG=opt/brother/Printers/BrGenML1/cupswrapper/paperconfigml1
 
     substituteInPlace $WRAPPER \
       --replace "basedir =~" "basedir = \"${brgenml1lpr}/opt/brother/Printers/BrGenML1\"; #" \
diff --git a/pkgs/misc/cups/drivers/brgenml1lpr/default.nix b/pkgs/misc/cups/drivers/brgenml1lpr/default.nix
index 6dc2408ec88a..bd069b0d65a9 100644
--- a/pkgs/misc/cups/drivers/brgenml1lpr/default.nix
+++ b/pkgs/misc/cups/drivers/brgenml1lpr/default.nix
@@ -8,7 +8,7 @@
 
     Logging
     -------
-    
+
     `/tmp/br_lpdfilter_ml1.log` when `$ENV{LPD_DEBUG} > 0` in `filter_BrGenML1`
     which is activated automatically when `DEBUG > 0` in `brother_lpdwrapper_BrGenML1`
     from the cups wrapper.
@@ -17,7 +17,7 @@
     ------
 
      -  filter_BrGenML1 ln 196 `my $GHOST_SCRIPT=`which gs`;`
-      
+
         `GHOST_SCRIPT` is empty resulting in an empty `/tmp/br_lpdfilter_ml1_gsout.dat` file.
         See `/tmp/br_lpdfilter_ml1.log` for the executed command.
 
@@ -49,8 +49,8 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ cups perl glibc ghostscript which ];
-  
-  buildPhase = ":";
+
+  dontBuild = true;
 
   patchPhase = ''
     INFDIR=opt/brother/Printers/BrGenML1/inf
diff --git a/pkgs/os-specific/darwin/install_name_tool/default.nix b/pkgs/os-specific/darwin/install_name_tool/default.nix
index 6a7e6caaa262..581eb31cc71c 100644
--- a/pkgs/os-specific/darwin/install_name_tool/default.nix
+++ b/pkgs/os-specific/darwin/install_name_tool/default.nix
@@ -5,9 +5,9 @@ assert stdenv.isDarwin;
 stdenv.mkDerivation {
   name = "install_name_tool";
   src = "/usr/bin/install_name_tool";
+
   unpackPhase = "true";
-  configurePhase = "true";
-  buildPhase = "true";
+  dontBuild = true;
 
   installPhase = ''
     mkdir -p "$out"/bin
diff --git a/pkgs/os-specific/darwin/osx-sdk/default.nix b/pkgs/os-specific/darwin/osx-sdk/default.nix
index 875479b4f29d..235eadfd2556 100644
--- a/pkgs/os-specific/darwin/osx-sdk/default.nix
+++ b/pkgs/os-specific/darwin/osx-sdk/default.nix
@@ -7,9 +7,8 @@ in stdenv.mkDerivation rec {
 
   src = "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk";
 
-  unpackPhase    = "true";
-  configurePhase = "true";
-  buildPhase     = "true";
+  unpackPhase = "true";
+  dontBuild = true;
 
   installPhase = ''
     mkdir -p $out/Developer/SDKs/
diff --git a/pkgs/os-specific/gnu/hurd/default.nix b/pkgs/os-specific/gnu/hurd/default.nix
index 4bdb6e132fbb..5eccee62468d 100644
--- a/pkgs/os-specific/gnu/hurd/default.nix
+++ b/pkgs/os-specific/gnu/hurd/default.nix
@@ -87,7 +87,7 @@ stdenv.mkDerivation ({
 //
 
 (if headersOnly
- then { buildPhase = ":"; installPhase = "make install-headers"; }
+ then { dontBuild = true; installPhase = "make install-headers"; }
  else (if (cross != null)
        then {
          crossConfig = cross.config;
diff --git a/pkgs/os-specific/gnu/libpthread/default.nix b/pkgs/os-specific/gnu/libpthread/default.nix
index 4b16652ba053..294a1548582b 100644
--- a/pkgs/os-specific/gnu/libpthread/default.nix
+++ b/pkgs/os-specific/gnu/libpthread/default.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation ({
        "ac_cv_lib_ihash_hurd_ihash_create=yes"
      ];
 
-   buildPhase = ":";
+   dontBuild = true;
    installPhase = "make install-data-local-headers";
  }
  else { })
diff --git a/pkgs/os-specific/gnu/mach/default.nix b/pkgs/os-specific/gnu/mach/default.nix
index 6d2d20687bc6..e8c158507151 100644
--- a/pkgs/os-specific/gnu/mach/default.nix
+++ b/pkgs/os-specific/gnu/mach/default.nix
@@ -53,5 +53,5 @@ stdenv.mkDerivation ({
 //
 
 (if headersOnly
- then { buildPhase = ":"; installPhase = "make install-data"; }
+ then { dontBuild = true; installPhase = "make install-data"; }
  else {}))
diff --git a/pkgs/os-specific/linux/firmware/zd1211/default.nix b/pkgs/os-specific/linux/firmware/zd1211/default.nix
index 19cbdecca0cc..2298cbd13c57 100644
--- a/pkgs/os-specific/linux/firmware/zd1211/default.nix
+++ b/pkgs/os-specific/linux/firmware/zd1211/default.nix
@@ -11,9 +11,12 @@ stdenv.mkDerivation rec {
     sha256 = "04ibs0qw8bh6h6zmm5iz6lddgknwhsjq8ib3gyck6a7psw83h7gi";
   };
 
-  buildPhase = "true";
+  dontBuild = true;
 
-  installPhase = "mkdir -p $out/lib/firmware/zd1211; cp * $out/lib/firmware/zd1211";
+  installPhase = ''
+    mkdir -p $out/lib/firmware/zd1211
+    cp * $out/lib/firmware/zd1211
+  '';
 
   meta = {
     description = "Firmware for the ZyDAS ZD1211(b) 802.11a/b/g USB WLAN chip";
diff --git a/pkgs/servers/monitoring/longview/default.nix b/pkgs/servers/monitoring/longview/default.nix
index 9436f4bf300f..fd8a009b1670 100644
--- a/pkgs/servers/monitoring/longview/default.nix
+++ b/pkgs/servers/monitoring/longview/default.nix
@@ -11,15 +11,14 @@ stdenv.mkDerivation rec {
     sha256 = "1i6va44bx2zfgbld7znf1slph0iqidlahq2xh3kd8q4lhvbrjn02";
   };
 
-  patches =
-    [ # log to systemd journal
-      ./log-stdout.patch
-    ];
+  patches = [
+    # log to systemd journal
+    ./log-stdout.patch
+  ];
 
-  postPatch =
-    ''
-      substituteInPlace Linode/Longview/Util.pm --replace /var/run/longview.pid /run/longview.pid
-    '';
+  postPatch = ''
+    substituteInPlace Linode/Longview/Util.pm --replace /var/run/longview.pid /run/longview.pid
+  '';
 
   buildInputs = [ perl makeWrapper glibc ]
     ++ (with perlPackages; [
@@ -37,7 +36,8 @@ stdenv.mkDerivation rec {
       DBDmysql
     ]);
 
-  buildPhase = "true";
+  dontBuild = true;
+
   installPhase = ''
     mkdir -p $out/bin $out/usr
     mv Linode $out
diff --git a/pkgs/servers/rt/default.nix b/pkgs/servers/rt/default.nix
index 77b7c6d4f269..4bb111e18936 100644
--- a/pkgs/servers/rt/default.nix
+++ b/pkgs/servers/rt/default.nix
@@ -7,7 +7,6 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://download.bestpractical.com/pub/rt/release/${name}.tar.gz";
-
     sha256 = "1hgz50fxv9zdcngww083aqh8vzyk148lm7mcivxflpnsqfw3696x";
   };
 
@@ -15,7 +14,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ perl ];
 
-  buildPhase = "true";
+  dontBuild = true;
 
   installPhase = ''
     mkdir $out
diff --git a/pkgs/servers/sql/monetdb/default.nix b/pkgs/servers/sql/monetdb/default.nix
index 443dafef55ca..0e27211a0606 100644
--- a/pkgs/servers/sql/monetdb/default.nix
+++ b/pkgs/servers/sql/monetdb/default.nix
@@ -25,15 +25,14 @@ composableDerivation.composableDerivation {} {
     javaSupport = true;
   };
 
-  configurePhase = ":";
-  buildPhase = ":";
-  
+  dontBuild = true;
+
   installPhase = ''
     mkdir $TMP/build
     sh monetdb-install.sh --build=$TMP/build --prefix=$out --enable-sql --enable-xquery
   '';
 
-  meta = { 
+  meta = {
     description = "A open-source database system for high-performance applications in data mining, OLAP, GIS, XML Query, text and multimedia retrieval";
     homepage = http://monetdb.cwi.nl/;
     license = "MonetDB Public License"; # very similar to Mozilla public license (MPL) Version see 1.1 http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html 
diff --git a/pkgs/servers/x11/xquartz/default.nix b/pkgs/servers/x11/xquartz/default.nix
index db0c446617af..16a4aeb1ce58 100644
--- a/pkgs/servers/x11/xquartz/default.nix
+++ b/pkgs/servers/x11/xquartz/default.nix
@@ -98,9 +98,13 @@ let
   };
 in stdenv.mkDerivation {
   name = "xquartz";
+
   buildInputs = [ ruby makeWrapper ];
+
   unpackPhase = "sourceRoot=.";
-  buildPhase = ":";
+
+  dontBuild = true;
+
   installPhase = ''
     cp -rT ${xorg.xinit} $out
     chmod -R u+w $out
@@ -179,6 +183,7 @@ in stdenv.mkDerivation {
       --replace "@DEFAULT_CLIENT@"  "${xterm}/bin/xterm" \
       --replace "@FONTCONFIG_FILE@" "$fontsConfPath"
   '';
+
   meta = with lib; {
     platforms   = platforms.darwin;
     maintainers = with maintainers; [ cstrahan ];
diff --git a/pkgs/tools/admin/sec/default.nix b/pkgs/tools/admin/sec/default.nix
index c74814ae1974..56da02cc8d08 100644
--- a/pkgs/tools/admin/sec/default.nix
+++ b/pkgs/tools/admin/sec/default.nix
@@ -10,14 +10,14 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ perl ];
 
-  configurePhase = ":";
-  buildPhase = ":";
+  dontBuild = false;
+  doCheck = false;
+
   installPhase = ''
     mkdir -p $out/bin $out/share/man/man1
     cp sec $out/bin
     cp sec.man $out/share/man/man1/sec.1
   '';
-  doCheck = false;
 
   meta = {
     homepage = "http://simple-evcorr.sourceforge.net/";
@@ -26,5 +26,4 @@ stdenv.mkDerivation rec {
     maintainers = [ stdenv.lib.maintainers.tv ];
     platforms = stdenv.lib.platforms.all;
   };
-
 }
diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix
index 4af6475668e7..d60b47ca0116 100644
--- a/pkgs/tools/misc/debootstrap/default.nix
+++ b/pkgs/tools/misc/debootstrap/default.nix
@@ -1,11 +1,8 @@
 { stdenv, fetchurl, dpkg, gettext, gawk, perl, wget, coreutils, fakeroot }:
 
 let
-
 # USAGE like this: debootstrap sid /tmp/target-chroot-directory
-
 # There is also cdebootstrap now. Is that easier to maintain?
-
   makedev = stdenv.mkDerivation {
     name = "makedev-for-debootstrap";
     src = fetchurl {
@@ -27,11 +24,7 @@ let
       chmod +x $t
     '';
   };
-  
-in
-
-stdenv.mkDerivation rec {
-
+in stdenv.mkDerivation rec {
   name = "debootstrap-${version}";
   version = "1.0.80";
 
@@ -44,14 +37,13 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ dpkg gettext gawk perl ];
 
-  buildPhase = ":";
+  dontBuild = true;
 
   # If you have to update the patch for functions a vim regex like this
   # can help you identify which lines are used to write scripts on TARGET and
   # which should /bin/ paths should be replaced:
   # \<echo\>\|\/bin\/\|^\s*\<cat\>\|EOF\|END
   installPhase = ''
-
     sed -i \
       -e 's@/usr/bin/id@id@' \
       -e 's@/usr/bin/dpkg@${dpkg}/bin/dpkg@' \
@@ -59,7 +51,6 @@ stdenv.mkDerivation rec {
       -e 's@/bin/sha@${coreutils}/bin/sha@' \
       debootstrap
 
-
     for file in functions debootstrap; do
       substituteInPlace "$file" \
         --subst-var-by gunzip "$(type -p gunzip)" \
@@ -103,7 +94,7 @@ stdenv.mkDerivation rec {
     inherit makedev;
   };
 
-  meta = { 
+  meta = {
     description = "Tool to create a Debian system in a chroot";
     homepage = http://packages.debian.org/de/lenny/debootstrap; # http://code.erisian.com.au/Wiki/debootstrap
     license = stdenv.lib.licenses.gpl2; # gentoo says so.. ?
diff --git a/pkgs/tools/networking/swec/default.nix b/pkgs/tools/networking/swec/default.nix
index 3e8f3ca3dc59..f8a8b6393d21 100644
--- a/pkgs/tools/networking/swec/default.nix
+++ b/pkgs/tools/networking/swec/default.nix
@@ -5,33 +5,34 @@ stdenv.mkDerivation rec {
   name = "swec-0.4";
 
   src = fetchurl {
-    url = "http://random.zerodogg.org/files/${name}.tar.bz2";
+    url = "http://files.zerodogg.org/swec/${name}.tar.bz2";
     sha256 = "1m3971z4z1wr0paggprfz0n8ng8vsnkc9m6s3bdplgyz7qjk6jwx";
   };
 
   buildInputs = [ makeWrapper perl LWP URI HTMLParser ]
    ++ stdenv.lib.optional doCheck [ HTTPServerSimple Parent ];
 
-  configurePhase =
-    '' for i in swec tests/{runTests,testServer}
-       do
-         sed -i "$i" -e's|/usr/bin/perl|${perl}/bin/perl|g'
-       done
-    '';
+  configurePhase = ''
+    for i in swec tests/{runTests,testServer}
+    do
+      sed -i "$i" -e's|/usr/bin/perl|${perl}/bin/perl|g'
+    done
+  '';
 
-  buildPhase  = "true";
-  installPhase =
-    '' make install prefix="$out"
+  dontBuild = true;
 
-       mkdir -p "$out/share/${name}"
-       cp -v default.sdf "$out/share/${name}"
-       sed -i "$out/bin/swec" -e"s|realpath(\$0)|'$out/share/${name}/swec'|g"
+  installPhase = ''
+    make install prefix="$out"
 
-       wrapProgram "$out/bin/swec" \
-         --prefix PERL5LIB : \
-         ${stdenv.lib.concatStringsSep ":"
-             (map (x: "${x}/lib/perl5/site_perl") [ LWP URI HTMLParser ])}
-    '';
+    mkdir -p "$out/share/${name}"
+    cp -v default.sdf "$out/share/${name}"
+    sed -i "$out/bin/swec" -e"s|realpath(\$0)|'$out/share/${name}/swec'|g"
+
+    wrapProgram "$out/bin/swec" \
+      --prefix PERL5LIB : \
+      ${stdenv.lib.concatStringsSep ":"
+          (map (x: "${x}/lib/perl5/site_perl") [ LWP URI HTMLParser ])}
+  '';
 
   doCheck = true;
   checkPhase = "make test";
diff --git a/pkgs/tools/package-management/nix-repl/default.nix b/pkgs/tools/package-management/nix-repl/default.nix
index e8670770c5f4..8dfc9e6333eb 100644
--- a/pkgs/tools/package-management/nix-repl/default.nix
+++ b/pkgs/tools/package-management/nix-repl/default.nix
@@ -14,18 +14,17 @@ stdenv.mkDerivation {
 
   buildInputs = [ nix readline ];
 
-  buildPhase = "true";
+  dontBuild = true;
 
   # FIXME: unfortunate cut&paste.
-  installPhase =
-    ''
-      mkdir -p $out/bin
-      $CXX -O3 -Wall -std=c++0x \
-        -o $out/bin/nix-repl nix-repl.cc \
-        -I${nix}/include/nix \
-        -lnixformat -lnixutil -lnixstore -lnixexpr -lnixmain -lreadline -lgc \
-        -DNIX_VERSION=\"${(builtins.parseDrvName nix.name).version}\"
-    '';
+  installPhase = ''
+    mkdir -p $out/bin
+    $CXX -O3 -Wall -std=c++0x \
+      -o $out/bin/nix-repl nix-repl.cc \
+      -I${nix}/include/nix \
+      -lnixformat -lnixutil -lnixstore -lnixexpr -lnixmain -lreadline -lgc \
+      -DNIX_VERSION=\"${(builtins.parseDrvName nix.name).version}\"
+  '';
 
   meta = {
     homepage = https://github.com/edolstra/nix-repl;
diff --git a/pkgs/tools/package-management/nix-serve/default.nix b/pkgs/tools/package-management/nix-serve/default.nix
index 332576a9873c..3a20fdc0fac3 100644
--- a/pkgs/tools/package-management/nix-serve/default.nix
+++ b/pkgs/tools/package-management/nix-serve/default.nix
@@ -15,21 +15,20 @@ stdenv.mkDerivation rec {
   buildInputs = [ perl nix ]
     ++ (with perlPackages; [ DBI DBDSQLite Plack Starman ]);
 
-  buildPhase = "true";
+  dontBuild = false;
 
   # FIXME: unfortunate cut&paste.
-  installPhase =
-    ''
-      mkdir -p $out/libexec/nix-serve
-      cp nix-serve.psgi $out/libexec/nix-serve/nix-serve.psgi
+  installPhase = ''
+    mkdir -p $out/libexec/nix-serve
+    cp nix-serve.psgi $out/libexec/nix-serve/nix-serve.psgi
 
-      mkdir -p $out/bin
-      cat > $out/bin/nix-serve <<EOF
-      #! ${stdenv.shell}
-      PERL5LIB=$PERL5LIB exec ${perlPackages.Starman}/bin/starman $out/libexec/nix-serve/nix-serve.psgi "\$@"
-      EOF
-      chmod +x $out/bin/nix-serve
-    '';
+    mkdir -p $out/bin
+    cat > $out/bin/nix-serve <<EOF
+    #! ${stdenv.shell}
+    PERL5LIB=$PERL5LIB exec ${perlPackages.Starman}/bin/starman $out/libexec/nix-serve/nix-serve.psgi "\$@"
+    EOF
+    chmod +x $out/bin/nix-serve
+  '';
 
   meta = {
     homepage = https://github.com/edolstra/nix-serve;
diff --git a/pkgs/tools/security/pius/default.nix b/pkgs/tools/security/pius/default.nix
index ae9b3be9ee2f..c81a01ef8962 100644
--- a/pkgs/tools/security/pius/default.nix
+++ b/pkgs/tools/security/pius/default.nix
@@ -12,19 +12,19 @@ stdenv.mkDerivation {
 
   buildInputs = [ python ];
 
-  patchPhase =
-    '' sed -i "pius" -e's|/usr/bin/gpg|${gnupg}/bin/gpg2|g'
-    '';
+  patchPhase = ''
+    sed -i "pius" -e's|/usr/bin/gpg|${gnupg}/bin/gpg2|g'
+  '';
 
-  buildPhase = "true";
+  dontBuild = true;
 
-  installPhase =
-    '' mkdir -p "$out/bin"
-       cp -v pius "$out/bin"
+  installPhase = ''
+    mkdir -p "$out/bin"
+    cp -v pius "$out/bin"
 
-       mkdir -p "$out/doc/pius-${version}"
-       cp -v README "$out/doc/pius-${version}"
-    '';
+    mkdir -p "$out/doc/pius-${version}"
+    cp -v README "$out/doc/pius-${version}"
+  '';
 
   meta = {
     homepage = http://www.phildev.net/pius/;
diff --git a/pkgs/tools/text/xidel/default.nix b/pkgs/tools/text/xidel/default.nix
index 000584a50e10..c76e0f49734e 100644
--- a/pkgs/tools/text/xidel/default.nix
+++ b/pkgs/tools/text/xidel/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     dpkg-deb -x ${src} ./
   '';
 
-  buildPhase = "true";
+  dontBuild = true;
 
   installPhase = ''
     mkdir -p "$out/bin"
diff --git a/pkgs/tools/text/xml/basex/default.nix b/pkgs/tools/text/xml/basex/default.nix
index e2b59bdb115a..b7ff365fad52 100644
--- a/pkgs/tools/text/xml/basex/default.nix
+++ b/pkgs/tools/text/xml/basex/default.nix
@@ -21,9 +21,8 @@ stdenv.mkDerivation rec {
     mimeType = "text/xml";
   };
 
-  # We're using a pre-built package
-  configurePhase = "true";
-  buildPhase = "true";
+  dontBuild = true;
+
   installPhase = ''
     mkdir -p "$out"
     cp -r * "$out"
diff --git a/pkgs/tools/typesetting/pygmentex/default.nix b/pkgs/tools/typesetting/pygmentex/default.nix
index da029639c3d2..c19447cc0c4a 100644
--- a/pkgs/tools/typesetting/pygmentex/default.nix
+++ b/pkgs/tools/typesetting/pygmentex/default.nix
@@ -11,12 +11,11 @@ python2Packages.buildPythonApplication rec {
 
   pythonPath = [ python2Packages.pygments python2Packages.chardet ];
 
-  buildPhase = ":";
-  
+  dontBuild = true;
+
   doCheck = false;
-  
+
   installPhase = ''
-  
     mkdir -p $out/bin
     cp -a pygmentex.py $out/bin
   '';
diff --git a/pkgs/tools/typesetting/tex/dblatex/default.nix b/pkgs/tools/typesetting/tex/dblatex/default.nix
index 18f9c99ee240..0aab900f1503 100644
--- a/pkgs/tools/typesetting/tex/dblatex/default.nix
+++ b/pkgs/tools/typesetting/tex/dblatex/default.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  buildPhase = "true";
+  dontBuild = true;
 
   installPhase = ''
     python ./setup.py install --prefix="$out" --use-python-path --verbose
diff --git a/pkgs/tools/typesetting/tex/pgf/1.x.nix b/pkgs/tools/typesetting/tex/pgf/1.x.nix
index a26513d9f26d..5e84a92caddb 100644
--- a/pkgs/tools/typesetting/tex/pgf/1.x.nix
+++ b/pkgs/tools/typesetting/tex/pgf/1.x.nix
@@ -8,11 +8,13 @@ stdenv.mkDerivation {
     sha256 = "0s6b8rx9yfxcjjg18vx1mphnwbd28fl5lnq0dasjz40pp3ypwdjv";
   };
 
-  buildPhase = "true";
+  dontBuild = true;
+
   installPhase = "
     mkdir -p $out/share/texmf-nix
     cp -prd * $out/share/texmf-nix
   ";
+
   meta = {
     branch = "1";
   };
diff --git a/pkgs/tools/typesetting/tex/pgf/2.x.nix b/pkgs/tools/typesetting/tex/pgf/2.x.nix
index 821357e72739..05e28454be1f 100644
--- a/pkgs/tools/typesetting/tex/pgf/2.x.nix
+++ b/pkgs/tools/typesetting/tex/pgf/2.x.nix
@@ -8,12 +8,13 @@ stdenv.mkDerivation {
     sha256 = "0j57niag4jb2k0iyrvjsannxljc3vkx0iag7zd35ilhiy4dh6264";
   };
 
-  buildPhase = "true";
+  dontBuild = true;
 
   installPhase = "
     mkdir -p $out/share/texmf-nix
     cp -prd * $out/share/texmf-nix
   ";
+
   meta = {
     branch = "2";
   };
diff --git a/pkgs/tools/typesetting/tex/pgf/3.x.nix b/pkgs/tools/typesetting/tex/pgf/3.x.nix
index 32c73c4a43cc..b8df977cfb01 100644
--- a/pkgs/tools/typesetting/tex/pgf/3.x.nix
+++ b/pkgs/tools/typesetting/tex/pgf/3.x.nix
@@ -17,12 +17,13 @@ stdenv.mkDerivation {
     unzip $src
   '';
 
-  buildPhase = "true";
+  dontBuild = true;
 
   installPhase = "
     mkdir -p $out/share/texmf-nix
     cp -prd * $out/share/texmf-nix
   ";
+
   meta = {
     branch = "3";
   };
diff --git a/pkgs/tools/typesetting/tex/pgfplots/default.nix b/pkgs/tools/typesetting/tex/pgfplots/default.nix
index 67739350c6f6..d7c03967b0b4 100644
--- a/pkgs/tools/typesetting/tex/pgfplots/default.nix
+++ b/pkgs/tools/typesetting/tex/pgfplots/default.nix
@@ -2,17 +2,18 @@
 
 stdenv.mkDerivation {
   name = "pgfplots-1.5.1";
+
   src = fetchurl {
     url = mirror://sourceforge/pgfplots/pgfplots_1.5.1.tds.zip;
     sha256 = "1xajrmq35i0qlsfwydy5zzg6f1jg88hqqh5b3xsmglzrarnllbdi";
   };
-  
+
   buildInputs = [ unzip ];
-  
+
   unpackPhase = "unzip $src";
-  
-  buildPhase = "true";
-  
+
+  dontBuild = true;
+
   installPhase = "
     mkdir -p $out/share/texmf-nix
     cp -prd * $out/share/texmf-nix

From 30ef92e0ff4d47124f64cf3617c2b92d9d448bca Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 4 May 2016 10:37:40 +0000
Subject: [PATCH 230/287] jbidwatcher: fixup to last commit

---
 pkgs/applications/misc/jbidwatcher/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/jbidwatcher/default.nix b/pkgs/applications/misc/jbidwatcher/default.nix
index a933befec5f4..f204a9fc0ef9 100644
--- a/pkgs/applications/misc/jbidwatcher/default.nix
+++ b/pkgs/applications/misc/jbidwatcher/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   jarfile = "$out/share/java/${pname}/JBidwatcher.jar";
 
-#  unpackPhase = "true";
+  unpackPhase = "true";
 
   dontBuild = true;
 

From 397c75aeb41dbf1b885782c9a31670c87372f561 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 4 May 2016 13:40:53 +0200
Subject: [PATCH 231/287] Revert "Just strip everything by default"

This reverts commit 2362891dc815160e343e52458f25db22508ac487. The patch
is broken. :-(
---
 pkgs/build-support/setup-hooks/strip.sh | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/pkgs/build-support/setup-hooks/strip.sh b/pkgs/build-support/setup-hooks/strip.sh
index 33ef85e436e2..6860c9b9cb9a 100644
--- a/pkgs/build-support/setup-hooks/strip.sh
+++ b/pkgs/build-support/setup-hooks/strip.sh
@@ -4,7 +4,7 @@ fixupOutputHooks+=(_doStrip)
 
 _doStrip() {
     if [ -z "$dontStrip" ]; then
-        stripDebugList=${stripDebugList:-.}
+        stripDebugList=${stripDebugList:-lib lib32 lib64 libexec bin sbin}
         if [ -n "$stripDebugList" ]; then
             stripDirs "$stripDebugList" "${stripDebugFlags:--S}"
         fi
@@ -29,20 +29,8 @@ stripDirs() {
     dirs=${dirsNew}
 
     if [ -n "${dirs}" ]; then
-        header "Stripping (with flags $stripFlags) in$dirs"
-        while IFS= read -r -d $'\0' f; do
-            if out=$(strip $commonStripFlags $stripFlags "$f" 2>&1); then
-                echo "Stripped $f"
-            else
-                # Ignore failures on files that cannot be stripped.
-                if [ "$out" = "strip:$f: File format not recognized" ]; then
-                    continue
-                fi
-
-                echo "Strip failed on file $f: $out"
-                false # fail !
-            fi
-        done < <(find $dirs -type f -print0)
+        header "stripping (with flags $stripFlags) in$dirs"
+        find $dirs -type f -print0 | xargs -0 ${xargsFlags:--r} strip $commonStripFlags $stripFlags || true
         stopNest
     fi
 }

From 2cbb7bf9d1ce519a480880f257cc569fbe4e6269 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 4 May 2016 14:23:54 +0200
Subject: [PATCH 232/287] cc-wrapper: add -B flag with cc.lib

This fixes `gcc --print-file-name=libstdc++.so`
and thus it should fix #14967.
---
 pkgs/build-support/cc-wrapper/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 6bdb35b912a7..da114fdb347f 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -113,6 +113,7 @@ stdenv.mkDerivation {
         ccCFlags+=" -B${cc_solib}/lib64"
       fi
       ccLDFlags+=" -L${cc_solib}/lib"
+      ccCFlags+=" -B${cc_solib}/lib"
 
       ${optionalString cc.langVhdl or false ''
         ccLDFlags+=" -L${zlib.out}/lib"

From 68b4c4caa72655e15a6130645d49d7f4bdf00f5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 29 Apr 2016 13:39:28 +0200
Subject: [PATCH 233/287] bzip2: greatly simplify by using autoconfiscated
 version

I don't know there's still need for linkStatic or cygwin special-casing,
but I left it there for now.
---
 pkgs/tools/compression/bzip2/default.nix | 110 +++++------------------
 1 file changed, 20 insertions(+), 90 deletions(-)

diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix
index d3ed5121ba98..f46ddd1c5369 100644
--- a/pkgs/tools/compression/bzip2/default.nix
+++ b/pkgs/tools/compression/bzip2/default.nix
@@ -1,103 +1,33 @@
-{ stdenv, fetchurl, libtool, autoconf, automake, gnum4, linkStatic ? false }:
+{ stdenv, fetchurl
+, linkStatic ? (stdenv.system == "i686-cygwin")
+}:
 
-let
-  version = "1.0.6";
-
-  sharedLibrary = !(stdenv ? isStatic)
-               && stdenv.system != "i686-cygwin" && !linkStatic;
-
-  darwinMakefile = fetchurl {
-    url    = "https://gitweb.gentoo.org/repo/proj/prefix.git/plain/app-arch/bzip2/files/bzip2-1.0.6-Makefile-libbz2_dylib";
-    sha256 = "1lq6g98kfpwv2f7wn4sk8hzcf87dwf92gviq0b4691f5bvc9mawz";
-  };
-in stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "bzip2-${version}";
+  version = "1.0.6.0.1";
 
+  /* We use versions patched to use autotools style properly,
+      saving lots of trouble. */
   src = fetchurl {
-    url = "http://www.bzip.org/${version}/bzip2-${version}.tar.gz";
-    sha256 = "1kfrc7f0ja9fdn6j1y6yir6li818npy6217hvr3wzmnmzhs8z152";
+    urls = map
+      (prefix: prefix + "/people/sbrabec/bzip2/tarballs/${name}.tar.gz")
+      [
+        "http://ftp.uni-kl.de/pub/linux/suse"
+        "ftp://ftp.hs.uni-hamburg.de/pub/mirrors/suse"
+        "ftp://ftp.mplayerhq.hu/pub/linux/suse"
+        "http://ftp.suse.com/pub" # the original patched version but slow
+      ];
+    sha256 = "0b5b5p8c7bslc6fslcr1nj9136412v3qcvbg6yxi9argq9g72v8c";
   };
 
-  crossAttrs = {
-    buildInputs = [ libtool autoconf automake gnum4 ];
-    patches = [
-      # original upstream for the autoconf patch is here:
-      # http://ftp.suse.com/pub/people/sbrabec/bzip2/for_downstream/bzip2-1.0.6-autoconfiscated.patch
-      # but we get the mingw-builds version of the patch, which fixes
-      # a few more issues
-      (fetchurl {
-        url = "https://raw.githubusercontent.com/niXman/mingw-builds/17ae841dcf6e72badad7941a06d631edaf687436/patches/bzip2/bzip2-1.0.6-autoconfiscated.patch";
-        sha256 = "1flbd3i8vg9kzq0a712qcg9j2c4ymnqvgd0ldyafpzvbqj1iicnp";
-      })
-    ];
-    patchFlags = "-p0";
-    postPatch = ''
-      sed -i -e '/<sys\\stat\.h>/s|\\|/|' bzip2.c
-    '';
-    preConfigure = "sh ./autogen.sh";
-  };
-
-  outputs = [ "dev" "bin" "static" ] ++ stdenv.lib.optional sharedLibrary "out";
-
-  preBuild = stdenv.lib.optionalString sharedLibrary ''
-    make -f ${if stdenv.isDarwin then "Makefile-libbz2_dylib" else "Makefile-libbz2_so"}
-  '';
-
-  preInstall = stdenv.lib.optionalString
-    (sharedLibrary && stdenv.cross.libc or null != "msvcrt")
-    (if !stdenv.isDarwin then ''
-      mkdir -p $out/lib
-      mv libbz2.so* $out/lib
-      ( cd $out/lib &&
-        ln -s libbz2.so.1.0.? libbz2.so &&
-        ln -s libbz2.so.1.0.? libbz2.so.1
-      )
-    '' else ''
-      mkdir -p $out/lib
-      mv libbz2.*.dylib $out/lib
-      ( cd $out/lib &&
-        ln -s libbz2.1.0.?.dylib libbz2.dylib &&
-        ln -s libbz2.1.0.?.dylib libbz2.1.dylib
-      )
-    '');
-
-  installFlags = [ "PREFIX=$(bin)" ];
-
-  postInstall = ''
-    rm $bin/bin/bunzip2* $bin/bin/bzcat*
-    ln -s bzip2 $bin/bin/bunzip2
-    ln -s bzip2 $bin/bin/bzcat
-
-  ''
-    + (if stdenv.cross.libc or null != "msvcrt" # mingw TODO: avoided rebuilds for now
-      then ''
-        mkdir "$static"
-        mv "$bin/lib" "$static/"
-      ''
-      else ''
-        moveToOutput "lib/*.a" "$static"
-        moveToOutput "lib/*.dll.a" "$out"
-        mkdir -p "$static" # empty for now, but we want to avoid failure
-      '')
-    ;
-
   postPatch = ''
-    substituteInPlace Makefile --replace CC=gcc CC=cc
-    substituteInPlace Makefile-libbz2_so --replace CC=gcc CC=cc
-  '' + stdenv.lib.optionalString stdenv.isDarwin ''
-    cp ${darwinMakefile} Makefile-libbz2_dylib
-    substituteInPlace Makefile-libbz2_dylib \
-      --replace "CC=gcc" "CC=cc" \
-      --replace "PREFIX=/usr" "PREFIX=$out"
+    sed -i -e '/<sys\\stat\.h>/s|\\|/|' bzip2.c
   '';
 
-  preConfigure = ''
-    substituteInPlace Makefile --replace '$(PREFIX)/man' '$(PREFIX)/share/man'
-  '';
+  outputs = [ "dev" "bin" "out" "man" ];
 
-  makeFlags = stdenv.lib.optional linkStatic "LDFLAGS=-static";
-
-  inherit linkStatic;
+  configureFlags =
+    stdenv.lib.optionals linkStatic [ "--enable-static" "--disable-shared" ];
 
   meta = {
     homepage = "http://www.bzip.org";

From b70d728ed78021b63f11b167c169188d7c8dea73 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 4 May 2016 08:23:39 -0500
Subject: [PATCH 234/287] cmake: use single output

Fixes #15184. Install everything, including documentation, into one
output, increasing package size by 10%. Otherwise, the help commands for
CMake do not work. This is a good trade because CMake should be a
build-only dependency. The only reason the docs should ever make it to
runtime is if the user has actually installed CMake, in which case
there's a pretty good chance they want the docs, too.
---
 pkgs/development/tools/build-managers/cmake/default.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index e1528aa5f009..32e16751395a 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     optional (stdenv ? glibc) ./search-path-3.2.patch
     ++ optional stdenv.isCygwin ./3.2.2-cygwin.patch;
 
-  outputs = [ "out" "doc" ];
+  outputs = [ "out" ];
   setOutputFlags = false;
 
   setupHook = ./setup-hook.sh;
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
         --subst-var-by glibc_lib ${getLib glibc}
     '';
   configureFlags =
-    [ "--docdir=/share/doc/${name}"
+    [ "--docdir=share/doc/${name}"
       "--no-system-jsoncpp"
     ]
     ++ optional (!stdenv.isCygwin) "--system-libs"
@@ -64,10 +64,6 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  preInstall = ''mkdir "$doc" '';
-
-  postInstall = ''moveToOutput "share/cmake-*/Help" "$doc" '';
-
   meta = with stdenv.lib; {
     homepage = http://www.cmake.org/;
     description = "Cross-Platform Makefile Generator";

From 9e0d0423fe4a97d339addc8b7bd7f8ac8677c2a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 29 Apr 2016 11:22:47 +0200
Subject: [PATCH 235/287] stdenv substituteAll: use more robust code

The set/env fix in #14907 wasn't very good, so let's use a null-delimited
approach. Suggested by Aszlig.
In particular, this should fix a mass-breakage on Darwin, though I was
unable to test that.
---
 pkgs/stdenv/generic/setup.sh | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index a183aabed0e3..3e156b579bc4 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -409,7 +409,7 @@ substitute() {
         if [ "$p" = --subst-var ]; then
             varName="${params[$((n + 1))]}"
             # check if the used nix attribute name is a valid bash name
-            if ! [[ "$varName" =~ ^[a-zA-Z_]+[a-zA-Z0-9_]*$ ]]; then
+            if ! [[ "$varName" =~ ^[a-zA-Z_][a-zA-Z0-9_]*$ ]]; then
                 echo "substitution variables must be valid bash names, \"$varName\" isn't."
                 exit 1;
             fi
@@ -439,20 +439,23 @@ substituteInPlace() {
 }
 
 
+# Substitute all environment variables that do not start with an upper-case
+# character or underscore. Note: other names that aren't bash-valid
+# will cause an error during `substitute --subst-var`.
 substituteAll() {
     local input="$1"
     local output="$2"
+    local -a args=()
 
-    # Select all environment variables that start with a lowercase character.
-    # Will not work with nix attribute names (and thus env variables) containing '\n'.
-    for envVar in $(set | sed -e $'s/^\([a-z][^=]*\)=.*/\\1/; t \n d'); do
+    # We need to be careful due to vars with multi-line contents or weird names.
+    while IFS= read -r -d '' varName; do
         if [ "$NIX_DEBUG" = "1" ]; then
-            echo "$envVar -> ${!envVar}"
+            echo "@varName@ -> '${varName}'"
         fi
-        args="$args --subst-var $envVar"
-    done
+        args+=("--subst-var" "$varName")
+    done < <(env -0 | cut -z -d= -f1 | grep -z -v '^[_A-Z]')
 
-    substitute "$input" "$output" $args
+    substitute "$input" "$output" "${args[@]}"
 }
 
 

From 14c22adbc331c5b22269a72769622c527a61aa27 Mon Sep 17 00:00:00 2001
From: Wei Tang <hi@that.world>
Date: Sun, 8 May 2016 03:14:48 +0200
Subject: [PATCH 236/287] calibre: Fix file already exist building problem

---
 pkgs/applications/misc/calibre/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 7c6f3cfdffb1..8e4551713d24 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -30,7 +30,6 @@ stdenv.mkDerivation rec {
   # hack around a build problem
   preBuild = ''
     mkdir -p ../tmp.*/lib
-    ln -s '${qtbase.out}/lib/libQt5PlatformSupport.a' ../tmp.*/lib/
   '';
 
   nativeBuildInputs = [ makeWrapper pkgconfig qmakeHook ];

From 4d15758984b6fca164549dc3957a8f7571b26452 Mon Sep 17 00:00:00 2001
From: Wei Tang <hi@that.world>
Date: Sun, 8 May 2016 01:44:37 +0200
Subject: [PATCH 237/287] firefox: Fix build due to commit #ab0a0c

---
 pkgs/applications/networking/browsers/firefox/wrapper.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index d859d9a74ec3..64b5b6f44b1f 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -129,7 +129,7 @@ stdenv.mkDerivation {
   # Let each plugin tell us (through its `mozillaPlugin') attribute
   # where to find the plugin in its tree.
   plugins = map (x: x + x.mozillaPlugin) plugins;
-  libs = lib.makeLibraryPath libs + ":" + lib.makeSearchPathOutputs "lib64" ["lib"] libs;
+  libs = lib.makeLibraryPath libs + ":" + lib.makeSearchPathOutput "lib" "lib64" libs;
   gtk_modules = map (x: x + x.gtkModule) gtk_modules;
 
   passthru = { unwrapped = browser; };

From 62fc8859c10dd18b005b9bcaa0b429103d7661d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 8 May 2016 19:37:37 +0200
Subject: [PATCH 238/287] stdenv substituteAll: use yet another implementation

It turned out that process substitution fed into a while-cycle
isn't recognized during darwin bootstrap:
http://hydra.nixos.org/build/35382446/nixlog/1/raw

Also fix broken NIX_DEBUG output, noticed by abbradar.
---
 pkgs/stdenv/generic/setup.sh | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 3e156b579bc4..10fc4873afa3 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -398,7 +398,7 @@ substitute() {
     content="${content%X}"
 
     for ((n = 2; n < ${#params[*]}; n += 1)); do
-        p=${params[$n]}
+        p="${params[$n]}"
 
         if [ "$p" = --replace ]; then
             pattern="${params[$((n + 1))]}"
@@ -448,13 +448,18 @@ substituteAll() {
     local -a args=()
 
     # We need to be careful due to vars with multi-line contents or weird names.
-    while IFS= read -r -d '' varName; do
+    local IFS==
+    local varNames="$(env -0 | cut -z -d= -f1 | grep -z -v '^[_A-Z]' | tr '\000' '=')"
+    local varName
+    for varName in $varNames; do
         if [ "$NIX_DEBUG" = "1" ]; then
-            echo "@varName@ -> '${varName}'"
+            echo "@${varName}@ -> '${!varName}'"
         fi
         args+=("--subst-var" "$varName")
-    done < <(env -0 | cut -z -d= -f1 | grep -z -v '^[_A-Z]')
+    done
 
+    # restore default $IFS for the child
+    IFS=$' \t\n'
     substitute "$input" "$output" "${args[@]}"
 }
 

From 099c59ea4e4f6944bdff6b12fefd2b441340a288 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 4 May 2016 05:58:02 -0500
Subject: [PATCH 239/287] qt55.qmakeHook: fix error when package builds no
 libraries

---
 pkgs/development/libraries/qt-5/5.5/qmake-hook.sh | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.5/qmake-hook.sh b/pkgs/development/libraries/qt-5/5.5/qmake-hook.sh
index aa20779f4ec0..425048a59357 100644
--- a/pkgs/development/libraries/qt-5/5.5/qmake-hook.sh
+++ b/pkgs/development/libraries/qt-5/5.5/qmake-hook.sh
@@ -57,11 +57,13 @@ _qtMultioutModuleDevs() {
     # Move libtool archives and qmake project files to $dev/lib
     if [ "z${!outputLib}" != "z${!outputDev}" ]; then
         pushd "${!outputLib}"
-        find lib -name '*.a' -o -name '*.la' -o -name '*.prl' -print0 | \
-            while read -r -d $'\0' file; do
-                mkdir -p "${!outputDev}/$(dirname "$file")"
-                mv "${!outputLib}/$file" "${!outputDev}/$file"
-            done
+        if [ -d "lib" ]; then
+            find lib -name '*.a' -o -name '*.la' -o -name '*.prl' -print0 | \
+                while read -r -d $'\0' file; do
+                    mkdir -p "${!outputDev}/$(dirname "$file")"
+                    mv "${!outputLib}/$file" "${!outputDev}/$file"
+                done
+        fi
         popd
     fi
 }

From ea90e3e6caa3173bc894cfb6052904517ebcb02c Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 2 May 2016 18:50:19 -0500
Subject: [PATCH 240/287] qt56: init at 5.6.0

---
 .../libraries/qt-5/5.6/default.nix            | 121 ++++++++
 .../libraries/qt-5/5.6/fetchsrcs.sh           |  47 +++
 .../qt-5/5.6/fix-qt-module-cmake-config.sh    |   5 +
 .../libraries/qt-5/5.6/make-qt-wrapper.sh     |  38 +++
 .../libraries/qt-5/5.6/qmake-hook.sh          | 114 +++++++
 .../qt-5/5.6/qtbase/compose-search-path.patch |  16 +
 .../qt-5/5.6/qtbase/decrypt-ssl-traffic.patch |  13 +
 .../libraries/qt-5/5.6/qtbase/default.nix     | 284 ++++++++++++++++++
 .../qt-5/5.6/qtbase/dlopen-dbus.patch         |  13 +
 .../libraries/qt-5/5.6/qtbase/dlopen-gl.patch |  17 ++
 .../qt-5/5.6/qtbase/dlopen-gtkstyle.patch     |  50 +++
 .../qt-5/5.6/qtbase/dlopen-libXcursor.patch   |  17 ++
 .../qt-5/5.6/qtbase/dlopen-openssl.patch      |  26 ++
 .../qt-5/5.6/qtbase/dlopen-resolv.patch       |  26 ++
 .../libraries/qt-5/5.6/qtbase/libressl.patch  |  33 ++
 .../qt-5/5.6/qtbase/mkspecs-libgl.patch       |  15 +
 .../qtbase/nix-profiles-library-paths.patch   |  22 ++
 .../libraries/qt-5/5.6/qtbase/series          |   9 +
 .../libraries/qt-5/5.6/qtbase/setup-hook.sh   |  52 ++++
 .../libraries/qt-5/5.6/qtbase/tzdir.patch     |  40 +++
 .../qt-5/5.6/qtbase/xdg-config-dirs.patch     |  42 +++
 .../libraries/qt-5/5.6/qtconnectivity.nix     |  10 +
 .../qt-5/5.6/qtdeclarative/default.nix        |  14 +
 .../nix-profiles-import-paths.patch           |  20 ++
 .../libraries/qt-5/5.6/qtdeclarative/series   |   1 +
 pkgs/development/libraries/qt-5/5.6/qtdoc.nix |   6 +
 .../libraries/qt-5/5.6/qtenginio.nix          |   9 +
 .../libraries/qt-5/5.6/qtgraphicaleffects.nix |   6 +
 .../libraries/qt-5/5.6/qtimageformats.nix     |   6 +
 .../libraries/qt-5/5.6/qtlocation.nix         |  10 +
 .../libraries/qt-5/5.6/qtmultimedia.nix       |  16 +
 .../libraries/qt-5/5.6/qtquickcontrols.nix    |   6 +
 .../qt-5/5.6/qtscript/0001-glib-2.32.patch    |  25 ++
 .../libraries/qt-5/5.6/qtscript/default.nix   |  10 +
 .../libraries/qt-5/5.6/qtsensors.nix          |   9 +
 .../0001-dlopen-serialport-udev.patch         |  28 ++
 .../qt-5/5.6/qtserialport/default.nix         |  15 +
 pkgs/development/libraries/qt-5/5.6/qtsvg.nix |   9 +
 .../libraries/qt-5/5.6/qttools.nix            |  16 +
 .../libraries/qt-5/5.6/qttranslations.nix     |   6 +
 .../libraries/qt-5/5.6/qtwebsockets.nix       |   9 +
 .../libraries/qt-5/5.6/qtx11extras.nix        |   9 +
 .../libraries/qt-5/5.6/qtxmlpatterns.nix      |   9 +
 pkgs/development/libraries/qt-5/5.6/srcs.nix  | 261 ++++++++++++++++
 pkgs/top-level/all-packages.nix               |   4 +
 45 files changed, 1514 insertions(+)
 create mode 100644 pkgs/development/libraries/qt-5/5.6/default.nix
 create mode 100755 pkgs/development/libraries/qt-5/5.6/fetchsrcs.sh
 create mode 100644 pkgs/development/libraries/qt-5/5.6/fix-qt-module-cmake-config.sh
 create mode 100644 pkgs/development/libraries/qt-5/5.6/make-qt-wrapper.sh
 create mode 100644 pkgs/development/libraries/qt-5/5.6/qmake-hook.sh
 create mode 100644 pkgs/development/libraries/qt-5/5.6/qtbase/compose-search-path.patch
 create mode 100644 pkgs/development/libraries/qt-5/5.6/qtbase/decrypt-ssl-traffic.patch
 create mode 100644 pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
 create mode 100644 pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-dbus.patch
 create mode 100644 pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-gl.patch
 create mode 100644 pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-gtkstyle.patch
 create mode 100644 pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-libXcursor.patch
 create mode 100644 pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-openssl.patch
 create mode 100644 pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-resolv.patch
 create mode 100644 pkgs/development/libraries/qt-5/5.6/qtbase/libressl.patch
 create mode 100644 pkgs/development/libraries/qt-5/5.6/qtbase/mkspecs-libgl.patch
 create mode 100644 pkgs/development/libraries/qt-5/5.6/qtbase/nix-profiles-library-paths.patch
 create mode 100644 pkgs/development/libraries/qt-5/5.6/qtbase/series
 create mode 100644 pkgs/development/libraries/qt-5/5.6/qtbase/setup-hook.sh
 create mode 100644 pkgs/development/libraries/qt-5/5.6/qtbase/tzdir.patch
 create mode 100644 pkgs/development/libraries/qt-5/5.6/qtbase/xdg-config-dirs.patch
 create mode 100644 pkgs/development/libraries/qt-5/5.6/qtconnectivity.nix
 create mode 100644 pkgs/development/libraries/qt-5/5.6/qtdeclarative/default.nix
 create mode 100644 pkgs/development/libraries/qt-5/5.6/qtdeclarative/nix-profiles-import-paths.patch
 create mode 100644 pkgs/development/libraries/qt-5/5.6/qtdeclarative/series
 create mode 100644 pkgs/development/libraries/qt-5/5.6/qtdoc.nix
 create mode 100644 pkgs/development/libraries/qt-5/5.6/qtenginio.nix
 create mode 100644 pkgs/development/libraries/qt-5/5.6/qtgraphicaleffects.nix
 create mode 100644 pkgs/development/libraries/qt-5/5.6/qtimageformats.nix
 create mode 100644 pkgs/development/libraries/qt-5/5.6/qtlocation.nix
 create mode 100644 pkgs/development/libraries/qt-5/5.6/qtmultimedia.nix
 create mode 100644 pkgs/development/libraries/qt-5/5.6/qtquickcontrols.nix
 create mode 100644 pkgs/development/libraries/qt-5/5.6/qtscript/0001-glib-2.32.patch
 create mode 100644 pkgs/development/libraries/qt-5/5.6/qtscript/default.nix
 create mode 100644 pkgs/development/libraries/qt-5/5.6/qtsensors.nix
 create mode 100644 pkgs/development/libraries/qt-5/5.6/qtserialport/0001-dlopen-serialport-udev.patch
 create mode 100644 pkgs/development/libraries/qt-5/5.6/qtserialport/default.nix
 create mode 100644 pkgs/development/libraries/qt-5/5.6/qtsvg.nix
 create mode 100644 pkgs/development/libraries/qt-5/5.6/qttools.nix
 create mode 100644 pkgs/development/libraries/qt-5/5.6/qttranslations.nix
 create mode 100644 pkgs/development/libraries/qt-5/5.6/qtwebsockets.nix
 create mode 100644 pkgs/development/libraries/qt-5/5.6/qtx11extras.nix
 create mode 100644 pkgs/development/libraries/qt-5/5.6/qtxmlpatterns.nix
 create mode 100644 pkgs/development/libraries/qt-5/5.6/srcs.nix

diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix
new file mode 100644
index 000000000000..b74b2debf0e2
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.6/default.nix
@@ -0,0 +1,121 @@
+/*
+
+# Minor Updates
+
+1. Edit ./fetchsrcs.sh to point to the updated URL.
+2. Run ./fetchsrcs.sh.
+3. Build and enjoy.
+
+# Major Updates
+
+1. Make a copy of this directory. (We like to keep the old version around
+   for a short time after major updates.)
+2. Delete the tmp/ subdirectory of the copy.
+3. Follow the minor update instructions above.
+4. Package any new Qt modules, if necessary.
+
+*/
+
+{ pkgs
+
+# options
+, developerBuild ? false
+, decryptSslTraffic ? false
+}:
+
+let inherit (pkgs) makeSetupHook makeWrapper stdenv; in
+
+with stdenv.lib;
+
+let
+
+  mirror = "http://download.qt.io";
+  srcs = import ./srcs.nix { inherit mirror; inherit (pkgs) fetchurl; };
+
+  qtSubmodule = args:
+    let
+      inherit (args) name;
+      version = args.version or srcs."${name}".version;
+      src = args.src or srcs."${name}".src;
+      inherit (pkgs.stdenv) mkDerivation;
+    in mkDerivation (args // {
+      name = "${name}-${version}";
+      inherit src;
+
+      propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or []);
+      nativeBuildInputs =
+        (args.nativeBuildInputs or [])
+        ++ [ pkgs.perl self.fixQtModuleCMakeConfig self.qmakeHook ];
+
+      NIX_QT_SUBMODULE = args.NIX_QT_SUBMODULE or true;
+
+      outputs = args.outputs or [ "dev" "out" ];
+      setOutputFlags = args.setOutputFlags or false;
+
+      enableParallelBuilding = args.enableParallelBuilding or true;
+
+      meta = self.qtbase.meta // (args.meta or {});
+    });
+
+  addPackages = self: with self;
+    let
+      callPackage = self.newScope { inherit qtSubmodule srcs; };
+    in {
+
+      qtbase = callPackage ./qtbase {
+        mesa = pkgs.mesa_noglu;
+        harfbuzz = pkgs.harfbuzz-icu;
+        cups = if stdenv.isLinux then pkgs.cups else null;
+        # GNOME dependencies are not used unless gtkStyle == true
+        inherit (pkgs.gnome) libgnomeui GConf gnome_vfs;
+        bison = pkgs.bison2; # error: too few arguments to function 'int yylex(...
+        inherit developerBuild decryptSslTraffic;
+      };
+
+      /* qt3d = not packaged */
+      /* qtactiveqt = not packaged */
+      /* qtandroidextras = not packaged */
+      /* qtcanvas3d = not packaged */
+      qtconnectivity = callPackage ./qtconnectivity.nix {};
+      qtdeclarative = callPackage ./qtdeclarative {};
+      qtdoc = callPackage ./qtdoc.nix {};
+      qtenginio = callPackage ./qtenginio.nix {};
+      qtgraphicaleffects = callPackage ./qtgraphicaleffects.nix {};
+      qtimageformats = callPackage ./qtimageformats.nix {};
+      qtlocation = callPackage ./qtlocation.nix {};
+      /* qtmacextras = not packaged */
+      qtmultimedia = callPackage ./qtmultimedia.nix {
+        inherit (pkgs.gst_all_1) gstreamer gst-plugins-base;
+      };
+      qtquickcontrols = callPackage ./qtquickcontrols.nix {};
+      qtscript = callPackage ./qtscript {};
+      qtsensors = callPackage ./qtsensors.nix {};
+      qtserialport = callPackage ./qtserialport {};
+      qtsvg = callPackage ./qtsvg.nix {};
+      qttools = callPackage ./qttools.nix {};
+      qttranslations = callPackage ./qttranslations.nix {};
+      /* qtwayland = not packaged */
+      /* qtwebchannel = not packaged */
+      /* qtwebengine = not packaged */
+      qtwebsockets = callPackage ./qtwebsockets.nix {};
+      /* qtwinextras = not packaged */
+      qtx11extras = callPackage ./qtx11extras.nix {};
+      qtxmlpatterns = callPackage ./qtxmlpatterns.nix {};
+
+      env = callPackage ../qt-env.nix {};
+      full = env "qt-${qtbase.version}" [
+        qtconnectivity qtdeclarative qtdoc qtenginio qtgraphicaleffects
+        qtimageformats qtlocation qtmultimedia qtquickcontrols qtscript
+        qtsensors qtserialport qtsvg qttools qttranslations qtwebsockets
+        qtx11extras qtxmlpatterns
+      ];
+
+      makeQtWrapper = makeSetupHook { deps = [ makeWrapper ]; } ./make-qt-wrapper.sh;
+      fixQtModuleCMakeConfig = makeSetupHook { } ./fix-qt-module-cmake-config.sh;
+      qmakeHook = makeSetupHook { substitutions = { qt_dev = qtbase.dev; lndir = pkgs.xorg.lndir; }; } ./qmake-hook.sh;
+
+    };
+
+   self = makeScope pkgs.newScope addPackages;
+
+in self
diff --git a/pkgs/development/libraries/qt-5/5.6/fetchsrcs.sh b/pkgs/development/libraries/qt-5/5.6/fetchsrcs.sh
new file mode 100755
index 000000000000..c499c70ea2ca
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.6/fetchsrcs.sh
@@ -0,0 +1,47 @@
+#! /usr/bin/env nix-shell
+#! nix-shell -i bash -p coreutils findutils gnused nix wget
+
+set -x
+
+# The trailing slash at the end is necessary!
+RELEASE_URL="http://download.qt.io/official_releases/qt/5.6/5.6.0/submodules/"
+EXTRA_WGET_ARGS='-A *.tar.xz'
+
+mkdir tmp; cd tmp
+
+wget -nH -r -c --no-parent $RELEASE_URL $EXTRA_WGET_ARGS
+
+cat >../srcs.nix <<EOF
+# DO NOT EDIT! This file is generated automatically by manifest.sh
+{ fetchurl, mirror }:
+
+{
+EOF
+
+workdir=$(pwd)
+
+find . | while read src; do
+    if [[ -f "${src}" ]]; then
+        url="${src:2}"
+        # Sanitize file name
+        filename=$(basename "$src" | tr '@' '_')
+        nameversion="${filename%.tar.*}"
+        name=$(echo "$nameversion" | sed -e 's,-[[:digit:]].*,,' | sed -e 's,-opensource-src$,,')
+        version=$(echo "$nameversion" | sed -e 's,^\([[:alpha:]][[:alnum:]]*-\)\+,,')
+        sha256=$(nix-hash --type sha256 --base32 --flat "$src")
+        cat >>../srcs.nix <<EOF
+  $name = {
+    version = "$version";
+    src = fetchurl {
+      url = "\${mirror}/$url";
+      sha256 = "$sha256";
+      name = "$filename";
+    };
+  };
+EOF
+    fi
+done
+
+echo "}" >>../srcs.nix
+
+cd ..
diff --git a/pkgs/development/libraries/qt-5/5.6/fix-qt-module-cmake-config.sh b/pkgs/development/libraries/qt-5/5.6/fix-qt-module-cmake-config.sh
new file mode 100644
index 000000000000..7ca3e33b613c
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.6/fix-qt-module-cmake-config.sh
@@ -0,0 +1,5 @@
+fixQtModuleCMakeConfig() {
+    local module="$1"
+    sed -e "/set(imported_location/ s@\\\${_qt5${module}_install_prefix}@${!outputLib}@" \
+        -i "${!outputDev}/lib/cmake/Qt5${module}/Qt5${module}Config.cmake"
+}
diff --git a/pkgs/development/libraries/qt-5/5.6/make-qt-wrapper.sh b/pkgs/development/libraries/qt-5/5.6/make-qt-wrapper.sh
new file mode 100644
index 000000000000..3b537430371a
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.6/make-qt-wrapper.sh
@@ -0,0 +1,38 @@
+wrapQtProgram() {
+    local prog="$1"
+    shift
+    wrapProgram "$prog" \
+        --prefix QT_PLUGIN_PATH : "$QT_PLUGIN_PATH" \
+        --prefix QML_IMPORT_PATH : "$QML_IMPORT_PATH" \
+        --prefix QML2_IMPORT_PATH : "$QML2_IMPORT_PATH" \
+        --prefix XDG_CONFIG_DIRS : "$NIX_WRAP_XDG_CONFIG_DIRS" \
+        --prefix XDG_DATA_DIRS : "$NIX_WRAP_XDG_DATA_DIRS" \
+        "$@"
+}
+
+makeQtWrapper() {
+    local old="$1"
+    local new="$2"
+    shift
+    shift
+    makeWrapper "$old" "$new" \
+        --prefix QT_PLUGIN_PATH : "$QT_PLUGIN_PATH" \
+        --prefix QML_IMPORT_PATH : "$QML_IMPORT_PATH" \
+        --prefix QML2_IMPORT_PATH : "$QML2_IMPORT_PATH" \
+        --prefix XDG_CONFIG_DIRS : "$NIX_WRAP_XDG_CONFIG_DIRS" \
+        --prefix XDG_DATA_DIRS : "$NIX_WRAP_XDG_DATA_DIRS" \
+        "$@"
+}
+
+_makeQtWrapperSetup() {
+    # cannot use addToSearchPath because these directories may not exist yet
+    export QT_PLUGIN_PATH="$QT_PLUGIN_PATH${QT_PLUGIN_PATH:+:}${!outputLib}/lib/qt5/plugins"
+    export QML_IMPORT_PATH="$QML_IMPORT_PATH${QML_IMPORT_PATH:+:}${!outputLib}/lib/qt5/imports"
+    export QML2_IMPORT_PATH="$QML2_IMPORT_PATH${QML2_IMPORT_PATH:+:}${!outputLib}/lib/qt5/qml"
+    export XDG_CONFIG_DIRS="$XDG_CONFIG_DIRS${XDG_CONFIG_DIRS:+:}${!outputLib}/etc/xdg"
+    export XDG_DATA_DIRS="$XDG_DATA_DIRS${XDG_DATA_DIRS:+:}${!outputLib}/share"
+    export NIX_WRAP_XDG_CONFIG_DIRS="$NIX_WRAP_XDG_CONFIG_DIRS${NIX_WRAP_XDG_CONFIG_DIRS:+:}${!outputLib}/etc/xdg"
+    export NIX_WRAP_XDG_DATA_DIRS="$NIX_WRAP_XDG_DATA_DIRS${NIX_WRAP_XDG_DATA_DIRS:+:}${!outputLib}/share"
+}
+
+prePhases+=(_makeQtWrapperSetup)
diff --git a/pkgs/development/libraries/qt-5/5.6/qmake-hook.sh b/pkgs/development/libraries/qt-5/5.6/qmake-hook.sh
new file mode 100644
index 000000000000..425048a59357
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.6/qmake-hook.sh
@@ -0,0 +1,114 @@
+if [[ -z "$QMAKE" ]]; then
+
+_qtLinkDependencyDir() {
+    @lndir@/bin/lndir -silent "$1/$2" "$qtOut/$2"
+    if [ -n "$NIX_QT_SUBMODULE" ]; then
+        find "$1/$2" -printf "$2/%P\n" >> "$out/nix-support/qt-inputs"
+    fi
+}
+
+_qtLinkModule() {
+    if [ -d "$1/mkspecs" ]; then
+        # $1 is a Qt module
+        _qtLinkDependencyDir "$1" mkspecs
+
+        for dir in bin include lib share; do
+            if [ -d "$1/$dir" ]; then
+                _qtLinkDependencyDir "$1" "$dir"
+            fi
+        done
+    fi
+}
+
+_qtRmModules() {
+    cat "$out/nix-support/qt-inputs" | while read file; do
+      if [ -h "$out/$file" ]; then
+        rm "$out/$file"
+      fi
+    done
+
+    cat "$out/nix-support/qt-inputs" | while read file; do
+      if [ -d "$out/$file" ]; then
+        rmdir --ignore-fail-on-non-empty -p "$out/$file"
+      fi
+    done
+
+    rm "$out/nix-support/qt-inputs"
+}
+
+_qtRmQmake() {
+    rm "$qtOut/bin/qmake" "$qtOut/bin/qt.conf"
+}
+
+_qtSetQmakePath() {
+    export PATH="$qtOut/bin${PATH:+:}$PATH"
+}
+
+_qtMultioutModuleDevs() {
+    # We cannot simply set these paths in configureFlags because libQtCore retains
+    # references to the paths it was built with.
+    moveToOutput "bin" "${!outputDev}"
+    moveToOutput "include" "${!outputDev}"
+
+    # The destination directory must exist or moveToOutput will do nothing
+    mkdir -p "${!outputDev}/share"
+    moveToOutput "share/doc" "${!outputDev}"
+
+    # Move libtool archives and qmake project files to $dev/lib
+    if [ "z${!outputLib}" != "z${!outputDev}" ]; then
+        pushd "${!outputLib}"
+        if [ -d "lib" ]; then
+            find lib -name '*.a' -o -name '*.la' -o -name '*.prl' -print0 | \
+                while read -r -d $'\0' file; do
+                    mkdir -p "${!outputDev}/$(dirname "$file")"
+                    mv "${!outputLib}/$file" "${!outputDev}/$file"
+                done
+        fi
+        popd
+    fi
+}
+
+qmakeConfigurePhase() {
+    runHook preConfigure
+
+    qmake PREFIX=$out $qmakeFlags
+
+    runHook postConfigure
+}
+
+qtOut=""
+if [[ -z "$NIX_QT_SUBMODULE" ]]; then
+    qtOut=`mktemp -d`
+else
+    qtOut=$out
+fi
+
+mkdir -p "$qtOut/bin" "$qtOut/mkspecs" "$qtOut/include" "$qtOut/nix-support" "$qtOut/lib" "$qtOut/share"
+
+cp "@qt_dev@/bin/qmake" "$qtOut/bin"
+cat >"$qtOut/bin/qt.conf" <<EOF
+[Paths]
+Prefix = $qtOut
+Plugins = lib/qt5/plugins
+Imports = lib/qt5/imports
+Qml2Imports = lib/qt5/qml
+Documentation = share/doc/qt5
+EOF
+
+export QMAKE="$qtOut/bin/qmake"
+
+envHooks+=(_qtLinkModule)
+# Set PATH to find qmake first in a preConfigure hook
+# It must run after all the envHooks!
+postHooks+=(_qtSetQmakePath)
+
+if [ -z "$dontUseQmakeConfigure" -a -z "$configurePhase" ]; then
+    configurePhase=qmakeConfigurePhase
+fi
+
+if [ -n "$NIX_QT_SUBMODULE" ]; then
+    postInstallHooks+=(_qtRmQmake _qtRmModules)
+    preFixupHooks+=(_qtMultioutModuleDevs)
+fi
+
+fi
diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/compose-search-path.patch b/pkgs/development/libraries/qt-5/5.6/qtbase/compose-search-path.patch
new file mode 100644
index 000000000000..3d65dcc902c3
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/compose-search-path.patch
@@ -0,0 +1,16 @@
+Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
+===================================================================
+--- qt-everywhere-opensource-src-5.6.0.orig/qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
++++ qt-everywhere-opensource-src-5.6.0/qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
+@@ -251,10 +251,7 @@ void TableGenerator::initPossibleLocatio
+     // the QTCOMPOSE environment variable
+     if (qEnvironmentVariableIsSet("QTCOMPOSE"))
+         m_possibleLocations.append(QString::fromLocal8Bit(qgetenv("QTCOMPOSE")));
+-    m_possibleLocations.append(QStringLiteral("/usr/share/X11/locale"));
+-    m_possibleLocations.append(QStringLiteral("/usr/local/share/X11/locale"));
+-    m_possibleLocations.append(QStringLiteral("/usr/lib/X11/locale"));
+-    m_possibleLocations.append(QStringLiteral("/usr/local/lib/X11/locale"));
++    m_possibleLocations.append(QStringLiteral("${libX11}/share/X11/locale"));
+     m_possibleLocations.append(QStringLiteral(X11_PREFIX "/share/X11/locale"));
+     m_possibleLocations.append(QStringLiteral(X11_PREFIX "/lib/X11/locale"));
+ }
diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/decrypt-ssl-traffic.patch b/pkgs/development/libraries/qt-5/5.6/qtbase/decrypt-ssl-traffic.patch
new file mode 100644
index 000000000000..2cb3f7dfa700
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/decrypt-ssl-traffic.patch
@@ -0,0 +1,13 @@
+Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/network/ssl/qsslsocket_openssl.cpp
+===================================================================
+--- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/network/ssl/qsslsocket_openssl.cpp
++++ qt-everywhere-opensource-src-5.5.1/qtbase/src/network/ssl/qsslsocket_openssl.cpp
+@@ -48,7 +48,7 @@
+ ****************************************************************************/
+ 
+ //#define QSSLSOCKET_DEBUG
+-//#define QT_DECRYPT_SSL_TRAFFIC
++#define QT_DECRYPT_SSL_TRAFFIC
+ 
+ #include "qssl_p.h"
+ #include "qsslsocket_openssl_p.h"
diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
new file mode 100644
index 000000000000..ce1ea89bb828
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
@@ -0,0 +1,284 @@
+{ stdenv, lib, fetchgit, copyPathsToStore, fixQtModuleCMakeConfig
+, srcs
+
+, xlibs, libX11, libxcb, libXcursor, libXext, libXrender, libXi
+, xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilwm, libxkbcommon
+, fontconfig, freetype, harfbuzz
+, openssl, dbus, glib, udev, libxml2, libxslt, pcre16
+, zlib, libjpeg, libpng, libtiff, sqlite, icu
+
+, coreutils, bison, flex, gdb, gperf, lndir, ruby
+, patchelf, perl, pkgconfig, python
+
+# optional dependencies
+, cups ? null
+, mysql ? null, postgresql ? null
+
+# options
+, mesaSupported, mesa
+, buildExamples ? false
+, buildTests ? false
+, developerBuild ? false
+, gtkStyle ? true, libgnomeui, GConf, gnome_vfs, gtk
+, decryptSslTraffic ? false
+}:
+
+let
+  inherit (srcs.qt5) version;
+  system-x86_64 = lib.elem stdenv.system lib.platforms.x86_64;
+
+  # Search path for Gtk plugin
+  gtkLibPath = lib.makeLibraryPath [ gtk.out gnome_vfs.out libgnomeui.out GConf.out ];
+in
+
+stdenv.mkDerivation {
+
+  name = "qtbase-${version}";
+  inherit version;
+
+  srcs = with srcs; [ qt5.src qtbase.src ];
+
+  sourceRoot = "qt-everywhere-opensource-src-${version}";
+
+  outputs = [ "dev" "out" "gtk" ];
+
+  postUnpack = ''
+    mv qtbase-opensource-src-${version} $sourceRoot/qtbase
+  '';
+
+  patches =
+    copyPathsToStore (lib.readPathsFromFile ./. ./series)
+    ++ lib.optional decryptSslTraffic ./decrypt-ssl-traffic.patch
+    ++ lib.optional mesaSupported [ ./dlopen-gl.patch ./mkspecs-libgl.patch ];
+
+  postPatch =
+    ''
+      substituteInPlace configure --replace /bin/pwd pwd
+      substituteInPlace qtbase/configure --replace /bin/pwd pwd
+      substituteInPlace qtbase/src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls
+      sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i config.tests/*/*.test -i qtbase/mkspecs/*/*.conf
+
+      sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/src/corelib/Qt5Config.cmake.in"
+      sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/src/corelib/Qt5CoreMacros.cmake"
+      sed -i 's/NO_DEFAULT_PATH//' "qtbase/src/gui/Qt5GuiConfigExtras.cmake.in"
+      sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in"
+
+      substituteInPlace qtbase/src/network/kernel/qdnslookup_unix.cpp \
+        --replace "@glibc@" "${stdenv.cc.libc.out}"
+      substituteInPlace qtbase/src/network/kernel/qhostinfo_unix.cpp \
+        --replace "@glibc@" "${stdenv.cc.libc.out}"
+
+      substituteInPlace qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp \
+        --replace "@libXcursor@" "${libXcursor.out}"
+
+      substituteInPlace qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp \
+        --replace "@openssl@" "${openssl.out}"
+
+      substituteInPlace qtbase/src/dbus/qdbus_symbols.cpp \
+        --replace "@dbus_libs@" "${dbus.lib}"
+
+      substituteInPlace \
+        qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp \
+        --replace "@libX11@" "${libX11.out}"
+    ''
+    + lib.optionalString mesaSupported ''
+      substituteInPlace \
+        qtbase/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp \
+        --replace "@mesa_lib@" "${mesa.out}"
+      substituteInPlace qtbase/mkspecs/common/linux.conf \
+        --replace "@mesa_lib@" "${mesa.out}" \
+        --replace "@mesa_inc@" "${mesa.dev}"
+    '';
+
+
+  setOutputFlags = false;
+  preConfigure = ''
+    export LD_LIBRARY_PATH="$PWD/qtbase/lib:$PWD/qtbase/plugins/platforms:$LD_LIBRARY_PATH"
+    export MAKEFLAGS=-j$NIX_BUILD_CORES
+
+    configureFlags+="\
+        -plugindir $out/lib/qt5/plugins \
+        -importdir $out/lib/qt5/imports \
+        -qmldir $out/lib/qt5/qml \
+        -docdir $out/share/doc/qt5"
+  ''
+  # QMake expects to extract the list of available modules from .gitmodules
+  + ''
+    echo '[submodule "qtbase"]' >.gitmodules
+  '';
+
+  prefixKey = "-prefix ";
+
+  # -no-eglfs, -no-directfb, -no-linuxfb and -no-kms because of the current minimalist mesa
+  # TODO Remove obsolete and useless flags once the build will be totally mastered
+  configureFlags = ''
+    -verbose
+    -confirm-license
+    -opensource
+
+    -release
+    -shared
+    -c++11
+    ${lib.optionalString developerBuild "-developer-build"}
+    -largefile
+    -accessibility
+    -rpath
+    -optimized-qmake
+    -strip
+    -reduce-relocations
+    -system-proxies
+    -pkg-config
+
+    -gui
+    -widgets
+    -opengl desktop
+    -qml-debug
+    -nis
+    -iconv
+    -icu
+    -pch
+    -glib
+    -xcb
+    -qpa xcb
+    -${lib.optionalString (cups == null) "no-"}cups
+    -${lib.optionalString (!gtkStyle) "no-"}gtkstyle
+
+    -no-eglfs
+    -no-directfb
+    -no-linuxfb
+    -no-kms
+
+    ${lib.optionalString (!system-x86_64) "-no-sse2"}
+    -no-sse3
+    -no-ssse3
+    -no-sse4.1
+    -no-sse4.2
+    -no-avx
+    -no-avx2
+    -no-mips_dsp
+    -no-mips_dspr2
+
+    -system-zlib
+    -system-libpng
+    -system-libjpeg
+    -system-harfbuzz
+    -system-xcb
+    -system-xkbcommon
+    -system-pcre
+    -openssl-linked
+    -dbus-linked
+
+    -system-sqlite
+    -${if mysql != null then "plugin" else "no"}-sql-mysql
+    -${if postgresql != null then "plugin" else "no"}-sql-psql
+
+    -make libs
+    -make tools
+    -${lib.optionalString (buildExamples == false) "no"}make examples
+    -${lib.optionalString (buildTests == false) "no"}make tests
+  '';
+
+  # PostgreSQL autodetection fails sporadically because Qt omits the "-lpq" flag
+  # if dependency paths contain the string "pq", which can occur in the hash.
+  # To prevent these failures, we need to override PostgreSQL detection.
+  PSQL_LIBS = lib.optionalString (postgresql != null) "-L${postgresql.lib}/lib -lpq";
+
+  propagatedBuildInputs = [
+    dbus glib libxml2 libxslt openssl pcre16 sqlite udev zlib
+
+    # Image formats
+    libjpeg libpng libtiff
+
+    # Text rendering
+    fontconfig freetype harfbuzz icu
+
+    # X11 libs
+    xlibs.libXcomposite libX11 libxcb libXext libXrender libXi
+    xcbutil xcbutilimage xcbutilkeysyms xcbutilwm libxkbcommon
+  ]
+  ++ lib.optional mesaSupported mesa;
+
+  buildInputs =
+    [ bison flex gperf ruby ]
+    ++ lib.optional developerBuild gdb
+    ++ lib.optional (cups != null) cups
+    ++ lib.optional (mysql != null) mysql.lib
+    ++ lib.optional (postgresql != null) postgresql
+    ++ lib.optionals gtkStyle [gnome_vfs.out libgnomeui.out gtk GConf];
+
+  nativeBuildInputs = [ fixQtModuleCMakeConfig lndir patchelf perl pkgconfig python ];
+
+  # freetype-2.5.4 changed signedness of some struct fields
+  NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare";
+
+  preFixup = ''
+    # We cannot simply set these paths in configureFlags because libQtCore retains
+    # references to the paths it was built with.
+    moveToOutput "bin" "$dev"
+    moveToOutput "include" "$dev"
+    moveToOutput "mkspecs" "$dev"
+
+    # The destination directory must exist or moveToOutput will do nothing
+    mkdir -p "$dev/share"
+    moveToOutput "share/doc" "$dev"
+
+    # Move libtool archives and qmake projects
+    if [ "z''${!outputLib}" != "z''${!outputDev}" ]; then
+        pushd "''${!outputLib}"
+        find lib -name '*.a' -o -name '*.la' -o -name '*.prl' | \
+            while read -r file; do
+                mkdir -p "''${!outputDev}/$(dirname "$file")"
+                mv "''${!outputLib}/$file" "''${!outputDev}/$file"
+            done
+        popd
+    fi
+
+    # Move the QGtkStyle plugin to the gtk output
+    mkdir -p "$gtk/lib/qt5/plugins/platformthemes"
+    mv "$out/lib/qt5/plugins/platformthemes/libqgtk2.so" "$gtk/lib/qt5/plugins/platformthemes"
+    rm "$out/lib/cmake/Qt5Gui/Qt5Gui_QGtk2ThemePlugin.cmake"
+
+    # Set RPATH for QGtkStyle plugin
+    qgtk2="$gtk/lib/qt5/plugins/platformthemes/libqgtk2.so"
+    qgtk2_RPATH="$(patchelf --print-rpath "$qgtk2")"
+    qgtk2_RPATH="$qgtk2_RPATH''${qgtk2_RPATH:+:}${gtkLibPath}"
+    patchelf "$qgtk2" \
+        --add-needed libgtk-x11-2.0.so \
+        --add-needed libgnomeui-2.so \
+        --add-needed libgnomevfs-2.so \
+        --add-needed libgconf-2.so \
+        --set-rpath "$qgtk2_RPATH"
+  '';
+
+  postFixup =
+    ''
+      # Don't retain build-time dependencies like gdb and ruby.
+      sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $dev/mkspecs/qconfig.pri
+
+      fixQtModuleCMakeConfig "Concurrent"
+      fixQtModuleCMakeConfig "Core"
+      fixQtModuleCMakeConfig "DBus"
+      fixQtModuleCMakeConfig "Gui"
+      fixQtModuleCMakeConfig "Network"
+      fixQtModuleCMakeConfig "OpenGL"
+      fixQtModuleCMakeConfig "OpenGLExtensions"
+      fixQtModuleCMakeConfig "PrintSupport"
+      fixQtModuleCMakeConfig "Sql"
+      fixQtModuleCMakeConfig "Test"
+      fixQtModuleCMakeConfig "Widgets"
+      fixQtModuleCMakeConfig "Xml"
+    '';
+
+  setupHook = ./setup-hook.sh;
+
+  enableParallelBuilding = true;
+
+  meta = with lib; {
+    homepage = http://www.qt.io;
+    description = "A cross-platform application framework for C++";
+    license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ];
+    maintainers = with maintainers; [ bbenoist qknight ttuegel ];
+    platforms = platforms.linux;
+  };
+
+}
diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-dbus.patch b/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-dbus.patch
new file mode 100644
index 000000000000..401cfd5c295e
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-dbus.patch
@@ -0,0 +1,13 @@
+Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/dbus/qdbus_symbols.cpp
+===================================================================
+--- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/dbus/qdbus_symbols.cpp
++++ qt-everywhere-opensource-src-5.5.1/qtbase/src/dbus/qdbus_symbols.cpp
+@@ -89,7 +89,7 @@ bool qdbus_loadLibDBus()
+ #ifdef Q_OS_WIN
+         QLatin1String("dbus-1"),
+ #endif
+-        QLatin1String("libdbus-1")
++        QLatin1String("@dbus_libs@/lib/libdbus-1")
+     };
+ 
+     lib->unload();
diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-gl.patch b/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-gl.patch
new file mode 100644
index 000000000000..59f510ac54da
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-gl.patch
@@ -0,0 +1,17 @@
+Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
+===================================================================
+--- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
++++ qt-everywhere-opensource-src-5.5.1/qtbase/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
+@@ -563,7 +563,12 @@ void (*QGLXContext::getProcAddress(const
+             {
+                 extern const QString qt_gl_library_name();
+ //                QLibrary lib(qt_gl_library_name());
++                // Check system library paths first
+                 QLibrary lib(QLatin1String("GL"));
++                if (!lib.load()) {
++                    // Fallback to Mesa driver
++                    lib.setFileName(QLatin1String("@mesa_lib@/lib/libGL"));
++                }
+                 glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB");
+             }
+         }
diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-gtkstyle.patch b/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-gtkstyle.patch
new file mode 100644
index 000000000000..ad1719c46e29
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-gtkstyle.patch
@@ -0,0 +1,50 @@
+Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/widgets/styles/qgtk2painter.cpp
+===================================================================
+--- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/widgets/styles/qgtk2painter.cpp
++++ qt-everywhere-opensource-src-5.5.1/qtbase/src/widgets/styles/qgtk2painter.cpp
+@@ -96,7 +96,7 @@ static void initGtk()
+     static bool initialized = false;
+     if (!initialized) {
+         // enforce the "0" suffix, so we'll open libgtk-x11-2.0.so.0
+-        QLibrary libgtk(QLS("gtk-x11-2.0"), 0, 0);
++        QLibrary libgtk(QLS("@gtk@/lib/libgtk-x11-2.0"), 0, 0);
+ 
+         QGtk2PainterPrivate::gdk_pixmap_new = (Ptr_gdk_pixmap_new)libgtk.resolve("gdk_pixmap_new");
+         QGtk2PainterPrivate::gdk_pixbuf_get_from_drawable = (Ptr_gdk_pixbuf_get_from_drawable)libgtk.resolve("gdk_pixbuf_get_from_drawable");
+Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/widgets/styles/qgtkstyle_p.cpp
+===================================================================
+--- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/widgets/styles/qgtkstyle_p.cpp
++++ qt-everywhere-opensource-src-5.5.1/qtbase/src/widgets/styles/qgtkstyle_p.cpp
+@@ -327,7 +327,7 @@ void QGtkStylePrivate::gtkWidgetSetFocus
+ void QGtkStylePrivate::resolveGtk() const
+ {
+     // enforce the "0" suffix, so we'll open libgtk-x11-2.0.so.0
+-    QLibrary libgtk(QLS("gtk-x11-2.0"), 0, 0);
++    QLibrary libgtk(QLS("@gtk@/lib/libgtk-x11-2.0"), 0, 0);
+ 
+     gtk_init = (Ptr_gtk_init)libgtk.resolve("gtk_init");
+     gtk_window_new = (Ptr_gtk_window_new)libgtk.resolve("gtk_window_new");
+@@ -425,8 +425,8 @@ void QGtkStylePrivate::resolveGtk() cons
+     pango_font_description_get_family = (Ptr_pango_font_description_get_family)libgtk.resolve("pango_font_description_get_family");
+     pango_font_description_get_style = (Ptr_pango_font_description_get_style)libgtk.resolve("pango_font_description_get_style");
+ 
+-    gnome_icon_lookup_sync = (Ptr_gnome_icon_lookup_sync)QLibrary::resolve(QLS("gnomeui-2"), 0, "gnome_icon_lookup_sync");
+-    gnome_vfs_init= (Ptr_gnome_vfs_init)QLibrary::resolve(QLS("gnomevfs-2"), 0, "gnome_vfs_init");
++    gnome_icon_lookup_sync = (Ptr_gnome_icon_lookup_sync)QLibrary::resolve(QLS("@libgnomeui@/lib/libgnomeui-2"), 0, "gnome_icon_lookup_sync");
++    gnome_vfs_init= (Ptr_gnome_vfs_init)QLibrary::resolve(QLS("@gnome_vfs@/lib/libgnomevfs-2"), 0, "gnome_vfs_init");
+ }
+ 
+ /* \internal
+@@ -594,9 +594,9 @@ void QGtkStylePrivate::cleanupGtkWidgets
+ static bool resolveGConf()
+ {
+     if (!QGtkStylePrivate::gconf_client_get_default) {
+-        QGtkStylePrivate::gconf_client_get_default = (Ptr_gconf_client_get_default)QLibrary::resolve(QLS("gconf-2"), 4, "gconf_client_get_default");
+-        QGtkStylePrivate::gconf_client_get_string =  (Ptr_gconf_client_get_string)QLibrary::resolve(QLS("gconf-2"), 4, "gconf_client_get_string");
+-        QGtkStylePrivate::gconf_client_get_bool =  (Ptr_gconf_client_get_bool)QLibrary::resolve(QLS("gconf-2"), 4, "gconf_client_get_bool");
++        QGtkStylePrivate::gconf_client_get_default = (Ptr_gconf_client_get_default)QLibrary::resolve(QLS("@gconf@/lib/libgconf-2"), 4, "gconf_client_get_default");
++        QGtkStylePrivate::gconf_client_get_string =  (Ptr_gconf_client_get_string)QLibrary::resolve(QLS("@gconf@/lib/libgconf-2"), 4, "gconf_client_get_string");
++        QGtkStylePrivate::gconf_client_get_bool =  (Ptr_gconf_client_get_bool)QLibrary::resolve(QLS("@gconf@/lib/libgconf-2"), 4, "gconf_client_get_bool");
+     }
+     return (QGtkStylePrivate::gconf_client_get_default !=0);
+ }
diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-libXcursor.patch b/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-libXcursor.patch
new file mode 100644
index 000000000000..d3b5b631be76
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-libXcursor.patch
@@ -0,0 +1,17 @@
+Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp
+===================================================================
+--- qt-everywhere-opensource-src-5.6.0.orig/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp
++++ qt-everywhere-opensource-src-5.6.0/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp
+@@ -303,10 +303,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *c
+ #if defined(XCB_USE_XLIB) && !defined(QT_NO_LIBRARY)
+     static bool function_ptrs_not_initialized = true;
+     if (function_ptrs_not_initialized) {
+-        QLibrary xcursorLib(QLatin1String("Xcursor"), 1);
++        QLibrary xcursorLib(QLatin1String("@libXcursor@/lib/libXcursor"), 1);
+         bool xcursorFound = xcursorLib.load();
+         if (!xcursorFound) { // try without the version number
+-            xcursorLib.setFileName(QLatin1String("Xcursor"));
++            xcursorLib.setFileName(QLatin1String("@libXcursor@/lib/Xcursor"));
+             xcursorFound = xcursorLib.load();
+         }
+         if (xcursorFound) {
diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-openssl.patch b/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-openssl.patch
new file mode 100644
index 000000000000..f51fa44faaf5
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-openssl.patch
@@ -0,0 +1,26 @@
+Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
+===================================================================
+--- qt-everywhere-opensource-src-5.6.0.orig/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
++++ qt-everywhere-opensource-src-5.6.0/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
+@@ -652,8 +652,8 @@ static QPair<QLibrary*, QLibrary*> loadO
+ #endif
+ #if defined(SHLIB_VERSION_NUMBER) && !defined(Q_OS_QNX) // on QNX, the libs are always libssl.so and libcrypto.so
+     // first attempt: the canonical name is libssl.so.<SHLIB_VERSION_NUMBER>
+-    libssl->setFileNameAndVersion(QLatin1String("ssl"), QLatin1String(SHLIB_VERSION_NUMBER));
+-    libcrypto->setFileNameAndVersion(QLatin1String("crypto"), QLatin1String(SHLIB_VERSION_NUMBER));
++    libssl->setFileNameAndVersion(QLatin1String("@openssl@/lib/libssl"), QLatin1String(SHLIB_VERSION_NUMBER));
++    libcrypto->setFileNameAndVersion(QLatin1String("@openssl@/lib/libcrypto"), QLatin1String(SHLIB_VERSION_NUMBER));
+     if (libcrypto->load() && libssl->load()) {
+         // libssl.so.<SHLIB_VERSION_NUMBER> and libcrypto.so.<SHLIB_VERSION_NUMBER> found
+         return pair;
+@@ -670,8 +670,8 @@ static QPair<QLibrary*, QLibrary*> loadO
+     //  OS X's /usr/lib/libssl.dylib, /usr/lib/libcrypto.dylib will be picked up in the third
+     //    attempt, _after_ <bundle>/Contents/Frameworks has been searched.
+     //  iOS does not ship a system libssl.dylib, libcrypto.dylib in the first place.
+-    libssl->setFileNameAndVersion(QLatin1String("ssl"), -1);
+-    libcrypto->setFileNameAndVersion(QLatin1String("crypto"), -1);
++    libssl->setFileNameAndVersion(QLatin1String("@openssl@/lib/libssl"), -1);
++    libcrypto->setFileNameAndVersion(QLatin1String("@openssl@/lib/libcrypto"), -1);
+     if (libcrypto->load() && libssl->load()) {
+         // libssl.so.0 and libcrypto.so.0 found
+         return pair;
diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-resolv.patch b/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-resolv.patch
new file mode 100644
index 000000000000..3e9b9ca2b08a
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-resolv.patch
@@ -0,0 +1,26 @@
+Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/network/kernel/qdnslookup_unix.cpp
+===================================================================
+--- qt-everywhere-opensource-src-5.6.0.orig/qtbase/src/network/kernel/qdnslookup_unix.cpp
++++ qt-everywhere-opensource-src-5.6.0/qtbase/src/network/kernel/qdnslookup_unix.cpp
+@@ -79,7 +79,7 @@ static void resolveLibrary()
+     if (!lib.load())
+ #endif
+     {
+-        lib.setFileName(QLatin1String("resolv"));
++        lib.setFileName(QLatin1String("@glibc@/lib/resolv"));
+         if (!lib.load())
+             return;
+     }
+Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/network/kernel/qhostinfo_unix.cpp
+===================================================================
+--- qt-everywhere-opensource-src-5.6.0.orig/qtbase/src/network/kernel/qhostinfo_unix.cpp
++++ qt-everywhere-opensource-src-5.6.0/qtbase/src/network/kernel/qhostinfo_unix.cpp
+@@ -95,7 +95,7 @@ static void resolveLibrary()
+     if (!lib.load())
+ #endif
+     {
+-        lib.setFileName(QLatin1String("resolv"));
++        lib.setFileName(QLatin1String("@glibc@/lib/libresolv"));
+         if (!lib.load())
+             return;
+     }
diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/libressl.patch b/pkgs/development/libraries/qt-5/5.6/qtbase/libressl.patch
new file mode 100644
index 000000000000..a05d55c8640a
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/libressl.patch
@@ -0,0 +1,33 @@
+From 81494e67eccba04fc3fe554d76a9ca6fe7f2250e Mon Sep 17 00:00:00 2001
+From: hasufell <hasufell@gentoo.org>
+Date: Sat, 10 Oct 2015 01:15:01 +0200
+Subject: [PATCH] Fix compilation with libressl
+
+By additionally checking for defined(SSL_CTRL_SET_CURVES), which
+is defined in openssl, but not in libressl.
+---
+ src/network/ssl/qsslcontext_openssl.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/network/ssl/qsslcontext_openssl.cpp
+===================================================================
+--- qt-everywhere-opensource-src-5.6.0.orig/qtbase/src/network/ssl/qsslcontext_openssl.cpp
++++ qt-everywhere-opensource-src-5.6.0/qtbase/src/network/ssl/qsslcontext_openssl.cpp
+@@ -340,7 +340,7 @@ init_context:
+ 
+     const QVector<QSslEllipticCurve> qcurves = sslContext->sslConfiguration.ellipticCurves();
+     if (!qcurves.isEmpty()) {
+-#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(OPENSSL_NO_EC)
++#if OPENSSL_VERSION_NUMBER >= 0x10002000L && defined(SSL_CTRL_SET_CURVES) && !defined(OPENSSL_NO_EC)
+         // Set the curves to be used
+         if (q_SSLeay() >= 0x10002000L) {
+             // SSL_CTX_ctrl wants a non-const pointer as last argument,
+@@ -354,7 +354,7 @@ init_context:
+                 return sslContext;
+             }
+         } else
+-#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(OPENSSL_NO_EC)
++#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L && defined(SSL_CTRL_SET_CURVES) && !defined(OPENSSL_NO_EC)
+         {
+             // specific curves requested, but not possible to set -> error
+             sslContext->errorStr = msgErrorSettingEllipticCurves(QSslSocket::tr("OpenSSL version too old, need at least v1.0.2"));
diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/mkspecs-libgl.patch b/pkgs/development/libraries/qt-5/5.6/qtbase/mkspecs-libgl.patch
new file mode 100644
index 000000000000..56ee0a411d4d
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/mkspecs-libgl.patch
@@ -0,0 +1,15 @@
+Index: qt-everywhere-opensource-src-5.5.1/qtbase/mkspecs/common/linux.conf
+===================================================================
+--- qt-everywhere-opensource-src-5.5.1.orig/qtbase/mkspecs/common/linux.conf
++++ qt-everywhere-opensource-src-5.5.1/qtbase/mkspecs/common/linux.conf
+@@ -12,8 +12,8 @@ QMAKE_INCDIR            =
+ QMAKE_LIBDIR            =
+ QMAKE_INCDIR_X11        =
+ QMAKE_LIBDIR_X11        =
+-QMAKE_INCDIR_OPENGL     =
+-QMAKE_LIBDIR_OPENGL     =
++QMAKE_INCDIR_OPENGL     = @mesa_inc@/include
++QMAKE_LIBDIR_OPENGL     = @mesa_lib@/lib
+ QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL
+ QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL
+ QMAKE_INCDIR_EGL        =
diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/nix-profiles-library-paths.patch b/pkgs/development/libraries/qt-5/5.6/qtbase/nix-profiles-library-paths.patch
new file mode 100644
index 000000000000..b2aad140ad0f
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/nix-profiles-library-paths.patch
@@ -0,0 +1,22 @@
+Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/corelib/kernel/qcoreapplication.cpp
+===================================================================
+--- qt-everywhere-opensource-src-5.6.0.orig/qtbase/src/corelib/kernel/qcoreapplication.cpp
++++ qt-everywhere-opensource-src-5.6.0/qtbase/src/corelib/kernel/qcoreapplication.cpp
+@@ -2533,7 +2533,17 @@ QStringList QCoreApplication::libraryPat
+         QStringList *app_libpaths = new QStringList;
+         coreappdata()->app_libpaths.reset(app_libpaths);
+ 
++        // Add library paths derived from NIX_PROFILES.
++        const QByteArrayList profiles = qgetenv("NIX_PROFILES").split(' ');
++        const QString plugindir = QString::fromLatin1("/lib/qt5/plugins");
++        Q_FOREACH (const QByteArray &profile, profiles) {
++            if (!profile.isEmpty()) {
++                app_libpaths->append(QFile::decodeName(profile) + plugindir);
++            }
++        }
++
+         const QByteArray libPathEnv = qgetenv("QT_PLUGIN_PATH");
++        qunsetenv("QT_PLUGIN_PATH"); // do not propagate to child processes
+         if (!libPathEnv.isEmpty()) {
+             QStringList paths = QFile::decodeName(libPathEnv).split(QDir::listSeparator(), QString::SkipEmptyParts);
+             for (QStringList::const_iterator it = paths.constBegin(); it != paths.constEnd(); ++it) {
diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/series b/pkgs/development/libraries/qt-5/5.6/qtbase/series
new file mode 100644
index 000000000000..2196d8383752
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/series
@@ -0,0 +1,9 @@
+dlopen-resolv.patch
+tzdir.patch
+dlopen-libXcursor.patch
+dlopen-openssl.patch
+dlopen-dbus.patch
+xdg-config-dirs.patch
+nix-profiles-library-paths.patch
+compose-search-path.patch
+libressl.patch
diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/setup-hook.sh b/pkgs/development/libraries/qt-5/5.6/qtbase/setup-hook.sh
new file mode 100644
index 000000000000..a9c4fbc855f7
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/setup-hook.sh
@@ -0,0 +1,52 @@
+addToSearchPathOnceWithCustomDelimiter() {
+    local delim="$1"
+    local search="$2"
+    local target="$3"
+    local dirs
+    local exported
+    IFS="$delim" read -a dirs <<< "${!search}"
+    local canonical
+    if canonical=$(readlink -e "$target"); then
+        for dir in ${dirs[@]}; do
+            if [ "z$dir" == "z$canonical" ]; then exported=1; fi
+        done
+        if [ -z $exported ]; then
+            eval "export ${search}=\"${!search}${!search:+$delim}$canonical\""
+        fi
+    fi
+}
+
+addToSearchPathOnce() {
+    addToSearchPathOnceWithCustomDelimiter ':' "$@"
+}
+
+propagateOnce() {
+    addToSearchPathOnceWithCustomDelimiter ' ' "$@"
+}
+
+_qtPropagateRuntimeDependencies() {
+    for dir in "lib/qt5/plugins" "lib/qt5/qml" "lib/qt5/imports"; do
+        if [ -d "$1/$dir" ]; then
+            propagateOnce propagatedBuildInputs "$1"
+            propagateOnce propagatedUserEnvPkgs "$1"
+            break
+        fi
+    done
+    addToSearchPathOnce QT_PLUGIN_PATH "$1/lib/qt5/plugins"
+    addToSearchPathOnce QML_IMPORT_PATH "$1/lib/qt5/imports"
+    addToSearchPathOnce QML2_IMPORT_PATH "$1/lib/qt5/qml"
+}
+
+envHooks+=(_qtPropagateRuntimeDependencies)
+
+_qtMultioutDevs() {
+    # This is necessary whether the package is a Qt module or not
+    moveToOutput "mkspecs" "${!outputDev}"
+}
+
+preFixupHooks+=(_qtMultioutDevs)
+
+if [[ -z "$NIX_QT_PIC" ]]; then
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE${NIX_CFLAGS_COMPILE:+ }-fPIC"
+    export NIX_QT_PIC=1
+fi
diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/tzdir.patch b/pkgs/development/libraries/qt-5/5.6/qtbase/tzdir.patch
new file mode 100644
index 000000000000..1c0541bdc2ad
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/tzdir.patch
@@ -0,0 +1,40 @@
+Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp
+===================================================================
+--- qt-everywhere-opensource-src-5.6.0.orig/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp
++++ qt-everywhere-opensource-src-5.6.0/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp
+@@ -62,7 +62,10 @@ typedef QHash<QByteArray, QTzTimeZone> Q
+ // Parse zone.tab table, assume lists all installed zones, if not will need to read directories
+ static QTzTimeZoneHash loadTzTimeZones()
+ {
+-    QString path = QStringLiteral("/usr/share/zoneinfo/zone.tab");
++    QString path = qgetenv("TZDIR");
++    path += "/zone.tab";
++    if (!QFile::exists(path))
++        path = QStringLiteral("/usr/share/zoneinfo/zone.tab");
+     if (!QFile::exists(path))
+         path = QStringLiteral("/usr/lib/zoneinfo/zone.tab");
+ 
+@@ -560,12 +563,18 @@ void QTzTimeZonePrivate::init(const QByt
+         if (!tzif.open(QIODevice::ReadOnly))
+             return;
+     } else {
+-        // Open named tz, try modern path first, if fails try legacy path
+-        tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId));
++        // Try TZDIR first
++        QString zoneinfoDir = qgetenv("TZDIR");
++        zoneinfoDir += "/" + QString::fromLocal8Bit(ianaId);
++        tzif.setFileName(zoneinfoDir);
+         if (!tzif.open(QIODevice::ReadOnly)) {
+-            tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId));
+-            if (!tzif.open(QIODevice::ReadOnly))
+-                return;
++            // Open named tz, try modern path first, if fails try legacy path
++            tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId));
++            if (!tzif.open(QIODevice::ReadOnly)) {
++                tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId));
++                if (!tzif.open(QIODevice::ReadOnly))
++                    return;
++            }
+         }
+     }
+ 
diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/xdg-config-dirs.patch b/pkgs/development/libraries/qt-5/5.6/qtbase/xdg-config-dirs.patch
new file mode 100644
index 000000000000..ff4ad82ea8f8
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/xdg-config-dirs.patch
@@ -0,0 +1,42 @@
+Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/corelib/io/qsettings.cpp
+===================================================================
+--- qt-everywhere-opensource-src-5.6.0.orig/qtbase/src/corelib/io/qsettings.cpp
++++ qt-everywhere-opensource-src-5.6.0/qtbase/src/corelib/io/qsettings.cpp
+@@ -1155,6 +1155,24 @@ QConfFileSettingsPrivate::QConfFileSetti
+     if (!application.isEmpty())
+         confFiles[F_System | F_Application].reset(QConfFile::fromName(systemPath + appFile, false));
+     confFiles[F_System | F_Organization].reset(QConfFile::fromName(systemPath + orgFile, false));
++
++#if !defined(Q_OS_WIN)
++    // Add directories specified in $XDG_CONFIG_DIRS
++    const QString pathEnv = QString::fromLocal8Bit(getenv("XDG_CONFIG_DIRS"));
++    if (!pathEnv.isEmpty()) {
++        const QStringList pathEntries = pathEnv.split(QLatin1Char(':'), QString::SkipEmptyParts);
++        if (!pathEntries.isEmpty()) {
++            int j = 4; // This is the number of confFiles set above -- we need to start adding $XDG_CONFIG_DIRS after those.
++            for (int k = 0; k < pathEntries.size() && j < NumConfFiles - 1; ++k) {
++                const QString& path = pathEntries.at(k);
++                if (!application.isEmpty())
++                    confFiles[j++].reset(QConfFile::fromName(path + QDir::separator() + appFile, false));
++                confFiles[j++].reset(QConfFile::fromName(path + QDir::separator() + orgFile, false));
++            }
++        }
++    }
++#endif
++
+ #else
+     QString confName = getPath(format, QSettings::UserScope) + org;
+     if (!application.isEmpty())
+Index: qt-everywhere-opensource-src-5.6.0/qtbase/src/corelib/io/qsettings_p.h
+===================================================================
+--- qt-everywhere-opensource-src-5.6.0.orig/qtbase/src/corelib/io/qsettings_p.h
++++ qt-everywhere-opensource-src-5.6.0/qtbase/src/corelib/io/qsettings_p.h
+@@ -241,7 +241,7 @@ public:
+         F_Organization = 0x1,
+         F_User = 0x0,
+         F_System = 0x2,
+-        NumConfFiles = 4
++        NumConfFiles = 40 // HACK: increase NumConfFiles from 4 to 40 in order to accommodate more paths in $XDG_CONFIG_DIRS -- ellis
+ #else
+         SandboxConfFile = 0,
+         NumConfFiles = 1
diff --git a/pkgs/development/libraries/qt-5/5.6/qtconnectivity.nix b/pkgs/development/libraries/qt-5/5.6/qtconnectivity.nix
new file mode 100644
index 000000000000..35538c7261f1
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.6/qtconnectivity.nix
@@ -0,0 +1,10 @@
+{ qtSubmodule, qtbase, qtdeclarative }:
+
+qtSubmodule {
+  name = "qtconnectivity";
+  qtInputs = [ qtbase qtdeclarative ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "Bluetooth"
+    fixQtModuleCMakeConfig "Nfc"
+  '';
+}
diff --git a/pkgs/development/libraries/qt-5/5.6/qtdeclarative/default.nix b/pkgs/development/libraries/qt-5/5.6/qtdeclarative/default.nix
new file mode 100644
index 000000000000..407513f78498
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.6/qtdeclarative/default.nix
@@ -0,0 +1,14 @@
+{ qtSubmodule, lib, copyPathsToStore, python, qtbase, qtsvg, qtxmlpatterns }:
+
+qtSubmodule {
+  name = "qtdeclarative";
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
+  qtInputs = [ qtbase qtsvg qtxmlpatterns ];
+  nativeBuildInputs = [ python ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "Qml"
+    fixQtModuleCMakeConfig "Quick"
+    fixQtModuleCMakeConfig "QuickTest"
+    fixQtModuleCMakeConfig "QuickWidgets"
+  '';
+}
diff --git a/pkgs/development/libraries/qt-5/5.6/qtdeclarative/nix-profiles-import-paths.patch b/pkgs/development/libraries/qt-5/5.6/qtdeclarative/nix-profiles-import-paths.patch
new file mode 100644
index 000000000000..06b244b974ff
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.6/qtdeclarative/nix-profiles-import-paths.patch
@@ -0,0 +1,20 @@
+Index: qtdeclarative-opensource-src-5.5.1/src/qml/qml/qqmlimport.cpp
+===================================================================
+--- qtdeclarative-opensource-src-5.5.1.orig/src/qml/qml/qqmlimport.cpp
++++ qtdeclarative-opensource-src-5.5.1/src/qml/qml/qqmlimport.cpp
+@@ -1549,6 +1549,15 @@ QQmlImportDatabase::QQmlImportDatabase(Q
+     QString installImportsPath =  QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath);
+     addImportPath(installImportsPath);
+ 
++    // Add library paths derived from NIX_PROFILES.
++    const QByteArrayList profiles = qgetenv("NIX_PROFILES").split(' ');
++    const QString qmldir = QString::fromLatin1("/lib/qt5/qml");
++    Q_FOREACH (const QByteArray &profile, profiles) {
++        if (!profile.isEmpty()) {
++            addImportPath(QFile::decodeName(profile) + qmldir);
++        }
++    }
++
+     // env import paths
+     QByteArray envImportPath = qgetenv("QML2_IMPORT_PATH");
+     if (!envImportPath.isEmpty()) {
diff --git a/pkgs/development/libraries/qt-5/5.6/qtdeclarative/series b/pkgs/development/libraries/qt-5/5.6/qtdeclarative/series
new file mode 100644
index 000000000000..7dbe197c56e0
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.6/qtdeclarative/series
@@ -0,0 +1 @@
+nix-profiles-import-paths.patch
diff --git a/pkgs/development/libraries/qt-5/5.6/qtdoc.nix b/pkgs/development/libraries/qt-5/5.6/qtdoc.nix
new file mode 100644
index 000000000000..578ea6ba0b22
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.6/qtdoc.nix
@@ -0,0 +1,6 @@
+{ qtSubmodule, qtdeclarative }:
+
+qtSubmodule {
+  name = "qtdoc";
+  qtInputs = [ qtdeclarative ];
+}
diff --git a/pkgs/development/libraries/qt-5/5.6/qtenginio.nix b/pkgs/development/libraries/qt-5/5.6/qtenginio.nix
new file mode 100644
index 000000000000..503a0f7ce4f5
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.6/qtenginio.nix
@@ -0,0 +1,9 @@
+{ qtSubmodule, qtdeclarative }:
+
+qtSubmodule {
+  name = "qtenginio";
+  qtInputs = [ qtdeclarative ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "Enginio"
+  '';
+}
diff --git a/pkgs/development/libraries/qt-5/5.6/qtgraphicaleffects.nix b/pkgs/development/libraries/qt-5/5.6/qtgraphicaleffects.nix
new file mode 100644
index 000000000000..3273f12eb830
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.6/qtgraphicaleffects.nix
@@ -0,0 +1,6 @@
+{ qtSubmodule, qtdeclarative }:
+
+qtSubmodule {
+  name = "qtgraphicaleffects";
+  qtInputs = [ qtdeclarative ];
+}
diff --git a/pkgs/development/libraries/qt-5/5.6/qtimageformats.nix b/pkgs/development/libraries/qt-5/5.6/qtimageformats.nix
new file mode 100644
index 000000000000..03d0fffbe80e
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.6/qtimageformats.nix
@@ -0,0 +1,6 @@
+{ qtSubmodule, qtbase }:
+
+qtSubmodule {
+  name = "qtimageformats";
+  qtInputs = [ qtbase ];
+}
diff --git a/pkgs/development/libraries/qt-5/5.6/qtlocation.nix b/pkgs/development/libraries/qt-5/5.6/qtlocation.nix
new file mode 100644
index 000000000000..0e2ad8bafb30
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.6/qtlocation.nix
@@ -0,0 +1,10 @@
+{ qtSubmodule, qtbase, qtmultimedia }:
+
+qtSubmodule {
+  name = "qtlocation";
+  qtInputs = [ qtbase qtmultimedia ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "Location"
+    fixQtModuleCMakeConfig "Positioning"
+  '';
+}
diff --git a/pkgs/development/libraries/qt-5/5.6/qtmultimedia.nix b/pkgs/development/libraries/qt-5/5.6/qtmultimedia.nix
new file mode 100644
index 000000000000..9eb68ba6b5ba
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.6/qtmultimedia.nix
@@ -0,0 +1,16 @@
+{ qtSubmodule, qtbase, qtdeclarative, pkgconfig
+, alsaLib, gstreamer, gst-plugins-base, libpulseaudio
+}:
+
+qtSubmodule {
+  name = "qtmultimedia";
+  qtInputs = [ qtbase qtdeclarative ];
+  buildInputs = [
+    pkgconfig alsaLib gstreamer gst-plugins-base libpulseaudio
+  ];
+  qmakeFlags = [ "GST_VERSION=1.0" ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "Multimedia"
+    fixQtModuleCMakeConfig "MultimediaWidgets"
+  '';
+}
diff --git a/pkgs/development/libraries/qt-5/5.6/qtquickcontrols.nix b/pkgs/development/libraries/qt-5/5.6/qtquickcontrols.nix
new file mode 100644
index 000000000000..93a864621b82
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.6/qtquickcontrols.nix
@@ -0,0 +1,6 @@
+{ qtSubmodule, qtdeclarative }:
+
+qtSubmodule {
+  name = "qtquickcontrols";
+  qtInputs = [ qtdeclarative ];
+}
diff --git a/pkgs/development/libraries/qt-5/5.6/qtscript/0001-glib-2.32.patch b/pkgs/development/libraries/qt-5/5.6/qtscript/0001-glib-2.32.patch
new file mode 100644
index 000000000000..887e107b6c1b
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.6/qtscript/0001-glib-2.32.patch
@@ -0,0 +1,25 @@
+From abd80356449bb36c8adcc5c9ca1df6b47715d265 Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Sun, 23 Aug 2015 09:13:34 -0500
+Subject: [PATCH] glib-2.32
+
+---
+ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h
+index 1f6d25e..087c3fb 100644
+--- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h
++++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h
+@@ -81,7 +81,7 @@
+ #include <pthread.h>
+ #elif PLATFORM(GTK)
+ #include <wtf/gtk/GOwnPtr.h>
+-typedef struct _GMutex GMutex;
++typedef union _GMutex GMutex;
+ typedef struct _GCond GCond;
+ #endif
+ 
+-- 
+2.5.0
+
diff --git a/pkgs/development/libraries/qt-5/5.6/qtscript/default.nix b/pkgs/development/libraries/qt-5/5.6/qtscript/default.nix
new file mode 100644
index 000000000000..b81a43aeadb0
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.6/qtscript/default.nix
@@ -0,0 +1,10 @@
+{ qtSubmodule, qtbase, qttools }:
+
+qtSubmodule {
+  name = "qtscript";
+  qtInputs = [ qtbase qttools ];
+  patches = [ ./0001-glib-2.32.patch ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "Script"
+  '';
+}
diff --git a/pkgs/development/libraries/qt-5/5.6/qtsensors.nix b/pkgs/development/libraries/qt-5/5.6/qtsensors.nix
new file mode 100644
index 000000000000..5776f45a7068
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.6/qtsensors.nix
@@ -0,0 +1,9 @@
+{ qtSubmodule, qtbase, qtdeclarative }:
+
+qtSubmodule {
+  name = "qtsensors";
+  qtInputs = [ qtbase qtdeclarative ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "Sensors"
+  '';
+}
diff --git a/pkgs/development/libraries/qt-5/5.6/qtserialport/0001-dlopen-serialport-udev.patch b/pkgs/development/libraries/qt-5/5.6/qtserialport/0001-dlopen-serialport-udev.patch
new file mode 100644
index 000000000000..3a813dc80074
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.6/qtserialport/0001-dlopen-serialport-udev.patch
@@ -0,0 +1,28 @@
+From d81c2c870b9bea8fb8e6b85baefb06542f568338 Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Sun, 23 Aug 2015 09:16:02 -0500
+Subject: [PATCH] dlopen serialport udev
+
+---
+ src/serialport/qtudev_p.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/serialport/qtudev_p.h b/src/serialport/qtudev_p.h
+index 6f2cabd..81b9849 100644
+--- a/src/serialport/qtudev_p.h
++++ b/src/serialport/qtudev_p.h
+@@ -105,9 +105,9 @@ inline QFunctionPointer resolveSymbol(QLibrary *udevLibrary, const char *symbolN
+ inline bool resolveSymbols(QLibrary *udevLibrary)
+ {
+     if (!udevLibrary->isLoaded()) {
+-        udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 1);
++        udevLibrary->setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 1);
+         if (!udevLibrary->load()) {
+-            udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 0);
++            udevLibrary->setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 0);
+             if (!udevLibrary->load()) {
+                 qWarning("Failed to load the library: %s, supported version(s): %i and %i", qPrintable(udevLibrary->fileName()), 1, 0);
+                 return false;
+-- 
+2.5.0
+
diff --git a/pkgs/development/libraries/qt-5/5.6/qtserialport/default.nix b/pkgs/development/libraries/qt-5/5.6/qtserialport/default.nix
new file mode 100644
index 000000000000..3f409f9c0e08
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.6/qtserialport/default.nix
@@ -0,0 +1,15 @@
+{ qtSubmodule, qtbase, substituteAll, libudev }:
+
+qtSubmodule {
+  name = "qtserialport";
+  qtInputs = [ qtbase ];
+  patches = [
+    (substituteAll {
+      src = ./0001-dlopen-serialport-udev.patch;
+      libudev = libudev.out;
+    })
+  ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "SerialPort"
+  '';
+}
diff --git a/pkgs/development/libraries/qt-5/5.6/qtsvg.nix b/pkgs/development/libraries/qt-5/5.6/qtsvg.nix
new file mode 100644
index 000000000000..a460d6da4c2a
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.6/qtsvg.nix
@@ -0,0 +1,9 @@
+{ qtSubmodule, qtbase }:
+
+qtSubmodule {
+  name = "qtsvg";
+  qtInputs = [ qtbase ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "Svg"
+  '';
+}
diff --git a/pkgs/development/libraries/qt-5/5.6/qttools.nix b/pkgs/development/libraries/qt-5/5.6/qttools.nix
new file mode 100644
index 000000000000..1472691c5254
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.6/qttools.nix
@@ -0,0 +1,16 @@
+{ qtSubmodule, qtbase }:
+
+qtSubmodule {
+  name = "qttools";
+  qtInputs = [ qtbase ];
+  postFixup = ''
+    moveToOutput "bin/qdbus" "$out"
+    moveToOutput "bin/qtpaths" "$out"
+
+    fixQtModuleCMakeConfig "Designer"
+    fixQtModuleCMakeConfig "Help"
+    fixQtModuleCMakeConfig "LinguistTools"
+    fixQtModuleCMakeConfig "UiPlugin"
+    fixQtModuleCMakeConfig "UiTools"
+  '';
+}
diff --git a/pkgs/development/libraries/qt-5/5.6/qttranslations.nix b/pkgs/development/libraries/qt-5/5.6/qttranslations.nix
new file mode 100644
index 000000000000..50fc8cf6826a
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.6/qttranslations.nix
@@ -0,0 +1,6 @@
+{ qtSubmodule, qttools }:
+
+qtSubmodule {
+  name = "qttranslations";
+  qtInputs = [ qttools ];
+}
diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebsockets.nix b/pkgs/development/libraries/qt-5/5.6/qtwebsockets.nix
new file mode 100644
index 000000000000..c0d0f9e7d714
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.6/qtwebsockets.nix
@@ -0,0 +1,9 @@
+{ qtSubmodule, qtbase, qtdeclarative }:
+
+qtSubmodule {
+  name = "qtwebsockets";
+  qtInputs = [ qtbase qtdeclarative ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "WebSockets"
+  '';
+}
diff --git a/pkgs/development/libraries/qt-5/5.6/qtx11extras.nix b/pkgs/development/libraries/qt-5/5.6/qtx11extras.nix
new file mode 100644
index 000000000000..db92f1353627
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.6/qtx11extras.nix
@@ -0,0 +1,9 @@
+{ qtSubmodule, qtbase }:
+
+qtSubmodule {
+  name = "qtx11extras";
+  qtInputs = [ qtbase ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "X11Extras"
+  '';
+}
diff --git a/pkgs/development/libraries/qt-5/5.6/qtxmlpatterns.nix b/pkgs/development/libraries/qt-5/5.6/qtxmlpatterns.nix
new file mode 100644
index 000000000000..3b22132e4c38
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.6/qtxmlpatterns.nix
@@ -0,0 +1,9 @@
+{ qtSubmodule, qtbase }:
+
+qtSubmodule {
+  name = "qtxmlpatterns";
+  qtInputs = [ qtbase ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "XmlPatterns"
+  '';
+}
diff --git a/pkgs/development/libraries/qt-5/5.6/srcs.nix b/pkgs/development/libraries/qt-5/5.6/srcs.nix
new file mode 100644
index 000000000000..9ddbbbde078f
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.6/srcs.nix
@@ -0,0 +1,261 @@
+# DO NOT EDIT! This file is generated automatically by manifest.sh
+{ fetchurl, mirror }:
+
+{
+  qttools = {
+    version = "5.6.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qttools-opensource-src-5.6.0.tar.xz";
+      sha256 = "1791c9a1vxv0q2ywr00ya5rxaggidsq81s8h8fwmql75pdhlq90d";
+      name = "qttools-opensource-src-5.6.0.tar.xz";
+    };
+  };
+  qtwebengine = {
+    version = "5.6.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtwebengine-opensource-src-5.6.0.tar.xz";
+      sha256 = "00vaqx3mypqlnjkfwhx54r6ygfs07amkwc4rma0sg64zdjnvb8la";
+      name = "qtwebengine-opensource-src-5.6.0.tar.xz";
+    };
+  };
+  qtserialbus = {
+    version = "5.6.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtserialbus-opensource-src-5.6.0.tar.xz";
+      sha256 = "13hbmj9pilh5gkbbngfbp225qvc650pnzvpzawpnf69zwl757jlc";
+      name = "qtserialbus-opensource-src-5.6.0.tar.xz";
+    };
+  };
+  qtwayland = {
+    version = "5.6.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtwayland-opensource-src-5.6.0.tar.xz";
+      sha256 = "1k5zsgz54wlkxm3ici55lbbz286bk2791vri02bjgja5y9102pdm";
+      name = "qtwayland-opensource-src-5.6.0.tar.xz";
+    };
+  };
+  qt5 = {
+    version = "5.6.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qt5-opensource-src-5.6.0.tar.xz";
+      sha256 = "195dl9pk9slbiy6mgwwpc70vaw62sdhxc3lxmlnyddk99widqa3k";
+      name = "qt5-opensource-src-5.6.0.tar.xz";
+    };
+  };
+  qtimageformats = {
+    version = "5.6.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtimageformats-opensource-src-5.6.0.tar.xz";
+      sha256 = "1nmsh682idxl0642q7376r9qfxkx0736q9pl4jx179c9lrsl519c";
+      name = "qtimageformats-opensource-src-5.6.0.tar.xz";
+    };
+  };
+  qtactiveqt = {
+    version = "5.6.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtactiveqt-opensource-src-5.6.0.tar.xz";
+      sha256 = "0xrjr9jwkxxcv46a8vj77px3v1p36nm6rpvyxma0wb4xhpippp3a";
+      name = "qtactiveqt-opensource-src-5.6.0.tar.xz";
+    };
+  };
+  qtdoc = {
+    version = "5.6.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtdoc-opensource-src-5.6.0.tar.xz";
+      sha256 = "1z69yl8nkvp21arjhzl34gr8gvxm5b03d58lwnddl4mkaxbi4vap";
+      name = "qtdoc-opensource-src-5.6.0.tar.xz";
+    };
+  };
+  qtsensors = {
+    version = "5.6.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtsensors-opensource-src-5.6.0.tar.xz";
+      sha256 = "0blwqmkh0hn1716d5fvy0vnh56y9iikl34ayz6ksl0ayxhpkk3si";
+      name = "qtsensors-opensource-src-5.6.0.tar.xz";
+    };
+  };
+  qtwebchannel = {
+    version = "5.6.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtwebchannel-opensource-src-5.6.0.tar.xz";
+      sha256 = "0ky1njksczyfb7y7p5kfgzbx9vgajzy51g2y3vrpfvl6bs9j8m62";
+      name = "qtwebchannel-opensource-src-5.6.0.tar.xz";
+    };
+  };
+  qtmacextras = {
+    version = "5.6.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtmacextras-opensource-src-5.6.0.tar.xz";
+      sha256 = "1jkmwppapvymdr1kwdrbjlxhcafcn4jb23ssnhrvvgcq3lnl5lhj";
+      name = "qtmacextras-opensource-src-5.6.0.tar.xz";
+    };
+  };
+  qtwebsockets = {
+    version = "5.6.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtwebsockets-opensource-src-5.6.0.tar.xz";
+      sha256 = "17vi3n27gx3f3c2lii3b70pzz6mpblam3236v6mj439xzrlvi2i6";
+      name = "qtwebsockets-opensource-src-5.6.0.tar.xz";
+    };
+  };
+  qtconnectivity = {
+    version = "5.6.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtconnectivity-opensource-src-5.6.0.tar.xz";
+      sha256 = "1ss0ibabiv7n5hakkxmkc4msrwgqcvfffdjajnv5jrq0030v0p0c";
+      name = "qtconnectivity-opensource-src-5.6.0.tar.xz";
+    };
+  };
+  qtscript = {
+    version = "5.6.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtscript-opensource-src-5.6.0.tar.xz";
+      sha256 = "0hjhkh4lia1i0iir1i8dr57gizi74h73j0phhir3q3wsglcpax5c";
+      name = "qtscript-opensource-src-5.6.0.tar.xz";
+    };
+  };
+  qttranslations = {
+    version = "5.6.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qttranslations-opensource-src-5.6.0.tar.xz";
+      sha256 = "0jfdfj2z0nvf1xblmdxaphn0psjycrb5g3jxxcddkci214gka2cq";
+      name = "qttranslations-opensource-src-5.6.0.tar.xz";
+    };
+  };
+  qtlocation = {
+    version = "5.6.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtlocation-opensource-src-5.6.0.tar.xz";
+      sha256 = "1jakjrwic01b5vyij6hfzdfpipandpkj9li3d7wf9bzws0cia3in";
+      name = "qtlocation-opensource-src-5.6.0.tar.xz";
+    };
+  };
+  qtserialport = {
+    version = "5.6.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtserialport-opensource-src-5.6.0.tar.xz";
+      sha256 = "07rwhmh9y7b3ycvx4d4d1j32nahf8nhsb9qj99kxz5xrdfv7zvhn";
+      name = "qtserialport-opensource-src-5.6.0.tar.xz";
+    };
+  };
+  qtsvg = {
+    version = "5.6.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtsvg-opensource-src-5.6.0.tar.xz";
+      sha256 = "07v4bzxd31dhkhp52y4g2ii0sslmk48cqkkz32v41frqj4qrk1vr";
+      name = "qtsvg-opensource-src-5.6.0.tar.xz";
+    };
+  };
+  qtwebview = {
+    version = "5.6.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtwebview-opensource-src-5.6.0.tar.xz";
+      sha256 = "0mqbh125bq37xybwslhri4pl861r26cnraiz9ivh4881kqzab3x4";
+      name = "qtwebview-opensource-src-5.6.0.tar.xz";
+    };
+  };
+  qtcanvas3d = {
+    version = "5.6.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtcanvas3d-opensource-src-5.6.0.tar.xz";
+      sha256 = "1kwykm1ffgpjgb3ggd4h2d2x3yhp9jsc0gnwlks620bahagdbbb6";
+      name = "qtcanvas3d-opensource-src-5.6.0.tar.xz";
+    };
+  };
+  qtwinextras = {
+    version = "5.6.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtwinextras-opensource-src-5.6.0.tar.xz";
+      sha256 = "14xvm081wjyild2wi7pcilqxdkhc8b0lf9yn7yf7zp576i9ir5aq";
+      name = "qtwinextras-opensource-src-5.6.0.tar.xz";
+    };
+  };
+  qtgraphicaleffects = {
+    version = "5.6.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtgraphicaleffects-opensource-src-5.6.0.tar.xz";
+      sha256 = "1s0n8hrmrfs53cmm7i45p8zavvmsl0aisd5sgj93p8c5rzyi3s81";
+      name = "qtgraphicaleffects-opensource-src-5.6.0.tar.xz";
+    };
+  };
+  qtxmlpatterns = {
+    version = "5.6.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtxmlpatterns-opensource-src-5.6.0.tar.xz";
+      sha256 = "1m0rr0m9zg2d6rdban2p5qyx8rdnjnjsfk3bm72bh47hscxipvds";
+      name = "qtxmlpatterns-opensource-src-5.6.0.tar.xz";
+    };
+  };
+  qtquickcontrols2 = {
+    version = "5.6.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtquickcontrols2-opensource-src-5.6.0.tar.xz";
+      sha256 = "1q7yp7l32jd3p28587ldxzkj58z1aad9gcs80w6vqc9952i6xv2r";
+      name = "qtquickcontrols2-opensource-src-5.6.0.tar.xz";
+    };
+  };
+  qtbase = {
+    version = "5.6.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtbase-opensource-src-5.6.0.tar.xz";
+      sha256 = "0ynnvcs5idivzldsq5ciqg9myg82b3l3906l4vjv54lyamf8mykf";
+      name = "qtbase-opensource-src-5.6.0.tar.xz";
+    };
+  };
+  qt3d = {
+    version = "5.6.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qt3d-opensource-src-5.6.0.tar.xz";
+      sha256 = "17a37xhav5mxspx2c9wsgvcilv7ys40q6minmlqd1gnfmsfphqdr";
+      name = "qt3d-opensource-src-5.6.0.tar.xz";
+    };
+  };
+  qtenginio = {
+    version = "1.6.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtenginio-opensource-src-1.6.0.tar.xz";
+      sha256 = "033z2jncci64s7s9ml5rsfsnrkdmhx1g5dfvr61imv63pzxxqzb2";
+      name = "qtenginio-opensource-src-1.6.0.tar.xz";
+    };
+  };
+  qtx11extras = {
+    version = "5.6.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtx11extras-opensource-src-5.6.0.tar.xz";
+      sha256 = "099lc7kxcxgp5s01ddnd6n955fc8866caark43xfs2dw0a6pdva7";
+      name = "qtx11extras-opensource-src-5.6.0.tar.xz";
+    };
+  };
+  qtdeclarative = {
+    version = "5.6.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtdeclarative-opensource-src-5.6.0.tar.xz";
+      sha256 = "0k70zlyx1nh35caiav4s3jvg5l029pvilm6sarxmfj73y19z0mcc";
+      name = "qtdeclarative-opensource-src-5.6.0.tar.xz";
+    };
+  };
+  qtmultimedia = {
+    version = "5.6.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtmultimedia-opensource-src-5.6.0.tar.xz";
+      sha256 = "11h66xcr3y3w8hhvx801r66yirvf1kppasjlhm25qvr6rpb9jgqh";
+      name = "qtmultimedia-opensource-src-5.6.0.tar.xz";
+    };
+  };
+  qtquickcontrols = {
+    version = "5.6.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtquickcontrols-opensource-src-5.6.0.tar.xz";
+      sha256 = "12vqkxpz5y2bbh083lpsxcianykl8x7am49pmc4x221a5xwrc27c";
+      name = "qtquickcontrols-opensource-src-5.6.0.tar.xz";
+    };
+  };
+  qtandroidextras = {
+    version = "5.6.0";
+    src = fetchurl {
+      url = "${mirror}/official_releases/qt/5.6/5.6.0/submodules/qtandroidextras-opensource-src-5.6.0.tar.xz";
+      sha256 = "1qhrn8vhfn0z73bc2ls1b4zfvr7r5gn7b5xdmjp26hi338j55vp0";
+      name = "qtandroidextras-opensource-src-5.6.0.tar.xz";
+    };
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e9fc634bf201..027fc21857f2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8702,6 +8702,10 @@ in
     let imported = import ../development/libraries/qt-5/5.5 { inherit pkgs; };
     in recurseIntoAttrs (imported.override (super: qt5LibsFun));
 
+  qt56 =
+    let imported = import ../development/libraries/qt-5/5.6 { inherit pkgs; };
+    in recurseIntoAttrs (imported.override (super: qt5LibsFun));
+
   qt5 = self.qt54;
 
   qt5LibsFun = self: with self; {

From 3628eed9d4d8623a73bcc1be69aec835d1e8ff70 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 4 May 2016 07:43:33 -0500
Subject: [PATCH 241/287] qt5: 5.4.2 -> 5.6.0

---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 027fc21857f2..e23db12de4d0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8706,7 +8706,7 @@ in
     let imported = import ../development/libraries/qt-5/5.6 { inherit pkgs; };
     in recurseIntoAttrs (imported.override (super: qt5LibsFun));
 
-  qt5 = self.qt54;
+  qt5 = self.qt56;
 
   qt5LibsFun = self: with self; {
 

From 7c77230224e8bc27482eb6ecaf6f7bc048d1571f Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 4 May 2016 07:44:10 -0500
Subject: [PATCH 242/287] Remove Qt 5.4.2

---
 .../libraries/qt-5/5.4/default.nix            | 116 --------
 .../libraries/qt-5/5.4/fetchsrcs.sh           |  47 ----
 .../qt-5/5.4/fix-qt-module-cmake-config.sh    |   5 -
 .../libraries/qt-5/5.4/make-qt-wrapper.sh     |  42 ---
 .../libraries/qt-5/5.4/qmake-hook.sh          | 101 -------
 .../qt-5/5.4/qtbase/compose-search-path.patch |  16 --
 .../qt-5/5.4/qtbase/decrypt-ssl-traffic.patch |  13 -
 .../libraries/qt-5/5.4/qtbase/default.nix     | 254 ------------------
 .../qt-5/5.4/qtbase/dlopen-dbus.patch         |  13 -
 .../libraries/qt-5/5.4/qtbase/dlopen-gl.patch |  17 --
 .../qt-5/5.4/qtbase/dlopen-gtkstyle.patch     |  50 ----
 .../qt-5/5.4/qtbase/dlopen-libXcursor.patch   |  17 --
 .../qt-5/5.4/qtbase/dlopen-openssl.patch      |  26 --
 .../qt-5/5.4/qtbase/dlopen-resolv.patch       |  26 --
 .../qt-5/5.4/qtbase/mkspecs-libgl.patch       |  15 --
 .../qtbase/nix-profiles-library-paths.patch   |  26 --
 .../libraries/qt-5/5.4/qtbase/series          |   8 -
 .../libraries/qt-5/5.4/qtbase/setup-hook.sh   |  52 ----
 .../libraries/qt-5/5.4/qtbase/tzdir.patch     |  40 ---
 .../qt-5/5.4/qtbase/xdg-config-dirs.patch     |  42 ---
 .../libraries/qt-5/5.4/qtconnectivity.nix     |  10 -
 .../0001-nix-profiles-import-paths.patch      |  37 ---
 .../qt-5/5.4/qtdeclarative/default.nix        |  14 -
 pkgs/development/libraries/qt-5/5.4/qtdoc.nix |   6 -
 .../libraries/qt-5/5.4/qtenginio.nix          |   9 -
 .../libraries/qt-5/5.4/qtgraphicaleffects.nix |   6 -
 .../libraries/qt-5/5.4/qtimageformats.nix     |   6 -
 .../libraries/qt-5/5.4/qtlocation.nix         |  10 -
 .../libraries/qt-5/5.4/qtmultimedia.nix       |  16 --
 .../0001-nix-profiles-import-paths.patch      |  37 ---
 .../libraries/qt-5/5.4/qtquick1/default.nix   |  10 -
 .../libraries/qt-5/5.4/qtquickcontrols.nix    |   6 -
 .../qt-5/5.4/qtscript/0001-glib-2.32.patch    |  25 --
 .../libraries/qt-5/5.4/qtscript/default.nix   |  10 -
 .../libraries/qt-5/5.4/qtsensors.nix          |   9 -
 .../0001-dlopen-serialport-udev.patch         |  28 --
 .../qt-5/5.4/qtserialport/default.nix         |  16 --
 pkgs/development/libraries/qt-5/5.4/qtsvg.nix |   9 -
 .../libraries/qt-5/5.4/qttools.nix            |  15 --
 .../libraries/qt-5/5.4/qttranslations.nix     |   6 -
 .../libraries/qt-5/5.4/qtwebkit-examples.nix  |   6 -
 .../0001-dlopen-webkit-nsplugin.patch         |  53 ----
 .../5.4/qtwebkit/0002-dlopen-webkit-gtk.patch |  25 --
 .../qtwebkit/0003-dlopen-webkit-udev.patch    |  31 ---
 .../libraries/qt-5/5.4/qtwebkit/default.nix   |  38 ---
 .../libraries/qt-5/5.4/qtwebsockets.nix       |   9 -
 .../libraries/qt-5/5.4/qtx11extras.nix        |   9 -
 .../libraries/qt-5/5.4/qtxmlpatterns.nix      |   9 -
 pkgs/development/libraries/qt-5/5.4/srcs.nix  | 245 -----------------
 pkgs/top-level/all-packages.nix               |   4 -
 50 files changed, 1640 deletions(-)
 delete mode 100644 pkgs/development/libraries/qt-5/5.4/default.nix
 delete mode 100755 pkgs/development/libraries/qt-5/5.4/fetchsrcs.sh
 delete mode 100644 pkgs/development/libraries/qt-5/5.4/fix-qt-module-cmake-config.sh
 delete mode 100644 pkgs/development/libraries/qt-5/5.4/make-qt-wrapper.sh
 delete mode 100644 pkgs/development/libraries/qt-5/5.4/qmake-hook.sh
 delete mode 100644 pkgs/development/libraries/qt-5/5.4/qtbase/compose-search-path.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.4/qtbase/decrypt-ssl-traffic.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-dbus.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-gl.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-gtkstyle.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-libXcursor.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-openssl.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-resolv.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.4/qtbase/mkspecs-libgl.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.4/qtbase/nix-profiles-library-paths.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.4/qtbase/series
 delete mode 100644 pkgs/development/libraries/qt-5/5.4/qtbase/setup-hook.sh
 delete mode 100644 pkgs/development/libraries/qt-5/5.4/qtbase/tzdir.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.4/qtbase/xdg-config-dirs.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.4/qtconnectivity.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.4/qtdeclarative/0001-nix-profiles-import-paths.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.4/qtdeclarative/default.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.4/qtdoc.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.4/qtenginio.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.4/qtgraphicaleffects.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.4/qtimageformats.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.4/qtlocation.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.4/qtmultimedia.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.4/qtquick1/0001-nix-profiles-import-paths.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.4/qtquick1/default.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.4/qtquickcontrols.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.4/qtscript/0001-glib-2.32.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.4/qtscript/default.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.4/qtsensors.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.4/qtserialport/0001-dlopen-serialport-udev.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.4/qtserialport/default.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.4/qtsvg.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.4/qttools.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.4/qttranslations.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.4/qtwebkit-examples.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.4/qtwebkit/0001-dlopen-webkit-nsplugin.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.4/qtwebkit/0002-dlopen-webkit-gtk.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.4/qtwebkit/0003-dlopen-webkit-udev.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.4/qtwebkit/default.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.4/qtwebsockets.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.4/qtx11extras.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.4/qtxmlpatterns.nix
 delete mode 100644 pkgs/development/libraries/qt-5/5.4/srcs.nix

diff --git a/pkgs/development/libraries/qt-5/5.4/default.nix b/pkgs/development/libraries/qt-5/5.4/default.nix
deleted file mode 100644
index 950129ba5413..000000000000
--- a/pkgs/development/libraries/qt-5/5.4/default.nix
+++ /dev/null
@@ -1,116 +0,0 @@
-# Maintainer's Notes:
-#
-# Minor updates:
-#  1. Edit ./fetchsrcs.sh to point to the updated URL.
-#  2. Run ./fetchsrcs.sh.
-#  3. Build and enjoy.
-#
-# Major updates:
-#  We prefer not to immediately overwrite older versions with major updates, so
-#  make a copy of this directory first. After copying, be sure to delete ./tmp
-#  if it exists. Then follow the minor update instructions. Be sure to check if
-#  any new components have been added and package them as necessary.
-
-{ pkgs
-
-# options
-, developerBuild ? false
-, decryptSslTraffic ? false
-}:
-
-let inherit (pkgs) makeSetupHook makeWrapper stdenv; in
-
-with stdenv.lib;
-
-let
-
-  mirror = "http://download.qt.io";
-  srcs = import ./srcs.nix { inherit mirror; inherit (pkgs) fetchurl; };
-
-  qtSubmodule = args:
-    let
-      inherit (args) name;
-      inherit (srcs."${args.name}") version src;
-      inherit (pkgs.stdenv) mkDerivation;
-    in mkDerivation (args // {
-      name = "${name}-${version}";
-      inherit src;
-
-      propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or []);
-      nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ self.fixQtModuleCMakeConfig self.qmakeHook ];
-
-      NIX_QT_SUBMODULE = args.NIX_QT_SUBMODULE or true;
-      dontFixLibtool = args.dontFixLibtool or true;
-
-      outputs = args.outputs or [ "dev" "out" ];
-      setOutputFlags = false;
-
-      enableParallelBuilding = args.enableParallelBuilding or true;
-
-      meta = self.qtbase.meta // (args.meta or {});
-    });
-
-  addPackages = self: with self;
-    let
-      callPackage = self.newScope { inherit qtSubmodule srcs; };
-    in {
-
-      qtbase = callPackage ./qtbase {
-        mesa = pkgs.mesa_noglu;
-        cups = if stdenv.isLinux then pkgs.cups else null;
-        # GNOME dependencies are not used unless gtkStyle == true
-        inherit (pkgs.gnome) libgnomeui GConf gnome_vfs;
-        bison = pkgs.bison2; # error: too few arguments to function 'int yylex(...
-        inherit developerBuild decryptSslTraffic;
-      };
-
-      /* qt3d = not packaged */
-      /* qtactiveqt = not packaged */
-      /* qtandroidextras = not packaged */
-      /* qtcanvas3d = not packaged */
-      qtconnectivity = callPackage ./qtconnectivity.nix {};
-      qtdeclarative = callPackage ./qtdeclarative {};
-      qtdoc = callPackage ./qtdoc.nix {};
-      qtenginio = callPackage ./qtenginio.nix {};
-      qtgraphicaleffects = callPackage ./qtgraphicaleffects.nix {};
-      qtimageformats = callPackage ./qtimageformats.nix {};
-      qtlocation = callPackage ./qtlocation.nix {};
-      /* qtmacextras = not packaged */
-      qtmultimedia = callPackage ./qtmultimedia.nix {
-        inherit (pkgs.gst_all_1) gstreamer gst-plugins-base;
-      };
-      qtquick1 = callPackage ./qtquick1 {};
-      qtquickcontrols = callPackage ./qtquickcontrols.nix {};
-      qtscript = callPackage ./qtscript {};
-      qtsensors = callPackage ./qtsensors.nix {};
-      qtserialport = callPackage ./qtserialport {};
-      qtsvg = callPackage ./qtsvg.nix {};
-      qttools = callPackage ./qttools.nix {};
-      qttranslations = callPackage ./qttranslations.nix {};
-      /* qtwayland = not packaged */
-      /* qtwebchannel = not packaged */
-      /* qtwebengine = not packaged */
-      qtwebkit = callPackage ./qtwebkit {};
-      qtwebkit-examples = callPackage ./qtwebkit-examples.nix {};
-      qtwebsockets = callPackage ./qtwebsockets.nix {};
-      /* qtwinextras = not packaged */
-      qtx11extras = callPackage ./qtx11extras.nix {};
-      qtxmlpatterns = callPackage ./qtxmlpatterns.nix {};
-
-      env = callPackage ../qt-env.nix {};
-      full = env "qt-${qtbase.version}" [
-        qtconnectivity qtdeclarative qtdoc qtenginio qtgraphicaleffects qtimageformats
-        qtlocation qtmultimedia qtquick1 qtquickcontrols qtscript qtsensors qtserialport
-        qtsvg qttools qttranslations qtwebkit qtwebkit-examples qtwebsockets qtx11extras
-        qtxmlpatterns
-      ];
-
-      makeQtWrapper = makeSetupHook { deps = [ makeWrapper ]; } ./make-qt-wrapper.sh;
-      fixQtModuleCMakeConfig = makeSetupHook { } ./fix-qt-module-cmake-config.sh;
-      qmakeHook = makeSetupHook { substitutions = { qt_dev = qtbase.dev; lndir = pkgs.xorg.lndir; }; } ./qmake-hook.sh;
-
-    };
-
-    self = makeScope pkgs.newScope addPackages;
-
-in self
diff --git a/pkgs/development/libraries/qt-5/5.4/fetchsrcs.sh b/pkgs/development/libraries/qt-5/5.4/fetchsrcs.sh
deleted file mode 100755
index 0fd5bb8d5fee..000000000000
--- a/pkgs/development/libraries/qt-5/5.4/fetchsrcs.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#! /usr/bin/env nix-shell
-#! nix-shell -i bash -p coreutils findutils gnused nix wget
-
-set -x
-
-# The trailing slash at the end is necessary!
-RELEASE_URL="http://download.qt.io/official_releases/qt/5.4/5.4.2/submodules/"
-EXTRA_WGET_ARGS='-A *.tar.xz'
-
-mkdir tmp; cd tmp
-
-wget -nH -r -c --no-parent $RELEASE_URL $EXTRA_WGET_ARGS
-
-cat >../srcs.nix <<EOF
-# DO NOT EDIT! This file is generated automatically by manifest.sh
-{ fetchurl, mirror }:
-
-{
-EOF
-
-workdir=$(pwd)
-
-find . | while read src; do
-    if [[ -f "${src}" ]]; then
-        url="${src:2}"
-        # Sanitize file name
-        filename=$(basename "$src" | tr '@' '_')
-        nameversion="${filename%.tar.*}"
-        name=$(echo "$nameversion" | sed -e 's,-[[:digit:]].*,,' | sed -e 's,-opensource-src$,,')
-        version=$(echo "$nameversion" | sed -e 's,^\([[:alpha:]][[:alnum:]]*-\)\+,,')
-        sha256=$(nix-hash --type sha256 --base32 --flat "$src")
-        cat >>../srcs.nix <<EOF
-  $name = {
-    version = "$version";
-    src = fetchurl {
-      url = "\${mirror}/$url";
-      sha256 = "$sha256";
-      name = "$filename";
-    };
-  };
-EOF
-    fi
-done
-
-echo "}" >>../srcs.nix
-
-cd ..
diff --git a/pkgs/development/libraries/qt-5/5.4/fix-qt-module-cmake-config.sh b/pkgs/development/libraries/qt-5/5.4/fix-qt-module-cmake-config.sh
deleted file mode 100644
index 7ca3e33b613c..000000000000
--- a/pkgs/development/libraries/qt-5/5.4/fix-qt-module-cmake-config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-fixQtModuleCMakeConfig() {
-    local module="$1"
-    sed -e "/set(imported_location/ s@\\\${_qt5${module}_install_prefix}@${!outputLib}@" \
-        -i "${!outputDev}/lib/cmake/Qt5${module}/Qt5${module}Config.cmake"
-}
diff --git a/pkgs/development/libraries/qt-5/5.4/make-qt-wrapper.sh b/pkgs/development/libraries/qt-5/5.4/make-qt-wrapper.sh
deleted file mode 100644
index d61665455bf4..000000000000
--- a/pkgs/development/libraries/qt-5/5.4/make-qt-wrapper.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-addQtDependency() {
-    addToSearchPath QT_PLUGIN_PATH "$1/lib/qt5/plugins"
-    addToSearchPath QML_IMPORT_PATH "$1/lib/qt5/imports"
-    addToSearchPath QML2_IMPORT_PATH "$1/lib/qt5/qml"
-    addToSearchPath XDG_CONFIG_DIRS "$1/etc/xdg"
-    addToSearchPath XDG_DATA_DIRS "$1/share"
-}
-
-wrapQtProgram() {
-    local prog="$1"
-    shift
-    wrapProgram "$prog" \
-        --prefix QT_PLUGIN_PATH : "$QT_PLUGIN_PATH" \
-        --prefix QML_IMPORT_PATH : "$QML_IMPORT_PATH" \
-        --prefix QML2_IMPORT_PATH : "$QML2_IMPORT_PATH" \
-        --prefix XDG_CONFIG_DIRS : "$XDG_CONFIG_DIRS" \
-        --prefix XDG_DATA_DIRS : "$XDG_DATA_DIRS" \
-        "$@"
-}
-
-makeQtWrapper() {
-    local old="$1"
-    local new="$2"
-    shift
-    shift
-    makeWrapper "$old" "$new" \
-        --prefix QT_PLUGIN_PATH : "$QT_PLUGIN_PATH" \
-        --prefix QML_IMPORT_PATH : "$QML_IMPORT_PATH" \
-        --prefix QML2_IMPORT_PATH : "$QML2_IMPORT_PATH" \
-        --prefix XDG_CONFIG_DIRS : "$XDG_CONFIG_DIRS" \
-        --prefix XDG_DATA_DIRS : "$XDG_DATA_DIRS" \
-        "$@"
-}
-
-# cannot use addToSearchPath because these directories may not exist yet
-export QT_PLUGIN_PATH="$QT_PLUGIN_PATH${QT_PLUGIN_PATH:+:}$out/lib/qt5/plugins"
-export QML_IMPORT_PATH="$QML_IMPORT_PATH${QML_IMPORT_PATH:+:}$out/lib/qt5/imports"
-export QML2_IMPORT_PATH="$QML2_IMPORT_PATH${QML2_IMPORT_PATH:+:}$out/lib/qt5/qml"
-export XDG_CONFIG_DIRS="$XDG_CONFIG_DIRS${XDG_CONFIG_DIRS:+:}$out/etc/xdg"
-export XDG_DATA_DIRS="$XDG_DATA_DIRS${XDG_DATA_DIRS:+:}$out/share"
-
-envHooks+=(addQtDependency)
diff --git a/pkgs/development/libraries/qt-5/5.4/qmake-hook.sh b/pkgs/development/libraries/qt-5/5.4/qmake-hook.sh
deleted file mode 100644
index a38f9f578e38..000000000000
--- a/pkgs/development/libraries/qt-5/5.4/qmake-hook.sh
+++ /dev/null
@@ -1,101 +0,0 @@
-if [[ -z "$QMAKE" ]]; then
-
-_qtLinkDependencyDir() {
-    @lndir@/bin/lndir -silent "$1/$2" "$qtOut/$2"
-    if [ -n "$NIX_QT_SUBMODULE" ]; then
-        find "$1/$2" -printf "$2/%P\n" >> "$out/nix-support/qt-inputs"
-    fi
-}
-
-_qtLinkModule() {
-    if [ -d "$1/mkspecs" ]; then
-        # $1 is a Qt module
-        _qtLinkDependencyDir "$1" mkspecs
-
-        for dir in bin include lib share; do
-            if [ -d "$1/$dir" ]; then
-                _qtLinkDependencyDir "$1" "$dir"
-            fi
-        done
-    fi
-}
-
-_qtRmModules() {
-    cat "$out/nix-support/qt-inputs" | while read file; do
-      if [ -h "$out/$file" ]; then
-        rm "$out/$file"
-      fi
-    done
-
-    cat "$out/nix-support/qt-inputs" | while read file; do
-      if [ -d "$out/$file" ]; then
-        rmdir --ignore-fail-on-non-empty -p "$out/$file"
-      fi
-    done
-
-    rm "$out/nix-support/qt-inputs"
-}
-
-_qtRmQmake() {
-    rm "$qtOut/bin/qmake" "$qtOut/bin/qt.conf"
-}
-
-_qtSetQmakePath() {
-    export PATH="$qtOut/bin${PATH:+:}$PATH"
-}
-
-_qtMultioutModuleDevs() {
-    # We cannot simply set these paths in configureFlags because libQtCore retains
-    # references to the paths it was built with.
-    moveToOutput "bin" "${!outputDev}"
-    moveToOutput "include" "${!outputDev}"
-
-    # The destination directory must exist or moveToOutput will do nothing
-    mkdir -p "${!outputDev}/share"
-    moveToOutput "share/doc" "${!outputDev}"
-}
-
-qmakeConfigurePhase() {
-    runHook preConfigure
-
-    qmake PREFIX=$out $qmakeFlags
-
-    runHook postConfigure
-}
-
-qtOut=""
-if [[ -z "$NIX_QT_SUBMODULE" ]]; then
-    qtOut=`mktemp -d`
-else
-    qtOut=$out
-fi
-
-mkdir -p "$qtOut/bin" "$qtOut/mkspecs" "$qtOut/include" "$qtOut/nix-support" "$qtOut/lib" "$qtOut/share"
-
-cp "@qt_dev@/bin/qmake" "$qtOut/bin"
-cat >"$qtOut/bin/qt.conf" <<EOF
-[Paths]
-Prefix = $qtOut
-Plugins = lib/qt5/plugins
-Imports = lib/qt5/imports
-Qml2Imports = lib/qt5/qml
-Documentation = share/doc/qt5
-EOF
-
-export QMAKE="$qtOut/bin/qmake"
-
-envHooks+=(_qtLinkModule)
-# Set PATH to find qmake first in a preConfigure hook
-# It must run after all the envHooks!
-postHooks+=(_qtSetQmakePath)
-
-if [  -z "$dontUseQmakeConfigure" -a -z "$configurePhase" ]; then
-    configurePhase=qmakeConfigurePhase
-fi
-
-if [ -n "$NIX_QT_SUBMODULE" ]; then
-    postInstallHooks+=(_qtRmQmake _qtRmModules)
-    preFixupHooks+=(_qtMultioutModuleDevs)
-fi
-
-fi
diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/compose-search-path.patch b/pkgs/development/libraries/qt-5/5.4/qtbase/compose-search-path.patch
deleted file mode 100644
index 08d12087f080..000000000000
--- a/pkgs/development/libraries/qt-5/5.4/qtbase/compose-search-path.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
-===================================================================
---- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
-+++ qt-everywhere-opensource-src-5.5.1/qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
-@@ -68,10 +68,7 @@ void TableGenerator::initPossibleLocatio
-     // the QTCOMPOSE environment variable
-     if (qEnvironmentVariableIsSet("QTCOMPOSE"))
-         m_possibleLocations.append(QString::fromLocal8Bit(qgetenv("QTCOMPOSE")));
--    m_possibleLocations.append(QStringLiteral("/usr/share/X11/locale"));
--    m_possibleLocations.append(QStringLiteral("/usr/local/share/X11/locale"));
--    m_possibleLocations.append(QStringLiteral("/usr/lib/X11/locale"));
--    m_possibleLocations.append(QStringLiteral("/usr/local/lib/X11/locale"));
-+    m_possibleLocations.append(QStringLiteral("${libX11}/share/X11/locale"));
-     m_possibleLocations.append(QStringLiteral(X11_PREFIX "/share/X11/locale"));
-     m_possibleLocations.append(QStringLiteral(X11_PREFIX "/lib/X11/locale"));
- }
diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/decrypt-ssl-traffic.patch b/pkgs/development/libraries/qt-5/5.4/qtbase/decrypt-ssl-traffic.patch
deleted file mode 100644
index 10e7e01a07f2..000000000000
--- a/pkgs/development/libraries/qt-5/5.4/qtbase/decrypt-ssl-traffic.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: qt-everywhere-opensource-src-5.4.2/qtbase/src/network/ssl/qsslsocket_openssl.cpp
-===================================================================
---- qt-everywhere-opensource-src-5.4.2.orig/qtbase/src/network/ssl/qsslsocket_openssl.cpp
-+++ qt-everywhere-opensource-src-5.4.2/qtbase/src/network/ssl/qsslsocket_openssl.cpp
-@@ -47,7 +47,7 @@
- ****************************************************************************/
- 
- //#define QSSLSOCKET_DEBUG
--//#define QT_DECRYPT_SSL_TRAFFIC
-+#define QT_DECRYPT_SSL_TRAFFIC
- 
- #include "qssl_p.h"
- #include "qsslsocket_openssl_p.h"
diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
deleted file mode 100644
index 32e8bacd1e7b..000000000000
--- a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
+++ /dev/null
@@ -1,254 +0,0 @@
-{ stdenv, lib, fetchurl, copyPathsToStore, fixQtModuleCMakeConfig
-, srcs
-
-, xlibs, libX11, libxcb, libXcursor, libXext, libXrender, libXi
-, xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilwm, libxkbcommon
-, fontconfig, freetype, openssl, dbus, glib, udev, libxml2, libxslt, pcre
-, zlib, libjpeg, libpng, libtiff, sqlite, icu
-
-, coreutils, bison, flex, gdb, gperf, lndir, ruby
-, python, perl, pkgconfig
-
-# optional dependencies
-, cups ? null
-, mysql ? null, postgresql ? null
-
-# options
-, mesaSupported, mesa
-, buildExamples ? false
-, buildTests ? false
-, developerBuild ? false
-, gtkStyle ? false, libgnomeui, GConf, gnome_vfs, gtk
-, decryptSslTraffic ? false
-}:
-
-let
-  inherit (srcs.qt5) version;
-  system-x86_64 = lib.elem stdenv.system lib.platforms.x86_64;
-in
-
-stdenv.mkDerivation {
-
-  name = "qtbase-${version}";
-  inherit version;
-
-  srcs = with srcs; [ qt5.src qtbase.src ];
-
-  sourceRoot = "qt-everywhere-opensource-src-${version}";
-
-  outputs = [ "dev" "out" ];
-
-  postUnpack = ''
-    mv qtbase-opensource-src-${version} ./qt-everywhere-opensource-src-${version}/qtbase
-  '';
-
-  patches =
-    copyPathsToStore (lib.readPathsFromFile ./. ./series)
-    ++ lib.optional gtkStyle ./dlopen-gtkstyle.patch
-    ++ lib.optional decryptSslTraffic ./decrypt-ssl-traffic.patch
-    ++ lib.optional mesaSupported [ ./dlopen-gl.patch ./mkspecs-libgl.patch ];
-
-  postPatch =
-    ''
-      substituteInPlace configure --replace /bin/pwd pwd
-      substituteInPlace qtbase/configure --replace /bin/pwd pwd
-      substituteInPlace qtbase/src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls
-      sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i config.tests/*/*.test -i qtbase/mkspecs/*/*.conf
-
-      sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/src/corelib/Qt5Config.cmake.in"
-      sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/src/corelib/Qt5CoreMacros.cmake"
-      sed -i 's/NO_DEFAULT_PATH//' "qtbase/src/gui/Qt5GuiConfigExtras.cmake.in"
-      sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in"
-
-      substituteInPlace qtbase/src/network/kernel/qdnslookup_unix.cpp \
-        --replace "@glibc@" "${stdenv.cc.libc.out}"
-      substituteInPlace qtbase/src/network/kernel/qhostinfo_unix.cpp \
-        --replace "@glibc@" "${stdenv.cc.libc.out}"
-
-      substituteInPlace qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp \
-        --replace "@libXcursor@" "${libXcursor.out}"
-
-      substituteInPlace qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp \
-        --replace "@openssl@" "${openssl.out}"
-
-      substituteInPlace qtbase/src/dbus/qdbus_symbols.cpp \
-        --replace "@dbus_libs@" "${dbus.lib}"
-
-      substituteInPlace \
-        qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp \
-        --replace "@libX11@" "${libX11.out}"
-    ''
-    + lib.optionalString gtkStyle ''
-      substituteInPlace qtbase/src/widgets/styles/qgtk2painter.cpp --replace "@gtk@" "${gtk.out}"
-      substituteInPlace qtbase/src/widgets/styles/qgtkstyle_p.cpp \
-        --replace "@gtk@" "${gtk.out}" \
-        --replace "@gnome_vfs@" "${gnome_vfs}" \
-        --replace "@libgnomeui@" "${libgnomeui}" \
-        --replace "@gconf@" "${GConf}"
-    ''
-    + lib.optionalString mesaSupported ''
-      substituteInPlace \
-        qtbase/src/plugins/platforms/xcb/qglxintegration.cpp \
-        --replace "@mesa_lib@" "${mesa.out}"
-      substituteInPlace qtbase/mkspecs/common/linux.conf \
-        --replace "@mesa_lib@" "${mesa.out}" \
-        --replace "@mesa_inc@" "${mesa.dev}"
-    '';
-
-  setOutputFlags = false;
-  preConfigure = ''
-    export LD_LIBRARY_PATH="$PWD/qtbase/lib:$PWD/qtbase/plugins/platforms:$LD_LIBRARY_PATH"
-    export MAKEFLAGS=-j$NIX_BUILD_CORES
-
-    _multioutQtDevs() {
-        # We cannot simply set these paths in configureFlags because libQtCore retains
-        # references to the paths it was built with.
-        moveToOutput "bin" "$dev"
-        moveToOutput "include" "$dev"
-        moveToOutput "mkspecs" "$dev"
-
-        # The destination directory must exist or moveToOutput will do nothing
-        mkdir -p "$dev/share"
-        moveToOutput "share/doc" "$dev"
-
-        mkdir -p "$dev/lib"
-        lndir -silent "$out/lib" "$dev/lib"
-        if [[ -h "$dev/lib/cmake" ]]; then rm "$dev/lib/cmake"; fi
-        if [[ -h "$dev/lib/pkgconfig" ]]; then rm "$dev/lib/pkgconfig"; fi
-    }
-    preFixupHooks+=(_multioutQtDevs)
-
-    configureFlags+="\
-        -plugindir $out/lib/qt5/plugins \
-        -importdir $out/lib/qt5/imports \
-        -qmldir $out/lib/qt5/qml \
-        -docdir $out/share/doc/qt5"
-  '';
-
-  prefixKey = "-prefix ";
-
-  # -no-eglfs, -no-directfb, -no-linuxfb and -no-kms because of the current minimalist mesa
-  # TODO Remove obsolete and useless flags once the build will be totally mastered
-  configureFlags = ''
-    -verbose
-    -confirm-license
-    -opensource
-
-    -release
-    -shared
-    -c++11
-    ${lib.optionalString developerBuild "-developer-build"}
-    -largefile
-    -accessibility
-    -rpath
-    -optimized-qmake
-    -strip
-    -reduce-relocations
-    -system-proxies
-    -pkg-config
-
-    -gui
-    -widgets
-    -opengl desktop
-    -qml-debug
-    -nis
-    -iconv
-    -icu
-    -pch
-    -glib
-    -xcb
-    -qpa xcb
-    -${lib.optionalString (cups == null) "no-"}cups
-    -${lib.optionalString (!gtkStyle) "no-"}gtkstyle
-
-    -no-eglfs
-    -no-directfb
-    -no-linuxfb
-    -no-kms
-
-    ${lib.optionalString (!system-x86_64) "-no-sse2"}
-    -no-sse3
-    -no-ssse3
-    -no-sse4.1
-    -no-sse4.2
-    -no-avx
-    -no-avx2
-    -no-mips_dsp
-    -no-mips_dspr2
-
-    -system-zlib
-    -system-libpng
-    -system-libjpeg
-    -system-xcb
-    -system-xkbcommon
-    -openssl-linked
-    -dbus-linked
-
-    -system-sqlite
-    -${if mysql != null then "plugin" else "no"}-sql-mysql
-    -${if postgresql != null then "plugin" else "no"}-sql-psql
-
-    -make libs
-    -make tools
-    -${lib.optionalString (buildExamples == false) "no"}make examples
-    -${lib.optionalString (buildTests == false) "no"}make tests
-  '';
-
-  # PostgreSQL autodetection fails sporadically because Qt omits the "-lpq" flag
-  # if dependency paths contain the string "pq", which can occur in the hash.
-  # To prevent these failures, we need to override PostgreSQL detection.
-  PSQL_LIBS = lib.optionalString (postgresql != null) "-L${postgresql.lib}/lib -lpq";
-
-  propagatedBuildInputs = [
-    xlibs.libXcomposite libX11 libxcb libXext libXrender libXi
-    fontconfig freetype openssl dbus glib udev libxml2 libxslt pcre
-    zlib libjpeg libpng libtiff sqlite icu
-    xcbutil xcbutilimage xcbutilkeysyms xcbutilwm libxkbcommon
-  ]
-  ++ lib.optional mesaSupported mesa;
-
-  buildInputs =
-    [ bison flex gperf ruby ]
-    ++ lib.optional developerBuild gdb
-    ++ lib.optional (cups != null) cups
-    ++ lib.optional (mysql != null) mysql.lib
-    ++ lib.optional (postgresql != null) postgresql
-    ++ lib.optionals gtkStyle [gnome_vfs libgnomeui gtk GConf];
-
-  nativeBuildInputs = [ fixQtModuleCMakeConfig lndir python perl pkgconfig ];
-
-  # freetype-2.5.4 changed signedness of some struct fields
-  NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare";
-
-  postFixup =
-    ''
-      # Don't retain build-time dependencies like gdb and ruby.
-      sed '/QMAKE_DEFAULT_.*DIRS/ d' -i "$dev/mkspecs/qconfig.pri"
-
-      fixQtModuleCMakeConfig "Concurrent"
-      fixQtModuleCMakeConfig "Core"
-      fixQtModuleCMakeConfig "DBus"
-      fixQtModuleCMakeConfig "Gui"
-      fixQtModuleCMakeConfig "Network"
-      fixQtModuleCMakeConfig "OpenGL"
-      fixQtModuleCMakeConfig "OpenGLExtensions"
-      fixQtModuleCMakeConfig "PrintSupport"
-      fixQtModuleCMakeConfig "Sql"
-      fixQtModuleCMakeConfig "Test"
-      fixQtModuleCMakeConfig "Widgets"
-      fixQtModuleCMakeConfig "Xml"
-    '';
-
-  setupHook = ./setup-hook.sh;
-
-  enableParallelBuilding = true;
-
-  meta = with lib; {
-    homepage = http://www.qt.io;
-    description = "A cross-platform application framework for C++";
-    license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ];
-    maintainers = with maintainers; [ bbenoist qknight ttuegel ];
-    platforms = platforms.linux;
-  };
-
-}
diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-dbus.patch b/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-dbus.patch
deleted file mode 100644
index 05e98d8be71d..000000000000
--- a/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-dbus.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: qt-everywhere-opensource-src-5.4.2/qtbase/src/dbus/qdbus_symbols.cpp
-===================================================================
---- qt-everywhere-opensource-src-5.4.2.orig/qtbase/src/dbus/qdbus_symbols.cpp
-+++ qt-everywhere-opensource-src-5.4.2/qtbase/src/dbus/qdbus_symbols.cpp
-@@ -88,7 +88,7 @@ bool qdbus_loadLibDBus()
- #ifdef Q_OS_WIN
-         QLatin1String("dbus-1"),
- #endif
--        QLatin1String("libdbus-1")
-+        QLatin1String("@dbus_libs@/lib/libdbus-1")
-     };
- 
-     lib->unload();
diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-gl.patch b/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-gl.patch
deleted file mode 100644
index d5c4c2b97cb6..000000000000
--- a/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-gl.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: qt-everywhere-opensource-src-5.4.2/qtbase/src/plugins/platforms/xcb/qglxintegration.cpp
-===================================================================
---- qt-everywhere-opensource-src-5.4.2.orig/qtbase/src/plugins/platforms/xcb/qglxintegration.cpp
-+++ qt-everywhere-opensource-src-5.4.2/qtbase/src/plugins/platforms/xcb/qglxintegration.cpp
-@@ -560,7 +560,12 @@ void (*QGLXContext::getProcAddress(const
-             {
-                 extern const QString qt_gl_library_name();
- //                QLibrary lib(qt_gl_library_name());
-+                // Check system library paths first
-                 QLibrary lib(QLatin1String("GL"));
-+                if (!lib.load()) {
-+                    // Fallback to Mesa driver
-+                    lib.setFileName(QLatin1String("@mesa_lib@/lib/libGL"));
-+                }
-                 glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB");
-             }
-         }
diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-gtkstyle.patch b/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-gtkstyle.patch
deleted file mode 100644
index c2be73779497..000000000000
--- a/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-gtkstyle.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Index: qt-everywhere-opensource-src-5.4.2/qtbase/src/widgets/styles/qgtk2painter.cpp
-===================================================================
---- qt-everywhere-opensource-src-5.4.2.orig/qtbase/src/widgets/styles/qgtk2painter.cpp
-+++ qt-everywhere-opensource-src-5.4.2/qtbase/src/widgets/styles/qgtk2painter.cpp
-@@ -96,7 +96,7 @@ static void initGtk()
-     static bool initialized = false;
-     if (!initialized) {
-         // enforce the "0" suffix, so we'll open libgtk-x11-2.0.so.0
--        QLibrary libgtk(QLS("gtk-x11-2.0"), 0, 0);
-+        QLibrary libgtk(QLS("@gtk@/lib/libgtk-x11-2.0"), 0, 0);
- 
-         QGtk2PainterPrivate::gdk_pixmap_new = (Ptr_gdk_pixmap_new)libgtk.resolve("gdk_pixmap_new");
-         QGtk2PainterPrivate::gdk_pixbuf_get_from_drawable = (Ptr_gdk_pixbuf_get_from_drawable)libgtk.resolve("gdk_pixbuf_get_from_drawable");
-Index: qt-everywhere-opensource-src-5.4.2/qtbase/src/widgets/styles/qgtkstyle_p.cpp
-===================================================================
---- qt-everywhere-opensource-src-5.4.2.orig/qtbase/src/widgets/styles/qgtkstyle_p.cpp
-+++ qt-everywhere-opensource-src-5.4.2/qtbase/src/widgets/styles/qgtkstyle_p.cpp
-@@ -326,7 +326,7 @@ void QGtkStylePrivate::gtkWidgetSetFocus
- void QGtkStylePrivate::resolveGtk() const
- {
-     // enforce the "0" suffix, so we'll open libgtk-x11-2.0.so.0
--    QLibrary libgtk(QLS("gtk-x11-2.0"), 0, 0);
-+    QLibrary libgtk(QLS("@gtk@/lib/libgtk-x11-2.0"), 0, 0);
- 
-     gtk_init = (Ptr_gtk_init)libgtk.resolve("gtk_init");
-     gtk_window_new = (Ptr_gtk_window_new)libgtk.resolve("gtk_window_new");
-@@ -424,8 +424,8 @@ void QGtkStylePrivate::resolveGtk() cons
-     pango_font_description_get_family = (Ptr_pango_font_description_get_family)libgtk.resolve("pango_font_description_get_family");
-     pango_font_description_get_style = (Ptr_pango_font_description_get_style)libgtk.resolve("pango_font_description_get_style");
- 
--    gnome_icon_lookup_sync = (Ptr_gnome_icon_lookup_sync)QLibrary::resolve(QLS("gnomeui-2"), 0, "gnome_icon_lookup_sync");
--    gnome_vfs_init= (Ptr_gnome_vfs_init)QLibrary::resolve(QLS("gnomevfs-2"), 0, "gnome_vfs_init");
-+    gnome_icon_lookup_sync = (Ptr_gnome_icon_lookup_sync)QLibrary::resolve(QLS("@libgnomeui@/lib/libgnomeui-2"), 0, "gnome_icon_lookup_sync");
-+    gnome_vfs_init= (Ptr_gnome_vfs_init)QLibrary::resolve(QLS("@gnome_vfs@/lib/libgnomevfs-2"), 0, "gnome_vfs_init");
- }
- 
- /* \internal
-@@ -593,9 +593,9 @@ void QGtkStylePrivate::cleanupGtkWidgets
- static bool resolveGConf()
- {
-     if (!QGtkStylePrivate::gconf_client_get_default) {
--        QGtkStylePrivate::gconf_client_get_default = (Ptr_gconf_client_get_default)QLibrary::resolve(QLS("gconf-2"), 4, "gconf_client_get_default");
--        QGtkStylePrivate::gconf_client_get_string =  (Ptr_gconf_client_get_string)QLibrary::resolve(QLS("gconf-2"), 4, "gconf_client_get_string");
--        QGtkStylePrivate::gconf_client_get_bool =  (Ptr_gconf_client_get_bool)QLibrary::resolve(QLS("gconf-2"), 4, "gconf_client_get_bool");
-+        QGtkStylePrivate::gconf_client_get_default = (Ptr_gconf_client_get_default)QLibrary::resolve(QLS("@gconf@/lib/libgconf-2"), 4, "gconf_client_get_default");
-+        QGtkStylePrivate::gconf_client_get_string =  (Ptr_gconf_client_get_string)QLibrary::resolve(QLS("@gconf@/lib/libgconf-2"), 4, "gconf_client_get_string");
-+        QGtkStylePrivate::gconf_client_get_bool =  (Ptr_gconf_client_get_bool)QLibrary::resolve(QLS("@gconf@/lib/libgconf-2"), 4, "gconf_client_get_bool");
-     }
-     return (QGtkStylePrivate::gconf_client_get_default !=0);
- }
diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-libXcursor.patch b/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-libXcursor.patch
deleted file mode 100644
index 608c68b6d5b4..000000000000
--- a/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-libXcursor.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: qt-everywhere-opensource-src-5.4.2/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp
-===================================================================
---- qt-everywhere-opensource-src-5.4.2.orig/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp
-+++ qt-everywhere-opensource-src-5.4.2/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp
-@@ -297,10 +297,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *c
- #ifdef XCB_USE_XLIB
-     static bool function_ptrs_not_initialized = true;
-     if (function_ptrs_not_initialized) {
--        QLibrary xcursorLib(QLatin1String("Xcursor"), 1);
-+        QLibrary xcursorLib(QLatin1String("@libXcursor@/lib/libXcursor"), 1);
-         bool xcursorFound = xcursorLib.load();
-         if (!xcursorFound) { // try without the version number
--            xcursorLib.setFileName(QLatin1String("Xcursor"));
-+            xcursorLib.setFileName(QLatin1String("@libXcursor@/lib/Xcursor"));
-             xcursorFound = xcursorLib.load();
-         }
-         if (xcursorFound) {
diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-openssl.patch b/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-openssl.patch
deleted file mode 100644
index b648a58b5701..000000000000
--- a/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-openssl.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: qt-everywhere-opensource-src-5.4.2/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-===================================================================
---- qt-everywhere-opensource-src-5.4.2.orig/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-+++ qt-everywhere-opensource-src-5.4.2/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp
-@@ -611,8 +611,8 @@ static QPair<QLibrary*, QLibrary*> loadO
- #endif
- #if defined(SHLIB_VERSION_NUMBER) && !defined(Q_OS_QNX) // on QNX, the libs are always libssl.so and libcrypto.so
-     // first attempt: the canonical name is libssl.so.<SHLIB_VERSION_NUMBER>
--    libssl->setFileNameAndVersion(QLatin1String("ssl"), QLatin1String(SHLIB_VERSION_NUMBER));
--    libcrypto->setFileNameAndVersion(QLatin1String("crypto"), QLatin1String(SHLIB_VERSION_NUMBER));
-+    libssl->setFileNameAndVersion(QLatin1String("@openssl@/lib/libssl"), QLatin1String(SHLIB_VERSION_NUMBER));
-+    libcrypto->setFileNameAndVersion(QLatin1String("@openssl@/lib/libcrypto"), QLatin1String(SHLIB_VERSION_NUMBER));
-     if (libcrypto->load() && libssl->load()) {
-         // libssl.so.<SHLIB_VERSION_NUMBER> and libcrypto.so.<SHLIB_VERSION_NUMBER> found
-         return pair;
-@@ -629,8 +629,8 @@ static QPair<QLibrary*, QLibrary*> loadO
-     //  OS X's /usr/lib/libssl.dylib, /usr/lib/libcrypto.dylib will be picked up in the third
-     //    attempt, _after_ <bundle>/Contents/Frameworks has been searched.
-     //  iOS does not ship a system libssl.dylib, libcrypto.dylib in the first place.
--    libssl->setFileNameAndVersion(QLatin1String("ssl"), -1);
--    libcrypto->setFileNameAndVersion(QLatin1String("crypto"), -1);
-+    libssl->setFileNameAndVersion(QLatin1String("@openssl@/lib/libssl"), -1);
-+    libcrypto->setFileNameAndVersion(QLatin1String("@openssl@/lib/libcrypto"), -1);
-     if (libcrypto->load() && libssl->load()) {
-         // libssl.so.0 and libcrypto.so.0 found
-         return pair;
diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-resolv.patch b/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-resolv.patch
deleted file mode 100644
index 20e56bf3149e..000000000000
--- a/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-resolv.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/network/kernel/qdnslookup_unix.cpp
-===================================================================
---- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/network/kernel/qdnslookup_unix.cpp
-+++ qt-everywhere-opensource-src-5.5.1/qtbase/src/network/kernel/qdnslookup_unix.cpp
-@@ -79,7 +79,7 @@ static void resolveLibrary()
-     if (!lib.load())
- #endif
-     {
--        lib.setFileName(QLatin1String("resolv"));
-+        lib.setFileName(QLatin1String("@glibc@/lib/resolv"));
-         if (!lib.load())
-             return;
-     }
-Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/network/kernel/qhostinfo_unix.cpp
-===================================================================
---- qt-everywhere-opensource-src-5.5.1.orig/qtbase/src/network/kernel/qhostinfo_unix.cpp
-+++ qt-everywhere-opensource-src-5.5.1/qtbase/src/network/kernel/qhostinfo_unix.cpp
-@@ -95,7 +95,7 @@ static void resolveLibrary()
-     if (!lib.load())
- #endif
-     {
--        lib.setFileName(QLatin1String("resolv"));
-+        lib.setFileName(QLatin1String("@glibc@/lib/libresolv"));
-         if (!lib.load())
-             return;
-     }
diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/mkspecs-libgl.patch b/pkgs/development/libraries/qt-5/5.4/qtbase/mkspecs-libgl.patch
deleted file mode 100644
index 56ee0a411d4d..000000000000
--- a/pkgs/development/libraries/qt-5/5.4/qtbase/mkspecs-libgl.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: qt-everywhere-opensource-src-5.5.1/qtbase/mkspecs/common/linux.conf
-===================================================================
---- qt-everywhere-opensource-src-5.5.1.orig/qtbase/mkspecs/common/linux.conf
-+++ qt-everywhere-opensource-src-5.5.1/qtbase/mkspecs/common/linux.conf
-@@ -12,8 +12,8 @@ QMAKE_INCDIR            =
- QMAKE_LIBDIR            =
- QMAKE_INCDIR_X11        =
- QMAKE_LIBDIR_X11        =
--QMAKE_INCDIR_OPENGL     =
--QMAKE_LIBDIR_OPENGL     =
-+QMAKE_INCDIR_OPENGL     = @mesa_inc@/include
-+QMAKE_LIBDIR_OPENGL     = @mesa_lib@/lib
- QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL
- QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL
- QMAKE_INCDIR_EGL        =
diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/nix-profiles-library-paths.patch b/pkgs/development/libraries/qt-5/5.4/qtbase/nix-profiles-library-paths.patch
deleted file mode 100644
index 824d2ea0817f..000000000000
--- a/pkgs/development/libraries/qt-5/5.4/qtbase/nix-profiles-library-paths.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: qt-everywhere-opensource-src-5.4.2/qtbase/src/corelib/kernel/qcoreapplication.cpp
-===================================================================
---- qt-everywhere-opensource-src-5.4.2.orig/qtbase/src/corelib/kernel/qcoreapplication.cpp
-+++ qt-everywhere-opensource-src-5.4.2/qtbase/src/corelib/kernel/qcoreapplication.cpp
-@@ -2442,6 +2442,21 @@ QStringList QCoreApplication::libraryPat
-                 }
-             }
-         }
-+
-+        // Add library paths derived from NIX_PROFILES.
-+        const QByteArray nixProfilesEnv = qgetenv("NIX_PROFILES");
-+        if (!nixProfilesEnv.isEmpty()) {
-+            QLatin1Char pathSep(' ');
-+            QStringList paths = QFile::decodeName(nixProfilesEnv).split(pathSep, QString::SkipEmptyParts);
-+            for (QStringList::iterator it = paths.begin(); it != paths.end(); ++it) {
-+                it->append("/lib/qt5/plugins");
-+                QString canonicalPath = QDir(*it).canonicalPath();
-+                if (!canonicalPath.isEmpty()
-+                    && !app_libpaths->contains(canonicalPath)) {
-+                    app_libpaths->append(canonicalPath);
-+                }
-+            }
-+        }
-     }
-     return *(coreappdata()->app_libpaths);
- }
diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/series b/pkgs/development/libraries/qt-5/5.4/qtbase/series
deleted file mode 100644
index 3cfa50e85b70..000000000000
--- a/pkgs/development/libraries/qt-5/5.4/qtbase/series
+++ /dev/null
@@ -1,8 +0,0 @@
-dlopen-resolv.patch
-tzdir.patch
-dlopen-libXcursor.patch
-dlopen-openssl.patch
-dlopen-dbus.patch
-xdg-config-dirs.patch
-nix-profiles-library-paths.patch
-compose-search-path.patch
diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/setup-hook.sh b/pkgs/development/libraries/qt-5/5.4/qtbase/setup-hook.sh
deleted file mode 100644
index a9c4fbc855f7..000000000000
--- a/pkgs/development/libraries/qt-5/5.4/qtbase/setup-hook.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-addToSearchPathOnceWithCustomDelimiter() {
-    local delim="$1"
-    local search="$2"
-    local target="$3"
-    local dirs
-    local exported
-    IFS="$delim" read -a dirs <<< "${!search}"
-    local canonical
-    if canonical=$(readlink -e "$target"); then
-        for dir in ${dirs[@]}; do
-            if [ "z$dir" == "z$canonical" ]; then exported=1; fi
-        done
-        if [ -z $exported ]; then
-            eval "export ${search}=\"${!search}${!search:+$delim}$canonical\""
-        fi
-    fi
-}
-
-addToSearchPathOnce() {
-    addToSearchPathOnceWithCustomDelimiter ':' "$@"
-}
-
-propagateOnce() {
-    addToSearchPathOnceWithCustomDelimiter ' ' "$@"
-}
-
-_qtPropagateRuntimeDependencies() {
-    for dir in "lib/qt5/plugins" "lib/qt5/qml" "lib/qt5/imports"; do
-        if [ -d "$1/$dir" ]; then
-            propagateOnce propagatedBuildInputs "$1"
-            propagateOnce propagatedUserEnvPkgs "$1"
-            break
-        fi
-    done
-    addToSearchPathOnce QT_PLUGIN_PATH "$1/lib/qt5/plugins"
-    addToSearchPathOnce QML_IMPORT_PATH "$1/lib/qt5/imports"
-    addToSearchPathOnce QML2_IMPORT_PATH "$1/lib/qt5/qml"
-}
-
-envHooks+=(_qtPropagateRuntimeDependencies)
-
-_qtMultioutDevs() {
-    # This is necessary whether the package is a Qt module or not
-    moveToOutput "mkspecs" "${!outputDev}"
-}
-
-preFixupHooks+=(_qtMultioutDevs)
-
-if [[ -z "$NIX_QT_PIC" ]]; then
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE${NIX_CFLAGS_COMPILE:+ }-fPIC"
-    export NIX_QT_PIC=1
-fi
diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/tzdir.patch b/pkgs/development/libraries/qt-5/5.4/qtbase/tzdir.patch
deleted file mode 100644
index f62b25ef4457..000000000000
--- a/pkgs/development/libraries/qt-5/5.4/qtbase/tzdir.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Index: qt-everywhere-opensource-src-5.4.2/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp
-===================================================================
---- qt-everywhere-opensource-src-5.4.2.orig/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp
-+++ qt-everywhere-opensource-src-5.4.2/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp
-@@ -61,7 +61,10 @@ typedef QHash<QByteArray, QTzTimeZone> Q
- // Parse zone.tab table, assume lists all installed zones, if not will need to read directories
- static QTzTimeZoneHash loadTzTimeZones()
- {
--    QString path = QStringLiteral("/usr/share/zoneinfo/zone.tab");
-+    QString path = qgetenv("TZDIR");
-+    path += "/zone.tab";
-+    if (!QFile::exists(path))
-+        path = QStringLiteral("/usr/share/zoneinfo/zone.tab");
-     if (!QFile::exists(path))
-         path = QStringLiteral("/usr/lib/zoneinfo/zone.tab");
- 
-@@ -552,12 +555,18 @@ void QTzTimeZonePrivate::init(const QByt
-         if (!tzif.open(QIODevice::ReadOnly))
-             return;
-     } else {
--        // Open named tz, try modern path first, if fails try legacy path
--        tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId));
-+        // Try TZDIR first
-+        QString zoneinfoDir = qgetenv("TZDIR");
-+        zoneinfoDir += "/" + QString::fromLocal8Bit(ianaId);
-+        tzif.setFileName(zoneinfoDir);
-         if (!tzif.open(QIODevice::ReadOnly)) {
--            tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId));
--            if (!tzif.open(QIODevice::ReadOnly))
--                return;
-+            // Open named tz, try modern path first, if fails try legacy path
-+            tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId));
-+            if (!tzif.open(QIODevice::ReadOnly)) {
-+                tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId));
-+                if (!tzif.open(QIODevice::ReadOnly))
-+                    return;
-+            }
-         }
-     }
- 
diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/xdg-config-dirs.patch b/pkgs/development/libraries/qt-5/5.4/qtbase/xdg-config-dirs.patch
deleted file mode 100644
index dbf5eac52e6b..000000000000
--- a/pkgs/development/libraries/qt-5/5.4/qtbase/xdg-config-dirs.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Index: qt-everywhere-opensource-src-5.4.2/qtbase/src/corelib/io/qsettings.cpp
-===================================================================
---- qt-everywhere-opensource-src-5.4.2.orig/qtbase/src/corelib/io/qsettings.cpp
-+++ qt-everywhere-opensource-src-5.4.2/qtbase/src/corelib/io/qsettings.cpp
-@@ -1128,6 +1128,24 @@ QConfFileSettingsPrivate::QConfFileSetti
-     if (!application.isEmpty())
-         confFiles[F_System | F_Application].reset(QConfFile::fromName(systemPath + appFile, false));
-     confFiles[F_System | F_Organization].reset(QConfFile::fromName(systemPath + orgFile, false));
-+
-+#if !defined(Q_OS_WIN)
-+    // Add directories specified in $XDG_CONFIG_DIRS
-+    const QString pathEnv = QString::fromLocal8Bit(getenv("XDG_CONFIG_DIRS"));
-+    if (!pathEnv.isEmpty()) {
-+        const QStringList pathEntries = pathEnv.split(QLatin1Char(':'), QString::SkipEmptyParts);
-+        if (!pathEntries.isEmpty()) {
-+            int j = 4; // This is the number of confFiles set above -- we need to start adding $XDG_CONFIG_DIRS after those.
-+            for (int k = 0; k < pathEntries.size() && j < NumConfFiles - 1; ++k) {
-+                const QString& path = pathEntries.at(k);
-+                if (!application.isEmpty())
-+                    confFiles[j++].reset(QConfFile::fromName(path + QDir::separator() + appFile, false));
-+                confFiles[j++].reset(QConfFile::fromName(path + QDir::separator() + orgFile, false));
-+            }
-+        }
-+    }
-+#endif
-+
- #else
-     QString confName = getPath(format, QSettings::UserScope) + org;
-     if (!application.isEmpty())
-Index: qt-everywhere-opensource-src-5.4.2/qtbase/src/corelib/io/qsettings_p.h
-===================================================================
---- qt-everywhere-opensource-src-5.4.2.orig/qtbase/src/corelib/io/qsettings_p.h
-+++ qt-everywhere-opensource-src-5.4.2/qtbase/src/corelib/io/qsettings_p.h
-@@ -240,7 +240,7 @@ public:
-         F_Organization = 0x1,
-         F_User = 0x0,
-         F_System = 0x2,
--        NumConfFiles = 4
-+        NumConfFiles = 40 // HACK: increase NumConfFiles from 4 to 40 in order to accommodate more paths in $XDG_CONFIG_DIRS -- ellis
- #else
-         SandboxConfFile = 0,
-         NumConfFiles = 1
diff --git a/pkgs/development/libraries/qt-5/5.4/qtconnectivity.nix b/pkgs/development/libraries/qt-5/5.4/qtconnectivity.nix
deleted file mode 100644
index 35538c7261f1..000000000000
--- a/pkgs/development/libraries/qt-5/5.4/qtconnectivity.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ qtSubmodule, qtbase, qtdeclarative }:
-
-qtSubmodule {
-  name = "qtconnectivity";
-  qtInputs = [ qtbase qtdeclarative ];
-  postFixup = ''
-    fixQtModuleCMakeConfig "Bluetooth"
-    fixQtModuleCMakeConfig "Nfc"
-  '';
-}
diff --git a/pkgs/development/libraries/qt-5/5.4/qtdeclarative/0001-nix-profiles-import-paths.patch b/pkgs/development/libraries/qt-5/5.4/qtdeclarative/0001-nix-profiles-import-paths.patch
deleted file mode 100644
index 8e86f97a9477..000000000000
--- a/pkgs/development/libraries/qt-5/5.4/qtdeclarative/0001-nix-profiles-import-paths.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 3f6fa74067aacd0e595e45b4ef7ce754514cb205 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Sat, 17 Oct 2015 09:28:18 -0500
-Subject: [PATCH] nix profiles import paths
-
----
- src/qml/qml/qqmlimport.cpp | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
-diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp
-index 5a54609..f33c2f9 100644
---- a/src/qml/qml/qqmlimport.cpp
-+++ b/src/qml/qml/qqmlimport.cpp
-@@ -1549,6 +1549,20 @@ QQmlImportDatabase::QQmlImportDatabase(QQmlEngine *e)
-     QString installImportsPath =  QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath);
-     addImportPath(installImportsPath);
- 
-+    // Add import paths derived from NIX_PROFILES.
-+    const QByteArray nixProfilesEnv = qgetenv("NIX_PROFILES");
-+    if (!nixProfilesEnv.isEmpty()) {
-+        QLatin1Char pathSep(' ');
-+        QStringList paths = QFile::decodeName(nixProfilesEnv).split(pathSep, QString::SkipEmptyParts);
-+        for (QStringList::iterator it = paths.begin(); it != paths.end(); ++it) {
-+            it->append("/lib/qt5/qml");
-+            QString canonicalPath = QDir(*it).canonicalPath();
-+            if (!canonicalPath.isEmpty()) {
-+                addImportPath(canonicalPath);
-+            }
-+        }
-+    }
-+
-     // env import paths
-     QByteArray envImportPath = qgetenv("QML2_IMPORT_PATH");
-     if (!envImportPath.isEmpty()) {
--- 
-2.5.2
-
diff --git a/pkgs/development/libraries/qt-5/5.4/qtdeclarative/default.nix b/pkgs/development/libraries/qt-5/5.4/qtdeclarative/default.nix
deleted file mode 100644
index e2219642a122..000000000000
--- a/pkgs/development/libraries/qt-5/5.4/qtdeclarative/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ qtSubmodule, python, qtbase, qtsvg, qtxmlpatterns }:
-
-qtSubmodule {
-  name = "qtdeclarative";
-  patches = [ ./0001-nix-profiles-import-paths.patch ];
-  qtInputs = [ qtbase qtsvg qtxmlpatterns ];
-  nativeBuildInputs = [ python ];
-  postFixup = ''
-    fixQtModuleCMakeConfig "Qml"
-    fixQtModuleCMakeConfig "Quick"
-    fixQtModuleCMakeConfig "QuickTest"
-    fixQtModuleCMakeConfig "QuickWidgets"
-  '';
-}
diff --git a/pkgs/development/libraries/qt-5/5.4/qtdoc.nix b/pkgs/development/libraries/qt-5/5.4/qtdoc.nix
deleted file mode 100644
index 578ea6ba0b22..000000000000
--- a/pkgs/development/libraries/qt-5/5.4/qtdoc.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ qtSubmodule, qtdeclarative }:
-
-qtSubmodule {
-  name = "qtdoc";
-  qtInputs = [ qtdeclarative ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.4/qtenginio.nix b/pkgs/development/libraries/qt-5/5.4/qtenginio.nix
deleted file mode 100644
index 503a0f7ce4f5..000000000000
--- a/pkgs/development/libraries/qt-5/5.4/qtenginio.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ qtSubmodule, qtdeclarative }:
-
-qtSubmodule {
-  name = "qtenginio";
-  qtInputs = [ qtdeclarative ];
-  postFixup = ''
-    fixQtModuleCMakeConfig "Enginio"
-  '';
-}
diff --git a/pkgs/development/libraries/qt-5/5.4/qtgraphicaleffects.nix b/pkgs/development/libraries/qt-5/5.4/qtgraphicaleffects.nix
deleted file mode 100644
index 3273f12eb830..000000000000
--- a/pkgs/development/libraries/qt-5/5.4/qtgraphicaleffects.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ qtSubmodule, qtdeclarative }:
-
-qtSubmodule {
-  name = "qtgraphicaleffects";
-  qtInputs = [ qtdeclarative ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.4/qtimageformats.nix b/pkgs/development/libraries/qt-5/5.4/qtimageformats.nix
deleted file mode 100644
index 03d0fffbe80e..000000000000
--- a/pkgs/development/libraries/qt-5/5.4/qtimageformats.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ qtSubmodule, qtbase }:
-
-qtSubmodule {
-  name = "qtimageformats";
-  qtInputs = [ qtbase ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.4/qtlocation.nix b/pkgs/development/libraries/qt-5/5.4/qtlocation.nix
deleted file mode 100644
index 0e2ad8bafb30..000000000000
--- a/pkgs/development/libraries/qt-5/5.4/qtlocation.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ qtSubmodule, qtbase, qtmultimedia }:
-
-qtSubmodule {
-  name = "qtlocation";
-  qtInputs = [ qtbase qtmultimedia ];
-  postFixup = ''
-    fixQtModuleCMakeConfig "Location"
-    fixQtModuleCMakeConfig "Positioning"
-  '';
-}
diff --git a/pkgs/development/libraries/qt-5/5.4/qtmultimedia.nix b/pkgs/development/libraries/qt-5/5.4/qtmultimedia.nix
deleted file mode 100644
index 9eb68ba6b5ba..000000000000
--- a/pkgs/development/libraries/qt-5/5.4/qtmultimedia.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ qtSubmodule, qtbase, qtdeclarative, pkgconfig
-, alsaLib, gstreamer, gst-plugins-base, libpulseaudio
-}:
-
-qtSubmodule {
-  name = "qtmultimedia";
-  qtInputs = [ qtbase qtdeclarative ];
-  buildInputs = [
-    pkgconfig alsaLib gstreamer gst-plugins-base libpulseaudio
-  ];
-  qmakeFlags = [ "GST_VERSION=1.0" ];
-  postFixup = ''
-    fixQtModuleCMakeConfig "Multimedia"
-    fixQtModuleCMakeConfig "MultimediaWidgets"
-  '';
-}
diff --git a/pkgs/development/libraries/qt-5/5.4/qtquick1/0001-nix-profiles-import-paths.patch b/pkgs/development/libraries/qt-5/5.4/qtquick1/0001-nix-profiles-import-paths.patch
deleted file mode 100644
index 63b141f6ce5a..000000000000
--- a/pkgs/development/libraries/qt-5/5.4/qtquick1/0001-nix-profiles-import-paths.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From bbc706b3fcb90ca3b2b51d5e3434145572152711 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Sat, 17 Oct 2015 09:29:51 -0500
-Subject: [PATCH] nix profiles import paths
-
----
- src/declarative/qml/qdeclarativeimport.cpp | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
-diff --git a/src/declarative/qml/qdeclarativeimport.cpp b/src/declarative/qml/qdeclarativeimport.cpp
-index 9404834..d185ed5 100644
---- a/src/declarative/qml/qdeclarativeimport.cpp
-+++ b/src/declarative/qml/qdeclarativeimport.cpp
-@@ -725,6 +725,20 @@ QDeclarativeImportDatabase::QDeclarativeImportDatabase(QDeclarativeEngine *e)
- 
-     addImportPath(installImportsPath);
- 
-+    // Add import paths derived from NIX_PROFILES.
-+    const QByteArray nixProfilesEnv = qgetenv("NIX_PROFILES");
-+    if (!nixProfilesEnv.isEmpty()) {
-+        QLatin1Char pathSep(' ');
-+        QStringList paths = QFile::decodeName(nixProfilesEnv).split(pathSep, QString::SkipEmptyParts);
-+        for (QStringList::iterator it = paths.begin(); it != paths.end(); ++it) {
-+            it->append("/lib/qt5/imports");
-+            QString canonicalPath = QDir(*it).canonicalPath();
-+            if (!canonicalPath.isEmpty()) {
-+                addImportPath(canonicalPath);
-+            }
-+        }
-+    }
-+
-     // env import paths
-     QByteArray envImportPath = qgetenv("QML_IMPORT_PATH");
-     if (!envImportPath.isEmpty()) {
--- 
-2.5.2
-
diff --git a/pkgs/development/libraries/qt-5/5.4/qtquick1/default.nix b/pkgs/development/libraries/qt-5/5.4/qtquick1/default.nix
deleted file mode 100644
index d81abbcd6140..000000000000
--- a/pkgs/development/libraries/qt-5/5.4/qtquick1/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ qtSubmodule, qtscript, qtsvg, qtwebkit, qtxmlpatterns }:
-
-qtSubmodule {
-  name = "qtquick1";
-  patches = [ ./0001-nix-profiles-import-paths.patch ];
-  qtInputs = [ qtscript qtsvg qtwebkit qtxmlpatterns ];
-  postFixup = ''
-    fixQtModuleCMakeConfig "Declarative"
-  '';
-}
diff --git a/pkgs/development/libraries/qt-5/5.4/qtquickcontrols.nix b/pkgs/development/libraries/qt-5/5.4/qtquickcontrols.nix
deleted file mode 100644
index 93a864621b82..000000000000
--- a/pkgs/development/libraries/qt-5/5.4/qtquickcontrols.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ qtSubmodule, qtdeclarative }:
-
-qtSubmodule {
-  name = "qtquickcontrols";
-  qtInputs = [ qtdeclarative ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.4/qtscript/0001-glib-2.32.patch b/pkgs/development/libraries/qt-5/5.4/qtscript/0001-glib-2.32.patch
deleted file mode 100644
index 887e107b6c1b..000000000000
--- a/pkgs/development/libraries/qt-5/5.4/qtscript/0001-glib-2.32.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From abd80356449bb36c8adcc5c9ca1df6b47715d265 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Sun, 23 Aug 2015 09:13:34 -0500
-Subject: [PATCH] glib-2.32
-
----
- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h
-index 1f6d25e..087c3fb 100644
---- a/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h
-+++ b/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h
-@@ -81,7 +81,7 @@
- #include <pthread.h>
- #elif PLATFORM(GTK)
- #include <wtf/gtk/GOwnPtr.h>
--typedef struct _GMutex GMutex;
-+typedef union _GMutex GMutex;
- typedef struct _GCond GCond;
- #endif
- 
--- 
-2.5.0
-
diff --git a/pkgs/development/libraries/qt-5/5.4/qtscript/default.nix b/pkgs/development/libraries/qt-5/5.4/qtscript/default.nix
deleted file mode 100644
index b81a43aeadb0..000000000000
--- a/pkgs/development/libraries/qt-5/5.4/qtscript/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ qtSubmodule, qtbase, qttools }:
-
-qtSubmodule {
-  name = "qtscript";
-  qtInputs = [ qtbase qttools ];
-  patches = [ ./0001-glib-2.32.patch ];
-  postFixup = ''
-    fixQtModuleCMakeConfig "Script"
-  '';
-}
diff --git a/pkgs/development/libraries/qt-5/5.4/qtsensors.nix b/pkgs/development/libraries/qt-5/5.4/qtsensors.nix
deleted file mode 100644
index 5776f45a7068..000000000000
--- a/pkgs/development/libraries/qt-5/5.4/qtsensors.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ qtSubmodule, qtbase, qtdeclarative }:
-
-qtSubmodule {
-  name = "qtsensors";
-  qtInputs = [ qtbase qtdeclarative ];
-  postFixup = ''
-    fixQtModuleCMakeConfig "Sensors"
-  '';
-}
diff --git a/pkgs/development/libraries/qt-5/5.4/qtserialport/0001-dlopen-serialport-udev.patch b/pkgs/development/libraries/qt-5/5.4/qtserialport/0001-dlopen-serialport-udev.patch
deleted file mode 100644
index 3a813dc80074..000000000000
--- a/pkgs/development/libraries/qt-5/5.4/qtserialport/0001-dlopen-serialport-udev.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From d81c2c870b9bea8fb8e6b85baefb06542f568338 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Sun, 23 Aug 2015 09:16:02 -0500
-Subject: [PATCH] dlopen serialport udev
-
----
- src/serialport/qtudev_p.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/serialport/qtudev_p.h b/src/serialport/qtudev_p.h
-index 6f2cabd..81b9849 100644
---- a/src/serialport/qtudev_p.h
-+++ b/src/serialport/qtudev_p.h
-@@ -105,9 +105,9 @@ inline QFunctionPointer resolveSymbol(QLibrary *udevLibrary, const char *symbolN
- inline bool resolveSymbols(QLibrary *udevLibrary)
- {
-     if (!udevLibrary->isLoaded()) {
--        udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 1);
-+        udevLibrary->setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 1);
-         if (!udevLibrary->load()) {
--            udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 0);
-+            udevLibrary->setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 0);
-             if (!udevLibrary->load()) {
-                 qWarning("Failed to load the library: %s, supported version(s): %i and %i", qPrintable(udevLibrary->fileName()), 1, 0);
-                 return false;
--- 
-2.5.0
-
diff --git a/pkgs/development/libraries/qt-5/5.4/qtserialport/default.nix b/pkgs/development/libraries/qt-5/5.4/qtserialport/default.nix
deleted file mode 100644
index 2c9575f122e7..000000000000
--- a/pkgs/development/libraries/qt-5/5.4/qtserialport/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ qtSubmodule, qtbase, substituteAll, libudev }:
-
-qtSubmodule {
-  name = "qtserialport";
-  qtInputs = [ qtbase ];
-
-  patches = [
-    (substituteAll {
-      src = ./0001-dlopen-serialport-udev.patch;
-      libudev = libudev.out;
-    })
-  ];
-  postFixup = ''
-    fixQtModuleCMakeConfig "SerialPort"
-  '';
-}
diff --git a/pkgs/development/libraries/qt-5/5.4/qtsvg.nix b/pkgs/development/libraries/qt-5/5.4/qtsvg.nix
deleted file mode 100644
index a460d6da4c2a..000000000000
--- a/pkgs/development/libraries/qt-5/5.4/qtsvg.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ qtSubmodule, qtbase }:
-
-qtSubmodule {
-  name = "qtsvg";
-  qtInputs = [ qtbase ];
-  postFixup = ''
-    fixQtModuleCMakeConfig "Svg"
-  '';
-}
diff --git a/pkgs/development/libraries/qt-5/5.4/qttools.nix b/pkgs/development/libraries/qt-5/5.4/qttools.nix
deleted file mode 100644
index 16887c4265a8..000000000000
--- a/pkgs/development/libraries/qt-5/5.4/qttools.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ qtSubmodule, qtbase }:
-
-qtSubmodule {
-  name = "qttools";
-  qtInputs = [ qtbase ];
-  postFixup = ''
-    moveToOutput "bin/qdbus" "$out"
-    moveToOutput "bin/qtpaths" "$out"
-
-    fixQtModuleCMakeConfig "Designer"
-    fixQtModuleCMakeConfig "Help"
-    fixQtModuleCMakeConfig "LinguistTools"
-    fixQtModuleCMakeConfig "UiTools"
-  '';
-}
diff --git a/pkgs/development/libraries/qt-5/5.4/qttranslations.nix b/pkgs/development/libraries/qt-5/5.4/qttranslations.nix
deleted file mode 100644
index 50fc8cf6826a..000000000000
--- a/pkgs/development/libraries/qt-5/5.4/qttranslations.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ qtSubmodule, qttools }:
-
-qtSubmodule {
-  name = "qttranslations";
-  qtInputs = [ qttools ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.4/qtwebkit-examples.nix b/pkgs/development/libraries/qt-5/5.4/qtwebkit-examples.nix
deleted file mode 100644
index 64f85c42d198..000000000000
--- a/pkgs/development/libraries/qt-5/5.4/qtwebkit-examples.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ qtSubmodule, qttools, qtwebkit }:
-
-qtSubmodule {
-  name = "qtwebkit-examples";
-  qtInputs = [ qttools qtwebkit ];
-}
diff --git a/pkgs/development/libraries/qt-5/5.4/qtwebkit/0001-dlopen-webkit-nsplugin.patch b/pkgs/development/libraries/qt-5/5.4/qtwebkit/0001-dlopen-webkit-nsplugin.patch
deleted file mode 100644
index 0eeacce1bc05..000000000000
--- a/pkgs/development/libraries/qt-5/5.4/qtwebkit/0001-dlopen-webkit-nsplugin.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 862ce7d357a3ec32683ac6ec7c0ebdc9346b44ba Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Sun, 23 Aug 2015 09:18:54 -0500
-Subject: [PATCH 1/3] dlopen webkit nsplugin
-
----
- Source/WebCore/plugins/qt/PluginPackageQt.cpp                        | 2 +-
- Source/WebCore/plugins/qt/PluginViewQt.cpp                           | 2 +-
- Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/Source/WebCore/plugins/qt/PluginPackageQt.cpp b/Source/WebCore/plugins/qt/PluginPackageQt.cpp
-index a923d49..2731d05 100644
---- a/Source/WebCore/plugins/qt/PluginPackageQt.cpp
-+++ b/Source/WebCore/plugins/qt/PluginPackageQt.cpp
-@@ -136,7 +136,7 @@ static void initializeGtk(QLibrary* module = 0)
-         }
-     }
- 
--    QLibrary library(QLatin1String("libgtk-x11-2.0"), 0);
-+    QLibrary library(QLatin1String("@gtk@/lib/libgtk-x11-2.0"), 0);
-     if (library.load()) {
-         typedef void *(*gtk_init_check_ptr)(int*, char***);
-         gtk_init_check_ptr gtkInitCheck = (gtk_init_check_ptr)library.resolve("gtk_init_check");
-diff --git a/Source/WebCore/plugins/qt/PluginViewQt.cpp b/Source/WebCore/plugins/qt/PluginViewQt.cpp
-index de06a2f..363bde5 100644
---- a/Source/WebCore/plugins/qt/PluginViewQt.cpp
-+++ b/Source/WebCore/plugins/qt/PluginViewQt.cpp
-@@ -697,7 +697,7 @@ static Display *getPluginDisplay()
-     // support gdk based plugins (like flash) that use a different X connection.
-     // The code below has the same effect as this one:
-     // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default());
--    QLibrary library(QLatin1String("libgdk-x11-2.0"), 0);
-+    QLibrary library(QLatin1String("@gdk_pixbuf@/lib/libgdk-x11-2.0"), 0);
-     if (!library.load())
-         return 0;
- 
-diff --git a/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp b/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
-index d734ff6..62a2197 100644
---- a/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
-+++ b/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
-@@ -64,7 +64,7 @@ static Display* getPluginDisplay()
-     // The code below has the same effect as this one:
-     // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default());
- 
--    QLibrary library(QLatin1String("libgdk-x11-2.0"), 0);
-+    QLibrary library(QLatin1String("@gdk_pixbuf@/libgdk-x11-2.0"), 0);
-     if (!library.load())
-         return 0;
- 
--- 
-2.5.0
-
diff --git a/pkgs/development/libraries/qt-5/5.4/qtwebkit/0002-dlopen-webkit-gtk.patch b/pkgs/development/libraries/qt-5/5.4/qtwebkit/0002-dlopen-webkit-gtk.patch
deleted file mode 100644
index bb5d1f74364c..000000000000
--- a/pkgs/development/libraries/qt-5/5.4/qtwebkit/0002-dlopen-webkit-gtk.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 6a407d30357c2551abceac75c82f4a1688e47437 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Sun, 23 Aug 2015 09:19:16 -0500
-Subject: [PATCH 2/3] dlopen webkit gtk
-
----
- Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp b/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp
-index 8de6521..0b25748 100644
---- a/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp
-+++ b/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp
-@@ -53,7 +53,7 @@ static void messageHandler(QtMsgType type, const QMessageLogContext&, const QStr
- 
- static bool initializeGtk()
- {
--    QLibrary gtkLibrary(QLatin1String("libgtk-x11-2.0"), 0);
-+    QLibrary gtkLibrary(QLatin1String("@gtk@/lib/libgtk-x11-2.0"), 0);
-     if (!gtkLibrary.load())
-         return false;
-     typedef void* (*gtk_init_ptr)(void*, void*);
--- 
-2.5.0
-
diff --git a/pkgs/development/libraries/qt-5/5.4/qtwebkit/0003-dlopen-webkit-udev.patch b/pkgs/development/libraries/qt-5/5.4/qtwebkit/0003-dlopen-webkit-udev.patch
deleted file mode 100644
index 1c360cd81aa2..000000000000
--- a/pkgs/development/libraries/qt-5/5.4/qtwebkit/0003-dlopen-webkit-udev.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 864020dd47c3b6d532d9f26b82185904cf9324f2 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Sun, 23 Aug 2015 09:19:29 -0500
-Subject: [PATCH 3/3] dlopen webkit udev
-
----
- Source/WebCore/platform/qt/GamepadsQt.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Source/WebCore/platform/qt/GamepadsQt.cpp b/Source/WebCore/platform/qt/GamepadsQt.cpp
-index 60ff317..da8ac69 100644
---- a/Source/WebCore/platform/qt/GamepadsQt.cpp
-+++ b/Source/WebCore/platform/qt/GamepadsQt.cpp
-@@ -111,12 +111,12 @@ private:
-     bool load()
-     {
-         m_libUdev.setLoadHints(QLibrary::ResolveAllSymbolsHint);
--        m_libUdev.setFileNameAndVersion(QStringLiteral("udev"), 1);
-+        m_libUdev.setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 1);
-         m_loaded = m_libUdev.load();
-         if (resolveMethods())
-             return true;
- 
--        m_libUdev.setFileNameAndVersion(QStringLiteral("udev"), 0);
-+        m_libUdev.setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 0);
-         m_loaded = m_libUdev.load();
-         return resolveMethods();
-     }
--- 
-2.5.0
-
diff --git a/pkgs/development/libraries/qt-5/5.4/qtwebkit/default.nix b/pkgs/development/libraries/qt-5/5.4/qtwebkit/default.nix
deleted file mode 100644
index 7ed3017b95a3..000000000000
--- a/pkgs/development/libraries/qt-5/5.4/qtwebkit/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ qtSubmodule, stdenv, qtdeclarative, qtlocation, qtmultimedia, qtsensors
-, fontconfig, gdk_pixbuf, gtk, libwebp, libxml2, libxslt
-, sqlite, libudev
-, bison2, flex, gdb, gperf, perl, pkgconfig, python, ruby
-, substituteAll
-, flashplayerFix ? false
-}:
-
-with stdenv.lib;
-
-qtSubmodule {
-  name = "qtwebkit";
-  qtInputs = [ qtdeclarative qtlocation qtmultimedia qtsensors ];
-  buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite ];
-  nativeBuildInputs = [
-    bison2 flex gdb gperf perl pkgconfig python ruby
-  ];
-  patches =
-    let dlopen-webkit-nsplugin = substituteAll {
-          src = ./0001-dlopen-webkit-nsplugin.patch;
-          gtk = gtk.out;
-          gdk_pixbuf = gdk_pixbuf.out;
-        };
-        dlopen-webkit-gtk = substituteAll {
-          src = ./0002-dlopen-webkit-gtk.patch;
-          gtk = gtk.out;
-        };
-        dlopen-webkit-udev = substituteAll {
-          src = ./0003-dlopen-webkit-udev.patch;
-          udev = libudev.out;
-        };
-    in optionals flashplayerFix [ dlopen-webkit-nsplugin dlopen-webkit-gtk ]
-    ++ [ dlopen-webkit-udev ];
-  postFixup = ''
-    fixQtModuleCMakeConfig "WebKit"
-    fixQtModuleCMakeConfig "WebKitWidgets"
-  '';
-}
diff --git a/pkgs/development/libraries/qt-5/5.4/qtwebsockets.nix b/pkgs/development/libraries/qt-5/5.4/qtwebsockets.nix
deleted file mode 100644
index c0d0f9e7d714..000000000000
--- a/pkgs/development/libraries/qt-5/5.4/qtwebsockets.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ qtSubmodule, qtbase, qtdeclarative }:
-
-qtSubmodule {
-  name = "qtwebsockets";
-  qtInputs = [ qtbase qtdeclarative ];
-  postFixup = ''
-    fixQtModuleCMakeConfig "WebSockets"
-  '';
-}
diff --git a/pkgs/development/libraries/qt-5/5.4/qtx11extras.nix b/pkgs/development/libraries/qt-5/5.4/qtx11extras.nix
deleted file mode 100644
index db92f1353627..000000000000
--- a/pkgs/development/libraries/qt-5/5.4/qtx11extras.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ qtSubmodule, qtbase }:
-
-qtSubmodule {
-  name = "qtx11extras";
-  qtInputs = [ qtbase ];
-  postFixup = ''
-    fixQtModuleCMakeConfig "X11Extras"
-  '';
-}
diff --git a/pkgs/development/libraries/qt-5/5.4/qtxmlpatterns.nix b/pkgs/development/libraries/qt-5/5.4/qtxmlpatterns.nix
deleted file mode 100644
index 3b22132e4c38..000000000000
--- a/pkgs/development/libraries/qt-5/5.4/qtxmlpatterns.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ qtSubmodule, qtbase }:
-
-qtSubmodule {
-  name = "qtxmlpatterns";
-  qtInputs = [ qtbase ];
-  postFixup = ''
-    fixQtModuleCMakeConfig "XmlPatterns"
-  '';
-}
diff --git a/pkgs/development/libraries/qt-5/5.4/srcs.nix b/pkgs/development/libraries/qt-5/5.4/srcs.nix
deleted file mode 100644
index dd873f5961b3..000000000000
--- a/pkgs/development/libraries/qt-5/5.4/srcs.nix
+++ /dev/null
@@ -1,245 +0,0 @@
-# DO NOT EDIT! This file is generated automatically by manifest.sh
-{ fetchurl, mirror }:
-
-{
-  qtbase = {
-    version = "5.4.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtbase-opensource-src-5.4.2.tar.xz";
-      sha256 = "0x2szpjjvsrpcqw0dd3gsim7b1jv9p716pnllzjbia5mp0hggi4z";
-      name = "qtbase-opensource-src-5.4.2.tar.xz";
-    };
-  };
-  qtenginio = {
-    version = "5.4.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtenginio-opensource-src-5.4.2.tar.xz";
-      sha256 = "082i3fapjw6xs0jkz7x529dn3pb6w1pfli3cjrgvggff86gwlgwn";
-      name = "qtenginio-opensource-src-5.4.2.tar.xz";
-    };
-  };
-  qtserialport = {
-    version = "5.4.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtserialport-opensource-src-5.4.2.tar.xz";
-      sha256 = "1h6p5rb0ldxgzd4md3n79gy0j9blhj736670xqjd9vlvh1743kck";
-      name = "qtserialport-opensource-src-5.4.2.tar.xz";
-    };
-  };
-  qtscript = {
-    version = "5.4.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtscript-opensource-src-5.4.2.tar.xz";
-      sha256 = "0izsmy0cr8iii78r10ndkidyljxqd2k9g03f5xb9nxacvr2f8hp0";
-      name = "qtscript-opensource-src-5.4.2.tar.xz";
-    };
-  };
-  qtwebchannel = {
-    version = "5.4.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtwebchannel-opensource-src-5.4.2.tar.xz";
-      sha256 = "0vy1zjbghfa1wirxd8fd2n2n8yryykzr09913qm2nlfbcxdsgqsn";
-      name = "qtwebchannel-opensource-src-5.4.2.tar.xz";
-    };
-  };
-  qtwinextras = {
-    version = "5.4.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtwinextras-opensource-src-5.4.2.tar.xz";
-      sha256 = "0sgybvr1y2xsddlqc95ninxj3rfmd4gv7a8f7rqcxdynjan5gij0";
-      name = "qtwinextras-opensource-src-5.4.2.tar.xz";
-    };
-  };
-  qtwebsockets = {
-    version = "5.4.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtwebsockets-opensource-src-5.4.2.tar.xz";
-      sha256 = "0lv1la8333qnirxmscs42xnnra0xry1gjbhi3bxrf1hrfs2im9j4";
-      name = "qtwebsockets-opensource-src-5.4.2.tar.xz";
-    };
-  };
-  qtmultimedia = {
-    version = "5.4.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtmultimedia-opensource-src-5.4.2.tar.xz";
-      sha256 = "0h29cs8ajnjarhjx1aczdnxqwvg6pqs9s8w28hw488s149wqqrnj";
-      name = "qtmultimedia-opensource-src-5.4.2.tar.xz";
-    };
-  };
-  qtgraphicaleffects = {
-    version = "5.4.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtgraphicaleffects-opensource-src-5.4.2.tar.xz";
-      sha256 = "02p8xm5ajicjam30ry3g1lm2p4nja2q0sls8dzimqrxhw5xlg3xs";
-      name = "qtgraphicaleffects-opensource-src-5.4.2.tar.xz";
-    };
-  };
-  qtxmlpatterns = {
-    version = "5.4.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtxmlpatterns-opensource-src-5.4.2.tar.xz";
-      sha256 = "0ar7znqp1i02ha5ngy2kzk3hlgkafjbn2xa8j2k78gzmwsmdhzxa";
-      name = "qtxmlpatterns-opensource-src-5.4.2.tar.xz";
-    };
-  };
-  qttranslations = {
-    version = "5.4.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qttranslations-opensource-src-5.4.2.tar.xz";
-      sha256 = "0b4l69c16z8gjd4mq75zz3lj2gxarr9wyk0vk60jg1mi62vxvdls";
-      name = "qttranslations-opensource-src-5.4.2.tar.xz";
-    };
-  };
-  qtdeclarative = {
-    version = "5.4.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtdeclarative-opensource-src-5.4.2.tar.xz";
-      sha256 = "1bj1wwms6lpj8s70y8by3j0hjsw6g9v8m6fybx68krzzizbj2c5p";
-      name = "qtdeclarative-opensource-src-5.4.2.tar.xz";
-    };
-  };
-  qtwebkit = {
-    version = "5.4.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtwebkit-opensource-src-5.4.2.tar.xz";
-      sha256 = "0vffbpiczag2n2hp5gc0nii8n7vkidr8f8pp8a47px0183hl6hiy";
-      name = "qtwebkit-opensource-src-5.4.2.tar.xz";
-    };
-  };
-  qtquick1 = {
-    version = "5.4.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtquick1-opensource-src-5.4.2.tar.xz";
-      sha256 = "0178z15a31fw3l6933fwxs7sk0csifpwckydp3rqnn3fg5f2fwvp";
-      name = "qtquick1-opensource-src-5.4.2.tar.xz";
-    };
-  };
-  qtquickcontrols = {
-    version = "5.4.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtquickcontrols-opensource-src-5.4.2.tar.xz";
-      sha256 = "137z3c3drxlvkdfc7zgcl0xqmavw0ladzqy0i3bq51h756qdc877";
-      name = "qtquickcontrols-opensource-src-5.4.2.tar.xz";
-    };
-  };
-  qtimageformats = {
-    version = "5.4.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtimageformats-opensource-src-5.4.2.tar.xz";
-      sha256 = "1nny6j9pm5ri3n1vwl5lrfrdz0fl81rx127wa49rkg2rjai2aawb";
-      name = "qtimageformats-opensource-src-5.4.2.tar.xz";
-    };
-  };
-  qtdoc = {
-    version = "5.4.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtdoc-opensource-src-5.4.2.tar.xz";
-      sha256 = "15lamv6jvd7v33ldpcrazcdksv6qibdcgh4ncbyh774k8avgrlh8";
-      name = "qtdoc-opensource-src-5.4.2.tar.xz";
-    };
-  };
-  qtwayland = {
-    version = "5.4.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtwayland-opensource-src-5.4.2.tar.xz";
-      sha256 = "14pmpkfq70plw07igxjaiji4vnjg5kg7izlb0wwym1lisg7bwkg0";
-      name = "qtwayland-opensource-src-5.4.2.tar.xz";
-    };
-  };
-  qtmacextras = {
-    version = "5.4.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtmacextras-opensource-src-5.4.2.tar.xz";
-      sha256 = "0h0p3s0rvd3g9rgr4hwcggdbsav2g30vijqwmdxgxd8c00yply80";
-      name = "qtmacextras-opensource-src-5.4.2.tar.xz";
-    };
-  };
-  qtactiveqt = {
-    version = "5.4.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtactiveqt-opensource-src-5.4.2.tar.xz";
-      sha256 = "014kwficqydciwdm1yw88yms81qm8pmi6xfhhfpbc9k85pc6jlla";
-      name = "qtactiveqt-opensource-src-5.4.2.tar.xz";
-    };
-  };
-  qtlocation = {
-    version = "5.4.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtlocation-opensource-src-5.4.2.tar.xz";
-      sha256 = "1v43hl2zzi90vaw11y8dvsksrjn0r2v0br7pw6njl8lqadpg4jnw";
-      name = "qtlocation-opensource-src-5.4.2.tar.xz";
-    };
-  };
-  qtconnectivity = {
-    version = "5.4.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtconnectivity-opensource-src-5.4.2.tar.xz";
-      sha256 = "1nj68bzgm3r1gg171kj0acnifzb3jx0m5pf4f81xb7zl4hfxasrs";
-      name = "qtconnectivity-opensource-src-5.4.2.tar.xz";
-    };
-  };
-  qtx11extras = {
-    version = "5.4.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtx11extras-opensource-src-5.4.2.tar.xz";
-      sha256 = "0jgyywjxavfpiz8202g3s0g9izfl185mmak4fs9h80w1i3gn5zzn";
-      name = "qtx11extras-opensource-src-5.4.2.tar.xz";
-    };
-  };
-  qttools = {
-    version = "5.4.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qttools-opensource-src-5.4.2.tar.xz";
-      sha256 = "1d5nx01r7wxhdg9f1i9xhsvsbwgaz3yv516s068riy970bhdgwzd";
-      name = "qttools-opensource-src-5.4.2.tar.xz";
-    };
-  };
-  qtsensors = {
-    version = "5.4.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtsensors-opensource-src-5.4.2.tar.xz";
-      sha256 = "1yawvjbdymgw8af7ir9zcin89xxck9dm2l6hnc43lwrky0frcvcf";
-      name = "qtsensors-opensource-src-5.4.2.tar.xz";
-    };
-  };
-  qtwebengine = {
-    version = "5.4.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtwebengine-opensource-src-5.4.2.tar.xz";
-      sha256 = "06cyl733prakniqrn8sd807lclk5im2vmysjdcijry2mcyah2ih8";
-      name = "qtwebengine-opensource-src-5.4.2.tar.xz";
-    };
-  };
-  qtsvg = {
-    version = "5.4.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtsvg-opensource-src-5.4.2.tar.xz";
-      sha256 = "1dsyncp154xvb7d82nmnfjm0ngymnhqmliq58ljwxsjmpjlncakz";
-      name = "qtsvg-opensource-src-5.4.2.tar.xz";
-    };
-  };
-  qt5 = {
-    version = "5.4.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qt5-opensource-src-5.4.2.tar.xz";
-      sha256 = "17a0pybr4bpyv9pj7cr5hl4g31biv89bjr8zql723h0b12ql1w44";
-      name = "qt5-opensource-src-5.4.2.tar.xz";
-    };
-  };
-  qtwebkit-examples = {
-    version = "5.4.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtwebkit-examples-opensource-src-5.4.2.tar.xz";
-      sha256 = "0pm9ik1j09jfb5xflc16449nff2xsfyfms7vxlcdjg4dhcqfmll8";
-      name = "qtwebkit-examples-opensource-src-5.4.2.tar.xz";
-    };
-  };
-  qtandroidextras = {
-    version = "5.4.2";
-    src = fetchurl {
-      url = "${mirror}/official_releases/qt/5.4/5.4.2/submodules/qtandroidextras-opensource-src-5.4.2.tar.xz";
-      sha256 = "0krfm0wg26x7575p8isswdhrkb0jxyp169grwklil7mfw8yg3xhx";
-      name = "qtandroidextras-opensource-src-5.4.2.tar.xz";
-    };
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e23db12de4d0..9e18a791bd3b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8694,10 +8694,6 @@ in
     developerBuild = true;
   });
 
-  qt54 =
-    let imported = import ../development/libraries/qt-5/5.4 { inherit pkgs; };
-    in recurseIntoAttrs (imported.override (super: qt5LibsFun));
-
   qt55 =
     let imported = import ../development/libraries/qt-5/5.5 { inherit pkgs; };
     in recurseIntoAttrs (imported.override (super: qt5LibsFun));

From c6e12e26e5b50845608efd0fe1d0a4d62c9f726d Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 5 May 2016 16:30:35 -0500
Subject: [PATCH 243/287] qmltermwidget: incompatible with Qt 5.6

---
 pkgs/top-level/all-packages.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9e18a791bd3b..55ceac33569f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8696,7 +8696,12 @@ in
 
   qt55 =
     let imported = import ../development/libraries/qt-5/5.5 { inherit pkgs; };
-    in recurseIntoAttrs (imported.override (super: qt5LibsFun));
+        # Libraries that cannot be built with newer versions of Qt 5
+        qt55Only = self: with self; {
+          # Requires Qt Quick (deprecated in Qt 5.5, removed from Qt 5.6)
+          qmltermwidget = callPackage ../development/libraries/qmltermwidget { };
+        };
+    in recurseIntoAttrs (imported.override (super: self: qt5LibsFun self // qt55Only self));
 
   qt56 =
     let imported = import ../development/libraries/qt-5/5.6 { inherit pkgs; };
@@ -8728,8 +8733,6 @@ in
 
     qca-qt5 = callPackage ../development/libraries/qca-qt5 { };
 
-    qmltermwidget = callPackage ../development/libraries/qmltermwidget { };
-
     qtcreator = callPackage ../development/qtcreator {
       withDocumentation = true;
     };

From 93369da0390af41e29a6f5d76b4797d83f374eb9 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 5 May 2016 16:51:02 -0500
Subject: [PATCH 244/287] signon: remove

The library does not build with Qt 5.6 and no packages depend on
it. (Why are we building unused packages?)
---
 pkgs/development/libraries/signon/default.nix | 18 ------------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 20 deletions(-)
 delete mode 100644 pkgs/development/libraries/signon/default.nix

diff --git a/pkgs/development/libraries/signon/default.nix b/pkgs/development/libraries/signon/default.nix
deleted file mode 100644
index f2f7de5b7125..000000000000
--- a/pkgs/development/libraries/signon/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ stdenv, fetchurl, doxygen, qtbase, qmakeHook }:
-
-stdenv.mkDerivation rec {
-  name = "signon-${version}";
-  version = "8.57";
-  src = fetchurl {
-    url = "https://gitlab.com/accounts-sso/signond/repository/archive.tar.gz?ref=${version}";
-    sha256 = "1vqkxhmdjk3217k38l2s3wld8x7f4jrbbh6xbr036cn1r23ncni5";
-  };
-
-  buildInputs = [ qtbase ];
-  nativeBuildInputs = [ doxygen qmakeHook ];
-
-  preConfigure = ''
-    qmakeFlags="$qmakeFlags LIBDIR=$out/lib CMAKE_CONFIG_PATH=$out/lib/cmake/SignOnQt5"
-  '';
-
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 55ceac33569f..530ab2f65901 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8743,8 +8743,6 @@ in
 
     qwt = callPackage ../development/libraries/qwt/6.nix { };
 
-    signon = callPackage ../development/libraries/signon { };
-
     telepathy = callPackage ../development/libraries/telepathy/qt { };
 
     vlc = lowPrio (callPackage ../applications/video/vlc {

From 7b22cb0ed27804f864820dcfebe1f6d715a6fe13 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 5 May 2016 16:55:31 -0500
Subject: [PATCH 245/287] qtcreator: build only once

It should not be necessary to build Qt Creator for each version of
Qt. The version of Qt used for development is independent of the version
Creator is compiled with.
---
 pkgs/top-level/aliases.nix      | 1 -
 pkgs/top-level/all-packages.nix | 8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index cfacd06b2fa2..fd8426aaef35 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -74,7 +74,6 @@ doNotDisplayTwice rec {
   pidginlatexSF = pidginlatex; # added 2014-11-02
   poppler_qt5 = qt5.poppler;  # added 2015-12-19
   qca-qt5 = qt5.qca-qt5;  # added 2015-12-19
-  qtcreator = qt5.qtcreator;  # added 2015-12-19
   quake3game = ioquake3; # added 2016-01-14
   quassel_kf5 = kde5.quassel; # added 2015-09-30
   quassel_qt5 = kde5.quassel_qt5; # added 2015-09-30
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 530ab2f65901..eb1931a04b0b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6284,6 +6284,10 @@ in
 
   premake = premake4;
 
+  qtcreator = qt5.callPackage ../development/qtcreator {
+    withDocumentation = true;
+  };
+
   racerRust = callPackage ../development/tools/rust/racer { };
 
   radare = callPackage ../development/tools/analysis/radare {
@@ -8733,10 +8737,6 @@ in
 
     qca-qt5 = callPackage ../development/libraries/qca-qt5 { };
 
-    qtcreator = callPackage ../development/qtcreator {
-      withDocumentation = true;
-    };
-
     quazip = callPackage ../development/libraries/quazip {
       qt = qtbase;
     };

From 0903faa3fb54f704b0a517329319daa7787022a1 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 8 May 2016 10:52:22 -0500
Subject: [PATCH 246/287] qt56.qmakeHook: fix static library relocation

---
 pkgs/development/libraries/qt-5/5.6/qmake-hook.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/qt-5/5.6/qmake-hook.sh b/pkgs/development/libraries/qt-5/5.6/qmake-hook.sh
index 425048a59357..62a8c8b71c3e 100644
--- a/pkgs/development/libraries/qt-5/5.6/qmake-hook.sh
+++ b/pkgs/development/libraries/qt-5/5.6/qmake-hook.sh
@@ -58,7 +58,7 @@ _qtMultioutModuleDevs() {
     if [ "z${!outputLib}" != "z${!outputDev}" ]; then
         pushd "${!outputLib}"
         if [ -d "lib" ]; then
-            find lib -name '*.a' -o -name '*.la' -o -name '*.prl' -print0 | \
+            find lib \( -name '*.a' -o -name '*.la' -o -name '*.prl' \) -print0 | \
                 while read -r -d $'\0' file; do
                     mkdir -p "${!outputDev}/$(dirname "$file")"
                     mv "${!outputLib}/$file" "${!outputDev}/$file"

From 62d07ae7d44f92a16f91cd8f669fdf047b45326d Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 8 May 2016 10:52:48 -0500
Subject: [PATCH 247/287] qt56.qttools: add qtdeclarative dependency

---
 pkgs/development/libraries/qt-5/5.6/qttools.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.6/qttools.nix b/pkgs/development/libraries/qt-5/5.6/qttools.nix
index 1472691c5254..deb00d1f8088 100644
--- a/pkgs/development/libraries/qt-5/5.6/qttools.nix
+++ b/pkgs/development/libraries/qt-5/5.6/qttools.nix
@@ -1,8 +1,8 @@
-{ qtSubmodule, qtbase }:
+{ qtSubmodule, qtbase, qtdeclarative }:
 
 qtSubmodule {
   name = "qttools";
-  qtInputs = [ qtbase ];
+  qtInputs = [ qtbase qtdeclarative ];
   postFixup = ''
     moveToOutput "bin/qdbus" "$out"
     moveToOutput "bin/qtpaths" "$out"

From b63899c42fbeb16e1f99866ec830aec8d615d61b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 8 May 2016 12:32:37 -0500
Subject: [PATCH 248/287] qt55.qmakeHook: fix static library relocation

---
 pkgs/development/libraries/qt-5/5.5/qmake-hook.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/qt-5/5.5/qmake-hook.sh b/pkgs/development/libraries/qt-5/5.5/qmake-hook.sh
index 425048a59357..2669a396280f 100644
--- a/pkgs/development/libraries/qt-5/5.5/qmake-hook.sh
+++ b/pkgs/development/libraries/qt-5/5.5/qmake-hook.sh
@@ -58,7 +58,7 @@ _qtMultioutModuleDevs() {
     if [ "z${!outputLib}" != "z${!outputDev}" ]; then
         pushd "${!outputLib}"
         if [ -d "lib" ]; then
-            find lib -name '*.a' -o -name '*.la' -o -name '*.prl' -print0 | \
+            find lib \( -name '*.a' -o -name '*.la' -o -name '*.prl' -print0 \) | \
                 while read -r -d $'\0' file; do
                     mkdir -p "${!outputDev}/$(dirname "$file")"
                     mv "${!outputLib}/$file" "${!outputDev}/$file"

From a5e1a0ae119a97dd6f2f405fce32cd1b682eee2d Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 8 May 2016 15:48:27 -0500
Subject: [PATCH 249/287] openbr: mark broken

---
 pkgs/development/libraries/openbr/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/openbr/default.nix b/pkgs/development/libraries/openbr/default.nix
index dd40311b8073..3f3218a550f8 100644
--- a/pkgs/development/libraries/openbr/default.nix
+++ b/pkgs/development/libraries/openbr/default.nix
@@ -28,5 +28,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.asl20;
     maintainers = with stdenv.lib.maintainers; [flosse];
     platforms = with stdenv.lib.platforms; linux;
+    broken = true;
   };
 }

From a2eaef20746e58d27de288b53ffb4e82e70b714c Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 8 May 2016 15:50:33 -0500
Subject: [PATCH 250/287] apitrace: pin at Qt 5.5

The package requires Qt Webkit, which has been removed in Qt 5.6.
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eb1931a04b0b..ee8fa8796b52 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -434,7 +434,7 @@ in
     withGui = false;
   };
 
-  apitrace = qt5.callPackage ../applications/graphics/apitrace {};
+  apitrace = qt55.callPackage ../applications/graphics/apitrace {};
 
   argyllcms = callPackage ../tools/graphics/argyllcms {};
 

From 2acf48f80360388bfafde782d4bd96487a62b6fd Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 8 May 2016 16:07:53 -0500
Subject: [PATCH 251/287] cool-retro-term: pin at Qt 5.5

The package requires Qt Quick, which is removed in Qt 5.6.
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ee8fa8796b52..5fa0acb2970b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1160,7 +1160,7 @@ in
 
   convmv = callPackage ../tools/misc/convmv { };
 
-  cool-retro-term = qt5.callPackage ../applications/misc/cool-retro-term { };
+  cool-retro-term = qt55.callPackage ../applications/misc/cool-retro-term { };
 
   coreutils = callPackage ../tools/misc/coreutils {
     aclSupport = stdenv.isLinux;

From 6def68f54813e2091bfabc10a85c85bf1175032a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 8 May 2016 16:21:33 -0500
Subject: [PATCH 252/287] kst: mark broken

---
 pkgs/tools/graphics/kst/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/graphics/kst/default.nix b/pkgs/tools/graphics/kst/default.nix
index 9b983450f480..24d678e11422 100644
--- a/pkgs/tools/graphics/kst/default.nix
+++ b/pkgs/tools/graphics/kst/default.nix
@@ -27,5 +27,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2;
     platforms = platforms.all;
     maintainers = [ maintainers.vbgl ];
+    broken = true;
   };
 }

From 8bd32d51e2db3d08e0b8127b6f27f84d7381b8f2 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 8 May 2016 18:13:29 -0500
Subject: [PATCH 253/287] sigil: pin at Qt 5.5

The package requires Qt Webkit, which was removed from Qt 5.6.
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5fa0acb2970b..a99671ceb53f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3248,7 +3248,7 @@ in
 
   siege = callPackage ../tools/networking/siege {};
 
-  sigil = qt5.callPackage ../applications/editors/sigil { };
+  sigil = qt55.callPackage ../applications/editors/sigil { };
 
   # aka., gpg-tools
   signing-party = callPackage ../tools/security/signing-party { };

From 184597433fe6506daf3369405f69039ff2ecd39d Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 8 May 2016 21:42:56 -0500
Subject: [PATCH 254/287] libcommuni: add to qtLibsFun

---
 pkgs/top-level/all-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a99671ceb53f..32563326ee50 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7512,8 +7512,6 @@ in
 
   libcm = callPackage ../development/libraries/libcm { };
 
-  libcommuni = qt5.callPackage ../development/libraries/libcommuni { };
-
   libconfuse = callPackage ../development/libraries/libconfuse { };
 
   inherit (gnome3) libcroco;
@@ -8719,6 +8717,8 @@ in
 
     grantlee = callPackage ../development/libraries/grantlee/5.x.nix { };
 
+    libcommuni = callPackage ../development/libraries/libcommuni { };
+
     libdbusmenu = callPackage ../development/libraries/libdbusmenu-qt/qt-5.5.nix { };
 
     libkeyfinder = callPackage ../development/libraries/libkeyfinder { };

From 61689edcd593016a3678a5a71fca57e674ea769b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 8 May 2016 21:44:22 -0500
Subject: [PATCH 255/287] zeal: pin at Qt 5.5

The package requires Qt Webkit, which is removed from Qt 5.6.
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 32563326ee50..9f0ecd708753 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11664,7 +11664,7 @@ in
 
   xlsx2csv = pythonPackages.xlsx2csv;
 
-  zeal = qt5.callPackage ../data/documentation/zeal { };
+  zeal = qt55.callPackage ../data/documentation/zeal { };
 
 
   ### APPLICATIONS

From 3a62eab2c98d5bd96dbcc15845df04d4edd27534 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 8 May 2016 22:27:02 -0500
Subject: [PATCH 256/287] antimony: mark broken

---
 pkgs/applications/graphics/antimony/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/graphics/antimony/default.nix b/pkgs/applications/graphics/antimony/default.nix
index 50b33096e3d2..e797f95970a7 100644
--- a/pkgs/applications/graphics/antimony/default.nix
+++ b/pkgs/applications/graphics/antimony/default.nix
@@ -48,5 +48,6 @@ in
       homepage    = "https://github.com/mkeeter/antimony";
       license     = licenses.mit;
       platforms   = platforms.linux;
+      broken = true;
     };
   }

From e60eb2887395e300100a7a9f1aad5da16976709b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 9 May 2016 05:58:17 -0500
Subject: [PATCH 257/287] firestr: mark broken

---
 pkgs/applications/networking/p2p/firestr/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/p2p/firestr/default.nix b/pkgs/applications/networking/p2p/firestr/default.nix
index e216ede9a392..56eb9c354275 100644
--- a/pkgs/applications/networking/p2p/firestr/default.nix
+++ b/pkgs/applications/networking/p2p/firestr/default.nix
@@ -31,5 +31,6 @@ stdenv.mkDerivation {
     license = licenses.gpl3;
     maintainers = [ maintainers.ehmry ];
     platforms = platforms.linux;
+    broken = true;
   };
 }

From 747a3b7cdb484e79b97b02c1ccfb6a5dee647518 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 9 May 2016 06:12:49 -0500
Subject: [PATCH 258/287] keyfinder: unpin from Qt 5.5

---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9f0ecd708753..6445244e4f37 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13029,7 +13029,7 @@ in
 
   kermit = callPackage ../tools/misc/kermit { };
 
-  keyfinder = qt55.callPackage ../applications/audio/keyfinder { };
+  keyfinder = qt5.callPackage ../applications/audio/keyfinder { };
 
   keyfinder-cli = qt5.callPackage ../applications/audio/keyfinder-cli { };
 

From 705705448c4a3317b5fd52b1112750407ef2b98f Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 9 May 2016 06:13:15 -0500
Subject: [PATCH 259/287] luminanceHDR: pin at Qt 5.5

The package depends on Qt Webkit, which was removed from Qt 5.6.
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6445244e4f37..53f4fb0b3c6b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13187,7 +13187,7 @@ in
       webkit = webkitgtk2;
   };
 
-  luminanceHDR = qt5.callPackage ../applications/graphics/luminance-hdr { };
+  luminanceHDR = qt55.callPackage ../applications/graphics/luminance-hdr { };
 
   lxdvdrip = callPackage ../applications/video/lxdvdrip { };
 

From cd305c6a8164e2ecd2fd2b8dffe74dcb0188146b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 9 May 2016 06:13:50 -0500
Subject: [PATCH 260/287] musescore: pin at Qt 5.5

The package depends on Qt Webkit, which was removed from Qt 5.6.
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 53f4fb0b3c6b..d0a696c791b0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13402,7 +13402,7 @@ in
       else null;
   };
 
-  musescore = qt5.callPackage ../applications/audio/musescore { };
+  musescore = qt55.callPackage ../applications/audio/musescore { };
 
   mutt = callPackage ../applications/networking/mailreaders/mutt { };
   mutt-with-sidebar = callPackage ../applications/networking/mailreaders/mutt {

From ce024c988b51831d8b0e368ad2cc5497e88caf0e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 9 May 2016 06:21:21 -0500
Subject: [PATCH 261/287] smtube: pin at Qt 5.5

The package depends on Qt Webkit, which was removed from Qt 5.6.
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d0a696c791b0..ac0d56e14dc8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13444,7 +13444,7 @@ in
 
   smplayer = qt5.callPackage ../applications/video/smplayer { };
 
-  smtube = qt5.callPackage ../applications/video/smtube {};
+  smtube = qt55.callPackage ../applications/video/smtube {};
 
   sup = callPackage ../applications/networking/mailreaders/sup {
     ruby = ruby_2_3.override { cursesSupport = true; };

From da902fd13122a5ece547f15d134b270187860ec1 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 9 May 2016 09:16:59 -0500
Subject: [PATCH 262/287] rapcad: pin at Qt 5.5

The package fails to build with Qt 5.6.
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ac0d56e14dc8..fb54b737b4a7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13793,7 +13793,7 @@ in
     demo = false;
   };
 
-  rapcad = qt5.callPackage ../applications/graphics/rapcad { boost = boost159; };
+  rapcad = qt55.callPackage ../applications/graphics/rapcad { boost = boost159; };
 
   rapidsvn = callPackage ../applications/version-management/rapidsvn { };
 

From a583fe221af9023a819e4ab72140c66923d86609 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 9 May 2016 09:17:28 -0500
Subject: [PATCH 263/287] ricochet: pin at Qt 5.5

The package depends on Qt Quick, which was removed from Qt 5.6.
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fb54b737b4a7..e6aa4f1adc6f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13821,7 +13821,7 @@ in
 
   RhythmDelay = callPackage ../applications/audio/RhythmDelay { };
 
-  ricochet = qt5.callPackage ../applications/networking/instant-messengers/ricochet { };
+  ricochet = qt55.callPackage ../applications/networking/instant-messengers/ricochet { };
 
   rkt = callPackage ../applications/virtualization/rkt { };
 

From 5b73e2b8c8ef065b519c0e5c2cdfd448dfa41830 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 9 May 2016 09:19:05 -0500
Subject: [PATCH 264/287] sonic-visualiser: mark broken

---
 pkgs/applications/audio/sonic-visualiser/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix
index 31a95c51fc50..d48f1eb851b7 100644
--- a/pkgs/applications/audio/sonic-visualiser/default.nix
+++ b/pkgs/applications/audio/sonic-visualiser/default.nix
@@ -53,5 +53,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2Plus;
     maintainers = [ maintainers.goibhniu maintainers.marcweber ];
     platforms = platforms.linux;
+    broken = true;
   };
 }

From 19ea08af79638885512d6745b04a5041b586ae8d Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 9 May 2016 09:39:54 -0500
Subject: [PATCH 265/287] chessx: mark broken

---
 pkgs/games/chessx/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/games/chessx/default.nix b/pkgs/games/chessx/default.nix
index 63a1adb7155a..345840af2493 100644
--- a/pkgs/games/chessx/default.nix
+++ b/pkgs/games/chessx/default.nix
@@ -30,5 +30,6 @@ stdenv.mkDerivation rec {
     description = "ChessX allows you to browse and analyse chess games";
     license = licenses.gpl2;
     maintainers = [maintainers.luispedro];
+    broken = true;
   };
 }

From 8ffaef8a691a6c35496cd77f975fd22bd9c56f23 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 9 May 2016 09:50:01 -0500
Subject: [PATCH 266/287] mudlet: mark broken

---
 pkgs/games/mudlet/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/games/mudlet/default.nix b/pkgs/games/mudlet/default.nix
index d684cc22c38f..99c06e56043e 100644
--- a/pkgs/games/mudlet/default.nix
+++ b/pkgs/games/mudlet/default.nix
@@ -40,5 +40,6 @@ stdenv.mkDerivation rec {
     maintainers = [ stdenv.lib.maintainers.wyvie ];
     platforms = stdenv.lib.platforms.linux;
     license = stdenv.lib.licenses.gpl2;
+    broken = true;
   };
 }

From d66f33c86f3142b5b1190d8500294a96f71efb38 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 9 May 2016 09:50:46 -0500
Subject: [PATCH 267/287] redis-desktop-manager: pin at Qt 5.5

The package depends on Qt Quick, which was removed from Qt 5.6.
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e6aa4f1adc6f..c358eab69db1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16455,7 +16455,7 @@ in
     inherit (pythonPackages) pexpect paramiko;
   };
 
-  redis-desktop-manager = qt5.callPackage ../applications/misc/redis-desktop-manager { };
+  redis-desktop-manager = qt55.callPackage ../applications/misc/redis-desktop-manager { };
 
   robomongo = qt5.callPackage ../applications/misc/robomongo { };
 

From 358c6c9dd5fb997329e52642ec0501dbae848cf1 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 9 May 2016 09:51:33 -0500
Subject: [PATCH 268/287] golden-cheetah: pin at Qt 5.5

The package depends on Qt Webkit, which was removed from Qt 5.6.
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c358eab69db1..68e440e74c42 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16794,7 +16794,7 @@ in
 
   discord = callPackage ../applications/networking/instant-messengers/discord { };
 
-  golden-cheetah = qt5.callPackage ../applications/misc/golden-cheetah {};
+  golden-cheetah = qt55.callPackage ../applications/misc/golden-cheetah {};
 
   tomb = callPackage ../os-specific/linux/tomb {};
 

From 198e8d656131c37113e0d4a246001f4cb346619d Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 9 May 2016 09:58:22 -0500
Subject: [PATCH 269/287] gstreamer: add ttuegel to maintainers

---
 pkgs/development/libraries/gstreamer/core/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix
index bbd4bcde785b..531e22d755dd 100644
--- a/pkgs/development/libraries/gstreamer/core/default.nix
+++ b/pkgs/development/libraries/gstreamer/core/default.nix
@@ -10,6 +10,7 @@ stdenv.mkDerivation rec {
     homepage = "http://gstreamer.freedesktop.org";
     license = stdenv.lib.licenses.lgpl2Plus;
     platforms = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.ttuegel ];
   };
 
   src = fetchurl {

From ed2fc081e08b3e62a70a34167169fe78f3ab0253 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 9 May 2016 10:06:19 -0500
Subject: [PATCH 270/287] signon: remove obsolete alias

---
 pkgs/top-level/aliases.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index fd8426aaef35..209b5663ad5c 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -91,7 +91,6 @@ doNotDisplayTwice rec {
   saneBackendsGit = sane-backends-git; # added 2016-01-02
   saneFrontends = sane-frontends; # added 2016-01-02
   scim = sc-im; # added 2016-01-22
-  signon = qt5.signon;  # added 2015-12-19
   speedtest_cli = speedtest-cli;  # added 2015-02-17
   sqliteInteractive = sqlite-interactive;  # added 2014-12-06
   system_config_printer = system-config-printer;  # added 2016-01-03

From 20292cb12c854b725752b8fa679a089148869e4d Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <me@tobias.gr>
Date: Tue, 10 May 2016 04:17:40 +0200
Subject: [PATCH 271/287] alsaLib: 1.1.0 -> 1.1.1

---
 pkgs/os-specific/linux/alsa-lib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/alsa-lib/default.nix b/pkgs/os-specific/linux/alsa-lib/default.nix
index d2637f99119c..985d04299dbd 100644
--- a/pkgs/os-specific/linux/alsa-lib/default.nix
+++ b/pkgs/os-specific/linux/alsa-lib/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "alsa-lib-1.1.0";
+  name = "alsa-lib-1.1.1";
 
   src = fetchurl {
     urls = [
      "ftp://ftp.alsa-project.org/pub/lib/${name}.tar.bz2"
      "http://alsa.cybermirror.org/lib/${name}.tar.bz2"
     ];
-    sha256 = "dfde65d11e82b68f82e562ab6228c1fb7c78854345d3c57e2c68a9dd3dae1f15";
+    sha256 = "0sa24fy3qf3jg63xxvfb7j8halj1qmdbcak2lyfx8bpd8hqnriwa";
   };
 
   patches = [

From 292fb98d96a27e916f1aab6405913e8f1d7eeba3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 10 May 2016 18:06:01 +0200
Subject: [PATCH 272/287] imagemagick: fix evaluation on mingw

I made a mistake during conflict resolution in 7a005601d.
---
 pkgs/applications/graphics/ImageMagick/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index 8094252c660d..9b17fbde7f5f 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -19,12 +19,12 @@ let
     // lib.optionalAttrs (stdenv.cross.libc or null == "msvcrt") {
         version = "6.9.2-0";
         sha256 = "17ir8bw1j7g7srqmsz3rx780sgnc21zfn0kwyj78iazrywldx8h7";
-        patches = (fetchpatch {
+        patches = [(fetchpatch {
           name = "mingw-build.patch";
           url = "https://raw.githubusercontent.com/Alexpux/MINGW-packages/"
             + "01ca03b2a4ef/mingw-w64-imagemagick/002-build-fixes.patch";
           sha256 = "1pypszlcx2sf7wfi4p37w1y58ck2r8cd5b2wrrwr9rh87p7fy1c0";
-        });
+        })];
       };
 in
 

From 4ffb000f19c84af642584fee1b57ee708fb537d3 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 10 May 2016 20:00:09 -0500
Subject: [PATCH 273/287] kde5: unpin from Qt 5.5

---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 68e440e74c42..949b96aa00a1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15713,7 +15713,7 @@ in
         // applications self
         // kde5PackagesFun self;
     in
-      recurseIntoAttrs (lib.makeScope qt55.newScope merged);
+      recurseIntoAttrs (lib.makeScope qt5.newScope merged);
 
   theme-vertex = callPackage ../misc/themes/vertex { };
 

From f64eaa7b14521adcbe5127de246ce0ca59f0aa4b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 10 May 2016 20:07:55 -0500
Subject: [PATCH 274/287] quassel: remove qtwebkit input

---
 pkgs/applications/networking/irc/quassel/qt-5.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/irc/quassel/qt-5.nix b/pkgs/applications/networking/irc/quassel/qt-5.nix
index c80624ac0510..4ef1a9c45824 100644
--- a/pkgs/applications/networking/irc/quassel/qt-5.nix
+++ b/pkgs/applications/networking/irc/quassel/qt-5.nix
@@ -1,12 +1,11 @@
 { monolithic ? true # build monolithic Quassel
 , daemon ? false # build Quassel daemon
 , client ? false # build Quassel client
-, previews ? false # enable webpage previews on hovering over URLs
 , tag ? "" # tag added to the package name
 , static ? false # link statically
 
 , stdenv, fetchurl, cmake, makeWrapper, dconf
-, qtbase, qtscript, qtwebkit
+, qtbase, qtscript
 , phonon, libdbusmenu, qca-qt5
 
 , withKDE ? stdenv.isLinux # enable KDE integration
@@ -46,7 +45,6 @@ in with stdenv; mkDerivation rec {
        [ cmake makeWrapper qtbase ]
     ++ lib.optionals buildCore [qtscript qca-qt5]
     ++ lib.optionals buildClient [libdbusmenu phonon]
-    ++ lib.optionals (buildClient && previews) [qtwebkit]
     ++ lib.optionals (buildClient && withKDE) [
       extra-cmake-modules kconfigwidgets kcoreaddons
       knotifications knotifyconfig ktextwidgets kwidgetsaddons
@@ -61,8 +59,7 @@ in with stdenv; mkDerivation rec {
     ++ edf monolithic "WANT_MONO"
     ++ edf daemon "WANT_CORE"
     ++ edf client "WANT_QTCLIENT"
-    ++ edf withKDE "WITH_KDE"
-    ++ edf previews "WITH_WEBKIT";
+    ++ edf withKDE "WITH_KDE";
 
   preFixup =
     lib.optionalString buildClient ''

From 7661144ae921c55255671eeb0f8172df66a4a730 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 10 May 2016 20:08:09 -0500
Subject: [PATCH 275/287] baloo: remove qtquick1 input

---
 pkgs/desktops/kde-5/frameworks-5.21/baloo.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/baloo.nix b/pkgs/desktops/kde-5/frameworks-5.21/baloo.nix
index a4fdf9bb6652..f676da0f4c84 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/baloo.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/baloo.nix
@@ -1,6 +1,6 @@
 { kdeFramework, lib, extra-cmake-modules, kauth, kconfig
 , kcoreaddons, kcrash, kdbusaddons, kfilemetadata, ki18n, kidletime
-, kio, lmdb, makeQtWrapper, qtbase, qtquick1, solid
+, kio, lmdb, makeQtWrapper, qtbase, solid
 }:
 
 kdeFramework {
@@ -8,7 +8,7 @@ kdeFramework {
   nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
   propagatedBuildInputs = [
     kauth kconfig kcoreaddons kcrash kdbusaddons kfilemetadata ki18n kio
-    kidletime lmdb qtbase qtquick1 solid
+    kidletime lmdb qtbase solid
   ];
   postInstall = ''
     wrapQtProgram "$out/bin/baloo_file"

From 62c2fcee746aaa075833809a79fd28df13db5f46 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 10 May 2016 20:08:25 -0500
Subject: [PATCH 276/287] kdesignerplugin: remove kdewebkit input

---
 pkgs/desktops/kde-5/frameworks-5.21/kdesignerplugin.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kdesignerplugin.nix b/pkgs/desktops/kde-5/frameworks-5.21/kdesignerplugin.nix
index d6e03e174729..a99587bbf045 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/kdesignerplugin.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/kdesignerplugin.nix
@@ -4,7 +4,6 @@
 , kconfig
 , kconfigwidgets
 , kcoreaddons
-, kdewebkit
 , kdoctools
 , kiconthemes
 , kio
@@ -21,7 +20,7 @@ kdeFramework {
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
   propagatedBuildInputs = [
-    kcompletion kconfig kconfigwidgets kcoreaddons kdewebkit kiconthemes kio
+    kcompletion kconfig kconfigwidgets kcoreaddons kiconthemes kio
     kitemviews kplotting ktextwidgets kwidgetsaddons kxmlgui sonnet
   ];
   postInstall = ''

From b98d8b0a52cc8347c2435bff7e6af94827f7798a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 10 May 2016 20:08:37 -0500
Subject: [PATCH 277/287] krunner: remove qtquick1 input

---
 pkgs/desktops/kde-5/frameworks-5.21/krunner.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/krunner.nix b/pkgs/desktops/kde-5/frameworks-5.21/krunner.nix
index f07a0c31c296..ec9ab7abe9f9 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/krunner.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/krunner.nix
@@ -1,5 +1,5 @@
 { kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons
-, ki18n, kio, kservice, plasma-framework, qtquick1, solid
+, ki18n, kio, kservice, plasma-framework, solid
 , threadweaver
 }:
 
@@ -8,7 +8,7 @@ kdeFramework {
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [
-    kconfig kcoreaddons ki18n kio kservice plasma-framework qtquick1 solid
+    kconfig kcoreaddons ki18n kio kservice plasma-framework solid
     threadweaver
   ];
 }

From 094b945b0ce85e12224cc1c4be8474524522fb03 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 10 May 2016 20:08:51 -0500
Subject: [PATCH 278/287] libksysguard: remove qtwebkit input

---
 pkgs/desktops/kde-5/plasma-5.6/libksysguard/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/desktops/kde-5/plasma-5.6/libksysguard/default.nix b/pkgs/desktops/kde-5/plasma-5.6/libksysguard/default.nix
index 679ba61e3e29..2a92d6e0af0b 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/libksysguard/default.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/libksysguard/default.nix
@@ -1,6 +1,6 @@
 { fetchpatch, plasmaPackage, extra-cmake-modules, kauth, kcompletion
 , kconfigwidgets, kcoreaddons, kservice, kwidgetsaddons
-, kwindowsystem, plasma-framework, qtscript, qtwebkit, qtx11extras
+, kwindowsystem, plasma-framework, qtscript, qtx11extras
 , kconfig, ki18n, kiconthemes
 }:
 
@@ -15,6 +15,5 @@ plasmaPackage {
   propagatedBuildInputs = [
     kauth kconfig ki18n kiconthemes kwindowsystem plasma-framework qtx11extras
     kcompletion kconfigwidgets kcoreaddons kservice kwidgetsaddons qtscript
-    qtwebkit
   ];
 }

From 6011898cb521136fcc87520a350b83ac8b1ad47b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 10 May 2016 20:09:02 -0500
Subject: [PATCH 279/287] plasma-desktop: remove qtquick1 input

---
 pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/default.nix b/pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/default.nix
index 3475f53e858e..58c2325f5c49 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/default.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/plasma-desktop/default.nix
@@ -7,7 +7,7 @@
 , qtsvg, libXcursor, libXft, libxkbfile, xf86inputevdev
 , xf86inputsynaptics, xinput, xkeyboard_config, xorgserver
 , libcanberra_kde, libpulseaudio, makeQtWrapper, utillinux
-, qtquick1, qtquickcontrols
+, qtquickcontrols
 }:
 
 plasmaPackage rec {
@@ -23,7 +23,7 @@ plasmaPackage rec {
     libpulseaudio libXft libxkbfile phonon qtsvg xf86inputevdev
     xf86inputsynaptics xkeyboard_config xinput baloo kactivities kauth
     kdeclarative kdelibs4support kemoticons kglobalaccel ki18n kpeople krunner
-    kwin plasma-framework plasma-workspace qtdeclarative qtquick1
+    kwin plasma-framework plasma-workspace qtdeclarative
     qtquickcontrols qtx11extras
   ];
   patches = [

From 05bbe4fa553c605a5ca1624c946a177b9d9a7f21 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 10 May 2016 20:09:15 -0500
Subject: [PATCH 280/287] phonon: remove qtquick1 input

---
 pkgs/development/libraries/phonon/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix
index 2356a0403804..3fbbccc08e30 100644
--- a/pkgs/development/libraries/phonon/default.nix
+++ b/pkgs/development/libraries/phonon/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchurl, cmake, mesa, pkgconfig, libpulseaudio
-, qt4 ? null, extra-cmake-modules ? null, qtbase ? null, qtquick1 ? null, qttools ? null
+, qt4 ? null, extra-cmake-modules ? null, qtbase ? null, qttools ? null
 , debug ? false }:
 
 with lib;
@@ -10,7 +10,6 @@ let
 in
 
 assert withQt5 -> qtbase != null;
-assert withQt5 -> qtquick1 != null;
 assert withQt5 -> qttools != null;
 
 stdenv.mkDerivation rec {
@@ -31,7 +30,7 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ mesa libpulseaudio ]
-    ++ (if withQt5 then [ qtbase qtquick1 qttools ] else [ qt4 ]);
+    ++ (if withQt5 then [ qtbase qttools ] else [ qt4 ]);
 
   nativeBuildInputs = [ cmake pkgconfig ] ++ optional withQt5 extra-cmake-modules;
 

From cc6a7d55674fd4c98192c3710cc6910fdd4ac874 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 10 May 2016 20:09:26 -0500
Subject: [PATCH 281/287] plasma-workspace: remove qtquick1 and qtwebkit inputs

---
 .../kde-5/plasma-5.6/plasma-workspace/default.nix         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/default.nix b/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/default.nix
index 73a842746426..f4da82bc86a3 100644
--- a/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/default.nix
+++ b/pkgs/desktops/kde-5/plasma-5.6/plasma-workspace/default.nix
@@ -1,10 +1,10 @@
 { plasmaPackage, lib, copyPathsToStore
 , extra-cmake-modules, kdoctools
 , baloo, kactivities, kcmutils, kconfig, kcrash, kdbusaddons, kdeclarative
-, kdelibs4support, kdesu, kdewebkit, kglobalaccel, kidletime, kjsembed, knewstuff
+, kdelibs4support, kdesu, kglobalaccel, kidletime, kjsembed, knewstuff
 , knotifyconfig, kpackage, krunner, ktexteditor, ktextwidgets, kwallet, kwayland
 , kwin, kxmlrpcclient, libdbusmenu, libkscreen, libksysguard, libSM, libXcursor
-, networkmanager-qt, pam, phonon, plasma-framework, qtquick1, qtquickcontrols
+, networkmanager-qt, pam, phonon, plasma-framework, qtquickcontrols
 , qtscript, qtx11extras, solid, wayland
 }:
 
@@ -17,10 +17,10 @@ plasmaPackage {
   ];
   propagatedBuildInputs = [
     baloo kactivities kcmutils kconfig kcrash kdbusaddons kdeclarative
-    kdelibs4support kdesu kdewebkit kglobalaccel kidletime kjsembed knewstuff
+    kdelibs4support kdesu kglobalaccel kidletime kjsembed knewstuff
     knotifyconfig kpackage krunner ktexteditor ktextwidgets kwallet kwayland
     kwin kxmlrpcclient libdbusmenu libkscreen libksysguard libSM libXcursor
-    networkmanager-qt pam phonon plasma-framework qtquick1 qtquickcontrols
+    networkmanager-qt pam phonon plasma-framework qtquickcontrols
     qtscript qtx11extras solid wayland
   ];
 

From dd34c61097898c5de2ee286fc5df24ee0d12c0d5 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 10 May 2016 20:09:55 -0500
Subject: [PATCH 282/287] kdewebkit: removed

---
 pkgs/desktops/kde-5/frameworks-5.21/default.nix   |  1 -
 pkgs/desktops/kde-5/frameworks-5.21/kdewebkit.nix | 12 ------------
 2 files changed, 13 deletions(-)
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.21/kdewebkit.nix

diff --git a/pkgs/desktops/kde-5/frameworks-5.21/default.nix b/pkgs/desktops/kde-5/frameworks-5.21/default.nix
index f7c43f73e9f9..8c60c4d8856a 100644
--- a/pkgs/desktops/kde-5/frameworks-5.21/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.21/default.nix
@@ -70,7 +70,6 @@ let
     kdelibs4support = callPackage ./kdelibs4support {};
     kdesignerplugin = callPackage ./kdesignerplugin.nix {};
     kdesu = callPackage ./kdesu.nix {};
-    kdewebkit = callPackage ./kdewebkit.nix {};
     kdnssd = callPackage ./kdnssd.nix {};
     kdoctools = callPackage ./kdoctools {};
     kemoticons = callPackage ./kemoticons.nix {};
diff --git a/pkgs/desktops/kde-5/frameworks-5.21/kdewebkit.nix b/pkgs/desktops/kde-5/frameworks-5.21/kdewebkit.nix
deleted file mode 100644
index 3c0e4ba3f562..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.21/kdewebkit.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons
-, ki18n, kio, kjobwidgets, kparts, kservice, kwallet, qtwebkit
-}:
-
-kdeFramework {
-  name = "kdewebkit";
-  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [
-    kconfig kcoreaddons ki18n kio kjobwidgets kparts kservice kwallet qtwebkit
-  ];
-}

From d22df66c54df371039f5d71382beddf559ec5f05 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 11 May 2016 10:19:28 -0500
Subject: [PATCH 283/287] qt56: remove fixQtModuleCMakeConfig

---
 .../libraries/qt-5/5.6/default.nix            |  3 +-
 .../qt-5/5.6/fix-qt-module-cmake-config.sh    |  5 ---
 .../libraries/qt-5/5.6/qmake-hook.sh          | 11 ++++-
 .../libraries/qt-5/5.6/qtbase/default.nix     | 40 +++++++------------
 .../libraries/qt-5/5.6/qtconnectivity.nix     |  4 --
 .../qt-5/5.6/qtdeclarative/default.nix        |  6 ---
 .../libraries/qt-5/5.6/qtenginio.nix          |  3 --
 .../libraries/qt-5/5.6/qtlocation.nix         |  4 --
 .../libraries/qt-5/5.6/qtmultimedia.nix       |  4 --
 .../libraries/qt-5/5.6/qtscript/default.nix   |  3 --
 .../libraries/qt-5/5.6/qtsensors.nix          |  3 --
 .../qt-5/5.6/qtserialport/default.nix         |  3 --
 pkgs/development/libraries/qt-5/5.6/qtsvg.nix |  3 --
 .../libraries/qt-5/5.6/qttools.nix            |  6 ---
 .../libraries/qt-5/5.6/qtwebsockets.nix       |  3 --
 .../libraries/qt-5/5.6/qtx11extras.nix        |  3 --
 .../libraries/qt-5/5.6/qtxmlpatterns.nix      |  3 --
 17 files changed, 25 insertions(+), 82 deletions(-)
 delete mode 100644 pkgs/development/libraries/qt-5/5.6/fix-qt-module-cmake-config.sh

diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix
index b74b2debf0e2..4aada4224dac 100644
--- a/pkgs/development/libraries/qt-5/5.6/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/default.nix
@@ -45,7 +45,7 @@ let
       propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or []);
       nativeBuildInputs =
         (args.nativeBuildInputs or [])
-        ++ [ pkgs.perl self.fixQtModuleCMakeConfig self.qmakeHook ];
+        ++ [ pkgs.perl self.qmakeHook ];
 
       NIX_QT_SUBMODULE = args.NIX_QT_SUBMODULE or true;
 
@@ -111,7 +111,6 @@ let
       ];
 
       makeQtWrapper = makeSetupHook { deps = [ makeWrapper ]; } ./make-qt-wrapper.sh;
-      fixQtModuleCMakeConfig = makeSetupHook { } ./fix-qt-module-cmake-config.sh;
       qmakeHook = makeSetupHook { substitutions = { qt_dev = qtbase.dev; lndir = pkgs.xorg.lndir; }; } ./qmake-hook.sh;
 
     };
diff --git a/pkgs/development/libraries/qt-5/5.6/fix-qt-module-cmake-config.sh b/pkgs/development/libraries/qt-5/5.6/fix-qt-module-cmake-config.sh
deleted file mode 100644
index 7ca3e33b613c..000000000000
--- a/pkgs/development/libraries/qt-5/5.6/fix-qt-module-cmake-config.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-fixQtModuleCMakeConfig() {
-    local module="$1"
-    sed -e "/set(imported_location/ s@\\\${_qt5${module}_install_prefix}@${!outputLib}@" \
-        -i "${!outputDev}/lib/cmake/Qt5${module}/Qt5${module}Config.cmake"
-}
diff --git a/pkgs/development/libraries/qt-5/5.6/qmake-hook.sh b/pkgs/development/libraries/qt-5/5.6/qmake-hook.sh
index 62a8c8b71c3e..cf3803a1b9ce 100644
--- a/pkgs/development/libraries/qt-5/5.6/qmake-hook.sh
+++ b/pkgs/development/libraries/qt-5/5.6/qmake-hook.sh
@@ -44,7 +44,7 @@ _qtSetQmakePath() {
     export PATH="$qtOut/bin${PATH:+:}$PATH"
 }
 
-_qtMultioutModuleDevs() {
+_qtModuleMultioutDevsPre() {
     # We cannot simply set these paths in configureFlags because libQtCore retains
     # references to the paths it was built with.
     moveToOutput "bin" "${!outputDev}"
@@ -53,7 +53,9 @@ _qtMultioutModuleDevs() {
     # The destination directory must exist or moveToOutput will do nothing
     mkdir -p "${!outputDev}/share"
     moveToOutput "share/doc" "${!outputDev}"
+}
 
+_qtModuleMultioutDevsPost() {
     # Move libtool archives and qmake project files to $dev/lib
     if [ "z${!outputLib}" != "z${!outputDev}" ]; then
         pushd "${!outputLib}"
@@ -63,6 +65,10 @@ _qtMultioutModuleDevs() {
                     mkdir -p "${!outputDev}/$(dirname "$file")"
                     mv "${!outputLib}/$file" "${!outputDev}/$file"
                 done
+
+            # Ensure that CMake can find the shared libraries
+            mkdir -p "${!outputDev}/lib"
+            @lndir@/bin/lndir -silent "${!outputLib}/lib" "${!outputDev}/lib"
         fi
         popd
     fi
@@ -108,7 +114,8 @@ fi
 
 if [ -n "$NIX_QT_SUBMODULE" ]; then
     postInstallHooks+=(_qtRmQmake _qtRmModules)
-    preFixupHooks+=(_qtMultioutModuleDevs)
+    preFixupHooks+=(_qtModuleMultioutDevsPre)
+    postFixupHooks+=(_qtModuleMultioutDevsPost)
 fi
 
 fi
diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
index ce1ea89bb828..6ab5a48951f8 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchgit, copyPathsToStore, fixQtModuleCMakeConfig
+{ stdenv, lib, fetchgit, copyPathsToStore
 , srcs
 
 , xlibs, libX11, libxcb, libXcursor, libXext, libXrender, libXi
@@ -206,7 +206,7 @@ stdenv.mkDerivation {
     ++ lib.optional (postgresql != null) postgresql
     ++ lib.optionals gtkStyle [gnome_vfs.out libgnomeui.out gtk GConf];
 
-  nativeBuildInputs = [ fixQtModuleCMakeConfig lndir patchelf perl pkgconfig python ];
+  nativeBuildInputs = [ lndir patchelf perl pkgconfig python ];
 
   # freetype-2.5.4 changed signedness of some struct fields
   NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare";
@@ -222,17 +222,6 @@ stdenv.mkDerivation {
     mkdir -p "$dev/share"
     moveToOutput "share/doc" "$dev"
 
-    # Move libtool archives and qmake projects
-    if [ "z''${!outputLib}" != "z''${!outputDev}" ]; then
-        pushd "''${!outputLib}"
-        find lib -name '*.a' -o -name '*.la' -o -name '*.prl' | \
-            while read -r file; do
-                mkdir -p "''${!outputDev}/$(dirname "$file")"
-                mv "''${!outputLib}/$file" "''${!outputDev}/$file"
-            done
-        popd
-    fi
-
     # Move the QGtkStyle plugin to the gtk output
     mkdir -p "$gtk/lib/qt5/plugins/platformthemes"
     mv "$out/lib/qt5/plugins/platformthemes/libqgtk2.so" "$gtk/lib/qt5/plugins/platformthemes"
@@ -255,18 +244,19 @@ stdenv.mkDerivation {
       # Don't retain build-time dependencies like gdb and ruby.
       sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $dev/mkspecs/qconfig.pri
 
-      fixQtModuleCMakeConfig "Concurrent"
-      fixQtModuleCMakeConfig "Core"
-      fixQtModuleCMakeConfig "DBus"
-      fixQtModuleCMakeConfig "Gui"
-      fixQtModuleCMakeConfig "Network"
-      fixQtModuleCMakeConfig "OpenGL"
-      fixQtModuleCMakeConfig "OpenGLExtensions"
-      fixQtModuleCMakeConfig "PrintSupport"
-      fixQtModuleCMakeConfig "Sql"
-      fixQtModuleCMakeConfig "Test"
-      fixQtModuleCMakeConfig "Widgets"
-      fixQtModuleCMakeConfig "Xml"
+      # Move libtool archives and qmake projects
+      if [ "z''${!outputLib}" != "z''${!outputDev}" ]; then
+          pushd "''${!outputLib}"
+          find lib -name '*.a' -o -name '*.la' -o -name '*.prl' | \
+              while read -r file; do
+                  mkdir -p "''${!outputDev}/$(dirname "$file")"
+                  mv "''${!outputLib}/$file" "''${!outputDev}/$file"
+              done
+          popd
+
+          # Ensure that CMake can find the shared libraries
+          lndir -silent "''${!outputLib}/lib" "''${!outputDev}/lib"
+      fi
     '';
 
   setupHook = ./setup-hook.sh;
diff --git a/pkgs/development/libraries/qt-5/5.6/qtconnectivity.nix b/pkgs/development/libraries/qt-5/5.6/qtconnectivity.nix
index 35538c7261f1..95cd6fea79b4 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtconnectivity.nix
+++ b/pkgs/development/libraries/qt-5/5.6/qtconnectivity.nix
@@ -3,8 +3,4 @@
 qtSubmodule {
   name = "qtconnectivity";
   qtInputs = [ qtbase qtdeclarative ];
-  postFixup = ''
-    fixQtModuleCMakeConfig "Bluetooth"
-    fixQtModuleCMakeConfig "Nfc"
-  '';
 }
diff --git a/pkgs/development/libraries/qt-5/5.6/qtdeclarative/default.nix b/pkgs/development/libraries/qt-5/5.6/qtdeclarative/default.nix
index 407513f78498..328d8aee72bd 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtdeclarative/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/qtdeclarative/default.nix
@@ -5,10 +5,4 @@ qtSubmodule {
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   qtInputs = [ qtbase qtsvg qtxmlpatterns ];
   nativeBuildInputs = [ python ];
-  postFixup = ''
-    fixQtModuleCMakeConfig "Qml"
-    fixQtModuleCMakeConfig "Quick"
-    fixQtModuleCMakeConfig "QuickTest"
-    fixQtModuleCMakeConfig "QuickWidgets"
-  '';
 }
diff --git a/pkgs/development/libraries/qt-5/5.6/qtenginio.nix b/pkgs/development/libraries/qt-5/5.6/qtenginio.nix
index 503a0f7ce4f5..b860a73ef890 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtenginio.nix
+++ b/pkgs/development/libraries/qt-5/5.6/qtenginio.nix
@@ -3,7 +3,4 @@
 qtSubmodule {
   name = "qtenginio";
   qtInputs = [ qtdeclarative ];
-  postFixup = ''
-    fixQtModuleCMakeConfig "Enginio"
-  '';
 }
diff --git a/pkgs/development/libraries/qt-5/5.6/qtlocation.nix b/pkgs/development/libraries/qt-5/5.6/qtlocation.nix
index 0e2ad8bafb30..1e134057c4b4 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtlocation.nix
+++ b/pkgs/development/libraries/qt-5/5.6/qtlocation.nix
@@ -3,8 +3,4 @@
 qtSubmodule {
   name = "qtlocation";
   qtInputs = [ qtbase qtmultimedia ];
-  postFixup = ''
-    fixQtModuleCMakeConfig "Location"
-    fixQtModuleCMakeConfig "Positioning"
-  '';
 }
diff --git a/pkgs/development/libraries/qt-5/5.6/qtmultimedia.nix b/pkgs/development/libraries/qt-5/5.6/qtmultimedia.nix
index 9eb68ba6b5ba..7c1cc5da07e3 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtmultimedia.nix
+++ b/pkgs/development/libraries/qt-5/5.6/qtmultimedia.nix
@@ -9,8 +9,4 @@ qtSubmodule {
     pkgconfig alsaLib gstreamer gst-plugins-base libpulseaudio
   ];
   qmakeFlags = [ "GST_VERSION=1.0" ];
-  postFixup = ''
-    fixQtModuleCMakeConfig "Multimedia"
-    fixQtModuleCMakeConfig "MultimediaWidgets"
-  '';
 }
diff --git a/pkgs/development/libraries/qt-5/5.6/qtscript/default.nix b/pkgs/development/libraries/qt-5/5.6/qtscript/default.nix
index b81a43aeadb0..127766e2ebd6 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtscript/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/qtscript/default.nix
@@ -4,7 +4,4 @@ qtSubmodule {
   name = "qtscript";
   qtInputs = [ qtbase qttools ];
   patches = [ ./0001-glib-2.32.patch ];
-  postFixup = ''
-    fixQtModuleCMakeConfig "Script"
-  '';
 }
diff --git a/pkgs/development/libraries/qt-5/5.6/qtsensors.nix b/pkgs/development/libraries/qt-5/5.6/qtsensors.nix
index 5776f45a7068..61e64dc47e4d 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtsensors.nix
+++ b/pkgs/development/libraries/qt-5/5.6/qtsensors.nix
@@ -3,7 +3,4 @@
 qtSubmodule {
   name = "qtsensors";
   qtInputs = [ qtbase qtdeclarative ];
-  postFixup = ''
-    fixQtModuleCMakeConfig "Sensors"
-  '';
 }
diff --git a/pkgs/development/libraries/qt-5/5.6/qtserialport/default.nix b/pkgs/development/libraries/qt-5/5.6/qtserialport/default.nix
index 3f409f9c0e08..32549c95344a 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtserialport/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/qtserialport/default.nix
@@ -9,7 +9,4 @@ qtSubmodule {
       libudev = libudev.out;
     })
   ];
-  postFixup = ''
-    fixQtModuleCMakeConfig "SerialPort"
-  '';
 }
diff --git a/pkgs/development/libraries/qt-5/5.6/qtsvg.nix b/pkgs/development/libraries/qt-5/5.6/qtsvg.nix
index a460d6da4c2a..b9ccac7cf933 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtsvg.nix
+++ b/pkgs/development/libraries/qt-5/5.6/qtsvg.nix
@@ -3,7 +3,4 @@
 qtSubmodule {
   name = "qtsvg";
   qtInputs = [ qtbase ];
-  postFixup = ''
-    fixQtModuleCMakeConfig "Svg"
-  '';
 }
diff --git a/pkgs/development/libraries/qt-5/5.6/qttools.nix b/pkgs/development/libraries/qt-5/5.6/qttools.nix
index deb00d1f8088..4aeaea729a25 100644
--- a/pkgs/development/libraries/qt-5/5.6/qttools.nix
+++ b/pkgs/development/libraries/qt-5/5.6/qttools.nix
@@ -6,11 +6,5 @@ qtSubmodule {
   postFixup = ''
     moveToOutput "bin/qdbus" "$out"
     moveToOutput "bin/qtpaths" "$out"
-
-    fixQtModuleCMakeConfig "Designer"
-    fixQtModuleCMakeConfig "Help"
-    fixQtModuleCMakeConfig "LinguistTools"
-    fixQtModuleCMakeConfig "UiPlugin"
-    fixQtModuleCMakeConfig "UiTools"
   '';
 }
diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebsockets.nix b/pkgs/development/libraries/qt-5/5.6/qtwebsockets.nix
index c0d0f9e7d714..fbdfbbcf0dbe 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtwebsockets.nix
+++ b/pkgs/development/libraries/qt-5/5.6/qtwebsockets.nix
@@ -3,7 +3,4 @@
 qtSubmodule {
   name = "qtwebsockets";
   qtInputs = [ qtbase qtdeclarative ];
-  postFixup = ''
-    fixQtModuleCMakeConfig "WebSockets"
-  '';
 }
diff --git a/pkgs/development/libraries/qt-5/5.6/qtx11extras.nix b/pkgs/development/libraries/qt-5/5.6/qtx11extras.nix
index db92f1353627..a765161e2d7e 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtx11extras.nix
+++ b/pkgs/development/libraries/qt-5/5.6/qtx11extras.nix
@@ -3,7 +3,4 @@
 qtSubmodule {
   name = "qtx11extras";
   qtInputs = [ qtbase ];
-  postFixup = ''
-    fixQtModuleCMakeConfig "X11Extras"
-  '';
 }
diff --git a/pkgs/development/libraries/qt-5/5.6/qtxmlpatterns.nix b/pkgs/development/libraries/qt-5/5.6/qtxmlpatterns.nix
index 3b22132e4c38..9a8ddbba2bd2 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtxmlpatterns.nix
+++ b/pkgs/development/libraries/qt-5/5.6/qtxmlpatterns.nix
@@ -3,7 +3,4 @@
 qtSubmodule {
   name = "qtxmlpatterns";
   qtInputs = [ qtbase ];
-  postFixup = ''
-    fixQtModuleCMakeConfig "XmlPatterns"
-  '';
 }

From b4e28007daed114eb673533a16e2baf883bff79e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 11 May 2016 13:14:55 -0500
Subject: [PATCH 284/287] calamares: remove qtquick1 input

Qt Quick was removed from Qt 5.6.
---
 pkgs/tools/misc/calamares/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/calamares/default.nix b/pkgs/tools/misc/calamares/default.nix
index f9f9f06eb518..596030216f60 100644
--- a/pkgs/tools/misc/calamares/default.nix
+++ b/pkgs/tools/misc/calamares/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchgit, cmake, polkit-qt, libyamlcpp, python, boost, parted
 , extra-cmake-modules, kconfig, ki18n, kcoreaddons, solid, utillinux, libatasmart
-, ckbcomp, glibc, tzdata, xkeyboard_config, qtbase, qtquick1, qtsvg, qttools }:
+, ckbcomp, glibc, tzdata, xkeyboard_config, qtbase, qtsvg, qttools }:
 
 stdenv.mkDerivation rec {
   name = "calamares-${version}";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    cmake qtbase qtquick1 qtsvg qttools libyamlcpp python boost polkit-qt parted
+    cmake qtbase qtsvg qttools libyamlcpp python boost polkit-qt parted
     extra-cmake-modules kconfig ki18n kcoreaddons solid utillinux libatasmart
   ];
 

From 0883048ef4be625331ad0bb0629dc8863e7106a1 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 11 May 2016 13:19:21 -0500
Subject: [PATCH 285/287] kdeconnect: remove qtquick1 input

Qt Quick was removed from Qt 5.6.
---
 pkgs/applications/misc/kdeconnect/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/applications/misc/kdeconnect/default.nix b/pkgs/applications/misc/kdeconnect/default.nix
index ff9c451461d5..8fe3fe098bd6 100644
--- a/pkgs/applications/misc/kdeconnect/default.nix
+++ b/pkgs/applications/misc/kdeconnect/default.nix
@@ -3,7 +3,6 @@
 , fetchurl
 , extra-cmake-modules
 , makeQtWrapper
-, qtquick1
 , kcmutils
 , kconfigwidgets
 , kdbusaddons
@@ -29,7 +28,6 @@ stdenv.mkDerivation rec {
     kconfigwidgets
     kdbusaddons
     qca-qt5
-    qtquick1
     ki18n
     kiconthemes
     knotifications

From 6521529c23fe979cc29867a25ede3a355e5b410c Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 11 May 2016 13:20:57 -0500
Subject: [PATCH 286/287] quassel: fix SSL detection with Qt 5.6

---
 pkgs/applications/networking/irc/quassel/qt-5.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/networking/irc/quassel/qt-5.nix b/pkgs/applications/networking/irc/quassel/qt-5.nix
index 4ef1a9c45824..d631f4aa2146 100644
--- a/pkgs/applications/networking/irc/quassel/qt-5.nix
+++ b/pkgs/applications/networking/irc/quassel/qt-5.nix
@@ -41,6 +41,9 @@ in with stdenv; mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  # Prevent ``undefined reference to `qt_version_tag''' in SSL check
+  NIX_CFLAGS_COMPILE = [ "-DQT_NO_VERSION_TAGGING=1" ];
+
   buildInputs =
        [ cmake makeWrapper qtbase ]
     ++ lib.optionals buildCore [qtscript qca-qt5]

From 81df0354290389128077e00edfd2368eeeea0c24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 12 May 2016 03:48:05 +0200
Subject: [PATCH 287/287] stdenv setup.sh: revert most of changes around #14907

I'm giving this up. Feel free to find some reasonable variant that works
at least on Linux and Darwin. Problems encountered:
- During bootstrap of Darwin stdenv `env -0` and some bash features
  don't work.
- Without `env -0` the contents of some multi-line phases is taken as
  variable declarations, which wouldn't typically matter, but the PR
  wanted to refuse bash-invalid names which would be occasionally
  triggered. This commit dowgrades that to a warning with explanation.
---
 pkgs/stdenv/generic/setup.sh | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 10fc4873afa3..ce5feac3c66d 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -408,14 +408,16 @@ substitute() {
 
         if [ "$p" = --subst-var ]; then
             varName="${params[$((n + 1))]}"
+            n=$((n + 1))
             # check if the used nix attribute name is a valid bash name
             if ! [[ "$varName" =~ ^[a-zA-Z_][a-zA-Z0-9_]*$ ]]; then
-                echo "substitution variables must be valid bash names, \"$varName\" isn't."
-                exit 1;
+                echo "WARNING: substitution variables should be valid bash names,"
+                echo "  \"$varName\" isn't and therefore was skipped; it might be caused"
+                echo "  by multi-line phases in variables - see #14907 for details."
+                continue
             fi
             pattern="@$varName@"
             replacement="${!varName}"
-            n=$((n + 1))
         fi
 
         if [ "$p" = --subst-var-by ]; then
@@ -447,19 +449,14 @@ substituteAll() {
     local output="$2"
     local -a args=()
 
-    # We need to be careful due to vars with multi-line contents or weird names.
-    local IFS==
-    local varNames="$(env -0 | cut -z -d= -f1 | grep -z -v '^[_A-Z]' | tr '\000' '=')"
-    local varName
-    for varName in $varNames; do
+    # Select all environment variables that start with a lowercase character.
+    for varName in $(env | sed -e $'s/^\([a-z][^= \t]*\)=.*/\\1/; t \n d'); do
         if [ "$NIX_DEBUG" = "1" ]; then
             echo "@${varName}@ -> '${!varName}'"
         fi
         args+=("--subst-var" "$varName")
     done
 
-    # restore default $IFS for the child
-    IFS=$' \t\n'
     substitute "$input" "$output" "${args[@]}"
 }