From 8c6fada372dba386c25e209a4dff440e2da5a0be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 3 Jun 2017 11:24:18 +0200
Subject: [PATCH 001/189] nixpkgs manual: advise against overriding whole
 phases

I've seen that mistake at least a few times already, e.g.
https://github.com/NixOS/nixpkgs/pull/26209#issuecomment-305925562
It might perhaps seem counter-intuitive if one doesn't know nixpkgs well.
---
 doc/stdenv.xml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/doc/stdenv.xml b/doc/stdenv.xml
index a2530e102ca..6e7134e16a5 100644
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@@ -318,7 +318,13 @@ containing some shell commands to be executed, or by redefining the
 shell function
 <varname><replaceable>name</replaceable>Phase</varname>.  The former
 is convenient to override a phase from the derivation, while the
-latter is convenient from a build script.</para>
+latter is convenient from a build script.
+
+However, typically one only wants to <emphasis>add</emphasis> some
+commands to a phase, e.g. by defining <literal>postInstall</literal>
+or <literal>preFixup</literal>, as skipping some of the default actions
+may have unexpected consequences.
+</para>
 
 
 <section xml:id="ssec-controlling-phases"><title>Controlling

From 994ffc01a04e4793fcfe360117564df904d44049 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 15 Jun 2017 19:27:01 +0200
Subject: [PATCH 002/189] ssh module: disable agent by default

---
 nixos/doc/manual/release-notes/rl-1709.xml | 9 +++++++++
 nixos/modules/programs/ssh.nix             | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/nixos/doc/manual/release-notes/rl-1709.xml b/nixos/doc/manual/release-notes/rl-1709.xml
index b1bef8ef1c2..34cfe1702e9 100644
--- a/nixos/doc/manual/release-notes/rl-1709.xml
+++ b/nixos/doc/manual/release-notes/rl-1709.xml
@@ -104,6 +104,15 @@ rmdir /var/lib/ipfs/.ipfs
       <literal>dataDir</literal>.
     </para>
   </listitem>
+  <listitem>
+    <para>
+      The <literal>ssh-agent</literal> user service is not started by default
+      anymore. Use <literal>programs.ssh.startAgent</literal> to enable it if
+      needed. There is also a new <literal>programs.gnupg.agent</literal>
+      module that creates a <literal>gpg-agent</literal> user service. It can
+      also serve as a SSH agent if <literal>enableSSHSupport</literal> is set.
+    </para>
+  </listitem>
 </itemizedlist>
 
 
diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix
index 4faef2c609b..e0fbba897fa 100644
--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@@ -74,7 +74,7 @@ in
 
       startAgent = mkOption {
         type = types.bool;
-        default = true;
+        default = false;
         description = ''
           Whether to start the OpenSSH agent when you log in.  The OpenSSH agent
           remembers private keys for you so that you don't have to type in

From 53b6f15d34630f005c4faeb53a5842b691235504 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Fri, 16 Jun 2017 12:03:57 +0200
Subject: [PATCH 003/189] serd: 0.24.0 -> 0.26.0

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

diff --git a/pkgs/development/libraries/serd/default.nix b/pkgs/development/libraries/serd/default.nix
index d68503298fc..0023427f1ba 100644
--- a/pkgs/development/libraries/serd/default.nix
+++ b/pkgs/development/libraries/serd/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "serd-${version}";
-  version = "0.24.0";
+  version = "0.26.0";
 
   src = fetchurl {
     url = "http://download.drobilla.net/${name}.tar.bz2";
-    sha256 = "0v3a9xss5ailrnb3flfjyl6l9pmp51dc02p0lr6phvwsipg8mywc";
+    sha256 = "164j43am4hka2vbzw4n52zy7rafgp6kmkgbcbvap368az644mr73";
   };
 
   buildInputs = [ pcre pkgconfig python ];

From 6ee183b7f210a302d0f71e810dc4bf3a74d108e9 Mon Sep 17 00:00:00 2001
From: Jos van den Oever <jos@vandenoever.info>
Date: Fri, 16 Jun 2017 22:00:14 +0200
Subject: [PATCH 004/189] musescore: 2.0.3 -> 2.1.0

---
 pkgs/applications/audio/musescore/default.nix | 10 ++++------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix
index 463bd64495d..9d6f2fc9c8f 100644
--- a/pkgs/applications/audio/musescore/default.nix
+++ b/pkgs/applications/audio/musescore/default.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchzip, cmake, pkgconfig
 , alsaLib, freetype, libjack2, lame, libogg, libpulseaudio, libsndfile, libvorbis
-, portaudio, qtbase, qtdeclarative, qtenginio, qtscript, qtsvg, qttools
+, portaudio, qtbase, qtdeclarative, qtscript, qtsvg, qttools
 , qtwebkit, qtxmlpatterns
 }:
 
 stdenv.mkDerivation rec {
   name = "musescore-${version}";
-  version = "2.0.3";
+  version = "2.1.0";
 
   src = fetchzip {
     url = "https://github.com/musescore/MuseScore/archive/v${version}.tar.gz";
-    sha256 = "067f4li48qfhz2barj70zpf2d2mlii12npx07jx9xjkkgz84z4c9";
+    sha256 = "1rlxz2nzilz7n6c0affnjk2wcxl4b8949qxs0xi555gxg01kybls";
   };
 
   hardeningDisable = [ "relro" "bindnow" ];
@@ -31,7 +31,6 @@ stdenv.mkDerivation rec {
   ];
 
   preBuild = ''
-    make lupdate
     make lrelease
   '';
 
@@ -45,7 +44,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     alsaLib libjack2 freetype lame libogg libpulseaudio libsndfile libvorbis
-    portaudio qtbase qtdeclarative qtenginio qtscript qtsvg qttools
+    portaudio qtbase qtdeclarative qtscript qtsvg qttools
     qtwebkit qtxmlpatterns #tesseract
   ];
 
@@ -56,6 +55,5 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
     maintainers = [ maintainers.vandenoever ];
     repositories.git = https://github.com/musescore/MuseScore;
-    broken = true;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ad5281f6bf5..8278266174f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15086,7 +15086,7 @@ with pkgs;
     if stdenv.isDarwin then
       callPackage ../applications/audio/musescore/darwin.nix { }
     else
-      libsForQt56.callPackage ../applications/audio/musescore { };
+      libsForQt5.callPackage ../applications/audio/musescore { };
 
   mutt = callPackage ../applications/networking/mailreaders/mutt { };
   mutt-with-sidebar = callPackage ../applications/networking/mailreaders/mutt {

From 2265f50a5144d69a6bead22d3cac29a590636fd2 Mon Sep 17 00:00:00 2001
From: Bas van Dijk <v.dijk.bas@gmail.com>
Date: Sat, 17 Jun 2017 19:57:39 +0200
Subject: [PATCH 005/189] opencv-3.x: fix build on OS X

---
 pkgs/development/libraries/opencv/3.x.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix
index 5c7972eb2fa..dc4a00e6dd9 100644
--- a/pkgs/development/libraries/opencv/3.x.nix
+++ b/pkgs/development/libraries/opencv/3.x.nix
@@ -36,6 +36,13 @@ let
     sha256 = "1lynpbxz1jay3ya5y45zac5v8c6ifgk4ssn8d1chfdk3spi691jj";
   };
 
+  # This fixes the build on OS X.
+  # See: https://github.com/opencv/opencv_contrib/pull/926
+  contribOSXFix = fetchpatch {
+    url = "https://github.com/opencv/opencv_contrib/commit/abf44fcccfe2f281b7442dac243e37b7f436d961.patch";
+    sha256 = "11dsq8dwh1k6f7zglbc26xwsjw184ggf2531mhf7v77kd72k19fm";
+  };
+
   vggFiles = fetchFromGitHub {
     owner  = "opencv";
     repo   = "opencv_3rdparty";
@@ -61,6 +68,9 @@ stdenv.mkDerivation rec {
     (lib.optionalString enableContrib ''
       cp --no-preserve=mode -r "${contribSrc}/modules" "$NIX_BUILD_TOP/opencv_contrib"
 
+      # This fixes the build on OS X.
+      patch -d "$NIX_BUILD_TOP/opencv_contrib" -p2 < "${contribOSXFix}"
+
       for name in vgg_generated_48.i \
                   vgg_generated_64.i \
                   vgg_generated_80.i \

From 2cb4b8fc701bc0a9f0f9cf6f4764cd199c0ec88d Mon Sep 17 00:00:00 2001
From: Matt McHenry <github@matt.mchenryfamily.org>
Date: Sat, 17 Jun 2017 14:18:44 -0400
Subject: [PATCH 006/189] crashplan: move version and rev inside 'mkDerivation
 rec', simplify src

---
 pkgs/applications/backup/crashplan/default.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/backup/crashplan/default.nix b/pkgs/applications/backup/crashplan/default.nix
index b5b4b23353a..25842d4a989 100644
--- a/pkgs/applications/backup/crashplan/default.nix
+++ b/pkgs/applications/backup/crashplan/default.nix
@@ -1,19 +1,15 @@
 { stdenv, fetchurl, makeWrapper, jre, cpio, gawk, gnugrep, gnused, procps, swt, gtk2, glib, libXtst }:
 
-let
+stdenv.mkDerivation rec {
   version = "4.8.2";
   rev = "1"; #tracks unversioned changes that occur on download.code42.com from time to time
-
-in stdenv.mkDerivation rec {
   name = "crashplan-${version}-r${rev}";
 
-  crashPlanArchive = fetchurl {
+  src = fetchurl {
     url = "https://download.code42.com/installs/linux/install/CrashPlan/CrashPlan_${version}_Linux.tgz";
     sha256 = "0wh8lcm06ilcyncnp4ckg4yhyf9z3gb6v1kr111j4bpgmnd0v1yf";
   };
 
-  srcs = [ crashPlanArchive ];
-
   meta = with stdenv.lib; {
     description = "An online/offline backup solution";
     homepage = "http://www.crashplan.org";

From 478e88d13e9f9518694676dcfe5dac9ec41cacfe Mon Sep 17 00:00:00 2001
From: Eric Bailey <eric@ericb.me>
Date: Sat, 17 Jun 2017 19:31:25 -0500
Subject: [PATCH 007/189] polyml: 5.6 -> 5.7

- fetchurl -> fetchFromGitHub
- use `with stdenv.lib` in meta
- add darwin to platforms
- add yurrriq to maintainers
---
 pkgs/development/compilers/polyml/default.nix | 27 +++++++++----------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/compilers/polyml/default.nix b/pkgs/development/compilers/polyml/default.nix
index 8b5d14e7f5f..3ad8585edf3 100644
--- a/pkgs/development/compilers/polyml/default.nix
+++ b/pkgs/development/compilers/polyml/default.nix
@@ -1,11 +1,8 @@
-{stdenv, fetchurl, autoreconfHook}:
+{ stdenv, fetchFromGitHub, autoreconfHook }:
 
-let
-  version = "5.6";
-in
-
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "polyml-${version}";
+  version = "5.7";
 
   prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
     substituteInPlace configure.ac --replace stdc++ c++
@@ -13,21 +10,21 @@ stdenv.mkDerivation {
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin autoreconfHook;
 
-  src = fetchurl {
-    url = "mirror://sourceforge/polyml/polyml.${version}.tar.gz";
-    sha256 = "05d6l2a5m9jf32a8kahwg2p2ph4x9rjf1nsl83331q3gwn5bkmr0";
+  src = fetchFromGitHub {
+    owner = "polyml";
+    repo = "polyml";
+    rev = "v${version}";
+    sha256 = "10nsljmcl0zjbcc7ifc991ypwfwq5gh4rcp5rg4nnb706c6bs16y";
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Standard ML compiler and interpreter";
     longDescription = ''
       Poly/ML is a full implementation of Standard ML.
     '';
     homepage = http://www.polyml.org/;
-    license = stdenv.lib.licenses.lgpl21;
-    platforms = with stdenv.lib.platforms; linux;
-    maintainers = [ #Add your name here!
-      stdenv.lib.maintainers.z77z
-    ];
+    license = licenses.lgpl21;
+    platforms = with platforms; (linux ++ darwin);
+    maintainers = with maintainers; [ z77z yurrriq ];
   };
 }

From 72f8ba269c948b276c1f38d8aee32b8de7be97ef Mon Sep 17 00:00:00 2001
From: dywedir <dywedir@protonmail.ch>
Date: Sun, 18 Jun 2017 13:06:31 +0300
Subject: [PATCH 008/189] rustfmt: 0.8.3 -> 0.9.0

---
 pkgs/development/tools/rust/rustfmt/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/rust/rustfmt/default.nix b/pkgs/development/tools/rust/rustfmt/default.nix
index 3efc82a60c8..0e3802a214f 100644
--- a/pkgs/development/tools/rust/rustfmt/default.nix
+++ b/pkgs/development/tools/rust/rustfmt/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   name = "rustfmt-${version}";
-  version = "0.8.3";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "rust-lang-nursery";
     repo = "rustfmt";
     rev = "${version}";
-    sha256 = "1nh0h8mncz5vnn5hmw74f8nnh5cxdlrg67891l4dyq0p38vjhimz";
+    sha256 = "12l3ff0s0pzhcf5jbs8wqawjk4jghhhz8j6dq1n5201yvny12jlr";
   };
 
-  depsSha256 = "002d7y33a0bavd07wl7xrignmyaamnzfabdnr7a2x3zfizkfnblb";
+  depsSha256 = "1nnb2lpzjf6hv1a7cw3cbkc22fb54rsp6h87wzmqi4hsy1csff7a";
 
   meta = with stdenv.lib; {
     description = "A tool for formatting Rust code according to style guidelines";

From 130082d012869ab4634a04bfef75e8a5cf08bb7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 18 Jun 2017 12:39:18 +0100
Subject: [PATCH 009/189] communi: fix forbidden build references

---
 pkgs/applications/networking/irc/communi/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/irc/communi/default.nix b/pkgs/applications/networking/irc/communi/default.nix
index b292dd8f68e..c521084213e 100644
--- a/pkgs/applications/networking/irc/communi/default.nix
+++ b/pkgs/applications/networking/irc/communi/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
       --replace "/usr/bin" "$out/bin"
   '';
 
-  postFixup = ''
+  preFixup = ''
     patchelf --set-rpath "$out/lib:$(patchelf --print-rpath $out/bin/.communi-wrapped)" $out/bin/.communi-wrapped
   '';
 

From b9eecf80e775f747d070cc7326ee5b3ee2ab76cd Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Sun, 18 Jun 2017 20:45:51 +0900
Subject: [PATCH 010/189] tmuxinator: 0.8.1 -> 0.9.0

---
 pkgs/tools/misc/tmuxinator/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/misc/tmuxinator/default.nix b/pkgs/tools/misc/tmuxinator/default.nix
index 5e896610866..5bf7dd49143 100644
--- a/pkgs/tools/misc/tmuxinator/default.nix
+++ b/pkgs/tools/misc/tmuxinator/default.nix
@@ -8,8 +8,8 @@ buildRubyGem rec {
   inherit ruby;
   name = "${gemName}-${version}";
   gemName = "tmuxinator";
-  version = "0.8.1";
-  sha256 = "1cpmlfa684j9r1hjya70nfcl5lzdbzmbi9hqbs5nhxha97b77qs5";
+  version = "0.9.0";
+  sha256 = "13p8rvf1naknjin1n97370ifyj475lyyh60cbw2v6gczi9rs84p3";
 
   erubis = buildRubyGem rec {
     inherit ruby;
@@ -33,7 +33,7 @@ buildRubyGem rec {
     description = "Manage complex tmux sessions easily";
     homepage    = https://github.com/tmuxinator/tmuxinator;
     license     = licenses.mit;
-    maintainers = with maintainers; [ auntie ];
+    maintainers = with maintainers; [ auntie ericsagnes ];
     platforms   = platforms.unix;
   };
-}
\ No newline at end of file
+}

From abc374f1273585d0114affcbbbefdfadfc4169b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 18 Jun 2017 12:52:02 +0100
Subject: [PATCH 011/189] ply: add kernel version constraint

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

diff --git a/pkgs/os-specific/linux/ply/default.nix b/pkgs/os-specific/linux/ply/default.nix
index 9d4bdb1e27d..a9c84516ef8 100644
--- a/pkgs/os-specific/linux/ply/default.nix
+++ b/pkgs/os-specific/linux/ply/default.nix
@@ -1,9 +1,12 @@
-{ stdenv, kernel, fetchFromGitHub, autoreconfHook, yacc, flex, bison }:
+{ stdenv, kernel, fetchFromGitHub, autoreconfHook, yacc, flex, bison, p7zip }:
+
+assert kernel != null -> stdenv.lib.versionAtLeast kernel.version "4.0";
+
 let
   version = "1.0.beta1-9e810b1";
 in stdenv.mkDerivation {
   name = "ply-${version}";
-  nativeBuildInputs = [ autoreconfHook flex yacc ];
+  nativeBuildInputs = [ autoreconfHook flex yacc p7zip ];
 
   src = fetchFromGitHub {
     owner = "iovisor";
@@ -14,7 +17,9 @@ in stdenv.mkDerivation {
 
   preAutoreconf = ''
     # ply wants to install header fails to its build directory
-    xz -d < ${kernel.src} | tar -xf -
+    # use 7z to handle multiple archive formats transparently
+    7z x ${kernel.src} -so | 7z x -aoa -si -ttar
+
     configureFlagsArray+=(--with-kerneldir=$(echo $(pwd)/linux-*))
     ./autogen.sh --prefix=$out
   '';

From 3477f560279e362477f2620b6f9b825e919629d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 18 Jun 2017 12:56:45 +0100
Subject: [PATCH 012/189] vimPlugins.command-t: fix ruby build

---
 pkgs/misc/vim-plugins/default.nix                          | 7 +++----
 .../misc/vim-plugins/vim2nix/additional-nix-code/command-t | 3 +--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 87d57e44182..c871e422638 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -5,7 +5,7 @@
 , python3, boost, icu
 , ycmd
 , pythonPackages, python3Packages
-, Cocoa ? null
+, Cocoa ? null, git
 }:
 
 let
@@ -1775,11 +1775,10 @@ rec {
       sha256 = "15wil973sqfgvix9li15qk49kv9l3rn8zqis2cl71k6xh1xvd9ff";
     };
     dependencies = [];
-    buildInputs = [ perl ruby ];
+    buildInputs = [ perl ruby git ];
     buildPhase = ''
       pushd ruby/command-t
-      ruby extconf.rb
-      make
+      gem build ./command-t.gemspec
       popd
     '';
   };
diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/command-t b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/command-t
index a29c602b5d7..57aa35999dc 100644
--- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/command-t
+++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/command-t
@@ -1,7 +1,6 @@
     buildInputs = [ perl ruby ];
     buildPhase = ''
       pushd ruby/command-t
-      ruby extconf.rb
-      make
+      gem build command-t.gemspec
       popd
     '';

From 2c5de119792d0b9ceaa0005b12ea4f847c7ac295 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 18 Jun 2017 13:14:10 +0100
Subject: [PATCH 013/189] cli53: fix meta

---
 pkgs/tools/admin/cli53/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/admin/cli53/default.nix b/pkgs/tools/admin/cli53/default.nix
index 5c80e76f482..4e284c46193 100644
--- a/pkgs/tools/admin/cli53/default.nix
+++ b/pkgs/tools/admin/cli53/default.nix
@@ -24,7 +24,7 @@ buildGoPackage rec {
   meta = with stdenv.lib; {
     description = "CLI tool for the Amazon Route 53 DNS service";
     homepage = https://github.com/barnybug/cli53;
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ benley ];
+    license = licenses.mit;
+    maintainers = with maintainers; [ benley ];
   };
 }

From 8581998d7fab76cd0565309a854ee006626fdbfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 18 Jun 2017 13:14:26 +0100
Subject: [PATCH 014/189] vulnix: use zope-testrunner from pythonPackages

---
 pkgs/tools/security/vulnix/requirements.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/security/vulnix/requirements.nix b/pkgs/tools/security/vulnix/requirements.nix
index bf87fe1c64d..c1cbf9c4d3b 100644
--- a/pkgs/tools/security/vulnix/requirements.nix
+++ b/pkgs/tools/security/vulnix/requirements.nix
@@ -26,7 +26,7 @@ rec {
       url = "https://pypi.python.org/packages/52/b3/a96d62711a26d8cfbe546519975dc9ed54d2eb50b3238d2e6de045764796/ZConfig-3.1.0.tar.gz";
       sha256 = "c21fa3a073a56925a8098036d46717392994a92cffea1b3cda3176b70c0a842e";
     };
-    propagatedBuildInputs = with self; [ zope_testrunner ];
+    propagatedBuildInputs = [ pythonPackages.zope_testrunner ];
     meta = with stdenv.lib; {
       homepage = "";
       license = licenses.zpt21;

From a9aefdeac9a8444b53931233b86f998561a9c89d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 18 Jun 2017 13:18:40 +0100
Subject: [PATCH 015/189] pythonPackages.rebulk: 0.8.2 -> 0.9.0

---
 .../python-modules/rebulk/default.nix         | 23 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 21 +----------------
 2 files changed, 24 insertions(+), 20 deletions(-)
 create mode 100644 pkgs/development/python-modules/rebulk/default.nix

diff --git a/pkgs/development/python-modules/rebulk/default.nix b/pkgs/development/python-modules/rebulk/default.nix
new file mode 100644
index 00000000000..3dec364b292
--- /dev/null
+++ b/pkgs/development/python-modules/rebulk/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, buildPythonPackage, fetchPypi, pytest, pytestrunner, six, regex}:
+
+buildPythonPackage rec {
+  pname = "rebulk";
+  version = "0.9.0";
+  name = "${pname}-${version}";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1sw516ihfrb7i9bfl1n3049akvb23mpsk3llh7w3xfnbvkfrpip0";
+  };
+
+  # Some kind of trickery with imports that doesn't work.
+  doCheck = false;
+  buildInputs = [ pytest pytestrunner ];
+  propagatedBuildInputs = [ six regex ];
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/Toilal/rebulk/";
+    license = licenses.mit;
+    description = "Advanced string matching from simple patterns";
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e85fc22e3b9..d93a3a012c1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11914,26 +11914,7 @@ in {
 
   guessit = callPackage ../development/python-modules/guessit { };
 
-  rebulk = buildPythonPackage rec {
-    version = "0.8.2";
-    name = "rebulk-${version}";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/r/rebulk/${name}.tar.gz";
-      sha256 = "8c09901bda7b79a21d46faf489d67d017aa54d38bdabdb53f824068a6640401a";
-    };
-
-    # Some kind of trickery with imports that doesn't work.
-    doCheck = false;
-    buildInputs = with self; [ pytest pytestrunner ];
-    propagatedBuildInputs = with self; [ six regex ];
-
-    meta = {
-      homepage = "https://github.com/Toilal/rebulk/";
-      license = licenses.mit;
-      description = "Advanced string matching from simple patterns";
-    };
-  };
+  rebulk = callPackage ../development/python-modules/rebulk { };
 
   gunicorn = callPackage ../development/python-modules/gunicorn.nix { };
 

From 8b8a9b695a23d93765cec274422fbf25c028471e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 18 Jun 2017 13:23:30 +0100
Subject: [PATCH 016/189] cli53: add missing deps.nix

---
 pkgs/tools/admin/cli53/deps.nix | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 pkgs/tools/admin/cli53/deps.nix

diff --git a/pkgs/tools/admin/cli53/deps.nix b/pkgs/tools/admin/cli53/deps.nix
new file mode 100644
index 00000000000..0cb0360e499
--- /dev/null
+++ b/pkgs/tools/admin/cli53/deps.nix
@@ -0,0 +1,3 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.0
+[
+]

From 08d25152b85fb24f7b5b85efe25d6be4deb12227 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 18 Jun 2017 13:26:11 +0100
Subject: [PATCH 017/189] gdbGuile: mark as broken

does not compile anymore since gdb 8.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 bdd4604d161..6ce2a8c3754 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7168,7 +7168,7 @@ with pkgs;
     inherit (gnu) mig;
   };
 
-  gdbGuile = lowPrio (gdb.override { inherit guile; });
+  gdbGuile = lowPrio (gdb.override { inherit guile; broken = true; });
 
   gdb-multitarget = lowPrio (gdb.override { multitarget = true; });
 

From e66d2753f3a8a35bc8b96a0db054ed598d4df4f6 Mon Sep 17 00:00:00 2001
From: Kirill Elagin <kirelagin@gmail.com>
Date: Sun, 18 Jun 2017 15:31:34 +0300
Subject: [PATCH 018/189] nsd: Send stderr to /dev/null

nsd by default logs _both_ to syslog and to standard error which results
in all the messages ending up in the journal twice, the ones from stderr
with an ugly timestamp sticked in front of them.
---
 nixos/modules/services/networking/nsd.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix
index 0f01b9d4af0..c8b8ed547eb 100644
--- a/nixos/modules/services/networking/nsd.nix
+++ b/nixos/modules/services/networking/nsd.nix
@@ -811,6 +811,7 @@ in
 
       serviceConfig = {
         ExecStart = "${nsdPkg}/sbin/nsd -d -c ${nsdEnv}/nsd.conf";
+        StandardError = "null";
         PIDFile = pidFile;
         Restart = "always";
         RestartSec = "4s";

From 3f3d33a07867116446ec9b5e2675ef1c8de8127d Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Mon, 15 May 2017 06:44:33 -0500
Subject: [PATCH 019/189] qt5: use distinct `lib/qt-5.x` prefix for each minor
 version

Using a distinct prefix for plugins and QML libraries allows multiple Qt 5 minor
versions to coexist in the same environment.
---
 .../services/x11/desktop-managers/plasma5.nix |  1 -
 .../display-managers/sddm/default.nix         |  2 +-
 .../science/programming/fdr/default.nix       |  2 +-
 .../robotics/qgroundcontrol/default.nix       |  6 ++---
 pkgs/desktops/lxqt/default.nix                |  2 +-
 pkgs/desktops/plasma-5/libkscreen/default.nix |  2 +-
 pkgs/desktops/plasma-5/startkde/default.nix   | 15 +----------
 pkgs/desktops/plasma-5/startkde/startkde.sh   |  4 +--
 .../extra-cmake-modules/setup-hook.sh         | 13 +++++++---
 .../kde-frameworks/kwindowsystem/default.nix  |  2 +-
 .../libraries/qmltermwidget/default.nix       |  2 +-
 .../libraries/qt-5/5.6/default.nix            |  9 ++++---
 .../libraries/qt-5/5.6/qtbase/default.nix     | 17 ++++++++-----
 .../qtbase/nix-profiles-library-paths.patch   |  8 +++---
 .../qt-5/5.6/qtdeclarative/default.nix        |  4 +++
 .../nix-profiles-import-paths.patch           | 20 +++++++--------
 .../qt-5/5.6/qtwebengine/default.nix          |  7 +++---
 .../libraries/qt-5/5.8/default.nix            |  9 ++++---
 .../libraries/qt-5/5.8/qtbase/default.nix     | 18 +++++++------
 .../qtbase/nix-profiles-library-paths.patch   |  8 +++---
 .../qt-5/5.8/qtdeclarative/default.nix        |  4 +++
 .../nix-profiles-import-paths.patch           | 20 +++++++--------
 .../libraries/qt-5/make-qt-wrapper-darwin.sh  |  7 ++----
 .../libraries/qt-5/make-qt-wrapper.sh         |  7 ++----
 pkgs/development/libraries/qt-5/qt-env.nix    |  7 +++---
 .../qt-5/qtbase-setup-hook-darwin.sh          | 25 ++++++++++---------
 .../libraries/qt-5/qtbase-setup-hook.sh       | 25 ++++++++++---------
 .../libraries/qtwebkit-plugins/default.nix    |  2 +-
 pkgs/development/qtcreator/default.nix        |  2 +-
 pkgs/tools/misc/qt5ct/default.nix             |  2 +-
 30 files changed, 129 insertions(+), 123 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix
index 2216104be31..d981cd5328e 100644
--- a/nixos/modules/services/x11/desktop-managers/plasma5.nix
+++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix
@@ -183,7 +183,6 @@ in
       environment.variables = {
         # Enable GTK applications to load SVG icons
         GDK_PIXBUF_MODULE_FILE = "${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache";
-        QT_PLUGIN_PATH = "/run/current-system/sw/lib/qt5/plugins";
       };
 
       fonts.fonts = with pkgs; [ noto-fonts hack-font ];
diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix
index d1f487b37ac..07c1e8cee33 100644
--- a/pkgs/applications/display-managers/sddm/default.nix
+++ b/pkgs/applications/display-managers/sddm/default.nix
@@ -53,7 +53,7 @@ let
     ];
 
     preConfigure = ''
-      export cmakeFlags="$cmakeFlags -DQT_IMPORTS_DIR=$out/lib/qt5/qml -DCMAKE_INSTALL_SYSCONFDIR=$out/etc -DSYSTEMD_SYSTEM_UNIT_DIR=$out/lib/systemd/system"
+      export cmakeFlags="$cmakeFlags -DQT_IMPORTS_DIR=$out/$qtQmlPrefix -DCMAKE_INSTALL_SYSCONFDIR=$out/etc -DSYSTEMD_SYSTEM_UNIT_DIR=$out/lib/systemd/system"
     '';
 
     enableParallelBuilding = true;
diff --git a/pkgs/applications/science/programming/fdr/default.nix b/pkgs/applications/science/programming/fdr/default.nix
index a82027a628f..8ed8e0e73b0 100644
--- a/pkgs/applications/science/programming/fdr/default.nix
+++ b/pkgs/applications/science/programming/fdr/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
     cp -r * "$out"
     # Hack around lack of libtinfo in NixOS
     ln -s ${ncurses.out}/lib/libncursesw.so.6 $out/lib/libtinfo.so.5
-    ln -s ${qtbase.out}/lib/qt5/plugins $out/lib/qt_plugins
+    ln -s ${qtbase.out}/$qtPluginPrefix $out/lib/qt_plugins
     ln -s ${zlib.out}/lib/libz.so.1 $out/lib/libz.so.1
 
     for b in fdr4 _fdr4 refines _refines cspmprofiler cspmexplorerprof
diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix
index e323b42d7ae..580d9f0e76e 100644
--- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix
+++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix
@@ -56,10 +56,10 @@ stdenv.mkDerivation rec {
 
     # we need to link to our Qt deps in our own output if we want
     # this package to work without being installed as a system pkg
-    mkdir -p $out/lib/qt5 $out/etc/xdg
+    mkdir -p $out/lib/qt-$qtCompatVersion $out/etc/xdg
     for pkg in $qtInputs; do
-      if [[ -d $pkg/lib/qt5 ]]; then
-        for dir in lib/qt5 share etc/xdg; do
+      if [[ -d $pkg/lib/qt-$qtCompatVersion ]]; then
+        for dir in lib/qt-$qtCompatVersion share etc/xdg; do
           if [[ -d $pkg/$dir ]]; then
             ${lndir}/bin/lndir "$pkg/$dir" "$out/$dir"
           fi
diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix
index fbcb286f5b2..735ba79b405 100644
--- a/pkgs/desktops/lxqt/default.nix
+++ b/pkgs/desktops/lxqt/default.nix
@@ -13,7 +13,7 @@ let
           --replace "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" \
           --replace "DESTINATION \"\''${LXQT_SHARE_DIR}" "DESTINATION \"share/lxqt" \
           --replace "DESTINATION \"\''${LXQT_GRAPHICS_DIR}" "DESTINATION \"share/lxqt/graphics" \
-          --replace "DESTINATION \"\''${QT_PLUGINS_DIR}" "DESTINATION \"lib/qt5/plugins" \
+          --replace "DESTINATION \"\''${QT_PLUGINS_DIR}" "DESTINATION \"$qtPluginPrefix" \
           --replace "\''${LXQT_TRANSLATIONS_DIR}" share/lxqt/translations
         echo ============================
         echo $file
diff --git a/pkgs/desktops/plasma-5/libkscreen/default.nix b/pkgs/desktops/plasma-5/libkscreen/default.nix
index afb2c20e90c..6881f95e6d5 100644
--- a/pkgs/desktops/plasma-5/libkscreen/default.nix
+++ b/pkgs/desktops/plasma-5/libkscreen/default.nix
@@ -14,6 +14,6 @@ plasmaPackage {
   ];
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   preConfigure = ''
-    NIX_CFLAGS_COMPILE+=" -DNIXPKGS_LIBKSCREEN_BACKENDS=\"''${!outputLib}/lib/qt5/plugins/kf5/kscreen\""
+    NIX_CFLAGS_COMPILE+=" -DNIXPKGS_LIBKSCREEN_BACKENDS=\"''${!outputLib}/$qtPluginPrefix/kf5/kscreen\""
   '';
 }
diff --git a/pkgs/desktops/plasma-5/startkde/default.nix b/pkgs/desktops/plasma-5/startkde/default.nix
index 87c72fdc599..25ebdd7f332 100644
--- a/pkgs/desktops/plasma-5/startkde/default.nix
+++ b/pkgs/desktops/plasma-5/startkde/default.nix
@@ -34,21 +34,8 @@ in runCommand "startkde" env ''
       addToSearchPath suffixPATH "$p/lib/libexec/kf5"
   done
 
-  # Configure Qt search paths
-  QT_PLUGIN_PATH=
-  QML_IMPORT_PATH=
-  QML2_IMPORT_PATH=
-  for p in $libs; do
-      addToSearchPath QT_PLUGIN_PATH "$p/lib/qt5/plugins"
-      addToSearchPath QML_IMPORT_PATH "$p/lib/qt5/imports"
-      addToSearchPath QML2_IMPORT_PATH "$p/lib/qt5/qml"
-  done
-
   substitute ${./startkde.sh} "$out" \
       --subst-var shell \
-      --subst-var suffixPATH \
-      --subst-var QT_PLUGIN_PATH \
-      --subst-var QML_IMPORT_PATH \
-      --subst-var QML2_IMPORT_PATH
+      --subst-var suffixPATH
   chmod +x "$out"
 ''
diff --git a/pkgs/desktops/plasma-5/startkde/startkde.sh b/pkgs/desktops/plasma-5/startkde/startkde.sh
index c38450516e9..53e7fbb0569 100755
--- a/pkgs/desktops/plasma-5/startkde/startkde.sh
+++ b/pkgs/desktops/plasma-5/startkde/startkde.sh
@@ -2,9 +2,7 @@
 
 PATH="$PATH${PATH:+:}@suffixPATH@"
 
-export QT_PLUGIN_PATH="$QT_PLUGIN_PATH${QT_PLUGIN_PATH:+:}@QT_PLUGIN_PATH@"
-export QML_IMPORT_PATH="$QML_IMPORT_PATH${QML_IMPORT_PATH:+:}@QML_IMPORT_PATH@"
-export QML2_IMPORT_PATH="$QML2_IMPORT_PATH${QML2_IMPORT_PATH:+:}@QML2_IMPORT_PATH@"
+echo "NIX_PROFILES=\"$NIX_PROFILES\""
 
 kbuildsycoca5
 
diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh
index 9ee9ef90a44..a550cda1fa2 100644
--- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh
+++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh
@@ -13,10 +13,6 @@ _ecmConfig() {
     cmakeFlags+=" -DKDE_INSTALL_LIBDIR=${!outputLib}/lib"
     cmakeFlags+=" -DKDE_INSTALL_LIBEXECDIR=${!outputBin}/lib/libexec"
     cmakeFlags+=" -DKDE_INSTALL_CMAKEPACKAGEDIR=${!outputDev}/lib/cmake"
-    cmakeFlags+=" -DKDE_INSTALL_QTPLUGINDIR=${!outputBin}/lib/qt5/plugins"
-    cmakeFlags+=" -DKDE_INSTALL_PLUGINDIR=${!outputBin}/lib/qt5/plugins"
-    cmakeFlags+=" -DKDE_INSTALL_QTQUICKIMPORTSDIR=${!outputBin}/lib/qt5/imports"
-    cmakeFlags+=" -DKDE_INSTALL_QMLDIR=${!outputBin}/lib/qt5/qml"
     cmakeFlags+=" -DKDE_INSTALL_INCLUDEDIR=${!outputInclude}/include"
     cmakeFlags+=" -DKDE_INSTALL_LOCALSTATEDIR=/var"
     cmakeFlags+=" -DKDE_INSTALL_DATAROOTDIR=${!outputBin}/share"
@@ -46,6 +42,15 @@ _ecmConfig() {
     cmakeFlags+=" -DKDE_INSTALL_SYSCONFDIR=${!outputBin}/etc"
     cmakeFlags+=" -DKDE_INSTALL_CONFDIR=${!outputBin}/etc/xdg"
     cmakeFlags+=" -DKDE_INSTALL_AUTOSTARTDIR=${!outputBin}/etc/xdg/autostart"
+
+    if [ -n "$qtPluginPrefix" ]; then
+        cmakeFlags+=" -DKDE_INSTALL_QTPLUGINDIR=${!outputBin}/$qtPluginPrefix"
+        cmakeFlags+=" -DKDE_INSTALL_PLUGINDIR=${!outputBin}/$qtPluginPrefix"
+    fi
+
+    if [ -n "$qtQmlPrefix" ]; then
+        cmakeFlags+=" -DKDE_INSTALL_QMLDIR=${!outputBin}/$qtQmlPrefix"
+    fi
 }
 
 preConfigureHooks+=(_ecmConfig)
diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
index 8a91bdbac52..4e02777e39c 100644
--- a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
@@ -14,6 +14,6 @@ kdeFramework {
   propagatedBuildInputs = [ qtx11extras ];
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   preConfigure = ''
-    NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PATH=\"$out/lib/qt5/plugins\""
+    NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PATH=\"$out/$qtPluginPrefix\""
   '';
 }
diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix
index bb058711b2e..88d942b9fd7 100644
--- a/pkgs/development/libraries/qmltermwidget/default.nix
+++ b/pkgs/development/libraries/qmltermwidget/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   patchPhase = ''
     substituteInPlace qmltermwidget.pro \
-      --replace '$$[QT_INSTALL_QML]' "/lib/qt5/qml/"
+      --replace '$$[QT_INSTALL_QML]' "/$qtQmlPrefix/"
   '';
 
   installFlags = [ "INSTALL_ROOT=$(out)" ];
diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix
index cc6475d31b6..2dccdd065df 100644
--- a/pkgs/development/libraries/qt-5/5.6/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/default.nix
@@ -18,8 +18,9 @@ existing packages here and modify it as necessary.
 1. Update the URL in `./fetch.sh`.
 2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-5/$VERSION/`
    from the top of the Nixpkgs tree.
-3. Use `nox-review wip` to check that everything builds.
-4. Commit the changes and open a pull request.
+3. Update `qtCompatVersion` below if the minor version number changes.
+4. Check that the new packages build correctly.
+5. Commit the changes and open a pull request.
 
 */
 
@@ -38,6 +39,8 @@ with stdenv.lib;
 
 let
 
+  qtCompatVersion = "5.6";
+
   mirror = "http://download.qt.io";
   srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; };
 
@@ -70,7 +73,7 @@ let
 
   addPackages = self: with self;
     let
-      callPackage = self.newScope { inherit qtSubmodule srcs; };
+      callPackage = self.newScope { inherit qtCompatVersion qtSubmodule srcs; };
     in {
 
       qtbase = callPackage ./qtbase {
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 289a1bbac6c..a4039714a60 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchgit, copyPathsToStore
-, srcs
+, srcs, qtCompatVersion
 
 , xlibs, libX11, libxcb, libXcursor, libXext, libXrender, libXi
 , xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilwm, libxkbcommon
@@ -32,6 +32,7 @@ stdenv.mkDerivation {
 
   name = "qtbase-${srcs.qtbase.version}";
   inherit (srcs.qtbase) src version;
+  inherit qtCompatVersion;
 
   outputs = [ "out" "dev" ];
 
@@ -94,18 +95,22 @@ stdenv.mkDerivation {
     # Note on the above: \x27 is a way if including a single-quote
     # character in the sed string arguments.
 
+  qtPluginPrefix = "lib/qt-${qtCompatVersion}/plugins";
+  qtQmlPrefix = "lib/qt-${qtCompatVersion}/qml";
+  qtDocPrefix = "share/doc/qt-${qtCompatVersion}";
+
   setOutputFlags = false;
   preConfigure = ''
     export LD_LIBRARY_PATH="$PWD/lib:$PWD/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"
+        -plugindir $out/$qtPluginPrefix \
+        -qmldir $out/$qtQmlPrefix \
+        -docdir $out/$qtDocPrefix"
 
-    NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QPA_PLATFORM_PLUGIN_PATH=\"''${!outputLib}/lib/qt5/plugins/platforms\""
+    NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PREFIX=\"$qtPluginPrefix\""
+    NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QPA_PLATFORM_PLUGIN_PATH=\"''${!outputLib}/$qtPluginPrefix/platforms\""
   '';
 
   prefixKey = "-prefix ";
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
index 68163fc0c31..dfc2dccdeb6 100644
--- 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
@@ -7,11 +7,11 @@ Index: qtbase-opensource-src-5.6.2/src/corelib/kernel/qcoreapplication.cpp
          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");
-+        for (const QByteArray &profile: profiles) {
++        const QStringList profiles = QFile::decodeName(qgetenv("NIX_PROFILES")).split(' ');
++        const QString plugindir = QStringLiteral(NIXPKGS_QT_PLUGIN_PREFIX);
++        for (const QString &profile: profiles) {
 +            if (!profile.isEmpty()) {
-+                app_libpaths->append(QFile::decodeName(profile) + plugindir);
++                app_libpaths->append(profile + QDir::separator() + plugindir);
 +            }
 +        }
 +
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 9b6a6c46176..57b8e53b215 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtdeclarative/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/qtdeclarative/default.nix
@@ -5,4 +5,8 @@ qtSubmodule {
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   qtInputs = [ qtbase qtsvg qtxmlpatterns ];
   nativeBuildInputs = [ python2 ];
+
+  preConfigure = ''
+    NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QML2_IMPORT_PREFIX=\"$qtQmlPrefix\""
+  '';
 }
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
index 06b244b974f..50e9490b6d9 100644
--- 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
@@ -1,20 +1,20 @@
-Index: qtdeclarative-opensource-src-5.5.1/src/qml/qml/qqmlimport.cpp
+Index: qtdeclarative-opensource-src-5.6.2/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
+--- qtdeclarative-opensource-src-5.6.2.orig/src/qml/qml/qqmlimport.cpp
++++ qtdeclarative-opensource-src-5.6.2/src/qml/qml/qqmlimport.cpp
+@@ -1568,6 +1568,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) {
++    const QStringList profiles = QFile::decodeName(qgetenv("NIX_PROFILES")).split(' ');
++    const QString qmldir = QStringLiteral(NIXPKGS_QML2_IMPORT_PREFIX);
++    for (const QString &profile: profiles) {
 +        if (!profile.isEmpty()) {
-+            addImportPath(QFile::decodeName(profile) + qmldir);
++            addImportPath(profile + QDir::separator() + qmldir);
 +        }
 +    }
 +
      // env import paths
-     QByteArray envImportPath = qgetenv("QML2_IMPORT_PATH");
-     if (!envImportPath.isEmpty()) {
+     if (Q_UNLIKELY(!qEnvironmentVariableIsEmpty("QML2_IMPORT_PATH"))) {
+         const QByteArray envImportPath = qgetenv("QML2_IMPORT_PATH");
diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix b/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix
index 1234c825b14..7ffc42fe7f6 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/qtwebengine/default.nix
@@ -42,10 +42,9 @@ qtSubmodule {
     sed -i -e 's,/cert.pem,/certs/ca-bundle.crt,' src/3rdparty/chromium/third_party/boringssl/src/crypto/x509/x509_def.c
 
     configureFlags+="\
-        -plugindir $out/lib/qt5/plugins \
-        -importdir $out/lib/qt5/imports \
-        -qmldir $out/lib/qt5/qml \
-        -docdir $out/share/doc/qt5"
+        -plugindir $out/$qtPluginPrefix \
+        -qmldir $out/$qtQmlPrefix \
+        -docdir $out/$qtDocPrefix"
   '';
   propagatedBuildInputs = [
     # Image formats
diff --git a/pkgs/development/libraries/qt-5/5.8/default.nix b/pkgs/development/libraries/qt-5/5.8/default.nix
index 2865a879f47..5a737441fa8 100644
--- a/pkgs/development/libraries/qt-5/5.8/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/default.nix
@@ -9,8 +9,9 @@ top-level attribute to `top-level/all-packages.nix`.
 1. Update the URL in `maintainers/scripts/generate-qt.sh`.
 2. From the top of the Nixpkgs tree, run
    `./maintainers/scripts/generate-qt.sh > pkgs/development/libraries/qt-5/$VERSION/srcs.nix`.
-3. Check that the new packages build correctly.
-4. Commit the changes and open a pull request.
+3. Update `qtCompatVersion` below if the minor version number changes.
+4. Check that the new packages build correctly.
+5. Commit the changes and open a pull request.
 
 */
 
@@ -29,6 +30,8 @@ with stdenv.lib;
 
 let
 
+  qtCompatVersion = "5.8";
+
   mirror = "http://download.qt.io";
   srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; };
 
@@ -61,7 +64,7 @@ let
 
   addPackages = self: with self;
     let
-      callPackage = self.newScope { inherit qtSubmodule srcs; };
+      callPackage = self.newScope { inherit qtCompatVersion qtSubmodule srcs; };
     in {
 
       qtbase = callPackage ./qtbase {
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
index ee6399c2bd4..008eb1e3709 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
@@ -1,6 +1,6 @@
 {
   stdenv, lib, copyPathsToStore,
-  src, version,
+  src, version, qtCompatVersion,
 
   coreutils, bison, flex, gdb, gperf, lndir, patchelf, perl, pkgconfig, python2,
   ruby,
@@ -32,7 +32,7 @@ in
 stdenv.mkDerivation {
 
   name = "qtbase-${version}";
-  inherit src version;
+  inherit qtCompatVersion src version;
 
   propagatedBuildInputs =
     [
@@ -117,18 +117,22 @@ stdenv.mkDerivation {
      # Note on the above: \x27 is a way if including a single-quote
      # character in the sed string arguments.
 
+  qtPluginPrefix = "lib/qt-${qtCompatVersion}/plugins";
+  qtQmlPrefix = "lib/qt-${qtCompatVersion}/qml";
+  qtDocPrefix = "share/doc/qt-${qtCompatVersion}";
+
   setOutputFlags = false;
   preConfigure = ''
     export LD_LIBRARY_PATH="$PWD/lib:$PWD/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"
+        -plugindir $out/$qtPluginPrefix \
+        -qmldir $out/$qtQmlPrefix \
+        -docdir $out/$qtDocPrefix"
 
-    NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QPA_PLATFORM_PLUGIN_PATH=\"''${!outputLib}/lib/qt5/plugins/platforms\""
+    NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PREFIX=\"$qtPluginPrefix\""
+    NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QPA_PLATFORM_PLUGIN_PATH=\"''${!outputLib}/$qtPluginPrefix/platforms\""
   '';
 
 
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/nix-profiles-library-paths.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/nix-profiles-library-paths.patch
index 553c71d0ace..f626e399288 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/nix-profiles-library-paths.patch
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/nix-profiles-library-paths.patch
@@ -7,11 +7,11 @@ Index: qtbase-opensource-src-5.8.0/src/corelib/kernel/qcoreapplication.cpp
          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");
-+        for (const QByteArray &profile: profiles) {
++        const QStringList profiles = QFile::decodeName(qgetenv("NIX_PROFILES")).split(' ');
++        const QString plugindir = QStringLiteral(NIXPKGS_QT_PLUGIN_PREFIX);
++        for (const QString &profile: profiles) {
 +            if (!profile.isEmpty()) {
-+                app_libpaths->append(QFile::decodeName(profile) + plugindir);
++                app_libpaths->append(profile + QDir::separator() + plugindir);
 +            }
 +        }
 +
diff --git a/pkgs/development/libraries/qt-5/5.8/qtdeclarative/default.nix b/pkgs/development/libraries/qt-5/5.8/qtdeclarative/default.nix
index acddbd9e365..28ea571adca 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtdeclarative/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtdeclarative/default.nix
@@ -8,6 +8,10 @@ qtSubmodule {
   qtInputs = [ qtbase qtsvg qtxmlpatterns ];
   nativeBuildInputs = [ python2 makeQtWrapper ];
 
+  preConfigure = ''
+    NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QML2_IMPORT_PREFIX=\"$qtQmlPrefix\""
+  '';
+
   postInstall = ''
     wrapQtProgram $out/bin/qmleasing
     wrapQtProgram $out/bin/qmlscene
diff --git a/pkgs/development/libraries/qt-5/5.8/qtdeclarative/nix-profiles-import-paths.patch b/pkgs/development/libraries/qt-5/5.8/qtdeclarative/nix-profiles-import-paths.patch
index 06b244b974f..2d51f7b6759 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtdeclarative/nix-profiles-import-paths.patch
+++ b/pkgs/development/libraries/qt-5/5.8/qtdeclarative/nix-profiles-import-paths.patch
@@ -1,20 +1,20 @@
-Index: qtdeclarative-opensource-src-5.5.1/src/qml/qml/qqmlimport.cpp
+Index: qtdeclarative-opensource-src-5.8.0/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
+--- qtdeclarative-opensource-src-5.8.0.orig/src/qml/qml/qqmlimport.cpp
++++ qtdeclarative-opensource-src-5.8.0/src/qml/qml/qqmlimport.cpp
+@@ -1630,6 +1630,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) {
++    const QStringList profiles = QFile::decodeName(qgetenv("NIX_PROFILES")).split(' ');
++    const QString qmldir = QStringLiteral(NIXPKGS_QML2_IMPORT_PREFIX);
++    for (const QString &profile: profiles) {
 +        if (!profile.isEmpty()) {
-+            addImportPath(QFile::decodeName(profile) + qmldir);
++            addImportPath(profile + QDir::separator() + qmldir);
 +        }
 +    }
 +
      // env import paths
-     QByteArray envImportPath = qgetenv("QML2_IMPORT_PATH");
-     if (!envImportPath.isEmpty()) {
+     if (Q_UNLIKELY(!qEnvironmentVariableIsEmpty("QML2_IMPORT_PATH"))) {
+         const QByteArray envImportPath = qgetenv("QML2_IMPORT_PATH");
diff --git a/pkgs/development/libraries/qt-5/make-qt-wrapper-darwin.sh b/pkgs/development/libraries/qt-5/make-qt-wrapper-darwin.sh
index 576c03d8c76..a42c418fde6 100644
--- a/pkgs/development/libraries/qt-5/make-qt-wrapper-darwin.sh
+++ b/pkgs/development/libraries/qt-5/make-qt-wrapper-darwin.sh
@@ -3,7 +3,6 @@ wrapQtProgram() {
     shift
     wrapProgram "$prog" \
         --set QT_PLUGIN_PATH "$QT_PLUGIN_PATH" \
-        --set QML_IMPORT_PATH "$QML_IMPORT_PATH" \
         --set QML2_IMPORT_PATH "$QML2_IMPORT_PATH" \
         --set DYLD_FRAMEWORK_PATH "/System/Library/Frameworks" \
         --prefix XDG_DATA_DIRS : "$RUNTIME_XDG_DATA_DIRS" \
@@ -18,7 +17,6 @@ makeQtWrapper() {
     shift
     makeWrapper "$old" "$new" \
         --set QT_PLUGIN_PATH "$QT_PLUGIN_PATH" \
-        --set QML_IMPORT_PATH "$QML_IMPORT_PATH" \
         --set QML2_IMPORT_PATH "$QML2_IMPORT_PATH" \
         --set DYLD_FRAMEWORK_PATH "/System/Library/Frameworks" \
         --prefix XDG_DATA_DIRS : "$RUNTIME_XDG_DATA_DIRS" \
@@ -28,9 +26,8 @@ makeQtWrapper() {
 
 _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 QT_PLUGIN_PATH="$QT_PLUGIN_PATH${QT_PLUGIN_PATH:+:}${!outputLib}/$qtPluginPrefix"
+    export QML2_IMPORT_PATH="$QML2_IMPORT_PATH${QML2_IMPORT_PATH:+:}${!outputLib}/$qtQmlPrefix"
     export RUNTIME_XDG_DATA_DIRS="$RUNTIME_XDG_DATA_DIRS${RUNTIME_XDG_DATA_DIRS:+:}${!outputBin}/share"
     export RUNTIME_XDG_CONFIG_DIRS="$RUNTIME_XDG_CONFIG_DIRS${RUNTIME_XDG_CONFIG_DIRS:+:}${!outputBin}/etc/xdg"
 }
diff --git a/pkgs/development/libraries/qt-5/make-qt-wrapper.sh b/pkgs/development/libraries/qt-5/make-qt-wrapper.sh
index 4a5651f74c9..33dc8b6370f 100644
--- a/pkgs/development/libraries/qt-5/make-qt-wrapper.sh
+++ b/pkgs/development/libraries/qt-5/make-qt-wrapper.sh
@@ -3,7 +3,6 @@ wrapQtProgram() {
     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_DATA_DIRS : "$RUNTIME_XDG_DATA_DIRS" \
         --prefix XDG_CONFIG_DIRS : "$RUNTIME_XDG_CONFIG_DIRS" \
@@ -18,7 +17,6 @@ makeQtWrapper() {
     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_DATA_DIRS : "$RUNTIME_XDG_DATA_DIRS" \
         --prefix XDG_CONFIG_DIRS : "$RUNTIME_XDG_CONFIG_DIRS" \
@@ -28,9 +26,8 @@ makeQtWrapper() {
 
 _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 QT_PLUGIN_PATH="$QT_PLUGIN_PATH${QT_PLUGIN_PATH:+:}${!outputLib}/$qtPluginPrefix"
+    export QML2_IMPORT_PATH="$QML2_IMPORT_PATH${QML2_IMPORT_PATH:+:}${!outputLib}/$qtQmlPrefix"
     export RUNTIME_XDG_DATA_DIRS="$RUNTIME_XDG_DATA_DIRS${RUNTIME_XDG_DATA_DIRS:+:}${!outputBin}/share${GSETTINGS_SCHEMAS_PATH:+:$GSETTINGS_SCHEMAS_PATH}"
     export RUNTIME_XDG_CONFIG_DIRS="$RUNTIME_XDG_CONFIG_DIRS${RUNTIME_XDG_CONFIG_DIRS:+:}${!outputBin}/etc/xdg"
 }
diff --git a/pkgs/development/libraries/qt-5/qt-env.nix b/pkgs/development/libraries/qt-5/qt-env.nix
index fad68fbd745..728761689b4 100644
--- a/pkgs/development/libraries/qt-5/qt-env.nix
+++ b/pkgs/development/libraries/qt-5/qt-env.nix
@@ -13,10 +13,9 @@ buildEnv {
     cat >"$out/bin/qt.conf" <<EOF
     [Paths]
     Prefix = $out
-    Plugins = lib/qt5/plugins
-    Imports = lib/qt5/imports
-    Qml2Imports = lib/qt5/qml
-    Documentation = share/doc/qt5
+    Plugins = $qtPluginPrefix
+    Qml2Imports = $qtQmlPrefix
+    Documentation = $qtDocPrefix
     EOF
   '';
 }
diff --git a/pkgs/development/libraries/qt-5/qtbase-setup-hook-darwin.sh b/pkgs/development/libraries/qt-5/qtbase-setup-hook-darwin.sh
index aa2d24a741c..81fcf5fc3d3 100644
--- a/pkgs/development/libraries/qt-5/qtbase-setup-hook-darwin.sh
+++ b/pkgs/development/libraries/qt-5/qtbase-setup-hook-darwin.sh
@@ -1,3 +1,7 @@
+qtPluginPrefix=@qtPluginPrefix@
+qtQmlPrefix=@qtQmlPrefix@
+qtDocPrefix=@qtDocPrefix@
+
 addToSearchPathOnceWithCustomDelimiter() {
     local delim="$1"
     local search="$2"
@@ -25,30 +29,28 @@ propagateOnce() {
 }
 
 _qtPropagate() {
-    for dir in "lib/qt5/plugins" "lib/qt5/qml" "lib/qt5/imports"; do
+    for dir in $qtPluginPrefix $qtQmlPrefix; do
         if [ -d "$1/$dir" ]; then
             propagateOnce propagatedBuildInputs "$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"
+    addToSearchPathOnce QT_PLUGIN_PATH "$1/$qtPluginPrefix"
+    addToSearchPathOnce QML2_IMPORT_PATH "$1/$qtQmlPrefix"
 }
 
 crossEnvHooks+=(_qtPropagate)
 
 _qtPropagateNative() {
-    for dir in "lib/qt5/plugins" "lib/qt5/qml" "lib/qt5/imports"; do
+    for dir in $qtPluginPrefix $qtQmlPrefix; do
         if [ -d "$1/$dir" ]; then
             propagateOnce propagatedNativeBuildInputs "$1"
             break
         fi
     done
     if [ -z "$crossConfig" ]; then
-        addToSearchPathOnce QT_PLUGIN_PATH "$1/lib/qt5/plugins"
-        addToSearchPathOnce QML_IMPORT_PATH "$1/lib/qt5/imports"
-        addToSearchPathOnce QML2_IMPORT_PATH "$1/lib/qt5/qml"
+    addToSearchPathOnce QT_PLUGIN_PATH "$1/$qtPluginPrefix"
+    addToSearchPathOnce QML2_IMPORT_PATH "$1/$qtQmlPrefix"
     fi
 }
 
@@ -112,10 +114,9 @@ if [ -z "$NIX_QT5_TMP" ]; then
     cat >"$NIX_QT5_TMP/bin/qt.conf" <<EOF
 [Paths]
 Prefix = $NIX_QT5_TMP
-Plugins = lib/qt5/plugins
-Imports = lib/qt5/imports
-Qml2Imports = lib/qt5/qml
-Documentation = share/doc/qt5
+Plugins = $qtPluginPrefix
+Qml2Imports = $qtQmlPrefix
+Documentation = $qtDocPrefix
 EOF
     echo "bin/qt.conf" >> "$NIX_QT5_TMP/nix-support/qt-inputs"
 
diff --git a/pkgs/development/libraries/qt-5/qtbase-setup-hook.sh b/pkgs/development/libraries/qt-5/qtbase-setup-hook.sh
index 47d196cec26..66f5d3f5818 100644
--- a/pkgs/development/libraries/qt-5/qtbase-setup-hook.sh
+++ b/pkgs/development/libraries/qt-5/qtbase-setup-hook.sh
@@ -1,3 +1,7 @@
+qtPluginPrefix=@qtPluginPrefix@
+qtQmlPrefix=@qtQmlPrefix@
+qtDocPrefix=@qtDocPrefix@
+
 addToSearchPathOnceWithCustomDelimiter() {
     local delim="$1"
     local search="$2"
@@ -25,30 +29,28 @@ propagateOnce() {
 }
 
 _qtPropagate() {
-    for dir in "lib/qt5/plugins" "lib/qt5/qml" "lib/qt5/imports"; do
+    for dir in $qtPluginPrefix $qtQmlPrefix; do
         if [ -d "$1/$dir" ]; then
             propagateOnce propagatedBuildInputs "$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"
+    addToSearchPathOnce QT_PLUGIN_PATH "$1/$qtPluginPrefix"
+    addToSearchPathOnce QML2_IMPORT_PATH "$1/$qtQmlPrefix"
 }
 
 crossEnvHooks+=(_qtPropagate)
 
 _qtPropagateNative() {
-    for dir in "lib/qt5/plugins" "lib/qt5/qml" "lib/qt5/imports"; do
+    for dir in $qtPluginPrefix $qtQmlPrefix; do
         if [ -d "$1/$dir" ]; then
             propagateOnce propagatedNativeBuildInputs "$1"
             break
         fi
     done
     if [ -z "$crossConfig" ]; then
-        addToSearchPathOnce QT_PLUGIN_PATH "$1/lib/qt5/plugins"
-        addToSearchPathOnce QML_IMPORT_PATH "$1/lib/qt5/imports"
-        addToSearchPathOnce QML2_IMPORT_PATH "$1/lib/qt5/qml"
+    addToSearchPathOnce QT_PLUGIN_PATH "$1/$qtPluginPrefix"
+    addToSearchPathOnce QML2_IMPORT_PATH "$1/$qtQmlPrefix"
     fi
 }
 
@@ -111,10 +113,9 @@ if [ -z "$NIX_QT5_TMP" ]; then
     cat >"$NIX_QT5_TMP/bin/qt.conf" <<EOF
 [Paths]
 Prefix = $NIX_QT5_TMP
-Plugins = lib/qt5/plugins
-Imports = lib/qt5/imports
-Qml2Imports = lib/qt5/qml
-Documentation = share/doc/qt5
+Plugins = $qtPluginPrefix
+Qml2Imports = $qtQmlPrefix
+Documentation = $qtDocPrefix
 EOF
     echo "bin/qt.conf" >> "$NIX_QT5_TMP/nix-support/qt-inputs"
 
diff --git a/pkgs/development/libraries/qtwebkit-plugins/default.nix b/pkgs/development/libraries/qtwebkit-plugins/default.nix
index 73e62945113..716e6cb2809 100644
--- a/pkgs/development/libraries/qtwebkit-plugins/default.nix
+++ b/pkgs/development/libraries/qtwebkit-plugins/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
 
   postPatch = ''
     sed -i "s,-lhunspell,-lhunspell-1.6," src/spellcheck/spellcheck.pri
-    sed -i "s,\$\$\[QT_INSTALL_PLUGINS\],$out/lib/qt5/plugins," src/src.pro
+    sed -i "s,\$\$\[QT_INSTALL_PLUGINS\],$out/$qtPluginPrefix," src/src.pro
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix
index 6fadf530ed0..d82098852cc 100644
--- a/pkgs/development/qtcreator/default.nix
+++ b/pkgs/development/qtcreator/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   installFlags = [ "INSTALL_ROOT=$(out)" ] ++ optional withDocumentation "install_docs";
 
   preBuild = optional withDocumentation ''
-    ln -s ${qtbase}/share/doc $NIX_QT5_TMP/share
+    ln -s ${qtbase}/$qtDocPrefix $NIX_QT5_TMP/share
   '';
 
   postInstall = ''
diff --git a/pkgs/tools/misc/qt5ct/default.nix b/pkgs/tools/misc/qt5ct/default.nix
index 016e9726ad9..f6ba699211c 100644
--- a/pkgs/tools/misc/qt5ct/default.nix
+++ b/pkgs/tools/misc/qt5ct/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ qtbase qtsvg ];
 
   preConfigure = ''
-    qmakeFlags="$qmakeFlags PLUGINDIR=$out/lib/qt5/plugins"
+    qmakeFlags="$qmakeFlags PLUGINDIR=$out/$qtPluginPrefix"
   '';
 
   preFixup = ''

From 210f6888023c1df8aff2d053a5e41f5e1effdfe7 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 2 Jun 2017 10:40:19 -0500
Subject: [PATCH 020/189] qt5: rename qmakeHook to qmake

---
 pkgs/applications/audio/dfasma/default.nix    |  6 +++---
 pkgs/applications/audio/fmit/default.nix      |  4 ++--
 pkgs/applications/audio/iannix/default.nix    |  5 +++--
 pkgs/applications/audio/keyfinder/default.nix |  5 +++--
 .../audio/sonic-visualiser/default.nix        |  7 +++----
 pkgs/applications/editors/rstudio/default.nix |  5 +++--
 pkgs/applications/editors/tiled/default.nix   |  4 ++--
 .../graphics/awesomebump/default.nix          |  5 +++--
 .../graphics/phototonic/default.nix           |  4 ++--
 pkgs/applications/graphics/rapcad/default.nix |  4 ++--
 pkgs/applications/misc/calibre/default.nix    |  4 ++--
 .../misc/cool-retro-term/default.nix          |  4 ++--
 .../misc/golden-cheetah/default.nix           |  4 ++--
 pkgs/applications/misc/goldendict/default.nix |  9 ++++++---
 pkgs/applications/misc/gpxsee/default.nix     |  4 ++--
 pkgs/applications/misc/openbrf/default.nix    |  4 ++--
 pkgs/applications/misc/qtpass/default.nix     |  4 ++--
 .../misc/redis-desktop-manager/default.nix    |  4 ++--
 pkgs/applications/misc/twmn/default.nix       |  5 +++--
 .../instant-messengers/ricochet/default.nix   |  4 ++--
 .../telegram/cutegram/default.nix             |  4 ++--
 .../libqtelegram-aseman-edition/default.nix   |  4 ++--
 .../telegram/telegram-qml/default.nix         |  4 ++--
 .../instant-messengers/tensor/default.nix     |  4 ++--
 .../networking/irc/communi/default.nix        |  4 ++--
 .../networking/linssid/default.nix            |  5 +++--
 .../networking/mumble/default.nix             |  2 +-
 .../newsreaders/quiterss/default.nix          |  5 +++--
 .../networking/p2p/qbittorrent/default.nix    |  6 +++---
 pkgs/applications/office/cb2bib/default.nix   |  4 ++--
 pkgs/applications/office/mytetra/default.nix  |  5 +++--
 .../science/electronics/fritzing/default.nix  |  4 ++--
 .../robotics/qgroundcontrol/default.nix       | 20 ++++++++-----------
 pkgs/applications/video/bomi/default.nix      |  4 ++--
 pkgs/applications/video/shotcut/default.nix   | 10 +++++++---
 pkgs/applications/video/smplayer/default.nix  |  4 ++--
 pkgs/applications/video/smtube/default.nix    |  5 +++--
 .../applications/video/vokoscreen/default.nix |  5 ++---
 pkgs/data/documentation/zeal/default.nix      |  5 +++--
 pkgs/desktops/lumina/default.nix              |  4 ++--
 .../libraries/accounts-qt/default.nix         |  4 ++--
 .../libraries/libcommuni/default.nix          |  4 ++--
 .../libraries/libkeyfinder/default.nix        |  5 +++--
 .../libraries/qmltermwidget/default.nix       |  4 ++--
 .../libraries/qscintilla/default.nix          |  4 ++--
 .../libraries/qt-5/5.6/default.nix            |  4 ++--
 .../libraries/qt-5/5.8/default.nix            |  4 ++--
 .../libraries/qtinstaller/default.nix         |  6 +++---
 .../libraries/qtstyleplugins/default.nix      |  5 +++--
 .../libraries/qtwebkit-plugins/default.nix    |  4 ++--
 pkgs/development/libraries/quazip/default.nix |  4 ++--
 pkgs/development/libraries/qwt/6.nix          |  4 ++--
 pkgs/development/python-modules/pyqt/5.x.nix  |  7 ++++---
 pkgs/development/qtcreator/default.nix        |  4 ++--
 .../tools/analysis/qcachegrind/default.nix    |  4 ++--
 pkgs/games/chessx/default.nix                 |  6 ++----
 .../dwarf-therapist/default.nix               |  4 ++--
 pkgs/games/mudlet/default.nix                 |  7 ++++---
 pkgs/os-specific/linux/wpa_supplicant/gui.nix |  4 ++--
 pkgs/tools/misc/ckb/default.nix               |  4 ++--
 pkgs/tools/misc/qt5ct/default.nix             |  5 +++--
 pkgs/tools/misc/radeon-profile/default.nix    |  4 ++--
 pkgs/tools/misc/rockbox-utility/default.nix   |  4 ++--
 pkgs/tools/networking/cmst/default.nix        |  4 ++--
 pkgs/top-level/all-packages.nix               |  4 ++--
 65 files changed, 165 insertions(+), 151 deletions(-)

diff --git a/pkgs/applications/audio/dfasma/default.nix b/pkgs/applications/audio/dfasma/default.nix
index d006f2c0178..53ca8d316a2 100644
--- a/pkgs/applications/audio/dfasma/default.nix
+++ b/pkgs/applications/audio/dfasma/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fftw, libsndfile, qtbase, qtmultimedia, qmakeHook, makeQtWrapper }:
+{ stdenv, fetchFromGitHub, fftw, libsndfile, qtbase, qtmultimedia, qmake, makeQtWrapper }:
 
 let
 
@@ -37,9 +37,9 @@ in stdenv.mkDerivation rec {
     owner = "gillesdegottex";
   };
 
-  buildInputs = [ fftw libsndfile qtbase qtmultimedia qmakeHook ];
+  buildInputs = [ fftw libsndfile qtbase qtmultimedia ];
 
-  nativeBuildInputs = [ makeQtWrapper ];
+  nativeBuildInputs = [ makeQtWrapper qmake ];
 
   postPatch = ''
     substituteInPlace dfasma.pro --replace '$$DFASMAVERSIONGITPRO' '${version}'
diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix
index bb4df5ea1db..e4c6c658efd 100644
--- a/pkgs/applications/audio/fmit/default.nix
+++ b/pkgs/applications/audio/fmit/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fftw, freeglut, mesa_glu, qtbase, qtmultimedia, qmakeHook
+{ stdenv, fetchFromGitHub, fftw, freeglut, mesa_glu, qtbase, qtmultimedia, qmake
 , alsaSupport ? true, alsaLib ? null
 , jackSupport ? false, libjack2 ? null
 , portaudioSupport ? false, portaudio ? null }:
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     owner = "gillesdegottex";
   };
 
-  nativeBuildInputs = [ qmakeHook ];
+  nativeBuildInputs = [ qmake ];
   buildInputs = [ fftw qtbase qtmultimedia ]
     ++ optionals alsaSupport [ alsaLib ]
     ++ optionals jackSupport [ libjack2 ]
diff --git a/pkgs/applications/audio/iannix/default.nix b/pkgs/applications/audio/iannix/default.nix
index 83fd2b14ed2..d72a2b13c42 100644
--- a/pkgs/applications/audio/iannix/default.nix
+++ b/pkgs/applications/audio/iannix/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, alsaLib, pkgconfig, qtbase, qtscript, qmakeHook
+{ stdenv, fetchFromGitHub, alsaLib, pkgconfig, qtbase, qtscript, qmake
 }:
 
 stdenv.mkDerivation rec {
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "184ydb9f1303v332k5k3f1ki7cb6nkxhh6ij0yn72v7dp7figrgj";
   };
 
-  buildInputs = [ alsaLib pkgconfig qtbase qtscript qmakeHook ];
+  nativeBuildInputs = [ qmake ];
+  buildInputs = [ alsaLib pkgconfig qtbase qtscript ];
 
   qmakeFlags = [ "PREFIX=/" ];
 
diff --git a/pkgs/applications/audio/keyfinder/default.nix b/pkgs/applications/audio/keyfinder/default.nix
index 0cacd772493..6aaf14a5763 100644
--- a/pkgs/applications/audio/keyfinder/default.nix
+++ b/pkgs/applications/audio/keyfinder/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, libav_0_8, libkeyfinder, qtbase, qtxmlpatterns, qmakeHook, taglib }:
+{ stdenv, fetchFromGitHub, libav_0_8, libkeyfinder, qtbase, qtxmlpatterns, qmake, taglib }:
 
 stdenv.mkDerivation rec {
   name = "keyfinder-${version}";
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
     owner = "ibsh";
   };
 
-  buildInputs = [ libav_0_8 libkeyfinder qtbase qtxmlpatterns qmakeHook taglib ];
+  nativeBuildInputs = [ qmake ];
+  buildInputs = [ libav_0_8 libkeyfinder qtbase qtxmlpatterns taglib ];
 
   postPatch = ''
     substituteInPlace is_KeyFinder.pro \
diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix
index d48f1eb851b..d1e9b50dee3 100644
--- a/pkgs/applications/audio/sonic-visualiser/default.nix
+++ b/pkgs/applications/audio/sonic-visualiser/default.nix
@@ -3,7 +3,7 @@
 { stdenv, fetchurl, alsaLib, bzip2, fftw, libjack2, libX11, liblo
 , libmad, libogg, librdf, librdf_raptor, librdf_rasqal, libsamplerate
 , libsndfile, pkgconfig, libpulseaudio, makeQtWrapper, qtbase, redland
-, qmakeHook, rubberband, serd, sord, vampSDK, fftwFloat
+, qmake, rubberband, serd, sord, vampSDK, fftwFloat
 }:
 
 stdenv.mkDerivation rec {
@@ -16,11 +16,10 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs =
-    [ libsndfile qtbase qmakeHook fftw fftwFloat bzip2 librdf rubberband
+    [ libsndfile qtbase fftw fftwFloat bzip2 librdf rubberband
       libsamplerate vampSDK alsaLib librdf_raptor librdf_rasqal redland
       serd
       sord
-      pkgconfig
       # optional
       libjack2
       # portaudio
@@ -32,7 +31,7 @@ stdenv.mkDerivation rec {
       libX11
     ];
 
-  nativeBuildInputs = [ makeQtWrapper qmakeHook ];
+  nativeBuildInputs = [ makeQtWrapper pkgconfig qmake ];
 
   configurePhase = ''
     for i in sonic-visualiser svapp svcore svgui;
diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix
index eab1228da1a..9ac91e7086a 100644
--- a/pkgs/applications/editors/rstudio/default.nix
+++ b/pkgs/applications/editors/rstudio/default.nix
@@ -10,7 +10,8 @@ in
 stdenv.mkDerivation rec {
   name = "RStudio-${version}";
 
-  buildInputs = [ cmake boost163 zlib openssl R qt5.full qt5.qtwebkit qt5.qmakeHook libuuid unzip ant jdk makeWrapper pandoc ];
+  buildInputs = [ cmake boost163 zlib openssl R qt5.full qt5.qtwebkit libuuid unzip ant jdk makeWrapper pandoc ];
+  nativeBuildInputs = [ qt5.qmake ];
 
   src = fetchurl {
     url = "https://github.com/rstudio/rstudio/archive/v${version}.tar.gz";
@@ -90,7 +91,7 @@ stdenv.mkDerivation rec {
       cp ${pandoc}/bin/pandoc dependencies/common/pandoc/
     '';
 
-  cmakeFlags = [ "-DRSTUDIO_TARGET=Desktop" "-DQT_QMAKE_EXECUTABLE=${qt5.qmakeHook}/bin/qmake" ];
+  cmakeFlags = [ "-DRSTUDIO_TARGET=Desktop" "-DQT_QMAKE_EXECUTABLE=${qt5.qmake}/bin/qmake" ];
 
   desktopItem = makeDesktopItem {
     name = name;
diff --git a/pkgs/applications/editors/tiled/default.nix b/pkgs/applications/editors/tiled/default.nix
index be518b9336a..9bfa3998926 100644
--- a/pkgs/applications/editors/tiled/default.nix
+++ b/pkgs/applications/editors/tiled/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, qmakeHook
+{ stdenv, fetchFromGitHub, pkgconfig, qmake
 , python, qtbase, qttools, zlib }:
 
 let
@@ -14,7 +14,7 @@ in stdenv.mkDerivation rec {
     sha256 = "087jl36g6w2g5l70gz573iwyvx3r7i8fijl3y4mmmf8pyqdyq1n2";
   };
 
-  nativeBuildInputs = [ pkgconfig qmakeHook ];
+  nativeBuildInputs = [ pkgconfig qmake ];
   buildInputs = [ python qtbase qttools ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/applications/graphics/awesomebump/default.nix b/pkgs/applications/graphics/awesomebump/default.nix
index b89e18ed148..9e0916bab9c 100644
--- a/pkgs/applications/graphics/awesomebump/default.nix
+++ b/pkgs/applications/graphics/awesomebump/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, qtbase, qmakeHook, makeWrapper }:
+{ lib, stdenv, fetchurl, qtbase, qmake, makeWrapper }:
 
 stdenv.mkDerivation {
   name = "awesomebump-4.0";
@@ -10,7 +10,8 @@ stdenv.mkDerivation {
 
   setSourceRoot = "sourceRoot=$(echo */Sources)";
 
-  buildInputs = [ qtbase qmakeHook makeWrapper ];
+  nativeBuildInputs = [ makeWrapper qmake ];
+  buildInputs = [ qtbase ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/applications/graphics/phototonic/default.nix b/pkgs/applications/graphics/phototonic/default.nix
index 4782376d1e0..8ce9d407aad 100644
--- a/pkgs/applications/graphics/phototonic/default.nix
+++ b/pkgs/applications/graphics/phototonic/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qtbase, qmakeHook, exiv2 }:
+{ stdenv, fetchFromGitHub, qtbase, qmake, exiv2 }:
 
 stdenv.mkDerivation rec {
   name = "phototonic-${version}";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ qtbase exiv2 ];
-  nativeBuildInputs = [ qmakeHook ];
+  nativeBuildInputs = [ qmake ];
 
   preConfigure = ''
     sed -i 's;/usr;$$PREFIX/;g' phototonic.pro
diff --git a/pkgs/applications/graphics/rapcad/default.nix b/pkgs/applications/graphics/rapcad/default.nix
index b7672a39d0d..451eaae79b2 100644
--- a/pkgs/applications/graphics/rapcad/default.nix
+++ b/pkgs/applications/graphics/rapcad/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, fetchurl, cgal, boost, gmp, mpfr, flex, bison, dxflib, readline
-, qtbase, qmakeHook, mesa_glu
+, qtbase, qmake, mesa_glu
 }:
 
 stdenv.mkDerivation rec {
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  nativeBuildInputs = [ qmakeHook ];
+  nativeBuildInputs = [ qmake ];
   buildInputs = [ qtbase cgal boost gmp mpfr flex bison dxflib readline mesa_glu ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 49c005cf739..5845fe85ccb 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchpatch, poppler_utils, pkgconfig, libpng
-, imagemagick, libjpeg, fontconfig, podofo, qtbase, qmakeHook, icu, sqlite
+, imagemagick, libjpeg, fontconfig, podofo, qtbase, qmake, icu, sqlite
 , makeWrapper, unrarSupport ? false, chmlib, python2Packages, xz, libusb1, libmtp
 , xdg_utils, makeDesktopItem, wrapGAppsHook
 }:
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  nativeBuildInputs = [ makeWrapper pkgconfig qmakeHook ];
+  nativeBuildInputs = [ makeWrapper pkgconfig qmake ];
 
   buildInputs = [
     poppler_utils libpng imagemagick libjpeg
diff --git a/pkgs/applications/misc/cool-retro-term/default.nix b/pkgs/applications/misc/cool-retro-term/default.nix
index 9ff27c74709..ccdedb23cb0 100644
--- a/pkgs/applications/misc/cool-retro-term/default.nix
+++ b/pkgs/applications/misc/cool-retro-term/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchgit, makeQtWrapper, qtbase, qtquick1, qmltermwidget,
-qtquickcontrols, qtgraphicaleffects, qmakeHook }:
+qtquickcontrols, qtgraphicaleffects, qmake }:
 
 stdenv.mkDerivation rec {
   version = "1.0.0";
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   '';
 
   buildInputs = [ qtbase qtquick1 qmltermwidget qtquickcontrols qtgraphicaleffects ];
-  nativeBuildInputs = [ makeQtWrapper qmakeHook ];
+  nativeBuildInputs = [ makeQtWrapper qmake ];
 
   installFlags = [ "INSTALL_ROOT=$(out)" ];
 
diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix
index d6da900656c..3472af27fea 100644
--- a/pkgs/applications/misc/golden-cheetah/default.nix
+++ b/pkgs/applications/misc/golden-cheetah/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl
 , qtbase, qtsvg, qtserialport, qtwebkit, qtmultimedia, qttools, qtconnectivity
-, yacc, flex, zlib, config, qmakeHook, makeQtWrapper
+, yacc, flex, zlib, config, qmake, makeQtWrapper
 }:
 stdenv.mkDerivation rec {
   name = "golden-cheetah-${version}";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     qtbase qtsvg qtserialport qtwebkit qtmultimedia qttools yacc flex zlib
     qtconnectivity
   ];
-  nativeBuildInputs = [ makeQtWrapper qmakeHook ] ++ qtInputs;
+  nativeBuildInputs = [ makeQtWrapper qmake ] ++ qtInputs;
   preConfigure = ''
     cp src/gcconfig.pri.in src/gcconfig.pri
     cp qwt/qwtconfig.pri.in qwt/qwtconfig.pri
diff --git a/pkgs/applications/misc/goldendict/default.nix b/pkgs/applications/misc/goldendict/default.nix
index be36eeceb6b..278c685b7cf 100644
--- a/pkgs/applications/misc/goldendict/default.nix
+++ b/pkgs/applications/misc/goldendict/default.nix
@@ -1,7 +1,8 @@
 { stdenv, fetchurl, pkgconfig, libXtst, libvorbis, hunspell
 , libao, ffmpeg, libeb, lzo, xz, libtiff
-, qtbase, qtsvg, qtwebkit, qtx11extras, qttools, qmakeHook }:
+, qtbase, qtsvg, qtwebkit, qtx11extras, qttools, qmake }:
 stdenv.mkDerivation rec {
+
   name = "goldendict-1.5.0.rc2";
   src = fetchurl {
     url = "https://github.com/goldendict/goldendict/archive/1.5.0-RC2.tar.gz";
@@ -9,10 +10,12 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    pkgconfig qtbase qtsvg qtwebkit qtx11extras qttools libXtst libvorbis hunspell libao ffmpeg libeb
-    lzo xz libtiff qmakeHook
+    pkgconfig qtbase qtsvg qtwebkit qtx11extras qttools
+    libXtst libvorbis hunspell libao ffmpeg libeb lzo xz libtiff
   ];
 
+  nativeBuildInputs = [ qmake ];
+
   qmakeFlags = [ "CONFIG+=zim_support" ];
 
   meta = {
diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix
index 42fc1e46e33..6d3193089c7 100644
--- a/pkgs/applications/misc/gpxsee/default.nix
+++ b/pkgs/applications/misc/gpxsee/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qmakeHook, qtbase, qttools, makeQtWrapper }:
+{ stdenv, fetchFromGitHub, qmake, qtbase, qttools, makeQtWrapper }:
 
 stdenv.mkDerivation rec {
   name = "gpxsee-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "17s1v6b1j7pi0yj554bd0cg14bl854gssp5gj2pl51rxji6zr0wp";
   };
 
-  nativeBuildInputs = [ qmakeHook qttools makeQtWrapper ];
+  nativeBuildInputs = [ qmake qttools makeQtWrapper ];
 
   preConfigure = ''
     substituteInPlace src/config.h --replace /usr/share/gpxsee $out/share/gpxsee
diff --git a/pkgs/applications/misc/openbrf/default.nix b/pkgs/applications/misc/openbrf/default.nix
index 50c8fc7bcec..039b50b133a 100644
--- a/pkgs/applications/misc/openbrf/default.nix
+++ b/pkgs/applications/misc/openbrf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qtbase, vcg, glew, qmakeHook, makeQtWrapper, mesa }:
+{ stdenv, fetchFromGitHub, qtbase, vcg, glew, qmake, makeQtWrapper, mesa }:
 
 
 stdenv.mkDerivation {
@@ -12,9 +12,9 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [ qtbase vcg glew ];
-  nativeBuildInputs = [ qmakeHook makeQtWrapper ];
 
   enableParallelBuilding = true;
+  nativeBuildInputs = [ qmake makeQtWrapper ];
 
   qmakeFlags = [ "openBrf.pro" ];
 
diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix
index 4cdb6591465..a12467c55d4 100644
--- a/pkgs/applications/misc/qtpass/default.nix
+++ b/pkgs/applications/misc/qtpass/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, git, gnupg, makeQtWrapper, pass, qtbase, qtsvg, qttools, qmakeHook }:
+{ stdenv, fetchFromGitHub, git, gnupg, makeQtWrapper, pass, qtbase, qtsvg, qttools, qmake }:
 
 stdenv.mkDerivation rec {
   name = "qtpass-${version}";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ git gnupg pass qtbase qtsvg qttools ];
 
-  nativeBuildInputs = [ makeQtWrapper qmakeHook ];
+  nativeBuildInputs = [ makeQtWrapper qmake ];
 
   preConfigure = ''
     qmakeFlags="$qmakeFlags CONFIG+=release DESTDIR=$out"
diff --git a/pkgs/applications/misc/redis-desktop-manager/default.nix b/pkgs/applications/misc/redis-desktop-manager/default.nix
index 9d333da01cb..f9ca31eccfe 100644
--- a/pkgs/applications/misc/redis-desktop-manager/default.nix
+++ b/pkgs/applications/misc/redis-desktop-manager/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchgit, pkgconfig , libssh2
 , qtbase, qtdeclarative, qtgraphicaleffects, qtimageformats, qtquickcontrols
 , qtsvg, qttools, qtquick1
-, makeQtWrapper, qmakeHook
+, makeQtWrapper, qmake
 }:
 
 let
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     sha256 = "0a7xa39qp1q32zkypw32mm3wi8wbhxhvrm6l3xsa3k1jzih7hzxr";
   };
 
-  nativeBuildInputs = [ makeQtWrapper qmakeHook ];
+  nativeBuildInputs = [ makeQtWrapper qmake ];
 
   buildInputs = [
     pkgconfig libssh2 qtbase qtdeclarative qtgraphicaleffects qtimageformats
diff --git a/pkgs/applications/misc/twmn/default.nix b/pkgs/applications/misc/twmn/default.nix
index c38b97b0e98..7ec3d66f31c 100644
--- a/pkgs/applications/misc/twmn/default.nix
+++ b/pkgs/applications/misc/twmn/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, fetchgit, qtbase, qtx11extras, qmakeHook, pkgconfig, boost }:
+{ fetchurl, stdenv, fetchgit, qtbase, qtx11extras, qmake, pkgconfig, boost }:
 
 stdenv.mkDerivation rec {
   name = "twmn-git-2014-09-23";
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "1a68gka9gyxyzhc9rn8df59rzcdwkjw90cxp1kk0rdfp6svhxhsa";
   };
 
-  buildInputs = [ qtbase qtx11extras pkgconfig boost qmakeHook ];
+  nativeBuildInputs = [ pkgconfig qmake ];
+  buildInputs = [ qtbase qtx11extras boost ];
 
   postPatch = ''
     sed -i s/-Werror// twmnd/twmnd.pro
diff --git a/pkgs/applications/networking/instant-messengers/ricochet/default.nix b/pkgs/applications/networking/instant-messengers/ricochet/default.nix
index d1af2ad70d1..b7566e0be4b 100644
--- a/pkgs/applications/networking/instant-messengers/ricochet/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ricochet/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, makeDesktopItem, unzip
 , qtbase, qttools, makeQtWrapper, qtmultimedia, qtquick1, qtquickcontrols
-, openssl, protobuf, qmakeHook
+, openssl, protobuf, qmake
 }:
 
 stdenv.mkDerivation rec {
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     openssl protobuf
   ];
 
-  nativeBuildInputs = [ pkgconfig makeQtWrapper qmakeHook ];
+  nativeBuildInputs = [ pkgconfig makeQtWrapper qmake ];
 
   preConfigure = ''
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags openssl)"
diff --git a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix
index a20119e0d73..c61c62dc8ba 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix
@@ -3,7 +3,7 @@
 , qtimageformats, qtgraphicaleffects, qtwebkit
 , telegram-qml, libqtelegram-aseman-edition
 , gst_all_1
-, makeQtWrapper, qmakeHook }:
+, makeQtWrapper, qmake }:
 
 stdenv.mkDerivation rec {
   name = "cutegram-${meta.version}";
@@ -20,9 +20,9 @@ stdenv.mkDerivation rec {
     telegram-qml libqtelegram-aseman-edition
   ] ++ (with gst_all_1; [ gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly ]);
 
-  nativeBuildInputs = [ makeQtWrapper qmakeHook ];
 
   enableParallelBuilding = true;
+  nativeBuildInputs = [ makeQtWrapper qmake ];
 
   fixupPhase = ''
     wrapQtProgram $out/bin/cutegram \
diff --git a/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix b/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix
index 322c40afc7d..ec2e65dc499 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub
-, qtbase, qtmultimedia, qtquick1, qmakeHook }:
+, qtbase, qtmultimedia, qtquick1, qmake }:
 
 stdenv.mkDerivation rec {
   name = "libqtelegram-aseman-edition-${meta.version}";
@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ qtbase qtmultimedia qtquick1 ];
-  nativeBuildInputs = [ qmakeHook ];
   enableParallelBuilding = true;
+  nativeBuildInputs = [ qmake ];
 
   patchPhase = ''
     substituteInPlace libqtelegram-ae.pro --replace "/libqtelegram-ae" ""
diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix
index 854648d9786..c8d24c9b28c 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub
-, qtbase, qtmultimedia, qtquick1, qmakeHook
+, qtbase, qtmultimedia, qtquick1, qmake
 , libqtelegram-aseman-edition }:
 
 stdenv.mkDerivation rec {
@@ -13,8 +13,8 @@ stdenv.mkDerivation rec {
   };
 
   propagatedBuildInputs = [ qtbase qtmultimedia qtquick1 libqtelegram-aseman-edition ];
-  nativeBuildInputs = [ qmakeHook ];
   enableParallelBuilding = true;
+  nativeBuildInputs = [ qmake ];
 
   patchPhase = ''
     substituteInPlace telegramqml.pro --replace "/\$\$LIB_PATH" ""
diff --git a/pkgs/applications/networking/instant-messengers/tensor/default.nix b/pkgs/applications/networking/instant-messengers/tensor/default.nix
index 0dfda79e767..d602e887f26 100644
--- a/pkgs/applications/networking/instant-messengers/tensor/default.nix
+++ b/pkgs/applications/networking/instant-messengers/tensor/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, qtbase, qtquickcontrols, qmakeHook, makeQtWrapper, makeDesktopItem }:
+{ stdenv, fetchgit, qtbase, qtquickcontrols, qmake, makeQtWrapper, makeDesktopItem }:
 
 stdenv.mkDerivation rec {
   name = "tensor-git-${version}";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   buildInputs = [ qtbase qtquickcontrols ];
-  nativeBuildInputs = [ qmakeHook makeQtWrapper ];
+  nativeBuildInputs = [ qmake makeQtWrapper ];
 
   desktopItem = makeDesktopItem {
     name        = "tensor";
diff --git a/pkgs/applications/networking/irc/communi/default.nix b/pkgs/applications/networking/irc/communi/default.nix
index c521084213e..7b4d52b73c2 100644
--- a/pkgs/applications/networking/irc/communi/default.nix
+++ b/pkgs/applications/networking/irc/communi/default.nix
@@ -1,4 +1,4 @@
-{ fetchgit, libcommuni, makeQtWrapper, qtbase, qmakeHook, stdenv }:
+{ fetchgit, libcommuni, makeQtWrapper, qtbase, qmake, stdenv }:
 
 stdenv.mkDerivation rec {
   name = "communi-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     fetchSubmodules = true;
   };
 
-  nativeBuildInputs = [ makeQtWrapper qmakeHook ];
+  nativeBuildInputs = [ makeQtWrapper qmake ];
 
   buildInputs = [ libcommuni qtbase ];
 
diff --git a/pkgs/applications/networking/linssid/default.nix b/pkgs/applications/networking/linssid/default.nix
index d35c2e100e4..ad571888a9c 100644
--- a/pkgs/applications/networking/linssid/default.nix
+++ b/pkgs/applications/networking/linssid/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qtbase, qtsvg, qmakeHook, pkgconfig, boost, wirelesstools, iw, qwt6 }:
+{ stdenv, fetchurl, qtbase, qtsvg, qmake, pkgconfig, boost, wirelesstools, iw, qwt6 }:
 
 stdenv.mkDerivation rec {
   name = "linssid-${version}";
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "13d35rlcjncd8lx3khkgn9x8is2xjd5fp6ns5xsn3w6l4xj9b4gl";
   };
 
-  buildInputs = [ qtbase qtsvg pkgconfig boost qwt6 qmakeHook ];
+  nativeBuildInputs = [ qmake ];
+  buildInputs = [ qtbase qtsvg pkgconfig boost qwt6 ];
 
   patches = [ ./0001-unbundled-qwt.patch ];
 
diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index fa8ccf60a2a..f08759514c3 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -20,7 +20,7 @@ let
     patches = optional jackSupport ./mumble-jack-support.patch;
 
     nativeBuildInputs = [ pkgconfig python ]
-      ++ { qt4 = [ qmake4Hook ]; qt5 = [ qt5.qmakeHook ]; }."qt${toString source.qtVersion}"
+      ++ { qt4 = [ qmake4Hook ]; qt5 = [ qt5.qmake ]; }."qt${toString source.qtVersion}"
       ++ (overrides.nativeBuildInputs or [ ]);
     buildInputs = [ boost protobuf avahi ]
       ++ { qt4 = [ qt4 ]; qt5 = [ qt5.qtbase ]; }."qt${toString source.qtVersion}"
diff --git a/pkgs/applications/networking/newsreaders/quiterss/default.nix b/pkgs/applications/networking/newsreaders/quiterss/default.nix
index 2f20710a909..21a55c4136c 100644
--- a/pkgs/applications/networking/newsreaders/quiterss/default.nix
+++ b/pkgs/applications/networking/newsreaders/quiterss/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qt5, qmakeHook, makeQtWrapper, pkgconfig, sqlite }:
+{ stdenv, fetchFromGitHub, qtbase, qmake, qttools, qtwebkit, makeQtWrapper, pkgconfig, sqlite }:
 
 stdenv.mkDerivation rec {
   name = "quiterss-${version}";
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "1y0n5ps1z4wgf9hkfjrw7dfyncrw22bf9mi3052vmf3s7xzz6vbb";
   };
 
-  buildInputs = [ qt5.qtbase qt5.qttools qt5.qtwebkit qmakeHook makeQtWrapper pkgconfig sqlite.dev ];
+  nativeBuildInputs = [ makeQtWrapper pkgconfig qmake ];
+  buildInputs = [ qtbase qttools qtwebkit sqlite.dev ];
 
   postInstall = ''
     wrapQtProgram "$out/bin/quiterss"
diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix
index de05555633e..4db6c9dc16b 100644
--- a/pkgs/applications/networking/p2p/qbittorrent/default.nix
+++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, which
-, boost, libtorrentRasterbar, qmakeHook, qt5
+, boost, libtorrentRasterbar, qmake, qtbase, qttools
 , debugSupport ? false # Debugging
 , guiSupport ? true, dbus_libs ? null # GUI (disable to run headless)
 , webuiSupport ? true # WebUI
@@ -17,9 +17,9 @@ stdenv.mkDerivation rec {
     sha256 = "0vs626khavhqqnq2hrwrxyc8ihbngharcf1fd37nwccvy13qqljn";
   };
 
-  nativeBuildInputs = [ pkgconfig which ];
+  nativeBuildInputs = [ pkgconfig which qmake ];
 
-  buildInputs = [ boost libtorrentRasterbar qt5.qtbase qt5.qttools ]
+  buildInputs = [ boost libtorrentRasterbar qtbase qttools ]
     ++ optional guiSupport dbus_libs;
 
   preConfigure = ''
diff --git a/pkgs/applications/office/cb2bib/default.nix b/pkgs/applications/office/cb2bib/default.nix
index abff61b881f..1004733a18b 100644
--- a/pkgs/applications/office/cb2bib/default.nix
+++ b/pkgs/applications/office/cb2bib/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qmakeHook, qtbase, qtwebkit, qtx11extras, lzo, libX11 }:
+{ stdenv, fetchurl, qmake, qtbase, qtwebkit, qtx11extras, lzo, libX11 }:
 
 stdenv.mkDerivation rec {
   name = pname + "-" + version;
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0yz79v023w1229wzck3gij0iqah1xg8rg4a352q8idvg7bdmyfin";
   };
   buildInputs = [ qtbase qtwebkit qtx11extras lzo libX11 ];
-  nativeBuildInputs = [ qmakeHook ];
+  nativeBuildInputs = [ qmake ];
 
   configurePhase = ''
     runHook preConfigure
diff --git a/pkgs/applications/office/mytetra/default.nix b/pkgs/applications/office/mytetra/default.nix
index b35e60cf2d6..be70cb89d6f 100644
--- a/pkgs/applications/office/mytetra/default.nix
+++ b/pkgs/applications/office/mytetra/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qmakeHook, makeQtWrapper, qtsvg }:
+{ stdenv, fetchurl, qmake, makeQtWrapper, qtsvg }:
 
 let
   version = "1.42.2";
@@ -9,7 +9,8 @@ in stdenv.mkDerivation rec {
     sha256 = "1ah44nf4ksxkh01a2zmgvvby4pwczhyq5vcp270rf6visp8v9804";
   };
 
-  buildInputs = [ qmakeHook makeQtWrapper qtsvg ];
+  nativeBuildInputs = [ makeQtWrapper qmake ];
+  buildInputs = [ qtsvg ];
 
   hardeningDisable = [ "format" ];
 
diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/pkgs/applications/science/electronics/fritzing/default.nix
index 838697f1394..b978e644a8e 100644
--- a/pkgs/applications/science/electronics/fritzing/default.nix
+++ b/pkgs/applications/science/electronics/fritzing/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchpatch, fetchFromGitHub, makeQtWrapper, qmakeHook, pkgconfig
+{ stdenv, fetchpatch, fetchFromGitHub, makeQtWrapper, qmake, pkgconfig
 , qtbase, qtsvg, qtserialport, boost, libgit2
 }:
 
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ qtbase qtsvg qtserialport boost libgit2 ];
 
-  nativeBuildInputs = [ qmakeHook makeQtWrapper pkgconfig ];
+  nativeBuildInputs = [ qmake makeQtWrapper pkgconfig ];
 
   qmakeFlags = [ "phoenix.pro" ];
 
diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix
index 580d9f0e76e..a4a08deb8e2 100644
--- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix
+++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix
@@ -1,19 +1,16 @@
 { stdenv, fetchgit, git,  espeak, SDL, udev, doxygen, cmake
-  , qtbase, qtlocation, qtserialport, qtdeclarative, qtconnectivity, qtxmlpatterns
-  , qtsvg, qtquick1, qtquickcontrols, qtgraphicaleffects, qmakeHook
-  , makeQtWrapper, lndir
-  , gst_all_1, qt-gstreamer1, pkgconfig, glibc
-  , version ? "2.9.4"
+, qtbase, qtlocation, qtserialport, qtdeclarative, qtconnectivity, qtxmlpatterns
+, qtsvg, qtquick1, qtquickcontrols, qtgraphicaleffects, qmake
+, makeQtWrapper, lndir
+, gst_all_1, qt-gstreamer1, pkgconfig, glibc
+, version ? "2.9.4"
 }:
 
 stdenv.mkDerivation rec {
   name = "qgroundcontrol-${version}";
-  buildInputs = [
-   SDL udev doxygen git
-  ] ++ gstInputs;
 
   qtInputs = [
-    qtbase qtlocation qtserialport qtdeclarative qtconnectivity qtxmlpatterns qtsvg 
+    qtbase qtlocation qtserialport qtdeclarative qtconnectivity qtxmlpatterns qtsvg
     qtquick1 qtquickcontrols qtgraphicaleffects
   ];
 
@@ -22,9 +19,8 @@ stdenv.mkDerivation rec {
   ];
 
   enableParallelBuilding = true;
-  nativeBuildInputs = [
-    pkgconfig makeQtWrapper qmakeHook
- ] ++ qtInputs;
+  buildInputs = [ SDL udev doxygen git ] ++ gstInputs ++ qtInputs;
+  nativeBuildInputs = [ pkgconfig makeQtWrapper qmake ];
 
   patches = [ ./0001-fix-gcc-cmath-namespace-issues.patch ];
   postPatch = ''
diff --git a/pkgs/applications/video/bomi/default.nix b/pkgs/applications/video/bomi/default.nix
index c98e2747989..0995052cfc1 100644
--- a/pkgs/applications/video/bomi/default.nix
+++ b/pkgs/applications/video/bomi/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, fetchpatch, pkgconfig, perl, python, which, makeQtWrapper
 , libX11, libxcb, mesa
-, qtbase, qtdeclarative, qtquickcontrols, qttools, qtx11extras, qmakeHook
+, qtbase, qtdeclarative, qtquickcontrols, qttools, qtx11extras, qmake
 , libchardet
 , ffmpeg
 
@@ -104,7 +104,7 @@ stdenv.mkDerivation rec {
                    ++ optional cddaSupport "--enable-cdda"
                    ;
 
-  nativeBuildInputs = [ pkgconfig perl python which qttools makeQtWrapper qmakeHook ];
+  nativeBuildInputs = [ pkgconfig perl python which qttools makeQtWrapper qmake ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix
index 140c8e5863d..d9a38d88f95 100644
--- a/pkgs/applications/video/shotcut/default.nix
+++ b/pkgs/applications/video/shotcut/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, SDL, frei0r, gettext, mlt, jack1, pkgconfig, qtbase,
 qtmultimedia, qtwebkit, qtx11extras, qtwebsockets, qtquickcontrols,
 qtgraphicaleffects,
-qmakeHook, makeQtWrapper }:
+qmake, makeQtWrapper }:
 
 stdenv.mkDerivation rec {
   name = "shotcut-${version}";
@@ -12,10 +12,14 @@ stdenv.mkDerivation rec {
     sha256 = "09nygz1x9fvqf33gqpc6jnr1j7ny0yny3w2ngwqqfkf3f8n83qhr";
   };
 
-  buildInputs = [ SDL frei0r gettext mlt pkgconfig qtbase qtmultimedia qtwebkit
-    qtx11extras qtwebsockets qtquickcontrols qtgraphicaleffects qmakeHook makeQtWrapper ];
 
   enableParallelBuilding = true;
+  nativeBuildInputs = [ makeQtWrapper pkgconfig qmake ];
+  buildInputs = [
+    SDL frei0r gettext mlt
+    qtbase qtmultimedia qtwebkit qtx11extras qtwebsockets qtquickcontrols
+    qtgraphicaleffects
+  ];
 
   prePatch = ''
     sed 's_shotcutPath, "qmelt"_"${mlt}/bin/melt"_' -i src/jobs/meltjob.cpp
diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix
index 146cb3b0e46..b7e4fe6b7c6 100644
--- a/pkgs/applications/video/smplayer/default.nix
+++ b/pkgs/applications/video/smplayer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qmakeHook, qtscript }:
+{ stdenv, fetchurl, qmake, qtscript }:
 
 stdenv.mkDerivation rec {
   name = "smplayer-17.6.0";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ qtscript ];
-  nativeBuildInputs = [ qmakeHook ];
+  nativeBuildInputs = [ qmake ];
 
   dontUseQmakeConfigure = true;
 
diff --git a/pkgs/applications/video/smtube/default.nix b/pkgs/applications/video/smtube/default.nix
index 3f0aff6a15b..b0588796709 100644
--- a/pkgs/applications/video/smtube/default.nix
+++ b/pkgs/applications/video/smtube/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qmakeHook, qtscript, qtwebkit }:
+{ stdenv, fetchurl, qmake, qtscript, qtwebkit }:
 
 stdenv.mkDerivation rec {
   version = "17.5.0";
@@ -15,7 +15,8 @@ stdenv.mkDerivation rec {
 
   dontUseQmakeConfigure = true;
 
-  buildInputs = [ qmakeHook qtscript qtwebkit ];
+  nativeBuildInputs = [ qmake ];
+  buildInputs = [ qtscript qtwebkit ];
 
   meta = with stdenv.lib; {
     description = "Play and download Youtube videos";
diff --git a/pkgs/applications/video/vokoscreen/default.nix b/pkgs/applications/video/vokoscreen/default.nix
index 204580b108f..b10495434b9 100644
--- a/pkgs/applications/video/vokoscreen/default.nix
+++ b/pkgs/applications/video/vokoscreen/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchgit
-, pkgconfig, qtbase, qttools, qmakeHook, qtx11extras, alsaLib, libv4l, libXrandr
+, pkgconfig, qtbase, qttools, qmake, qtx11extras, alsaLib, libv4l, libXrandr
 , ffmpeg
 }:
 
@@ -11,13 +11,12 @@ stdenv.mkDerivation {
     sha256 = "1hvw7xz1mj16ishbaip73wddbmgibsz0pad4y586zbarpynss25z";
   };
 
+  nativeBuildInputs = [ pkgconfig qmake ];
   buildInputs = [
     alsaLib
     libv4l
-    pkgconfig
     qtbase
     qttools
-    qmakeHook
     qtx11extras
     libXrandr
   ];
diff --git a/pkgs/data/documentation/zeal/default.nix b/pkgs/data/documentation/zeal/default.nix
index 25a99789af5..36416c6f827 100644
--- a/pkgs/data/documentation/zeal/default.nix
+++ b/pkgs/data/documentation/zeal/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, libarchive, pkgconfig, qtbase
-, qtimageformats, qtwebkit, qtx11extras, xcbutilkeysyms, qmakeHook }:
+, qtimageformats, qtwebkit, qtx11extras, xcbutilkeysyms, qmake }:
 
 stdenv.mkDerivation rec {
   version = "0.3.1";
@@ -12,8 +12,9 @@ stdenv.mkDerivation rec {
     sha256 = "14ld7zm15677jdlasnfa6c42kiswd4d6yg1db50xbk2yflzzwqqa";
   };
 
+  nativeBuildInputs = [ pkgconfig qmake ];
   buildInputs = [
-    xcbutilkeysyms pkgconfig qtbase qtimageformats qtwebkit qtx11extras libarchive qmakeHook
+    xcbutilkeysyms qtbase qtimageformats qtwebkit qtx11extras libarchive
   ];
 
   qmakeFlags = [ "PREFIX=/" ];
diff --git a/pkgs/desktops/lumina/default.nix b/pkgs/desktops/lumina/default.nix
index 2c80f5157b6..81ced85d462 100644
--- a/pkgs/desktops/lumina/default.nix
+++ b/pkgs/desktops/lumina/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, fluxbox, xscreensaver, desktop_file_utils, numlockx,
-  xorg, qtbase, qtsvg, qtmultimedia, qtx11extras, qmakeHook, qttools, oxygen-icons5
+  xorg, qtbase, qtsvg, qtmultimedia, qtx11extras, qmake, qttools, oxygen-icons5
 }:
 
 stdenv.mkDerivation rec {
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    qmakeHook
+    qmake
     qttools
   ];
 
diff --git a/pkgs/development/libraries/accounts-qt/default.nix b/pkgs/development/libraries/accounts-qt/default.nix
index a6d9a9381f9..883d0d65aa5 100644
--- a/pkgs/development/libraries/accounts-qt/default.nix
+++ b/pkgs/development/libraries/accounts-qt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkgconfig, qtbase, qmakeHook }:
+{ stdenv, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkgconfig, qtbase, qmake }:
 
 stdenv.mkDerivation rec {
   name = "accounts-qt-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ glib libaccounts-glib qtbase ];
-  nativeBuildInputs = [ doxygen pkgconfig qmakeHook ];
+  nativeBuildInputs = [ doxygen pkgconfig qmake ];
 
   preConfigure = ''
     qmakeFlags="$qmakeFlags LIBDIR=$out/lib CMAKE_CONFIG_PATH=$out/lib/cmake"
diff --git a/pkgs/development/libraries/libcommuni/default.nix b/pkgs/development/libraries/libcommuni/default.nix
index 3632fff43bd..2dc9c6577a4 100644
--- a/pkgs/development/libraries/libcommuni/default.nix
+++ b/pkgs/development/libraries/libcommuni/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qtbase, qtdeclarative, qmakeHook, which
+{ stdenv, fetchFromGitHub, qtbase, qtdeclarative, qmake, which
 }:
 
 stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ qtbase qtdeclarative ];
-  nativeBuildInputs = [ qmakeHook which ];
+  nativeBuildInputs = [ qmake which ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/libraries/libkeyfinder/default.nix b/pkgs/development/libraries/libkeyfinder/default.nix
index d95ada04a34..326d9c4f9d7 100644
--- a/pkgs/development/libraries/libkeyfinder/default.nix
+++ b/pkgs/development/libraries/libkeyfinder/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fftw, qtbase, qmakeHook }:
+{ stdenv, fetchFromGitHub, fftw, qtbase, qmake }:
 
 stdenv.mkDerivation rec {
   name = "libkeyfinder-${version}";
@@ -11,7 +11,8 @@ stdenv.mkDerivation rec {
     owner = "ibsh";
   };
 
-  buildInputs = [ fftw qtbase qmakeHook ];
+  nativeBuildInputs = [ qmake ];
+  buildInputs = [ fftw qtbase ];
 
   postPatch = ''
     substituteInPlace LibKeyFinder.pro \
diff --git a/pkgs/development/libraries/qmltermwidget/default.nix b/pkgs/development/libraries/qmltermwidget/default.nix
index 88d942b9fd7..e8e0aba7a24 100644
--- a/pkgs/development/libraries/qmltermwidget/default.nix
+++ b/pkgs/development/libraries/qmltermwidget/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, qtbase, qtquick1, qmakeHook, qtmultimedia }:
+{ stdenv, fetchgit, qtbase, qtquick1, qmake, qtmultimedia }:
 
 stdenv.mkDerivation rec {
   version = "0.1.0";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ qtbase qtquick1 qtmultimedia ];
-  nativeBuildInputs = [ qmakeHook ];
+  nativeBuildInputs = [ qmake ];
 
   patchPhase = ''
     substituteInPlace qmltermwidget.pro \
diff --git a/pkgs/development/libraries/qscintilla/default.nix b/pkgs/development/libraries/qscintilla/default.nix
index 928ff5f788b..c2e6c3cb3b5 100644
--- a/pkgs/development/libraries/qscintilla/default.nix
+++ b/pkgs/development/libraries/qscintilla/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, unzip
 , qt4 ? null, qmake4Hook ? null
-, withQt5 ? false, qtbase ? null, qmakeHook ? null
+, withQt5 ? false, qtbase ? null, qmake ? null
 }:
 
 stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = if withQt5 then [ qtbase ] else [ qt4 ];
-  nativeBuildInputs = [ unzip ] ++ (if withQt5 then [ qmakeHook ] else [ qmake4Hook ]);
+  nativeBuildInputs = [ unzip ] ++ (if withQt5 then [ qmake ] else [ qmake4Hook ]);
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix
index 2dccdd065df..beb80bbd1b1 100644
--- a/pkgs/development/libraries/qt-5/5.6/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/default.nix
@@ -57,7 +57,7 @@ let
       propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or []);
       nativeBuildInputs =
         (args.nativeBuildInputs or [])
-        ++ [ perl self.qmakeHook ];
+        ++ [ perl self.qmake ];
 
       NIX_QT_SUBMODULE = args.NIX_QT_SUBMODULE or true;
 
@@ -127,7 +127,7 @@ let
         { deps = [ makeWrapper ]; }
         (if stdenv.isDarwin then ../make-qt-wrapper-darwin.sh else ../make-qt-wrapper.sh);
 
-      qmakeHook =
+      qmake =
         makeSetupHook
         { deps = [ self.qtbase.dev ]; }
         (if stdenv.isDarwin then ../qmake-hook-darwin.sh else ../qmake-hook.sh);
diff --git a/pkgs/development/libraries/qt-5/5.8/default.nix b/pkgs/development/libraries/qt-5/5.8/default.nix
index 5a737441fa8..129858f8ac9 100644
--- a/pkgs/development/libraries/qt-5/5.8/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/default.nix
@@ -48,7 +48,7 @@ let
       propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or []);
       nativeBuildInputs =
         (args.nativeBuildInputs or [])
-        ++ [ perl self.qmakeHook ];
+        ++ [ perl self.qmake ];
 
       NIX_QT_SUBMODULE = args.NIX_QT_SUBMODULE or true;
 
@@ -114,7 +114,7 @@ let
         { deps = [ makeWrapper ] ++ optionals (!stdenv.isDarwin) [ dconf.lib gtk3 ]; }
         (if stdenv.isDarwin then ../make-qt-wrapper-darwin.sh else ../make-qt-wrapper.sh);
 
-      qmakeHook =
+      qmake =
         makeSetupHook
         { deps = [ self.qtbase.dev ]; }
         (if stdenv.isDarwin then ../qmake-hook-darwin.sh else ../qmake-hook.sh);
diff --git a/pkgs/development/libraries/qtinstaller/default.nix b/pkgs/development/libraries/qtinstaller/default.nix
index 3379cbc9acf..2fc8a894056 100644
--- a/pkgs/development/libraries/qtinstaller/default.nix
+++ b/pkgs/development/libraries/qtinstaller/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchurl, qtdeclarative , qttools, qtbase, qmakeHook }:
+{ stdenv, fetchurl, qtdeclarative , qttools, qtbase, qmake }:
 
 stdenv.mkDerivation rec {
   name = "qtinstaller";
 
-  propagatedBuildInputs = [qtdeclarative qttools];
-  nativeBuildInputs = [ qmakeHook ];
+  propagatedBuildInputs = [ qtdeclarative qttools ];
+  nativeBuildInputs = [ qmake ];
 
   version = "2.0.3";
   src = fetchurl {
diff --git a/pkgs/development/libraries/qtstyleplugins/default.nix b/pkgs/development/libraries/qtstyleplugins/default.nix
index dc27e2034f1..1be83731f20 100644
--- a/pkgs/development/libraries/qtstyleplugins/default.nix
+++ b/pkgs/development/libraries/qtstyleplugins/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qmakeHook, qtbase, pkgconfig, gtk2 }:
+{ stdenv, fetchFromGitHub, qmake, qtbase, pkgconfig, gtk2 }:
 
 stdenv.mkDerivation rec {
   name = "qtstyleplugins-2017-03-11";
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
     sha256 = "085wyn85nrmzr8nv5zv7fi2kqf8rp1gnd30h72s30j55xvhmxvmy";
   };
 
-  buildInputs = [ qmakeHook pkgconfig gtk2 ];
+  nativeBuildInputs = [ pkgconfig qmake ];
+  buildInputs = [ gtk2 ];
 
   installPhase = ''
     make INSTALL_ROOT=$NIX_QT5_TMP install
diff --git a/pkgs/development/libraries/qtwebkit-plugins/default.nix b/pkgs/development/libraries/qtwebkit-plugins/default.nix
index 716e6cb2809..201eb4e7ec9 100644
--- a/pkgs/development/libraries/qtwebkit-plugins/default.nix
+++ b/pkgs/development/libraries/qtwebkit-plugins/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qmakeHook, qtwebkit, hunspell }:
+{ stdenv, fetchFromGitHub, qmake, qtwebkit, hunspell }:
 
 stdenv.mkDerivation {
   name = "qtwebkit-plugins-2015-05-09";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
     sha256 = "0xyq25l56jgdxgqqv0380brhw9gg0hin5hyrf1j6d3c8k1gka20m";
   };
 
-  nativeBuildInputs = [ qmakeHook ];
+  nativeBuildInputs = [ qmake ];
 
   buildInputs = [ qtwebkit hunspell ];
 
diff --git a/pkgs/development/libraries/quazip/default.nix b/pkgs/development/libraries/quazip/default.nix
index 7fbbf27c8eb..4379f5cf667 100644
--- a/pkgs/development/libraries/quazip/default.nix
+++ b/pkgs/development/libraries/quazip/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, zip, zlib, qtbase, qmakeHook }:
+{ fetchurl, stdenv, zip, zlib, qtbase, qmake }:
 
 stdenv.mkDerivation rec {
   name = "quazip-0.7.1";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   preConfigure = "cd quazip";
 
   buildInputs = [ zlib qtbase ];
-  nativeBuildInputs = [ qmakeHook ];
+  nativeBuildInputs = [ qmake ];
 
   meta = {
     description = "Provides access to ZIP archives from Qt programs";
diff --git a/pkgs/development/libraries/qwt/6.nix b/pkgs/development/libraries/qwt/6.nix
index cd940b818e9..314ab0f9e61 100644
--- a/pkgs/development/libraries/qwt/6.nix
+++ b/pkgs/development/libraries/qwt/6.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qtbase, qtsvg, qttools, qmakeHook }:
+{ stdenv, fetchurl, qtbase, qtsvg, qttools, qmake }:
 
 stdenv.mkDerivation rec {
   name = "qwt-6.1.2";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   propagatedBuildInputs = [ qtbase qtsvg qttools ];
-  nativeBuildInputs = [ qmakeHook ];
+  nativeBuildInputs = [ qmake ];
 
   postPatch = ''
     sed -e "s|QWT_INSTALL_PREFIX.*=.*|QWT_INSTALL_PREFIX = $out|g" -i qwtconfig.pri
diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix
index 880edfbab07..5d98544da88 100644
--- a/pkgs/development/python-modules/pyqt/5.x.nix
+++ b/pkgs/development/python-modules/pyqt/5.x.nix
@@ -1,5 +1,5 @@
 { lib, fetchurl, pythonPackages, pkgconfig, qtbase, qtsvg, qtwebkit, qtwebengine, dbus_libs
-, lndir, makeWrapper, qmakeHook }:
+, lndir, makeWrapper, qmake }:
 
 let
   version = "5.8.1";
@@ -21,9 +21,10 @@ in buildPythonPackage {
     sha256 = "0biak7l574i2gc8lj1s45skajbxsmmx66nlvs6xaakzkc6r293qy";
   };
 
+  nativeBuildInputs = [ pkgconfig makeWrapper qmake ];
+
   buildInputs = [
-    pkgconfig makeWrapper lndir
-    qtbase qtsvg qtwebkit qtwebengine dbus_libs qmakeHook
+    lndir qtbase qtsvg qtwebkit qtwebengine dbus_libs
   ];
 
   propagatedBuildInputs = [ sip ];
diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix
index d82098852cc..df6a7fa5a15 100644
--- a/pkgs/development/qtcreator/default.nix
+++ b/pkgs/development/qtcreator/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, makeWrapper
-, qtbase, makeQtWrapper, qtquickcontrols, qtscript, qtdeclarative, qmakeHook
+, qtbase, makeQtWrapper, qtquickcontrols, qtscript, qtdeclarative, qmake
 , withDocumentation ? false
 }:
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative ];
 
-  nativeBuildInputs = [ qmakeHook makeQtWrapper makeWrapper ];
+  nativeBuildInputs = [ qmake makeQtWrapper makeWrapper ];
 
   doCheck = true;
 
diff --git a/pkgs/development/tools/analysis/qcachegrind/default.nix b/pkgs/development/tools/analysis/qcachegrind/default.nix
index 64bb39aaf45..7caac253435 100644
--- a/pkgs/development/tools/analysis/qcachegrind/default.nix
+++ b/pkgs/development/tools/analysis/qcachegrind/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, qmakeHook, makeQtWrapper, qtbase, perl, python, php }:
+{ stdenv, fetchurl, cmake, qmake, makeQtWrapper, qtbase, perl, python, php }:
 
 stdenv.mkDerivation rec {
   name = "qcachegrind-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ qtbase perl python php ];
 
-  nativeBuildInputs = [ qmakeHook makeQtWrapper ];
+  nativeBuildInputs = [ qmake makeQtWrapper ];
 
   postInstall = ''
      mkdir -p $out/bin
diff --git a/pkgs/games/chessx/default.nix b/pkgs/games/chessx/default.nix
index f1dd86d67b9..e8daca26ef7 100644
--- a/pkgs/games/chessx/default.nix
+++ b/pkgs/games/chessx/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, pkgconfig, zlib, qtbase, qtsvg, qttools, qtmultimedia, qmakeHook, fetchurl }:
+{ stdenv, pkgconfig, zlib, qtbase, qtsvg, qttools, qtmultimedia, qmake, fetchurl }:
 stdenv.mkDerivation rec {
   name = "chessx-${version}";
   version = "1.4.0";
@@ -7,15 +7,13 @@ stdenv.mkDerivation rec {
     sha256 = "1x10c9idj2qks8xk9dy7aw3alc5w7z1kvv6dnahs0428j0sp4a74";
   };
   buildInputs = [
-   stdenv
-   pkgconfig
    qtbase
    qtsvg
    qttools
    qtmultimedia
    zlib
-   qmakeHook
   ];
+  nativeBuildInputs = [ pkgconfig qmake ];
 
   # RCC: Error in 'resources.qrc': Cannot find file 'i18n/chessx_da.qm'
   #enableParallelBuilding = true;
diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
index 57610fb1c1c..5be8c7d759e 100644
--- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
+++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, coreutils, qtbase, qtdeclarative, qmakeHook, texlive }:
+{ stdenv, fetchFromGitHub, coreutils, qtbase, qtdeclarative, qmake, texlive }:
 
 stdenv.mkDerivation rec {
   name = "dwarf-therapist-original-${version}";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "layouts" ];
   buildInputs = [ qtbase qtdeclarative ];
-  nativeBuildInputs = [ texlive qmakeHook ];
+  nativeBuildInputs = [ texlive qmake ];
 
   enableParallelBuilding = false;
 
diff --git a/pkgs/games/mudlet/default.nix b/pkgs/games/mudlet/default.nix
index 99c06e56043..078075931da 100644
--- a/pkgs/games/mudlet/default.nix
+++ b/pkgs/games/mudlet/default.nix
@@ -1,5 +1,5 @@
 { fetchurl, unzip, stdenv, makeWrapper, qtbase, yajl, libzip, hunspell
-, boost, lua5_1, luafilesystem, luazip, lrexlib, luasqlite3, qmakeHook }:
+, boost, lua5_1, luafilesystem, luazip, lrexlib, luasqlite3, qmake }:
 
 stdenv.mkDerivation rec {
   name = "mudlet-${version}";
@@ -10,9 +10,10 @@ stdenv.mkDerivation rec {
     sha256 = "08fhqd323kgz5s17ac5z9dhkjxcmwvcmvhzy0x1vw4rayhijfrd7";
   };
 
+  nativeBuildInputs = [ makeWrapper qmake ];
   buildInputs = [
-    unzip qtbase lua5_1 hunspell libzip yajl boost makeWrapper
-    luafilesystem luazip lrexlib luasqlite3 qmakeHook
+    unzip qtbase lua5_1 hunspell libzip yajl boost
+    luafilesystem luazip lrexlib luasqlite3
   ];
 
   preConfigure = "cd src";
diff --git a/pkgs/os-specific/linux/wpa_supplicant/gui.nix b/pkgs/os-specific/linux/wpa_supplicant/gui.nix
index d2bd6ff739f..06a38b29166 100644
--- a/pkgs/os-specific/linux/wpa_supplicant/gui.nix
+++ b/pkgs/os-specific/linux/wpa_supplicant/gui.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qtbase, qmakeHook, inkscape, imagemagick, wpa_supplicant }:
+{ stdenv, fetchurl, qtbase, qmake, inkscape, imagemagick, wpa_supplicant }:
 
 stdenv.mkDerivation {
   name = "wpa_gui-${wpa_supplicant.version}";
@@ -6,7 +6,7 @@ stdenv.mkDerivation {
   inherit (wpa_supplicant) src;
 
   buildInputs = [ qtbase ];
-  nativeBuildInputs = [ qmakeHook inkscape imagemagick ];
+  nativeBuildInputs = [ qmake inkscape imagemagick ];
 
   prePatch = ''
     cd wpa_supplicant/wpa_gui-qt4
diff --git a/pkgs/tools/misc/ckb/default.nix b/pkgs/tools/misc/ckb/default.nix
index b90adfd5852..41116288e53 100644
--- a/pkgs/tools/misc/ckb/default.nix
+++ b/pkgs/tools/misc/ckb/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, libudev, pkgconfig, qtbase, qmakeHook, zlib }:
+{ stdenv, fetchFromGitHub, libudev, pkgconfig, qtbase, qmake, zlib }:
 
 stdenv.mkDerivation rec {
   version = "0.2.6";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     pkgconfig
-    qmakeHook
+    qmake
   ];
 
   patches = [
diff --git a/pkgs/tools/misc/qt5ct/default.nix b/pkgs/tools/misc/qt5ct/default.nix
index f6ba699211c..dce2392cc7b 100644
--- a/pkgs/tools/misc/qt5ct/default.nix
+++ b/pkgs/tools/misc/qt5ct/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qtbase, qtsvg, qttools, qmakeHook, makeQtWrapper }:
+{ stdenv, fetchurl, qtbase, qtsvg, qttools, qmake, makeQtWrapper }:
 
 stdenv.mkDerivation rec {
   name = "qt5ct-${version}";
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "0by0wz40rl9gxvwbd85j0y5xy9mjab1cya96rv48x677v95lhm9f";
   };
 
-  nativeBuildInputs = [ makeQtWrapper qmakeHook qttools ];
+  propagatedBuildInputs = [ qtbase qtsvg qttools ];
+  nativeBuildInputs = [ qmake ];
 
   buildInputs = [ qtbase qtsvg ];
 
diff --git a/pkgs/tools/misc/radeon-profile/default.nix b/pkgs/tools/misc/radeon-profile/default.nix
index ab60bd97b35..f07e1d4adc7 100644
--- a/pkgs/tools/misc/radeon-profile/default.nix
+++ b/pkgs/tools/misc/radeon-profile/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchFromGitHub, qtbase, qmakeHook, makeQtWrapper, libXrandr }:
+{ stdenv, fetchFromGitHub, qtbase, qmake, makeQtWrapper, libXrandr }:
 
 stdenv.mkDerivation rec {
 
   name = "radeon-profile-${version}";
   version = "20161221";
 
-  nativeBuildInputs = [ qmakeHook makeQtWrapper ];
+  nativeBuildInputs = [ qmake makeQtWrapper ];
   buildInputs = [ qtbase libXrandr ];
 
   src = (fetchFromGitHub {
diff --git a/pkgs/tools/misc/rockbox-utility/default.nix b/pkgs/tools/misc/rockbox-utility/default.nix
index 2ec03094f9f..0538dd79508 100644
--- a/pkgs/tools/misc/rockbox-utility/default.nix
+++ b/pkgs/tools/misc/rockbox-utility/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, libusb1
-, qtbase, qttools, makeQtWrapper, qmakeHook
+, qtbase, qttools, makeQtWrapper, qmake
 , withEspeak ? false, espeak ? null }:
 
 stdenv.mkDerivation  rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation  rec {
 
   buildInputs = [ libusb1 qtbase qttools ]
     ++ stdenv.lib.optional withEspeak espeak;
-  nativeBuildInputs = [ makeQtWrapper pkgconfig qmakeHook ];
+  nativeBuildInputs = [ makeQtWrapper pkgconfig qmake ];
 
   preConfigure = ''
     cd rbutil/rbutilqt
diff --git a/pkgs/tools/networking/cmst/default.nix b/pkgs/tools/networking/cmst/default.nix
index e5d404d65e1..8b99182242b 100644
--- a/pkgs/tools/networking/cmst/default.nix
+++ b/pkgs/tools/networking/cmst/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qtbase, qmakeHook, makeWrapper, libX11 }:
+{ stdenv, fetchFromGitHub, qtbase, qmake, makeWrapper, libX11 }:
 
 stdenv.mkDerivation rec {
   name = "cmst-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0lsg8ya36df48ij0jawgli3f63hy6mn9zcla48whb1l4r7cih545";
   };
 
-  nativeBuildInputs = [ makeWrapper qmakeHook ];
+  nativeBuildInputs = [ makeWrapper qmake ];
 
   buildInputs = [ qtbase ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6ce2a8c3754..d7ba1d6a289 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4049,7 +4049,7 @@ with pkgs;
   };
 
   quazip_qt4 = libsForQt5.quazip.override {
-    qtbase = qt4; qmakeHook = qmake4Hook;
+    qtbase = qt4; qmake = qmake4Hook;
   };
 
   scrot = callPackage ../tools/graphics/scrot { };
@@ -15665,7 +15665,7 @@ with pkgs;
 
   rofi-menugen = callPackage ../applications/misc/rofi-menugen { };
 
-  rstudio = callPackage ../applications/editors/rstudio { };
+  rstudio = libsForQt5.callPackage ../applications/editors/rstudio { };
 
   rsync = callPackage ../applications/networking/sync/rsync {
     enableACLs = !(stdenv.isDarwin || stdenv.isSunOS || stdenv.isFreeBSD);

From 7b6f8dc77f7ba2cc28bdff390f5922befefa8b48 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 2 Jun 2017 10:49:32 -0500
Subject: [PATCH 021/189] qt5: move kdeDerivation to qt5.mkDerivation

---
 .../kde/build-support/application.nix         |  9 ++----
 pkgs/applications/kde/default.nix             |  9 +++---
 pkgs/applications/misc/krename/default.nix    |  4 +--
 pkgs/applications/misc/krusader/default.nix   |  5 ++-
 pkgs/applications/misc/yakuake/default.nix    |  4 +--
 .../networking/irc/konversation/default.nix   |  4 +--
 pkgs/build-support/kde/derivation.nix         | 17 ----------
 .../plasma-5/build-support/package.nix        |  4 +--
 pkgs/desktops/plasma-5/default.nix            |  5 +--
 .../build-support/framework.nix               |  4 +--
 .../libraries/kde-frameworks/default.nix      |  5 +--
 .../libraries/qt-5/5.6/default.nix            | 32 ++++++++++++++++---
 .../libraries/qt-5/5.8/default.nix            | 32 ++++++++++++++++---
 pkgs/tools/misc/kronometer/default.nix        |  4 +--
 pkgs/tools/misc/partition-manager/default.nix |  9 +++---
 pkgs/tools/misc/peruse/default.nix            |  4 +--
 pkgs/tools/text/kdiff3/default.nix            |  6 ++--
 pkgs/top-level/all-packages.nix               |  9 ++----
 18 files changed, 93 insertions(+), 73 deletions(-)
 delete mode 100644 pkgs/build-support/kde/derivation.nix

diff --git a/pkgs/applications/kde/build-support/application.nix b/pkgs/applications/kde/build-support/application.nix
index 92fdb439330..a5d1ccc3add 100644
--- a/pkgs/applications/kde/build-support/application.nix
+++ b/pkgs/applications/kde/build-support/application.nix
@@ -1,4 +1,4 @@
-{ kdeDerivation, lib, debug, srcs }:
+{ mkDerivation, lib, srcs }:
 
 args:
 
@@ -7,15 +7,10 @@ let
   sname = args.sname or name;
   inherit (srcs."${sname}") src version;
 in
-kdeDerivation (args // {
+mkDerivation (args // {
   name = "${name}-${version}";
   inherit src;
 
-  cmakeFlags =
-    (args.cmakeFlags or [])
-    ++ [ "-DBUILD_TESTING=OFF" ]
-    ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug";
-
   meta = {
     platforms = lib.platforms.linux;
     homepage = "http://www.kde.org";
diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 81c50147cb6..5056cc8725e 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -27,9 +27,7 @@ still shows most of the available features is in `./gwenview.nix`.
 
 {
   stdenv, lib, libsForQt5, fetchurl, recurseIntoAttrs,
-  kdeDerivation, plasma5,
-  attica, phonon,
-  debug ? false,
+  plasma5, attica, phonon,
 }:
 
 let
@@ -43,8 +41,9 @@ let
     let
       callPackage = self.newScope {
         kdeApp = import ./build-support/application.nix {
-          inherit lib kdeDerivation;
-          inherit debug srcs;
+          inherit lib;
+          inherit srcs;
+          mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {};
         };
       };
     in {
diff --git a/pkgs/applications/misc/krename/default.nix b/pkgs/applications/misc/krename/default.nix
index c6baab21ee0..05d1ce1a950 100644
--- a/pkgs/applications/misc/krename/default.nix
+++ b/pkgs/applications/misc/krename/default.nix
@@ -1,5 +1,5 @@
 {
-  kdeDerivation, kdeWrapper, fetchFromGitHub, lib,
+  mkDerivation, kdeWrapper, fetchFromGitHub, lib,
   extra-cmake-modules, kdoctools, kconfig, kinit, kjsembed,
   taglib, exiv2, podofo
 }:
@@ -7,7 +7,7 @@
 let
   pname = "krename";
   version = "20170610";
-  unwrapped = kdeDerivation rec {
+  unwrapped = mkDerivation rec {
     name = "${pname}-${version}";
 
     src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/krusader/default.nix b/pkgs/applications/misc/krusader/default.nix
index c085d916d86..df557f76e73 100644
--- a/pkgs/applications/misc/krusader/default.nix
+++ b/pkgs/applications/misc/krusader/default.nix
@@ -1,5 +1,5 @@
 {
-  kdeDerivation, kdeWrapper, fetchurl, lib,
+  mkDerivation, kdeWrapper, fetchurl, lib,
   extra-cmake-modules, kdoctools,
   kconfig, kinit, kparts
 }:
@@ -7,7 +7,7 @@
 let
   pname = "krusader";
   version = "2.6.0";
-  unwrapped = kdeDerivation rec {
+  unwrapped = mkDerivation rec {
     name = "krusader-${version}";
 
     src = fetchurl {
@@ -24,7 +24,6 @@ let
 
     nativeBuildInputs = [ extra-cmake-modules kdoctools ];
     propagatedBuildInputs = [ kconfig kinit kparts ];
-    enableParallelBuilding = true;
   };
 
 in kdeWrapper {
diff --git a/pkgs/applications/misc/yakuake/default.nix b/pkgs/applications/misc/yakuake/default.nix
index a70b4be287c..7df1c7383c7 100644
--- a/pkgs/applications/misc/yakuake/default.nix
+++ b/pkgs/applications/misc/yakuake/default.nix
@@ -1,4 +1,4 @@
-{ kdeDerivation
+{ mkDerivation
 , lib
 , fetchurl
 , kdoctools
@@ -21,7 +21,7 @@ let
   unwrapped = let
     pname = "yakuake";
     version = "3.0.3";
-  in kdeDerivation rec {
+  in mkDerivation rec {
     name = "${pname}-${version}";
 
     src = fetchurl {
diff --git a/pkgs/applications/networking/irc/konversation/default.nix b/pkgs/applications/networking/irc/konversation/default.nix
index 6f4bc2af79f..740f30874bf 100644
--- a/pkgs/applications/networking/irc/konversation/default.nix
+++ b/pkgs/applications/networking/irc/konversation/default.nix
@@ -1,4 +1,4 @@
-{ kdeDerivation
+{ mkDerivation
 , lib
 , fetchurl
 , extra-cmake-modules
@@ -31,7 +31,7 @@ let
   unwrapped = let
     pname = "konversation";
     version = "1.6.2";
-  in kdeDerivation rec {
+  in mkDerivation rec {
     name = "${pname}-${version}";
 
     src = fetchurl {
diff --git a/pkgs/build-support/kde/derivation.nix b/pkgs/build-support/kde/derivation.nix
deleted file mode 100644
index 2e29a0a661e..00000000000
--- a/pkgs/build-support/kde/derivation.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ stdenv, lib, debug ? false }:
-
-args:
-
-stdenv.mkDerivation (args // {
-
-  outputs = args.outputs or [ "out" "dev" ];
-
-  propagatedUserEnvPkgs =
-    builtins.map lib.getBin (args.propagatedBuildInputs or []);
-
-  cmakeFlags =
-    (args.cmakeFlags or [])
-    ++ [ "-DBUILD_TESTING=OFF" ]
-    ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug";
-
-})
diff --git a/pkgs/desktops/plasma-5/build-support/package.nix b/pkgs/desktops/plasma-5/build-support/package.nix
index 1e9ba016c47..64c7934cc23 100644
--- a/pkgs/desktops/plasma-5/build-support/package.nix
+++ b/pkgs/desktops/plasma-5/build-support/package.nix
@@ -1,4 +1,4 @@
-{ kdeDerivation, lib, fetchurl }:
+{ mkDerivation, lib, fetchurl }:
 
 let
   mirror = "mirror://kde";
@@ -12,7 +12,7 @@ let
   sname = args.sname or name;
   inherit (srcs."${sname}") src version;
 in
-kdeDerivation (args // {
+mkDerivation (args // {
   name = "${name}-${version}";
   inherit src;
 
diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix
index 1a8f1ed064b..83d7d39dd86 100644
--- a/pkgs/desktops/plasma-5/default.nix
+++ b/pkgs/desktops/plasma-5/default.nix
@@ -25,7 +25,7 @@ existing packages here and modify it as necessary.
 */
 
 {
-  libsForQt5, kdeDerivation, lib, fetchurl,
+  libsForQt5, lib, fetchurl,
   gconf,
   debug ? false,
 }:
@@ -35,7 +35,8 @@ let
     let
       callPackage = self.newScope {
         plasmaPackage = import ./build-support/package.nix {
-          inherit kdeDerivation lib fetchurl;
+          inherit lib fetchurl;
+          mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {};
         };
       };
     in {
diff --git a/pkgs/development/libraries/kde-frameworks/build-support/framework.nix b/pkgs/development/libraries/kde-frameworks/build-support/framework.nix
index 5b6f2cc4b26..04832cf5608 100644
--- a/pkgs/development/libraries/kde-frameworks/build-support/framework.nix
+++ b/pkgs/development/libraries/kde-frameworks/build-support/framework.nix
@@ -1,4 +1,4 @@
-{ kdeDerivation, lib, fetchurl }:
+{ mkDerivation, lib, fetchurl }:
 
 let
   mirror = "mirror://kde";
@@ -10,7 +10,7 @@ args:
 let
   inherit (args) name;
   inherit (srcs."${name}") src version;
-in kdeDerivation (args // {
+in mkDerivation (args // {
   name = "${name}-${version}";
   inherit src;
 
diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix
index 221fba628ba..e5a765d7c16 100644
--- a/pkgs/development/libraries/kde-frameworks/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/default.nix
@@ -24,14 +24,15 @@ existing packages here and modify it as necessary.
 
 */
 
-{ libsForQt5, kdeDerivation, lib, fetchurl }:
+{ libsForQt5, lib, fetchurl }:
 
 let
   packages = self: with self;
     let
       callPackage = self.newScope {
         kdeFramework = import ./build-support/framework.nix {
-          inherit kdeDerivation lib fetchurl;
+          inherit lib fetchurl;
+          mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {};
         };
       };
     in {
diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix
index beb80bbd1b1..586a8d584da 100644
--- a/pkgs/development/libraries/qt-5/5.6/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/default.nix
@@ -33,6 +33,7 @@ existing packages here and modify it as necessary.
   # options
   developerBuild ? false,
   decryptSslTraffic ? false,
+  debug ? null,
 }:
 
 with stdenv.lib;
@@ -44,12 +45,36 @@ let
   mirror = "http://download.qt.io";
   srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; };
 
+  mkDerivation = args:
+    stdenv.mkDerivation (args // {
+
+      outputs = args.outputs or [ "out" "dev" ];
+
+      propagatedUserEnvPkgs =
+        (args.propagatedUserEnvPkgs or [])
+        ++ map getBin (args.propagatedBuildInputs or []);
+
+      qmakeFlags =
+        (args.qmakeFlags or [])
+        ++ optional (debug != null)
+           (if debug then "CONFIG+=debug" else "CONFIG+=release");
+
+      cmakeFlags =
+        (args.cmakeFlags or [])
+        ++ [ "-DBUILD_TESTING=OFF" ]
+        ++ optional (debug != null)
+           (if debug then "-DCMAKE_BUILD_TYPE=Debug"
+                     else "-DCMAKE_BUILD_TYPE=Release");
+
+      enableParallelBuilding = args.enableParallelBuilding or true;
+
+    });
+
   qtSubmodule = args:
     let
       inherit (args) name;
       version = args.version or srcs."${name}".version;
       src = args.src or srcs."${name}".src;
-      inherit (stdenv) mkDerivation;
     in mkDerivation (args // {
       name = "${name}-${version}";
       inherit src;
@@ -61,13 +86,10 @@ let
 
       NIX_QT_SUBMODULE = args.NIX_QT_SUBMODULE or true;
 
-      outputs = args.outputs or [ "out" "dev" ];
       setOutputFlags = args.setOutputFlags or false;
 
       setupHook = ../qtsubmodule-setup-hook.sh;
 
-      enableParallelBuilding = args.enableParallelBuilding or true;
-
       meta = self.qtbase.meta // (args.meta or {});
     });
 
@@ -76,6 +98,8 @@ let
       callPackage = self.newScope { inherit qtCompatVersion qtSubmodule srcs; };
     in {
 
+      inherit mkDerivation;
+
       qtbase = callPackage ./qtbase {
         inherit bison cups harfbuzz mesa;
         inherit developerBuild decryptSslTraffic;
diff --git a/pkgs/development/libraries/qt-5/5.8/default.nix b/pkgs/development/libraries/qt-5/5.8/default.nix
index 129858f8ac9..399c0415b11 100644
--- a/pkgs/development/libraries/qt-5/5.8/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/default.nix
@@ -24,6 +24,7 @@ top-level attribute to `top-level/all-packages.nix`.
   # options
   developerBuild ? false,
   decryptSslTraffic ? false,
+  debug ? null,
 }:
 
 with stdenv.lib;
@@ -35,12 +36,36 @@ let
   mirror = "http://download.qt.io";
   srcs = import ./srcs.nix { inherit fetchurl; inherit mirror; };
 
+  mkDerivation = args:
+    stdenv.mkDerivation (args // {
+
+      outputs = args.outputs or [ "out" "dev" ];
+
+      propagatedUserEnvPkgs =
+        (args.propagatedUserEnvPkgs or [])
+        ++ map getBin (args.propagatedBuildInputs or []);
+
+      qmakeFlags =
+        (args.qmakeFlags or [])
+        ++ optional (debug != null)
+           (if debug then "CONFIG+=debug" else "CONFIG+=release");
+
+      cmakeFlags =
+        (args.cmakeFlags or [])
+        ++ [ "-DBUILD_TESTING=OFF" ]
+        ++ optional (debug != null)
+           (if debug then "-DCMAKE_BUILD_TYPE=Debug"
+                     else "-DCMAKE_BUILD_TYPE=Release");
+
+      enableParallelBuilding = args.enableParallelBuilding or true;
+
+    });
+
   qtSubmodule = args:
     let
       inherit (args) name;
       version = args.version or srcs."${name}".version;
       src = args.src or srcs."${name}".src;
-      inherit (stdenv) mkDerivation;
     in mkDerivation (args // {
       name = "${name}-${version}";
       inherit src;
@@ -52,13 +77,10 @@ let
 
       NIX_QT_SUBMODULE = args.NIX_QT_SUBMODULE or true;
 
-      outputs = args.outputs or [ "out" "dev" ];
       setOutputFlags = args.setOutputFlags or false;
 
       setupHook = ../qtsubmodule-setup-hook.sh;
 
-      enableParallelBuilding = args.enableParallelBuilding or true;
-
       meta = self.qtbase.meta // (args.meta or {});
     });
 
@@ -67,6 +89,8 @@ let
       callPackage = self.newScope { inherit qtCompatVersion qtSubmodule srcs; };
     in {
 
+      inherit mkDerivation;
+
       qtbase = callPackage ./qtbase {
         inherit (srcs.qtbase) src version;
         inherit bison cups harfbuzz mesa;
diff --git a/pkgs/tools/misc/kronometer/default.nix b/pkgs/tools/misc/kronometer/default.nix
index 5ba2543e273..088d01b882d 100644
--- a/pkgs/tools/misc/kronometer/default.nix
+++ b/pkgs/tools/misc/kronometer/default.nix
@@ -1,5 +1,5 @@
 {
-  kdeDerivation, kdeWrapper, fetchurl, lib,
+  mkDerivation, kdeWrapper, fetchurl, lib,
   extra-cmake-modules, kdoctools,
   kconfig, kinit
 }:
@@ -7,7 +7,7 @@
 let
   pname = "kronometer";
   version = "2.1.3";
-  unwrapped = kdeDerivation rec {
+  unwrapped = mkDerivation rec {
     name = "${pname}-${version}";
 
     src = fetchurl {
diff --git a/pkgs/tools/misc/partition-manager/default.nix b/pkgs/tools/misc/partition-manager/default.nix
index dcea9c47aec..ffee286f57f 100644
--- a/pkgs/tools/misc/partition-manager/default.nix
+++ b/pkgs/tools/misc/partition-manager/default.nix
@@ -1,11 +1,11 @@
-{ kdeDerivation, kdeWrapper, fetchurl, lib
-, ecm, kdoctools
+{ mkDerivation, kdeWrapper, fetchurl, lib
+, extra-cmake-modules, kdoctools
 , kconfig, kinit, kpmcore
 , eject, libatasmart }:
 
 let
   pname = "partitionmanager";
-  unwrapped = kdeDerivation rec {
+  unwrapped = mkDerivation rec {
     name = "${pname}-${version}";
     version = "3.0.1";
 
@@ -19,11 +19,10 @@ let
       license = licenses.gpl2;
       maintainers = with maintainers; [ peterhoeg ];
     };
-    nativeBuildInputs = [ ecm kdoctools ];
+    nativeBuildInputs = [ extra-cmake-modules kdoctools ];
     # refer to kpmcore for the use of eject
     buildInputs = [ eject libatasmart ];
     propagatedBuildInputs = [ kconfig kinit kpmcore ];
-    enableParallelBuilding = true;
   };
 
 in kdeWrapper {
diff --git a/pkgs/tools/misc/peruse/default.nix b/pkgs/tools/misc/peruse/default.nix
index 1c7a28e2975..5b5cbbf59cf 100644
--- a/pkgs/tools/misc/peruse/default.nix
+++ b/pkgs/tools/misc/peruse/default.nix
@@ -1,5 +1,5 @@
 {
-  kdeDerivation, kdeWrapper, fetchFromGitHub, fetchurl, lib,
+  mkDerivation, kdeWrapper, fetchFromGitHub, fetchurl, lib,
   extra-cmake-modules, kdoctools,
   baloo, kconfig, kfilemetadata, kinit, kirigami, knewstuff, plasma-framework
 }:
@@ -13,7 +13,7 @@ let
     rev    = "d1be8c43a82a4320306c8e835a86fdb7b2574ca7";
     sha256 = "03ds5da69zipa25rsp76l6xqivrh3wcgygwyqa5x2rgcz3rjnlpr";
   };
-  unwrapped = kdeDerivation rec {
+  unwrapped = mkDerivation rec {
     name = "${pname}-${version}";
 
     src = fetchurl {
diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix
index 124855525ac..3263fe09f6f 100644
--- a/pkgs/tools/text/kdiff3/default.nix
+++ b/pkgs/tools/text/kdiff3/default.nix
@@ -1,10 +1,10 @@
 {
-  kdeDerivation, kdeWrapper, lib, fetchgit, fetchpatch,
+  mkDerivation, lib, kdeWrapper, fetchgit, fetchpatch,
   extra-cmake-modules, kdoctools, kconfig, kinit, kparts
 }:
 
 let
-  unwrapped = kdeDerivation rec {
+  unwrapped = mkDerivation rec {
     name = "kdiff3-${version}";
     version = "1.7.0-2017-02-19";
 
@@ -34,8 +34,6 @@ let
 
     propagatedBuildInputs = [ kconfig kinit kparts ];
 
-    enableParallelBuilding = true;
-
     meta = with lib; {
       homepage = http://kdiff3.sourceforge.net/;
       license = licenses.gpl2Plus;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d7ba1d6a289..d730991ffdf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -292,9 +292,6 @@ with pkgs;
       inherit kernel rootModules allowMissing;
     };
 
-  kdeDerivation = makeOverridable (import ../build-support/kde/derivation.nix)
-    { inherit stdenv lib; };
-
   kdeWrapper = callPackage ../build-support/kde/wrapper.nix {
     inherit (gnome3) dconf;
   };
@@ -8233,7 +8230,7 @@ with pkgs;
       mkFrameworks = import ../development/libraries/kde-frameworks;
       attrs = {
         inherit libsForQt5;
-        inherit kdeDerivation lib fetchurl;
+        inherit lib fetchurl;
       };
     in
       recurseIntoAttrs (makeOverridable mkFrameworks attrs);
@@ -14620,7 +14617,7 @@ with pkgs;
       mkApplications = import ../applications/kde;
       attrs = {
         inherit stdenv lib libsForQt5 fetchurl recurseIntoAttrs;
-        inherit kdeDerivation plasma5;
+        inherit plasma5;
         inherit attica phonon;
       };
     in
@@ -17570,7 +17567,7 @@ with pkgs;
     let
       mkPlasma5 = import ../desktops/plasma-5;
       attrs = {
-        inherit libsForQt5 kdeDerivation lib fetchurl;
+        inherit libsForQt5 lib fetchurl;
         inherit (gnome3) gconf;
       };
     in

From 6beea32ab104af7aad43383513682198d2f01430 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 2 Jun 2017 10:49:52 -0500
Subject: [PATCH 022/189] kdeApplications: rename kdeApp to mkDerivation

---
 pkgs/applications/editors/kile/default.nix         | 4 ++--
 pkgs/applications/kde/akonadi-contacts.nix         | 4 ++--
 pkgs/applications/kde/akonadi-mime.nix             | 4 ++--
 pkgs/applications/kde/akonadi.nix                  | 4 ++--
 pkgs/applications/kde/ark/default.nix              | 4 ++--
 pkgs/applications/kde/baloo-widgets.nix            | 4 ++--
 pkgs/applications/kde/default.nix                  | 2 +-
 pkgs/applications/kde/dolphin-plugins.nix          | 4 ++--
 pkgs/applications/kde/dolphin.nix                  | 4 ++--
 pkgs/applications/kde/ffmpegthumbs.nix             | 4 ++--
 pkgs/applications/kde/filelight.nix                | 4 ++--
 pkgs/applications/kde/gwenview.nix                 | 4 ++--
 pkgs/applications/kde/k3b.nix                      | 4 ++--
 pkgs/applications/kde/kate.nix                     | 4 ++--
 pkgs/applications/kde/kcachegrind.nix              | 4 ++--
 pkgs/applications/kde/kcalc.nix                    | 4 ++--
 pkgs/applications/kde/kcolorchooser.nix            | 4 ++--
 pkgs/applications/kde/kcontacts.nix                | 4 ++--
 pkgs/applications/kde/kde-locale-4.nix             | 4 ++--
 pkgs/applications/kde/kde-locale-5.nix             | 4 ++--
 pkgs/applications/kde/kdegraphics-mobipocket.nix   | 4 ++--
 pkgs/applications/kde/kdegraphics-thumbnailers.nix | 4 ++--
 pkgs/applications/kde/kdelibs/default.nix          | 4 ++--
 pkgs/applications/kde/kdenetwork-filesharing.nix   | 4 ++--
 pkgs/applications/kde/kdenlive.nix                 | 4 ++--
 pkgs/applications/kde/kdf.nix                      | 4 ++--
 pkgs/applications/kde/kgpg.nix                     | 4 ++--
 pkgs/applications/kde/khelpcenter.nix              | 4 ++--
 pkgs/applications/kde/kig.nix                      | 8 ++++----
 pkgs/applications/kde/kio-extras.nix               | 4 ++--
 pkgs/applications/kde/kmime.nix                    | 4 ++--
 pkgs/applications/kde/kmix.nix                     | 4 ++--
 pkgs/applications/kde/kolourpaint.nix              | 6 +++---
 pkgs/applications/kde/kompare.nix                  | 4 ++--
 pkgs/applications/kde/konsole.nix                  | 4 ++--
 pkgs/applications/kde/krfb.nix                     | 4 ++--
 pkgs/applications/kde/kwalletmanager.nix           | 4 ++--
 pkgs/applications/kde/libkcddb.nix                 | 5 ++---
 pkgs/applications/kde/libkdcraw.nix                | 4 ++--
 pkgs/applications/kde/libkexiv2.nix                | 4 ++--
 pkgs/applications/kde/libkipi.nix                  | 4 ++--
 pkgs/applications/kde/libkomparediff2.nix          | 4 ++--
 pkgs/applications/kde/marble.nix                   | 4 ++--
 pkgs/applications/kde/okteta.nix                   | 4 ++--
 pkgs/applications/kde/okular.nix                   | 4 ++--
 pkgs/applications/kde/print-manager.nix            | 4 ++--
 pkgs/applications/kde/spectacle.nix                | 4 ++--
 47 files changed, 96 insertions(+), 97 deletions(-)

diff --git a/pkgs/applications/editors/kile/default.nix b/pkgs/applications/editors/kile/default.nix
index fa8d4d8313e..3834269f180 100644
--- a/pkgs/applications/editors/kile/default.nix
+++ b/pkgs/applications/editors/kile/default.nix
@@ -1,4 +1,4 @@
-{ kdeDerivation
+{ mkDerivation
 , lib
 , fetchgit
 , extra-cmake-modules
@@ -23,7 +23,7 @@
 
 let
   unwrapped =
-    kdeDerivation rec {
+    mkDerivation rec {
       name = "kile-${version}";
       version = "2017-02-09";
 
diff --git a/pkgs/applications/kde/akonadi-contacts.nix b/pkgs/applications/kde/akonadi-contacts.nix
index 830c9e6899e..7d017f6496f 100644
--- a/pkgs/applications/kde/akonadi-contacts.nix
+++ b/pkgs/applications/kde/akonadi-contacts.nix
@@ -1,11 +1,11 @@
 {
-  kdeApp, lib,
+  mkDerivation, lib,
   extra-cmake-modules,
   akonadi-mime, grantlee, kcontacts, kio, kitemmodels, kmime, qtwebengine,
   akonadi
 }:
 
-kdeApp {
+mkDerivation {
   name = "akonadi-contacts";
   meta = {
     license = with lib.licenses; [ gpl2 lgpl21 ];
diff --git a/pkgs/applications/kde/akonadi-mime.nix b/pkgs/applications/kde/akonadi-mime.nix
index ba4b4b50242..390ef373528 100644
--- a/pkgs/applications/kde/akonadi-mime.nix
+++ b/pkgs/applications/kde/akonadi-mime.nix
@@ -1,10 +1,10 @@
 {
-  kdeApp, lib,
+  mkDerivation, lib,
   extra-cmake-modules,
   akonadi, kdbusaddons, kio, kitemmodels, kmime
 }:
 
-kdeApp {
+mkDerivation {
   name = "akonadi-mime";
   meta = {
     license = with lib.licenses; [ gpl2 lgpl21 ];
diff --git a/pkgs/applications/kde/akonadi.nix b/pkgs/applications/kde/akonadi.nix
index 284ed60a9cb..367fdd36fb8 100644
--- a/pkgs/applications/kde/akonadi.nix
+++ b/pkgs/applications/kde/akonadi.nix
@@ -1,12 +1,12 @@
 {
-  kdeApp, lib,
+  mkDerivation, lib,
   extra-cmake-modules,
   kcompletion, kconfigwidgets, kdbusaddons, kdesignerplugin, kiconthemes,
   kio,
   boost, kitemmodels
 }:
 
-kdeApp {
+mkDerivation {
   name = "akonadi";
   meta = {
     license = [ lib.licenses.lgpl21 ];
diff --git a/pkgs/applications/kde/ark/default.nix b/pkgs/applications/kde/ark/default.nix
index 52cb403f202..d7a6ee2bdc7 100644
--- a/pkgs/applications/kde/ark/default.nix
+++ b/pkgs/applications/kde/ark/default.nix
@@ -1,5 +1,5 @@
 {
-  kdeApp, lib, config, kdeWrapper,
+  mkDerivation, lib, config, kdeWrapper,
 
   extra-cmake-modules, kdoctools, makeWrapper,
 
@@ -15,7 +15,7 @@
 
 let
   unwrapped =
-    kdeApp {
+    mkDerivation {
       name = "ark";
       nativeBuildInputs = [
         extra-cmake-modules kdoctools makeWrapper
diff --git a/pkgs/applications/kde/baloo-widgets.nix b/pkgs/applications/kde/baloo-widgets.nix
index bb680305709..17ae75cc479 100644
--- a/pkgs/applications/kde/baloo-widgets.nix
+++ b/pkgs/applications/kde/baloo-widgets.nix
@@ -1,10 +1,10 @@
 {
-  kdeApp, lib,
+  mkDerivation, lib,
   extra-cmake-modules, kdoctools,
   baloo, kconfig, kdelibs4support, kfilemetadata, ki18n, kio, kservice
 }:
 
-kdeApp {
+mkDerivation {
   name = "baloo-widgets";
   meta = {
     license = [ lib.licenses.lgpl21 ];
diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 5056cc8725e..931132cf428 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -40,7 +40,7 @@ let
   packages = self: with self;
     let
       callPackage = self.newScope {
-        kdeApp = import ./build-support/application.nix {
+        mkDerivation = import ./build-support/application.nix {
           inherit lib;
           inherit srcs;
           mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {};
diff --git a/pkgs/applications/kde/dolphin-plugins.nix b/pkgs/applications/kde/dolphin-plugins.nix
index 7f436c7a55a..670b040f79f 100644
--- a/pkgs/applications/kde/dolphin-plugins.nix
+++ b/pkgs/applications/kde/dolphin-plugins.nix
@@ -1,10 +1,10 @@
 {
-  kdeApp, lib,
+  mkDerivation, lib,
   extra-cmake-modules, kdoctools,
   dolphin, kdelibs4support, ki18n, kio, kxmlgui
 }:
 
-kdeApp {
+mkDerivation {
   name = "dolphin-plugins";
   meta = {
     license = [ lib.licenses.gpl2 ];
diff --git a/pkgs/applications/kde/dolphin.nix b/pkgs/applications/kde/dolphin.nix
index 6515c230c28..746afa2732d 100644
--- a/pkgs/applications/kde/dolphin.nix
+++ b/pkgs/applications/kde/dolphin.nix
@@ -1,5 +1,5 @@
 {
-  kdeApp, lib, kdeWrapper,
+  mkDerivation, lib, kdeWrapper,
   extra-cmake-modules, kdoctools, makeQtWrapper,
   baloo, baloo-widgets, dolphin-plugins, kactivities, kbookmarks, kcmutils,
   kcompletion, kconfig, kcoreaddons, kdelibs4support, kdbusaddons,
@@ -9,7 +9,7 @@
 
 let
   unwrapped =
-    kdeApp {
+    mkDerivation {
       name = "dolphin";
       meta = {
         license = with lib.licenses; [ gpl2 fdl12 ];
diff --git a/pkgs/applications/kde/ffmpegthumbs.nix b/pkgs/applications/kde/ffmpegthumbs.nix
index 5dde6d8a64e..4e915422d14 100644
--- a/pkgs/applications/kde/ffmpegthumbs.nix
+++ b/pkgs/applications/kde/ffmpegthumbs.nix
@@ -1,10 +1,10 @@
 {
-  kdeApp, lib,
+  mkDerivation, lib,
   extra-cmake-modules,
   ffmpeg, kio
 }:
 
-kdeApp {
+mkDerivation {
   name = "ffmpegthumbs";
   meta = {
     license = with lib.licenses; [ gpl2 bsd3 ];
diff --git a/pkgs/applications/kde/filelight.nix b/pkgs/applications/kde/filelight.nix
index 71ab51320ab..c09b5f5106a 100644
--- a/pkgs/applications/kde/filelight.nix
+++ b/pkgs/applications/kde/filelight.nix
@@ -1,12 +1,12 @@
 {
-  kdeApp, lib, kdeWrapper,
+  mkDerivation, lib, kdeWrapper,
   extra-cmake-modules, kdoctools,
   kio, kparts, kxmlgui, qtscript, solid
 }:
 
 let
   unwrapped =
-    kdeApp {
+    mkDerivation {
       name = "filelight";
       meta = {
         license = with lib.licenses; [ gpl2 ];
diff --git a/pkgs/applications/kde/gwenview.nix b/pkgs/applications/kde/gwenview.nix
index 0fa06ed0fbe..19b2fd751f7 100644
--- a/pkgs/applications/kde/gwenview.nix
+++ b/pkgs/applications/kde/gwenview.nix
@@ -1,5 +1,5 @@
 {
-  kdeApp, lib, kdeWrapper,
+  mkDerivation, lib, kdeWrapper,
   extra-cmake-modules, kdoctools,
   baloo, exiv2, kactivities, kdelibs4support, kio, kipi-plugins, lcms2,
   libkdcraw, libkipi, phonon, qtimageformats, qtsvg, qtx11extras
@@ -7,7 +7,7 @@
 
 let
   unwrapped =
-    kdeApp {
+    mkDerivation {
       name = "gwenview";
       meta = {
         license = with lib.licenses; [ gpl2 fdl12 ];
diff --git a/pkgs/applications/kde/k3b.nix b/pkgs/applications/kde/k3b.nix
index d1cd33a5208..c21ce4a3e18 100644
--- a/pkgs/applications/kde/k3b.nix
+++ b/pkgs/applications/kde/k3b.nix
@@ -1,4 +1,4 @@
-{ kdeApp, lib, kdeWrapper, extra-cmake-modules
+{ mkDerivation, lib, kdeWrapper, extra-cmake-modules
 , qtwebkit
 , libkcddb, kcmutils, kdoctools, kfilemetadata, knewstuff, knotifyconfig, solid, kxmlgui
 , flac, lame, libmad, libmpcdec, libvorbis
@@ -9,7 +9,7 @@
 
 let
   unwrapped =
-    kdeApp {
+    mkDerivation {
       name = "k3b";
       meta = with lib; {
         license = with licenses; [ gpl2Plus ];
diff --git a/pkgs/applications/kde/kate.nix b/pkgs/applications/kde/kate.nix
index cd320afd8d3..7a138afb8ed 100644
--- a/pkgs/applications/kde/kate.nix
+++ b/pkgs/applications/kde/kate.nix
@@ -1,5 +1,5 @@
 {
-  kdeApp, lib, kdeWrapper,
+  mkDerivation, lib, kdeWrapper,
   extra-cmake-modules, kdoctools,
   kactivities, kconfig, kcrash, kdbusaddons, kguiaddons, kiconthemes, ki18n,
   kinit, kio, kitemmodels, kjobwidgets, knewstuff, knotifications, konsole,
@@ -9,7 +9,7 @@
 
 let
   unwrapped =
-    kdeApp {
+    mkDerivation {
       name = "kate";
       meta = {
         license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ];
diff --git a/pkgs/applications/kde/kcachegrind.nix b/pkgs/applications/kde/kcachegrind.nix
index d43de1fdc36..fd5c4502c9d 100644
--- a/pkgs/applications/kde/kcachegrind.nix
+++ b/pkgs/applications/kde/kcachegrind.nix
@@ -1,12 +1,12 @@
 {
-  kdeApp, lib, kdeWrapper,
+  mkDerivation, lib, kdeWrapper,
   extra-cmake-modules, kdoctools,
   kio, ki18n,
   perl, python, php
 }:
 
 kdeWrapper {
-  unwrapped = kdeApp {
+  unwrapped = mkDerivation {
     name = "kcachegrind";
     meta = {
       license = with lib.licenses; [ gpl2 ];
diff --git a/pkgs/applications/kde/kcalc.nix b/pkgs/applications/kde/kcalc.nix
index 8ec7591460e..6ce0722d3e4 100644
--- a/pkgs/applications/kde/kcalc.nix
+++ b/pkgs/applications/kde/kcalc.nix
@@ -1,12 +1,12 @@
 {
-  kdeApp, lib, kdeWrapper,
+  mkDerivation, lib, kdeWrapper,
   extra-cmake-modules, kdoctools,
   kconfig, kconfigwidgets, kguiaddons, kinit, knotifications, gmp
 }:
 
 let
   unwrapped =
-    kdeApp {
+    mkDerivation {
       name = "kcalc";
       meta = {
         license = with lib.licenses; [ gpl2 ];
diff --git a/pkgs/applications/kde/kcolorchooser.nix b/pkgs/applications/kde/kcolorchooser.nix
index c1266009b68..f910b99f603 100644
--- a/pkgs/applications/kde/kcolorchooser.nix
+++ b/pkgs/applications/kde/kcolorchooser.nix
@@ -1,11 +1,11 @@
 {
-  kdeApp, lib, kdeWrapper,
+  mkDerivation, lib, kdeWrapper,
   extra-cmake-modules, ki18n, kwidgetsaddons, kxmlgui
 }:
 
 let
   unwrapped =
-    kdeApp {
+    mkDerivation {
       name = "kcolorchooser";
       meta = {
         license = with lib.licenses; [ mit ];
diff --git a/pkgs/applications/kde/kcontacts.nix b/pkgs/applications/kde/kcontacts.nix
index 5143df60ef4..d49ba125474 100644
--- a/pkgs/applications/kde/kcontacts.nix
+++ b/pkgs/applications/kde/kcontacts.nix
@@ -1,10 +1,10 @@
 {
-  kdeApp, lib,
+  mkDerivation, lib,
   extra-cmake-modules, ki18n,
   kcoreaddons, kconfig, kcodecs
 }:
 
-kdeApp {
+mkDerivation {
   name = "kcontacts";
   meta = {
     license = [ lib.licenses.lgpl21 ];
diff --git a/pkgs/applications/kde/kde-locale-4.nix b/pkgs/applications/kde/kde-locale-4.nix
index e83794c60d8..daf0a55b19e 100644
--- a/pkgs/applications/kde/kde-locale-4.nix
+++ b/pkgs/applications/kde/kde-locale-4.nix
@@ -1,8 +1,8 @@
 name: args:
 
-{ kdeApp, automoc4, cmake, gettext, kdelibs, perl }:
+{ mkDerivation, automoc4, cmake, gettext, kdelibs, perl }:
 
-kdeApp (args // {
+mkDerivation (args // {
   sname = "kde-l10n-${name}";
   name = "kde-l10n-${name}-qt4";
 
diff --git a/pkgs/applications/kde/kde-locale-5.nix b/pkgs/applications/kde/kde-locale-5.nix
index 772ebe37e44..76d601cbdc0 100644
--- a/pkgs/applications/kde/kde-locale-5.nix
+++ b/pkgs/applications/kde/kde-locale-5.nix
@@ -1,8 +1,8 @@
 name: args:
 
-{ kdeApp, cmake, extra-cmake-modules, gettext, kdoctools }:
+{ mkDerivation, cmake, extra-cmake-modules, gettext, kdoctools }:
 
-kdeApp (args // {
+mkDerivation (args // {
   sname = "kde-l10n-${name}";
   name = "kde-l10n-${name}-qt5";
 
diff --git a/pkgs/applications/kde/kdegraphics-mobipocket.nix b/pkgs/applications/kde/kdegraphics-mobipocket.nix
index e50c92f8884..09f761df851 100644
--- a/pkgs/applications/kde/kdegraphics-mobipocket.nix
+++ b/pkgs/applications/kde/kdegraphics-mobipocket.nix
@@ -1,10 +1,10 @@
 {
-  kdeApp, lib,
+  mkDerivation, lib,
   extra-cmake-modules,
   kio
 }:
 
-kdeApp {
+mkDerivation {
   name = "kdegraphics-mobipocket";
   meta = {
     license = [ lib.licenses.gpl2Plus ];
diff --git a/pkgs/applications/kde/kdegraphics-thumbnailers.nix b/pkgs/applications/kde/kdegraphics-thumbnailers.nix
index 5aa974a9c96..3302681bd85 100644
--- a/pkgs/applications/kde/kdegraphics-thumbnailers.nix
+++ b/pkgs/applications/kde/kdegraphics-thumbnailers.nix
@@ -1,9 +1,9 @@
 {
-  kdeApp, lib,
+  mkDerivation, lib,
   extra-cmake-modules, kio, libkexiv2, libkdcraw
 }:
 
-kdeApp {
+mkDerivation {
   name = "kdegraphics-thumbnailers";
   meta = {
     license = [ lib.licenses.lgpl21 ];
diff --git a/pkgs/applications/kde/kdelibs/default.nix b/pkgs/applications/kde/kdelibs/default.nix
index cae1b9b7e7f..e3abe89eade 100644
--- a/pkgs/applications/kde/kdelibs/default.nix
+++ b/pkgs/applications/kde/kdelibs/default.nix
@@ -1,12 +1,12 @@
 {
-  kdeApp, lib,
+  mkDerivation, lib,
   automoc4, bison, cmake, flex, libxslt, perl, pkgconfig, shared_mime_info,
   attica, attr, avahi, docbook_xml_dtd_42, docbook_xsl, giflib, ilmbase,
   libdbusmenu_qt, libjpeg, libxml2, phonon, polkit_qt4, qca2, qt4,
   shared_desktop_ontologies, soprano, strigi, udev, xz, pcre, fetchpatch
 }:
 
-kdeApp {
+mkDerivation {
   name = "kdelibs";
 
   outputs = [ "out" "dev" ];
diff --git a/pkgs/applications/kde/kdenetwork-filesharing.nix b/pkgs/applications/kde/kdenetwork-filesharing.nix
index 20f81563c3b..62176f3f3bb 100644
--- a/pkgs/applications/kde/kdenetwork-filesharing.nix
+++ b/pkgs/applications/kde/kdenetwork-filesharing.nix
@@ -1,10 +1,10 @@
 {
-  kdeApp, lib,
+  mkDerivation, lib,
   extra-cmake-modules, kdoctools,
   kcoreaddons, ki18n, kio, kwidgetsaddons, samba
 }:
 
-kdeApp {
+mkDerivation {
   name = "kdenetwork-filesharing";
   meta = {
     license = [ lib.licenses.gpl2 lib.licenses.lgpl21 ];
diff --git a/pkgs/applications/kde/kdenlive.nix b/pkgs/applications/kde/kdenlive.nix
index e543a3d84bf..4e59e12e8fd 100644
--- a/pkgs/applications/kde/kdenlive.nix
+++ b/pkgs/applications/kde/kdenlive.nix
@@ -1,4 +1,4 @@
-{ kdeApp
+{ mkDerivation
 , kdeWrapper
 , lib
 , extra-cmake-modules
@@ -32,7 +32,7 @@
 }:
 
 let
-unwrapped = kdeApp {
+unwrapped = mkDerivation {
   name = "kdenlive";
   patches = [
     ./kdenlive-cmake-concurrent-module.patch
diff --git a/pkgs/applications/kde/kdf.nix b/pkgs/applications/kde/kdf.nix
index 97e74eb2e12..aaeac0161f5 100644
--- a/pkgs/applications/kde/kdf.nix
+++ b/pkgs/applications/kde/kdf.nix
@@ -1,12 +1,12 @@
 {
-  kdeApp, lib, kdeWrapper,
+  mkDerivation, lib, kdeWrapper,
   extra-cmake-modules, kdoctools,
   kcmutils
 }:
 
 let
   unwrapped =
-    kdeApp {
+    mkDerivation {
       name = "kdf";
       meta = {
         license = with lib.licenses; [ gpl2 ];
diff --git a/pkgs/applications/kde/kgpg.nix b/pkgs/applications/kde/kgpg.nix
index 58e9cb0d1e9..5b462c2712f 100644
--- a/pkgs/applications/kde/kgpg.nix
+++ b/pkgs/applications/kde/kgpg.nix
@@ -1,12 +1,12 @@
 {
-  kdeApp, lib, makeQtWrapper,
+  mkDerivation, lib, makeQtWrapper,
   extra-cmake-modules, kdoctools, ki18n,
   akonadi-contacts, gnupg1, gpgme, karchive, kcodecs, kcontacts, kcoreaddons, kcrash,
   kdbusaddons, kiconthemes, kjobwidgets, kio, knotifications, kservice,
   ktextwidgets, kxmlgui, kwidgetsaddons, kwindowsystem
 }:
 
-kdeApp {
+mkDerivation {
   name = "kgpg";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ki18n ];
   buildInputs = [
diff --git a/pkgs/applications/kde/khelpcenter.nix b/pkgs/applications/kde/khelpcenter.nix
index 0579faa72a0..e88bef4c652 100644
--- a/pkgs/applications/kde/khelpcenter.nix
+++ b/pkgs/applications/kde/khelpcenter.nix
@@ -1,5 +1,5 @@
 {
-  kdeApp, kdeWrapper,
+  mkDerivation, kdeWrapper,
   extra-cmake-modules, kdoctools,
   grantlee, kconfig, kcoreaddons, kdbusaddons, ki18n, kinit, kcmutils,
   kdelibs4support, khtml, kservice, xapian
@@ -7,7 +7,7 @@
 
 let
   unwrapped =
-    kdeApp {
+    mkDerivation {
       name = "khelpcenter";
       nativeBuildInputs = [ extra-cmake-modules kdoctools ];
       buildInputs = [
diff --git a/pkgs/applications/kde/kig.nix b/pkgs/applications/kde/kig.nix
index 9f38079316f..03229f9a150 100644
--- a/pkgs/applications/kde/kig.nix
+++ b/pkgs/applications/kde/kig.nix
@@ -1,12 +1,12 @@
 {
-  kdeApp, lib, kdeWrapper
-  , extra-cmake-modules, kdoctools, kparts
-  , qtsvg, qtxmlpatterns, ktexteditor, boost
+  mkDerivation, lib, kdeWrapper,
+  extra-cmake-modules, kdoctools,
+  kparts, qtsvg, qtxmlpatterns, ktexteditor, boost
 }:
 
 let
   unwrapped =
-    kdeApp {
+    mkDerivation {
       name = "kig";
       meta = {
         license = with lib.licenses; [ gpl2 ];
diff --git a/pkgs/applications/kde/kio-extras.nix b/pkgs/applications/kde/kio-extras.nix
index 77f795167fc..50709a7ddef 100644
--- a/pkgs/applications/kde/kio-extras.nix
+++ b/pkgs/applications/kde/kio-extras.nix
@@ -1,12 +1,12 @@
 {
-  kdeApp, lib, extra-cmake-modules, kdoctools, shared_mime_info,
+  mkDerivation, 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 {
+mkDerivation {
   name = "kio-extras";
   meta = {
     license = with lib.licenses; [ gpl2 lgpl21 ];
diff --git a/pkgs/applications/kde/kmime.nix b/pkgs/applications/kde/kmime.nix
index c17b3fdcd8e..5bd8762391c 100644
--- a/pkgs/applications/kde/kmime.nix
+++ b/pkgs/applications/kde/kmime.nix
@@ -1,10 +1,10 @@
 {
-  kdeApp, lib,
+  mkDerivation, lib,
   extra-cmake-modules, ki18n,
   kcodecs
 }:
 
-kdeApp {
+mkDerivation {
   name = "kmime";
   meta = {
     license = [ lib.licenses.lgpl21 ];
diff --git a/pkgs/applications/kde/kmix.nix b/pkgs/applications/kde/kmix.nix
index 6ab653cfce0..483983571dd 100644
--- a/pkgs/applications/kde/kmix.nix
+++ b/pkgs/applications/kde/kmix.nix
@@ -1,5 +1,5 @@
 {
-  kdeApp, lib, kdeWrapper,
+  mkDerivation, lib, kdeWrapper,
   extra-cmake-modules, kdoctools,
   kglobalaccel, kxmlgui, kcoreaddons, kdelibs4support,
   plasma-framework, libpulseaudio, alsaLib, libcanberra_kde
@@ -7,7 +7,7 @@
 
 let
   unwrapped =
-    kdeApp {
+    mkDerivation {
       name = "kmix";
       meta = {
         license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
diff --git a/pkgs/applications/kde/kolourpaint.nix b/pkgs/applications/kde/kolourpaint.nix
index 75d5b6fca65..bdfeb233af3 100644
--- a/pkgs/applications/kde/kolourpaint.nix
+++ b/pkgs/applications/kde/kolourpaint.nix
@@ -1,5 +1,5 @@
 { lib
-, kdeApp
+, mkDerivation
 , kdeWrapper
 , extra-cmake-modules
 , kdoctools
@@ -9,7 +9,7 @@
 
 let
   unwrapped =
-    kdeApp {
+    mkDerivation {
       name = "kolourpaint";
       nativeBuildInputs = [ extra-cmake-modules kdoctools ];
       propagatedBuildInputs = [
@@ -25,4 +25,4 @@ let
 in kdeWrapper {
   inherit unwrapped;
   targets = ["bin/kolourpaint"];
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/kde/kompare.nix b/pkgs/applications/kde/kompare.nix
index 660090dc84a..c14f15707aa 100644
--- a/pkgs/applications/kde/kompare.nix
+++ b/pkgs/applications/kde/kompare.nix
@@ -1,12 +1,12 @@
 {
-  kdeApp, lib, kdeWrapper,
+  mkDerivation, lib, kdeWrapper,
   extra-cmake-modules, kdoctools,
   kparts, ktexteditor, kwidgetsaddons, libkomparediff2
 }:
 
 let
   unwrapped =
-    kdeApp {
+    mkDerivation {
       name = "kompare";
       meta = { license = with lib.licenses; [ gpl2 ]; };
       nativeBuildInputs = [ extra-cmake-modules kdoctools ];
diff --git a/pkgs/applications/kde/konsole.nix b/pkgs/applications/kde/konsole.nix
index 15b6373bdb0..4eb45c74480 100644
--- a/pkgs/applications/kde/konsole.nix
+++ b/pkgs/applications/kde/konsole.nix
@@ -1,5 +1,5 @@
 {
-  kdeApp, lib, kdeWrapper,
+  mkDerivation, lib, kdeWrapper,
   extra-cmake-modules, kdoctools,
   kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kguiaddons,
   ki18n, kiconthemes, kinit, kdelibs4support, kio, knotifications,
@@ -9,7 +9,7 @@
 
 let
   unwrapped =
-    kdeApp {
+    mkDerivation {
       name = "konsole";
       meta = {
         license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
diff --git a/pkgs/applications/kde/krfb.nix b/pkgs/applications/kde/krfb.nix
index ef5530be6fa..3ad7b436dbc 100644
--- a/pkgs/applications/kde/krfb.nix
+++ b/pkgs/applications/kde/krfb.nix
@@ -1,12 +1,12 @@
 {
-  kdeApp, lib, kdeWrapper,
+  mkDerivation, lib, kdeWrapper,
   extra-cmake-modules, kdoctools,
   kdelibs4support, kdnssd, libvncserver, libXtst
 }:
 
 let
   unwrapped =
-    kdeApp {
+    mkDerivation {
       name = "krfb";
       meta = {
         license = with lib.licenses; [ gpl2 fdl12 ];
diff --git a/pkgs/applications/kde/kwalletmanager.nix b/pkgs/applications/kde/kwalletmanager.nix
index afa870d90a5..efdcac650bb 100644
--- a/pkgs/applications/kde/kwalletmanager.nix
+++ b/pkgs/applications/kde/kwalletmanager.nix
@@ -1,5 +1,5 @@
 { lib
-, kdeApp
+, mkDerivation
 , kdeWrapper
 , extra-cmake-modules
 , kdoctools
@@ -13,7 +13,7 @@
 }:
 
 let
-  unwrapped = kdeApp {
+  unwrapped = mkDerivation {
     name = "kwalletmanager";
     meta = {
       license = with lib.licenses; [ gpl2 ];
diff --git a/pkgs/applications/kde/libkcddb.nix b/pkgs/applications/kde/libkcddb.nix
index 3d05714e824..edd9732d051 100644
--- a/pkgs/applications/kde/libkcddb.nix
+++ b/pkgs/applications/kde/libkcddb.nix
@@ -1,8 +1,8 @@
-{ kdeApp, lib, extra-cmake-modules, qtbase, kdoctools
+{ mkDerivation, lib, extra-cmake-modules, qtbase, kdoctools
 , kcodecs, ki18n, kio, kwidgetsaddons
 , libmusicbrainz5 }:
 
-kdeApp {
+mkDerivation {
   name = "libkcddb";
   meta = with lib; {
     license = with licenses; [ gpl2 lgpl21 bsd3 ];
@@ -14,5 +14,4 @@ kdeApp {
     kcodecs ki18n kio kwidgetsaddons
     libmusicbrainz5
   ];
-  enableParallelBuilding = true;
 }
diff --git a/pkgs/applications/kde/libkdcraw.nix b/pkgs/applications/kde/libkdcraw.nix
index 179e9f414dc..383bd3b6703 100644
--- a/pkgs/applications/kde/libkdcraw.nix
+++ b/pkgs/applications/kde/libkdcraw.nix
@@ -1,6 +1,6 @@
-{ kdeApp, lib, extra-cmake-modules, libraw, qtbase }:
+{ mkDerivation, lib, extra-cmake-modules, libraw, qtbase }:
 
-kdeApp {
+mkDerivation {
   name = "libkdcraw";
   meta = {
     license = with lib.licenses; [ gpl2 lgpl21 bsd3 ];
diff --git a/pkgs/applications/kde/libkexiv2.nix b/pkgs/applications/kde/libkexiv2.nix
index 0991c5df5ab..816d4168967 100644
--- a/pkgs/applications/kde/libkexiv2.nix
+++ b/pkgs/applications/kde/libkexiv2.nix
@@ -1,6 +1,6 @@
-{ kdeApp, lib, exiv2, extra-cmake-modules, qtbase }:
+{ mkDerivation, lib, exiv2, extra-cmake-modules, qtbase }:
 
-kdeApp {
+mkDerivation {
   name = "libkexiv2";
   meta = {
     license = with lib.licenses; [ gpl2 lgpl21 bsd3 ];
diff --git a/pkgs/applications/kde/libkipi.nix b/pkgs/applications/kde/libkipi.nix
index 32eeb171ff8..3a28d8c2e8c 100644
--- a/pkgs/applications/kde/libkipi.nix
+++ b/pkgs/applications/kde/libkipi.nix
@@ -1,6 +1,6 @@
-{ kdeApp, lib, extra-cmake-modules, kconfig, ki18n, kservice, kxmlgui }:
+{ mkDerivation, lib, extra-cmake-modules, kconfig, ki18n, kservice, kxmlgui }:
 
-kdeApp {
+mkDerivation {
   name = "libkipi";
   meta = {
     license = with lib.licenses; [ gpl2 lgpl21 bsd3 ];
diff --git a/pkgs/applications/kde/libkomparediff2.nix b/pkgs/applications/kde/libkomparediff2.nix
index aacc89a0efe..52aa2b10e24 100644
--- a/pkgs/applications/kde/libkomparediff2.nix
+++ b/pkgs/applications/kde/libkomparediff2.nix
@@ -1,6 +1,6 @@
-{ kdeApp, lib, extra-cmake-modules, ki18n, kxmlgui, kcodecs, kio }:
+{ mkDerivation, lib, extra-cmake-modules, ki18n, kxmlgui, kcodecs, kio }:
 
-kdeApp {
+mkDerivation {
   name = "libkomparediff2";
   nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [ kcodecs ki18n kxmlgui kio ];
diff --git a/pkgs/applications/kde/marble.nix b/pkgs/applications/kde/marble.nix
index 5322c66b01d..eb059a1b398 100644
--- a/pkgs/applications/kde/marble.nix
+++ b/pkgs/applications/kde/marble.nix
@@ -1,4 +1,4 @@
-{ kdeApp, lib, kdeWrapper
+{ mkDerivation, lib, kdeWrapper
 , extra-cmake-modules, kdoctools
 , qtscript, qtsvg, qtquickcontrols, qtwebkit
 , krunner, shared_mime_info, kparts, knewstuff
@@ -7,7 +7,7 @@
 
 let
   unwrapped =
-    kdeApp {
+    mkDerivation {
       name = "marble";
       meta.license = with lib.licenses; [ lgpl21 gpl3 ];
 
diff --git a/pkgs/applications/kde/okteta.nix b/pkgs/applications/kde/okteta.nix
index 59520e28532..7fb4ffb7693 100644
--- a/pkgs/applications/kde/okteta.nix
+++ b/pkgs/applications/kde/okteta.nix
@@ -1,5 +1,5 @@
 {
-  kdeApp, lib, kdeWrapper,
+  mkDerivation, lib, kdeWrapper,
   extra-cmake-modules, kdoctools,
   kconfig, kinit,
   kcmutils, kconfigwidgets, knewstuff, kparts, qca-qt5
@@ -7,7 +7,7 @@
 
 let
   unwrapped =
-    kdeApp {
+    mkDerivation {
       name = "okteta";
       meta = {
         license = with lib.licenses; [ gpl2 ];
diff --git a/pkgs/applications/kde/okular.nix b/pkgs/applications/kde/okular.nix
index f5b3e38ca7c..3bed7454f42 100644
--- a/pkgs/applications/kde/okular.nix
+++ b/pkgs/applications/kde/okular.nix
@@ -1,5 +1,5 @@
 {
-  kdeApp, lib, kdeWrapper,
+  mkDerivation, lib, kdeWrapper,
   extra-cmake-modules, kdoctools,
   djvulibre, ebook_tools, kactivities, karchive, kbookmarks, kcompletion,
   kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdegraphics-mobipocket,
@@ -8,7 +8,7 @@
 }:
 
 let
-  unwrapped = kdeApp {
+  unwrapped = mkDerivation {
     name = "okular";
     nativeBuildInputs = [ extra-cmake-modules kdoctools ];
     propagatedBuildInputs = [
diff --git a/pkgs/applications/kde/print-manager.nix b/pkgs/applications/kde/print-manager.nix
index 0a3d311eb27..a2589f46bba 100644
--- a/pkgs/applications/kde/print-manager.nix
+++ b/pkgs/applications/kde/print-manager.nix
@@ -1,11 +1,11 @@
 {
-  kdeApp, lib, extra-cmake-modules,
+  mkDerivation, lib, extra-cmake-modules,
   cups, kconfig, kconfigwidgets, kdbusaddons, kiconthemes, ki18n, kcmutils, kio,
   knotifications, kwidgetsaddons, kwindowsystem, kitemviews, plasma-framework,
   qtdeclarative
 }:
 
-kdeApp {
+mkDerivation {
   name = "print-manager";
   meta = {
     license = [ lib.licenses.gpl2 ];
diff --git a/pkgs/applications/kde/spectacle.nix b/pkgs/applications/kde/spectacle.nix
index 30abfc23e83..a0c5ef58c9b 100644
--- a/pkgs/applications/kde/spectacle.nix
+++ b/pkgs/applications/kde/spectacle.nix
@@ -1,5 +1,5 @@
 {
-  kdeApp, lib, kdeWrapper,
+  mkDerivation, lib, kdeWrapper,
   extra-cmake-modules, kdoctools,
   kconfig, kcoreaddons, kdbusaddons, kdeclarative, ki18n, kio, kipi-plugins,
   knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi,
@@ -8,7 +8,7 @@
 
 let
   unwrapped =
-    kdeApp {
+    mkDerivation {
       name = "spectacle";
       meta = with lib; { maintainers = with maintainers; [ ttuegel ]; };
       nativeBuildInputs = [ extra-cmake-modules kdoctools ];

From eaa644a5af59b1967fb464a61316a1004cb5e888 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Mon, 15 May 2017 11:44:58 -0500
Subject: [PATCH 023/189] plasma5: rename plasmaPackage to mkDerivation

---
 pkgs/desktops/plasma-5/bluedevil.nix          |  4 +--
 pkgs/desktops/plasma-5/breeze-grub.nix        |  4 +--
 pkgs/desktops/plasma-5/breeze-gtk.nix         |  7 ++---
 .../plasma-5/breeze-plymouth/default.nix      |  4 +--
 pkgs/desktops/plasma-5/breeze-qt4.nix         |  4 +--
 pkgs/desktops/plasma-5/breeze-qt5.nix         |  4 +--
 .../plasma-5/build-support/package.nix        | 27 ----------------
 pkgs/desktops/plasma-5/default.nix            | 31 ++++++++++++++++---
 pkgs/desktops/plasma-5/kactivitymanagerd.nix  |  4 +--
 pkgs/desktops/plasma-5/kde-cli-tools.nix      |  4 +--
 .../plasma-5/kde-gtk-config/default.nix       |  4 +--
 pkgs/desktops/plasma-5/kdecoration.nix        |  4 +--
 pkgs/desktops/plasma-5/kdeplasma-addons.nix   |  9 ++----
 pkgs/desktops/plasma-5/kgamma5.nix            |  4 +--
 pkgs/desktops/plasma-5/khotkeys.nix           |  4 +--
 pkgs/desktops/plasma-5/kinfocenter.nix        |  4 +--
 pkgs/desktops/plasma-5/kmenuedit.nix          |  4 +--
 pkgs/desktops/plasma-5/kscreen.nix            |  4 +--
 pkgs/desktops/plasma-5/kscreenlocker.nix      |  4 +--
 pkgs/desktops/plasma-5/ksshaskpass.nix        |  4 +--
 pkgs/desktops/plasma-5/ksysguard.nix          |  4 +--
 pkgs/desktops/plasma-5/kwallet-pam.nix        |  5 ++-
 .../plasma-5/kwayland-integration.nix         | 17 +++-------
 pkgs/desktops/plasma-5/kwin/default.nix       |  4 +--
 pkgs/desktops/plasma-5/kwrited.nix            |  4 +--
 pkgs/desktops/plasma-5/libkscreen/default.nix | 12 +++----
 .../plasma-5/libksysguard/default.nix         |  4 +--
 pkgs/desktops/plasma-5/milou.nix              |  4 +--
 pkgs/desktops/plasma-5/oxygen.nix             |  4 +--
 .../plasma-5/plasma-desktop/default.nix       |  4 +--
 pkgs/desktops/plasma-5/plasma-integration.nix |  4 +--
 pkgs/desktops/plasma-5/plasma-nm/default.nix  |  5 ++-
 pkgs/desktops/plasma-5/plasma-pa.nix          |  8 ++---
 .../plasma-5/plasma-workspace-wallpapers.nix  |  4 +--
 .../plasma-5/plasma-workspace/default.nix     |  4 +--
 pkgs/desktops/plasma-5/polkit-kde-agent.nix   |  4 +--
 pkgs/desktops/plasma-5/powerdevil.nix         |  4 +--
 pkgs/desktops/plasma-5/systemsettings.nix     |  6 ++--
 38 files changed, 106 insertions(+), 133 deletions(-)
 delete mode 100644 pkgs/desktops/plasma-5/build-support/package.nix

diff --git a/pkgs/desktops/plasma-5/bluedevil.nix b/pkgs/desktops/plasma-5/bluedevil.nix
index d0e78499813..6db3e787911 100644
--- a/pkgs/desktops/plasma-5/bluedevil.nix
+++ b/pkgs/desktops/plasma-5/bluedevil.nix
@@ -1,10 +1,10 @@
 {
-  plasmaPackage, extra-cmake-modules, shared_mime_info,
+  mkDerivation, extra-cmake-modules, shared_mime_info,
   bluez-qt, kcoreaddons, kdbusaddons, kded, ki18n, kiconthemes, kio,
   knotifications, kwidgetsaddons, kwindowsystem, plasma-framework, qtdeclarative
 }:
 
-plasmaPackage {
+mkDerivation {
   name = "bluedevil";
   nativeBuildInputs = [ extra-cmake-modules shared_mime_info ];
   propagatedBuildInputs = [
diff --git a/pkgs/desktops/plasma-5/breeze-grub.nix b/pkgs/desktops/plasma-5/breeze-grub.nix
index da0fb6f73ad..e8ac5c1e208 100644
--- a/pkgs/desktops/plasma-5/breeze-grub.nix
+++ b/pkgs/desktops/plasma-5/breeze-grub.nix
@@ -1,8 +1,8 @@
 {
-  plasmaPackage
+  mkDerivation
 }:
 
-plasmaPackage {
+mkDerivation {
   name = "breeze-grub";
   outputs = [ "out" ];
   installPhase = ''
diff --git a/pkgs/desktops/plasma-5/breeze-gtk.nix b/pkgs/desktops/plasma-5/breeze-gtk.nix
index 4048d98431d..9c204e3acb8 100644
--- a/pkgs/desktops/plasma-5/breeze-gtk.nix
+++ b/pkgs/desktops/plasma-5/breeze-gtk.nix
@@ -1,9 +1,6 @@
-{ plasmaPackage
-, extra-cmake-modules
-, qtbase
-}:
+{ mkDerivation , extra-cmake-modules , qtbase }:
 
-plasmaPackage {
+mkDerivation {
   name = "breeze-gtk";
   nativeBuildInputs = [ extra-cmake-modules ];
   cmakeFlags = [ "-DWITH_GTK3_VERSION=3.20" ];
diff --git a/pkgs/desktops/plasma-5/breeze-plymouth/default.nix b/pkgs/desktops/plasma-5/breeze-plymouth/default.nix
index dfbdf48165a..898d9cd78a5 100644
--- a/pkgs/desktops/plasma-5/breeze-plymouth/default.nix
+++ b/pkgs/desktops/plasma-5/breeze-plymouth/default.nix
@@ -1,10 +1,10 @@
 {
-  plasmaPackage, lib, copyPathsToStore,
+  mkDerivation, lib, copyPathsToStore,
   extra-cmake-modules,
   plymouth
 }:
 
-plasmaPackage {
+mkDerivation {
   name = "breeze-plymouth";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ plymouth ];
diff --git a/pkgs/desktops/plasma-5/breeze-qt4.nix b/pkgs/desktops/plasma-5/breeze-qt4.nix
index adcc6110c4d..6c9d0c5c4ce 100644
--- a/pkgs/desktops/plasma-5/breeze-qt4.nix
+++ b/pkgs/desktops/plasma-5/breeze-qt4.nix
@@ -1,10 +1,10 @@
 {
-  plasmaPackage, lib,
+  mkDerivation, lib,
   automoc4, cmake, perl, pkgconfig,
   kdelibs4, qt4, xproto
 }:
 
-plasmaPackage {
+mkDerivation {
   name = "breeze-qt4";
   sname = "breeze";
   buildInputs = [ kdelibs4 qt4 xproto ];
diff --git a/pkgs/desktops/plasma-5/breeze-qt5.nix b/pkgs/desktops/plasma-5/breeze-qt5.nix
index a1b64a4656c..11af6fff04b 100644
--- a/pkgs/desktops/plasma-5/breeze-qt5.nix
+++ b/pkgs/desktops/plasma-5/breeze-qt5.nix
@@ -1,11 +1,11 @@
 {
-  plasmaPackage,
+  mkDerivation,
   extra-cmake-modules,
   frameworkintegration, kcmutils, kconfigwidgets, kcoreaddons, kdecoration,
   kguiaddons, ki18n, kwayland, kwindowsystem, plasma-framework, qtx11extras
 }:
 
-plasmaPackage {
+mkDerivation {
   name = "breeze-qt5";
   sname = "breeze";
   nativeBuildInputs = [ extra-cmake-modules ];
diff --git a/pkgs/desktops/plasma-5/build-support/package.nix b/pkgs/desktops/plasma-5/build-support/package.nix
deleted file mode 100644
index 64c7934cc23..00000000000
--- a/pkgs/desktops/plasma-5/build-support/package.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ mkDerivation, lib, fetchurl }:
-
-let
-  mirror = "mirror://kde";
-  srcs = import ../srcs.nix { inherit fetchurl mirror; };
-in
-
-args:
-
-let
-  inherit (args) name;
-  sname = args.sname or name;
-  inherit (srcs."${sname}") src version;
-in
-mkDerivation (args // {
-  name = "${name}-${version}";
-  inherit src;
-
-  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 {});
-})
diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix
index 83d7d39dd86..10d5a152f13 100644
--- a/pkgs/desktops/plasma-5/default.nix
+++ b/pkgs/desktops/plasma-5/default.nix
@@ -31,13 +31,36 @@ existing packages here and modify it as necessary.
 }:
 
 let
+  srcs = import ./srcs.nix {
+    inherit fetchurl;
+    mirror = "mirror://kde";
+  };
+
   packages = self: with self;
     let
       callPackage = self.newScope {
-        plasmaPackage = import ./build-support/package.nix {
-          inherit lib fetchurl;
-          mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {};
-        };
+        mkDerivation = args:
+          let
+            inherit (args) name;
+            sname = args.sname or name;
+            inherit (srcs."${sname}") src version;
+            mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {};
+          in
+          mkDerivation (args // {
+            name = "${name}-${version}";
+            inherit src;
+
+            outputs = args.outputs or [ "out" "dev" ];
+
+            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 {});
+          });
       };
     in {
       bluedevil = callPackage ./bluedevil.nix {};
diff --git a/pkgs/desktops/plasma-5/kactivitymanagerd.nix b/pkgs/desktops/plasma-5/kactivitymanagerd.nix
index 282e58ecf9e..27f977ea785 100644
--- a/pkgs/desktops/plasma-5/kactivitymanagerd.nix
+++ b/pkgs/desktops/plasma-5/kactivitymanagerd.nix
@@ -1,10 +1,10 @@
-{ plasmaPackage
+{ mkDerivation
 , extra-cmake-modules
 , boost, kconfig, kcoreaddons, kdbusaddons, ki18n, kio, kglobalaccel
 , kwindowsystem, kxmlgui
 }:
 
-plasmaPackage {
+mkDerivation {
   name = "kactivitymanagerd";
   nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [
diff --git a/pkgs/desktops/plasma-5/kde-cli-tools.nix b/pkgs/desktops/plasma-5/kde-cli-tools.nix
index 87a46703997..e18481d6da9 100644
--- a/pkgs/desktops/plasma-5/kde-cli-tools.nix
+++ b/pkgs/desktops/plasma-5/kde-cli-tools.nix
@@ -1,10 +1,10 @@
 {
-  plasmaPackage, extra-cmake-modules,
+  mkDerivation, extra-cmake-modules,
   kcmutils, kconfig, kdelibs4support, kdesu, kdoctools, ki18n, kiconthemes,
   kwindowsystem, qtsvg, qtx11extras
 }:
 
-plasmaPackage {
+mkDerivation {
   name = "kde-cli-tools";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [
diff --git a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix
index f482f2a6a3f..eaa2a906f82 100644
--- a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix
+++ b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix
@@ -1,4 +1,4 @@
-{ plasmaPackage
+{ mkDerivation
 , extra-cmake-modules
 , glib
 , gtk2
@@ -12,7 +12,7 @@
 , knewstuff
 }:
 
-plasmaPackage {
+mkDerivation {
   name = "kde-gtk-config";
   patches = [ ./0001-follow-symlinks.patch ];
   nativeBuildInputs = [ extra-cmake-modules ];
diff --git a/pkgs/desktops/plasma-5/kdecoration.nix b/pkgs/desktops/plasma-5/kdecoration.nix
index 546f72c3f38..9efdb8cff81 100644
--- a/pkgs/desktops/plasma-5/kdecoration.nix
+++ b/pkgs/desktops/plasma-5/kdecoration.nix
@@ -1,6 +1,6 @@
-{ plasmaPackage, extra-cmake-modules, qtbase }:
+{ mkDerivation, extra-cmake-modules, qtbase }:
 
-plasmaPackage {
+mkDerivation {
   name = "kdecoration";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ qtbase ];
diff --git a/pkgs/desktops/plasma-5/kdeplasma-addons.nix b/pkgs/desktops/plasma-5/kdeplasma-addons.nix
index 3371e17beaf..e3526d56c37 100644
--- a/pkgs/desktops/plasma-5/kdeplasma-addons.nix
+++ b/pkgs/desktops/plasma-5/kdeplasma-addons.nix
@@ -1,16 +1,13 @@
-{ plasmaPackage, extra-cmake-modules, kdoctools
+{ mkDerivation, extra-cmake-modules, kdoctools
 , kconfig, kconfigwidgets, kcoreaddons, kcmutils, kdelibs4support, ki18n
 , kio, knewstuff, kross, krunner, kservice, ksysguard, kunitconversion
 , plasma-framework, plasma-workspace, qtdeclarative, qtx11extras
 , ibus
 }:
 
-plasmaPackage {
+mkDerivation {
   name = "kdeplasma-addons";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [
     kconfig kconfigwidgets kcoreaddons kcmutils kdelibs4support kio knewstuff
     kross krunner kservice ksysguard kunitconversion plasma-framework
diff --git a/pkgs/desktops/plasma-5/kgamma5.nix b/pkgs/desktops/plasma-5/kgamma5.nix
index 965c33e6eef..8199b5d0330 100644
--- a/pkgs/desktops/plasma-5/kgamma5.nix
+++ b/pkgs/desktops/plasma-5/kgamma5.nix
@@ -1,8 +1,8 @@
-{ plasmaPackage, extra-cmake-modules, kdoctools, kdelibs4support
+{ mkDerivation, extra-cmake-modules, kdoctools, kdelibs4support
 , qtx11extras
 }:
 
-plasmaPackage {
+mkDerivation {
   name = "kgamma5";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [ kdelibs4support qtx11extras ];
diff --git a/pkgs/desktops/plasma-5/khotkeys.nix b/pkgs/desktops/plasma-5/khotkeys.nix
index 2b02e5916b9..32d9c14ddef 100644
--- a/pkgs/desktops/plasma-5/khotkeys.nix
+++ b/pkgs/desktops/plasma-5/khotkeys.nix
@@ -1,10 +1,10 @@
-{ plasmaPackage, extra-cmake-modules, kdoctools, kcmutils
+{ mkDerivation, extra-cmake-modules, kdoctools, kcmutils
 , kdbusaddons, kdelibs4support, kglobalaccel, ki18n, kio, kxmlgui
 , plasma-framework, plasma-workspace, qtx11extras
 , fetchpatch
 }:
 
-plasmaPackage {
+mkDerivation {
   name = "khotkeys";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [
diff --git a/pkgs/desktops/plasma-5/kinfocenter.nix b/pkgs/desktops/plasma-5/kinfocenter.nix
index b4c8dc99adc..ee6aa6aebda 100644
--- a/pkgs/desktops/plasma-5/kinfocenter.nix
+++ b/pkgs/desktops/plasma-5/kinfocenter.nix
@@ -1,12 +1,12 @@
 {
-  plasmaPackage,
+  mkDerivation,
   extra-cmake-modules, kdoctools,
   kcmutils, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons,
   kdeclarative, kdelibs4support, ki18n, kiconthemes, kio, kpackage, kservice,
   kwayland, kwidgetsaddons, kxmlgui, libraw1394, mesa_glu, pciutils, solid
 }:
 
-plasmaPackage {
+mkDerivation {
   name = "kinfocenter";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [
diff --git a/pkgs/desktops/plasma-5/kmenuedit.nix b/pkgs/desktops/plasma-5/kmenuedit.nix
index a27dc5dd92a..164c378a60d 100644
--- a/pkgs/desktops/plasma-5/kmenuedit.nix
+++ b/pkgs/desktops/plasma-5/kmenuedit.nix
@@ -1,11 +1,11 @@
 {
-  plasmaPackage,
+  mkDerivation,
   extra-cmake-modules, kdoctools,
   kdbusaddons, kdelibs4support, khotkeys, ki18n, kiconthemes, kio, kxmlgui,
   sonnet
 }:
 
-plasmaPackage {
+mkDerivation {
   name = "kmenuedit";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [
diff --git a/pkgs/desktops/plasma-5/kscreen.nix b/pkgs/desktops/plasma-5/kscreen.nix
index e0fbea5d746..93dd0e71050 100644
--- a/pkgs/desktops/plasma-5/kscreen.nix
+++ b/pkgs/desktops/plasma-5/kscreen.nix
@@ -1,9 +1,9 @@
-{ plasmaPackage, extra-cmake-modules, kconfig, kconfigwidgets
+{ mkDerivation, extra-cmake-modules, kconfig, kconfigwidgets
 , kdbusaddons, kglobalaccel, ki18n, kwidgetsaddons, kxmlgui
 , libkscreen, qtdeclarative, qtgraphicaleffects
 }:
 
-plasmaPackage {
+mkDerivation {
   name = "kscreen";
   nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [
diff --git a/pkgs/desktops/plasma-5/kscreenlocker.nix b/pkgs/desktops/plasma-5/kscreenlocker.nix
index 3551feab76f..64ea4690513 100644
--- a/pkgs/desktops/plasma-5/kscreenlocker.nix
+++ b/pkgs/desktops/plasma-5/kscreenlocker.nix
@@ -1,11 +1,11 @@
 {
-  plasmaPackage,
+  mkDerivation,
   extra-cmake-modules, kdoctools,
   kcmutils, kcrash, kdeclarative, kdelibs4support, kglobalaccel, kidletime,
   kwayland, libXcursor, pam, plasma-framework, qtdeclarative, wayland
 }:
 
-plasmaPackage {
+mkDerivation {
   name = "kscreenlocker";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [
diff --git a/pkgs/desktops/plasma-5/ksshaskpass.nix b/pkgs/desktops/plasma-5/ksshaskpass.nix
index f1a6b82ae93..94bc5a35da0 100644
--- a/pkgs/desktops/plasma-5/ksshaskpass.nix
+++ b/pkgs/desktops/plasma-5/ksshaskpass.nix
@@ -1,8 +1,8 @@
-{ plasmaPackage, extra-cmake-modules, kdoctools, kcoreaddons
+{ mkDerivation, extra-cmake-modules, kdoctools, kcoreaddons
 , ki18n, kwallet, kwidgetsaddons
 }:
 
-plasmaPackage {
+mkDerivation {
   name = "ksshaskpass";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [ kcoreaddons ki18n kwallet kwidgetsaddons ];
diff --git a/pkgs/desktops/plasma-5/ksysguard.nix b/pkgs/desktops/plasma-5/ksysguard.nix
index 366b154cae7..63aeda685ba 100644
--- a/pkgs/desktops/plasma-5/ksysguard.nix
+++ b/pkgs/desktops/plasma-5/ksysguard.nix
@@ -1,12 +1,12 @@
 {
-  plasmaPackage,
+  mkDerivation,
   extra-cmake-modules, kdoctools,
   lm_sensors,
   kconfig, kcoreaddons, kdelibs4support, ki18n, kiconthemes, kitemviews,
   knewstuff, libksysguard, qtwebkit
 }:
 
-plasmaPackage {
+mkDerivation {
   name = "ksysguard";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [ lm_sensors ];
diff --git a/pkgs/desktops/plasma-5/kwallet-pam.nix b/pkgs/desktops/plasma-5/kwallet-pam.nix
index 2789499c50a..b7a783f82a3 100644
--- a/pkgs/desktops/plasma-5/kwallet-pam.nix
+++ b/pkgs/desktops/plasma-5/kwallet-pam.nix
@@ -1,7 +1,6 @@
-{ plasmaPackage, extra-cmake-modules, pam, socat, libgcrypt
-}:
+{ mkDerivation, extra-cmake-modules, pam, socat, libgcrypt }:
 
-plasmaPackage {
+mkDerivation {
   name = "kwallet-pam";
 
   nativeBuildInputs = [ extra-cmake-modules ];
diff --git a/pkgs/desktops/plasma-5/kwayland-integration.nix b/pkgs/desktops/plasma-5/kwayland-integration.nix
index 9045227a51a..e5d00eb0800 100644
--- a/pkgs/desktops/plasma-5/kwayland-integration.nix
+++ b/pkgs/desktops/plasma-5/kwayland-integration.nix
@@ -1,16 +1,7 @@
-{ plasmaPackage
-, extra-cmake-modules
-, kidletime
-, kwayland
-, kwindowsystem
-}:
+{ mkDerivation , extra-cmake-modules , kidletime , kwayland , kwindowsystem }:
 
-plasmaPackage {
+mkDerivation {
   name = "kwayland-integration";
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  propagatedBuildInputs = [
-    kidletime kwindowsystem kwayland
-  ];
+  nativeBuildInputs = [ extra-cmake-modules ];
+  propagatedBuildInputs = [ kidletime kwindowsystem kwayland ];
 }
diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix
index a14b6433a76..ab8cc4d2498 100644
--- a/pkgs/desktops/plasma-5/kwin/default.nix
+++ b/pkgs/desktops/plasma-5/kwin/default.nix
@@ -1,5 +1,5 @@
 {
-  plasmaPackage, lib, copyPathsToStore,
+  mkDerivation, lib, copyPathsToStore,
   extra-cmake-modules, kdoctools,
   breeze-qt5, epoxy, kactivities, kcompletion, kcmutils, kconfig,
   kconfigwidgets, kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel,
@@ -10,7 +10,7 @@
   xcb-util-cursor, xwayland
 }:
 
-plasmaPackage {
+mkDerivation {
   name = "kwin";
   nativeBuildInputs = [
     extra-cmake-modules
diff --git a/pkgs/desktops/plasma-5/kwrited.nix b/pkgs/desktops/plasma-5/kwrited.nix
index 29498e93404..18c4a4af8db 100644
--- a/pkgs/desktops/plasma-5/kwrited.nix
+++ b/pkgs/desktops/plasma-5/kwrited.nix
@@ -1,8 +1,8 @@
-{ plasmaPackage, extra-cmake-modules, kcoreaddons, ki18n, kpty
+{ mkDerivation, extra-cmake-modules, kcoreaddons, ki18n, kpty
 , knotifications, kdbusaddons
 }:
 
-plasmaPackage {
+mkDerivation {
   name = "kwrited";
   nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [ kcoreaddons ki18n kpty knotifications kdbusaddons ];
diff --git a/pkgs/desktops/plasma-5/libkscreen/default.nix b/pkgs/desktops/plasma-5/libkscreen/default.nix
index 6881f95e6d5..82a254c3a37 100644
--- a/pkgs/desktops/plasma-5/libkscreen/default.nix
+++ b/pkgs/desktops/plasma-5/libkscreen/default.nix
@@ -1,17 +1,13 @@
-{ plasmaPackage, lib, copyPathsToStore
+{ mkDerivation, lib, copyPathsToStore
 , extra-cmake-modules
 , kwayland, libXrandr
 , qtx11extras
 }:
 
-plasmaPackage {
+mkDerivation {
   name = "libkscreen";
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
-  propagatedBuildInputs = [
-    kwayland libXrandr qtx11extras
-  ];
+  nativeBuildInputs = [ extra-cmake-modules ];
+  propagatedBuildInputs = [ kwayland libXrandr qtx11extras ];
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   preConfigure = ''
     NIX_CFLAGS_COMPILE+=" -DNIXPKGS_LIBKSCREEN_BACKENDS=\"''${!outputLib}/$qtPluginPrefix/kf5/kscreen\""
diff --git a/pkgs/desktops/plasma-5/libksysguard/default.nix b/pkgs/desktops/plasma-5/libksysguard/default.nix
index b67e041a782..e7cdf28a728 100644
--- a/pkgs/desktops/plasma-5/libksysguard/default.nix
+++ b/pkgs/desktops/plasma-5/libksysguard/default.nix
@@ -1,12 +1,12 @@
 {
-  plasmaPackage,
+  mkDerivation,
   extra-cmake-modules,
   kauth, kcompletion, kconfig, kconfigwidgets, kcoreaddons, ki18n, kiconthemes,
   kservice, kwidgetsaddons, kwindowsystem, plasma-framework, qtscript, qtwebkit,
   qtx11extras
 }:
 
-plasmaPackage {
+mkDerivation {
   name = "libksysguard";
   patches = [
     ./0001-qdiriterator-follow-symlinks.patch
diff --git a/pkgs/desktops/plasma-5/milou.nix b/pkgs/desktops/plasma-5/milou.nix
index 43f78d9e2a9..abc35279aba 100644
--- a/pkgs/desktops/plasma-5/milou.nix
+++ b/pkgs/desktops/plasma-5/milou.nix
@@ -1,9 +1,9 @@
-{ plasmaPackage, extra-cmake-modules, qtscript, qtdeclarative
+{ mkDerivation, extra-cmake-modules, qtscript, qtdeclarative
 , kcoreaddons, ki18n, kdeclarative, kservice, plasma-framework
 , krunner
 }:
 
-plasmaPackage {
+mkDerivation {
   name = "milou";
   nativeBuildInputs = [
     extra-cmake-modules
diff --git a/pkgs/desktops/plasma-5/oxygen.nix b/pkgs/desktops/plasma-5/oxygen.nix
index b4ff775264f..c50fd8b0514 100644
--- a/pkgs/desktops/plasma-5/oxygen.nix
+++ b/pkgs/desktops/plasma-5/oxygen.nix
@@ -1,12 +1,12 @@
 {
-  plasmaPackage, kdeWrapper,
+  mkDerivation, kdeWrapper,
   extra-cmake-modules,
   frameworkintegration, kcmutils, kcompletion, kconfig, kdecoration, kguiaddons,
   ki18n, kwidgetsaddons, kservice, kwayland, kwindowsystem, qtx11extras
 }:
 
 let
-  unwrapped = plasmaPackage {
+  unwrapped = mkDerivation {
     name = "oxygen";
     nativeBuildInputs = [ extra-cmake-modules ];
     propagatedBuildInputs = [
diff --git a/pkgs/desktops/plasma-5/plasma-desktop/default.nix b/pkgs/desktops/plasma-5/plasma-desktop/default.nix
index 1c152500b6a..a1ccaea6ea3 100644
--- a/pkgs/desktops/plasma-5/plasma-desktop/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-desktop/default.nix
@@ -1,5 +1,5 @@
 {
-  plasmaPackage, lib, copyPathsToStore,
+  mkDerivation, lib, copyPathsToStore,
   extra-cmake-modules, kdoctools,
   attica, baloo, boost, fontconfig, ibus, kactivities, kactivities-stats, kauth,
   kcmutils, kdbusaddons, kdeclarative, kded, kdelibs4support, kemoticons,
@@ -12,7 +12,7 @@
   utillinux
 }:
 
-plasmaPackage rec {
+mkDerivation rec {
   name = "plasma-desktop";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
diff --git a/pkgs/desktops/plasma-5/plasma-integration.nix b/pkgs/desktops/plasma-5/plasma-integration.nix
index 97d30dcd773..2bca3943c34 100644
--- a/pkgs/desktops/plasma-5/plasma-integration.nix
+++ b/pkgs/desktops/plasma-5/plasma-integration.nix
@@ -1,11 +1,11 @@
-{ plasmaPackage, extra-cmake-modules
+{ mkDerivation, extra-cmake-modules
 , breeze-qt5, kconfig, kconfigwidgets, kiconthemes, kio, kwayland
 , libXcursor
 }:
 
 # TODO: install Noto Sans and Oxygen Mono fonts with plasma-integration
 
-plasmaPackage {
+mkDerivation {
   name = "plasma-integration";
   nativeBuildInputs = [
     extra-cmake-modules
diff --git a/pkgs/desktops/plasma-5/plasma-nm/default.nix b/pkgs/desktops/plasma-5/plasma-nm/default.nix
index 736d59b4041..5c343548fcf 100644
--- a/pkgs/desktops/plasma-5/plasma-nm/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-nm/default.nix
@@ -1,4 +1,4 @@
-{ plasmaPackage, substituteAll, extra-cmake-modules, kdoctools
+{ mkDerivation, substituteAll, extra-cmake-modules, kdoctools
 , kcompletion, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative
 , kdelibs4support, ki18n, kiconthemes, kinit, kio, kitemviews
 , knotifications, kservice, kwallet, kwidgetsaddons, kwindowsystem
@@ -7,7 +7,7 @@
 , qca-qt5, qtdeclarative, solid, openvpn
 }:
 
-plasmaPackage {
+mkDerivation {
   name = "plasma-nm";
   patches = [
     (substituteAll {
@@ -27,5 +27,4 @@ plasmaPackage {
     mobile_broadband_provider_info modemmanager-qt networkmanager-qt openconnect
     qca-qt5 solid
   ];
-  enableParallelBuilding = true;
 }
diff --git a/pkgs/desktops/plasma-5/plasma-pa.nix b/pkgs/desktops/plasma-5/plasma-pa.nix
index f398e1a9efc..ec40ffb9630 100644
--- a/pkgs/desktops/plasma-5/plasma-pa.nix
+++ b/pkgs/desktops/plasma-5/plasma-pa.nix
@@ -1,15 +1,13 @@
 {
-  plasmaPackage,
+  mkDerivation,
   extra-cmake-modules,
   gconf, glib, kdoctools, kconfigwidgets, kcoreaddons, kdeclarative, kglobalaccel,
   ki18n, libcanberra_gtk3, libpulseaudio, plasma-framework
 }:
 
-plasmaPackage {
+mkDerivation {
   name = "plasma-pa";
-  nativeBuildInputs = [
-    extra-cmake-modules kdoctools
-  ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [
     gconf glib kconfigwidgets kcoreaddons kdeclarative
     kglobalaccel ki18n libcanberra_gtk3 libpulseaudio plasma-framework
diff --git a/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix b/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix
index 8af9caaa579..fb0830eb59a 100644
--- a/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix
+++ b/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix
@@ -1,8 +1,8 @@
-{ plasmaPackage
+{ mkDerivation
 , extra-cmake-modules
 }:
 
-plasmaPackage {
+mkDerivation {
   name = "plasma-workspace-wallpapers";
   outputs = [ "out" ];
   nativeBuildInputs = [
diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix
index 8759c7d8c1e..175a80fcb4c 100644
--- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix
@@ -1,5 +1,5 @@
 {
-  plasmaPackage, lib, copyPathsToStore,
+  mkDerivation, lib, copyPathsToStore,
 
   extra-cmake-modules, kdoctools,
 
@@ -12,7 +12,7 @@
   libXcursor, pam, wayland
 }:
 
-plasmaPackage {
+mkDerivation {
   name = "plasma-workspace";
 
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
diff --git a/pkgs/desktops/plasma-5/polkit-kde-agent.nix b/pkgs/desktops/plasma-5/polkit-kde-agent.nix
index 1d7d20a7ffb..bd3e5d6e1f4 100644
--- a/pkgs/desktops/plasma-5/polkit-kde-agent.nix
+++ b/pkgs/desktops/plasma-5/polkit-kde-agent.nix
@@ -1,10 +1,10 @@
 {
-  plasmaPackage, extra-cmake-modules,
+  mkDerivation, extra-cmake-modules,
   kcoreaddons, kconfig, kcrash, kdbusaddons, ki18n, kiconthemes, knotifications,
   kwidgetsaddons, kwindowsystem, polkit-qt
 }:
 
-plasmaPackage {
+mkDerivation {
   name = "polkit-kde-agent";
   nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [
diff --git a/pkgs/desktops/plasma-5/powerdevil.nix b/pkgs/desktops/plasma-5/powerdevil.nix
index c3469cc2ebc..4660efd66ab 100644
--- a/pkgs/desktops/plasma-5/powerdevil.nix
+++ b/pkgs/desktops/plasma-5/powerdevil.nix
@@ -1,10 +1,10 @@
-{ plasmaPackage, extra-cmake-modules, kdoctools, bluez-qt, kactivities
+{ mkDerivation, extra-cmake-modules, kdoctools, bluez-qt, kactivities
 , kauth, kconfig, kdbusaddons, kdelibs4support, kglobalaccel, ki18n
 , kidletime, kio, knotifyconfig, kwayland, libkscreen, networkmanager-qt
 , plasma-workspace, qtx11extras, solid, udev
 }:
 
-plasmaPackage {
+mkDerivation {
   name = "powerdevil";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [
diff --git a/pkgs/desktops/plasma-5/systemsettings.nix b/pkgs/desktops/plasma-5/systemsettings.nix
index 4146e34c2f7..5ada154f77d 100644
--- a/pkgs/desktops/plasma-5/systemsettings.nix
+++ b/pkgs/desktops/plasma-5/systemsettings.nix
@@ -1,12 +1,12 @@
 {
-  plasmaPackage, extra-cmake-modules, kdoctools, makeQtWrapper,
+  mkDerivation, extra-cmake-modules, kdoctools, makeQtWrapper,
   kcmutils, kconfig, kdbusaddons, khtml, ki18n, kiconthemes, kio, kitemviews,
   kservice, kwindowsystem, kxmlgui, qtquickcontrols, qtquickcontrols2
 }:
 
-plasmaPackage {
+mkDerivation {
   name = "systemsettings";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [
     kcmutils kconfig kdbusaddons khtml ki18n kiconthemes kio kitemviews kservice
     kwindowsystem kxmlgui qtquickcontrols qtquickcontrols2

From 945758f96030ee7762ccdab32a3ffddd028b37b6 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Mon, 15 May 2017 12:05:35 -0500
Subject: [PATCH 024/189] kdeFrameworks: rename kdeFramework to mkDerivation

---
 .../libraries/kde-frameworks/attica.nix       |  4 +-
 .../libraries/kde-frameworks/baloo.nix        |  4 +-
 .../libraries/kde-frameworks/bluez-qt.nix     |  4 +-
 .../libraries/kde-frameworks/breeze-icons.nix |  4 +-
 .../build-support/framework.nix               | 24 -------
 .../libraries/kde-frameworks/default.nix      | 62 +++++++++++++++++--
 .../extra-cmake-modules/default.nix           |  4 +-
 .../kde-frameworks/frameworkintegration.nix   |  4 +-
 .../kde-frameworks/kactivities-stats.nix      |  4 +-
 .../libraries/kde-frameworks/kactivities.nix  |  4 +-
 .../libraries/kde-frameworks/kapidox.nix      |  4 +-
 .../libraries/kde-frameworks/karchive.nix     |  4 +-
 .../kde-frameworks/kauth/default.nix          |  7 ++-
 .../libraries/kde-frameworks/kbookmarks.nix   |  4 +-
 .../kde-frameworks/kcmutils/default.nix       | 10 +--
 .../libraries/kde-frameworks/kcodecs.nix      |  4 +-
 .../libraries/kde-frameworks/kcompletion.nix  | 11 ++--
 .../libraries/kde-frameworks/kconfig.nix      |  6 +-
 .../kde-frameworks/kconfigwidgets/default.nix |  4 +-
 .../libraries/kde-frameworks/kcoreaddons.nix  |  7 +--
 .../libraries/kde-frameworks/kcrash.nix       |  4 +-
 .../libraries/kde-frameworks/kdbusaddons.nix  |  4 +-
 .../libraries/kde-frameworks/kdeclarative.nix |  4 +-
 .../libraries/kde-frameworks/kded.nix         |  4 +-
 .../kdelibs4support/default.nix               | 21 +++----
 .../kde-frameworks/kdesignerplugin.nix        | 22 ++-----
 .../libraries/kde-frameworks/kdesu.nix        |  4 +-
 .../libraries/kde-frameworks/kdnssd.nix       | 12 ++--
 .../kde-frameworks/kdoctools/default.nix      |  8 ++-
 .../libraries/kde-frameworks/kemoticons.nix   | 12 ++--
 .../kde-frameworks/kfilemetadata/default.nix  |  8 ++-
 .../libraries/kde-frameworks/kglobalaccel.nix |  5 +-
 .../libraries/kde-frameworks/kguiaddons.nix   |  4 +-
 .../libraries/kde-frameworks/khtml.nix        | 12 ++--
 .../libraries/kde-frameworks/ki18n.nix        |  4 +-
 .../kde-frameworks/kiconthemes/default.nix    |  9 +--
 .../libraries/kde-frameworks/kidletime.nix    | 10 +--
 .../kde-frameworks/kimageformats.nix          |  4 +-
 .../kde-frameworks/kinit/default.nix          |  9 ++-
 .../libraries/kde-frameworks/kio/default.nix  | 16 ++---
 .../libraries/kde-frameworks/kitemmodels.nix  | 10 +--
 .../libraries/kde-frameworks/kitemviews.nix   | 10 +--
 .../libraries/kde-frameworks/kjobwidgets.nix  | 11 ++--
 .../libraries/kde-frameworks/kjs.nix          |  8 +--
 .../libraries/kde-frameworks/kjsembed.nix     |  5 +-
 .../libraries/kde-frameworks/kmediaplayer.nix |  4 +-
 .../libraries/kde-frameworks/knewstuff.nix    |  4 +-
 .../kde-frameworks/knotifications.nix         |  4 +-
 .../kde-frameworks/knotifyconfig.nix          |  4 +-
 .../kde-frameworks/kpackage/default.nix       |  4 +-
 .../libraries/kde-frameworks/kparts.nix       |  4 +-
 .../libraries/kde-frameworks/kpeople.nix      |  4 +-
 .../libraries/kde-frameworks/kplotting.nix    |  4 +-
 .../libraries/kde-frameworks/kpty.nix         |  4 +-
 .../libraries/kde-frameworks/kross.nix        |  4 +-
 .../libraries/kde-frameworks/krunner.nix      |  4 +-
 .../kde-frameworks/kservice/default.nix       |  4 +-
 .../libraries/kde-frameworks/ktexteditor.nix  |  4 +-
 .../libraries/kde-frameworks/ktextwidgets.nix |  4 +-
 .../kde-frameworks/kunitconversion.nix        |  4 +-
 .../libraries/kde-frameworks/kwallet.nix      |  4 +-
 .../libraries/kde-frameworks/kwayland.nix     |  4 +-
 .../kde-frameworks/kwidgetsaddons.nix         |  4 +-
 .../kde-frameworks/kwindowsystem/default.nix  |  4 +-
 .../libraries/kde-frameworks/kxmlgui.nix      |  4 +-
 .../kde-frameworks/kxmlrpcclient.nix          |  4 +-
 .../kde-frameworks/modemmanager-qt.nix        |  4 +-
 .../kde-frameworks/networkmanager-qt.nix      |  4 +-
 .../kde-frameworks/oxygen-icons5.nix          |  4 +-
 .../kde-frameworks/plasma-framework.nix       |  4 +-
 .../libraries/kde-frameworks/solid.nix        |  4 +-
 .../libraries/kde-frameworks/sonnet.nix       |  4 +-
 .../kde-frameworks/syntax-highlighting.nix    |  4 +-
 .../libraries/kde-frameworks/threadweaver.nix |  4 +-
 74 files changed, 275 insertions(+), 240 deletions(-)
 delete mode 100644 pkgs/development/libraries/kde-frameworks/build-support/framework.nix

diff --git a/pkgs/development/libraries/kde-frameworks/attica.nix b/pkgs/development/libraries/kde-frameworks/attica.nix
index 6c120c20d3a..c70be1b877d 100644
--- a/pkgs/development/libraries/kde-frameworks/attica.nix
+++ b/pkgs/development/libraries/kde-frameworks/attica.nix
@@ -1,6 +1,6 @@
-{ kdeFramework, lib, extra-cmake-modules, qtbase }:
+{ mkDerivation, lib, extra-cmake-modules, qtbase }:
 
-kdeFramework {
+mkDerivation {
   name = "attica";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
diff --git a/pkgs/development/libraries/kde-frameworks/baloo.nix b/pkgs/development/libraries/kde-frameworks/baloo.nix
index dc7b6af193b..9bbb9a1101b 100644
--- a/pkgs/development/libraries/kde-frameworks/baloo.nix
+++ b/pkgs/development/libraries/kde-frameworks/baloo.nix
@@ -1,9 +1,9 @@
-{ kdeFramework, lib, extra-cmake-modules, kauth, kconfig
+{ mkDerivation, lib, extra-cmake-modules, kauth, kconfig
 , kcoreaddons, kcrash, kdbusaddons, kfilemetadata, ki18n, kidletime
 , kio, lmdb, qtbase, solid
 }:
 
-kdeFramework {
+mkDerivation {
   name = "baloo";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
diff --git a/pkgs/development/libraries/kde-frameworks/bluez-qt.nix b/pkgs/development/libraries/kde-frameworks/bluez-qt.nix
index 261d9471a77..2f3b960f3bd 100644
--- a/pkgs/development/libraries/kde-frameworks/bluez-qt.nix
+++ b/pkgs/development/libraries/kde-frameworks/bluez-qt.nix
@@ -1,9 +1,9 @@
-{ kdeFramework, lib
+{ mkDerivation, lib
 , extra-cmake-modules
 , qtbase, qtdeclarative
 }:
 
-kdeFramework {
+mkDerivation {
   name = "bluez-qt";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
diff --git a/pkgs/development/libraries/kde-frameworks/breeze-icons.nix b/pkgs/development/libraries/kde-frameworks/breeze-icons.nix
index 9a18ade96a8..1c4ed2a9909 100644
--- a/pkgs/development/libraries/kde-frameworks/breeze-icons.nix
+++ b/pkgs/development/libraries/kde-frameworks/breeze-icons.nix
@@ -1,6 +1,6 @@
-{ kdeFramework, lib, extra-cmake-modules, qtsvg }:
+{ mkDerivation, lib, extra-cmake-modules, qtsvg }:
 
-kdeFramework {
+mkDerivation {
   name = "breeze-icons";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   outputs = [ "out" ];
diff --git a/pkgs/development/libraries/kde-frameworks/build-support/framework.nix b/pkgs/development/libraries/kde-frameworks/build-support/framework.nix
deleted file mode 100644
index 04832cf5608..00000000000
--- a/pkgs/development/libraries/kde-frameworks/build-support/framework.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ mkDerivation, lib, fetchurl }:
-
-let
-  mirror = "mirror://kde";
-  srcs = import ../srcs.nix { inherit fetchurl mirror; };
-in
-
-args:
-
-let
-  inherit (args) name;
-  inherit (srcs."${name}") src version;
-in mkDerivation (args // {
-  name = "${name}-${version}";
-  inherit src;
-
-  meta = {
-    license = with lib.licenses; [
-      lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
-    ];
-    platforms = lib.platforms.linux;
-    homepage = "http://www.kde.org";
-  } // (args.meta or {});
-})
diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix
index e5a765d7c16..abe17848f3b 100644
--- a/pkgs/development/libraries/kde-frameworks/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/default.nix
@@ -27,14 +27,68 @@ existing packages here and modify it as necessary.
 { libsForQt5, lib, fetchurl }:
 
 let
+
+  srcs = import ./srcs.nix {
+    inherit fetchurl;
+    mirror = "mirror://kde";
+  };
+
+  mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {};
+
   packages = self: with self;
     let
+
+      propagateBin =
+        let setupHook = { writeScript }:
+              writeScript "setup-hook.sh" ''
+                # Propagate $bin output
+                propagatedUserEnvPkgs+=" @bin@"
+
+                # Propagate $dev so that this setup hook is propagated
+                # But only if there is a separate $dev output
+                if [ "$outputDev" != out ]; then
+                    if [ -n "$crossConfig" ]; then
+                      propagatedBuildInputs+=" @dev@"
+                    else
+                      propagatedNativeBuildInputs+=" @dev@"
+                    fi
+                fi
+              '';
+        in callPackage setupHook {};
+
       callPackage = self.newScope {
-        kdeFramework = import ./build-support/framework.nix {
-          inherit lib fetchurl;
-          mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {};
-        };
+
+        inherit propagateBin;
+
+        mkDerivation = args:
+          let
+
+            inherit (args) name;
+            inherit (srcs."${name}") src version;
+
+            outputs = args.outputs or [ "out" "dev" "bin" ];
+            hasBin = lib.elem "bin" outputs;
+            hasDev = lib.elem "dev" outputs;
+
+            defaultSetupHook = if hasBin && hasDev then propagateBin else null;
+            setupHook = args.setupHook or defaultSetupHook;
+
+            meta = {
+              homepage = "http://www.kde.org";
+              license = with lib.licenses; [
+                lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
+              ];
+              maintainers = [ lib.maintainers.ttuegel ];
+              platforms = lib.platforms.linux;
+            } // (args.meta or {});
+
+          in mkDerivation (args // {
+            name = "${name}-${version}";
+            inherit meta outputs setupHook src;
+          });
+
       };
+
     in {
       attica = callPackage ./attica.nix {};
       baloo = callPackage ./baloo.nix {};
diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix
index f8a774b6855..dfdb6a11803 100644
--- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/default.nix
@@ -1,6 +1,6 @@
-{ kdeFramework, lib, copyPathsToStore, cmake, pkgconfig }:
+{ mkDerivation, lib, copyPathsToStore, cmake, pkgconfig }:
 
-kdeFramework {
+mkDerivation {
   name = "extra-cmake-modules";
 
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
diff --git a/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix b/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix
index 325758bf91d..8f2d1446fcf 100644
--- a/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix
+++ b/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix
@@ -1,11 +1,11 @@
 {
-  kdeFramework, lib,
+  mkDerivation, lib,
   extra-cmake-modules,
   kbookmarks, kcompletion, kconfig, kconfigwidgets, ki18n, kiconthemes, kio,
   knewstuff, knotifications, kpackage, kwidgetsaddons, libXcursor, qtx11extras
 }:
 
-kdeFramework {
+mkDerivation {
   name = "frameworkintegration";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
diff --git a/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix b/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix
index 25188b009b6..99737ea2b83 100644
--- a/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix
+++ b/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix
@@ -1,6 +1,6 @@
-{ kdeFramework, lib, extra-cmake-modules, boost, kactivities, kconfig }:
+{ mkDerivation, lib, extra-cmake-modules, boost, kactivities, kconfig }:
 
-kdeFramework {
+mkDerivation {
   name = "kactivities-stats";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
diff --git a/pkgs/development/libraries/kde-frameworks/kactivities.nix b/pkgs/development/libraries/kde-frameworks/kactivities.nix
index 167c3f15bbd..59b5639c24f 100644
--- a/pkgs/development/libraries/kde-frameworks/kactivities.nix
+++ b/pkgs/development/libraries/kde-frameworks/kactivities.nix
@@ -1,9 +1,9 @@
-{ kdeFramework, lib, extra-cmake-modules, boost, kcmutils, kconfig
+{ mkDerivation, lib, extra-cmake-modules, boost, kcmutils, kconfig
 , kcoreaddons, kdbusaddons, kdeclarative, kglobalaccel, ki18n
 , kio, kservice, kwindowsystem, kxmlgui, qtdeclarative
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kactivities";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
diff --git a/pkgs/development/libraries/kde-frameworks/kapidox.nix b/pkgs/development/libraries/kde-frameworks/kapidox.nix
index 749cf9b2970..0d3ccc276fc 100644
--- a/pkgs/development/libraries/kde-frameworks/kapidox.nix
+++ b/pkgs/development/libraries/kde-frameworks/kapidox.nix
@@ -1,6 +1,6 @@
-{ kdeFramework, lib, extra-cmake-modules, python }:
+{ mkDerivation, lib, extra-cmake-modules, python }:
 
-kdeFramework {
+mkDerivation {
   name = "kapidox";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules python ];
diff --git a/pkgs/development/libraries/kde-frameworks/karchive.nix b/pkgs/development/libraries/kde-frameworks/karchive.nix
index 71561b1109c..5f725a75d56 100644
--- a/pkgs/development/libraries/kde-frameworks/karchive.nix
+++ b/pkgs/development/libraries/kde-frameworks/karchive.nix
@@ -1,6 +1,6 @@
-{ kdeFramework, lib, extra-cmake-modules, qtbase }:
+{ mkDerivation, lib, extra-cmake-modules, qtbase }:
 
-kdeFramework {
+mkDerivation {
   name = "karchive";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
diff --git a/pkgs/development/libraries/kde-frameworks/kauth/default.nix b/pkgs/development/libraries/kde-frameworks/kauth/default.nix
index 7561575ae84..25cdb7f4a19 100644
--- a/pkgs/development/libraries/kde-frameworks/kauth/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kauth/default.nix
@@ -1,6 +1,9 @@
-{ kdeFramework, lib, copyPathsToStore, extra-cmake-modules, kcoreaddons, polkit-qt, qttools }:
+{
+  mkDerivation, lib, copyPathsToStore,
+  extra-cmake-modules, kcoreaddons, polkit-qt, qttools
+}:
 
-kdeFramework {
+mkDerivation {
   name = "kauth";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules qttools ];
diff --git a/pkgs/development/libraries/kde-frameworks/kbookmarks.nix b/pkgs/development/libraries/kde-frameworks/kbookmarks.nix
index 36ea7405842..0873094af3d 100644
--- a/pkgs/development/libraries/kde-frameworks/kbookmarks.nix
+++ b/pkgs/development/libraries/kde-frameworks/kbookmarks.nix
@@ -1,9 +1,9 @@
 {
-  kdeFramework, lib, extra-cmake-modules,
+  mkDerivation, lib, extra-cmake-modules,
   kcodecs, kconfig, kconfigwidgets, kcoreaddons, kiconthemes, kxmlgui
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kbookmarks";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
diff --git a/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix b/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix
index fdf55174548..fb5779e10bc 100644
--- a/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix
@@ -1,9 +1,11 @@
-{ kdeFramework, lib, extra-cmake-modules, kconfigwidgets
-, kcoreaddons, kdeclarative, ki18n, kiconthemes, kitemviews
-, kpackage, kservice, kxmlgui
+{
+  mkDerivation, lib,
+  extra-cmake-modules,
+  kconfigwidgets, kcoreaddons, kdeclarative, ki18n, kiconthemes, kitemviews,
+  kpackage, kservice, kxmlgui
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kcmutils";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
diff --git a/pkgs/development/libraries/kde-frameworks/kcodecs.nix b/pkgs/development/libraries/kde-frameworks/kcodecs.nix
index fa1679519cc..f66c422a638 100644
--- a/pkgs/development/libraries/kde-frameworks/kcodecs.nix
+++ b/pkgs/development/libraries/kde-frameworks/kcodecs.nix
@@ -1,6 +1,6 @@
-{ kdeFramework, lib, extra-cmake-modules, qtbase, qttools }:
+{ mkDerivation, lib, extra-cmake-modules, qtbase, qttools }:
 
-kdeFramework {
+mkDerivation {
   name = "kcodecs";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
diff --git a/pkgs/development/libraries/kde-frameworks/kcompletion.nix b/pkgs/development/libraries/kde-frameworks/kcompletion.nix
index f143524889a..bf7556e94a6 100644
--- a/pkgs/development/libraries/kde-frameworks/kcompletion.nix
+++ b/pkgs/development/libraries/kde-frameworks/kcompletion.nix
@@ -1,9 +1,12 @@
-{ kdeFramework, lib, extra-cmake-modules, kconfig, kwidgetsaddons, qtbase, qttools }:
+{
+  mkDerivation, lib,
+  extra-cmake-modules,
+  kconfig, kwidgetsaddons, qtbase, qttools
+}:
 
-kdeFramework {
+mkDerivation {
   name = "kcompletion";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules qttools ];
-  buildInputs = [ qtbase ];
-  propagatedBuildInputs = [ kconfig kwidgetsaddons ];
+  propagatedBuildInputs = [ kconfig kwidgetsaddons qtbase ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kconfig.nix b/pkgs/development/libraries/kde-frameworks/kconfig.nix
index f6d38cd2336..f95b50f9de5 100644
--- a/pkgs/development/libraries/kde-frameworks/kconfig.nix
+++ b/pkgs/development/libraries/kde-frameworks/kconfig.nix
@@ -1,11 +1,11 @@
-{ kdeFramework, lib, extra-cmake-modules, qtbase, qttools }:
+{ mkDerivation, lib, extra-cmake-modules, qtbase, qttools }:
 
-kdeFramework {
+mkDerivation {
   name = "kconfig";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
   nativeBuildInputs = [ extra-cmake-modules qttools ];
-  buildInputs = [ qtbase ];
+  propagatedBuildInputs = [ qtbase ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix b/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix
index c44473bb915..2b91e003764 100644
--- a/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix
@@ -1,9 +1,9 @@
 {
-  kdeFramework, lib, extra-cmake-modules,
+  mkDerivation, lib, extra-cmake-modules,
   kauth, kcodecs, kconfig, kdoctools, kguiaddons, ki18n, kwidgetsaddons
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kconfigwidgets";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
diff --git a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix
index 4d35c0bbdea..8fa10bd767b 100644
--- a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix
+++ b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix
@@ -1,12 +1,11 @@
-{ kdeFramework, lib, fetchurl, extra-cmake-modules, qtbase, qttools, shared_mime_info }:
+{ mkDerivation, lib, fetchurl, extra-cmake-modules, qtbase, qttools, shared_mime_info }:
 
-kdeFramework {
+mkDerivation {
   name = "kcoreaddons";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
   nativeBuildInputs = [ extra-cmake-modules qttools ];
-  buildInputs = [ qtbase ];
-  propagatedBuildInputs = [ shared_mime_info ];
+  propagatedBuildInputs = [ qtbase shared_mime_info ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kcrash.nix b/pkgs/development/libraries/kde-frameworks/kcrash.nix
index bd008c732af..c8e674c88c5 100644
--- a/pkgs/development/libraries/kde-frameworks/kcrash.nix
+++ b/pkgs/development/libraries/kde-frameworks/kcrash.nix
@@ -1,6 +1,6 @@
-{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, kwindowsystem, qtx11extras }:
+{ mkDerivation, lib, extra-cmake-modules, kcoreaddons, kwindowsystem, qtx11extras }:
 
-kdeFramework {
+mkDerivation {
   name = "kcrash";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
diff --git a/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix b/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix
index 2bbbf65f898..8169c89b5ba 100644
--- a/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix
@@ -1,6 +1,6 @@
-{ kdeFramework, lib, extra-cmake-modules, qtbase, qttools, qtx11extras }:
+{ mkDerivation, lib, extra-cmake-modules, qtbase, qttools, qtx11extras }:
 
-kdeFramework {
+mkDerivation {
   name = "kdbusaddons";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
diff --git a/pkgs/development/libraries/kde-frameworks/kdeclarative.nix b/pkgs/development/libraries/kde-frameworks/kdeclarative.nix
index 05eaffb9fbf..4b9522ffa5d 100644
--- a/pkgs/development/libraries/kde-frameworks/kdeclarative.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdeclarative.nix
@@ -1,10 +1,10 @@
 {
-  kdeFramework, lib, extra-cmake-modules,
+  mkDerivation, lib, extra-cmake-modules,
   epoxy, kconfig, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kpackage,
   kwidgetsaddons, kwindowsystem, pkgconfig, qtdeclarative
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kdeclarative";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
diff --git a/pkgs/development/libraries/kde-frameworks/kded.nix b/pkgs/development/libraries/kde-frameworks/kded.nix
index 2da1bac8f39..18b8ccd0fb6 100644
--- a/pkgs/development/libraries/kde-frameworks/kded.nix
+++ b/pkgs/development/libraries/kde-frameworks/kded.nix
@@ -1,9 +1,9 @@
 {
-  kdeFramework, lib, extra-cmake-modules,
+  mkDerivation, lib, extra-cmake-modules,
   kconfig, kcoreaddons, kcrash, kdbusaddons, kdoctools, kinit, kservice
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kded";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
diff --git a/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix b/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix
index 1174972917e..cf94a706167 100644
--- a/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix
@@ -1,16 +1,15 @@
-{ 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
+{
+  mkDerivation, lib, copyPathsToStore,
+  extra-cmake-modules, kdoctools,
+  docbook_xml_dtd_45, kauth, karchive, kcompletion, kconfig, kconfigwidgets,
+  kcoreaddons, kcrash, kdbusaddons, kded, kdesignerplugin, 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 {
+mkDerivation {
   name = "kdelibs4support";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
diff --git a/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix b/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix
index 8e17a1a60c8..c732a6be22e 100644
--- a/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix
@@ -1,21 +1,11 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, kcompletion
-, kconfig
-, kconfigwidgets
-, kcoreaddons
-, kdoctools
-, kiconthemes
-, kio
-, kitemviews
-, kplotting
-, ktextwidgets
-, kwidgetsaddons
-, kxmlgui
-, sonnet
+{
+  mkDerivation, lib,
+  extra-cmake-modules, kdoctools,
+  kcompletion, kconfig, kconfigwidgets, kcoreaddons, kiconthemes, kio,
+  kitemviews, kplotting, ktextwidgets, kwidgetsaddons, kxmlgui, sonnet
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kdesignerplugin";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
diff --git a/pkgs/development/libraries/kde-frameworks/kdesu.nix b/pkgs/development/libraries/kde-frameworks/kdesu.nix
index fcccea9161f..e8d72008507 100644
--- a/pkgs/development/libraries/kde-frameworks/kdesu.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdesu.nix
@@ -1,8 +1,8 @@
-{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n, kpty
+{ mkDerivation, lib, extra-cmake-modules, kcoreaddons, ki18n, kpty
 , kservice
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kdesu";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
diff --git a/pkgs/development/libraries/kde-frameworks/kdnssd.nix b/pkgs/development/libraries/kde-frameworks/kdnssd.nix
index 18a435139f6..1d7553090fc 100644
--- a/pkgs/development/libraries/kde-frameworks/kdnssd.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdnssd.nix
@@ -1,15 +1,15 @@
-{ kdeFramework, lib
-, extra-cmake-modules, qttools
-, avahi, qtbase
+{
+  mkDerivation, lib,
+  extra-cmake-modules, qttools,
+  avahi, qtbase
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kdnssd";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
   nativeBuildInputs = [ extra-cmake-modules qttools ];
-  propagatedBuildInputs = [ avahi ];
-  buildInputs = [ qtbase ];
+  propagatedBuildInputs = [ avahi qtbase ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix
index 99fc4c7d023..991717cce8c 100644
--- a/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix
@@ -1,8 +1,10 @@
-{ kdeFramework, lib, extra-cmake-modules, docbook_xml_dtd_45
-, docbook5_xsl, karchive, ki18n, perl, perlPackages
+{
+  mkDerivation, lib,
+  extra-cmake-modules, docbook_xml_dtd_45, docbook5_xsl,
+  karchive, ki18n, perl, perlPackages
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kdoctools";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
diff --git a/pkgs/development/libraries/kde-frameworks/kemoticons.nix b/pkgs/development/libraries/kde-frameworks/kemoticons.nix
index 1e31277172d..c2060e9c919 100644
--- a/pkgs/development/libraries/kde-frameworks/kemoticons.nix
+++ b/pkgs/development/libraries/kde-frameworks/kemoticons.nix
@@ -1,12 +1,10 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, karchive
-, kconfig
-, kcoreaddons
-, kservice
+{
+  mkDerivation, lib,
+  extra-cmake-modules,
+  karchive, kconfig, kcoreaddons, kservice
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kemoticons";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
diff --git a/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix b/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix
index bc7349e7453..3fb81c28a7b 100644
--- a/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix
@@ -1,8 +1,10 @@
-{ kdeFramework, lib, copyPathsToStore, extra-cmake-modules
-, attr, ebook_tools, exiv2, ffmpeg, karchive, ki18n, poppler, qtbase, taglib
+{
+  mkDerivation, lib, copyPathsToStore,
+  extra-cmake-modules,
+  attr, ebook_tools, exiv2, ffmpeg, karchive, ki18n, poppler, qtbase, taglib
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kfilemetadata";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
diff --git a/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix b/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix
index 1c1336dd4d0..cfe767b4d55 100644
--- a/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix
+++ b/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix
@@ -1,10 +1,11 @@
 {
-  kdeFramework, lib, extra-cmake-modules,
+  mkDerivation, lib,
+  extra-cmake-modules,
   kconfig, kcoreaddons, kcrash, kdbusaddons, kservice, kwindowsystem,
   qtx11extras
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kglobalaccel";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
diff --git a/pkgs/development/libraries/kde-frameworks/kguiaddons.nix b/pkgs/development/libraries/kde-frameworks/kguiaddons.nix
index f93aa0967f6..2b4e28ca492 100644
--- a/pkgs/development/libraries/kde-frameworks/kguiaddons.nix
+++ b/pkgs/development/libraries/kde-frameworks/kguiaddons.nix
@@ -1,10 +1,10 @@
 {
-  kdeFramework, lib,
+  mkDerivation, lib,
   extra-cmake-modules,
   qtbase, qtx11extras,
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kguiaddons";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
diff --git a/pkgs/development/libraries/kde-frameworks/khtml.nix b/pkgs/development/libraries/kde-frameworks/khtml.nix
index 99f6fe31e0d..d6ec1ab901f 100644
--- a/pkgs/development/libraries/kde-frameworks/khtml.nix
+++ b/pkgs/development/libraries/kde-frameworks/khtml.nix
@@ -1,10 +1,12 @@
-{ kdeFramework, lib, extra-cmake-modules, giflib, karchive
-, kcodecs, kglobalaccel, ki18n, kiconthemes, kio, kjs
-, knotifications, kparts, ktextwidgets, kwallet, kwidgetsaddons
-, kwindowsystem, kxmlgui, perl, phonon, qtx11extras, sonnet
+{
+  mkDerivation, lib,
+  extra-cmake-modules, perl,
+  giflib, karchive, kcodecs, kglobalaccel, ki18n, kiconthemes, kio, kjs,
+  knotifications, kparts, ktextwidgets, kwallet, kwidgetsaddons, kwindowsystem,
+  kxmlgui, phonon, qtx11extras, sonnet
 }:
 
-kdeFramework {
+mkDerivation {
   name = "khtml";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules perl ];
diff --git a/pkgs/development/libraries/kde-frameworks/ki18n.nix b/pkgs/development/libraries/kde-frameworks/ki18n.nix
index 68f29c8314f..649f1db3952 100644
--- a/pkgs/development/libraries/kde-frameworks/ki18n.nix
+++ b/pkgs/development/libraries/kde-frameworks/ki18n.nix
@@ -1,10 +1,10 @@
 {
-  kdeFramework, lib,
+  mkDerivation, lib,
   extra-cmake-modules, gettext, python,
   qtbase, qtdeclarative, qtscript,
 }:
 
-kdeFramework {
+mkDerivation {
   name = "ki18n";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
diff --git a/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix b/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix
index 6102bb0d4b5..f1d8503804e 100644
--- a/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix
@@ -1,9 +1,10 @@
-{ kdeFramework, lib, copyPathsToStore
-, extra-cmake-modules
-, karchive, kconfigwidgets, ki18n, breeze-icons, kitemviews, qtsvg
+{
+  mkDerivation, lib, copyPathsToStore,
+  extra-cmake-modules,
+  karchive, kconfigwidgets, ki18n, breeze-icons, kitemviews, qtsvg
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kiconthemes";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
diff --git a/pkgs/development/libraries/kde-frameworks/kidletime.nix b/pkgs/development/libraries/kde-frameworks/kidletime.nix
index bfec344ca11..4139674cd39 100644
--- a/pkgs/development/libraries/kde-frameworks/kidletime.nix
+++ b/pkgs/development/libraries/kde-frameworks/kidletime.nix
@@ -1,10 +1,10 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, qtbase
-, qtx11extras
+{
+  mkDerivation, lib,
+  extra-cmake-modules,
+  qtbase, qtx11extras
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kidletime";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
diff --git a/pkgs/development/libraries/kde-frameworks/kimageformats.nix b/pkgs/development/libraries/kde-frameworks/kimageformats.nix
index 2a8e825893b..b711328cf89 100644
--- a/pkgs/development/libraries/kde-frameworks/kimageformats.nix
+++ b/pkgs/development/libraries/kde-frameworks/kimageformats.nix
@@ -1,10 +1,10 @@
 {
-  kdeFramework, lib,
+  mkDerivation, lib,
   extra-cmake-modules,
   ilmbase, karchive, qtbase
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kimageformats";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
diff --git a/pkgs/development/libraries/kde-frameworks/kinit/default.nix b/pkgs/development/libraries/kde-frameworks/kinit/default.nix
index f5cfa166e91..51c0e40617a 100644
--- a/pkgs/development/libraries/kde-frameworks/kinit/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kinit/default.nix
@@ -1,13 +1,12 @@
 {
-  kdeFramework, lib, copyPathsToStore,
+  mkDerivation, lib, copyPathsToStore,
   extra-cmake-modules, kdoctools,
   kconfig, kcrash, ki18n, kio, kparts, kservice, kwindowsystem, plasma-framework
 }:
 
-let
-  inherit (lib) getLib;
-in
-kdeFramework {
+let inherit (lib) getLib; in
+
+mkDerivation {
   name = "kinit";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
diff --git a/pkgs/development/libraries/kde-frameworks/kio/default.nix b/pkgs/development/libraries/kde-frameworks/kio/default.nix
index 3f4ae5a25c2..86cb72707a5 100644
--- a/pkgs/development/libraries/kde-frameworks/kio/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kio/default.nix
@@ -1,13 +1,13 @@
-{ 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
-, qtscript, qtx11extras, solid, fetchpatch
+{
+  mkDerivation, lib, copyPathsToStore,
+  extra-cmake-modules, kdoctools,
+  acl, karchive, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons,
+  kdbusaddons, ki18n, kiconthemes, kitemviews, kjobwidgets, knotifications,
+  kservice, ktextwidgets, kwallet, kwidgetsaddons, kwindowsystem, kxmlgui,
+  qtscript, qtx11extras, solid, fetchpatch
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kio";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
diff --git a/pkgs/development/libraries/kde-frameworks/kitemmodels.nix b/pkgs/development/libraries/kde-frameworks/kitemmodels.nix
index e2f0633da8c..a769d30b3c3 100644
--- a/pkgs/development/libraries/kde-frameworks/kitemmodels.nix
+++ b/pkgs/development/libraries/kde-frameworks/kitemmodels.nix
@@ -1,13 +1,15 @@
-{ kdeFramework, lib
-, extra-cmake-modules, qtbase
+{
+  mkDerivation, lib,
+  extra-cmake-modules,
+  qtbase
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kitemmodels";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtbase ];
+  propagatedBuildInputs = [ qtbase ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kitemviews.nix b/pkgs/development/libraries/kde-frameworks/kitemviews.nix
index df420f8f4b9..7e317deef58 100644
--- a/pkgs/development/libraries/kde-frameworks/kitemviews.nix
+++ b/pkgs/development/libraries/kde-frameworks/kitemviews.nix
@@ -1,13 +1,15 @@
-{ kdeFramework, lib
-, extra-cmake-modules, qtbase, qttools
+{
+  mkDerivation, lib,
+  extra-cmake-modules,
+  qtbase, qttools
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kitemviews";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
   nativeBuildInputs = [ extra-cmake-modules qttools ];
-  buildInputs = [ qtbase ];
+  propagatedBuildInputs = [ qtbase ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix b/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix
index ddc66d2eb20..048f1290a99 100644
--- a/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix
+++ b/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix
@@ -1,11 +1,10 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, kcoreaddons
-, kwidgetsaddons
-, qttools, qtx11extras
+{
+  mkDerivation, lib,
+  extra-cmake-modules, qttools,
+  kcoreaddons, kwidgetsaddons, qtx11extras
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kjobwidgets";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules qttools ];
diff --git a/pkgs/development/libraries/kde-frameworks/kjs.nix b/pkgs/development/libraries/kde-frameworks/kjs.nix
index abdc15ce8df..20459498c3e 100644
--- a/pkgs/development/libraries/kde-frameworks/kjs.nix
+++ b/pkgs/development/libraries/kde-frameworks/kjs.nix
@@ -1,9 +1,9 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, kdoctools
+{
+  mkDerivation, lib,
+  extra-cmake-modules, kdoctools
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kjs";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
diff --git a/pkgs/development/libraries/kde-frameworks/kjsembed.nix b/pkgs/development/libraries/kde-frameworks/kjsembed.nix
index 95bc02422f1..3a52761e259 100644
--- a/pkgs/development/libraries/kde-frameworks/kjsembed.nix
+++ b/pkgs/development/libraries/kde-frameworks/kjsembed.nix
@@ -1,8 +1,9 @@
-{ kdeFramework, lib, extra-cmake-modules, kdoctools, ki18n, kjs
+{
+  mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kjs
 , qtsvg
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kjsembed";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
diff --git a/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix b/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix
index 93a6b450f76..278a4240ab9 100644
--- a/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix
+++ b/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix
@@ -1,10 +1,10 @@
-{ kdeFramework, lib
+{ mkDerivation, lib
 , extra-cmake-modules
 , kparts
 , kxmlgui
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kmediaplayer";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
diff --git a/pkgs/development/libraries/kde-frameworks/knewstuff.nix b/pkgs/development/libraries/kde-frameworks/knewstuff.nix
index 002418c65ad..b32a073fb33 100644
--- a/pkgs/development/libraries/kde-frameworks/knewstuff.nix
+++ b/pkgs/development/libraries/kde-frameworks/knewstuff.nix
@@ -1,9 +1,9 @@
-{ kdeFramework, lib, extra-cmake-modules, attica, karchive
+{ mkDerivation, lib, extra-cmake-modules, attica, karchive
 , kcompletion, kconfig, kcoreaddons, ki18n, kiconthemes, kio
 , kitemviews, kservice, ktextwidgets, kwidgetsaddons, kxmlgui
 }:
 
-kdeFramework {
+mkDerivation {
   name = "knewstuff";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
diff --git a/pkgs/development/libraries/kde-frameworks/knotifications.nix b/pkgs/development/libraries/kde-frameworks/knotifications.nix
index c1c07957872..2532f5b4b4f 100644
--- a/pkgs/development/libraries/kde-frameworks/knotifications.nix
+++ b/pkgs/development/libraries/kde-frameworks/knotifications.nix
@@ -1,4 +1,4 @@
-{ kdeFramework, lib
+{ mkDerivation, lib
 , extra-cmake-modules
 , kcodecs, kconfig, kcoreaddons, kwindowsystem
 , libdbusmenu
@@ -6,7 +6,7 @@
 , qttools, qtx11extras
 }:
 
-kdeFramework {
+mkDerivation {
   name = "knotifications";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules qttools ];
diff --git a/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix b/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix
index 0e357aecb99..29c779e6598 100644
--- a/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix
+++ b/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix
@@ -1,8 +1,8 @@
-{ kdeFramework, lib, extra-cmake-modules, kcompletion, kconfig
+{ mkDerivation, lib, extra-cmake-modules, kcompletion, kconfig
 , ki18n, kio, phonon
 }:
 
-kdeFramework {
+mkDerivation {
   name = "knotifyconfig";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
diff --git a/pkgs/development/libraries/kde-frameworks/kpackage/default.nix b/pkgs/development/libraries/kde-frameworks/kpackage/default.nix
index 2953aea9a55..e83afaa8e82 100644
--- a/pkgs/development/libraries/kde-frameworks/kpackage/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kpackage/default.nix
@@ -1,10 +1,10 @@
 {
-  kdeFramework, fetchurl, lib, copyPathsToStore,
+  mkDerivation, fetchurl, lib, copyPathsToStore,
   extra-cmake-modules, kdoctools,
   karchive, kconfig, kcoreaddons, ki18n
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kpackage";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
diff --git a/pkgs/development/libraries/kde-frameworks/kparts.nix b/pkgs/development/libraries/kde-frameworks/kparts.nix
index ad6ea2dbc30..db0eb6c2a2c 100644
--- a/pkgs/development/libraries/kde-frameworks/kparts.nix
+++ b/pkgs/development/libraries/kde-frameworks/kparts.nix
@@ -1,9 +1,9 @@
-{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons
+{ mkDerivation, lib, extra-cmake-modules, kconfig, kcoreaddons
 , ki18n, kiconthemes, kio, kjobwidgets, knotifications, kservice
 , ktextwidgets, kwidgetsaddons, kxmlgui
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kparts";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
diff --git a/pkgs/development/libraries/kde-frameworks/kpeople.nix b/pkgs/development/libraries/kde-frameworks/kpeople.nix
index 6acb5e2eed5..e10abf6ab62 100644
--- a/pkgs/development/libraries/kde-frameworks/kpeople.nix
+++ b/pkgs/development/libraries/kde-frameworks/kpeople.nix
@@ -1,8 +1,8 @@
-{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n
+{ mkDerivation, lib, extra-cmake-modules, kcoreaddons, ki18n
 , kitemviews, kservice, kwidgetsaddons, qtdeclarative
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kpeople";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
diff --git a/pkgs/development/libraries/kde-frameworks/kplotting.nix b/pkgs/development/libraries/kde-frameworks/kplotting.nix
index e132a45976f..a0d6b4625d9 100644
--- a/pkgs/development/libraries/kde-frameworks/kplotting.nix
+++ b/pkgs/development/libraries/kde-frameworks/kplotting.nix
@@ -1,8 +1,8 @@
-{ kdeFramework, lib
+{ mkDerivation, lib
 , extra-cmake-modules, qtbase
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kplotting";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
diff --git a/pkgs/development/libraries/kde-frameworks/kpty.nix b/pkgs/development/libraries/kde-frameworks/kpty.nix
index 8bdaacb85f8..27acf536c36 100644
--- a/pkgs/development/libraries/kde-frameworks/kpty.nix
+++ b/pkgs/development/libraries/kde-frameworks/kpty.nix
@@ -1,6 +1,6 @@
-{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n }:
+{ mkDerivation, lib, extra-cmake-modules, kcoreaddons, ki18n }:
 
-kdeFramework {
+mkDerivation {
   name = "kpty";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
diff --git a/pkgs/development/libraries/kde-frameworks/kross.nix b/pkgs/development/libraries/kde-frameworks/kross.nix
index 0e66d95b5cc..6b37c118183 100644
--- a/pkgs/development/libraries/kde-frameworks/kross.nix
+++ b/pkgs/development/libraries/kde-frameworks/kross.nix
@@ -1,9 +1,9 @@
-{ kdeFramework, lib, extra-cmake-modules, kcompletion, kcoreaddons
+{ mkDerivation, lib, extra-cmake-modules, kcompletion, kcoreaddons
 , kdoctools, ki18n, kiconthemes, kio, kparts, kwidgetsaddons
 , kxmlgui, qtscript
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kross";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
diff --git a/pkgs/development/libraries/kde-frameworks/krunner.nix b/pkgs/development/libraries/kde-frameworks/krunner.nix
index ec9ab7abe9f..2f542591e49 100644
--- a/pkgs/development/libraries/kde-frameworks/krunner.nix
+++ b/pkgs/development/libraries/kde-frameworks/krunner.nix
@@ -1,9 +1,9 @@
-{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons
+{ mkDerivation, lib, extra-cmake-modules, kconfig, kcoreaddons
 , ki18n, kio, kservice, plasma-framework, solid
 , threadweaver
 }:
 
-kdeFramework {
+mkDerivation {
   name = "krunner";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
diff --git a/pkgs/development/libraries/kde-frameworks/kservice/default.nix b/pkgs/development/libraries/kde-frameworks/kservice/default.nix
index 2751a7f5d6e..2730cf53677 100644
--- a/pkgs/development/libraries/kde-frameworks/kservice/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kservice/default.nix
@@ -1,10 +1,10 @@
 {
-  kdeFramework, lib, copyPathsToStore,
+  mkDerivation, lib, copyPathsToStore,
   bison, extra-cmake-modules, flex,
   kconfig, kcoreaddons, kcrash, kdbusaddons, kdoctools, ki18n, kwindowsystem
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kservice";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   propagatedNativeBuildInputs = [ bison extra-cmake-modules flex ];
diff --git a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix b/pkgs/development/libraries/kde-frameworks/ktexteditor.nix
index fbd73c65eff..bc4dcf6916b 100644
--- a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix
+++ b/pkgs/development/libraries/kde-frameworks/ktexteditor.nix
@@ -1,4 +1,4 @@
-{ kdeFramework, lib, copyPathsToStore
+{ mkDerivation, lib, copyPathsToStore
 , extra-cmake-modules, perl
 , karchive, kconfig, kguiaddons, kiconthemes, kparts
 , libgit2
@@ -6,7 +6,7 @@
 , ki18n, kio, sonnet, syntax-highlighting
 }:
 
-kdeFramework {
+mkDerivation {
   name = "ktexteditor";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules perl ];
diff --git a/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix b/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix
index 25954c60397..695e7b991e7 100644
--- a/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix
+++ b/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix
@@ -1,9 +1,9 @@
-{ kdeFramework, lib, extra-cmake-modules, kcompletion, kconfig
+{ mkDerivation, lib, extra-cmake-modules, kcompletion, kconfig
 , kconfigwidgets, ki18n, kiconthemes, kservice, kwindowsystem
 , sonnet
 }:
 
-kdeFramework {
+mkDerivation {
   name = "ktextwidgets";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
diff --git a/pkgs/development/libraries/kde-frameworks/kunitconversion.nix b/pkgs/development/libraries/kde-frameworks/kunitconversion.nix
index c04ded722aa..e793bb8828f 100644
--- a/pkgs/development/libraries/kde-frameworks/kunitconversion.nix
+++ b/pkgs/development/libraries/kde-frameworks/kunitconversion.nix
@@ -1,6 +1,6 @@
-{ kdeFramework, lib, extra-cmake-modules, ki18n }:
+{ mkDerivation, lib, extra-cmake-modules, ki18n }:
 
-kdeFramework {
+mkDerivation {
   name = "kunitconversion";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
diff --git a/pkgs/development/libraries/kde-frameworks/kwallet.nix b/pkgs/development/libraries/kde-frameworks/kwallet.nix
index 48181040a75..31a29dbff92 100644
--- a/pkgs/development/libraries/kde-frameworks/kwallet.nix
+++ b/pkgs/development/libraries/kde-frameworks/kwallet.nix
@@ -1,9 +1,9 @@
-{ kdeFramework, lib, extra-cmake-modules, kconfig, kconfigwidgets
+{ mkDerivation, lib, extra-cmake-modules, kconfig, kconfigwidgets
 , kcoreaddons , kdbusaddons, kdoctools, ki18n, kiconthemes
 , knotifications , kservice, kwidgetsaddons, kwindowsystem, libgcrypt, gpgme
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kwallet";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
diff --git a/pkgs/development/libraries/kde-frameworks/kwayland.nix b/pkgs/development/libraries/kde-frameworks/kwayland.nix
index d34687def3e..87c0bf84706 100644
--- a/pkgs/development/libraries/kde-frameworks/kwayland.nix
+++ b/pkgs/development/libraries/kde-frameworks/kwayland.nix
@@ -1,10 +1,10 @@
 {
-  kdeFramework, lib,
+  mkDerivation, lib,
   extra-cmake-modules,
   qtbase, wayland
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kwayland";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
diff --git a/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix b/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix
index ce16e280faa..4375cf064e1 100644
--- a/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix
+++ b/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix
@@ -1,8 +1,8 @@
-{ kdeFramework, lib
+{ mkDerivation, lib
 , extra-cmake-modules, qtbase, qttools
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kwidgetsaddons";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
index 4e02777e39c..6fe57449b89 100644
--- a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
@@ -1,10 +1,10 @@
 {
-  kdeFramework, lib, copyPathsToStore,
+  mkDerivation, lib, copyPathsToStore,
   extra-cmake-modules,
   qtbase, qttools, qtx11extras
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kwindowsystem";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
diff --git a/pkgs/development/libraries/kde-frameworks/kxmlgui.nix b/pkgs/development/libraries/kde-frameworks/kxmlgui.nix
index ea800bf58ae..80df93c61b8 100644
--- a/pkgs/development/libraries/kde-frameworks/kxmlgui.nix
+++ b/pkgs/development/libraries/kde-frameworks/kxmlgui.nix
@@ -1,9 +1,9 @@
-{ kdeFramework, lib, extra-cmake-modules, attica, kconfig
+{ mkDerivation, lib, extra-cmake-modules, attica, kconfig
 , kconfigwidgets, kglobalaccel, ki18n, kiconthemes, kitemviews
 , ktextwidgets, kwindowsystem, sonnet
 }:
 
-kdeFramework {
+mkDerivation {
   name = "kxmlgui";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
diff --git a/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix b/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix
index f20f4a22394..714d768742e 100644
--- a/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix
+++ b/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix
@@ -1,6 +1,6 @@
-{ kdeFramework, lib, extra-cmake-modules, ki18n, kio }:
+{ mkDerivation, lib, extra-cmake-modules, ki18n, kio }:
 
-kdeFramework {
+mkDerivation {
   name = "kxmlrpcclient";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
diff --git a/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix b/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix
index ea2e112ff67..c4edfeca5a3 100644
--- a/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix
+++ b/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix
@@ -1,9 +1,9 @@
-{ kdeFramework, lib
+{ mkDerivation, lib
 , extra-cmake-modules
 , modemmanager, qtbase
 }:
 
-kdeFramework {
+mkDerivation {
   name = "modemmanager-qt";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
diff --git a/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix b/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix
index 80085bb2072..340c76ef778 100644
--- a/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix
+++ b/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix
@@ -1,9 +1,9 @@
-{ kdeFramework, lib
+{ mkDerivation, lib
 , extra-cmake-modules
 , qtbase, networkmanager
 }:
 
-kdeFramework {
+mkDerivation {
   name = "networkmanager-qt";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
diff --git a/pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix b/pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix
index 1d45b51274c..919c4f36b15 100644
--- a/pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix
+++ b/pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix
@@ -1,9 +1,9 @@
-{ kdeFramework
+{ mkDerivation
 , lib
 , extra-cmake-modules, qtbase
 }:
 
-kdeFramework {
+mkDerivation {
   name = "oxygen-icons5";
   meta = {
     license = lib.licenses.lgpl3Plus;
diff --git a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix
index 2fd667af0dc..f47750145b5 100644
--- a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix
+++ b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix
@@ -1,11 +1,11 @@
-{ kdeFramework, lib, fetchurl, extra-cmake-modules, kactivities, karchive
+{ mkDerivation, lib, fetchurl, extra-cmake-modules, kactivities, karchive
 , kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative
 , kdoctools, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio
 , knotifications, kpackage, kservice, kwayland, kwindowsystem, kxmlgui
 , qtscript, qtx11extras
 }:
 
-kdeFramework {
+mkDerivation {
   name = "plasma-framework";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
diff --git a/pkgs/development/libraries/kde-frameworks/solid.nix b/pkgs/development/libraries/kde-frameworks/solid.nix
index d32acf598eb..f64b9936046 100644
--- a/pkgs/development/libraries/kde-frameworks/solid.nix
+++ b/pkgs/development/libraries/kde-frameworks/solid.nix
@@ -1,10 +1,10 @@
 {
-  kdeFramework, lib,
+  mkDerivation, lib,
   bison, extra-cmake-modules, flex,
   qtbase, qtdeclarative, qttools
 }:
 
-kdeFramework {
+mkDerivation {
   name = "solid";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
diff --git a/pkgs/development/libraries/kde-frameworks/sonnet.nix b/pkgs/development/libraries/kde-frameworks/sonnet.nix
index ae3e72e2a46..06165a57c3a 100644
--- a/pkgs/development/libraries/kde-frameworks/sonnet.nix
+++ b/pkgs/development/libraries/kde-frameworks/sonnet.nix
@@ -1,9 +1,9 @@
-{ kdeFramework, lib
+{ mkDerivation, lib
 , extra-cmake-modules
 , hunspell, qtbase, qttools
 }:
 
-kdeFramework {
+mkDerivation {
   name = "sonnet";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
diff --git a/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix b/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix
index f199321e674..ebc33a8346e 100644
--- a/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix
+++ b/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix
@@ -1,8 +1,8 @@
-{ kdeFramework, lib
+{ mkDerivation, lib
 , extra-cmake-modules, perl, qtbase, qttools
 }:
 
-kdeFramework {
+mkDerivation {
   name = "syntax-highlighting";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
diff --git a/pkgs/development/libraries/kde-frameworks/threadweaver.nix b/pkgs/development/libraries/kde-frameworks/threadweaver.nix
index 4df3ff510cb..3afedf18ecb 100644
--- a/pkgs/development/libraries/kde-frameworks/threadweaver.nix
+++ b/pkgs/development/libraries/kde-frameworks/threadweaver.nix
@@ -1,8 +1,8 @@
-{ kdeFramework, lib
+{ mkDerivation, lib
 , extra-cmake-modules, qtbase
 }:
 
-kdeFramework {
+mkDerivation {
   name = "threadweaver";
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];

From f6763c80e1879775be563fc811455cc5c64e3d14 Mon Sep 17 00:00:00 2001
From: romildo <malaquias@gmail.com>
Date: Sun, 18 Jun 2017 08:45:17 -0300
Subject: [PATCH 025/189] vivaldi: 1.9.818.44-1 -> 1.10.867.38-1

- Update to version 1.10.867.38-1
- Drop i386 arch. Vivaldi has suspended support for Linux 32-bit for
  Vivaldi 1.10. Unfortunately, this is due to Chromium suspending support
  for it and maintaining it themselves would take too much resources.
  See https://forum.vivaldi.net/post/142489.
- Update dependency on gtk2 to gtk3.
- Move dependency patchelf from buildInputs to nativeBuildInputs.
---
 .../networking/browsers/vivaldi/default.nix   | 45 +++++++------------
 1 file changed, 17 insertions(+), 28 deletions(-)

diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index 3489aeb4cf5..749fc855788 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -4,31 +4,19 @@
 , freetype, fontconfig, libXft, libXrender, libxcb, expat, libXau, libXdmcp
 , libuuid, xz
 , gstreamer, gst-plugins-base, libxml2
-, glib, gtk2, pango, gdk_pixbuf, cairo, atk, gnome3
+, glib, gtk3, pango, gdk_pixbuf, cairo, atk, gnome3
 , nss, nspr
 , patchelf
 }:
 
-let
-  version = "1.9";
-  build = "818.44-1";
-  fullVersion = "stable_${version}.${build}";
-
-  info = if stdenv.is64bit then {
-      arch = "amd64";
-      sha256 = "0apkwgd98ld5k77nplzmk67nz6mb5pi8jyrnkp96m93mr41b08bq";
-    } else {
-      arch = "i386";
-      sha256 = "0xyf0z1cnzmb3pv6rgsbd7jdjf1v137priz4kkymr8jgmpq0mmfx";
-    };
-
-in stdenv.mkDerivation rec {
-  product    = "vivaldi";
-  name       = "${product}-${version}";
+stdenv.mkDerivation rec {
+  name = "${product}-${version}";
+  product = "vivaldi";
+  version = "1.10.867.38-1";
 
   src = fetchurl {
-    inherit (info) sha256;
-    url = "https://downloads.vivaldi.com/stable/${product}-${fullVersion}_${info.arch}.deb";
+    url = "https://downloads.vivaldi.com/stable/${product}-stable_${version}_amd64.deb";
+    sha256 = "1h3iygzvw3rb5kmn0pam6gqy9baq6l630yllff1vnvychdg8d9vi";
   };
 
   unpackPhase = ''
@@ -36,14 +24,15 @@ in stdenv.mkDerivation rec {
     tar -xvf data.tar.xz
   '';
 
-  buildInputs =
-    [ stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb
-      libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr
-      atk alsaLib dbus_libs cups gtk2 gdk_pixbuf libexif ffmpeg systemd
-      freetype fontconfig libXrender libuuid expat glib nss nspr
-      gstreamer libxml2 gst-plugins-base pango cairo gnome3.gconf
-      patchelf
-    ];
+  nativeBuildInputs = [ patchelf ];
+
+  buildInputs = [
+    stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb
+    libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr
+    atk alsaLib dbus_libs cups gtk3 gdk_pixbuf libexif ffmpeg systemd
+    freetype fontconfig libXrender libuuid expat glib nss nspr
+    gstreamer libxml2 gst-plugins-base pango cairo gnome3.gconf
+  ];
 
   libPath = stdenv.lib.makeLibraryPath buildInputs
     + stdenv.lib.optionalString (stdenv.is64bit)
@@ -85,6 +74,6 @@ in stdenv.mkDerivation rec {
     homepage    = "https://vivaldi.com";
     license     = licenses.unfree;
     maintainers = with maintainers; [ otwieracz nequissimus ];
-    platforms   = platforms.linux;
+    platforms   = [ "x86_64-linux" ];
   };
 }

From be7b7d908f82e8ab16c43ffd0e240addd6f4018a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 16 May 2017 10:56:41 -0500
Subject: [PATCH 026/189] Remove kdeWrapper

---
 .../services/x11/desktop-managers/plasma5.nix | 28 +-----
 .../editors/kdevelop5/kdevelop.nix            | 22 +++--
 pkgs/applications/editors/kile/default.nix    | 77 +++++++--------
 .../applications/graphics/digikam/default.nix | 57 ++++++-----
 pkgs/applications/kde/ark/default.nix         | 57 +++++------
 pkgs/applications/kde/dolphin-plugins.nix     |  2 +-
 pkgs/applications/kde/dolphin.nix             | 39 +++-----
 pkgs/applications/kde/filelight.nix           | 31 +++---
 pkgs/applications/kde/gwenview.nix            | 35 +++----
 pkgs/applications/kde/k3b.nix                 | 63 ++++++------
 pkgs/applications/kde/kate.nix                | 40 +++-----
 pkgs/applications/kde/kcachegrind.nix         | 34 +++----
 pkgs/applications/kde/kcalc.nix               | 32 +++---
 pkgs/applications/kde/kcolorchooser.nix       | 29 +++---
 pkgs/applications/kde/kcontacts.nix           |  5 +-
 pkgs/applications/kde/kdenlive.nix            | 27 ++----
 pkgs/applications/kde/kdf.nix                 | 29 ++----
 pkgs/applications/kde/kgpg.nix                | 12 +--
 pkgs/applications/kde/khelpcenter.nix         | 25 ++---
 pkgs/applications/kde/kig.nix                 | 32 +++---
 pkgs/applications/kde/kmix.nix                | 41 ++++----
 pkgs/applications/kde/kolourpaint.nix         | 28 ++----
 pkgs/applications/kde/kompare.nix             | 25 ++---
 pkgs/applications/kde/konsole.nix             | 37 +++----
 pkgs/applications/kde/krfb.nix                | 27 ++----
 pkgs/applications/kde/kwalletmanager.nix      | 32 +++---
 pkgs/applications/kde/marble.nix              | 32 ++----
 pkgs/applications/kde/okteta.nix              | 33 +++----
 pkgs/applications/kde/okular.nix              | 38 +++-----
 pkgs/applications/kde/print-manager.nix       |  4 +-
 pkgs/applications/kde/spectacle.nix           | 29 +++---
 pkgs/applications/misc/krename/default.nix    | 45 ++++-----
 pkgs/applications/misc/krusader/default.nix   | 37 +++----
 pkgs/applications/misc/latte-dock/default.nix | 45 ++++-----
 pkgs/applications/misc/yakuake/default.nix    | 49 +++++-----
 .../networking/irc/konversation/default.nix   | 97 +++++++++----------
 pkgs/build-support/kde/wrapper.nix            | 68 -------------
 pkgs/desktops/plasma-5/oxygen.nix             | 22 ++---
 pkgs/tools/misc/kronometer/default.nix        | 36 +++----
 pkgs/tools/misc/partition-manager/default.nix | 39 ++++----
 pkgs/tools/misc/peruse/default.nix            | 51 +++++-----
 pkgs/tools/security/kwalletcli/default.nix    | 78 +++++++--------
 pkgs/tools/text/kdiff3/default.nix            | 79 +++++++--------
 pkgs/top-level/all-packages.nix               |  4 -
 44 files changed, 665 insertions(+), 987 deletions(-)
 delete mode 100644 pkgs/build-support/kde/wrapper.nix

diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix
index d981cd5328e..27678fda1b5 100644
--- a/nixos/modules/services/x11/desktop-managers/plasma5.nix
+++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix
@@ -7,7 +7,7 @@ let
   xcfg = config.services.xserver;
   cfg = xcfg.desktopManager.plasma5;
 
-  inherit (pkgs) kdeWrapper kdeApplications plasma5 libsForQt5 qt5 xorg;
+  inherit (pkgs) kdeApplications plasma5 libsForQt5 qt5 xorg;
 
 in
 
@@ -30,24 +30,12 @@ in
         '';
       };
 
-      extraPackages = mkOption {
-        type = types.listOf types.package;
-        default = [];
-        description = ''
-          KDE packages that need to be installed system-wide.
-        '';
-      };
-
     };
 
   };
 
 
   config = mkMerge [
-    (mkIf (cfg.extraPackages != []) {
-      environment.systemPackages = [ (kdeWrapper cfg.extraPackages) ];
-    })
-
     (mkIf (xcfg.enable && cfg.enable) {
       services.xserver.desktopManager.session = singleton {
         name = "plasma5";
@@ -139,10 +127,14 @@ in
           plasma-workspace
           plasma-workspace-wallpapers
 
+          dolphin
           dolphin-plugins
           ffmpegthumbs
           kdegraphics-thumbnailers
+          khelpcenter
           kio-extras
+          konsole
+          oxygen
           print-manager
 
           breeze-icons
@@ -163,16 +155,6 @@ in
         ++ lib.optional config.services.colord.enable colord-kde
         ++ lib.optionals config.services.samba.enable [ kdenetwork-filesharing pkgs.samba ];
 
-      services.xserver.desktopManager.plasma5.extraPackages =
-        with kdeApplications; with plasma5;
-        [
-          khelpcenter
-          oxygen
-
-          dolphin
-          konsole
-        ];
-
       environment.pathsToLink = [ "/share" ];
 
       environment.etc = singleton {
diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix
index c599666f4d5..d4f07d82bf0 100644
--- a/pkgs/applications/editors/kdevelop5/kdevelop.nix
+++ b/pkgs/applications/editors/kdevelop5/kdevelop.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, gettext, pkgconfig, extra-cmake-modules, makeQtWrapper
+{ mkDerivation, lib, fetchurl, cmake, gettext, pkgconfig, extra-cmake-modules, wrapGAppsHook
 , qtquickcontrols, qtwebkit, qttools, kde-cli-tools
 , kconfig, kdeclarative, kdoctools, kiconthemes, ki18n, kitemmodels, kitemviews
 , kjobwidgets, kcmutils, kio, knewstuff, knotifyconfig, kparts, ktexteditor
@@ -12,7 +12,7 @@ let
   version = "5.1.1";
 
 in
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
@@ -21,24 +21,26 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    cmake gettext pkgconfig extra-cmake-modules makeWrapper makeQtWrapper
+    cmake gettext pkgconfig extra-cmake-modules makeWrapper wrapGAppsHook
   ];
 
   buildInputs = [
+    kdevelop-pg-qt
+    llvmPackages.llvm llvmPackages.clang-unwrapped
+  ];
+
+  propagatedBuildInputs = [
     qtquickcontrols qtwebkit
     kconfig kdeclarative kdoctools kiconthemes ki18n kitemmodels kitemviews
     kjobwidgets kcmutils kio knewstuff knotifyconfig kparts ktexteditor
     threadweaver kxmlgui kwindowsystem grantlee plasma-framework krunner
-    kdevplatform kdevelop-pg-qt shared_mime_info libksysguard konsole.unwrapped
-    llvmPackages.llvm llvmPackages.clang-unwrapped
+    kdevplatform shared_mime_info libksysguard konsole
   ];
 
   postInstall = ''
-    wrapQtProgram "$out/bin/kdevelop"
-    
     # The kdevelop! script (shell environment) needs qdbus and kioclient5 in PATH.
     wrapProgram "$out/bin/kdevelop!" --prefix PATH ":" "${qttools}/bin:${kde-cli-tools}/bin"
-    
+
     # Fix the (now wrapped) kdevelop! to find things in right places:
     # - Make KDEV_BASEDIR point to bin directory of kdevplatform.
     kdev_fixup_sed="s|^export KDEV_BASEDIR=.*$|export KDEV_BASEDIR=${kdevplatform}/bin|"
@@ -47,7 +49,7 @@ stdenv.mkDerivation rec {
     sed -E -i "$kdev_fixup_sed" "$out/bin/.kdevelop!-wrapped"
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     maintainers = [ maintainers.ambrop72 ];
     platforms = platforms.linux;
     description = "KDE official IDE";
@@ -60,6 +62,6 @@ stdenv.mkDerivation rec {
         libraries and is under development since 1998.
       '';
     homepage = https://www.kdevelop.org;
-    license = with stdenv.lib.licenses; [ gpl2Plus lgpl2Plus ];
+    license = with licenses; [ gpl2Plus lgpl2Plus ];
   };
 }
diff --git a/pkgs/applications/editors/kile/default.nix b/pkgs/applications/editors/kile/default.nix
index 3834269f180..259c319c70f 100644
--- a/pkgs/applications/editors/kile/default.nix
+++ b/pkgs/applications/editors/kile/default.nix
@@ -3,7 +3,7 @@
 , fetchgit
 , extra-cmake-modules
 , kdoctools
-, kdeWrapper
+, wrapGAppsHook
 , qtscript
 , kconfig
 , kcrash
@@ -21,50 +21,43 @@
 , poppler
 }:
 
-let
-  unwrapped =
-    mkDerivation rec {
-      name = "kile-${version}";
-      version = "2017-02-09";
+mkDerivation rec {
+  name = "kile-${version}";
+  version = "2017-02-09";
 
-      src = fetchgit {
-        url = git://anongit.kde.org/kile.git;
-        rev = "f77f6e627487c152f111e307ad6dc71699ade746";
-        sha256 = "0wpqaix9ssa28cm7qqjj0zfrscjgk8s3kmi5b4kk8h583gsrikib";
+  src = fetchgit {
+    url = git://anongit.kde.org/kile.git;
+    rev = "f77f6e627487c152f111e307ad6dc71699ade746";
+    sha256 = "0wpqaix9ssa28cm7qqjj0zfrscjgk8s3kmi5b4kk8h583gsrikib";
 
-      };
+  };
 
-      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules wrapGAppsHook ];
 
-      buildInputs = [
-        kconfig
-        kcrash
-        kdbusaddons
-        kdelibs4support
-        kdoctools
-        kguiaddons
-        kiconthemes
-        kinit
-        khtml
-        kparts
-        ktexteditor
-        kwindowsystem
-        okular.unwrapped
-        poppler
-        qtscript
-      ];
+  propagatedBuildInputs = [
+    kconfig
+    kcrash
+    kdbusaddons
+    kdelibs4support
+    kdoctools
+    kguiaddons
+    kiconthemes
+    kinit
+    khtml
+    kparts
+    ktexteditor
+    kwindowsystem
+    okular
+    poppler
+    qtscript
+  ];
 
-      meta = {
-        description = "Kile is a user friendly TeX/LaTeX authoring tool for the KDE desktop environment";
-        homepage = https://www.kde.org/applications/office/kile/;
-        maintainers = with lib.maintainers; [ fridh ];
-        license = lib.licenses.gpl2Plus;
-      };
-    };
-in
-kdeWrapper
-{
-  inherit unwrapped;
-  targets = [ "bin/kile" ];
-  paths = [ konsole.unwrapped okular.unwrapped ];
+  propagatedUserEnvPkgs = [ konsole ];
+
+  meta = {
+    description = "Kile is a user friendly TeX/LaTeX authoring tool for the KDE desktop environment";
+    homepage = https://www.kde.org/applications/office/kile/;
+    maintainers = with lib.maintainers; [ fridh ];
+    license = lib.licenses.gpl2Plus;
+  };
 }
diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix
index f1179101692..96b1ca54d55 100644
--- a/pkgs/applications/graphics/digikam/default.nix
+++ b/pkgs/applications/graphics/digikam/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, extra-cmake-modules, makeQtWrapper
+{ mkDerivation, lib, fetchurl, cmake, extra-cmake-modules, wrapGAppsHook
 
 # For `digitaglinktree`
 , perl, sqlite
@@ -44,7 +44,7 @@
 , oxygen
 }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name    = "digikam-${version}";
   version = "5.4.0";
 
@@ -53,26 +53,11 @@ stdenv.mkDerivation rec {
     sha256 = "0dgsgji14l5zvxny36hrfsp889fsfrsbbn9bg57m18404xp903kg";
   };
 
-  nativeBuildInputs = [ cmake extra-cmake-modules makeQtWrapper ];
+  nativeBuildInputs = [ cmake extra-cmake-modules kdoctools wrapGAppsHook ];
 
   patches = [ ./0001-Disable-fno-operator-names.patch ];
 
   buildInputs = [
-    qtbase
-    qtxmlpatterns
-    qtsvg
-    qtwebkit
-
-    kconfigwidgets
-    kcoreaddons
-    kdoctools
-    kfilemetadata
-    knotifications
-    knotifyconfig
-    ktextwidgets
-    kwidgetsaddons
-    kxmlgui
-
     bison
     boost
     eigen
@@ -86,12 +71,28 @@ stdenv.mkDerivation rec {
     liblqr1
     libqtav
     libusb1
-    marble.unwrapped
     mysql
     opencv
-    threadweaver
+  ];
 
+  propagatedBuildInputs = [
+    qtbase
+    qtxmlpatterns
+    qtsvg
+    qtwebkit
+
+    kconfigwidgets
+    kcoreaddons
+    kfilemetadata
+    knotifications
+    knotifyconfig
+    ktextwidgets
+    kwidgetsaddons
+    kxmlgui
+
+    marble
     oxygen
+    threadweaver
   ];
 
   enableParallelBuilding = true;
@@ -104,22 +105,18 @@ stdenv.mkDerivation rec {
     "-DENABLE_MEDIAPLAYER=1"
   ];
 
-  fixupPhase = ''
+  preFixup = ''
+    gappsWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ gnumake hugin enblend-enfuse ]})
     substituteInPlace $out/bin/digitaglinktree \
       --replace "/usr/bin/perl" "${perl}/bin/perl" \
       --replace "/usr/bin/sqlite3" "${sqlite}/bin/sqlite3"
-
-    wrapQtProgram $out/bin/digikam \
-      --prefix PATH : "${gnumake}/bin:${hugin}/bin:${enblend-enfuse}/bin"
-
-    wrapQtProgram $out/bin/showfoto
   '';
 
-  meta = {
+  meta = with lib; {
     description = "Photo Management Program";
-    license = stdenv.lib.licenses.gpl2;
+    license = licenses.gpl2;
     homepage = http://www.digikam.org;
-    maintainers = with stdenv.lib.maintainers; [ the-kenny ];
-    platforms = stdenv.lib.platforms.linux;
+    maintainers = with maintainers; [ the-kenny ];
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/applications/kde/ark/default.nix b/pkgs/applications/kde/ark/default.nix
index d7a6ee2bdc7..f52f30c7917 100644
--- a/pkgs/applications/kde/ark/default.nix
+++ b/pkgs/applications/kde/ark/default.nix
@@ -1,7 +1,7 @@
 {
-  mkDerivation, lib, config, kdeWrapper,
+  mkDerivation, lib, config, wrapGAppsHook,
 
-  extra-cmake-modules, kdoctools, makeWrapper,
+  extra-cmake-modules, kdoctools,
 
   karchive, kconfig, kcrash, kdbusaddons, ki18n, kiconthemes, khtml, kio,
   kservice, kpty, kwidgetsaddons, libarchive, kitemmodels,
@@ -13,35 +13,26 @@
   unfreeEnableUnrar ? false, unrar,
 }:
 
-let
-  unwrapped =
-    mkDerivation {
-      name = "ark";
-      nativeBuildInputs = [
-        extra-cmake-modules kdoctools makeWrapper
-      ];
-      propagatedBuildInputs = [
-        khtml ki18n kio karchive kconfig kcrash kdbusaddons kiconthemes kservice
-        kpty kwidgetsaddons libarchive kitemmodels
-      ];
-      postInstall =
-        let
-          PATH =
-            lib.makeBinPath
-            ([ p7zip unzipNLS zip ] ++ lib.optional unfreeEnableUnrar unrar);
-        in ''
-          wrapProgram "$out/bin/ark" \
-              --prefix PATH : "${PATH}"
-        '';
-      meta = {
-        license = with lib.licenses;
-          [ gpl2 lgpl3 ] ++ lib.optional unfreeEnableUnrar unfree;
-        maintainers = [ lib.maintainers.ttuegel ];
-      };
-    };
-in
-kdeWrapper
-{
-  inherit unwrapped;
-  targets = [ "bin/ark" ];
+mkDerivation {
+  name = "ark";
+  nativeBuildInputs = [
+    extra-cmake-modules kdoctools wrapGAppsHook
+  ];
+  propagatedBuildInputs = [
+    khtml ki18n kio karchive kconfig kcrash kdbusaddons kiconthemes kservice
+    kpty kwidgetsaddons libarchive kitemmodels
+  ];
+  preFixup =
+    let
+      PATH =
+        lib.makeBinPath
+        ([ p7zip unzipNLS zip ] ++ lib.optional unfreeEnableUnrar unrar);
+    in ''
+      gappsWrapperArgs+=(--prefix PATH : "${PATH}")
+    '';
+  meta = {
+    license = with lib.licenses;
+      [ gpl2 lgpl3 ] ++ lib.optional unfreeEnableUnrar unfree;
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
 }
diff --git a/pkgs/applications/kde/dolphin-plugins.nix b/pkgs/applications/kde/dolphin-plugins.nix
index 670b040f79f..eb823641ae4 100644
--- a/pkgs/applications/kde/dolphin-plugins.nix
+++ b/pkgs/applications/kde/dolphin-plugins.nix
@@ -12,6 +12,6 @@ mkDerivation {
   };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [
-    dolphin.unwrapped kdelibs4support ki18n kio kxmlgui
+    dolphin kdelibs4support ki18n kio kxmlgui
   ];
 }
diff --git a/pkgs/applications/kde/dolphin.nix b/pkgs/applications/kde/dolphin.nix
index 746afa2732d..ff5be6fdd88 100644
--- a/pkgs/applications/kde/dolphin.nix
+++ b/pkgs/applications/kde/dolphin.nix
@@ -1,32 +1,23 @@
 {
-  mkDerivation, lib, kdeWrapper,
-  extra-cmake-modules, kdoctools, makeQtWrapper,
+  mkDerivation, lib,
+  extra-cmake-modules, kdoctools,
   baloo, baloo-widgets, dolphin-plugins, kactivities, kbookmarks, kcmutils,
   kcompletion, kconfig, kcoreaddons, kdelibs4support, kdbusaddons,
   kfilemetadata, ki18n, kiconthemes, kinit, kio, knewstuff, knotifications,
   konsole, kparts, ktexteditor, kwindowsystem, phonon, solid
 }:
 
-let
-  unwrapped =
-    mkDerivation {
-      name = "dolphin";
-      meta = {
-        license = with lib.licenses; [ gpl2 fdl12 ];
-        maintainers = [ lib.maintainers.ttuegel ];
-      };
-      nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-      propagatedBuildInputs = [
-        baloo baloo-widgets kactivities kbookmarks kcmutils kcompletion kconfig
-        kcoreaddons kdelibs4support kdbusaddons kfilemetadata ki18n kiconthemes
-        kinit kio knewstuff knotifications kparts ktexteditor kwindowsystem
-        phonon solid
-      ];
-    };
-in
-kdeWrapper
-{
-  inherit unwrapped;
-  targets = [ "bin/dolphin" ];
-  paths = [ dolphin-plugins konsole.unwrapped ];
+mkDerivation {
+  name = "dolphin";
+  meta = {
+    license = with lib.licenses; [ gpl2 fdl12 ];
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  propagatedBuildInputs = [
+    baloo baloo-widgets kactivities kbookmarks kcmutils kcompletion kconfig
+    kcoreaddons kdelibs4support kdbusaddons kfilemetadata ki18n kiconthemes
+    kinit kio knewstuff knotifications kparts ktexteditor kwindowsystem
+    phonon solid
+  ];
 }
diff --git a/pkgs/applications/kde/filelight.nix b/pkgs/applications/kde/filelight.nix
index c09b5f5106a..d3925d54988 100644
--- a/pkgs/applications/kde/filelight.nix
+++ b/pkgs/applications/kde/filelight.nix
@@ -1,24 +1,17 @@
 {
-  mkDerivation, lib, kdeWrapper,
-  extra-cmake-modules, kdoctools,
+  mkDerivation, lib,
+  extra-cmake-modules, kdoctools, wrapGAppsHook,
   kio, kparts, kxmlgui, qtscript, solid
 }:
 
-let
-  unwrapped =
-    mkDerivation {
-      name = "filelight";
-      meta = {
-        license = with lib.licenses; [ gpl2 ];
-        maintainers = with lib.maintainers; [ fridh vcunat ];
-      };
-      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-      propagatedBuildInputs = [
-        kio kparts kxmlgui qtscript solid
-      ];
-    };
-in
-kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/filelight" ];
+mkDerivation {
+  name = "filelight";
+  meta = {
+    license = with lib.licenses; [ gpl2 ];
+    maintainers = with lib.maintainers; [ fridh vcunat ];
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  propagatedBuildInputs = [
+    kio kparts kxmlgui qtscript solid
+  ];
 }
diff --git a/pkgs/applications/kde/gwenview.nix b/pkgs/applications/kde/gwenview.nix
index 19b2fd751f7..d206e901f8e 100644
--- a/pkgs/applications/kde/gwenview.nix
+++ b/pkgs/applications/kde/gwenview.nix
@@ -1,27 +1,20 @@
 {
-  mkDerivation, lib, kdeWrapper,
-  extra-cmake-modules, kdoctools,
+  mkDerivation, lib,
+  extra-cmake-modules, kdoctools, wrapGAppsHook,
   baloo, exiv2, kactivities, kdelibs4support, kio, kipi-plugins, lcms2,
   libkdcraw, libkipi, phonon, qtimageformats, qtsvg, qtx11extras
 }:
 
-let
-  unwrapped =
-    mkDerivation {
-      name = "gwenview";
-      meta = {
-        license = with lib.licenses; [ gpl2 fdl12 ];
-        maintainers = [ lib.maintainers.ttuegel ];
-      };
-      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-      propagatedBuildInputs = [
-        baloo kactivities kdelibs4support kio exiv2 lcms2 libkdcraw
-        libkipi phonon qtimageformats qtsvg qtx11extras
-      ];
-    };
-in
-kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/gwenview" ];
-  paths = [ kipi-plugins ];
+mkDerivation {
+  name = "gwenview";
+  meta = {
+    license = with lib.licenses; [ gpl2 fdl12 ];
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  propagatedBuildInputs = [
+    baloo kactivities kdelibs4support kio exiv2 lcms2 libkdcraw
+    libkipi phonon qtimageformats qtsvg qtx11extras
+  ];
+  propagatedUserEnvPkgs = [ kipi-plugins ];
 }
diff --git a/pkgs/applications/kde/k3b.nix b/pkgs/applications/kde/k3b.nix
index c21ce4a3e18..6fd6fbee9f5 100644
--- a/pkgs/applications/kde/k3b.nix
+++ b/pkgs/applications/kde/k3b.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, kdeWrapper, extra-cmake-modules
+{ mkDerivation, lib, wrapGAppsHook, extra-cmake-modules
 , qtwebkit
 , libkcddb, kcmutils, kdoctools, kfilemetadata, knewstuff, knotifyconfig, solid, kxmlgui
 , flac, lame, libmad, libmpcdec, libvorbis
@@ -7,35 +7,34 @@
 , ffmpeg, libmusicbrainz2, normalize, sox, transcode
 }:
 
-let
-  unwrapped =
-    mkDerivation {
-      name = "k3b";
-      meta = with lib; {
-        license = with licenses; [ gpl2Plus ];
-        maintainers = with maintainers; [ sander phreedom ];
-        platforms = platforms.linux;
-      };
-      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-      propagatedBuildInputs = [
-        # qt
-        qtwebkit
-        # kde
-        libkcddb kcmutils kfilemetadata knewstuff knotifyconfig solid kxmlgui
-        # formats
-        flac lame libmad libmpcdec libvorbis
-        # sound utilities
-        libsamplerate libsndfile taglib
-        # cd/dvd
-        cdparanoia libdvdcss libdvdread
-        # others
-        ffmpeg libmusicbrainz2
-      ];
-      enableParallelBuilding = true;
-    };
-
-in kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/k3b" ];
-  paths = [ cdrdao cdrtools dvdplusrwtools libburn normalize sox transcode vcdimager ];
+mkDerivation {
+  name = "k3b";
+  meta = with lib; {
+    license = with licenses; [ gpl2Plus ];
+    maintainers = with maintainers; [ sander phreedom ];
+    platforms = platforms.linux;
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  propagatedBuildInputs = [
+    # qt
+    qtwebkit
+    # kde
+    libkcddb kcmutils kfilemetadata knewstuff knotifyconfig solid kxmlgui
+    # formats
+    flac lame libmad libmpcdec libvorbis
+    # sound utilities
+    libsamplerate libsndfile taglib
+    # cd/dvd
+    cdparanoia libdvdcss libdvdread
+    # others
+    ffmpeg libmusicbrainz2
+  ];
+  preFixup =
+    let k3bPath = lib.makeBinPath [
+          cdrdao cdrtools dvdplusrwtools libburn normalize sox transcode
+          vcdimager
+        ];
+    in ''
+      gappsWrapperArgs+=(--prefix PATH : "${k3bPath}")
+    '';
 }
diff --git a/pkgs/applications/kde/kate.nix b/pkgs/applications/kde/kate.nix
index 7a138afb8ed..357abf96505 100644
--- a/pkgs/applications/kde/kate.nix
+++ b/pkgs/applications/kde/kate.nix
@@ -1,32 +1,24 @@
 {
-  mkDerivation, lib, kdeWrapper,
-  extra-cmake-modules, kdoctools,
+  mkDerivation, lib,
+  extra-cmake-modules, kdoctools, wrapGAppsHook,
   kactivities, kconfig, kcrash, kdbusaddons, kguiaddons, kiconthemes, ki18n,
   kinit, kio, kitemmodels, kjobwidgets, knewstuff, knotifications, konsole,
   kparts, ktexteditor, kwindowsystem, kwallet, kxmlgui, libgit2,
   plasma-framework, qtscript, threadweaver
 }:
 
-let
-  unwrapped =
-    mkDerivation {
-      name = "kate";
-      meta = {
-        license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ];
-        maintainers = [ lib.maintainers.ttuegel ];
-      };
-      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-      propagatedBuildInputs = [
-        kactivities ki18n kio ktexteditor kwindowsystem plasma-framework
-        qtscript kconfig kcrash kguiaddons kiconthemes kinit kjobwidgets kparts
-        kxmlgui kdbusaddons kwallet kitemmodels knotifications threadweaver
-        knewstuff libgit2
-      ];
-    };
-in
-kdeWrapper
-{
-  inherit unwrapped;
-  targets = [ "bin/kate" "bin/kwrite" ];
-  paths = [ konsole.unwrapped ];
+mkDerivation {
+  name = "kate";
+  meta = {
+    license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ];
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  propagatedBuildInputs = [
+    kactivities ki18n kio ktexteditor kwindowsystem plasma-framework
+    qtscript kconfig kcrash kguiaddons kiconthemes kinit kjobwidgets kparts
+    kxmlgui kdbusaddons kwallet kitemmodels knotifications threadweaver
+    knewstuff libgit2
+  ];
+  propagatedUserEnvPkgs = [ konsole ];
 }
diff --git a/pkgs/applications/kde/kcachegrind.nix b/pkgs/applications/kde/kcachegrind.nix
index fd5c4502c9d..c45edc87f89 100644
--- a/pkgs/applications/kde/kcachegrind.nix
+++ b/pkgs/applications/kde/kcachegrind.nix
@@ -1,28 +1,20 @@
 {
-  mkDerivation, lib, kdeWrapper,
-  extra-cmake-modules, kdoctools,
+  mkDerivation, lib,
+  extra-cmake-modules, kdoctools, wrapGAppsHook,
   kio, ki18n,
   perl, python, php
 }:
 
-kdeWrapper {
-  unwrapped = mkDerivation {
-    name = "kcachegrind";
-    meta = {
-      license = with lib.licenses; [ gpl2 ];
-      maintainers = with lib.maintainers; [ orivej ];
-    };
-    nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-    buildInputs = [ perl python php kio ki18n ];
-    enableParallelBuilding = true;
+mkDerivation {
+  name = "kcachegrind";
+  meta = {
+    license = with lib.licenses; [ gpl2 ];
+    maintainers = with lib.maintainers; [ orivej ];
   };
-
-  targets = [
-    "bin/kcachegrind"
-    "bin/dprof2calltree"    # perl
-    "bin/hotshot2calltree"  # python
-    "bin/memprof2calltree"  # perl
-    "bin/op2calltree"       # perl
-    "bin/pprof2calltree"    # php
-  ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  propagatedBuildInputs = [ kio ];
+  buildInputs = [ perl python php ki18n ];
+  preFixup = ''
+    gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ perl php python]}")
+  '';
 }
diff --git a/pkgs/applications/kde/kcalc.nix b/pkgs/applications/kde/kcalc.nix
index 6ce0722d3e4..2a3d7e17a55 100644
--- a/pkgs/applications/kde/kcalc.nix
+++ b/pkgs/applications/kde/kcalc.nix
@@ -1,24 +1,18 @@
 {
-  mkDerivation, lib, kdeWrapper,
-  extra-cmake-modules, kdoctools,
+  mkDerivation, lib,
+  extra-cmake-modules, kdoctools, wrapGAppsHook,
   kconfig, kconfigwidgets, kguiaddons, kinit, knotifications, gmp
 }:
 
-let
-  unwrapped =
-    mkDerivation {
-      name = "kcalc";
-      meta = {
-        license = with lib.licenses; [ gpl2 ];
-        maintainers = [ lib.maintainers.fridh ];
-      };
-      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-      propagatedBuildInputs = [
-        gmp kconfig kconfigwidgets kguiaddons kinit knotifications
-      ];
-    };
-in
-kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/kcalc" ];
+mkDerivation {
+  name = "kcalc";
+  meta = {
+    license = with lib.licenses; [ gpl2 ];
+    maintainers = [ lib.maintainers.fridh ];
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  buildInputs = [ gmp ];
+  propagatedBuildInputs = [
+    kconfig kconfigwidgets kguiaddons kinit knotifications
+  ];
 }
diff --git a/pkgs/applications/kde/kcolorchooser.nix b/pkgs/applications/kde/kcolorchooser.nix
index f910b99f603..5f33611f29a 100644
--- a/pkgs/applications/kde/kcolorchooser.nix
+++ b/pkgs/applications/kde/kcolorchooser.nix
@@ -1,21 +1,16 @@
 {
-  mkDerivation, lib, kdeWrapper,
-  extra-cmake-modules, ki18n, kwidgetsaddons, kxmlgui
+  mkDerivation, lib,
+  extra-cmake-modules, wrapGAppsHook,
+  ki18n, kwidgetsaddons, kxmlgui
 }:
 
-let
-  unwrapped =
-    mkDerivation {
-      name = "kcolorchooser";
-      meta = {
-        license = with lib.licenses; [ mit ];
-        maintainers = [ lib.maintainers.ttuegel ];
-      };
-      nativeBuildInputs = [ extra-cmake-modules ];
-      propagatedBuildInputs = [ ki18n kwidgetsaddons kxmlgui ];
-    };
-in
-kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/kcolorchooser" ];
+mkDerivation {
+  name = "kcolorchooser";
+  meta = {
+    license = with lib.licenses; [ mit ];
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+  nativeBuildInputs = [ extra-cmake-modules wrapGAppsHook ];
+  buildInputs = [ ki18n ];
+  propagatedBuildInputs = [ kwidgetsaddons kxmlgui ];
 }
diff --git a/pkgs/applications/kde/kcontacts.nix b/pkgs/applications/kde/kcontacts.nix
index d49ba125474..a56ca684545 100644
--- a/pkgs/applications/kde/kcontacts.nix
+++ b/pkgs/applications/kde/kcontacts.nix
@@ -10,6 +10,7 @@ mkDerivation {
     license = [ lib.licenses.lgpl21 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
-  nativeBuildInputs = [ extra-cmake-modules ki18n ];
-  buildInputs = [ kcoreaddons kconfig kcodecs ];
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ ki18n ];
+  propagatedBuildInputs = [ kcoreaddons kconfig kcodecs ];
 }
diff --git a/pkgs/applications/kde/kdenlive.nix b/pkgs/applications/kde/kdenlive.nix
index 4e59e12e8fd..c9929026aa6 100644
--- a/pkgs/applications/kde/kdenlive.nix
+++ b/pkgs/applications/kde/kdenlive.nix
@@ -1,8 +1,8 @@
 { mkDerivation
-, kdeWrapper
 , lib
 , extra-cmake-modules
 , kdoctools
+, wrapGAppsHook
 , qtscript
 , kactivities
 , kconfig
@@ -31,8 +31,7 @@
 , qtquickcontrols
 }:
 
-let
-unwrapped = mkDerivation {
+mkDerivation {
   name = "kdenlive";
   patches = [
     ./kdenlive-cmake-concurrent-module.patch
@@ -40,6 +39,7 @@ unwrapped = mkDerivation {
   nativeBuildInputs = [
     extra-cmake-modules
     kdoctools
+    wrapGAppsHook
   ];
   buildInputs = [
     qtscript
@@ -61,25 +61,12 @@ unwrapped = mkDerivation {
     ffmpeg
   ];
   propagatedBuildInputs = [
-    kactivities
-    ki18n
-    kio
-    kio-extras
-    kwindowsystem
-    kfilemetadata
-    plasma-framework
-    phonon-backend-gstreamer
-    qtquickcontrols
+    kactivities kconfig kcrash kguiaddons kiconthemes kinit kio kio-extras
+    kdbusaddons kfilemetadata knotifications knewstuff karchive knotifyconfig
+    kplotting ktextwidgets kwindowsystem plasma-framework
+    phonon-backend-gstreamer qtquickcontrols shared_mime_info
   ];
-  enableParallelBuilding = true;
   meta = {
     license = with lib.licenses; [ gpl2Plus ];
   };
-};
-in
-kdeWrapper
-{
-  inherit unwrapped;
-  targets = [ "bin/kdenlive" ];
-  paths = [ kinit ];
 }
diff --git a/pkgs/applications/kde/kdf.nix b/pkgs/applications/kde/kdf.nix
index aaeac0161f5..5a969aa15cf 100644
--- a/pkgs/applications/kde/kdf.nix
+++ b/pkgs/applications/kde/kdf.nix
@@ -1,24 +1,15 @@
 {
-  mkDerivation, lib, kdeWrapper,
-  extra-cmake-modules, kdoctools,
+  mkDerivation, lib,
+  extra-cmake-modules, kdoctools, wrapGAppsHook,
   kcmutils
 }:
 
-let
-  unwrapped =
-    mkDerivation {
-      name = "kdf";
-      meta = {
-        license = with lib.licenses; [ gpl2 ];
-        maintainers = [ lib.maintainers.peterhoeg ];
-      };
-      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-      propagatedBuildInputs = [
-        kcmutils
-      ];
-    };
-in
-kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/kdf" ];
+mkDerivation {
+  name = "kdf";
+  meta = {
+    license = with lib.licenses; [ gpl2 ];
+    maintainers = [ lib.maintainers.peterhoeg ];
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  propagatedBuildInputs = [ kcmutils ];
 }
diff --git a/pkgs/applications/kde/kgpg.nix b/pkgs/applications/kde/kgpg.nix
index 5b462c2712f..1a30b0685f8 100644
--- a/pkgs/applications/kde/kgpg.nix
+++ b/pkgs/applications/kde/kgpg.nix
@@ -1,6 +1,6 @@
 {
-  mkDerivation, lib, makeQtWrapper,
-  extra-cmake-modules, kdoctools, ki18n,
+  mkDerivation, lib,
+  extra-cmake-modules, kdoctools, ki18n, wrapGAppsHook,
   akonadi-contacts, gnupg1, gpgme, karchive, kcodecs, kcontacts, kcoreaddons, kcrash,
   kdbusaddons, kiconthemes, kjobwidgets, kio, knotifications, kservice,
   ktextwidgets, kxmlgui, kwidgetsaddons, kwindowsystem
@@ -8,14 +8,14 @@
 
 mkDerivation {
   name = "kgpg";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ki18n ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ki18n wrapGAppsHook ];
   buildInputs = [
     akonadi-contacts gnupg1 gpgme karchive kcodecs kcontacts kcoreaddons kcrash kdbusaddons
     kiconthemes kjobwidgets kio knotifications kservice ktextwidgets kxmlgui
-    kwidgetsaddons kwindowsystem makeQtWrapper
+    kwidgetsaddons kwindowsystem
   ];
-  postInstall = ''
-    wrapQtProgram $out/bin/kgpg --suffix PATH : ${lib.makeBinPath [ gnupg1 ]}
+  preFixup = ''
+    gappsWrapperArgs+=(--suffix PATH : ${lib.makeBinPath [ gnupg1 ]})
   '';
   meta = {
     license = [ lib.licenses.gpl2 ];
diff --git a/pkgs/applications/kde/khelpcenter.nix b/pkgs/applications/kde/khelpcenter.nix
index e88bef4c652..9862d75fdf4 100644
--- a/pkgs/applications/kde/khelpcenter.nix
+++ b/pkgs/applications/kde/khelpcenter.nix
@@ -1,22 +1,15 @@
 {
-  mkDerivation, kdeWrapper,
-  extra-cmake-modules, kdoctools,
+  mkDerivation,
+  extra-cmake-modules, kdoctools, wrapGAppsHook,
   grantlee, kconfig, kcoreaddons, kdbusaddons, ki18n, kinit, kcmutils,
   kdelibs4support, khtml, kservice, xapian
 }:
 
-let
-  unwrapped =
-    mkDerivation {
-      name = "khelpcenter";
-      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-      buildInputs = [
-        grantlee kdelibs4support khtml ki18n kconfig kcoreaddons kdbusaddons
-        kinit kcmutils kservice xapian
-      ];
-    };
-in
-kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/khelpcenter" ];
+mkDerivation {
+  name = "khelpcenter";
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  buildInputs = [
+    grantlee kdelibs4support khtml ki18n kconfig kcoreaddons kdbusaddons
+    kinit kcmutils kservice xapian
+  ];
 }
diff --git a/pkgs/applications/kde/kig.nix b/pkgs/applications/kde/kig.nix
index 03229f9a150..6fdad9766b2 100644
--- a/pkgs/applications/kde/kig.nix
+++ b/pkgs/applications/kde/kig.nix
@@ -1,26 +1,18 @@
 {
-  mkDerivation, lib, kdeWrapper,
-  extra-cmake-modules, kdoctools,
+  mkDerivation, lib,
+  extra-cmake-modules, kdoctools, wrapGAppsHook,
   kparts, qtsvg, qtxmlpatterns, ktexteditor, boost
 }:
 
-let
-  unwrapped =
-    mkDerivation {
-      name = "kig";
-      meta = {
-        license = with lib.licenses; [ gpl2 ];
-        maintainers = with lib.maintainers; [ raskin ];
-      };
-      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-      buildInputs = [
-        kparts qtsvg qtxmlpatterns ktexteditor boost
-      ];
-    };
-in
-kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/kig" ];
+mkDerivation {
+  name = "kig";
+  meta = {
+    license = with lib.licenses; [ gpl2 ];
+    maintainers = with lib.maintainers; [ raskin ];
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  buildInputs = [
+    kparts qtsvg qtxmlpatterns ktexteditor boost
+  ];
 }
 
-
diff --git a/pkgs/applications/kde/kmix.nix b/pkgs/applications/kde/kmix.nix
index 483983571dd..cc5e67a1ddc 100644
--- a/pkgs/applications/kde/kmix.nix
+++ b/pkgs/applications/kde/kmix.nix
@@ -1,30 +1,23 @@
 {
-  mkDerivation, lib, kdeWrapper,
-  extra-cmake-modules, kdoctools,
+  mkDerivation, lib,
+  extra-cmake-modules, kdoctools, wrapGAppsHook,
   kglobalaccel, kxmlgui, kcoreaddons, kdelibs4support,
   plasma-framework, libpulseaudio, alsaLib, libcanberra_kde
 }:
 
-let
-  unwrapped =
-    mkDerivation {
-      name = "kmix";
-      meta = {
-        license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
-        maintainers = [ lib.maintainers.rongcuid ];
-      };
-      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-      buildInputs = [ libpulseaudio alsaLib libcanberra_kde ];
-      propagatedBuildInputs = [
-        kglobalaccel kxmlgui kcoreaddons kdelibs4support
-        plasma-framework
-      ];
-      cmakeFlags = [
-        "-DKMIX_KF5_BUILD=1"
-      ];
-    };
-in
-kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/kmix" ];
+mkDerivation {
+  name = "kmix";
+  meta = {
+    license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+    maintainers = [ lib.maintainers.rongcuid ];
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  buildInputs = [ libpulseaudio alsaLib libcanberra_kde ];
+  propagatedBuildInputs = [
+    kglobalaccel kxmlgui kcoreaddons kdelibs4support
+    plasma-framework
+  ];
+  cmakeFlags = [
+    "-DKMIX_KF5_BUILD=1"
+  ];
 }
diff --git a/pkgs/applications/kde/kolourpaint.nix b/pkgs/applications/kde/kolourpaint.nix
index bdfeb233af3..a9e6904156a 100644
--- a/pkgs/applications/kde/kolourpaint.nix
+++ b/pkgs/applications/kde/kolourpaint.nix
@@ -1,28 +1,18 @@
 { lib
 , mkDerivation
-, kdeWrapper
 , extra-cmake-modules
 , kdoctools
+, wrapGAppsHook
 , kdelibs4support
 , libkexiv2
 }:
 
-let
-  unwrapped =
-    mkDerivation {
-      name = "kolourpaint";
-      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-      propagatedBuildInputs = [
-        kdelibs4support
-        libkexiv2
-      ];
-
-      meta = {
-        maintainers = [ lib.maintainers.fridh ];
-        license = with lib.licenses; [ gpl2 ];
-      };
-    };
-in kdeWrapper {
-  inherit unwrapped;
-  targets = ["bin/kolourpaint"];
+mkDerivation {
+  name = "kolourpaint";
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  propagatedBuildInputs = [ kdelibs4support libkexiv2 ];
+  meta = {
+    maintainers = [ lib.maintainers.fridh ];
+    license = with lib.licenses; [ gpl2 ];
+  };
 }
diff --git a/pkgs/applications/kde/kompare.nix b/pkgs/applications/kde/kompare.nix
index c14f15707aa..1a0c2211c80 100644
--- a/pkgs/applications/kde/kompare.nix
+++ b/pkgs/applications/kde/kompare.nix
@@ -1,21 +1,14 @@
 {
-  mkDerivation, lib, kdeWrapper,
-  extra-cmake-modules, kdoctools,
+  mkDerivation, lib,
+  extra-cmake-modules, kdoctools, wrapGAppsHook,
   kparts, ktexteditor, kwidgetsaddons, libkomparediff2
 }:
 
-let
-  unwrapped =
-    mkDerivation {
-      name = "kompare";
-      meta = { license = with lib.licenses; [ gpl2 ]; };
-      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-      propagatedBuildInputs = [
-        kparts ktexteditor kwidgetsaddons libkomparediff2
-      ];
-    };
-in
-kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/kompare" ];
+mkDerivation {
+  name = "kompare";
+  meta = { license = with lib.licenses; [ gpl2 ]; };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  propagatedBuildInputs = [
+    kparts ktexteditor kwidgetsaddons libkomparediff2
+  ];
 }
diff --git a/pkgs/applications/kde/konsole.nix b/pkgs/applications/kde/konsole.nix
index 4eb45c74480..4a4a261c433 100644
--- a/pkgs/applications/kde/konsole.nix
+++ b/pkgs/applications/kde/konsole.nix
@@ -1,30 +1,23 @@
 {
-  mkDerivation, lib, kdeWrapper,
-  extra-cmake-modules, kdoctools,
+  mkDerivation, lib,
+  extra-cmake-modules, kdoctools, wrapGAppsHook,
   kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kguiaddons,
   ki18n, kiconthemes, kinit, kdelibs4support, kio, knotifications,
   knotifyconfig, kparts, kpty, kservice, ktextwidgets, kwidgetsaddons,
   kwindowsystem, kxmlgui, qtscript
 }:
 
-let
-  unwrapped =
-    mkDerivation {
-      name = "konsole";
-      meta = {
-        license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
-        maintainers = [ lib.maintainers.ttuegel ];
-      };
-      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-      propagatedBuildInputs = [
-        kdelibs4support ki18n kwindowsystem qtscript kbookmarks kcompletion
-        kconfig kconfigwidgets kcoreaddons kguiaddons kiconthemes kinit kio
-        knotifications knotifyconfig kparts kpty kservice ktextwidgets
-        kwidgetsaddons kxmlgui
-      ];
-    };
-in
-kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/konsole" ];
+mkDerivation {
+  name = "konsole";
+  meta = {
+    license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  propagatedBuildInputs = [
+    kdelibs4support ki18n kwindowsystem qtscript kbookmarks kcompletion
+    kconfig kconfigwidgets kcoreaddons kguiaddons kiconthemes kinit kio
+    knotifications knotifyconfig kparts kpty kservice ktextwidgets
+    kwidgetsaddons kxmlgui
+  ];
 }
diff --git a/pkgs/applications/kde/krfb.nix b/pkgs/applications/kde/krfb.nix
index 3ad7b436dbc..a5a34b68460 100644
--- a/pkgs/applications/kde/krfb.nix
+++ b/pkgs/applications/kde/krfb.nix
@@ -1,22 +1,15 @@
 {
-  mkDerivation, lib, kdeWrapper,
-  extra-cmake-modules, kdoctools,
+  mkDerivation, lib,
+  extra-cmake-modules, kdoctools, wrapGAppsHook,
   kdelibs4support, kdnssd, libvncserver, libXtst
 }:
 
-let
-  unwrapped =
-    mkDerivation {
-      name = "krfb";
-      meta = {
-        license = with lib.licenses; [ gpl2 fdl12 ];
-        maintainers = with lib.maintainers; [ jerith666 ];
-      };
-      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-      propagatedBuildInputs = [ kdelibs4support kdnssd libvncserver libXtst ];
-    };
-in
-kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/krfb" ];
+mkDerivation {
+  name = "krfb";
+  meta = {
+    license = with lib.licenses; [ gpl2 fdl12 ];
+    maintainers = with lib.maintainers; [ jerith666 ];
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  propagatedBuildInputs = [ kdelibs4support kdnssd libvncserver libXtst ];
 }
diff --git a/pkgs/applications/kde/kwalletmanager.nix b/pkgs/applications/kde/kwalletmanager.nix
index efdcac650bb..9194b45c401 100644
--- a/pkgs/applications/kde/kwalletmanager.nix
+++ b/pkgs/applications/kde/kwalletmanager.nix
@@ -1,8 +1,8 @@
 { lib
 , mkDerivation
-, kdeWrapper
 , extra-cmake-modules
 , kdoctools
+, wrapGAppsHook
 , kauth
 , kcmutils
 , kconfigwidgets
@@ -12,25 +12,15 @@
 , kxmlgui
 }:
 
-let
-  unwrapped = mkDerivation {
-    name = "kwalletmanager";
-    meta = {
-      license = with lib.licenses; [ gpl2 ];
-      maintainers = with lib.maintainers; [ fridh ];
-    };
-    nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-    propagatedBuildInputs = [
-      kauth
-      kcmutils
-      kconfigwidgets
-      kcoreaddons
-      kdbusaddons
-      kdelibs4support
-      kxmlgui
-    ];
+mkDerivation {
+  name = "kwalletmanager";
+  meta = {
+    license = with lib.licenses; [ gpl2 ];
+    maintainers = with lib.maintainers; [ fridh ];
   };
-in kdeWrapper {
-  inherit unwrapped;
-  targets = ["bin/kwalletmanager5"];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  propagatedBuildInputs = [
+    kauth kcmutils kconfigwidgets kcoreaddons kdbusaddons kdelibs4support
+    kxmlgui
+  ];
 }
diff --git a/pkgs/applications/kde/marble.nix b/pkgs/applications/kde/marble.nix
index eb059a1b398..169b801b30d 100644
--- a/pkgs/applications/kde/marble.nix
+++ b/pkgs/applications/kde/marble.nix
@@ -1,28 +1,16 @@
-{ mkDerivation, lib, kdeWrapper
-, extra-cmake-modules, kdoctools
+{ mkDerivation, lib
+, extra-cmake-modules, kdoctools, wrapGAppsHook
 , qtscript, qtsvg, qtquickcontrols, qtwebkit
 , krunner, shared_mime_info, kparts, knewstuff
 , gpsd, perl
 }:
 
-let
-  unwrapped =
-    mkDerivation {
-      name = "marble";
-      meta.license = with lib.licenses; [ lgpl21 gpl3 ];
-
-      nativeBuildInputs = [ extra-cmake-modules kdoctools perl ];
-      propagatedBuildInputs = [
-        qtscript qtsvg qtquickcontrols qtwebkit shared_mime_info
-        krunner kparts knewstuff
-        gpsd
-      ];
-
-      enableParallelBuilding = true;
-    };
-in
-kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/marble-qt" "bin/marble" ];
-  paths = [ unwrapped ];
+mkDerivation {
+  name = "marble";
+  meta.license = with lib.licenses; [ lgpl21 gpl3 ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools perl wrapGAppsHook ];
+  propagatedBuildInputs = [
+    qtscript qtsvg qtquickcontrols qtwebkit shared_mime_info krunner kparts
+    knewstuff gpsd
+  ];
 }
diff --git a/pkgs/applications/kde/okteta.nix b/pkgs/applications/kde/okteta.nix
index 7fb4ffb7693..350630664d9 100644
--- a/pkgs/applications/kde/okteta.nix
+++ b/pkgs/applications/kde/okteta.nix
@@ -1,26 +1,19 @@
 {
-  mkDerivation, lib, kdeWrapper,
-  extra-cmake-modules, kdoctools,
+  mkDerivation, lib,
+  extra-cmake-modules, kdoctools, wrapGAppsHook,
   kconfig, kinit,
   kcmutils, kconfigwidgets, knewstuff, kparts, qca-qt5
 }:
 
-let
-  unwrapped =
-    mkDerivation {
-      name = "okteta";
-      meta = {
-        license = with lib.licenses; [ gpl2 ];
-        maintainers = with lib.maintainers; [ peterhoeg ];
-      };
-      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-      propagatedBuildInputs = [
-        kconfig kinit
-        kcmutils kconfigwidgets knewstuff kparts qca-qt5
-      ];
-    };
-
-in kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/okteta" ];
+mkDerivation {
+  name = "okteta";
+  meta = {
+    license = with lib.licenses; [ gpl2 ];
+    maintainers = with lib.maintainers; [ peterhoeg ];
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  propagatedBuildInputs = [
+    kconfig kinit
+    kcmutils kconfigwidgets knewstuff kparts qca-qt5
+  ];
 }
diff --git a/pkgs/applications/kde/okular.nix b/pkgs/applications/kde/okular.nix
index 3bed7454f42..12983519b26 100644
--- a/pkgs/applications/kde/okular.nix
+++ b/pkgs/applications/kde/okular.nix
@@ -1,31 +1,25 @@
 {
-  mkDerivation, lib, kdeWrapper,
-  extra-cmake-modules, kdoctools,
+  mkDerivation, lib,
+  extra-cmake-modules, kdoctools, wrapGAppsHook,
   djvulibre, ebook_tools, kactivities, karchive, kbookmarks, kcompletion,
   kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdegraphics-mobipocket,
   kiconthemes, kjs, khtml, kio, kparts, kpty, kwallet, kwindowsystem, libkexiv2,
   libspectre, poppler, qca-qt5, qtdeclarative, qtsvg, threadweaver
 }:
 
-let
-  unwrapped = mkDerivation {
-    name = "okular";
-    nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-    propagatedBuildInputs = [
-      djvulibre ebook_tools kactivities karchive kbookmarks kcompletion kconfig
-      kconfigwidgets kcoreaddons kdbusaddons kdegraphics-mobipocket kiconthemes
-      kjs khtml kio kparts kpty kwallet kwindowsystem libkexiv2 libspectre poppler
-      qca-qt5 qtdeclarative qtsvg threadweaver
-    ];
-    meta = {
-      platforms = lib.platforms.linux;
-      homepage = "http://www.kde.org";
-      license = with lib.licenses; [ gpl2 lgpl21 fdl12 bsd3 ];
-      maintainers = [ lib.maintainers.ttuegel ];
-    };
+mkDerivation {
+  name = "okular";
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  propagatedBuildInputs = [
+    djvulibre ebook_tools kactivities karchive kbookmarks kcompletion kconfig
+    kconfigwidgets kcoreaddons kdbusaddons kdegraphics-mobipocket kiconthemes
+    kjs khtml kio kparts kpty kwallet kwindowsystem libkexiv2 libspectre poppler
+    qca-qt5 qtdeclarative qtsvg threadweaver
+  ];
+  meta = {
+    platforms = lib.platforms.linux;
+    homepage = "http://www.kde.org";
+    license = with lib.licenses; [ gpl2 lgpl21 fdl12 bsd3 ];
+    maintainers = [ lib.maintainers.ttuegel ];
   };
-in
-kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/okular" ];
 }
diff --git a/pkgs/applications/kde/print-manager.nix b/pkgs/applications/kde/print-manager.nix
index a2589f46bba..18a5da2ccca 100644
--- a/pkgs/applications/kde/print-manager.nix
+++ b/pkgs/applications/kde/print-manager.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation, lib, extra-cmake-modules,
+  mkDerivation, lib, extra-cmake-modules, wrapGAppsHook,
   cups, kconfig, kconfigwidgets, kdbusaddons, kiconthemes, ki18n, kcmutils, kio,
   knotifications, kwidgetsaddons, kwindowsystem, kitemviews, plasma-framework,
   qtdeclarative
@@ -11,7 +11,7 @@ mkDerivation {
     license = [ lib.licenses.gpl2 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
-  nativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ extra-cmake-modules wrapGAppsHook ];
   propagatedBuildInputs = [
     cups kconfig kconfigwidgets kdbusaddons kiconthemes kcmutils knotifications
     kwidgetsaddons kitemviews ki18n kio kwindowsystem plasma-framework
diff --git a/pkgs/applications/kde/spectacle.nix b/pkgs/applications/kde/spectacle.nix
index a0c5ef58c9b..10d98d99b0b 100644
--- a/pkgs/applications/kde/spectacle.nix
+++ b/pkgs/applications/kde/spectacle.nix
@@ -1,25 +1,18 @@
 {
-  mkDerivation, lib, kdeWrapper,
-  extra-cmake-modules, kdoctools,
+  mkDerivation, lib,
+  extra-cmake-modules, kdoctools, wrapGAppsHook,
   kconfig, kcoreaddons, kdbusaddons, kdeclarative, ki18n, kio, kipi-plugins,
   knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi,
   xcb-util-cursor
 }:
 
-let
-  unwrapped =
-    mkDerivation {
-      name = "spectacle";
-      meta = with lib; { maintainers = with maintainers; [ ttuegel ]; };
-      nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-      propagatedBuildInputs = [
-        kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications
-        kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi xcb-util-cursor
-      ];
-    };
-in
-kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/spectacle" ];
-  paths = [ kipi-plugins ];
+mkDerivation {
+  name = "spectacle";
+  meta = with lib; { maintainers = with maintainers; [ ttuegel ]; };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  propagatedBuildInputs = [
+    kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications
+    kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi xcb-util-cursor
+  ];
+  propagatedUserEnvPkgs = [ kipi-plugins ];
 }
diff --git a/pkgs/applications/misc/krename/default.nix b/pkgs/applications/misc/krename/default.nix
index 05d1ce1a950..22cd14c1952 100644
--- a/pkgs/applications/misc/krename/default.nix
+++ b/pkgs/applications/misc/krename/default.nix
@@ -1,35 +1,30 @@
 {
-  mkDerivation, kdeWrapper, fetchFromGitHub, lib,
-  extra-cmake-modules, kdoctools, kconfig, kinit, kjsembed,
-  taglib, exiv2, podofo
+  mkDerivation, fetchFromGitHub, lib,
+  extra-cmake-modules, kdoctools, wrapGAppsHook,
+  kconfig, kinit, kjsembed, taglib, exiv2, podofo
 }:
 
 let
   pname = "krename";
   version = "20170610";
-  unwrapped = mkDerivation rec {
-    name = "${pname}-${version}";
+in mkDerivation rec {
+  name = "${pname}-${version}";
 
-    src = fetchFromGitHub {
-      owner  = "KDE";
-      repo   = "krename";
-      rev    = "18000edfec52de0b417d575e14eb078b4bd7b2f3";
-      sha256 = "0hsrlfrbi42jqqnkcz682c6yrfi3xpl299672knj22074wr6sv0j";
-    };
-
-    meta = with lib; {
-      homepage = http://www.krename.net;
-      description = "A powerful batch renamer for KDE";
-      inherit (kconfig.meta) platforms;
-      maintainers = with maintainers; [ peterhoeg ];
-    };
-
-    buildInputs = [ taglib exiv2 podofo ];
-    nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-    propagatedBuildInputs = [ kconfig kinit kjsembed ];
+  src = fetchFromGitHub {
+    owner  = "KDE";
+    repo   = "krename";
+    rev    = "18000edfec52de0b417d575e14eb078b4bd7b2f3";
+    sha256 = "0hsrlfrbi42jqqnkcz682c6yrfi3xpl299672knj22074wr6sv0j";
   };
 
-in kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/krename" ];
+  meta = with lib; {
+    homepage = http://www.krename.net;
+    description = "A powerful batch renamer for KDE";
+    inherit (kconfig.meta) platforms;
+    maintainers = with maintainers; [ peterhoeg ];
+  };
+
+  buildInputs = [ taglib exiv2 podofo ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  propagatedBuildInputs = [ kconfig kinit kjsembed ];
 }
diff --git a/pkgs/applications/misc/krusader/default.nix b/pkgs/applications/misc/krusader/default.nix
index df557f76e73..7f5dad62d26 100644
--- a/pkgs/applications/misc/krusader/default.nix
+++ b/pkgs/applications/misc/krusader/default.nix
@@ -1,32 +1,27 @@
 {
-  mkDerivation, kdeWrapper, fetchurl, lib,
-  extra-cmake-modules, kdoctools,
+  mkDerivation, fetchurl, lib,
+  extra-cmake-modules, kdoctools, wrapGAppsHook,
   kconfig, kinit, kparts
 }:
 
 let
   pname = "krusader";
   version = "2.6.0";
-  unwrapped = mkDerivation rec {
-    name = "krusader-${version}";
+in mkDerivation rec {
+  name = "krusader-${version}";
 
-    src = fetchurl {
-      url = "mirror://kde/stable/${pname}/${version}/${name}.tar.xz";
-      sha256 = "0f9skfvp0hdml8qq6v22z9293ndijd8kwbpdj7wpvgd6mlya8qbh";
-    };
-
-    meta = with lib; {
-      description = "Norton/Total Commander clone for KDE";
-      license = licenses.gpl2;
-      homepage = http://www.krusader.org;
-      maintainers = with maintainers; [ sander ];
-    };
-
-    nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-    propagatedBuildInputs = [ kconfig kinit kparts ];
+  src = fetchurl {
+    url = "mirror://kde/stable/${pname}/${version}/${name}.tar.xz";
+    sha256 = "0f9skfvp0hdml8qq6v22z9293ndijd8kwbpdj7wpvgd6mlya8qbh";
   };
 
-in kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/krusader" ];
+  meta = with lib; {
+    description = "Norton/Total Commander clone for KDE";
+    license = licenses.gpl2;
+    homepage = http://www.krusader.org;
+    maintainers = with maintainers; [ sander ];
+  };
+
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  propagatedBuildInputs = [ kconfig kinit kparts ];
 }
diff --git a/pkgs/applications/misc/latte-dock/default.nix b/pkgs/applications/misc/latte-dock/default.nix
index cdde0beb827..1b2cf94d173 100644
--- a/pkgs/applications/misc/latte-dock/default.nix
+++ b/pkgs/applications/misc/latte-dock/default.nix
@@ -1,33 +1,26 @@
-{ stdenv, lib, cmake, xorg, plasma-framework, fetchFromGitHub, kdeWrapper }:
+{ mkDerivation, lib, cmake, xorg, plasma-framework, fetchFromGitHub }:
 
-let version = "0.6.0";
+let version = "0.6.0"; in
 
-    unwrapped = stdenv.mkDerivation {
-      name = "latte-dock-${version}";
+mkDerivation {
+  name = "latte-dock-${version}";
 
-      src = fetchFromGitHub {
-        owner = "psifidotos";
-        repo = "Latte-Dock";
-        rev = "v${version}";
-        sha256 = "1967hx4lavy96vvik8d5m2c6ycd2mlf9cmhrv40zr0784ni0ikyv";
-      };
+  src = fetchFromGitHub {
+    owner = "psifidotos";
+    repo = "Latte-Dock";
+    rev = "v${version}";
+    sha256 = "1967hx4lavy96vvik8d5m2c6ycd2mlf9cmhrv40zr0784ni0ikyv";
+  };
 
-      buildInputs = [ plasma-framework xorg.libpthreadstubs xorg.libXdmcp ];
+  buildInputs = [ plasma-framework xorg.libpthreadstubs xorg.libXdmcp ];
 
-      nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake ];
 
-      enableParallelBuilding = true;
-
-      meta = with stdenv.lib; {
-        description = "Dock-style app launcher based on Plasma frameworks";
-        homepage = https://github.com/psifidotos/Latte-Dock;
-        license = licenses.gpl2;
-        platforms = platforms.unix;
-        maintainers = [ maintainers.benley ];
-      };
-    };
-
-in kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/latte-dock" ];
+  meta = with lib; {
+    description = "Dock-style app launcher based on Plasma frameworks";
+    homepage = https://github.com/psifidotos/Latte-Dock;
+    license = licenses.gpl2;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.benley ];
+  };
 }
diff --git a/pkgs/applications/misc/yakuake/default.nix b/pkgs/applications/misc/yakuake/default.nix
index 7df1c7383c7..4a25f88ac75 100644
--- a/pkgs/applications/misc/yakuake/default.nix
+++ b/pkgs/applications/misc/yakuake/default.nix
@@ -2,7 +2,7 @@
 , lib
 , fetchurl
 , kdoctools
-, kdeWrapper
+, wrapGAppsHook
 , extra-cmake-modules
 , karchive
 , kcrash
@@ -18,11 +18,10 @@
 }:
 
 let
-  unwrapped = let
-    pname = "yakuake";
-    version = "3.0.3";
-  in mkDerivation rec {
-    name = "${pname}-${version}";
+  pname = "yakuake";
+  version = "3.0.3";
+in mkDerivation rec {
+  name = "${pname}-${version}";
 
     src = fetchurl {
       url = "http://download.kde.org/stable/${pname}/${version}/src/${name}.tar.xz";
@@ -42,22 +41,28 @@ let
       kwindowsystem
     ];
 
-    nativeBuildInputs = [
-      extra-cmake-modules kdoctools
-    ];
+  propagatedBuildInputs = [
+    karchive
+    kcrash
+    kdbusaddons
+    ki18n
+    kiconthemes
+    knewstuff
+    knotifications
+    knotifyconfig
+    kparts
+    kwindowsystem
+  ];
 
-    meta = {
-      homepage = https://yakuake.kde.org;
-      description = "Quad-style terminal emulator for KDE";
-      maintainers = with lib.maintainers; [ fridh ];
-    };
+  propagatedUserEnvPkgs = [ konsole ];
+
+  nativeBuildInputs = [
+    extra-cmake-modules kdoctools wrapGAppsHook
+  ];
+
+  meta = {
+    homepage = https://yakuake.kde.org;
+    description = "Quad-style terminal emulator for KDE";
+    maintainers = with lib.maintainers; [ fridh ];
   };
-
-
-in
-kdeWrapper
-{
-  inherit unwrapped;
-  targets = [ "bin/yakuake" ];
-  paths = [ konsole.unwrapped ];
 }
diff --git a/pkgs/applications/networking/irc/konversation/default.nix b/pkgs/applications/networking/irc/konversation/default.nix
index 740f30874bf..26e5911a85f 100644
--- a/pkgs/applications/networking/irc/konversation/default.nix
+++ b/pkgs/applications/networking/irc/konversation/default.nix
@@ -2,14 +2,14 @@
 , lib
 , fetchurl
 , extra-cmake-modules
+, kdoctools
+, wrapGAppsHook
 , kbookmarks
 , karchive
 , kconfig
 , kconfigwidgets
 , kcoreaddons
 , kdbusaddons
-, kdeWrapper
-, kdoctools
 , kemoticons
 , kglobalaccel
 , ki18n
@@ -28,55 +28,50 @@
 }:
 
 let
-  unwrapped = let
-    pname = "konversation";
-    version = "1.6.2";
-  in mkDerivation rec {
-    name = "${pname}-${version}";
+  pname = "konversation";
+  version = "1.6.2";
+in mkDerivation rec {
+  name = "${pname}-${version}";
 
-    src = fetchurl {
-      url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
-      sha256 = "1798sslwz7a3h1v524ra33p0j5iqvcg0v1insyvb5qp4kv11slmn";
-    };
-
-    buildInputs = [
-      kbookmarks
-      karchive
-      kconfig
-      kconfigwidgets
-      kcoreaddons
-      kdbusaddons
-      kdoctools
-      kemoticons
-      kglobalaccel
-      ki18n
-      kiconthemes
-      kidletime
-      kitemviews
-      knotifications
-      knotifyconfig
-      kio
-      kparts
-      kwallet
-      solid
-      sonnet
-      phonon
-    ];
-
-    nativeBuildInputs = [
-      extra-cmake-modules
-      kdoctools
-    ];
-
-    meta = {
-      description = "Integrated IRC client for KDE";
-      license = with lib.licenses; [ gpl2 ];
-      maintainers = with lib.maintainers; [ fridh ];
-      homepage = https://konversation.kde.org;
-    };
+  src = fetchurl {
+    url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
+    sha256 = "1798sslwz7a3h1v524ra33p0j5iqvcg0v1insyvb5qp4kv11slmn";
   };
-in kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/konversation" ];
-}
 
+  buildInputs = [
+    kbookmarks
+    karchive
+    kconfig
+    kconfigwidgets
+    kcoreaddons
+    kdbusaddons
+    kdoctools
+    kemoticons
+    kglobalaccel
+    ki18n
+    kiconthemes
+    kidletime
+    kitemviews
+    knotifications
+    knotifyconfig
+    kio
+    kparts
+    kwallet
+    solid
+    sonnet
+    phonon
+  ];
+
+  nativeBuildInputs = [
+    extra-cmake-modules
+    kdoctools
+    wrapGAppsHook
+  ];
+
+  meta = {
+    description = "Integrated IRC client for KDE";
+    license = with lib.licenses; [ gpl2 ];
+    maintainers = with lib.maintainers; [ fridh ];
+    homepage = https://konversation.kde.org;
+  };
+}
diff --git a/pkgs/build-support/kde/wrapper.nix b/pkgs/build-support/kde/wrapper.nix
deleted file mode 100644
index 4442b111d79..00000000000
--- a/pkgs/build-support/kde/wrapper.nix
+++ /dev/null
@@ -1,68 +0,0 @@
-{ stdenv, lib, makeWrapper, buildEnv, gtk3, dconf }:
-
-packages:
-
-let
-  packages_ = if builtins.isList packages then packages else [packages];
-
-  unwrapped = lib.concatMap (p: if builtins.isList p.unwrapped then p.unwrapped else [p.unwrapped]) packages_;
-  targets = lib.concatMap (p: p.targets) packages_;
-  paths = lib.concatMap (p: p.paths or []) packages_;
-
-  name =
-    if builtins.length unwrapped == 1
-    then (lib.head unwrapped).name
-    else "kde-application";
-  meta =
-    if builtins.length unwrapped == 1
-    then (lib.head unwrapped).meta
-    else {};
-
-  env = buildEnv {
-    inherit name meta;
-    paths = builtins.map lib.getBin (unwrapped ++ paths);
-    pathsToLink = [ "/bin" "/share" "/lib/qt5" "/etc/xdg" ];
-  };
-in
-
-stdenv.mkDerivation {
-  inherit name meta;
-  preferLocalBuild = true;
-
-  inherit unwrapped env targets;
-
-  passthru = {
-    inherit targets paths;
-    unwrapped = if builtins.length unwrapped == 1 then lib.head unwrapped else unwrapped;
-  };
-
-  nativeBuildInputs = [ makeWrapper ];
-
-  buildCommand = ''
-    for t in $targets; do
-        good=""
-        for drv in $unwrapped; do
-            if [ -a "$drv/$t" ]; then
-                makeWrapper "$drv/$t" "$out/$t" \
-                    --argv0 '"$0"' \
-                    --suffix PATH : "$env/bin" \
-                    --prefix XDG_CONFIG_DIRS : "$env/etc/xdg" \
-                    --prefix XDG_DATA_DIRS : "$env/share:${gtk3}/share/gsettings-schemas/${gtk3.name}" \
-                    --prefix QML_IMPORT_PATH : "$env/lib/qt5/imports" \
-                    --prefix QML2_IMPORT_PATH : "$env/lib/qt5/qml" \
-                    --prefix QT_PLUGIN_PATH : "$env/lib/qt5/plugins" \
-                    --prefix GIO_EXTRA_MODULES : "${dconf.lib}/lib/gio/modules"
-                good="1"
-                break
-            fi
-        done
-        if [ -z "$good" ]; then
-            echo "file or directory not found in derivations: $t"
-            exit 1
-        fi
-    done
-
-    mkdir -p "$out/nix-support"
-    echo "$unwrapped" > "$out/nix-support/propagated-user-env-packages"
-  '';
-}
diff --git a/pkgs/desktops/plasma-5/oxygen.nix b/pkgs/desktops/plasma-5/oxygen.nix
index c50fd8b0514..483d987686a 100644
--- a/pkgs/desktops/plasma-5/oxygen.nix
+++ b/pkgs/desktops/plasma-5/oxygen.nix
@@ -1,21 +1,15 @@
 {
-  mkDerivation, kdeWrapper,
+  mkDerivation,
   extra-cmake-modules,
   frameworkintegration, kcmutils, kcompletion, kconfig, kdecoration, kguiaddons,
   ki18n, kwidgetsaddons, kservice, kwayland, kwindowsystem, qtx11extras
 }:
 
-let
-  unwrapped = mkDerivation {
-    name = "oxygen";
-    nativeBuildInputs = [ extra-cmake-modules ];
-    propagatedBuildInputs = [
-      frameworkintegration kcmutils kcompletion kconfig kdecoration kguiaddons
-      ki18n kservice kwayland kwidgetsaddons kwindowsystem qtx11extras
-    ];
-  };
-in
-kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/oxygen-demo5" "bin/oxygen-settings5" ];
+mkDerivation {
+  name = "oxygen";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  propagatedBuildInputs = [
+    frameworkintegration kcmutils kcompletion kconfig kdecoration kguiaddons
+    ki18n kservice kwayland kwidgetsaddons kwindowsystem qtx11extras
+  ];
 }
diff --git a/pkgs/tools/misc/kronometer/default.nix b/pkgs/tools/misc/kronometer/default.nix
index 088d01b882d..6db3278fade 100644
--- a/pkgs/tools/misc/kronometer/default.nix
+++ b/pkgs/tools/misc/kronometer/default.nix
@@ -1,29 +1,25 @@
 {
-  mkDerivation, kdeWrapper, fetchurl, lib,
-  extra-cmake-modules, kdoctools,
+  mkDerivation, fetchurl, lib,
+  extra-cmake-modules, kdoctools, wrapGAppsHook,
   kconfig, kinit
 }:
 
 let
   pname = "kronometer";
   version = "2.1.3";
-  unwrapped = mkDerivation rec {
-    name = "${pname}-${version}";
-
-    src = fetchurl {
-      url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
-      sha256 = "1z06gvaacm3d3a9smlmgg2vf0jdab5kqxx24r6v7iprqzgdpsn4i";
-    };
-
-    meta = with lib; {
-      license = licenses.gpl2;
-      maintainers = with maintainers; [ peterhoeg ];
-    };
-    nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-    propagatedBuildInputs = [ kconfig kinit ];
-  };
 in
-kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/kronometer" ];
+mkDerivation rec {
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
+    sha256 = "1z06gvaacm3d3a9smlmgg2vf0jdab5kqxx24r6v7iprqzgdpsn4i";
+  };
+
+  meta = with lib; {
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ peterhoeg ];
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  propagatedBuildInputs = [ kconfig kinit ];
 }
diff --git a/pkgs/tools/misc/partition-manager/default.nix b/pkgs/tools/misc/partition-manager/default.nix
index ffee286f57f..52183a3fff3 100644
--- a/pkgs/tools/misc/partition-manager/default.nix
+++ b/pkgs/tools/misc/partition-manager/default.nix
@@ -1,31 +1,26 @@
-{ mkDerivation, kdeWrapper, fetchurl, lib
-, extra-cmake-modules, kdoctools
+{ mkDerivation, fetchurl, lib
+, extra-cmake-modules, kdoctools, wrapGAppsHook
 , kconfig, kinit, kpmcore
 , eject, libatasmart }:
 
 let
   pname = "partitionmanager";
-  unwrapped = mkDerivation rec {
-    name = "${pname}-${version}";
-    version = "3.0.1";
+in mkDerivation rec {
+  name = "${pname}-${version}";
+  version = "3.0.1";
 
-    src = fetchurl {
-      url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
-      sha256 = "08sb9xa7dvvgha3k2xm1srl339przxpxd2y5bh1lnx6k1x7dk410";
-    };
-
-    meta = with lib; {
-      description = "KDE Partition Manager";
-      license = licenses.gpl2;
-      maintainers = with maintainers; [ peterhoeg ];
-    };
-    nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-    # refer to kpmcore for the use of eject
-    buildInputs = [ eject libatasmart ];
-    propagatedBuildInputs = [ kconfig kinit kpmcore ];
+  src = fetchurl {
+    url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz";
+    sha256 = "08sb9xa7dvvgha3k2xm1srl339przxpxd2y5bh1lnx6k1x7dk410";
   };
 
-in kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/partitionmanager" ];
+  meta = with lib; {
+    description = "KDE Partition Manager";
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ peterhoeg ];
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  # refer to kpmcore for the use of eject
+  buildInputs = [ eject libatasmart ];
+  propagatedBuildInputs = [ kconfig kinit kpmcore ];
 }
diff --git a/pkgs/tools/misc/peruse/default.nix b/pkgs/tools/misc/peruse/default.nix
index 5b5cbbf59cf..cd872fd966e 100644
--- a/pkgs/tools/misc/peruse/default.nix
+++ b/pkgs/tools/misc/peruse/default.nix
@@ -1,6 +1,6 @@
 {
-  mkDerivation, kdeWrapper, fetchFromGitHub, fetchurl, lib,
-  extra-cmake-modules, kdoctools,
+  mkDerivation, fetchFromGitHub, fetchurl, lib,
+  extra-cmake-modules, kdoctools, wrapGAppsHook,
   baloo, kconfig, kfilemetadata, kinit, kirigami, knewstuff, plasma-framework
 }:
 
@@ -13,33 +13,28 @@ let
     rev    = "d1be8c43a82a4320306c8e835a86fdb7b2574ca7";
     sha256 = "03ds5da69zipa25rsp76l6xqivrh3wcgygwyqa5x2rgcz3rjnlpr";
   };
-  unwrapped = mkDerivation rec {
-    name = "${pname}-${version}";
-
-    src = fetchurl {
-      url = "mirror://kde/stable/${pname}/${name}.tar.xz";
-      sha256 = "1ik2627xynkichsq9x28rkczqn3l3p06q6vw5jdafdh3hisccmjq";
-    };
-
-    nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-
-    propagatedBuildInputs = [ baloo kconfig kfilemetadata kinit kirigami knewstuff plasma-framework ];
-
-    pathsToLink = [ "/etc/xdg/peruse.knsrc"];
-
-    preConfigure = ''
-      rm -rf src/qtquick/karchive-rar/external/unarr
-      ln -s ${unarr} src/qtquick/karchive-rar/external/unarr
-    '';
-
-    meta = with lib; {
-      license = licenses.gpl2;
-      maintainers = with maintainers; [ peterhoeg ];
-    };
+in mkDerivation rec {
+  name = "${pname}-${version}";
 
+  src = fetchurl {
+    url = "mirror://kde/stable/${pname}/${name}.tar.xz";
+    sha256 = "1ik2627xynkichsq9x28rkczqn3l3p06q6vw5jdafdh3hisccmjq";
+  };
+
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+
+  propagatedBuildInputs = [ baloo kconfig kfilemetadata kinit kirigami knewstuff plasma-framework ];
+
+  pathsToLink = [ "/etc/xdg/peruse.knsrc"];
+
+  preConfigure = ''
+    rm -rf src/qtquick/karchive-rar/external/unarr
+    ln -s ${unarr} src/qtquick/karchive-rar/external/unarr
+  '';
+
+  meta = with lib; {
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ peterhoeg ];
   };
 
-in kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/peruse" "bin/perusecreator" ];
 }
diff --git a/pkgs/tools/security/kwalletcli/default.nix b/pkgs/tools/security/kwalletcli/default.nix
index c6217024f1b..c655e9aecf8 100644
--- a/pkgs/tools/security/kwalletcli/default.nix
+++ b/pkgs/tools/security/kwalletcli/default.nix
@@ -1,5 +1,5 @@
 {
-  kdeDerivation, kdeWrapper, fetchurl, lib,
+  mkDerivation, fetchurl, lib,
   pkgconfig,
   kcoreaddons, ki18n, kwallet,
   mksh
@@ -8,48 +8,42 @@
 let
   pname = "kwalletcli";
   version = "3.00";
+in
+mkDerivation rec {
+  name = "${pname}-${version}";
 
-  unwrapped = kdeDerivation rec {
-    name = "${pname}-${version}";
-
-    src = fetchurl {
-      url = "https://www.mirbsd.org/MirOS/dist/hosted/kwalletcli/${name}.tar.gz";
-      sha256 = "1q87nm7pkmgvkrml6hgbmv0ddx3871w7x86gn90sjc3vw59qfh98";
-    };
-
-    postPatch = ''
-      substituteInPlace GNUmakefile \
-        --replace '-I/usr/include/KF5/KCoreAddons' '-I${kcoreaddons.dev}/include/KF5/KCoreAddons' \
-        --replace '-I/usr/include/KF5/KI18n'       '-I${ki18n.dev}/include/KF5/KI18n' \
-        --replace '-I/usr/include/KF5/KWallet'     '-I${kwallet.dev}/include/KF5/KWallet' \
-        --replace /usr/bin                         $out/bin \
-        --replace /usr/share/man                   $out/share/man
-    '';
-
-    makeFlags = [ "KDE_VER=5" ];
-
-    # we need this when building against qt 5.8+
-    NIX_CFLAGS_COMPILE = [ "-std=c++11" ];
-
-    nativeBuildInputs = [ pkgconfig ];
-    # if using just kwallet, cmake will be added as a buildInput and fail the build
-    propagatedBuildInputs = [ kcoreaddons ki18n (lib.getLib kwallet) ];
-
-    preInstall = ''
-      mkdir -p $out/bin $out/share/man/man1
-    '';
-
-    meta = with lib; {
-      description = "Command-Line Interface to the KDE Wallet";
-      homepage = http://www.mirbsd.org/kwalletcli.htm;
-      license = licenses.miros;
-      maintainers = with maintainers; [ peterhoeg ];
-    };
+  src = fetchurl {
+    url = "https://www.mirbsd.org/MirOS/dist/hosted/kwalletcli/${name}.tar.gz";
+    sha256 = "1q87nm7pkmgvkrml6hgbmv0ddx3871w7x86gn90sjc3vw59qfh98";
   };
 
-in kdeWrapper {
-  inherit unwrapped;
-  targets = map (b: "bin/" + b)
-    [ "kwalletaskpass" "kwalletcli" "kwalletcli_getpin" "pinentry-kwallet" ];
-  paths = [ mksh ];
+  postPatch = ''
+    substituteInPlace GNUmakefile \
+      --replace '-I/usr/include/KF5/KCoreAddons' '-I${kcoreaddons.dev}/include/KF5/KCoreAddons' \
+      --replace '-I/usr/include/KF5/KI18n'       '-I${ki18n.dev}/include/KF5/KI18n' \
+      --replace '-I/usr/include/KF5/KWallet'     '-I${kwallet.dev}/include/KF5/KWallet' \
+      --replace /usr/bin                         $out/bin \
+      --replace /usr/share/man                   $out/share/man
+  '';
+
+  makeFlags = [ "KDE_VER=5" ];
+
+  # we need this when building against qt 5.8+
+  NIX_CFLAGS_COMPILE = [ "-std=c++11" ];
+
+  nativeBuildInputs = [ pkgconfig ];
+  # if using just kwallet, cmake will be added as a buildInput and fail the build
+  propagatedBuildInputs = [ kcoreaddons ki18n (lib.getLib kwallet) ];
+  propagatedUserEnvPkgs = [ mksh ];
+
+  preInstall = ''
+    mkdir -p $out/bin $out/share/man/man1
+  '';
+
+  meta = with lib; {
+    description = "Command-Line Interface to the KDE Wallet";
+    homepage = http://www.mirbsd.org/kwalletcli.htm;
+    license = licenses.miros;
+    maintainers = with maintainers; [ peterhoeg ];
+  };
 }
diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix
index 3263fe09f6f..e1a2f157085 100644
--- a/pkgs/tools/text/kdiff3/default.nix
+++ b/pkgs/tools/text/kdiff3/default.nix
@@ -1,49 +1,44 @@
 {
-  mkDerivation, lib, kdeWrapper, fetchgit, fetchpatch,
-  extra-cmake-modules, kdoctools, kconfig, kinit, kparts
+  mkDerivation, lib, fetchgit, fetchpatch,
+  extra-cmake-modules, kdoctools, wrapGAppsHook,
+  kconfig, kinit, kparts
 }:
 
-let
-  unwrapped = mkDerivation rec {
-    name = "kdiff3-${version}";
-    version = "1.7.0-2017-02-19";
+mkDerivation rec {
+  name = "kdiff3-${version}";
+  version = "1.7.0-2017-02-19";
 
-    src = fetchgit {
-      # gitlab is outdated
-      url = https://anongit.kde.org/scratch/thomasfischer/kdiff3.git;
-      sha256 = "0znlk9m844a6qsskbd898w4yk48dkg5bkqlkd5abvyrk1jipzyy8";
-      rev = "0d2ac328164e3cbe2db35875d3df3a86187ae84f";
-    };
-
-    setSourceRoot = ''sourceRoot="$(echo */kdiff3/)"'';
-
-    patches = [
-      (fetchpatch {
-        name = "git-mergetool.diff"; # see https://gitlab.com/tfischer/kdiff3/merge_requests/2
-        url = "https://gitlab.com/vcunat/kdiff3/commit/6106126216.patch";
-        sha256 = "16xqc24y8bg8gzkdbwapiwi68rzqnkpz4hgn586mi01ngig2fd7y";
-      })
-    ];
-    patchFlags = "-p 2";
-
-    postPatch = ''
-      sed -re "s/(p\\[[^]]+] *== *)('([^']|\\\\')+')/\\1QChar(\\2)/g" -i src/diff.cpp
-    '';
-
-    nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-
-    propagatedBuildInputs = [ kconfig kinit kparts ];
-
-    meta = with lib; {
-      homepage = http://kdiff3.sourceforge.net/;
-      license = licenses.gpl2Plus;
-      description = "Compares and merges 2 or 3 files or directories";
-      maintainers = with maintainers; [ viric peterhoeg ];
-      platforms = with platforms; linux;
-    };
+  src = fetchgit {
+    # gitlab is outdated
+    url = https://anongit.kde.org/scratch/thomasfischer/kdiff3.git;
+    sha256 = "0znlk9m844a6qsskbd898w4yk48dkg5bkqlkd5abvyrk1jipzyy8";
+    rev = "0d2ac328164e3cbe2db35875d3df3a86187ae84f";
   };
 
-in kdeWrapper {
-  inherit unwrapped;
-  targets = [ "bin/kdiff3" ];
+  setSourceRoot = ''sourceRoot="$(echo */kdiff3/)"'';
+
+  patches = [
+    (fetchpatch {
+      name = "git-mergetool.diff"; # see https://gitlab.com/tfischer/kdiff3/merge_requests/2
+      url = "https://gitlab.com/vcunat/kdiff3/commit/6106126216.patch";
+      sha256 = "16xqc24y8bg8gzkdbwapiwi68rzqnkpz4hgn586mi01ngig2fd7y";
+    })
+  ];
+  patchFlags = "-p 2";
+
+  postPatch = ''
+    sed -re "s/(p\\[[^]]+] *== *)('([^']|\\\\')+')/\\1QChar(\\2)/g" -i src/diff.cpp
+  '';
+
+  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+
+  propagatedBuildInputs = [ kconfig kinit kparts ];
+
+  meta = with lib; {
+    homepage = http://kdiff3.sourceforge.net/;
+    license = licenses.gpl2Plus;
+    description = "Compares and merges 2 or 3 files or directories";
+    maintainers = with maintainers; [ viric peterhoeg ];
+    platforms = with platforms; linux;
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d730991ffdf..ec153fd4666 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -292,10 +292,6 @@ with pkgs;
       inherit kernel rootModules allowMissing;
     };
 
-  kdeWrapper = callPackage ../build-support/kde/wrapper.nix {
-    inherit (gnome3) dconf;
-  };
-
   nixBufferBuilders = import ../build-support/emacs/buffer.nix { inherit (pkgs) lib writeText; inherit (emacsPackagesNg) inherit-local; };
 
   pathsFromGraph = ../build-support/kernel/paths-from-graph.pl;

From 870c07cc2b020b507238ef6f71003add14ec5cfc Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 17 May 2017 09:21:11 -0500
Subject: [PATCH 027/189] sddm: take themes from system environment

---
 .../services/x11/desktop-managers/plasma5.nix |   1 -
 .../services/x11/display-managers/sddm.nix    |  26 ++-
 .../display-managers/sddm/default.nix         | 153 ++++++------------
 ...e.patch => sddm-ignore-config-mtime.patch} |   0
 .../sddm/sddm-nix-profiles.patch              |  24 +++
 .../applications/display-managers/sddm/series |   2 +
 pkgs/top-level/all-packages.nix               |  11 +-
 7 files changed, 91 insertions(+), 126 deletions(-)
 rename pkgs/applications/display-managers/sddm/{0001-ignore-config-mtime.patch => sddm-ignore-config-mtime.patch} (100%)
 create mode 100644 pkgs/applications/display-managers/sddm/sddm-nix-profiles.patch
 create mode 100644 pkgs/applications/display-managers/sddm/series

diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix
index 27678fda1b5..0a64429c24f 100644
--- a/nixos/modules/services/x11/desktop-managers/plasma5.nix
+++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix
@@ -190,7 +190,6 @@ in
 
       services.xserver.displayManager.sddm = {
         theme = "breeze";
-        package = pkgs.sddmPlasma5;
       };
 
       security.pam.services.kde = { allowNullPassword = true; };
diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix
index 2eb7ddcb1ec..bf516235eb2 100644
--- a/nixos/modules/services/x11/display-managers/sddm.nix
+++ b/nixos/modules/services/x11/display-managers/sddm.nix
@@ -9,7 +9,7 @@ let
   cfg = dmcfg.sddm;
   xEnv = config.systemd.services."display-manager".environment;
 
-  sddm = cfg.package;
+  inherit (pkgs) sddm;
 
   xserverWrapper = pkgs.writeScript "xserver-wrapper" ''
     #!/bin/sh
@@ -37,8 +37,8 @@ let
 
     [Theme]
     Current=${cfg.theme}
-    ThemeDir=${sddm}/share/sddm/themes
-    FacesDir=${sddm}/share/sddm/faces
+    ThemeDir=/run/current-system/sw/share/sddm/themes
+    FacesDir=/run/current-system/sw/share/sddm/faces
 
     [Users]
     MaximumUid=${toString config.ids.uids.nixbld}
@@ -105,15 +105,6 @@ in
         '';
       };
 
-      package = mkOption {
-        type = types.package;
-        default = pkgs.sddm;
-        description = ''
-          The SDDM package to install.
-          The default package can be overridden to provide extra themes.
-        '';
-      };
-
       autoNumlock = mkOption {
         type = types.bool;
         default = false;
@@ -205,7 +196,13 @@ in
     services.xserver.displayManager.job = {
       logsXsession = true;
 
-      execCmd = "exec ${sddm}/bin/sddm";
+      environment = {
+        # Take themes system environment
+        NIX_PROFILES = "/run/current-system/sw";
+        XDG_DATA_DIRS = "/run/current-system/sw/share";
+      };
+
+      execCmd = "exec /run/current-system/sw/bin/sddm";
     };
 
     security.pam.services = {
@@ -254,7 +251,8 @@ in
 
     users.extraGroups.sddm.gid = config.ids.gids.sddm;
 
-    services.dbus.packages = [ sddm.unwrapped ];
+    environment.systemPackages = [ sddm ];
+    services.dbus.packages = [ sddm ];
 
     # To enable user switching, allow sddm to allocate TTYs/displays dynamically.
     services.xserver.tty = null;
diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix
index 07c1e8cee33..d54fb455fcb 100644
--- a/pkgs/applications/display-managers/sddm/default.nix
+++ b/pkgs/applications/display-managers/sddm/default.nix
@@ -1,121 +1,72 @@
-{ stdenv, lib, makeQtWrapper, fetchFromGitHub, fetchpatch
+{ mkDerivation, lib, copyPathsToStore, fetchFromGitHub, fetchpatch
 , cmake, extra-cmake-modules, pkgconfig, libxcb, libpthreadstubs, lndir
 , libXdmcp, libXau, qtbase, qtdeclarative, qttools, pam, systemd
-, themes
 }:
 
 let
+
   version = "0.14.0";
 
-  unwrapped = stdenv.mkDerivation rec {
-    name = "sddm-unwrapped-${version}";
-
-    src = fetchFromGitHub {
-      owner = "sddm";
-      repo = "sddm";
-      rev = "v${version}";
-      sha256 = "0wwid23kw0725zpw67zchalg9mmharr7sn4yzhijq7wqpsczjfxj";
-    };
-
-    patches = [
-      ./0001-ignore-config-mtime.patch
-      (fetchpatch { /* Fix display of user avatars. */
-        url = https://github.com/sddm/sddm/commit/ecb903e48822bd90650bdd64fe80754e3e9664cb.patch;
-        sha256 = "0zm88944pwdad8grmv0xwnxl23xml85ryc71x2xac233jxdyx6ms";
-      })
-    ];
-
-    postPatch =
-      # Module Qt5::Test must be included in `find_package` before it is used.
-      ''
-        sed -i CMakeLists.txt -e '/find_package(Qt5/ s|)| Test)|'
-      '';
-
-    nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qttools ];
-
-    buildInputs = [
-      libxcb libpthreadstubs libXdmcp libXau pam systemd
-    ];
-
-    propagatedBuildInputs = [
-      qtbase qtdeclarative
-    ];
-
-    cmakeFlags = [
-      "-DCONFIG_FILE=/etc/sddm.conf"
-      # Set UID_MIN and UID_MAX so that the build script won't try
-      # to read them from /etc/login.defs (fails in chroot).
-      # The values come from NixOS; they may not be appropriate
-      # for running SDDM outside NixOS, but that configuration is
-      # not supported anyway.
-      "-DUID_MIN=1000"
-      "-DUID_MAX=29999"
-    ];
-
-    preConfigure = ''
-      export cmakeFlags="$cmakeFlags -DQT_IMPORTS_DIR=$out/$qtQmlPrefix -DCMAKE_INSTALL_SYSCONFDIR=$out/etc -DSYSTEMD_SYSTEM_UNIT_DIR=$out/lib/systemd/system"
-    '';
-
-    enableParallelBuilding = true;
-
-    postInstall = ''
-      # remove empty scripts
-      rm "$out/share/sddm/scripts/Xsetup" "$out/share/sddm/scripts/Xstop"
-    '';
-
-    meta = with stdenv.lib; {
-      description = "QML based X11 display manager";
-      homepage = "https://github.com/sddm/sddm";
-      platforms = platforms.linux;
-      maintainers = with maintainers; [ abbradar ttuegel ];
-    };
+  /* Fix display of user avatars. */
+  patchFixUserAvatars = fetchpatch {
+    url = https://github.com/sddm/sddm/commit/ecb903e48822bd90650bdd64fe80754e3e9664cb.patch;
+    sha256 = "0zm88944pwdad8grmv0xwnxl23xml85ryc71x2xac233jxdyx6ms";
   };
 
-in
+in mkDerivation rec {
+  name = "sddm-unwrapped-${version}";
 
-stdenv.mkDerivation {
-  name = "sddm-${version}";
+  src = fetchFromGitHub {
+    owner = "sddm";
+    repo = "sddm";
+    rev = "v${version}";
+    sha256 = "0wwid23kw0725zpw67zchalg9mmharr7sn4yzhijq7wqpsczjfxj";
+  };
 
-  nativeBuildInputs = [ lndir makeQtWrapper ];
-  buildInputs = [ unwrapped ] ++ themes;
-  themes = map (pkg: pkg.out or pkg) themes;
-  inherit unwrapped;
+  patches =
+    copyPathsToStore (lib.readPathsFromFile ./. ./series)
+    ++ [ patchFixUserAvatars ];
 
-  unpackPhase = "true";
-  configurePhase = "runHook preConfigure; runHook postConfigure";
-  buildPhase = "runHook preBuild; runHook postBuild";
+  postPatch =
+    # Module Qt5::Test must be included in `find_package` before it is used.
+    ''
+      sed -i CMakeLists.txt -e '/find_package(Qt5/ s|)| Test)|'
+    '';
 
-  installPhase = ''
-    runHook preInstall
+  nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig qttools ];
 
-    propagated=
-    for i in $unwrapped $themes; do
-      findInputs $i propagated propagated-user-env-packages
-      if [ -z "$crossConfig" ]; then
-          findInputs $i propagated propagated-native-build-inputs
-      else
-          findInputs $i propagated propagated-build-inputs
-      fi
-    done
+  buildInputs = [
+    libxcb libpthreadstubs libXdmcp libXau pam systemd
+  ];
 
-    for pkg in $propagated; do
-      addToSearchPath RUNTIME_XDG_DATA_DIRS "$pkg/share"
-      addToSearchPath RUNTIME_XDG_CONFIG_DIRS "$pkg/etc/xdg"
-    done
+  propagatedBuildInputs = [
+    qtbase qtdeclarative
+  ];
 
-    mkdir -p "$out/bin"
-    makeQtWrapper "$unwrapped/bin/sddm" "$out/bin/sddm"
+  cmakeFlags = [
+    "-DCONFIG_FILE=/etc/sddm.conf"
+    # Set UID_MIN and UID_MAX so that the build script won't try
+    # to read them from /etc/login.defs (fails in chroot).
+    # The values come from NixOS; they may not be appropriate
+    # for running SDDM outside NixOS, but that configuration is
+    # not supported anyway.
+    "-DUID_MIN=1000"
+    "-DUID_MAX=29999"
+  ];
 
-    mkdir -p "$out/share/sddm"
-    for pkg in $unwrapped $themes; do
-        local sddmDir="$pkg/share/sddm"
-        if [ -d "$sddmDir" ]; then
-            lndir -silent "$sddmDir" "$out/share/sddm"
-        fi
-    done
-
-    runHook postInstall
+  preConfigure = ''
+    export cmakeFlags="$cmakeFlags -DQT_IMPORTS_DIR=$out/$qtQmlPrefix -DCMAKE_INSTALL_SYSCONFDIR=$out/etc -DSYSTEMD_SYSTEM_UNIT_DIR=$out/lib/systemd/system"
   '';
 
-  inherit (unwrapped) meta;
+  postInstall = ''
+    # remove empty scripts
+    rm "$out/share/sddm/scripts/Xsetup" "$out/share/sddm/scripts/Xstop"
+  '';
+
+  meta = with lib; {
+    description = "QML based X11 display manager";
+    homepage = "https://github.com/sddm/sddm";
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ abbradar ttuegel ];
+  };
 }
diff --git a/pkgs/applications/display-managers/sddm/0001-ignore-config-mtime.patch b/pkgs/applications/display-managers/sddm/sddm-ignore-config-mtime.patch
similarity index 100%
rename from pkgs/applications/display-managers/sddm/0001-ignore-config-mtime.patch
rename to pkgs/applications/display-managers/sddm/sddm-ignore-config-mtime.patch
diff --git a/pkgs/applications/display-managers/sddm/sddm-nix-profiles.patch b/pkgs/applications/display-managers/sddm/sddm-nix-profiles.patch
new file mode 100644
index 00000000000..1783164af46
--- /dev/null
+++ b/pkgs/applications/display-managers/sddm/sddm-nix-profiles.patch
@@ -0,0 +1,24 @@
+Index: sddm-0.14.0/src/daemon/Greeter.cpp
+===================================================================
+--- sddm-0.14.0.orig/src/daemon/Greeter.cpp
++++ sddm-0.14.0/src/daemon/Greeter.cpp
+@@ -157,18 +157,7 @@ namespace SDDM {
+                 << args;
+ 
+             // greeter environment
+-            QProcessEnvironment env;
+-            QProcessEnvironment sysenv = QProcessEnvironment::systemEnvironment();
+-
+-            insertEnvironmentList({QStringLiteral("LANG"), QStringLiteral("LANGUAGE"),
+-                                   QStringLiteral("LC_CTYPE"), QStringLiteral("LC_NUMERIC"), QStringLiteral("LC_TIME"), QStringLiteral("LC_COLLATE"),
+-                                   QStringLiteral("LC_MONETARY"), QStringLiteral("LC_MESSAGES"), QStringLiteral("LC_PAPER"), QStringLiteral("LC_NAME"),
+-                                   QStringLiteral("LC_ADDRESS"), QStringLiteral("LC_TELEPHONE"), QStringLiteral("LC_MEASUREMENT"), QStringLiteral("LC_IDENTIFICATION"),
+-                                   QStringLiteral("LD_LIBRARY_PATH"),
+-                                   QStringLiteral("QML2_IMPORT_PATH"),
+-                                   QStringLiteral("QT_PLUGIN_PATH"),
+-                                   QStringLiteral("XDG_DATA_DIRS")
+-            }, sysenv, env);
++            QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
+ 
+             env.insert(QStringLiteral("PATH"), mainConfig.Users.DefaultPath.get());
+             env.insert(QStringLiteral("DISPLAY"), m_display->name());
diff --git a/pkgs/applications/display-managers/sddm/series b/pkgs/applications/display-managers/sddm/series
new file mode 100644
index 00000000000..703fb6a3fe1
--- /dev/null
+++ b/pkgs/applications/display-managers/sddm/series
@@ -0,0 +1,2 @@
+sddm-ignore-config-mtime.patch
+sddm-nix-profiles.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ec153fd4666..13ec940b1c9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15866,16 +15866,7 @@ with pkgs;
 
   printrun = callPackage ../applications/misc/printrun { };
 
-  sddm = libsForQt5.callPackage ../applications/display-managers/sddm {
-    themes = [];  # extra themes, etc.
-  };
-
-  sddmPlasma5 = sddm.override {
-    themes = [
-      plasma5.plasma-workspace
-      pkgs.breeze-icons
-    ];
-  };
+  sddm = libsForQt5.callPackage ../applications/display-managers/sddm { };
 
   skrooge = libsForQt5.callPackage ../applications/office/skrooge {};
 

From 1607f51613fc63a6fbfc1884c55a9efea06161b3 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 17 May 2017 14:25:42 -0500
Subject: [PATCH 028/189] qmake: unify Darwin and Linux setup hooks

---
 .../libraries/qt-5/5.6/default.nix            |  8 ++--
 .../libraries/qt-5/5.8/default.nix            |  8 ++--
 .../libraries/qt-5/qmake-hook-darwin.sh       | 42 -------------------
 pkgs/development/libraries/qt-5/qmake-hook.sh |  7 +++-
 4 files changed, 14 insertions(+), 51 deletions(-)
 delete mode 100644 pkgs/development/libraries/qt-5/qmake-hook-darwin.sh

diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix
index 586a8d584da..37065edc440 100644
--- a/pkgs/development/libraries/qt-5/5.6/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/default.nix
@@ -151,10 +151,10 @@ let
         { deps = [ makeWrapper ]; }
         (if stdenv.isDarwin then ../make-qt-wrapper-darwin.sh else ../make-qt-wrapper.sh);
 
-      qmake =
-        makeSetupHook
-        { deps = [ self.qtbase.dev ]; }
-        (if stdenv.isDarwin then ../qmake-hook-darwin.sh else ../qmake-hook.sh);
+      qmake = makeSetupHook {
+        deps = [ self.qtbase.dev ];
+        substitutions = { inherit (stdenv) isDarwin; };
+      } ../qmake-hook.sh;
     };
 
    self = makeScope newScope addPackages;
diff --git a/pkgs/development/libraries/qt-5/5.8/default.nix b/pkgs/development/libraries/qt-5/5.8/default.nix
index 399c0415b11..1000bf09b17 100644
--- a/pkgs/development/libraries/qt-5/5.8/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/default.nix
@@ -138,11 +138,11 @@ let
         { deps = [ makeWrapper ] ++ optionals (!stdenv.isDarwin) [ dconf.lib gtk3 ]; }
         (if stdenv.isDarwin then ../make-qt-wrapper-darwin.sh else ../make-qt-wrapper.sh);
 
-      qmake =
-        makeSetupHook
-        { deps = [ self.qtbase.dev ]; }
-        (if stdenv.isDarwin then ../qmake-hook-darwin.sh else ../qmake-hook.sh);
 
+      qmake = makeSetupHook {
+        deps = [ self.qtbase.dev ];
+        substitutions = { inherit (stdenv) isDarwin; };
+      } ../qmake-hook.sh;
     };
 
    self = makeScope newScope addPackages;
diff --git a/pkgs/development/libraries/qt-5/qmake-hook-darwin.sh b/pkgs/development/libraries/qt-5/qmake-hook-darwin.sh
deleted file mode 100644
index c359cb4ee6a..00000000000
--- a/pkgs/development/libraries/qt-5/qmake-hook-darwin.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-qmakeConfigurePhase() {
-    runHook preConfigure
-
-    qmake PREFIX=$out $qmakeFlags
-
-    runHook postConfigure
-}
-
-if [ -z "$dontUseQmakeConfigure" -a -z "$configurePhase" ]; then
-    configurePhase=qmakeConfigurePhase
-fi
-
-_qtModuleMultioutDevsPre() {
-    # 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}"
-}
-
-_qtModuleMultioutDevsPost() {
-    # 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' \) -print0 | \
-                while read -r -d $'\0' file; do
-                    mkdir -p "${!outputDev}/$(dirname "$file")"
-                    mv "${!outputLib}/$file" "${!outputDev}/$file"
-                done
-        fi
-        popd
-    fi
-}
-
-if [ -n "$NIX_QT_SUBMODULE" ]; then
-    preFixupHooks+=(_qtModuleMultioutDevsPre)
-    postFixupHooks+=(_qtModuleMultioutDevsPost)
-fi
diff --git a/pkgs/development/libraries/qt-5/qmake-hook.sh b/pkgs/development/libraries/qt-5/qmake-hook.sh
index 696b4ea8dad..c70410975ec 100644
--- a/pkgs/development/libraries/qt-5/qmake-hook.sh
+++ b/pkgs/development/libraries/qt-5/qmake-hook.sh
@@ -22,11 +22,16 @@ _qtModuleMultioutDevsPre() {
 }
 
 _qtModuleMultioutDevsPost() {
+    local -a findopts=(-name '*.a' -o -name '*.la')
+    if [ -z "@isDarwin@" ]; then
+        findopts+=(-o -name '*.prl')
+    fi
+
     # 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 | \
+            find lib \( "${findopts[@]}" \) -print0 | \
                 while read -r -d $'\0' file; do
                     mkdir -p "${!outputDev}/$(dirname "$file")"
                     mv "${!outputLib}/$file" "${!outputDev}/$file"

From c816bbc8a86c7ea6c09ca42e1694fe08003a55fc Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 17 May 2017 14:26:11 -0500
Subject: [PATCH 029/189] qt5: remove makeQtWrapper

---
 pkgs/applications/audio/audacious/qt-5.nix    | 18 +++-----
 pkgs/applications/audio/cantata/default.nix   |  8 +---
 pkgs/applications/audio/dfasma/default.nix    |  8 +---
 .../audio/sonic-visualiser/default.nix        |  5 +--
 .../editors/kdevelop5/kdevelop.nix            |  4 +-
 .../editors/kdevelop5/kdevplatform.nix        |  7 ++-
 pkgs/applications/editors/neovim/qt.nix       |  8 ++--
 pkgs/applications/graphics/ipe/default.nix    |  9 ++--
 pkgs/applications/graphics/krita/default.nix  | 16 ++-----
 .../applications/graphics/photoqt/default.nix |  9 ++--
 .../graphics/renderdoc/default.nix            |  8 ++--
 pkgs/applications/kde/ark/default.nix         | 10 ++---
 pkgs/applications/kde/filelight.nix           |  4 +-
 pkgs/applications/kde/gwenview.nix            | 14 +++---
 pkgs/applications/kde/k3b.nix                 | 11 ++---
 pkgs/applications/kde/kate.nix                |  7 +--
 pkgs/applications/kde/kcachegrind.nix         |  7 +--
 pkgs/applications/kde/kcalc.nix               |  4 +-
 pkgs/applications/kde/kcolorchooser.nix       |  4 +-
 pkgs/applications/kde/kcontacts.nix           |  3 +-
 pkgs/applications/kde/kdenlive.nix            | 21 ++++-----
 pkgs/applications/kde/kdf.nix                 |  4 +-
 pkgs/applications/kde/kgpg.nix                | 17 ++++----
 pkgs/applications/kde/khelpcenter.nix         | 11 ++---
 pkgs/applications/kde/kig.nix                 |  9 ++--
 pkgs/applications/kde/kmix.nix                |  4 +-
 pkgs/applications/kde/kolourpaint.nix         |  3 +-
 pkgs/applications/kde/kompare.nix             |  4 +-
 pkgs/applications/kde/konsole.nix             | 12 +++---
 pkgs/applications/kde/krfb.nix                |  7 +--
 pkgs/applications/kde/kwalletmanager.nix      |  3 +-
 pkgs/applications/kde/marble.nix              |  4 +-
 pkgs/applications/kde/okteta.nix              |  7 ++-
 pkgs/applications/kde/okular.nix              | 13 +++---
 pkgs/applications/kde/print-manager.nix       | 14 +++---
 pkgs/applications/kde/spectacle.nix           | 13 +++---
 pkgs/applications/misc/albert/default.nix     | 12 ++----
 .../misc/cool-retro-term/default.nix          |  6 +--
 pkgs/applications/misc/cura/default.nix       | 10 ++---
 .../misc/golden-cheetah/default.nix           | 10 ++---
 pkgs/applications/misc/gpxsee/default.nix     |  5 +--
 pkgs/applications/misc/kdeconnect/default.nix | 10 +----
 pkgs/applications/misc/openbrf/default.nix    |  6 +--
 .../misc/qsyncthingtray/default.nix           | 12 +++---
 pkgs/applications/misc/qtpass/default.nix     |  8 ++--
 .../misc/redis-desktop-manager/default.nix    |  5 +--
 pkgs/applications/misc/xca/default.nix        | 17 +++-----
 .../browsers/qutebrowser/default.nix          |  9 ++--
 .../networking/dropbox/default.nix            | 13 +++---
 .../instant-messengers/qtox/default.nix       | 13 +++---
 .../instant-messengers/quaternion/default.nix | 12 ++----
 .../instant-messengers/ricochet/default.nix   |  5 +--
 .../telegram/cutegram/default.nix             |  6 +--
 .../telegram/tdesktop/default.nix             | 11 +++--
 .../instant-messengers/tensor/default.nix     |  6 +--
 .../networking/irc/communi/default.nix        |  5 +--
 .../networking/irc/konversation/default.nix   |  3 --
 .../mailreaders/trojita/default.nix           | 18 +++-----
 .../networking/mumble/default.nix             |  6 +--
 .../newsreaders/quiterss/default.nix          |  8 +---
 pkgs/applications/office/mendeley/default.nix |  5 ++-
 pkgs/applications/office/mytetra/default.nix  |  6 +--
 pkgs/applications/office/skrooge/default.nix  | 16 +++----
 .../science/astronomy/stellarium/default.nix  | 27 +++++-------
 .../science/electronics/fritzing/default.nix  | 10 +----
 .../science/math/speedcrunch/default.nix      | 14 ++----
 .../robotics/qgroundcontrol/default.nix       |  6 +--
 pkgs/applications/video/bomi/default.nix      | 10 ++---
 .../video/openshot-qt/default.nix             |  2 +-
 pkgs/applications/video/shotcut/default.nix   |  6 +--
 .../virtualization/virt-manager/qt.nix        | 18 +++-----
 .../virtualization/virtualbox/default.nix     |  8 +---
 pkgs/desktops/plasma-5/systemsettings.nix     |  2 +-
 .../development/libraries/libqtav/default.nix | 14 ++----
 .../libraries/qt-5/5.6/default.nix            |  5 ---
 .../libraries/qt-5/5.8/default.nix            |  6 ---
 .../qt-5/5.8/qtdeclarative/default.nix        | 12 +-----
 .../libraries/qt-5/5.8/qttools/default.nix    | 16 +------
 .../libraries/qt-5/make-qt-wrapper-darwin.sh  | 35 ---------------
 .../libraries/qt-5/make-qt-wrapper.sh         | 43 -------------------
 pkgs/development/qtcreator/default.nix        |  5 +--
 .../tools/analysis/qcachegrind/default.nix    |  6 +--
 .../tools/database/sqlitebrowser/default.nix  | 18 +++-----
 pkgs/development/tools/tora/default.nix       | 12 +++---
 pkgs/development/tools/vogl/default.nix       | 20 ++++-----
 pkgs/os-specific/linux/v4l-utils/default.nix  |  8 +---
 pkgs/tools/audio/qastools/default.nix         | 11 +++--
 pkgs/tools/misc/antimicro/default.nix         | 13 +++---
 pkgs/tools/misc/qt5ct/default.nix             |  6 +--
 pkgs/tools/misc/radeon-profile/default.nix    |  5 +--
 pkgs/tools/misc/rockbox-utility/default.nix   |  6 +--
 pkgs/top-level/all-packages.nix               |  8 ++--
 92 files changed, 323 insertions(+), 582 deletions(-)
 delete mode 100644 pkgs/development/libraries/qt-5/make-qt-wrapper-darwin.sh
 delete mode 100644 pkgs/development/libraries/qt-5/make-qt-wrapper.sh

diff --git a/pkgs/applications/audio/audacious/qt-5.nix b/pkgs/applications/audio/audacious/qt-5.nix
index 663e0eb0cc8..da143c7d946 100644
--- a/pkgs/applications/audio/audacious/qt-5.nix
+++ b/pkgs/applications/audio/audacious/qt-5.nix
@@ -1,6 +1,6 @@
 {
-  stdenv, lib, fetchurl,
-  gettext, makeQtWrapper, pkgconfig,
+  mkDerivation, lib, fetchurl,
+  gettext, pkgconfig,
   qtbase,
   alsaLib, curl, faad2, ffmpeg, flac, fluidsynth, gdk_pixbuf, lame, libbs2b,
   libcddb, libcdio082, libcue, libjack2, libmad, libmcs, libmms, libmodplug,
@@ -24,16 +24,14 @@ let
   };
 in
 
-stdenv.mkDerivation {
+mkDerivation {
   inherit version;
   name = "audacious-qt5-${version}";
 
   sourceFiles = lib.attrValues sources;
   sourceRoots = lib.attrNames sources;
 
-  nativeBuildInputs = [
-    gettext makeQtWrapper pkgconfig
-  ];
+  nativeBuildInputs = [ gettext pkgconfig ];
 
   buildInputs = [
     # Core dependencies
@@ -68,15 +66,9 @@ stdenv.mkDerivation {
       fi
 
     done
-
-    source $stdenv/setup
-    wrapQtProgram $out/bin/audacious
-    wrapQtProgram $out/bin/audtool
   '';
 
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Audio player";
     homepage = http://audacious-media-player.org/;
     maintainers = with maintainers; [ ttuegel ];
diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix
index 3231e3e5301..82a6d44f643 100644
--- a/pkgs/applications/audio/cantata/default.nix
+++ b/pkgs/applications/audio/cantata/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, cmake, vlc
 , withQt4 ? false, qt4
-, withQt5 ? true, qtbase, qtsvg, qttools, makeQtWrapper
+, withQt5 ? true, qtbase, qtsvg, qttools
 
 # Cantata doesn't build with cdparanoia enabled so we disable that
 # default for now until I (or someone else) figure it out.
@@ -63,8 +63,6 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional withMusicbrainz libmusicbrainz5
     ++ stdenv.lib.optional (withTaglib && withDevices) udisks2;
 
-  nativeBuildInputs = stdenv.lib.optional withQt5 makeQtWrapper;
-
   cmakeFlags = stdenv.lib.flatten [
     (fstat withQt5 "QT5")
     (fstats withTaglib [ "TAGLIB" "TAGLIB_EXTRAS" ])
@@ -88,10 +86,6 @@ stdenv.mkDerivation rec {
     sed -i -e 's/STRLESS/VERSION_LESS/g' cmake/FindTaglib.cmake
   '';
 
-  postInstall = stdenv.lib.optionalString withQt5 ''
-    wrapQtProgram "$out/bin/cantata"
-  '';
-
   meta = with stdenv.lib; {
     homepage = https://github.com/cdrummond/cantata;
     description = "A graphical client for MPD";
diff --git a/pkgs/applications/audio/dfasma/default.nix b/pkgs/applications/audio/dfasma/default.nix
index 53ca8d316a2..918accb4e16 100644
--- a/pkgs/applications/audio/dfasma/default.nix
+++ b/pkgs/applications/audio/dfasma/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fftw, libsndfile, qtbase, qtmultimedia, qmake, makeQtWrapper }:
+{ stdenv, fetchFromGitHub, fftw, libsndfile, qtbase, qtmultimedia, qmake }:
 
 let
 
@@ -39,7 +39,7 @@ in stdenv.mkDerivation rec {
 
   buildInputs = [ fftw libsndfile qtbase qtmultimedia ];
 
-  nativeBuildInputs = [ makeQtWrapper qmake ];
+  nativeBuildInputs = [ qmake ];
 
   postPatch = ''
     substituteInPlace dfasma.pro --replace '$$DFASMAVERSIONGITPRO' '${version}'
@@ -53,10 +53,6 @@ in stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  postInstall = ''
-    wrapQtProgram "$out/bin/dfasma"
-  '';
-
   meta = with stdenv.lib; {
     description = "Analyse and compare audio files in time and frequency";
     longDescription = ''
diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix
index d1e9b50dee3..bdb9911d365 100644
--- a/pkgs/applications/audio/sonic-visualiser/default.nix
+++ b/pkgs/applications/audio/sonic-visualiser/default.nix
@@ -2,7 +2,7 @@
 
 { stdenv, fetchurl, alsaLib, bzip2, fftw, libjack2, libX11, liblo
 , libmad, libogg, librdf, librdf_raptor, librdf_rasqal, libsamplerate
-, libsndfile, pkgconfig, libpulseaudio, makeQtWrapper, qtbase, redland
+, libsndfile, pkgconfig, libpulseaudio, qtbase, redland
 , qmake, rubberband, serd, sord, vampSDK, fftwFloat
 }:
 
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
       libX11
     ];
 
-  nativeBuildInputs = [ makeQtWrapper pkgconfig qmake ];
+  nativeBuildInputs = [ pkgconfig qmake ];
 
   configurePhase = ''
     for i in sonic-visualiser svapp svcore svgui;
@@ -43,7 +43,6 @@ stdenv.mkDerivation rec {
     mkdir -p $out/{bin,share/sonic-visualiser}
     cp sonic-visualiser $out/bin/
     cp -r samples $out/share/sonic-visualiser/
-    wrapQtProgram "$out/bin/sonic-visualiser"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/editors/kdevelop5/kdevelop.nix b/pkgs/applications/editors/kdevelop5/kdevelop.nix
index d4f07d82bf0..bbd9be22074 100644
--- a/pkgs/applications/editors/kdevelop5/kdevelop.nix
+++ b/pkgs/applications/editors/kdevelop5/kdevelop.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, lib, fetchurl, cmake, gettext, pkgconfig, extra-cmake-modules, wrapGAppsHook
+{ mkDerivation, lib, fetchurl, cmake, gettext, pkgconfig, extra-cmake-modules
 , qtquickcontrols, qtwebkit, qttools, kde-cli-tools
 , kconfig, kdeclarative, kdoctools, kiconthemes, ki18n, kitemmodels, kitemviews
 , kjobwidgets, kcmutils, kio, knewstuff, knotifyconfig, kparts, ktexteditor
@@ -21,7 +21,7 @@ mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    cmake gettext pkgconfig extra-cmake-modules makeWrapper wrapGAppsHook
+    cmake gettext pkgconfig extra-cmake-modules makeWrapper
   ];
 
   buildInputs = [
diff --git a/pkgs/applications/editors/kdevelop5/kdevplatform.nix b/pkgs/applications/editors/kdevelop5/kdevplatform.nix
index d3680aff3d8..3efc1335c07 100644
--- a/pkgs/applications/editors/kdevelop5/kdevplatform.nix
+++ b/pkgs/applications/editors/kdevelop5/kdevplatform.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, cmake, gettext, pkgconfig, extra-cmake-modules, makeQtWrapper
+{ stdenv, fetchurl, fetchpatch, cmake, gettext, pkgconfig, extra-cmake-modules
 , boost, subversion, apr, aprutil
 , qtscript, qtwebkit, grantlee, karchive, kconfig, kcoreaddons, kguiaddons, kiconthemes, ki18n
 , kitemmodels, kitemviews, kio, kparts, sonnet, kcmutils, knewstuff, knotifications
@@ -11,7 +11,7 @@ let
 in
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
-  
+
   src = fetchurl {
     url = "mirror://kde/stable/kdevelop/${version}/src/${name}.tar.xz";
     sha256 = "3159440512b1373c1a4b35f401ba1f81217de9578372b45137af141eeda6e726";
@@ -25,9 +25,8 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  nativeBuildInputs = [ cmake gettext pkgconfig extra-cmake-modules makeQtWrapper ];
+  nativeBuildInputs = [ cmake gettext pkgconfig extra-cmake-modules ];
 
-  propagatedBuildInputs = [ ];
   buildInputs = [
     boost subversion apr aprutil
     qtscript qtwebkit grantlee karchive kconfig kcoreaddons kguiaddons kiconthemes
diff --git a/pkgs/applications/editors/neovim/qt.nix b/pkgs/applications/editors/neovim/qt.nix
index 57f52f0e5fc..e24ca50a024 100644
--- a/pkgs/applications/editors/neovim/qt.nix
+++ b/pkgs/applications/editors/neovim/qt.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, cmake, doxygen
-, libmsgpack, makeQtWrapper, neovim, pythonPackages, qtbase }:
+{ stdenv, fetchFromGitHub, cmake, doxygen, makeWrapper
+, libmsgpack, neovim, pythonPackages, qtbase }:
 
 stdenv.mkDerivation rec {
   name = "neovim-qt-${version}";
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     jinja2 msgpack python
   ]);
 
-  nativeBuildInputs = [ cmake doxygen makeQtWrapper ];
+  nativeBuildInputs = [ cmake doxygen makeWrapper ];
 
   enableParallelBuilding = true;
 
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
   '';
 
   postInstall = ''
-    wrapQtProgram "$out/bin/nvim-qt" \
+    wrapProgram "$out/bin/nvim-qt" \
       --prefix PATH : "${neovim}/bin"
   '';
 
diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix
index 4a99d0ea4a1..2b1b1f8da8a 100644
--- a/pkgs/applications/graphics/ipe/default.nix
+++ b/pkgs/applications/graphics/ipe/default.nix
@@ -1,6 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, zlib, freetype, cairo, lua5, texlive, ghostscript
+{ stdenv, fetchurl, makeWrapper, pkgconfig, zlib, freetype, cairo, lua5, texlive, ghostscript
 , libjpeg, qtbase
-, makeQtWrapper
 }:
 
 stdenv.mkDerivation rec {
@@ -28,14 +27,14 @@ stdenv.mkDerivation rec {
   LUA_PACKAGE = "lua";
 
   buildInputs = [
-    libjpeg pkgconfig zlib qtbase freetype cairo lua5 texlive ghostscript
+    libjpeg zlib qtbase freetype cairo lua5 texlive ghostscript
   ];
 
-  nativeBuildInputs = [ makeQtWrapper ];
+  nativeBuildInputs = [ makeWrapper pkgconfig ];
 
   postFixup = ''
     for prog in $out/bin/*; do
-      wrapQtProgram "$prog" --prefix PATH : "${texlive}/bin"
+      wrapProgram "$prog" --prefix PATH : "${texlive}/bin"
     done
   '';
 
diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix
index c82d1565a55..121afdf2084 100644
--- a/pkgs/applications/graphics/krita/default.nix
+++ b/pkgs/applications/graphics/krita/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, cmake, extra-cmake-modules, makeQtWrapper
+{ mkDerivation, lib, fetchurl, cmake, extra-cmake-modules
 , karchive, kconfig, kwidgetsaddons, kcompletion, kcoreaddons
 , kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem
 , kio, kcrash
@@ -6,7 +6,7 @@
 , openjpeg, opencolorio, vc, poppler_qt5, curl, ilmbase
 }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name = "krita-${version}";
   ver_min = "3.1.3";
   version = "${ver_min}";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
     sha256 = "125js6c8aw4bqhs28pwnl3rbgqx5yx4zsklw7bfdhy3vf6lrysw1";
   };
 
-  nativeBuildInputs = [ cmake extra-cmake-modules makeQtWrapper ];
+  nativeBuildInputs = [ cmake extra-cmake-modules ];
 
   buildInputs = [
     karchive kconfig kwidgetsaddons kcompletion kcoreaddons kguiaddons
@@ -27,15 +27,7 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_COMPILE = [ "-I${ilmbase.dev}/include/OpenEXR" ];
 
-  enableParallelBuilding = true;
-
-  postInstall = ''
-    for i in $out/bin/*; do
-      wrapQtProgram "$i"
-    done
-  '';
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A free an open source painting application";
     homepage = "https://krita.org/";
     maintainers = with maintainers; [ abbradar ];
diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix
index f9b24581929..d6bcdee4137 100644
--- a/pkgs/applications/graphics/photoqt/default.nix
+++ b/pkgs/applications/graphics/photoqt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, makeQtWrapper, exiv2, graphicsmagick
+{ stdenv, fetchurl, cmake, exiv2, graphicsmagick
 , qtbase, qtdeclarative, qtmultimedia, qtquickcontrols, qttools
 }:
 
@@ -12,8 +12,9 @@ stdenv.mkDerivation rec {
     sha256 = "0j2kvxfb5pd9abciv161nkcsyam6n8kfqs8ymwj2mxiqflwbmfl1";
   };
 
+  nativeBuildInputs = [ cmake ];
   buildInputs = [
-    cmake makeQtWrapper qtbase qtquickcontrols qttools exiv2 graphicsmagick
+    qtbase qtquickcontrols qttools exiv2 graphicsmagick
     qtmultimedia qtdeclarative
   ];
 
@@ -21,10 +22,6 @@ stdenv.mkDerivation rec {
     export MAGICK_LOCATION="${graphicsmagick}/include/GraphicsMagick"
   '';
 
-  postInstall = ''
-    wrapQtProgram $out/bin/photoqt
-  '';
-
   meta = {
     homepage = "http://photoqt.org/";
     description = "Simple, yet powerful and good looking image viewer";
diff --git a/pkgs/applications/graphics/renderdoc/default.nix b/pkgs/applications/graphics/renderdoc/default.nix
index be4457c932f..d69f9a676c1 100644
--- a/pkgs/applications/graphics/renderdoc/default.nix
+++ b/pkgs/applications/graphics/renderdoc/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, cmake, qtbase, qtx11extras
-, pkgconfig, xorg, makeQtWrapper, vulkan-loader
+{ stdenv, fetchFromGitHub, cmake, makeWrapper, pkgconfig
+, qtbase, qtx11extras, vulkan-loader, xorg
 }:
 
 stdenv.mkDerivation rec {
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     qtbase xorg.libpthreadstubs xorg.libXdmcp qtx11extras vulkan-loader
   ];
-  nativeBuildInputs = [ cmake makeQtWrapper pkgconfig ];
+  nativeBuildInputs = [ cmake makeWrapper pkgconfig ];
 
   cmakeFlags = [
     "-DBUILD_VERSION_HASH=${src.rev}-distro-nix"
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     mkdir $out/bin/.bin
     mv $out/bin/qrenderdoc $out/bin/.bin/qrenderdoc
     ln -s $out/bin/.bin/qrenderdoc $out/bin/qrenderdoc
-    wrapQtProgram $out/bin/qrenderdoc --suffix LD_LIBRARY_PATH : $out/lib --suffix LD_LIBRARY_PATH : ${vulkan-loader}/lib
+    wrapProgram $out/bin/qrenderdoc --suffix LD_LIBRARY_PATH : $out/lib --suffix LD_LIBRARY_PATH : ${vulkan-loader}/lib
     mv $out/bin/renderdoccmd $out/bin/.bin/renderdoccmd
     ln -s $out/bin/.bin/renderdoccmd $out/bin/renderdoccmd
     wrapProgram $out/bin/renderdoccmd --suffix LD_LIBRARY_PATH : $out/lib --suffix LD_LIBRARY_PATH : ${vulkan-loader}/lib
diff --git a/pkgs/applications/kde/ark/default.nix b/pkgs/applications/kde/ark/default.nix
index f52f30c7917..f2976c38c39 100644
--- a/pkgs/applications/kde/ark/default.nix
+++ b/pkgs/applications/kde/ark/default.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation, lib, config, wrapGAppsHook,
+  mkDerivation, lib, config, makeWrapper,
 
   extra-cmake-modules, kdoctools,
 
@@ -15,20 +15,18 @@
 
 mkDerivation {
   name = "ark";
-  nativeBuildInputs = [
-    extra-cmake-modules kdoctools wrapGAppsHook
-  ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ];
   propagatedBuildInputs = [
     khtml ki18n kio karchive kconfig kcrash kdbusaddons kiconthemes kservice
     kpty kwidgetsaddons libarchive kitemmodels
   ];
-  preFixup =
+  postFixup =
     let
       PATH =
         lib.makeBinPath
         ([ p7zip unzipNLS zip ] ++ lib.optional unfreeEnableUnrar unrar);
     in ''
-      gappsWrapperArgs+=(--prefix PATH : "${PATH}")
+      wrapProgram "$out/bin/ark" --prefix PATH: "${PATH}"
     '';
   meta = {
     license = with lib.licenses;
diff --git a/pkgs/applications/kde/filelight.nix b/pkgs/applications/kde/filelight.nix
index d3925d54988..6eb219d8da9 100644
--- a/pkgs/applications/kde/filelight.nix
+++ b/pkgs/applications/kde/filelight.nix
@@ -1,6 +1,6 @@
 {
   mkDerivation, lib,
-  extra-cmake-modules, kdoctools, wrapGAppsHook,
+  extra-cmake-modules, kdoctools,
   kio, kparts, kxmlgui, qtscript, solid
 }:
 
@@ -10,7 +10,7 @@ mkDerivation {
     license = with lib.licenses; [ gpl2 ];
     maintainers = with lib.maintainers; [ fridh vcunat ];
   };
-  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [
     kio kparts kxmlgui qtscript solid
   ];
diff --git a/pkgs/applications/kde/gwenview.nix b/pkgs/applications/kde/gwenview.nix
index d206e901f8e..99be13ba7f8 100644
--- a/pkgs/applications/kde/gwenview.nix
+++ b/pkgs/applications/kde/gwenview.nix
@@ -1,8 +1,9 @@
 {
   mkDerivation, lib,
-  extra-cmake-modules, kdoctools, wrapGAppsHook,
-  baloo, exiv2, kactivities, kdelibs4support, kio, kipi-plugins, lcms2,
-  libkdcraw, libkipi, phonon, qtimageformats, qtsvg, qtx11extras
+  extra-cmake-modules, kdoctools,
+  exiv2, lcms2,
+  baloo, kactivities, kdelibs4support, kio, kipi-plugins, libkdcraw, libkipi,
+  phonon, qtimageformats, qtsvg, qtx11extras
 }:
 
 mkDerivation {
@@ -11,10 +12,11 @@ mkDerivation {
     license = with lib.licenses; [ gpl2 fdl12 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
-  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [ exiv2 lcms2 ];
   propagatedBuildInputs = [
-    baloo kactivities kdelibs4support kio exiv2 lcms2 libkdcraw
-    libkipi phonon qtimageformats qtsvg qtx11extras
+    baloo kactivities kdelibs4support kio libkdcraw libkipi phonon
+    qtimageformats qtsvg qtx11extras
   ];
   propagatedUserEnvPkgs = [ kipi-plugins ];
 }
diff --git a/pkgs/applications/kde/k3b.nix b/pkgs/applications/kde/k3b.nix
index 6fd6fbee9f5..e1f1132a08f 100644
--- a/pkgs/applications/kde/k3b.nix
+++ b/pkgs/applications/kde/k3b.nix
@@ -1,6 +1,7 @@
-{ mkDerivation, lib, wrapGAppsHook, extra-cmake-modules
+{ mkDerivation, lib
+, extra-cmake-modules, kdoctools, makeWrapper
 , qtwebkit
-, libkcddb, kcmutils, kdoctools, kfilemetadata, knewstuff, knotifyconfig, solid, kxmlgui
+, libkcddb, kcmutils, kfilemetadata, knewstuff, knotifyconfig, solid, kxmlgui
 , flac, lame, libmad, libmpcdec, libvorbis
 , libsamplerate, libsndfile, taglib
 , cdparanoia, cdrdao, cdrtools, dvdplusrwtools, libburn, libdvdcss, libdvdread, vcdimager
@@ -14,7 +15,7 @@ mkDerivation {
     maintainers = with maintainers; [ sander phreedom ];
     platforms = platforms.linux;
   };
-  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ];
   propagatedBuildInputs = [
     # qt
     qtwebkit
@@ -29,12 +30,12 @@ mkDerivation {
     # others
     ffmpeg libmusicbrainz2
   ];
-  preFixup =
+  postFixup =
     let k3bPath = lib.makeBinPath [
           cdrdao cdrtools dvdplusrwtools libburn normalize sox transcode
           vcdimager
         ];
     in ''
-      gappsWrapperArgs+=(--prefix PATH : "${k3bPath}")
+      wrapProgram "$out/bin/k3b" --prefix PATH : "${k3bPath}"
     '';
 }
diff --git a/pkgs/applications/kde/kate.nix b/pkgs/applications/kde/kate.nix
index 357abf96505..e6b4f6b6bdd 100644
--- a/pkgs/applications/kde/kate.nix
+++ b/pkgs/applications/kde/kate.nix
@@ -1,6 +1,6 @@
 {
   mkDerivation, lib,
-  extra-cmake-modules, kdoctools, wrapGAppsHook,
+  extra-cmake-modules, kdoctools,
   kactivities, kconfig, kcrash, kdbusaddons, kguiaddons, kiconthemes, ki18n,
   kinit, kio, kitemmodels, kjobwidgets, knewstuff, knotifications, konsole,
   kparts, ktexteditor, kwindowsystem, kwallet, kxmlgui, libgit2,
@@ -13,12 +13,13 @@ mkDerivation {
     license = with lib.licenses; [ gpl3 lgpl3 lgpl2 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
-  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [ libgit2 ];
   propagatedBuildInputs = [
     kactivities ki18n kio ktexteditor kwindowsystem plasma-framework
     qtscript kconfig kcrash kguiaddons kiconthemes kinit kjobwidgets kparts
     kxmlgui kdbusaddons kwallet kitemmodels knotifications threadweaver
-    knewstuff libgit2
+    knewstuff
   ];
   propagatedUserEnvPkgs = [ konsole ];
 }
diff --git a/pkgs/applications/kde/kcachegrind.nix b/pkgs/applications/kde/kcachegrind.nix
index c45edc87f89..a8833cfbf59 100644
--- a/pkgs/applications/kde/kcachegrind.nix
+++ b/pkgs/applications/kde/kcachegrind.nix
@@ -1,6 +1,6 @@
 {
   mkDerivation, lib,
-  extra-cmake-modules, kdoctools, wrapGAppsHook,
+  extra-cmake-modules, kdoctools,
   kio, ki18n,
   perl, python, php
 }:
@@ -11,10 +11,7 @@ mkDerivation {
     license = with lib.licenses; [ gpl2 ];
     maintainers = with lib.maintainers; [ orivej ];
   };
-  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [ kio ];
   buildInputs = [ perl python php ki18n ];
-  preFixup = ''
-    gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ perl php python]}")
-  '';
 }
diff --git a/pkgs/applications/kde/kcalc.nix b/pkgs/applications/kde/kcalc.nix
index 2a3d7e17a55..856da42c835 100644
--- a/pkgs/applications/kde/kcalc.nix
+++ b/pkgs/applications/kde/kcalc.nix
@@ -1,6 +1,6 @@
 {
   mkDerivation, lib,
-  extra-cmake-modules, kdoctools, wrapGAppsHook,
+  extra-cmake-modules, kdoctools,
   kconfig, kconfigwidgets, kguiaddons, kinit, knotifications, gmp
 }:
 
@@ -10,7 +10,7 @@ mkDerivation {
     license = with lib.licenses; [ gpl2 ];
     maintainers = [ lib.maintainers.fridh ];
   };
-  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [ gmp ];
   propagatedBuildInputs = [
     kconfig kconfigwidgets kguiaddons kinit knotifications
diff --git a/pkgs/applications/kde/kcolorchooser.nix b/pkgs/applications/kde/kcolorchooser.nix
index 5f33611f29a..186505a050c 100644
--- a/pkgs/applications/kde/kcolorchooser.nix
+++ b/pkgs/applications/kde/kcolorchooser.nix
@@ -1,6 +1,6 @@
 {
   mkDerivation, lib,
-  extra-cmake-modules, wrapGAppsHook,
+  extra-cmake-modules,
   ki18n, kwidgetsaddons, kxmlgui
 }:
 
@@ -10,7 +10,7 @@ mkDerivation {
     license = with lib.licenses; [ mit ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
-  nativeBuildInputs = [ extra-cmake-modules wrapGAppsHook ];
+  nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ ki18n ];
   propagatedBuildInputs = [ kwidgetsaddons kxmlgui ];
 }
diff --git a/pkgs/applications/kde/kcontacts.nix b/pkgs/applications/kde/kcontacts.nix
index a56ca684545..e7876d0d43e 100644
--- a/pkgs/applications/kde/kcontacts.nix
+++ b/pkgs/applications/kde/kcontacts.nix
@@ -1,6 +1,7 @@
 {
   mkDerivation, lib,
-  extra-cmake-modules, ki18n,
+  extra-cmake-modules,
+  ki18n,
   kcoreaddons, kconfig, kcodecs
 }:
 
diff --git a/pkgs/applications/kde/kdenlive.nix b/pkgs/applications/kde/kdenlive.nix
index c9929026aa6..854e346e290 100644
--- a/pkgs/applications/kde/kdenlive.nix
+++ b/pkgs/applications/kde/kdenlive.nix
@@ -2,7 +2,6 @@
 , lib
 , extra-cmake-modules
 , kdoctools
-, wrapGAppsHook
 , qtscript
 , kactivities
 , kconfig
@@ -39,16 +38,16 @@ mkDerivation {
   nativeBuildInputs = [
     extra-cmake-modules
     kdoctools
-    wrapGAppsHook
   ];
   buildInputs = [
-    qtscript
     kconfig
     kcrash
+    kdbusaddons
+    kfilemetadata
     kguiaddons
+    ki18n
     kiconthemes
     kinit
-    kdbusaddons
     knotifications
     knewstuff
     karchive
@@ -56,16 +55,18 @@ mkDerivation {
     kplotting
     ktextwidgets
     mlt
+    phonon-backend-gstreamer
+    qtquickcontrols
+    qtscript
     shared_mime_info
     libv4l
     ffmpeg
   ];
-  propagatedBuildInputs = [
-    kactivities kconfig kcrash kguiaddons kiconthemes kinit kio kio-extras
-    kdbusaddons kfilemetadata knotifications knewstuff karchive knotifyconfig
-    kplotting ktextwidgets kwindowsystem plasma-framework
-    phonon-backend-gstreamer qtquickcontrols shared_mime_info
-  ];
+  postPatch =
+    # Module Qt5::Concurrent must be included in `find_package` before it is used.
+    ''
+      sed -i CMakeLists.txt -e '/find_package(Qt5 REQUIRED/ s|)| Concurrent)|'
+    '';
   meta = {
     license = with lib.licenses; [ gpl2Plus ];
   };
diff --git a/pkgs/applications/kde/kdf.nix b/pkgs/applications/kde/kdf.nix
index 5a969aa15cf..333fea3df53 100644
--- a/pkgs/applications/kde/kdf.nix
+++ b/pkgs/applications/kde/kdf.nix
@@ -1,6 +1,6 @@
 {
   mkDerivation, lib,
-  extra-cmake-modules, kdoctools, wrapGAppsHook,
+  extra-cmake-modules, kdoctools,
   kcmutils
 }:
 
@@ -10,6 +10,6 @@ mkDerivation {
     license = with lib.licenses; [ gpl2 ];
     maintainers = [ lib.maintainers.peterhoeg ];
   };
-  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [ kcmutils ];
 }
diff --git a/pkgs/applications/kde/kgpg.nix b/pkgs/applications/kde/kgpg.nix
index 1a30b0685f8..ca495a1ae26 100644
--- a/pkgs/applications/kde/kgpg.nix
+++ b/pkgs/applications/kde/kgpg.nix
@@ -1,21 +1,22 @@
 {
   mkDerivation, lib,
-  extra-cmake-modules, kdoctools, ki18n, wrapGAppsHook,
-  akonadi-contacts, gnupg1, gpgme, karchive, kcodecs, kcontacts, kcoreaddons, kcrash,
-  kdbusaddons, kiconthemes, kjobwidgets, kio, knotifications, kservice,
+  extra-cmake-modules, kdoctools, ki18n, makeWrapper,
+  akonadi-contacts, gnupg1, gpgme, karchive, kcodecs, kcontacts, kcoreaddons,
+  kcrash, kdbusaddons, kiconthemes, kjobwidgets, kio, knotifications, kservice,
   ktextwidgets, kxmlgui, kwidgetsaddons, kwindowsystem
 }:
 
 mkDerivation {
   name = "kgpg";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ki18n wrapGAppsHook ];
-  buildInputs = [
-    akonadi-contacts gnupg1 gpgme karchive kcodecs kcontacts kcoreaddons kcrash kdbusaddons
+  nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ];
+  buildInputs = [ gnupg1 gpgme ki18n ];
+  propagatedBuildInputs = [
+    akonadi-contacts karchive kcodecs kcontacts kcoreaddons kcrash kdbusaddons
     kiconthemes kjobwidgets kio knotifications kservice ktextwidgets kxmlgui
     kwidgetsaddons kwindowsystem
   ];
-  preFixup = ''
-    gappsWrapperArgs+=(--suffix PATH : ${lib.makeBinPath [ gnupg1 ]})
+  postFixup = ''
+    wrapProgram "$out/bin/kgpg" --prefix PATH : "${lib.makeBinPath [ gnupg1 ]}"
   '';
   meta = {
     license = [ lib.licenses.gpl2 ];
diff --git a/pkgs/applications/kde/khelpcenter.nix b/pkgs/applications/kde/khelpcenter.nix
index 9862d75fdf4..db68cec976e 100644
--- a/pkgs/applications/kde/khelpcenter.nix
+++ b/pkgs/applications/kde/khelpcenter.nix
@@ -1,15 +1,16 @@
 {
   mkDerivation,
-  extra-cmake-modules, kdoctools, wrapGAppsHook,
+  extra-cmake-modules, kdoctools,
   grantlee, kconfig, kcoreaddons, kdbusaddons, ki18n, kinit, kcmutils,
   kdelibs4support, khtml, kservice, xapian
 }:
 
 mkDerivation {
   name = "khelpcenter";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
-  buildInputs = [
-    grantlee kdelibs4support khtml ki18n kconfig kcoreaddons kdbusaddons
-    kinit kcmutils kservice xapian
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [ ki18n xapian ];
+  propagatedBuildInputs = [
+    grantlee kdelibs4support khtml kconfig kcoreaddons kdbusaddons
+    kinit kcmutils kservice
   ];
 }
diff --git a/pkgs/applications/kde/kig.nix b/pkgs/applications/kde/kig.nix
index 6fdad9766b2..f2a1d275f6e 100644
--- a/pkgs/applications/kde/kig.nix
+++ b/pkgs/applications/kde/kig.nix
@@ -1,6 +1,6 @@
 {
   mkDerivation, lib,
-  extra-cmake-modules, kdoctools, wrapGAppsHook,
+  extra-cmake-modules, kdoctools,
   kparts, qtsvg, qtxmlpatterns, ktexteditor, boost
 }:
 
@@ -10,9 +10,10 @@ mkDerivation {
     license = with lib.licenses; [ gpl2 ];
     maintainers = with lib.maintainers; [ raskin ];
   };
-  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
-  buildInputs = [
-    kparts qtsvg qtxmlpatterns ktexteditor boost
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [ boost ];
+  propagatedBuildInputs = [
+    kparts qtsvg qtxmlpatterns ktexteditor
   ];
 }
 
diff --git a/pkgs/applications/kde/kmix.nix b/pkgs/applications/kde/kmix.nix
index cc5e67a1ddc..058fd8178c4 100644
--- a/pkgs/applications/kde/kmix.nix
+++ b/pkgs/applications/kde/kmix.nix
@@ -1,6 +1,6 @@
 {
   mkDerivation, lib,
-  extra-cmake-modules, kdoctools, wrapGAppsHook,
+  extra-cmake-modules, kdoctools,
   kglobalaccel, kxmlgui, kcoreaddons, kdelibs4support,
   plasma-framework, libpulseaudio, alsaLib, libcanberra_kde
 }:
@@ -11,7 +11,7 @@ mkDerivation {
     license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
     maintainers = [ lib.maintainers.rongcuid ];
   };
-  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [ libpulseaudio alsaLib libcanberra_kde ];
   propagatedBuildInputs = [
     kglobalaccel kxmlgui kcoreaddons kdelibs4support
diff --git a/pkgs/applications/kde/kolourpaint.nix b/pkgs/applications/kde/kolourpaint.nix
index a9e6904156a..db4cb75cc35 100644
--- a/pkgs/applications/kde/kolourpaint.nix
+++ b/pkgs/applications/kde/kolourpaint.nix
@@ -2,14 +2,13 @@
 , mkDerivation
 , extra-cmake-modules
 , kdoctools
-, wrapGAppsHook
 , kdelibs4support
 , libkexiv2
 }:
 
 mkDerivation {
   name = "kolourpaint";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [ kdelibs4support libkexiv2 ];
   meta = {
     maintainers = [ lib.maintainers.fridh ];
diff --git a/pkgs/applications/kde/kompare.nix b/pkgs/applications/kde/kompare.nix
index 1a0c2211c80..cf2fa2e6a10 100644
--- a/pkgs/applications/kde/kompare.nix
+++ b/pkgs/applications/kde/kompare.nix
@@ -1,13 +1,13 @@
 {
   mkDerivation, lib,
-  extra-cmake-modules, kdoctools, wrapGAppsHook,
+  extra-cmake-modules, kdoctools,
   kparts, ktexteditor, kwidgetsaddons, libkomparediff2
 }:
 
 mkDerivation {
   name = "kompare";
   meta = { license = with lib.licenses; [ gpl2 ]; };
-  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [
     kparts ktexteditor kwidgetsaddons libkomparediff2
   ];
diff --git a/pkgs/applications/kde/konsole.nix b/pkgs/applications/kde/konsole.nix
index 4a4a261c433..bd026c6f039 100644
--- a/pkgs/applications/kde/konsole.nix
+++ b/pkgs/applications/kde/konsole.nix
@@ -1,6 +1,6 @@
 {
   mkDerivation, lib,
-  extra-cmake-modules, kdoctools, wrapGAppsHook,
+  extra-cmake-modules, kdoctools,
   kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kguiaddons,
   ki18n, kiconthemes, kinit, kdelibs4support, kio, knotifications,
   knotifyconfig, kparts, kpty, kservice, ktextwidgets, kwidgetsaddons,
@@ -13,11 +13,11 @@ mkDerivation {
     license = with lib.licenses; [ gpl2 lgpl21 fdl12 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
-  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [ ki18n ];
   propagatedBuildInputs = [
-    kdelibs4support ki18n kwindowsystem qtscript kbookmarks kcompletion
-    kconfig kconfigwidgets kcoreaddons kguiaddons kiconthemes kinit kio
-    knotifications knotifyconfig kparts kpty kservice ktextwidgets
-    kwidgetsaddons kxmlgui
+    kbookmarks kcompletion kconfig kconfigwidgets kcoreaddons kdelibs4support
+    kguiaddons kiconthemes kinit kio knotifications knotifyconfig kparts kpty
+    kservice ktextwidgets kwidgetsaddons kwindowsystem kxmlgui qtscript
   ];
 }
diff --git a/pkgs/applications/kde/krfb.nix b/pkgs/applications/kde/krfb.nix
index a5a34b68460..0f4aecb83d4 100644
--- a/pkgs/applications/kde/krfb.nix
+++ b/pkgs/applications/kde/krfb.nix
@@ -1,6 +1,6 @@
 {
   mkDerivation, lib,
-  extra-cmake-modules, kdoctools, wrapGAppsHook,
+  extra-cmake-modules, kdoctools,
   kdelibs4support, kdnssd, libvncserver, libXtst
 }:
 
@@ -10,6 +10,7 @@ mkDerivation {
     license = with lib.licenses; [ gpl2 fdl12 ];
     maintainers = with lib.maintainers; [ jerith666 ];
   };
-  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
-  propagatedBuildInputs = [ kdelibs4support kdnssd libvncserver libXtst ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [ libvncserver libXtst ];
+  propagatedBuildInputs = [ kdelibs4support kdnssd ];
 }
diff --git a/pkgs/applications/kde/kwalletmanager.nix b/pkgs/applications/kde/kwalletmanager.nix
index 9194b45c401..75420b6600f 100644
--- a/pkgs/applications/kde/kwalletmanager.nix
+++ b/pkgs/applications/kde/kwalletmanager.nix
@@ -2,7 +2,6 @@
 , mkDerivation
 , extra-cmake-modules
 , kdoctools
-, wrapGAppsHook
 , kauth
 , kcmutils
 , kconfigwidgets
@@ -18,7 +17,7 @@ mkDerivation {
     license = with lib.licenses; [ gpl2 ];
     maintainers = with lib.maintainers; [ fridh ];
   };
-  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [
     kauth kcmutils kconfigwidgets kcoreaddons kdbusaddons kdelibs4support
     kxmlgui
diff --git a/pkgs/applications/kde/marble.nix b/pkgs/applications/kde/marble.nix
index 169b801b30d..1217c29032b 100644
--- a/pkgs/applications/kde/marble.nix
+++ b/pkgs/applications/kde/marble.nix
@@ -1,5 +1,5 @@
 { mkDerivation, lib
-, extra-cmake-modules, kdoctools, wrapGAppsHook
+, extra-cmake-modules, kdoctools
 , qtscript, qtsvg, qtquickcontrols, qtwebkit
 , krunner, shared_mime_info, kparts, knewstuff
 , gpsd, perl
@@ -8,7 +8,7 @@
 mkDerivation {
   name = "marble";
   meta.license = with lib.licenses; [ lgpl21 gpl3 ];
-  nativeBuildInputs = [ extra-cmake-modules kdoctools perl wrapGAppsHook ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools perl ];
   propagatedBuildInputs = [
     qtscript qtsvg qtquickcontrols qtwebkit shared_mime_info krunner kparts
     knewstuff gpsd
diff --git a/pkgs/applications/kde/okteta.nix b/pkgs/applications/kde/okteta.nix
index 350630664d9..deeffa3207b 100644
--- a/pkgs/applications/kde/okteta.nix
+++ b/pkgs/applications/kde/okteta.nix
@@ -1,6 +1,6 @@
 {
   mkDerivation, lib,
-  extra-cmake-modules, kdoctools, wrapGAppsHook,
+  extra-cmake-modules, kdoctools,
   kconfig, kinit,
   kcmutils, kconfigwidgets, knewstuff, kparts, qca-qt5
 }:
@@ -11,9 +11,8 @@ mkDerivation {
     license = with lib.licenses; [ gpl2 ];
     maintainers = with lib.maintainers; [ peterhoeg ];
   };
-  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [
-    kconfig kinit
-    kcmutils kconfigwidgets knewstuff kparts qca-qt5
+    kconfig kinit kcmutils kconfigwidgets knewstuff kparts qca-qt5
   ];
 }
diff --git a/pkgs/applications/kde/okular.nix b/pkgs/applications/kde/okular.nix
index 12983519b26..8cfd946b810 100644
--- a/pkgs/applications/kde/okular.nix
+++ b/pkgs/applications/kde/okular.nix
@@ -1,6 +1,6 @@
 {
   mkDerivation, lib,
-  extra-cmake-modules, kdoctools, wrapGAppsHook,
+  extra-cmake-modules, kdoctools,
   djvulibre, ebook_tools, kactivities, karchive, kbookmarks, kcompletion,
   kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdegraphics-mobipocket,
   kiconthemes, kjs, khtml, kio, kparts, kpty, kwallet, kwindowsystem, libkexiv2,
@@ -9,12 +9,13 @@
 
 mkDerivation {
   name = "okular";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [ djvulibre ebook_tools ];
   propagatedBuildInputs = [
-    djvulibre ebook_tools kactivities karchive kbookmarks kcompletion kconfig
-    kconfigwidgets kcoreaddons kdbusaddons kdegraphics-mobipocket kiconthemes
-    kjs khtml kio kparts kpty kwallet kwindowsystem libkexiv2 libspectre poppler
-    qca-qt5 qtdeclarative qtsvg threadweaver
+    kactivities karchive kbookmarks kcompletion kconfig kconfigwidgets
+    kcoreaddons kdbusaddons kdegraphics-mobipocket kiconthemes kjs khtml kio
+    kparts kpty kwallet kwindowsystem libkexiv2 libspectre poppler qca-qt5
+    qtdeclarative qtsvg threadweaver
   ];
   meta = {
     platforms = lib.platforms.linux;
diff --git a/pkgs/applications/kde/print-manager.nix b/pkgs/applications/kde/print-manager.nix
index 18a5da2ccca..085b53de0f3 100644
--- a/pkgs/applications/kde/print-manager.nix
+++ b/pkgs/applications/kde/print-manager.nix
@@ -1,6 +1,8 @@
 {
-  mkDerivation, lib, extra-cmake-modules, wrapGAppsHook,
-  cups, kconfig, kconfigwidgets, kdbusaddons, kiconthemes, ki18n, kcmutils, kio,
+  mkDerivation, lib,
+  extra-cmake-modules,
+  cups, ki18n,
+  kconfig, kconfigwidgets, kdbusaddons, kiconthemes, kcmutils, kio,
   knotifications, kwidgetsaddons, kwindowsystem, kitemviews, plasma-framework,
   qtdeclarative
 }:
@@ -11,10 +13,10 @@ mkDerivation {
     license = [ lib.licenses.gpl2 ];
     maintainers = [ lib.maintainers.ttuegel ];
   };
-  nativeBuildInputs = [ extra-cmake-modules wrapGAppsHook ];
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ cups ki18n ];
   propagatedBuildInputs = [
-    cups kconfig kconfigwidgets kdbusaddons kiconthemes kcmutils knotifications
-    kwidgetsaddons kitemviews ki18n kio kwindowsystem plasma-framework
-    qtdeclarative
+    kconfig kconfigwidgets kdbusaddons kiconthemes kcmutils knotifications
+    kwidgetsaddons kitemviews kio kwindowsystem plasma-framework qtdeclarative
   ];
 }
diff --git a/pkgs/applications/kde/spectacle.nix b/pkgs/applications/kde/spectacle.nix
index 10d98d99b0b..7fa18289ae1 100644
--- a/pkgs/applications/kde/spectacle.nix
+++ b/pkgs/applications/kde/spectacle.nix
@@ -1,18 +1,19 @@
 {
   mkDerivation, lib,
-  extra-cmake-modules, kdoctools, wrapGAppsHook,
-  kconfig, kcoreaddons, kdbusaddons, kdeclarative, ki18n, kio, kipi-plugins,
+  extra-cmake-modules, kdoctools,
+  ki18n, xcb-util-cursor,
+  kconfig, kcoreaddons, kdbusaddons, kdeclarative, kio, kipi-plugins,
   knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi,
-  xcb-util-cursor
 }:
 
 mkDerivation {
   name = "spectacle";
   meta = with lib; { maintainers = with maintainers; [ ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules kdoctools wrapGAppsHook ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [ ki18n xcb-util-cursor ];
   propagatedBuildInputs = [
-    kconfig kcoreaddons kdbusaddons kdeclarative ki18n kio knotifications
-    kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi xcb-util-cursor
+    kconfig kcoreaddons kdbusaddons kdeclarative kio knotifications
+    kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi
   ];
   propagatedUserEnvPkgs = [ kipi-plugins ];
 }
diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix
index f3c011e3333..854408e6e3e 100644
--- a/pkgs/applications/misc/albert/default.nix
+++ b/pkgs/applications/misc/albert/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, qtbase, qtsvg, qtx11extras, makeQtWrapper, muparser, cmake }:
+{ mkDerivation, lib, fetchFromGitHub, qtbase, qtsvg, qtx11extras, muparser, cmake }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name    = "albert-${version}";
   version = "0.11.3";
 
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0ddz6h1334b9kqy1lfi7qa21znm3l0b9h0d4s62llxdasv103jh5";
   };
 
-  nativeBuildInputs = [ cmake makeQtWrapper ];
+  nativeBuildInputs = [ cmake ];
 
   buildInputs = [ qtbase qtsvg qtx11extras muparser ];
 
@@ -31,11 +31,7 @@ stdenv.mkDerivation rec {
     rm "$out/lib"
   '';
 
-  fixupPhase = ''
-    wrapQtProgram $out/bin/albert
-  '';
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage    = https://albertlauncher.github.io/;
     description = "Desktop agnostic launcher";
     license     = licenses.gpl3Plus;
diff --git a/pkgs/applications/misc/cool-retro-term/default.nix b/pkgs/applications/misc/cool-retro-term/default.nix
index ccdedb23cb0..48e08be5474 100644
--- a/pkgs/applications/misc/cool-retro-term/default.nix
+++ b/pkgs/applications/misc/cool-retro-term/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, makeQtWrapper, qtbase, qtquick1, qmltermwidget,
+{ stdenv, fetchgit, qtbase, qtquick1, qmltermwidget,
 qtquickcontrols, qtgraphicaleffects, qmake }:
 
 stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   '';
 
   buildInputs = [ qtbase qtquick1 qmltermwidget qtquickcontrols qtgraphicaleffects ];
-  nativeBuildInputs = [ makeQtWrapper qmake ];
+  nativeBuildInputs = [ qmake ];
 
   installFlags = [ "INSTALL_ROOT=$(out)" ];
 
@@ -25,8 +25,6 @@ stdenv.mkDerivation rec {
     mv $out/usr/share $out/share
     mv $out/usr/bin $out/bin
     rmdir $out/usr
-
-    wrapQtProgram $out/bin/cool-retro-term
   '';
 
   enableParallelBuilding = true;
diff --git a/pkgs/applications/misc/cura/default.nix b/pkgs/applications/misc/cura/default.nix
index ff18796e39d..e33edfb0a44 100644
--- a/pkgs/applications/misc/cura/default.nix
+++ b/pkgs/applications/misc/cura/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, lib, fetchFromGitHub, cmake, python3, qtbase, makeQtWrapper, curaengine }:
+{ mkDerivation, lib, fetchFromGitHub, cmake, python3, qtbase, curaengine }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name = "cura-${version}";
   version = "2.4.0";
 
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ qtbase ];
   propagatedBuildInputs = with python3.pkgs; [ uranium zeroconf pyserial ];
-  nativeBuildInputs = [ cmake python3.pkgs.wrapPython makeQtWrapper ];
+  nativeBuildInputs = [ cmake python3.pkgs.wrapPython ];
 
   cmakeFlags = [ "-DCMAKE_MODULE_PATH=${python3.pkgs.uranium}/share/cmake-${cmake.majorVersion}/Modules" ];
 
@@ -24,11 +24,9 @@ stdenv.mkDerivation rec {
 
   postFixup = ''
     wrapPythonPrograms
-    mv $out/bin/cura $out/bin/.cura-noqtpath
-    makeQtWrapper $out/bin/.cura-noqtpath $out/bin/cura
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "3D printer / slicing GUI built on top of the Uranium framework";
     homepage = "https://github.com/Ultimaker/Cura";
     license = licenses.agpl3;
diff --git a/pkgs/applications/misc/golden-cheetah/default.nix b/pkgs/applications/misc/golden-cheetah/default.nix
index 3472af27fea..358d9dff44a 100644
--- a/pkgs/applications/misc/golden-cheetah/default.nix
+++ b/pkgs/applications/misc/golden-cheetah/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl
 , qtbase, qtsvg, qtserialport, qtwebkit, qtmultimedia, qttools, qtconnectivity
-, yacc, flex, zlib, config, qmake, makeQtWrapper
+, yacc, flex, zlib, config, qmake, makeWrapper
 }:
 stdenv.mkDerivation rec {
   name = "golden-cheetah-${version}";
@@ -10,11 +10,11 @@ stdenv.mkDerivation rec {
     url = "https://github.com/GoldenCheetah/GoldenCheetah/archive/V${version}.tar.gz";
     sha256 = "0fiz2pj155cd357kph50lc6rjyzwp045glfv4y68qls9j7m9ayaf";
   };
-  qtInputs = [
-    qtbase qtsvg qtserialport qtwebkit qtmultimedia qttools yacc flex zlib
+  buildInputs = [
+    qtbase qtsvg qtserialport qtwebkit qtmultimedia qttools zlib
     qtconnectivity
   ];
-  nativeBuildInputs = [ makeQtWrapper qmake ] ++ qtInputs;
+  nativeBuildInputs = [ flex makeWrapper qmake yacc ];
   preConfigure = ''
     cp src/gcconfig.pri.in src/gcconfig.pri
     cp qwt/qwtconfig.pri.in qwt/qwtconfig.pri
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
     mkdir -p $out/bin
     cp src/GoldenCheetah $out/bin
-    wrapQtProgram $out/bin/GoldenCheetah --set LD_LIBRARY_PATH "${zlib.out}/lib"
+    wrapProgram $out/bin/GoldenCheetah --set LD_LIBRARY_PATH "${zlib.out}/lib"
 
     runHook postInstall
   '';
diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix
index 6d3193089c7..16147715705 100644
--- a/pkgs/applications/misc/gpxsee/default.nix
+++ b/pkgs/applications/misc/gpxsee/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qmake, qtbase, qttools, makeQtWrapper }:
+{ stdenv, fetchFromGitHub, qmake, qtbase, qttools }:
 
 stdenv.mkDerivation rec {
   name = "gpxsee-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "17s1v6b1j7pi0yj554bd0cg14bl854gssp5gj2pl51rxji6zr0wp";
   };
 
-  nativeBuildInputs = [ qmake qttools makeQtWrapper ];
+  nativeBuildInputs = [ qmake qttools ];
 
   preConfigure = ''
     substituteInPlace src/config.h --replace /usr/share/gpxsee $out/share/gpxsee
@@ -20,7 +20,6 @@ stdenv.mkDerivation rec {
 
   preFixup = ''
     install -Dm755 GPXSee $out/bin/GPXSee
-    wrapQtProgram $out/bin/GPXSee
 
     mkdir -p $out/share/gpxsee
     cp pkg/maps.txt $out/share/gpxsee
diff --git a/pkgs/applications/misc/kdeconnect/default.nix b/pkgs/applications/misc/kdeconnect/default.nix
index 22c9cfc7e98..743a20b6bfc 100644
--- a/pkgs/applications/misc/kdeconnect/default.nix
+++ b/pkgs/applications/misc/kdeconnect/default.nix
@@ -2,7 +2,6 @@
 , lib
 , fetchurl
 , extra-cmake-modules
-, makeQtWrapper
 , kcmutils
 , kconfigwidgets
 , kdbusaddons
@@ -35,14 +34,7 @@ stdenv.mkDerivation rec {
     libXtst
   ];
 
-  nativeBuildInputs = [
-    extra-cmake-modules
-    makeQtWrapper
-  ];
-
-  postInstall = ''
-    wrapQtProgram "$out/bin/kdeconnect-cli"
-  '';
+  nativeBuildInputs = [ extra-cmake-modules ];
 
   meta = {
     description = "KDE Connect provides several features to integrate your phone and your computer";
diff --git a/pkgs/applications/misc/openbrf/default.nix b/pkgs/applications/misc/openbrf/default.nix
index 039b50b133a..5016acfff12 100644
--- a/pkgs/applications/misc/openbrf/default.nix
+++ b/pkgs/applications/misc/openbrf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qtbase, vcg, glew, qmake, makeQtWrapper, mesa }:
+{ stdenv, fetchFromGitHub, qtbase, vcg, glew, qmake, mesa }:
 
 
 stdenv.mkDerivation {
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
   buildInputs = [ qtbase vcg glew ];
 
   enableParallelBuilding = true;
-  nativeBuildInputs = [ qmake makeQtWrapper ];
+  nativeBuildInputs = [ qmake ];
 
   qmakeFlags = [ "openBrf.pro" ];
 
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
       --set-rpath "${stdenv.lib.makeLibraryPath [ qtbase glew stdenv.cc.cc mesa ]}" \
       $out/share/openBrf/openBrf
 
-    makeQtWrapper "$out/share/openBrf/openBrf" "$out/bin/openBrf"
+    ln -s "$out/share/openBrf/openBrf" "$out/bin/openBrf"
   '';
 
   dontPatchELF = true;
diff --git a/pkgs/applications/misc/qsyncthingtray/default.nix b/pkgs/applications/misc/qsyncthingtray/default.nix
index d6aea74d997..671370252a7 100644
--- a/pkgs/applications/misc/qsyncthingtray/default.nix
+++ b/pkgs/applications/misc/qsyncthingtray/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, lib, fetchFromGitHub, procps ? null
+{ mkDerivation, stdenv, lib, fetchFromGitHub, procps ? null
 , qtbase, qtwebengine, qtwebkit
-, cmake, makeQtWrapper
+, cmake
 , syncthing, syncthing-inotify ? null
 , preferQWebView ? false }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   version = "0.5.7";
   name = "qsyncthingtray-${version}";
 
@@ -16,8 +16,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ qtbase qtwebengine ] ++ lib.optional preferQWebView qtwebkit;
-  nativeBuildInputs = [ cmake makeQtWrapper ];
-  enableParallelBuilding = true;
+  nativeBuildInputs = [ cmake ];
 
   cmakeFlags = lib.optional preferQWebView "-DQST_BUILD_WEBKIT=1";
 
@@ -41,12 +40,11 @@ stdenv.mkDerivation rec {
     mkdir -p $out/bin
     install -m755 QSyncthingTray $out/bin/${qst}
     ln -s $out/bin/${qst} $out/bin/QSyncthingTray
-    wrapQtProgram $out/bin/qsyncthingtray
 
     runHook postInstall
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = https://github.com/sieren/QSyncthingTray/;
     description = "A Traybar Application for Syncthing written in C++";
     longDescription = ''
diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix
index a12467c55d4..d300e411c94 100644
--- a/pkgs/applications/misc/qtpass/default.nix
+++ b/pkgs/applications/misc/qtpass/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, git, gnupg, makeQtWrapper, pass, qtbase, qtsvg, qttools, qmake }:
+{ stdenv, fetchFromGitHub, git, gnupg, pass, qtbase, qtsvg, qttools, qmake, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "qtpass-${version}";
@@ -13,10 +13,10 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ git gnupg pass qtbase qtsvg qttools ];
 
-  nativeBuildInputs = [ makeQtWrapper qmake ];
+  nativeBuildInputs = [ makeWrapper qmake ];
 
   preConfigure = ''
-    qmakeFlags="$qmakeFlags CONFIG+=release DESTDIR=$out"
+    qmakeFlags="$qmakeFlags DESTDIR=$out"
   '';
 
   installPhase = ''
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   '';
 
   postInstall = ''
-    wrapQtProgram $out/bin/qtpass \
+    wrapProgram $out/bin/qtpass \
       --suffix PATH : ${git}/bin \
       --suffix PATH : ${gnupg}/bin \
       --suffix PATH : ${pass}/bin
diff --git a/pkgs/applications/misc/redis-desktop-manager/default.nix b/pkgs/applications/misc/redis-desktop-manager/default.nix
index f9ca31eccfe..0ba850a3460 100644
--- a/pkgs/applications/misc/redis-desktop-manager/default.nix
+++ b/pkgs/applications/misc/redis-desktop-manager/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchgit, pkgconfig , libssh2
 , qtbase, qtdeclarative, qtgraphicaleffects, qtimageformats, qtquickcontrols
 , qtsvg, qttools, qtquick1
-, makeQtWrapper, qmake
+, qmake
 }:
 
 let
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     sha256 = "0a7xa39qp1q32zkypw32mm3wi8wbhxhvrm6l3xsa3k1jzih7hzxr";
   };
 
-  nativeBuildInputs = [ makeQtWrapper qmake ];
+  nativeBuildInputs = [ qmake ];
 
   buildInputs = [
     pkgconfig libssh2 qtbase qtdeclarative qtgraphicaleffects qtimageformats
@@ -68,7 +68,6 @@ EOF
     mkdir -p $out/bin
     instdir="$srcdir/bin/linux/release"
     cp $instdir/rdm $out/bin
-    wrapQtProgram $out/bin/rdm
   '';
 
   meta = with lib; {
diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix
index 09da875e236..80ecbdeba77 100644
--- a/pkgs/applications/misc/xca/default.nix
+++ b/pkgs/applications/misc/xca/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl, pkgconfig, which, makeQtWrapper,
-  libtool, openssl, qtbase, qttools }:
+{ mkDerivation, lib, fetchurl, pkgconfig, which
+, libtool, openssl, qtbase, qttools }:
 
-with stdenv.lib;
+with lib;
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name = "xca-${version}";
   version = "1.3.2";
 
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libtool openssl qtbase qttools ];
 
-  nativeBuildInputs = [ makeQtWrapper pkgconfig which ];
+  nativeBuildInputs = [ pkgconfig which ];
 
   configureFlags = [ "CXXFLAGS=-std=c++11" ];
 
@@ -26,12 +26,7 @@ stdenv.mkDerivation rec {
       --replace ${qtbase}/bin/uic ${qtbase.dev}/bin/uic
   '';
 
-  postInstall = ''
-    wrapQtProgram "$out/bin/xca"
-    wrapQtProgram "$out/bin/xca_db_stat"
-  '';
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Interface for managing asymetric keys like RSA or DSA";
     homepage = http://xca.sourceforge.net/;
     platforms = platforms.all;
diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index a8c49b9fd4a..614473d39ee 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, unzip, buildPythonApplication, makeQtWrapper, wrapGAppsHook
+{ stdenv, lib, fetchurl, unzip, buildPythonApplication, makeWrapper, wrapGAppsHook
 , qtbase, pyqt5, jinja2, pygments, pyyaml, pypeg2, cssutils, glib_networking
 , asciidoc, docbook_xml_dtd_45, docbook_xsl, libxml2, libxslt
 , gst-plugins-base, gst-plugins-good, gst-plugins-bad, gst-plugins-ugly, gst-libav
@@ -44,7 +44,7 @@ in buildPythonApplication rec {
   ];
 
   nativeBuildInputs = [
-    makeQtWrapper wrapGAppsHook asciidoc docbook_xml_dtd_45 docbook_xsl libxml2 libxslt
+    makeWrapper wrapGAppsHook asciidoc docbook_xml_dtd_45 docbook_xsl libxml2 libxslt
   ];
 
   propagatedBuildInputs = [
@@ -73,9 +73,8 @@ in buildPythonApplication rec {
     install -Dm755 -t "$out/share/qutebrowser/userscripts/" misc/userscripts/*
   '';
 
-  postFixup = ''
-    wrapQtProgram $out/bin/qutebrowser \
-      ${lib.optionalString withWebEngineDefault ''--add-flags "--backend webengine"''}
+  postFixup = lib.optionalString withWebEngineDefault ''
+    wrapProgram $out/bin/qutebrowser --add-flags "--backend webengine"
   '';
 
   meta = {
diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index 12ed28979d2..cda86d2e652 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, makeDesktopItem, patchelf, makeWrapper, makeQtWrapper
+{ mkDerivation, stdenv, lib, fetchurl, makeDesktopItem
+, makeWrapper, patchelf
 , dbus_libs, fontconfig, freetype, gcc, glib
 , libdrm, libffi, libICE, libSM
 , libX11, libXcomposite, libXext, libXmu, libXrender, libxcb
@@ -58,7 +59,7 @@ let
     startupNotify = "false";
   };
 
-in stdenv.mkDerivation {
+in mkDerivation {
   name = "dropbox-${version}";
   src = fetchurl {
     name = "dropbox-${version}.tar.gz";
@@ -68,7 +69,7 @@ in stdenv.mkDerivation {
 
   sourceRoot = ".dropbox-dist";
 
-  nativeBuildInputs = [ makeQtWrapper patchelf ];
+  nativeBuildInputs = [ makeWrapper patchelf ];
   dontStrip = true; # already done
 
   installPhase = ''
@@ -94,7 +95,7 @@ in stdenv.mkDerivation {
 
     mkdir -p "$out/bin"
     RPATH="${ldpath}:$out/${appdir}"
-    makeQtWrapper "$out/${appdir}/dropbox" "$out/bin/dropbox" \
+    makeWrapper "$out/${appdir}/dropbox" "$out/bin/dropbox" \
       --prefix LD_LIBRARY_PATH : "$RPATH"
 
     chmod 755 $out/${appdir}/dropbox
@@ -137,8 +138,8 @@ in stdenv.mkDerivation {
   meta = {
     homepage = "http://www.dropbox.com";
     description = "Online stored folders (daemon version)";
-    maintainers = with stdenv.lib.maintainers; [ ttuegel ];
+    maintainers = with lib.maintainers; [ ttuegel ];
     platforms = [ "i686-linux" "x86_64-linux" ];
-    license = stdenv.lib.licenses.unfree;
+    license = lib.licenses.unfree;
   };
 }
diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix
index d1773456df2..2c6cf473f1c 100644
--- a/pkgs/applications/networking/instant-messengers/qtox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, openal, opencv,
+{ mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig, openal, opencv,
   libtoxcore, libsodium, libXScrnSaver, glib, gdk_pixbuf, gtk2, cairo, xorg,
-  pango, atk, qrencode, ffmpeg, filter-audio, makeQtWrapper,
+  pango, atk, qrencode, ffmpeg, filter-audio,
   qtbase, qtsvg, qttools, qttranslations, sqlcipher,
   libvpx, libopus }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name = "qtox-${version}";
   version = "1.10.2";
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     libpthreadstubs libXdmcp
   ]);
 
-  nativeBuildInputs = [ cmake makeQtWrapper pkgconfig ];
+  nativeBuildInputs = [ cmake pkgconfig ];
 
   cmakeFlags = [
     "-DGIT_DESCRIBE=${version}"
@@ -35,14 +35,11 @@ stdenv.mkDerivation rec {
     runHook preInstall
 
     install -Dm755 qtox $out/bin/qtox
-    wrapQtProgram $out/bin/qtox
 
     runHook postInstall
   '';
 
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Qt Tox client";
     license = licenses.gpl3;
     maintainers = with maintainers; [ viric jgeerds akaWolf peterhoeg ];
diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix
index 781a4a18b9c..03fc0d85292 100644
--- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix
+++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchgit, qtbase, qtquickcontrols, cmake, makeQtWrapper }:
+{ mkDerivation, lib, fetchgit, qtbase, qtquickcontrols, cmake }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name = "quaternion-git-${version}";
   version = "2017-04-15";
 
@@ -18,25 +18,21 @@ stdenv.mkDerivation rec {
     fetchSubmodules = true;
   };
 
-  enableParallelBuilding = true;
-
   buildInputs = [ qtbase qtquickcontrols ];
-  nativeBuildInputs = [ cmake makeQtWrapper ];
+  nativeBuildInputs = [ cmake ];
 
   cmakeFlags = [
     "-Wno-dev"
   ];
 
   postInstall = ''
-    wrapQtProgram $out/bin/quaternion
-
     substituteInPlace $out/share/applications/quaternion.desktop \
       --replace 'Exec=quaternion' "Exec=$out/bin/quaternion"
 
     rm $out/share/icons/hicolor/icon-theme.cache
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = https://matrix.org/docs/projects/client/quaternion.html;
     description = "Cross-platform desktop IM client for the Matrix protocol";
     license = licenses.gpl3;
diff --git a/pkgs/applications/networking/instant-messengers/ricochet/default.nix b/pkgs/applications/networking/instant-messengers/ricochet/default.nix
index b7566e0be4b..b1dd7a4c90f 100644
--- a/pkgs/applications/networking/instant-messengers/ricochet/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ricochet/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, makeDesktopItem, unzip
-, qtbase, qttools, makeQtWrapper, qtmultimedia, qtquick1, qtquickcontrols
+, qtbase, qttools, qtmultimedia, qtquick1, qtquickcontrols
 , openssl, protobuf, qmake
 }:
 
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     openssl protobuf
   ];
 
-  nativeBuildInputs = [ pkgconfig makeQtWrapper qmake ];
+  nativeBuildInputs = [ pkgconfig qmake ];
 
   preConfigure = ''
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags openssl)"
@@ -38,7 +38,6 @@ stdenv.mkDerivation rec {
   installPhase = ''
     mkdir -p $out/bin
     cp ricochet $out/bin
-    wrapQtProgram $out/bin/ricochet
 
     mkdir -p $out/share/applications
     cp $desktopItem/share/applications"/"* $out/share/applications
diff --git a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix
index c61c62dc8ba..67d1f55f2fe 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix
@@ -3,7 +3,7 @@
 , qtimageformats, qtgraphicaleffects, qtwebkit
 , telegram-qml, libqtelegram-aseman-edition
 , gst_all_1
-, makeQtWrapper, qmake }:
+, makeWrapper, qmake }:
 
 stdenv.mkDerivation rec {
   name = "cutegram-${meta.version}";
@@ -22,10 +22,10 @@ stdenv.mkDerivation rec {
 
 
   enableParallelBuilding = true;
-  nativeBuildInputs = [ makeQtWrapper qmake ];
+  nativeBuildInputs = [ makeWrapper qmake ];
 
   fixupPhase = ''
-    wrapQtProgram $out/bin/cutegram \
+    wrapProgram $out/bin/cutegram \
       --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0"
   '';
 
diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
index d64b5be816a..0af0c0b1d1b 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, lib, fetchFromGitHub, fetchgit, pkgconfig, gyp, cmake
-, qtbase, qtimageformats, makeQtWrapper
+{ mkDerivation, lib, fetchFromGitHub, fetchgit, pkgconfig, gyp, cmake
+, qtbase, qtimageformats
 , breakpad, gtk3, libappindicator-gtk3, dee
 , ffmpeg, openalSoft, minizip
 }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name = "telegram-desktop-${version}";
   version = "1.0.27";
 
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     gtk3 libappindicator-gtk3 dee qtbase qtimageformats ffmpeg openalSoft minizip
   ];
 
-  nativeBuildInputs = [ pkgconfig gyp cmake makeQtWrapper ];
+  nativeBuildInputs = [ pkgconfig gyp cmake ];
 
   patches = [ "${tgaur}/aur-build-fixes.patch" ];
 
@@ -86,10 +86,9 @@ stdenv.mkDerivation rec {
     for icon_size in 16 32 48 64 128 256 512; do
       install -Dm644 "../../../Telegram/Resources/art/icon''${icon_size}.png" "$out/share/icons/hicolor/''${icon_size}x''${icon_size}/apps/telegram-desktop.png"
     done
-    wrapQtProgram $out/bin/telegram-desktop
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Telegram Desktop messaging app";
     license = licenses.gpl3;
     platforms = platforms.linux;
diff --git a/pkgs/applications/networking/instant-messengers/tensor/default.nix b/pkgs/applications/networking/instant-messengers/tensor/default.nix
index d602e887f26..0571946061b 100644
--- a/pkgs/applications/networking/instant-messengers/tensor/default.nix
+++ b/pkgs/applications/networking/instant-messengers/tensor/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, qtbase, qtquickcontrols, qmake, makeQtWrapper, makeDesktopItem }:
+{ stdenv, fetchgit, qtbase, qtquickcontrols, qmake, makeDesktopItem }:
 
 stdenv.mkDerivation rec {
   name = "tensor-git-${version}";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   buildInputs = [ qtbase qtquickcontrols ];
-  nativeBuildInputs = [ qmake makeQtWrapper ];
+  nativeBuildInputs = [ qmake ];
 
   desktopItem = makeDesktopItem {
     name        = "tensor";
@@ -36,8 +36,6 @@ stdenv.mkDerivation rec {
     install -Dm644 ${desktopItem}/share/applications/tensor.desktop \
                    $out/share/applications/tensor.desktop
 
-    wrapQtProgram $out/bin/tensor
-
     substituteInPlace $out/share/applications/tensor.desktop \
       --subst-var-by bin $out/bin/tensor
 
diff --git a/pkgs/applications/networking/irc/communi/default.nix b/pkgs/applications/networking/irc/communi/default.nix
index 7b4d52b73c2..9bfdd8408da 100644
--- a/pkgs/applications/networking/irc/communi/default.nix
+++ b/pkgs/applications/networking/irc/communi/default.nix
@@ -1,4 +1,4 @@
-{ fetchgit, libcommuni, makeQtWrapper, qtbase, qmake, stdenv }:
+{ fetchgit, libcommuni, qtbase, qmake, stdenv }:
 
 stdenv.mkDerivation rec {
   name = "communi-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     fetchSubmodules = true;
   };
 
-  nativeBuildInputs = [ makeQtWrapper qmake ];
+  nativeBuildInputs = [ qmake ];
 
   buildInputs = [ libcommuni qtbase ];
 
@@ -30,7 +30,6 @@ stdenv.mkDerivation rec {
   '';
 
   postInstall = ''
-    wrapQtProgram "$out/bin/communi"
     substituteInPlace "$out/share/applications/communi.desktop" \
       --replace "/usr/bin" "$out/bin"
   '';
diff --git a/pkgs/applications/networking/irc/konversation/default.nix b/pkgs/applications/networking/irc/konversation/default.nix
index 26e5911a85f..4cfde1f9b07 100644
--- a/pkgs/applications/networking/irc/konversation/default.nix
+++ b/pkgs/applications/networking/irc/konversation/default.nix
@@ -3,7 +3,6 @@
 , fetchurl
 , extra-cmake-modules
 , kdoctools
-, wrapGAppsHook
 , kbookmarks
 , karchive
 , kconfig
@@ -21,7 +20,6 @@
 , kio
 , kparts
 , kwallet
-, makeQtWrapper
 , solid
 , sonnet
 , phonon
@@ -65,7 +63,6 @@ in mkDerivation rec {
   nativeBuildInputs = [
     extra-cmake-modules
     kdoctools
-    wrapGAppsHook
   ];
 
   meta = {
diff --git a/pkgs/applications/networking/mailreaders/trojita/default.nix b/pkgs/applications/networking/mailreaders/trojita/default.nix
index fa6e4db0a0d..26cb9e40a26 100644
--- a/pkgs/applications/networking/mailreaders/trojita/default.nix
+++ b/pkgs/applications/networking/mailreaders/trojita/default.nix
@@ -1,13 +1,12 @@
-{ stdenv
+{ mkDerivation
 , lib
 , fetchgit
 , cmake
 , qtbase
 , qtwebkit
-, makeQtWrapper
 }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name = "trojita-${version}";
   version = "0.7";
 
@@ -18,25 +17,20 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    cmake
     qtbase
     qtwebkit
   ];
 
   nativeBuildInputs = [
-    makeQtWrapper
+    cmake
   ];
 
-  postInstall = ''
-    wrapQtProgram "$out/bin/trojita"
-  '';
 
-
-  meta = {
+  meta = with lib; {
     description = "A Qt IMAP e-mail client";
     homepage = http://trojita.flaska.net/;
-    license = with lib.licenses; [ gpl2 gpl3 ];
-    platforms = stdenv.lib.platforms.linux;
+    license = with licenses; [ gpl2 gpl3 ];
+    platforms = platforms.linux;
   };
 
 }
diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index f08759514c3..696681dce27 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -70,7 +70,7 @@ let
   client = source: generic {
     type = "mumble";
 
-    nativeBuildInputs = optionals (source.qtVersion == 5) [ qt5.qttools qt5.makeQtWrapper ];
+    nativeBuildInputs = optionals (source.qtVersion == 5) [ qt5.qttools ];
     buildInputs = [ libopus libsndfile speex ]
       ++ optional (source.qtVersion == 5) qt5.qtsvg
       ++ optional stdenv.isLinux alsaLib
@@ -91,10 +91,6 @@ let
       mkdir -p $out/share/icons{,/hicolor/scalable/apps}
       cp icons/mumble.svg $out/share/icons
       ln -s $out/share/icon/mumble.svg $out/share/icons/hicolor/scalable/apps
-
-      ${optionalString (source.qtVersion == 5) ''
-        wrapQtProgram $out/bin/mumble
-      ''}
     '';
   } source;
 
diff --git a/pkgs/applications/networking/newsreaders/quiterss/default.nix b/pkgs/applications/networking/newsreaders/quiterss/default.nix
index 21a55c4136c..4bf571a93d8 100644
--- a/pkgs/applications/networking/newsreaders/quiterss/default.nix
+++ b/pkgs/applications/networking/newsreaders/quiterss/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, qtbase, qmake, qttools, qtwebkit, makeQtWrapper, pkgconfig, sqlite }:
+{ stdenv, fetchFromGitHub, qtbase, qmake, qttools, qtwebkit, pkgconfig, sqlite }:
 
 stdenv.mkDerivation rec {
   name = "quiterss-${version}";
@@ -11,13 +11,9 @@ stdenv.mkDerivation rec {
     sha256 = "1y0n5ps1z4wgf9hkfjrw7dfyncrw22bf9mi3052vmf3s7xzz6vbb";
   };
 
-  nativeBuildInputs = [ makeQtWrapper pkgconfig qmake ];
+  nativeBuildInputs = [ pkgconfig qmake ];
   buildInputs = [ qtbase qttools qtwebkit sqlite.dev ];
 
-  postInstall = ''
-    wrapQtProgram "$out/bin/quiterss"
-  '';
-
   meta = with stdenv.lib; {
     description = "A Qt-based RSS/Atom news feed reader";
     longDescription = ''
diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix
index 95286f3ab65..7178a0930e7 100644
--- a/pkgs/applications/office/mendeley/default.nix
+++ b/pkgs/applications/office/mendeley/default.nix
@@ -1,4 +1,5 @@
 { fetchurl, stdenv, dpkg, which
+, makeWrapper
 , alsaLib
 , desktop_file_utils
 , dbus
@@ -92,7 +93,7 @@ stdenv.mkDerivation {
     sha256 = sha256;
   };
 
-  nativeBuildInputs = [ qt5.makeQtWrapper ];
+  nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ dpkg which ] ++ deps;
 
   unpackPhase = "true";
@@ -107,7 +108,7 @@ stdenv.mkDerivation {
              $out/bin/mendeleydesktop
     paxmark m $out/bin/mendeleydesktop
 
-    wrapQtProgram $out/bin/mendeleydesktop \
+    wrapProgram $out/bin/mendeleydesktop \
       --add-flags "--unix-distro-build" \
       ${stdenv.lib.optionalString autorunLinkHandler
       ''--run "$out/bin/install-mendeley-link-handler.sh $out/bin/mendeleydesktop"''}
diff --git a/pkgs/applications/office/mytetra/default.nix b/pkgs/applications/office/mytetra/default.nix
index be70cb89d6f..9f54f2df6bf 100644
--- a/pkgs/applications/office/mytetra/default.nix
+++ b/pkgs/applications/office/mytetra/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qmake, makeQtWrapper, qtsvg }:
+{ stdenv, fetchurl, qmake, qtsvg }:
 
 let
   version = "1.42.2";
@@ -9,7 +9,7 @@ in stdenv.mkDerivation rec {
     sha256 = "1ah44nf4ksxkh01a2zmgvvby4pwczhyq5vcp270rf6visp8v9804";
   };
 
-  nativeBuildInputs = [ makeQtWrapper qmake ];
+  nativeBuildInputs = [ qmake ];
   buildInputs = [ qtsvg ];
 
   hardeningDisable = [ "format" ];
@@ -23,8 +23,6 @@ in stdenv.mkDerivation rec {
       --replace ":/resource/pic/logo.svg" "$out/share/icons/hicolor/48x48/apps/mytetra.png"
   '';
 
-  postInstall = "wrapQtProgram $out/bin/mytetra";
-
   meta = with stdenv.lib; {
     description = "Smart manager for information collecting";
     homepage = http://webhamster.ru/site/page/index/articles/projectcode/138;
diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix
index acf60bd0375..38ec107bcf7 100644
--- a/pkgs/applications/office/skrooge/default.nix
+++ b/pkgs/applications/office/skrooge/default.nix
@@ -1,9 +1,10 @@
-{ stdenv, fetchurl, cmake, extra-cmake-modules, makeQtWrapper, qtwebkit, qtscript, grantlee,
+{ mkDerivation, lib, fetchurl,
+  cmake, extra-cmake-modules, qtwebkit, qtscript, grantlee,
   kxmlgui, kwallet, kparts, kdoctools, kjobwidgets, kdesignerplugin,
   kiconthemes, knewstuff, sqlcipher, qca-qt5, kdelibs4support, kactivities,
   knotifyconfig, krunner, libofx }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name = "skrooge-${version}";
   version = "2.7.0";
 
@@ -12,21 +13,14 @@ stdenv.mkDerivation rec {
     sha256 = "1xrh9nal122rzlv4m0x8qah6zpqb6891al3351piarpk2xgjgj4x";
   };
 
-  nativeBuildInputs = [ cmake extra-cmake-modules makeQtWrapper ];
+  nativeBuildInputs = [ cmake extra-cmake-modules ];
 
   buildInputs = [ qtwebkit qtscript grantlee kxmlgui kwallet kparts kdoctools
     kjobwidgets kdesignerplugin kiconthemes knewstuff sqlcipher qca-qt5
     kdelibs4support kactivities knotifyconfig krunner libofx
   ];
 
-  enableParallelBuilding = true;
-
-  postInstall = ''
-    wrapQtProgram "$out/bin/skrooge"
-    wrapQtProgram "$out/bin/skroogeconvert"
-  '';
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "A personal finances manager, powered by KDE";
     license = with licenses; [ gpl3 ];
     maintainers = with maintainers; [ joko ];
diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix
index 49c774f7039..da6aa38d746 100644
--- a/pkgs/applications/science/astronomy/stellarium/default.nix
+++ b/pkgs/applications/science/astronomy/stellarium/default.nix
@@ -1,9 +1,10 @@
-{ stdenv, fetchurl, cmake, freetype, libpng, mesa, gettext, openssl, perl, libiconv
-, qtscript, qtserialport, qttools, makeQtWrapper
+{ mkDerivation, lib, fetchurl
+, cmake, freetype, libpng, mesa, gettext, openssl, perl, libiconv
+, qtscript, qtserialport, qttools
 , qtmultimedia
 }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name = "stellarium-${version}";
   version = "0.15.0";
 
@@ -12,25 +13,19 @@ stdenv.mkDerivation rec {
     sha256 = "0il751lgnfkx35h1m8fzwwnrygpxjx2a80gng1i1rbybkykf7l3l";
   };
 
-  nativeBuildInputs = [ makeQtWrapper ];
+  nativeBuildInputs = [ cmake perl ];
 
   buildInputs = [
-    cmake freetype libpng mesa gettext openssl perl libiconv qtscript
-    qtserialport qttools qtmultimedia
+    freetype libpng mesa openssl libiconv qtscript qtserialport qttools
+    qtmultimedia
   ];
 
-  enableParallelBuilding = true;
-
-  postInstall = ''
-    wrapQtProgram "$out/bin/stellarium"
-  '';
-
-  meta = {
+  meta = with lib; {
     description = "Free open-source planetarium";
     homepage = "http://stellarium.org/";
-    license = stdenv.lib.licenses.gpl2;
+    license = licenses.gpl2;
 
-    platforms = stdenv.lib.platforms.linux; # should be mesaPlatforms, but we don't have qt on darwin
-    maintainers = [ stdenv.lib.maintainers.peti ];
+    platforms = platforms.linux; # should be mesaPlatforms, but we don't have qt on darwin
+    maintainers = [ maintainers.peti ];
   };
 }
diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/pkgs/applications/science/electronics/fritzing/default.nix
index b978e644a8e..ab508854310 100644
--- a/pkgs/applications/science/electronics/fritzing/default.nix
+++ b/pkgs/applications/science/electronics/fritzing/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchpatch, fetchFromGitHub, makeQtWrapper, qmake, pkgconfig
+{ stdenv, fetchpatch, fetchFromGitHub, qmake, pkgconfig
 , qtbase, qtsvg, qtserialport, boost, libgit2
 }:
 
@@ -28,20 +28,14 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ qtbase qtsvg qtserialport boost libgit2 ];
 
-  nativeBuildInputs = [ qmake makeQtWrapper pkgconfig ];
+  nativeBuildInputs = [ qmake pkgconfig ];
 
   qmakeFlags = [ "phoenix.pro" ];
 
-  enableParallelBuilding = true;
-
   preConfigure = ''
     ln -s "$parts" parts
   '';
 
-  postInstall = ''
-    wrapQtProgram $out/bin/Fritzing
-  '';
-
   meta = {
     description = "An open source prototyping tool for Arduino-based projects";
     homepage = http://fritzing.org/;
diff --git a/pkgs/applications/science/math/speedcrunch/default.nix b/pkgs/applications/science/math/speedcrunch/default.nix
index 861deaff741..d36b135531c 100644
--- a/pkgs/applications/science/math/speedcrunch/default.nix
+++ b/pkgs/applications/science/math/speedcrunch/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchgit, cmake, makeQtWrapper, qtbase, qttools }:
+{ mkDerivation, lib, fetchgit, cmake, qtbase, qttools }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name = "speedcrunch-${version}";
   version = "0.12.0";
 
@@ -11,21 +11,15 @@ stdenv.mkDerivation rec {
     sha256 = "0vh7cd1915bjqzkdp3sk25ngy8cq624mkh8c53c5bnzk357kb0fk";
   };
 
-  enableParallelBuilding = true;
-
   buildInputs = [ qtbase qttools ];
 
-  nativeBuildInputs = [ cmake makeQtWrapper ];
+  nativeBuildInputs = [ cmake ];
 
   preConfigure = ''
     cd src
   '';
 
-  postFixup = ''
-    wrapQtProgram $out/bin/speedcrunch
-  '';
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage    = http://speedcrunch.org;
     license     = licenses.gpl2Plus;
     description = "A fast power user calculator";
diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix
index a4a08deb8e2..98ec39eb206 100644
--- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix
+++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchgit, git,  espeak, SDL, udev, doxygen, cmake
 , qtbase, qtlocation, qtserialport, qtdeclarative, qtconnectivity, qtxmlpatterns
 , qtsvg, qtquick1, qtquickcontrols, qtgraphicaleffects, qmake
-, makeQtWrapper, lndir
+, makeWrapper, lndir
 , gst_all_1, qt-gstreamer1, pkgconfig, glibc
 , version ? "2.9.4"
 }:
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
   buildInputs = [ SDL udev doxygen git ] ++ gstInputs ++ qtInputs;
-  nativeBuildInputs = [ pkgconfig makeQtWrapper qmake ];
+  nativeBuildInputs = [ pkgconfig makeWrapper qmake ];
 
   patches = [ ./0001-fix-gcc-cmath-namespace-issues.patch ];
   postPatch = ''
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
 
 
   postInstall = ''
-    wrapQtProgram "$out/bin/qgroundcontrol" \
+    wrapProgram "$out/bin/qgroundcontrol" \
       --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH"
   '';
   
diff --git a/pkgs/applications/video/bomi/default.nix b/pkgs/applications/video/bomi/default.nix
index 0995052cfc1..bffb038f653 100644
--- a/pkgs/applications/video/bomi/default.nix
+++ b/pkgs/applications/video/bomi/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, perl, python, which, makeQtWrapper
+{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, perl, python, which
 , libX11, libxcb, mesa
-, qtbase, qtdeclarative, qtquickcontrols, qttools, qtx11extras, qmake
+, qtbase, qtdeclarative, qtquickcontrols, qttools, qtx11extras, qmake, makeWrapper
 , libchardet
 , ffmpeg
 
@@ -90,7 +90,7 @@ stdenv.mkDerivation rec {
   '';
 
   postInstall = ''
-    wrapQtProgram $out/bin/bomi \
+    wrapProgram $out/bin/bomi \
       ${optionalString youtubeSupport "--prefix PATH ':' '${youtube-dl}/bin'"}
   '';
 
@@ -104,9 +104,7 @@ stdenv.mkDerivation rec {
                    ++ optional cddaSupport "--enable-cdda"
                    ;
 
-  nativeBuildInputs = [ pkgconfig perl python which qttools makeQtWrapper qmake ];
-
-  enableParallelBuilding = true;
+  nativeBuildInputs = [ makeWrapper pkgconfig perl python which qttools qmake ];
 
   meta = with stdenv.lib; {
     description = "Powerful and easy-to-use multimedia player";
diff --git a/pkgs/applications/video/openshot-qt/default.nix b/pkgs/applications/video/openshot-qt/default.nix
index 656ec1163dc..f67ab412c26 100644
--- a/pkgs/applications/video/openshot-qt/default.nix
+++ b/pkgs/applications/video/openshot-qt/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub
 , doxygen, python3Packages, libopenshot
-, makeQtWrapper, wrapGAppsHook, gtk3 }:
+, wrapGAppsHook, gtk3 }:
 
 python3Packages.buildPythonApplication rec {
   name = "openshot-qt-${version}";
diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix
index d9a38d88f95..4ca31916965 100644
--- a/pkgs/applications/video/shotcut/default.nix
+++ b/pkgs/applications/video/shotcut/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, SDL, frei0r, gettext, mlt, jack1, pkgconfig, qtbase,
 qtmultimedia, qtwebkit, qtx11extras, qtwebsockets, qtquickcontrols,
 qtgraphicaleffects,
-qmake, makeQtWrapper }:
+qmake, makeWrapper }:
 
 stdenv.mkDerivation rec {
   name = "shotcut-${version}";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
 
   enableParallelBuilding = true;
-  nativeBuildInputs = [ makeQtWrapper pkgconfig qmake ];
+  nativeBuildInputs = [ makeWrapper pkgconfig qmake ];
   buildInputs = [
     SDL frei0r gettext mlt
     qtbase qtmultimedia qtwebkit qtx11extras qtwebsockets qtquickcontrols
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   postInstall = ''
     mkdir -p $out/share/shotcut
     cp -r src/qml $out/share/shotcut/
-    wrapQtProgram $out/bin/shotcut --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ jack1 SDL ]} --prefix PATH : ${mlt}/bin
+    wrapProgram $out/bin/shotcut --prefix FREI0R_PATH : ${frei0r}/lib/frei0r-1 --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ jack1 SDL ]} --prefix PATH : ${mlt}/bin
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/virtualization/virt-manager/qt.nix b/pkgs/applications/virtualization/virt-manager/qt.nix
index 7e05324a046..783a424e18c 100644
--- a/pkgs/applications/virtualization/virt-manager/qt.nix
+++ b/pkgs/applications/virtualization/virt-manager/qt.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig
-, qtbase, qtmultimedia, qtsvg, makeQtWrapper
+{ mkDerivation, lib, fetchFromGitHub, cmake, pkgconfig
+, qtbase, qtmultimedia, qtsvg
 , lxqt, libvncserver, libvirt, pixman, spice_gtk, spice_protocol
 }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name = "virt-manager-qt-${version}";
   version = "0.43.70.2";
 
@@ -23,17 +23,9 @@ stdenv.mkDerivation rec {
     libvirt libvncserver pixman spice_gtk spice_protocol
   ];
 
-  nativeBuildInputs = [ cmake pkgconfig makeQtWrapper ];
+  nativeBuildInputs = [ cmake pkgconfig ];
 
-  postFixup = ''
-    for f in $out/bin/* ; do
-      wrapQtProgram $f
-    done
-  '';
-
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = http://f1ash.github.io/qt-virt-manager;
     description = "Desktop user interface for managing virtual machines (QT)";
     longDescription = ''
diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 6c49e95b6b9..32e8f9d23f4 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -58,7 +58,7 @@ in stdenv.mkDerivation {
     ++ optional pythonBindings python # Python is needed even when not building bindings
     ++ optional pulseSupport libpulseaudio
     ++ optionals (headless) [ libXrandr ]
-    ++ optionals (!headless) [ qt5.qtbase qt5.qtx11extras qt5.makeQtWrapper libXinerama SDL ];
+    ++ optionals (!headless) [ qt5.qtbase qt5.qtx11extras libXinerama SDL ];
 
   hardeningDisable = [ "fortify" "pic" "stackprotector" ];
 
@@ -153,12 +153,8 @@ in stdenv.mkDerivation {
     find out/linux.*/${buildType}/bin -mindepth 1 -maxdepth 1 \
       -name src -o -exec cp -avt "$libexec" {} +
 
-    # Create wrapper script
     mkdir -p $out/bin
-    ${optionalString (!headless) ''
-      makeQtWrapper "$libexec/VirtualBox" $out/bin/VirtualBox
-    ''}
-    for file in ${optionalString (!headless) "VBoxSDL rdesktop-vrdp"} VBoxManage VBoxBalloonCtrl VBoxHeadless; do
+    for file in ${optionalString (!headless) "VirtualBox VBoxSDL rdesktop-vrdp"} VBoxManage VBoxBalloonCtrl VBoxHeadless; do
         echo "Linking $file to /bin"
         test -x "$libexec/$file"
         ln -s "$libexec/$file" $out/bin/$file
diff --git a/pkgs/desktops/plasma-5/systemsettings.nix b/pkgs/desktops/plasma-5/systemsettings.nix
index 5ada154f77d..10fc7a3a5b7 100644
--- a/pkgs/desktops/plasma-5/systemsettings.nix
+++ b/pkgs/desktops/plasma-5/systemsettings.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation, extra-cmake-modules, kdoctools, makeQtWrapper,
+  mkDerivation, extra-cmake-modules, kdoctools,
   kcmutils, kconfig, kdbusaddons, khtml, ki18n, kiconthemes, kio, kitemviews,
   kservice, kwindowsystem, kxmlgui, qtquickcontrols, qtquickcontrols2
 }:
diff --git a/pkgs/development/libraries/libqtav/default.nix b/pkgs/development/libraries/libqtav/default.nix
index 7b421f4ca36..a79e6d90384 100644
--- a/pkgs/development/libraries/libqtav/default.nix
+++ b/pkgs/development/libraries/libqtav/default.nix
@@ -1,20 +1,20 @@
-{ stdenv, lib, fetchFromGitHub, extra-cmake-modules, makeQtWrapper
+{ mkDerivation, lib, fetchFromGitHub, extra-cmake-modules
 , qtbase, qtmultimedia, qtquick1, qttools
 , mesa, libX11
 , libass, openal, ffmpeg, libuchardet
 , alsaLib, libpulseaudio, libva
 }:
 
-with stdenv.lib;
+with lib;
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name = "libqtav-${version}";
 
   # Awaiting upcoming `v1.12.0` release. `v1.11.0` is not supporting cmake which is the
   # the reason behind taking an unstable git rev. 
   version = "unstable-2017-03-30";
 
-  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper qttools ];
+  nativeBuildInputs = [ extra-cmake-modules qttools ];
   buildInputs = [ 
     qtbase qtmultimedia qtquick1
     mesa libX11
@@ -45,12 +45,6 @@ stdenv.mkDerivation rec {
     cp -a "./bin/"* "$out/bin"
   '';
 
-  postFixup = ''
-    for i in `find $out/bin -maxdepth 1 -xtype f -executable`; do
-      wrapQtProgram "$i"
-    done
-  '';
-
   meta = {
     description = "A multimedia playback framework based on Qt + FFmpeg.";
     #license = licenses.lgpl21; # For the libraries / headers only.
diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix
index 37065edc440..7996a316bdb 100644
--- a/pkgs/development/libraries/qt-5/5.6/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/default.nix
@@ -146,11 +146,6 @@ let
         qtwebchannel qtwebengine qtwebkit qtwebsockets qtx11extras qtxmlpatterns
       ];
 
-      makeQtWrapper =
-        makeSetupHook
-        { deps = [ makeWrapper ]; }
-        (if stdenv.isDarwin then ../make-qt-wrapper-darwin.sh else ../make-qt-wrapper.sh);
-
       qmake = makeSetupHook {
         deps = [ self.qtbase.dev ];
         substitutions = { inherit (stdenv) isDarwin; };
diff --git a/pkgs/development/libraries/qt-5/5.8/default.nix b/pkgs/development/libraries/qt-5/5.8/default.nix
index 1000bf09b17..b7d141fd5a2 100644
--- a/pkgs/development/libraries/qt-5/5.8/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/default.nix
@@ -133,12 +133,6 @@ let
       ] ++ optional (!stdenv.isDarwin) qtwayland
         ++ optional (stdenv.isDarwin) qtmacextras);
 
-      makeQtWrapper =
-        makeSetupHook
-        { deps = [ makeWrapper ] ++ optionals (!stdenv.isDarwin) [ dconf.lib gtk3 ]; }
-        (if stdenv.isDarwin then ../make-qt-wrapper-darwin.sh else ../make-qt-wrapper.sh);
-
-
       qmake = makeSetupHook {
         deps = [ self.qtbase.dev ];
         substitutions = { inherit (stdenv) isDarwin; };
diff --git a/pkgs/development/libraries/qt-5/5.8/qtdeclarative/default.nix b/pkgs/development/libraries/qt-5/5.8/qtdeclarative/default.nix
index 28ea571adca..6f2ff593f1e 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtdeclarative/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtdeclarative/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, qtSubmodule, makeQtWrapper, copyPathsToStore, python2, qtbase, qtsvg, qtxmlpatterns }:
+{ stdenv, qtSubmodule, copyPathsToStore, python2, qtbase, qtsvg, qtxmlpatterns }:
 
 with stdenv.lib;
 
@@ -6,17 +6,9 @@ qtSubmodule {
   name = "qtdeclarative";
   patches = copyPathsToStore (readPathsFromFile ./. ./series);
   qtInputs = [ qtbase qtsvg qtxmlpatterns ];
-  nativeBuildInputs = [ python2 makeQtWrapper ];
+  nativeBuildInputs = [ python2 ];
 
   preConfigure = ''
     NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QML2_IMPORT_PREFIX=\"$qtQmlPrefix\""
   '';
-
-  postInstall = ''
-    wrapQtProgram $out/bin/qmleasing
-    wrapQtProgram $out/bin/qmlscene
-    wrapQtProgram $out/bin/qmltestrunner
-  '' + optionalString (stdenv.isDarwin) ''
-    wrapQtProgram $out/bin/qml.app/Contents/MacOS/qml
-  '';
 }
diff --git a/pkgs/development/libraries/qt-5/5.8/qttools/default.nix b/pkgs/development/libraries/qt-5/5.8/qttools/default.nix
index 6b97c2d85cd..6fa5390855d 100644
--- a/pkgs/development/libraries/qt-5/5.8/qttools/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qttools/default.nix
@@ -1,28 +1,14 @@
-{ stdenv, qtSubmodule, makeQtWrapper, copyPathsToStore, qtbase }:
+{ stdenv, qtSubmodule, copyPathsToStore, qtbase }:
 
 with stdenv.lib;
 
 qtSubmodule {
   name = "qttools";
   qtInputs = [ qtbase ];
-  nativeBuildInputs = [ makeQtWrapper ];
 
   patches = copyPathsToStore (readPathsFromFile ./. ./series);
   postFixup = ''
     moveToOutput "bin/qdbus" "$out"
     moveToOutput "bin/qtpaths" "$out"
   '';
-
-  postInstall =   ''
-    wrapQtProgram $out/bin/qcollectiongenerator
-    wrapQtProgram $out/bin/qhelpconverter
-    wrapQtProgram $out/bin/qhelpgenerator
-    wrapQtProgram $out/bin/qtdiag
-  '' + optionalString (stdenv.isDarwin) ''
-    wrapQtProgram $out/bin/Assistant.app/Contents/MacOS/Assistant
-    wrapQtProgram $out/bin/Designer.app/Contents/MacOS/Designer
-    wrapQtProgram $out/bin/Linguist.app/Contents/MacOS/Linguist
-    wrapQtProgram $out/bin/pixeltool.app/Contents/MacOS/pixeltool
-    wrapQtProgram $out/bin/qdbusviewer.app/Contents/MacOS/qdbusviewer
-  '';
 }
diff --git a/pkgs/development/libraries/qt-5/make-qt-wrapper-darwin.sh b/pkgs/development/libraries/qt-5/make-qt-wrapper-darwin.sh
deleted file mode 100644
index a42c418fde6..00000000000
--- a/pkgs/development/libraries/qt-5/make-qt-wrapper-darwin.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-wrapQtProgram() {
-    local prog="$1"
-    shift
-    wrapProgram "$prog" \
-        --set QT_PLUGIN_PATH "$QT_PLUGIN_PATH" \
-        --set QML2_IMPORT_PATH "$QML2_IMPORT_PATH" \
-        --set DYLD_FRAMEWORK_PATH "/System/Library/Frameworks" \
-        --prefix XDG_DATA_DIRS : "$RUNTIME_XDG_DATA_DIRS" \
-        --prefix XDG_CONFIG_DIRS : "$RUNTIME_XDG_CONFIG_DIRS" \
-        "$@"
-}
-
-makeQtWrapper() {
-    local old="$1"
-    local new="$2"
-    shift
-    shift
-    makeWrapper "$old" "$new" \
-        --set QT_PLUGIN_PATH "$QT_PLUGIN_PATH" \
-        --set QML2_IMPORT_PATH "$QML2_IMPORT_PATH" \
-        --set DYLD_FRAMEWORK_PATH "/System/Library/Frameworks" \
-        --prefix XDG_DATA_DIRS : "$RUNTIME_XDG_DATA_DIRS" \
-        --prefix XDG_CONFIG_DIRS : "$RUNTIME_XDG_CONFIG_DIRS" \
-        "$@"
-}
-
-_makeQtWrapperSetup() {
-    # cannot use addToSearchPath because these directories may not exist yet
-    export QT_PLUGIN_PATH="$QT_PLUGIN_PATH${QT_PLUGIN_PATH:+:}${!outputLib}/$qtPluginPrefix"
-    export QML2_IMPORT_PATH="$QML2_IMPORT_PATH${QML2_IMPORT_PATH:+:}${!outputLib}/$qtQmlPrefix"
-    export RUNTIME_XDG_DATA_DIRS="$RUNTIME_XDG_DATA_DIRS${RUNTIME_XDG_DATA_DIRS:+:}${!outputBin}/share"
-    export RUNTIME_XDG_CONFIG_DIRS="$RUNTIME_XDG_CONFIG_DIRS${RUNTIME_XDG_CONFIG_DIRS:+:}${!outputBin}/etc/xdg"
-}
-
-prePhases+=(_makeQtWrapperSetup)
diff --git a/pkgs/development/libraries/qt-5/make-qt-wrapper.sh b/pkgs/development/libraries/qt-5/make-qt-wrapper.sh
deleted file mode 100644
index 33dc8b6370f..00000000000
--- a/pkgs/development/libraries/qt-5/make-qt-wrapper.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-wrapQtProgram() {
-    local prog="$1"
-    shift
-    wrapProgram "$prog" \
-        --prefix QT_PLUGIN_PATH : "$QT_PLUGIN_PATH" \
-        --prefix QML2_IMPORT_PATH : "$QML2_IMPORT_PATH" \
-        --prefix XDG_DATA_DIRS : "$RUNTIME_XDG_DATA_DIRS" \
-        --prefix XDG_CONFIG_DIRS : "$RUNTIME_XDG_CONFIG_DIRS" \
-        --prefix GIO_EXTRA_MODULES : "$GIO_EXTRA_MODULES" \
-        "$@"
-}
-
-makeQtWrapper() {
-    local old="$1"
-    local new="$2"
-    shift
-    shift
-    makeWrapper "$old" "$new" \
-        --prefix QT_PLUGIN_PATH : "$QT_PLUGIN_PATH" \
-        --prefix QML2_IMPORT_PATH : "$QML2_IMPORT_PATH" \
-        --prefix XDG_DATA_DIRS : "$RUNTIME_XDG_DATA_DIRS" \
-        --prefix XDG_CONFIG_DIRS : "$RUNTIME_XDG_CONFIG_DIRS" \
-        --prefix GIO_EXTRA_MODULES : "$GIO_EXTRA_MODULES" \
-        "$@"
-}
-
-_makeQtWrapperSetup() {
-    # cannot use addToSearchPath because these directories may not exist yet
-    export QT_PLUGIN_PATH="$QT_PLUGIN_PATH${QT_PLUGIN_PATH:+:}${!outputLib}/$qtPluginPrefix"
-    export QML2_IMPORT_PATH="$QML2_IMPORT_PATH${QML2_IMPORT_PATH:+:}${!outputLib}/$qtQmlPrefix"
-    export RUNTIME_XDG_DATA_DIRS="$RUNTIME_XDG_DATA_DIRS${RUNTIME_XDG_DATA_DIRS:+:}${!outputBin}/share${GSETTINGS_SCHEMAS_PATH:+:$GSETTINGS_SCHEMAS_PATH}"
-    export RUNTIME_XDG_CONFIG_DIRS="$RUNTIME_XDG_CONFIG_DIRS${RUNTIME_XDG_CONFIG_DIRS:+:}${!outputBin}/etc/xdg"
-}
-
-prePhases+=(_makeQtWrapperSetup)
-
-_findGioModules() {
-    if [ -d "$1"/lib/gio/modules ] && [ -n "$(ls -A $1/lib/gio/modules)" ] ; then
-        export GIO_EXTRA_MODULES="$GIO_EXTRA_MODULES${GIO_EXTRA_MODULES:+:}$1/lib/gio/modules"
-    fi
-}
-
-envHooks+=(_findGioModules)
diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix
index df6a7fa5a15..ff4341c6783 100644
--- a/pkgs/development/qtcreator/default.nix
+++ b/pkgs/development/qtcreator/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, makeWrapper
-, qtbase, makeQtWrapper, qtquickcontrols, qtscript, qtdeclarative, qmake
+, qtbase, qtquickcontrols, qtscript, qtdeclarative, qmake
 , withDocumentation ? false
 }:
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ qtbase qtscript qtquickcontrols qtdeclarative ];
 
-  nativeBuildInputs = [ qmake makeQtWrapper makeWrapper ];
+  nativeBuildInputs = [ qmake makeWrapper ];
 
   doCheck = true;
 
@@ -38,7 +38,6 @@ stdenv.mkDerivation rec {
   postInstall = ''
     substituteInPlace $out/share/applications/org.qt-project.qtcreator.desktop \
       --replace "Exec=qtcreator" "Exec=$out/bin/qtcreator"
-    wrapQtProgram $out/bin/qtcreator
   '';
 
   meta = {
diff --git a/pkgs/development/tools/analysis/qcachegrind/default.nix b/pkgs/development/tools/analysis/qcachegrind/default.nix
index 7caac253435..395f720906c 100644
--- a/pkgs/development/tools/analysis/qcachegrind/default.nix
+++ b/pkgs/development/tools/analysis/qcachegrind/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, qmake, makeQtWrapper, qtbase, perl, python, php }:
+{ stdenv, fetchurl, cmake, qmake, qtbase, perl, python, php }:
 
 stdenv.mkDerivation rec {
   name = "qcachegrind-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ qtbase perl python php ];
 
-  nativeBuildInputs = [ qmake makeQtWrapper ];
+  nativeBuildInputs = [ qmake ];
 
   postInstall = ''
      mkdir -p $out/bin
@@ -25,10 +25,8 @@ stdenv.mkDerivation rec {
     mkdir -p $out/Applications
     cp cgview/cgview.app/Contents/MacOS/cgview $out/bin
     cp -a qcachegrind/qcachegrind.app $out/Applications
-    wrapQtProgram $out/Applications/qcachegrind.app/Contents/MacOS/qcachegrind
   '' else ''
     install qcachegrind/qcachegrind cgview/cgview -t "$out/bin"
-    wrapQtProgram "$out/bin/qcachegrind"
     install -Dm644 qcachegrind/qcachegrind.desktop -t "$out/share/applications"
     install -Dm644 kcachegrind/hi32-app-kcachegrind.png "$out/share/icons/hicolor/32x32/apps/kcachegrind.png"
     install -Dm644 kcachegrind/hi48-app-kcachegrind.png "$out/share/icons/hicolor/48x48/apps/kcachegrind.png"
diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/pkgs/development/tools/database/sqlitebrowser/default.nix
index 28c618c29a0..a43d3928980 100644
--- a/pkgs/development/tools/database/sqlitebrowser/default.nix
+++ b/pkgs/development/tools/database/sqlitebrowser/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, qtbase, qttools, makeQtWrapper, sqlite, cmake }:
+{ mkDerivation, lib, fetchFromGitHub, qtbase, qttools, sqlite, cmake }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   version = "3.9.1";
   name = "sqlitebrowser-${version}";
 
@@ -12,23 +12,17 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ qtbase qttools sqlite ];
-  nativeBuildInputs = [ makeQtWrapper cmake ];
-  
-  enableParallelBuilding = true;
-  
+  nativeBuildInputs = [ cmake ];
+
   cmakeFlags = [ "-DUSE_QT5=TRUE" ];
-  
+
   # A regression was introduced in CMakeLists.txt on v3.9.x
   # See https://github.com/sqlitebrowser/sqlitebrowser/issues/832 and issues/755
   postPatch = ''
     substituteInPlace CMakeLists.txt --replace 'project("DB Browser for SQLite")' 'project(sqlitebrowser)'
   '';
 
-  postInstall = ''
-    wrapQtProgram $out/bin/sqlitebrowser
-  '';
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "DB Browser for SQLite";
     homepage = "http://sqlitebrowser.org/";
     license = licenses.gpl3;
diff --git a/pkgs/development/tools/tora/default.nix b/pkgs/development/tools/tora/default.nix
index 350cda4e263..578e759548a 100644
--- a/pkgs/development/tools/tora/default.nix
+++ b/pkgs/development/tools/tora/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, lib, fetchFromGitHub, cmake, extra-cmake-modules, makeQtWrapper
+{ mkDerivation, lib, fetchFromGitHub, cmake, extra-cmake-modules, makeWrapper
 , boost, doxygen, openssl, mysql, postgresql, graphviz, loki, qscintilla, qtbase }:
 
 let
   qscintillaLib = (qscintilla.override { withQt5 = true; });
 
-in stdenv.mkDerivation rec {
+in mkDerivation rec {
   name = "tora-${version}";
   version = "3.1";
 
@@ -15,10 +15,8 @@ in stdenv.mkDerivation rec {
     sha256 = "0wninl10bcgiljf6wnhn2rv8kmzryw78x5qvbw8s2zfjlnxjsbn7";
   };
 
-  enableParallelBuilding = true;
-
+  nativeBuildInputs = [ cmake extra-cmake-modules makeWrapper ];
   buildInputs = [
-    cmake extra-cmake-modules makeQtWrapper
     boost doxygen graphviz loki mysql openssl postgresql qscintillaLib qtbase
   ];
 
@@ -54,11 +52,11 @@ in stdenv.mkDerivation rec {
   ];
 
   postFixup = ''
-    wrapQtProgram $out/bin/tora \
+    wrapProgram $out/bin/tora \
       --prefix PATH : ${lib.getBin graphviz}/bin
   '';
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Tora SQL tool";
     maintainers = with maintainers; [ peterhoeg ];
     platforms = platforms.linux;
diff --git a/pkgs/development/tools/vogl/default.nix b/pkgs/development/tools/vogl/default.nix
index 56f15d62154..e351a75db4b 100644
--- a/pkgs/development/tools/vogl/default.nix
+++ b/pkgs/development/tools/vogl/default.nix
@@ -1,11 +1,12 @@
-{ fetchFromGitHub, stdenv
+{ mkDerivation, lib, fetchFromGitHub
 , cmake, git, pkgconfig, wget, zip
-, makeQtWrapper, qtbase, qtx11extras
+, qtbase, qtx11extras
 , libdwarf, libjpeg_turbo, libunwind, lzma, tinyxml, libX11
 , SDL2, SDL2_gfx, SDL2_image, SDL2_ttf
 , freeglut, mesa_glu
 }:
-stdenv.mkDerivation rec {
+
+mkDerivation rec {
   name = "vogl-${version}";
   version = "2016-05-13";
 
@@ -16,9 +17,7 @@ stdenv.mkDerivation rec {
     sha256 = "17gwd73x3lnqv6ccqs48pzqwbzjhbn41c0x0l5zzirhiirb3yh0n";
   };
 
-  nativeBuildInputs = [
-    cmake makeQtWrapper pkgconfig
-  ];
+  nativeBuildInputs = [ cmake pkgconfig ];
 
   buildInputs = [
     git wget zip
@@ -28,16 +27,17 @@ stdenv.mkDerivation rec {
     freeglut mesa_glu
   ];
 
-  enableParallelBuilding = true;
-
   dontUseCmakeBuildDir = true;
   preConfigure = ''
     cmakeDir=$PWD
     mkdir -p vogl/vogl_build/release64 && cd $_
   '';
-  cmakeFlags = '' -DCMAKE_VERBOSE=On -DCMAKE_BUILD_TYPE=Release -DBUILD_X64=On'';
+  cmakeFlags = [
+    "-DCMAKE_VERBOSE=On"
+    "-DBUILD_X64=On"
+  ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "OpenGL capture / playback debugger.";
     homepage = https://github.com/ValveSoftware/vogl;
     license = licenses.mit;
diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix
index c0e065b3b55..622bf4fbd5c 100644
--- a/pkgs/os-specific/linux/v4l-utils/default.nix
+++ b/pkgs/os-specific/linux/v4l-utils/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, pkgconfig, perl, makeQtWrapper
+{ stdenv, lib, fetchurl, pkgconfig, perl
 , libjpeg, udev
 , withUtils ? true
 , withGUI ? true, alsaLib, libX11, qtbase, mesa_glu
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     ln -s "$dev/include/libv4l1-videodev.h" "$dev/include/videodev.h"
   '';
 
-  nativeBuildInputs = [ pkgconfig perl ] ++ lib.optional (withUtils && withGUI) makeQtWrapper;
+  nativeBuildInputs = [ pkgconfig perl ];
 
   buildInputs = [ udev ] ++ lib.optionals (withUtils && withGUI) [ alsaLib libX11 qtbase mesa_glu ];
 
@@ -41,10 +41,6 @@ stdenv.mkDerivation rec {
     patchShebangs .
   '';
 
-  postInstall = lib.optionalString (withUtils && withGUI) ''
-    wrapQtProgram $out/bin/qv4l2
-  '';
-
   meta = with stdenv.lib; {
     description = "V4L utils and libv4l, provide common image formats regardless of the v4l device";
     homepage = http://linuxtv.org/projects.php;
diff --git a/pkgs/tools/audio/qastools/default.nix b/pkgs/tools/audio/qastools/default.nix
index 3456f098648..d86a0b09c26 100644
--- a/pkgs/tools/audio/qastools/default.nix
+++ b/pkgs/tools/audio/qastools/default.nix
@@ -1,11 +1,10 @@
-{ stdenv, fetchurl, cmake, alsaLib, udev, qtbase,
-  qtsvg, qttools, makeQtWrapper }:
+{ mkDerivation, lib, fetchurl, cmake, alsaLib, udev, qtbase, qtsvg, qttools }:
 
 let
   version = "0.21.0";
 in
 
-stdenv.mkDerivation {
+mkDerivation {
   name = "qastools-${version}";
 
   src = fetchurl {
@@ -14,15 +13,15 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [
-    cmake alsaLib udev qtbase qtsvg qttools makeQtWrapper
+    alsaLib udev qtbase qtsvg qttools
   ];
+  nativeBuildInputs = [ cmake ];
 
   cmakeFlags = [
-    "-DCMAKE_INSALL_PREFIX=$out"
     "-DALSA_INCLUDE=${alsaLib.dev}/include/alsa/version.h"
   ];
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Collection of desktop applications for ALSA configuration";
     license = licenses.gpl3;
     platforms = platforms.linux;
diff --git a/pkgs/tools/misc/antimicro/default.nix b/pkgs/tools/misc/antimicro/default.nix
index 02d65597f74..ee0accac2d9 100644
--- a/pkgs/tools/misc/antimicro/default.nix
+++ b/pkgs/tools/misc/antimicro/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, cmake, pkgconfig, SDL2, qtbase, qttools, makeQtWrapper, xorg, fetchFromGitHub }:
+{ mkDerivation, lib, cmake, pkgconfig, SDL2, qtbase, qttools, xorg, fetchFromGitHub }:
 
-stdenv.mkDerivation rec {
+mkDerivation rec {
   name = "antimicro-${version}";
   version = "2.23";
 
@@ -11,15 +11,12 @@ stdenv.mkDerivation rec {
     sha256 = "1q40ayxwwyq85lc89cnj1cm2nar625h4vhh8dvmb2qcxczaggf4v";
   };
 
+  nativeBuildInputs = [ cmake pkgconfig ];
   buildInputs = [
-    cmake pkgconfig SDL2 qtbase qttools xorg.libXtst makeQtWrapper
+    SDL2 qtbase qttools xorg.libXtst
   ];
 
-  postInstall = ''
-    wrapQtProgram $out/bin/antimicro
-  '';
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "GUI for mapping keyboard and mouse controls to a gamepad";
     inherit (src.meta) homepage;
     maintainers = with maintainers; [ jb55 ];
diff --git a/pkgs/tools/misc/qt5ct/default.nix b/pkgs/tools/misc/qt5ct/default.nix
index dce2392cc7b..86750518bb5 100644
--- a/pkgs/tools/misc/qt5ct/default.nix
+++ b/pkgs/tools/misc/qt5ct/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qtbase, qtsvg, qttools, qmake, makeQtWrapper }:
+{ stdenv, fetchurl, qtbase, qtsvg, qttools, qmake }:
 
 stdenv.mkDerivation rec {
   name = "qt5ct-${version}";
@@ -18,10 +18,6 @@ stdenv.mkDerivation rec {
     qmakeFlags="$qmakeFlags PLUGINDIR=$out/$qtPluginPrefix"
   '';
 
-  preFixup = ''
-    wrapQtProgram $out/bin/qt5ct
-  '';
-
   meta = with stdenv.lib; {
     description = "Qt5 Configuration Tool";
     homepage = https://www.opendesktop.org/content/show.php?content=168066;
diff --git a/pkgs/tools/misc/radeon-profile/default.nix b/pkgs/tools/misc/radeon-profile/default.nix
index f07e1d4adc7..63f32763f22 100644
--- a/pkgs/tools/misc/radeon-profile/default.nix
+++ b/pkgs/tools/misc/radeon-profile/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchFromGitHub, qtbase, qmake, makeQtWrapper, libXrandr }:
+{ stdenv, fetchFromGitHub, qtbase, qmake, libXrandr }:
 
 stdenv.mkDerivation rec {
 
   name = "radeon-profile-${version}";
   version = "20161221";
 
-  nativeBuildInputs = [ qmake makeQtWrapper ];
+  nativeBuildInputs = [ qmake ];
   buildInputs = [ qtbase libXrandr ];
 
   src = (fetchFromGitHub {
@@ -18,7 +18,6 @@ stdenv.mkDerivation rec {
   postInstall = ''
     mkdir -p $out/bin
     cp ./radeon-profile $out/bin/radeon-profile
-    wrapQtProgram  $out/bin/radeon-profile
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/misc/rockbox-utility/default.nix b/pkgs/tools/misc/rockbox-utility/default.nix
index 0538dd79508..f84b9563967 100644
--- a/pkgs/tools/misc/rockbox-utility/default.nix
+++ b/pkgs/tools/misc/rockbox-utility/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, libusb1
-, qtbase, qttools, makeQtWrapper, qmake
+, qtbase, qttools, makeWrapper, qmake
 , withEspeak ? false, espeak ? null }:
 
 stdenv.mkDerivation  rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation  rec {
 
   buildInputs = [ libusb1 qtbase qttools ]
     ++ stdenv.lib.optional withEspeak espeak;
-  nativeBuildInputs = [ makeQtWrapper pkgconfig qmake ];
+  nativeBuildInputs = [ makeWrapper pkgconfig qmake ];
 
   preConfigure = ''
     cd rbutil/rbutilqt
@@ -24,7 +24,7 @@ stdenv.mkDerivation  rec {
 
     install -Dm755 RockboxUtility $out/bin/rockboxutility
     ln -s $out/bin/rockboxutility $out/bin/RockboxUtility
-    wrapQtProgram $out/bin/rockboxutility \
+    wrapProgram $out/bin/rockboxutility \
     ${stdenv.lib.optionalString withEspeak ''
       --prefix PATH : ${espeak}/bin
     ''}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 13ec940b1c9..68a1c2d29ea 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14620,10 +14620,10 @@ with pkgs;
       recurseIntoAttrs (makeOverridable mkApplications attrs);
 
   inherit (kdeApplications)
-    akonadi ark dolphin ffmpegthumbs filelight gwenview kate
-    kdenlive kcalc kcolorchooser kcontacts kgpg khelpcenter kig
-    kolourpaint konsole krfb marble
-    okteta okular spectacle;
+    akonadi ark dolphin ffmpegthumbs filelight gwenview kate kdenlive
+    kcachegrind kcalc kcolorchooser kcontacts kdf kgpg khelpcenter kig kmix
+    kolourpaint kompare konsole krfb kwalletmanager marble okteta okular
+    spectacle;
 
   kdeconnect = libsForQt5.callPackage ../applications/misc/kdeconnect { };
 

From 5a8295e5965a2c86062e5d554e8b8cdec3082716 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Thu, 18 May 2017 08:01:54 -0500
Subject: [PATCH 030/189] qtbase: setup required environment in GTK3 platform
 theme plugin

---
 .../libraries/qt-5/5.8/default.nix            |  1 +
 .../libraries/qt-5/5.8/qtbase/default.nix     |  8 ++++-
 .../libraries/qt-5/5.8/qtbase/qgtk-env.patch  | 36 +++++++++++++++++++
 .../libraries/qt-5/5.8/qtbase/series          |  1 +
 4 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qtbase/qgtk-env.patch

diff --git a/pkgs/development/libraries/qt-5/5.8/default.nix b/pkgs/development/libraries/qt-5/5.8/default.nix
index b7d141fd5a2..57728ad13ce 100644
--- a/pkgs/development/libraries/qt-5/5.8/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/default.nix
@@ -94,6 +94,7 @@ let
       qtbase = callPackage ./qtbase {
         inherit (srcs.qtbase) src version;
         inherit bison cups harfbuzz mesa;
+        inherit dconf gtk3;
         inherit developerBuild decryptSslTraffic;
       };
 
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
index 008eb1e3709..64e208a22b0 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
@@ -7,7 +7,7 @@
   # darwin support
   darwin, libiconv, libcxx,
 
-  dbus, fontconfig, freetype, glib, gtk3, harfbuzz, icu, libX11, libXcomposite,
+  dbus, dconf, fontconfig, freetype, glib, gtk3, harfbuzz, icu, libX11, libXcomposite,
   libXcursor, libXext, libXi, libXrender, libinput, libjpeg, libpng, libtiff,
   libxcb, libxkbcommon, libxml2, libxslt, openssl, pcre16, sqlite, udev,
   xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, xcbutilwm, xlibs,
@@ -147,6 +147,12 @@ stdenv.mkDerivation {
     ++ lib.optional mesaSupported
        ''-DNIXPKGS_MESA_GL="${mesa.out}/lib/libGL"''
 
+    ++ lib.optionals (!stdenv.isDarwin)
+    [
+      ''-DNIXPKGS_QGTK3_XDG_DATA_DIRS="${gtk3}/share/gsettings-schemas/${gtk3.name}"''
+      ''-DNIXPKGS_QGTK3_GIO_EXTRA_MODULES="${dconf.lib}/lib/gio/modules"''
+    ]
+
     ++ lib.optionals stdenv.isDarwin
     [
       "-D__MAC_OS_X_VERSION_MAX_ALLOWED=1090"
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/qgtk-env.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/qgtk-env.patch
new file mode 100644
index 00000000000..6a22b203afc
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/qgtk-env.patch
@@ -0,0 +1,36 @@
+Index: qtbase-opensource-src-5.8.0/src/plugins/platformthemes/gtk3/main.cpp
+===================================================================
+--- qtbase-opensource-src-5.8.0.orig/src/plugins/platformthemes/gtk3/main.cpp
++++ qtbase-opensource-src-5.8.0/src/plugins/platformthemes/gtk3/main.cpp
+@@ -39,6 +39,7 @@
+ 
+ #include <qpa/qplatformthemeplugin.h>
+ #include "qgtk3theme.h"
++#include <QFile>
+ 
+ QT_BEGIN_NAMESPACE
+ 
+@@ -54,8 +55,22 @@ public:
+ QPlatformTheme *QGtk3ThemePlugin::create(const QString &key, const QStringList &params)
+ {
+     Q_UNUSED(params);
+-    if (!key.compare(QLatin1String(QGtk3Theme::name), Qt::CaseInsensitive))
++    if (!key.compare(QLatin1String(QGtk3Theme::name), Qt::CaseInsensitive)) {
++
++#ifdef NIXPKGS_QGTK3_XDG_DATA_DIRS
++        QStringList XDG_DATA_DIRS = QFile::decodeName(qgetenv("XDG_DATA_DIRS")).split(':');
++        XDG_DATA_DIRS << QStringLiteral(NIXPKGS_QGTK3_XDG_DATA_DIRS);
++        qputenv("XDG_DATA_DIRS", QFile::encodeName(XDG_DATA_DIRS.join(':')));
++#endif
++
++#ifdef NIXPKGS_QGTK3_GIO_EXTRA_MODULES
++        QStringList GIO_EXTRA_MODULES = QFile::decodeName(qgetenv("GIO_EXTRA_MODULES")).split(':');
++        GIO_EXTRA_MODULES << QStringLiteral(NIXPKGS_QGTK3_GIO_EXTRA_MODULES);
++        qputenv("GIO_EXTRA_MODULES", QFile::encodeName(GIO_EXTRA_MODULES.join(':')));
++#endif
++
+         return new QGtk3Theme;
++    }
+ 
+     return 0;
+ }
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/series b/pkgs/development/libraries/qt-5/5.8/qtbase/series
index 47400cf7aa3..03f5e6b1002 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/series
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/series
@@ -8,3 +8,4 @@ qpa-platform-plugin-path.patch
 dlopen-gl.patch
 compose-search-path.patch
 cmake-paths.patch
+qgtk-env.patch

From 6fa41788be7e020b5e551f7b89601cad2c277b12 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Thu, 18 May 2017 18:19:42 -0500
Subject: [PATCH 031/189] qt5: separate plugins from libraries

---
 .../libraries/qt-5/5.6/default.nix            |  12 +-
 .../libraries/qt-5/5.8/default.nix            |  12 +-
 .../libraries/qt-5/5.8/qtbase/default.nix     |  41 ++--
 .../libraries/qt-5/5.8/qtconnectivity.nix     |   4 +
 .../qt-5/5.8/qtdeclarative/default.nix        |   6 +
 pkgs/development/libraries/qt-5/5.8/qtdoc.nix |   1 +
 .../libraries/qt-5/5.8/qtlocation.nix         |   5 +
 .../libraries/qt-5/5.8/qtmultimedia.nix       |   5 +
 .../libraries/qt-5/5.8/qtquickcontrols2.nix   |   4 +
 .../libraries/qt-5/5.8/qtsensors.nix          |   5 +
 pkgs/development/libraries/qt-5/5.8/qtsvg.nix |   4 +
 .../libraries/qt-5/5.8/qttools/default.nix    |   8 +-
 .../libraries/qt-5/5.8/qtwayland.nix          |   5 +
 .../libraries/qt-5/5.8/qtwebchannel.nix       |   4 +
 .../qt-5/5.8/qtwebengine/default.nix          |   3 +
 .../libraries/qt-5/5.8/qtwebsockets.nix       |   4 +
 .../libraries/qt-5/qtbase-setup-hook.sh       | 188 ++++++++----------
 17 files changed, 172 insertions(+), 139 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix
index 7996a316bdb..b286f8c5298 100644
--- a/pkgs/development/libraries/qt-5/5.6/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/default.nix
@@ -50,10 +50,6 @@ let
 
       outputs = args.outputs or [ "out" "dev" ];
 
-      propagatedUserEnvPkgs =
-        (args.propagatedUserEnvPkgs or [])
-        ++ map getBin (args.propagatedBuildInputs or []);
-
       qmakeFlags =
         (args.qmakeFlags or [])
         ++ optional (debug != null)
@@ -90,7 +86,13 @@ let
 
       setupHook = ../qtsubmodule-setup-hook.sh;
 
-      meta = self.qtbase.meta // (args.meta or {});
+      meta = {
+        homepage = http://www.qt.io;
+        description = "A cross-platform application framework for C++";
+        license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ];
+        maintainers = with maintainers; [ qknight ttuegel periklis ];
+        platforms = platforms.unix;
+      } // (args.meta or {});
     });
 
   addPackages = self: with self;
diff --git a/pkgs/development/libraries/qt-5/5.8/default.nix b/pkgs/development/libraries/qt-5/5.8/default.nix
index 57728ad13ce..034c7fd10e1 100644
--- a/pkgs/development/libraries/qt-5/5.8/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/default.nix
@@ -41,10 +41,6 @@ let
 
       outputs = args.outputs or [ "out" "dev" ];
 
-      propagatedUserEnvPkgs =
-        (args.propagatedUserEnvPkgs or [])
-        ++ map getBin (args.propagatedBuildInputs or []);
-
       qmakeFlags =
         (args.qmakeFlags or [])
         ++ optional (debug != null)
@@ -81,7 +77,13 @@ let
 
       setupHook = ../qtsubmodule-setup-hook.sh;
 
-      meta = self.qtbase.meta // (args.meta or {});
+      meta = {
+        homepage = http://www.qt.io;
+        description = "A cross-platform application framework for C++";
+        license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ];
+        maintainers = with maintainers; [ qknight ttuegel periklis ];
+        platforms = platforms.unix;
+      } // (args.meta or {});
     });
 
   addPackages = self: with self;
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
index 64e208a22b0..a627bcbee52 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
@@ -76,7 +76,7 @@ stdenv.mkDerivation {
     [ bison flex gperf lndir perl pkgconfig python2 ]
     ++ lib.optional (!stdenv.isDarwin) patchelf;
 
-  outputs = [ "out" "dev" ];
+  outputs = [ "out" "dev" "bin" ];
 
   patches =
     copyPathsToStore (lib.readPathsFromFile ./. ./series);
@@ -264,29 +264,32 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  postInstall = ''
-    find "$out" -name "*.cmake" | while read file; do
-        substituteInPlace "$file" \
-            --subst-var-by NIX_OUT "$out" \
-            --subst-var-by NIX_DEV "$dev"
-    done
-  '';
+  postInstall =
+    # Hardcode some CMake module paths.
+    ''
+      find "$out" -name "*.cmake" | while read file; do
+          substituteInPlace "$file" \
+              --subst-var-by NIX_OUT "$out" \
+              --subst-var-by NIX_DEV "$dev"
+      done
+    '';
 
-  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"
+  preFixup =
+    # Move selected outputs.
+    ''
+      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/share"
+      moveToOutput "share/doc" "$dev"
+
+      moveToOutput "$qtPluginPrefix" "$bin"
+    '';
 
   postFixup =
+    # Don't retain build-time dependencies like gdb.
     ''
-      # Don't retain build-time dependencies like gdb.
       sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $dev/mkspecs/qconfig.pri
     ''
 
diff --git a/pkgs/development/libraries/qt-5/5.8/qtconnectivity.nix b/pkgs/development/libraries/qt-5/5.8/qtconnectivity.nix
index 95cd6fea79b..1c10535c785 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtconnectivity.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtconnectivity.nix
@@ -3,4 +3,8 @@
 qtSubmodule {
   name = "qtconnectivity";
   qtInputs = [ qtbase qtdeclarative ];
+  outputs = [ "out" "dev" "bin" ];
+  postInstall = ''
+    moveToOutput "$qtQmlPrefix" "$bin"
+  '';
 }
diff --git a/pkgs/development/libraries/qt-5/5.8/qtdeclarative/default.nix b/pkgs/development/libraries/qt-5/5.8/qtdeclarative/default.nix
index 6f2ff593f1e..cc665334885 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtdeclarative/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtdeclarative/default.nix
@@ -7,8 +7,14 @@ qtSubmodule {
   patches = copyPathsToStore (readPathsFromFile ./. ./series);
   qtInputs = [ qtbase qtsvg qtxmlpatterns ];
   nativeBuildInputs = [ python2 ];
+  outputs = [ "out" "dev" "bin" ];
 
   preConfigure = ''
     NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QML2_IMPORT_PREFIX=\"$qtQmlPrefix\""
   '';
+
+  postInstall = ''
+    moveToOutput "$qtPluginPrefix" "$bin"
+    moveToOutput "$qtQmlPrefix" "$bin"
+  '';
 }
diff --git a/pkgs/development/libraries/qt-5/5.8/qtdoc.nix b/pkgs/development/libraries/qt-5/5.8/qtdoc.nix
index 578ea6ba0b2..7f979ee94c0 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtdoc.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtdoc.nix
@@ -3,4 +3,5 @@
 qtSubmodule {
   name = "qtdoc";
   qtInputs = [ qtdeclarative ];
+  outputs = [ "out" ];
 }
diff --git a/pkgs/development/libraries/qt-5/5.8/qtlocation.nix b/pkgs/development/libraries/qt-5/5.8/qtlocation.nix
index 1e134057c4b..0eabe04e478 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtlocation.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtlocation.nix
@@ -3,4 +3,9 @@
 qtSubmodule {
   name = "qtlocation";
   qtInputs = [ qtbase qtmultimedia ];
+  outputs = [ "out" "dev" "bin" ];
+  postInstall = ''
+    moveToOutput "$qtPluginPrefix" "$bin"
+    moveToOutput "$qtQmlPrefix" "$bin"
+  '';
 }
diff --git a/pkgs/development/libraries/qt-5/5.8/qtmultimedia.nix b/pkgs/development/libraries/qt-5/5.8/qtmultimedia.nix
index 1c2dcc90d41..e133256e900 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtmultimedia.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtmultimedia.nix
@@ -10,6 +10,11 @@ qtSubmodule {
   qtInputs = [ qtbase qtdeclarative ];
   buildInputs = [ pkgconfig gstreamer gst-plugins-base libpulseaudio]
     ++ optional (stdenv.isLinux) alsaLib;
+  outputs = [ "out" "dev" "bin" ];
   qmakeFlags = [ "GST_VERSION=1.0" ];
   NIX_LDFLAGS = optionalString (stdenv.isDarwin) "-lobjc";
+  postInstall = ''
+    moveToOutput "$qtPluginPrefix" "$bin"
+    moveToOutput "$qtQmlPrefix" "$bin"
+  '';
 }
diff --git a/pkgs/development/libraries/qt-5/5.8/qtquickcontrols2.nix b/pkgs/development/libraries/qt-5/5.8/qtquickcontrols2.nix
index 19750f2fd99..1a52d1802ce 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtquickcontrols2.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtquickcontrols2.nix
@@ -3,4 +3,8 @@
 qtSubmodule {
   name = "qtquickcontrols2";
   qtInputs = [ qtdeclarative ];
+  outputs = [ "out" "dev" "bin" ];
+  postInstall = ''
+    moveToOutput "$qtQmlPrefix" "$bin"
+  '';
 }
diff --git a/pkgs/development/libraries/qt-5/5.8/qtsensors.nix b/pkgs/development/libraries/qt-5/5.8/qtsensors.nix
index 7bb18f56fe2..75829d3f0aa 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtsensors.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtsensors.nix
@@ -5,4 +5,9 @@ with stdenv.lib;
 qtSubmodule {
   name = "qtsensors";
   qtInputs = [ qtbase qtdeclarative ];
+  outputs = [ "out" "dev" "bin" ];
+  postInstall = ''
+    moveToOutput "$qtPluginPrefix" "$bin"
+    moveToOutput "$qtQmlPrefix" "$bin"
+  '';
 }
diff --git a/pkgs/development/libraries/qt-5/5.8/qtsvg.nix b/pkgs/development/libraries/qt-5/5.8/qtsvg.nix
index b9ccac7cf93..0e21cf89340 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtsvg.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtsvg.nix
@@ -3,4 +3,8 @@
 qtSubmodule {
   name = "qtsvg";
   qtInputs = [ qtbase ];
+  outputs = [ "out" "dev" "bin" ];
+  postInstall = ''
+    moveToOutput "$qtPluginPrefix" "$bin"
+  '';
 }
diff --git a/pkgs/development/libraries/qt-5/5.8/qttools/default.nix b/pkgs/development/libraries/qt-5/5.8/qttools/default.nix
index 6fa5390855d..6c0f540e79b 100644
--- a/pkgs/development/libraries/qt-5/5.8/qttools/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qttools/default.nix
@@ -5,10 +5,10 @@ with stdenv.lib;
 qtSubmodule {
   name = "qttools";
   qtInputs = [ qtbase ];
-
+  outputs = [ "out" "dev" "bin" ];
   patches = copyPathsToStore (readPathsFromFile ./. ./series);
-  postFixup = ''
-    moveToOutput "bin/qdbus" "$out"
-    moveToOutput "bin/qtpaths" "$out"
+  postInstall = ''
+    moveToOutput "bin/qdbus" "$bin"
+    moveToOutput "bin/qtpaths" "$bin"
   '';
 }
diff --git a/pkgs/development/libraries/qt-5/5.8/qtwayland.nix b/pkgs/development/libraries/qt-5/5.8/qtwayland.nix
index 6d887f7c650..7b7bd2f6ebc 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtwayland.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtwayland.nix
@@ -5,4 +5,9 @@ qtSubmodule {
   qtInputs = [ qtbase qtquickcontrols ];
   buildInputs = [ wayland ];
   nativeBuildInputs = [ pkgconfig ];
+  outputs = [ "out" "dev" "bin" ];
+  postInstall = ''
+    moveToOutput "$qtPluginPrefix" "$bin"
+    moveToOutput "$qtQmlPrefix "$bin"
+  '';
 }
diff --git a/pkgs/development/libraries/qt-5/5.8/qtwebchannel.nix b/pkgs/development/libraries/qt-5/5.8/qtwebchannel.nix
index fd7a3c52026..50a539dbe72 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtwebchannel.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtwebchannel.nix
@@ -3,5 +3,9 @@
 qtSubmodule {
   name = "qtwebchannel";
   qtInputs = [ qtbase qtdeclarative ];
+  outputs = [ "out" "dev" "bin" ];
+  postInstall = ''
+    moveToOutput "$qtQmlPrefix" "$bin"
+  '';
 }
 
diff --git a/pkgs/development/libraries/qt-5/5.8/qtwebengine/default.nix b/pkgs/development/libraries/qt-5/5.8/qtwebengine/default.nix
index 37f12eed758..871fb21c106 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtwebengine/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtwebengine/default.nix
@@ -25,6 +25,7 @@ qtSubmodule {
   buildInputs = [ bison flex git which gperf ];
   nativeBuildInputs = [ pkgconfig python2 coreutils ];
   doCheck = true;
+  outputs = [ "out" "dev" "bin" ];
 
   enableParallelBuilding = true;
 
@@ -90,5 +91,7 @@ qtSubmodule {
     EOF
 
     paxmark m $out/libexec/QtWebEngineProcess
+
+    moveToOutput "$qtQmlPrefix" "$bin"
   '';
 }
diff --git a/pkgs/development/libraries/qt-5/5.8/qtwebsockets.nix b/pkgs/development/libraries/qt-5/5.8/qtwebsockets.nix
index fbdfbbcf0db..925adce75a9 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtwebsockets.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtwebsockets.nix
@@ -3,4 +3,8 @@
 qtSubmodule {
   name = "qtwebsockets";
   qtInputs = [ qtbase qtdeclarative ];
+  outputs = [ "out" "dev" "bin" ];
+  postInstall = ''
+    moveToOutput "$qtQmlPrefix" "$bin"
+  '';
 }
diff --git a/pkgs/development/libraries/qt-5/qtbase-setup-hook.sh b/pkgs/development/libraries/qt-5/qtbase-setup-hook.sh
index 66f5d3f5818..35df52d7a08 100644
--- a/pkgs/development/libraries/qt-5/qtbase-setup-hook.sh
+++ b/pkgs/development/libraries/qt-5/qtbase-setup-hook.sh
@@ -2,72 +2,54 @@ qtPluginPrefix=@qtPluginPrefix@
 qtQmlPrefix=@qtQmlPrefix@
 qtDocPrefix=@qtDocPrefix@
 
-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\""
+NIX_QT5_MODULES="${NIX_QT5_MODULES}${NIX_QT5_MODULES:+:}@out@"
+NIX_QT5_MODULES_DEV="${NIX_QT5_MODULES_DEV}${NIX_QT5_MODULES_DEV:+:}@dev@"
+
+providesQtRuntime() {
+    [ -d "$1/$qtPluginPrefix" ] || [ -d "$1/$qtQmlPrefix" ]
+}
+
+# Propagate any runtime dependency of the building package.
+# Each dependency is propagated to the user environment and as a build
+# input so that it will be re-propagated to the user environment by any
+# package depending on the building package. (This is necessary in case
+# the building package does not provide runtime dependencies itself and so
+# would not be propagated to the user environment.)
+_qtCrossEnvHook() {
+    if providesQtRuntime "$1"; then
+        propagatedBuildInputs+=" $1"
+        propagatedUserEnvPkgs+=" $1"
+    fi
+}
+if [ -z "$NIX_QT5_TMP" ]; then
+    crossEnvHooks+=(_qtCrossEnvHook)
+fi
+
+_qtEnvHook() {
+    if providesQtRuntime "$1"; then
+        propagatedNativeBuildInputs+=" $1"
+        if [ -z "$crossConfig" ]; then
+        propagatedUserEnvPkgs+=" $1"
         fi
     fi
 }
+if [ -z "$NIX_QT5_TMP" ]; then
+    envHooks+=(_qtEnvHook)
+fi
 
-addToSearchPathOnce() {
-    addToSearchPathOnceWithCustomDelimiter ':' "$@"
-}
-
-propagateOnce() {
-    addToSearchPathOnceWithCustomDelimiter ' ' "$@"
-}
-
-_qtPropagate() {
-    for dir in $qtPluginPrefix $qtQmlPrefix; do
-        if [ -d "$1/$dir" ]; then
-            propagateOnce propagatedBuildInputs "$1"
-            break
-        fi
-    done
-    addToSearchPathOnce QT_PLUGIN_PATH "$1/$qtPluginPrefix"
-    addToSearchPathOnce QML2_IMPORT_PATH "$1/$qtQmlPrefix"
-}
-
-crossEnvHooks+=(_qtPropagate)
-
-_qtPropagateNative() {
-    for dir in $qtPluginPrefix $qtQmlPrefix; do
-        if [ -d "$1/$dir" ]; then
-            propagateOnce propagatedNativeBuildInputs "$1"
-            break
-        fi
-    done
-    if [ -z "$crossConfig" ]; then
-    addToSearchPathOnce QT_PLUGIN_PATH "$1/$qtPluginPrefix"
-    addToSearchPathOnce QML2_IMPORT_PATH "$1/$qtQmlPrefix"
-    fi
-}
-
-envHooks+=(_qtPropagateNative)
-
-_qtMultioutDevs() {
-    # This is necessary whether the package is a Qt module or not
+_qtPreFixupHook() {
     moveToOutput "mkspecs" "${!outputDev}"
 }
+if [ -z "$NIX_QT5_TMP" ]; then
+    preFixupHooks+=(_qtPreFixupHook)
+fi
 
-preFixupHooks+=(_qtMultioutDevs)
-
-_qtSetCMakePrefix() {
-    export CMAKE_PREFIX_PATH="$NIX_QT5_TMP${CMAKE_PREFIX_PATH:+:}${CMAKE_PREFIX_PATH}"
-}
-
-_qtRmTmp() {
+_qtPostInstallHook() {
+    # Clean up temporary installation files created by this setup hook.
+    # For building Qt modules, this is necessary to prevent including
+    # dependencies in the output. For all other packages, this is necessary
+    # to induce patchelf to remove the temporary paths from the RPATH of
+    # dynamically-linked objects.
     if [ -z "$NIX_QT_SUBMODULE" ]; then
         rm -fr "$NIX_QT5_TMP"
     else
@@ -85,11 +67,51 @@ _qtRmTmp() {
 
         rm "$NIX_QT5_TMP/nix-support/qt-inputs"
     fi
+
+    # Patch CMake modules
+    if [ -n "$NIX_QT_SUBMODULE" ]; then
+        find "${!outputLib}" -name "*.cmake" | while read file; do
+            substituteInPlace "$file" \
+                              --subst-var-by NIX_OUT "${!outputLib}" \
+                              --subst-var-by NIX_DEV "${!outputDev}"
+        done
+    fi
+}
+if [ -z "$NIX_QT5_TMP" ]; then
+    preConfigureHooks+=(_qtPreConfigureHook)
+fi
+
+_qtLinkModuleDir() {
+    if [ -d "$1/$2" ]; then
+        @lndir@/bin/lndir -silent "$1/$2" "$NIX_QT5_TMP/$2"
+        find "$1/$2" -printf "$2/%P\n" >> "$NIX_QT5_TMP/nix-support/qt-inputs"
+    fi
 }
 
-_qtSetQmakePath() {
+_qtPreConfigureHook() {
+    # Find the temporary qmake executable first.
+    # This must run after all the environment hooks!
     export PATH="$NIX_QT5_TMP/bin${PATH:+:}$PATH"
+
+    # Link all runtime module dependencies into the temporary directory.
+    IFS=: read -a modules <<< $NIX_QT5_MODULES
+    for module in ${modules[@]}; do
+        _qtLinkModuleDir "$module" "lib"
+    done
+
+    # Link all the build-time module dependencies into the temporary directory.
+    IFS=: read -a modules <<< $NIX_QT5_MODULES_DEV
+    for module in ${modules[@]}; do
+        _qtLinkModuleDir "$module" "bin"
+        _qtLinkModuleDir "$module" "include"
+        _qtLinkModuleDir "$module" "lib"
+        _qtLinkModuleDir "$module" "mkspecs"
+        _qtLinkModuleDir "$module" "share"
+    done
 }
+if [ -z "$NIX_QT5_TMP" ]; then
+    postInstallHooks+=(_qtPostInstallHook)
+fi
 
 if [ -z "$NIX_QT5_TMP" ]; then
     if [ -z "$NIX_QT_SUBMODULE" ]; then
@@ -97,7 +119,6 @@ if [ -z "$NIX_QT5_TMP" ]; then
     else
         NIX_QT5_TMP=$out
     fi
-    postInstallHooks+=(_qtRmTmp)
 
     mkdir -p "$NIX_QT5_TMP/nix-support"
     for subdir in bin include lib mkspecs share; do
@@ -105,8 +126,6 @@ if [ -z "$NIX_QT5_TMP" ]; then
         echo "$subdir/" >> "$NIX_QT5_TMP/nix-support/qt-inputs"
     done
 
-    postHooks+=(_qtSetCMakePrefix)
-
     cp "@dev@/bin/qmake" "$NIX_QT5_TMP/bin"
     echo "bin/qmake" >> "$NIX_QT5_TMP/nix-support/qt-inputs"
 
@@ -120,48 +139,5 @@ EOF
     echo "bin/qt.conf" >> "$NIX_QT5_TMP/nix-support/qt-inputs"
 
     export QMAKE="$NIX_QT5_TMP/bin/qmake"
-
-    # Set PATH to find qmake first in a preConfigure hook
-    # It must run after all the envHooks!
-    preConfigureHooks+=(_qtSetQmakePath)
 fi
 
-qt5LinkModuleDir() {
-    if [ -d "$1/$2" ]; then
-        @lndir@/bin/lndir -silent "$1/$2" "$NIX_QT5_TMP/$2"
-        find "$1/$2" -printf "$2/%P\n" >> "$NIX_QT5_TMP/nix-support/qt-inputs"
-    fi
-}
-
-NIX_QT5_MODULES="${NIX_QT5_MODULES}${NIX_QT5_MODULES:+:}@out@"
-NIX_QT5_MODULES_DEV="${NIX_QT5_MODULES_DEV}${NIX_QT5_MODULES_DEV:+:}@dev@"
-
-_qtLinkAllModules() {
-    IFS=: read -a modules <<< $NIX_QT5_MODULES
-    for module in ${modules[@]}; do
-        qt5LinkModuleDir "$module" "lib"
-    done
-
-    IFS=: read -a modules <<< $NIX_QT5_MODULES_DEV
-    for module in ${modules[@]}; do
-        qt5LinkModuleDir "$module" "bin"
-        qt5LinkModuleDir "$module" "include"
-        qt5LinkModuleDir "$module" "lib"
-        qt5LinkModuleDir "$module" "mkspecs"
-        qt5LinkModuleDir "$module" "share"
-    done
-}
-
-preConfigureHooks+=(_qtLinkAllModules)
-
-_qtFixCMakePaths() {
-    find "${!outputLib}" -name "*.cmake" | while read file; do
-        substituteInPlace "$file" \
-            --subst-var-by NIX_OUT "${!outputLib}" \
-            --subst-var-by NIX_DEV "${!outputDev}"
-    done
-}
-
-if [ -n "$NIX_QT_SUBMODULE" ]; then
-    postInstallHooks+=(_qtFixCMakePaths)
-fi

From d9f29afa64c4b626f94e0f2ef6c03f19b7dab1e6 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Thu, 18 May 2017 20:08:10 -0500
Subject: [PATCH 032/189] qt5: use one output by default

---
 pkgs/applications/kde/build-support/application.nix | 2 ++
 pkgs/development/libraries/qt-5/5.6/default.nix     | 3 +--
 pkgs/development/libraries/qt-5/5.8/default.nix     | 3 +--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/kde/build-support/application.nix b/pkgs/applications/kde/build-support/application.nix
index a5d1ccc3add..892d82fb51e 100644
--- a/pkgs/applications/kde/build-support/application.nix
+++ b/pkgs/applications/kde/build-support/application.nix
@@ -11,6 +11,8 @@ mkDerivation (args // {
   name = "${name}-${version}";
   inherit src;
 
+  outputs = args.outputs or [ "out" "dev" ];
+
   meta = {
     platforms = lib.platforms.linux;
     homepage = "http://www.kde.org";
diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix
index b286f8c5298..b250ae8b952 100644
--- a/pkgs/development/libraries/qt-5/5.6/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/default.nix
@@ -48,8 +48,6 @@ let
   mkDerivation = args:
     stdenv.mkDerivation (args // {
 
-      outputs = args.outputs or [ "out" "dev" ];
-
       qmakeFlags =
         (args.qmakeFlags or [])
         ++ optional (debug != null)
@@ -82,6 +80,7 @@ let
 
       NIX_QT_SUBMODULE = args.NIX_QT_SUBMODULE or true;
 
+      outputs = args.outputs or [ "out" "dev" ];
       setOutputFlags = args.setOutputFlags or false;
 
       setupHook = ../qtsubmodule-setup-hook.sh;
diff --git a/pkgs/development/libraries/qt-5/5.8/default.nix b/pkgs/development/libraries/qt-5/5.8/default.nix
index 034c7fd10e1..fd4769a02c6 100644
--- a/pkgs/development/libraries/qt-5/5.8/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/default.nix
@@ -39,8 +39,6 @@ let
   mkDerivation = args:
     stdenv.mkDerivation (args // {
 
-      outputs = args.outputs or [ "out" "dev" ];
-
       qmakeFlags =
         (args.qmakeFlags or [])
         ++ optional (debug != null)
@@ -73,6 +71,7 @@ let
 
       NIX_QT_SUBMODULE = args.NIX_QT_SUBMODULE or true;
 
+      outputs = args.outputs or [ "out" "dev" ];
       setOutputFlags = args.setOutputFlags or false;
 
       setupHook = ../qtsubmodule-setup-hook.sh;

From dea7372ebfe197dfe722bc375e415020a3cf6d96 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Thu, 18 May 2017 21:04:39 -0500
Subject: [PATCH 033/189] qtbase: fix plugin path in CMake modules

---
 pkgs/development/libraries/qt-5/5.6/qtbase/default.nix       | 5 +++--
 pkgs/development/libraries/qt-5/5.8/qtbase/cmake-paths.patch | 4 ++--
 pkgs/development/libraries/qt-5/5.8/qtbase/default.nix       | 5 +++--
 pkgs/development/libraries/qt-5/qtbase-setup-hook.sh         | 5 +++--
 4 files changed, 11 insertions(+), 8 deletions(-)

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 a4039714a60..4e7c7ea5456 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/default.nix
@@ -237,8 +237,9 @@ stdenv.mkDerivation {
   postInstall = ''
     find "$out" -name "*.cmake" | while read file; do
         substituteInPlace "$file" \
-            --subst-var-by NIX_OUT "$out" \
-            --subst-var-by NIX_DEV "$dev"
+            --subst-var-by NIX_OUT "''${!outputLib}" \
+            --subst-var-by NIX_DEV "''${!outputDev}" \
+            --subst-var-by NIX_BIN "''${!outputBin}"
     done
   '';
 
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/cmake-paths.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/cmake-paths.patch
index c43653558e3..3408b235e0c 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/cmake-paths.patch
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/cmake-paths.patch
@@ -306,11 +306,11 @@ Index: qtbase-opensource-src-5.8.0/mkspecs/features/data/cmake/Qt5PluginTarget.c
  
  !!IF !isEmpty(CMAKE_RELEASE_TYPE)
 -_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
-+_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"@NIX_OUT@/$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
++_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME RELEASE \"@NIX_BIN@/$${CMAKE_PLUGIN_LOCATION_RELEASE}\")
  !!ENDIF
  !!IF !isEmpty(CMAKE_DEBUG_TYPE)
 -_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
-+_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"@NIX_OUT@/$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
++_populate_$${CMAKE_MODULE_NAME}_plugin_properties($$CMAKE_PLUGIN_NAME DEBUG \"@NIX_BIN@/$${CMAKE_PLUGIN_LOCATION_DEBUG}\")
  !!ENDIF
  
  list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME)
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
index a627bcbee52..3048baeb327 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
@@ -269,8 +269,9 @@ stdenv.mkDerivation {
     ''
       find "$out" -name "*.cmake" | while read file; do
           substituteInPlace "$file" \
-              --subst-var-by NIX_OUT "$out" \
-              --subst-var-by NIX_DEV "$dev"
+              --subst-var-by NIX_OUT "''${!outputLib}" \
+              --subst-var-by NIX_DEV "''${!outputDev}" \
+              --subst-var-by NIX_BIN "''${!outputBin}"
       done
     '';
 
diff --git a/pkgs/development/libraries/qt-5/qtbase-setup-hook.sh b/pkgs/development/libraries/qt-5/qtbase-setup-hook.sh
index 35df52d7a08..e7752af4397 100644
--- a/pkgs/development/libraries/qt-5/qtbase-setup-hook.sh
+++ b/pkgs/development/libraries/qt-5/qtbase-setup-hook.sh
@@ -72,8 +72,9 @@ _qtPostInstallHook() {
     if [ -n "$NIX_QT_SUBMODULE" ]; then
         find "${!outputLib}" -name "*.cmake" | while read file; do
             substituteInPlace "$file" \
-                              --subst-var-by NIX_OUT "${!outputLib}" \
-                              --subst-var-by NIX_DEV "${!outputDev}"
+                --subst-var-by NIX_OUT "${!outputLib}" \
+                --subst-var-by NIX_DEV "${!outputDev}" \
+                --subst-var-by NIX_BIN "${!outputBin}"
         done
     fi
 }

From b9ae0c7185c500f8f2d6688c96f59777493dc229 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 26 May 2017 15:47:39 -0500
Subject: [PATCH 034/189] kwallet-pam: set path to socat

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

diff --git a/pkgs/desktops/plasma-5/kwallet-pam.nix b/pkgs/desktops/plasma-5/kwallet-pam.nix
index b7a783f82a3..d555701c76d 100644
--- a/pkgs/desktops/plasma-5/kwallet-pam.nix
+++ b/pkgs/desktops/plasma-5/kwallet-pam.nix
@@ -1,10 +1,11 @@
-{ mkDerivation, extra-cmake-modules, pam, socat, libgcrypt }:
+{ mkDerivation, lib, extra-cmake-modules, pam, socat, libgcrypt, qtbase, }:
 
 mkDerivation {
   name = "kwallet-pam";
 
   nativeBuildInputs = [ extra-cmake-modules ];
-
-  buildInputs = [ pam socat libgcrypt ];
-
+  buildInputs = [ pam socat libgcrypt qtbase ];
+  postPatch = ''
+    sed -i pam_kwallet_init -e "s|socat|${lib.getBin socat}/bin/socat|"
+  '';
 }

From 078c88a7a715ed5b0245d46c0ce6776cb5e73a8b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 19 May 2017 07:42:08 -0500
Subject: [PATCH 035/189] startkde: use absolute paths to required programs

The dependency on socat is removed because kwallet setup is deferred to kwallet-pam.
---
 pkgs/desktops/plasma-5/startkde/default.nix | 62 +++++++++---------
 pkgs/desktops/plasma-5/startkde/startkde.sh | 72 +++++++++------------
 2 files changed, 61 insertions(+), 73 deletions(-)

diff --git a/pkgs/desktops/plasma-5/startkde/default.nix b/pkgs/desktops/plasma-5/startkde/default.nix
index 25ebdd7f332..3b04c037073 100644
--- a/pkgs/desktops/plasma-5/startkde/default.nix
+++ b/pkgs/desktops/plasma-5/startkde/default.nix
@@ -1,41 +1,41 @@
 {
-  stdenv, lib, runCommand, dbus, qttools, socat, gnugrep, gnused, kconfig,
-  kinit, kservice, plasma-workspace, xmessage, xprop, xsetroot, qtbase,
-  qtdeclarative, qtgraphicaleffects, qtquickcontrols, qtquickcontrols2,
-  qtscript, qtsvg, qtx11extras, qtxmlpatterns
+  stdenv, lib, runCommand, substituteAll, dbus, gnugrep, gnused, kconfig,
+  kinit, kservice, plasma-desktop, plasma-workspace, xmessage, xprop, xrdb,
+  xsetroot, qttools,
 }:
 
 let
 
-  env = {
+  inherit (lib) getBin getLib;
+
+  script = substituteAll {
+    src = ./startkde.sh;
     inherit (stdenv) shell;
-    bins = builtins.map (pkg: pkg.out or pkg)
-      [
-        dbus qttools socat
-        gnugrep gnused
-        kconfig kinit kservice
-        plasma-workspace
-        xmessage xprop xsetroot
-      ];
-    libs = builtins.map (pkg: pkg.out or pkg)
-      [
-        qtbase qtdeclarative qtgraphicaleffects qtquickcontrols qtquickcontrols2
-        qtscript qtsvg qtx11extras qtxmlpatterns
-      ];
+    kbuildsycoca5 = "${getBin kservice}/bin/kbuildsycoca5";
+    sed = "${getBin gnused}/bin/sed";
+    kcheckrunning = "${getBin plasma-workspace}/bin/kcheckrunning";
+    xmessage = "${getBin xmessage}/bin/xmessage";
+    kstartupconfig5 = "${getBin plasma-workspace}/bin/kstartupconfig5";
+    kapplymousetheme = "${getBin plasma-desktop}/bin/kapplymousetheme";
+    xsetroot = "${getBin xsetroot}/bin/xsetroot";
+    xrdb = "${getBin xrdb}/bin/xrdb";
+    ksplashqml = "${getBin plasma-workspace}/bin/ksplashqml";
+    qdbus = "${getBin qttools}/bin/qdbus";
+    xprop = "${getBin xprop}/bin/xprop";
+    qtpaths = "${getBin qttools}/bin/qtpaths";
+    dbus_update_activation_environment = "${getBin dbus}/bin/dbus-update-activation-environment";
+    start_kdeinit_wrapper = "${getLib kinit}/lib/libexec/kf5/start_kdeinit_wrapper";
+    kwrapper5 = "${getBin kinit}/bin/kwrapper5";
+    ksmserver = "${getBin plasma-workspace}/bin/ksmserver";
+    kreadconfig5 = "${getBin kconfig}/bin/kreadconfig5";
+    kdeinit5_shutdown = "${getBin kinit}/bin/kdeinit5_shutdown";
   };
 
-in runCommand "startkde" env ''
+in
 
-  # Configure PATH variable
-  suffixPATH=
-  for p in $bins; do
-      addToSearchPath suffixPATH "$p/bin"
-      addToSearchPath suffixPATH "$p/lib/libexec"
-      addToSearchPath suffixPATH "$p/lib/libexec/kf5"
-  done
-
-  substitute ${./startkde.sh} "$out" \
-      --subst-var shell \
-      --subst-var suffixPATH
-  chmod +x "$out"
+runCommand "startkde.sh"
+{ preferLocalBuild = true; allowSubstitutes = false; }
+''
+  cp ${script} $out
+  chmod +x $out
 ''
diff --git a/pkgs/desktops/plasma-5/startkde/startkde.sh b/pkgs/desktops/plasma-5/startkde/startkde.sh
index 53e7fbb0569..f8b4f4844e2 100755
--- a/pkgs/desktops/plasma-5/startkde/startkde.sh
+++ b/pkgs/desktops/plasma-5/startkde/startkde.sh
@@ -1,10 +1,6 @@
 #!@shell@
 
-PATH="$PATH${PATH:+:}@suffixPATH@"
-
-echo "NIX_PROFILES=\"$NIX_PROFILES\""
-
-kbuildsycoca5
+@kbuildsycoca5@
 
 # Set the default GTK 2 theme
 if ! [ -e $HOME/.gtkrc-2.0 ] \
@@ -30,6 +26,7 @@ fi
 
 if ! [ -e $HOME/.config/gtk-3.0/settings.ini ] \
        && [ -e /run/current-system/sw/share/themes/Breeze/gtk-3.0 ]; then
+    mkdir -p $HOME/.config/gtk-3.0
     cat >$HOME/.config/gtk-3.0/settings.ini <<EOF
 [Settings]
 gtk-font-name=Sans Serif Regular 10
@@ -61,7 +58,7 @@ rm -fv $HOME/.cache/icon-cache.kcache
 # 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
+    @sed@ -e '/nix\\store\|nix\/store/ d' -i $HOME/.config/Trolltech.conf
 fi
 
 if test "x$1" = x--failsafe; then
@@ -79,11 +76,11 @@ trap 'echo GOT SIGHUP' HUP
 unset DYLD_FORCE_FLAT_NAMESPACE
 
 # 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."
+    @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."
@@ -105,7 +102,7 @@ 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
-configDir=$(qtpaths --writable-path GenericConfigLocation)
+configDir=$(@qtpaths@ --writable-path GenericConfigLocation)
 mkdir -p "$configDir"
 
 if ! [ -e $configDir/kcminputrc ]; then
@@ -162,10 +159,10 @@ activeFont=Noto Sans,12,-1,5,50,0,0,0,0,0,Bold
 EOF
 }
 
-kstartupconfig5
+@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
@@ -187,7 +184,7 @@ 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"
+    @kapplymousetheme@ "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"
     if test $? -eq 10; then
         XCURSOR_THEME=breeze_cursors
         export XCURSOR_THEME
@@ -211,10 +208,10 @@ unset THEME
 # If the user has overwritten fonts, the cursor font may be different now
 # so don't move this up.
 #
-xsetroot -cursor_name left_ptr
+@xsetroot@ -cursor_name left_ptr
 
 if test "$kcmfonts_general_forcefontdpi" -ne 0; then
-    xrdb -quiet -merge -nocpp <<EOF
+    @xrdb@ -quiet -merge -nocpp <<EOF
 Xft.dpi: $kcmfonts_general_forcefontdpi
 EOF
 fi
@@ -227,7 +224,7 @@ 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=$(@ksplashqml@ "${ksplashrc_ksplash_theme}" --pid)
       ;;
     None)
       ;;
@@ -239,12 +236,12 @@ fi
 echo 'startkde: Starting up...'  1>&2
 
 # Make sure that D-Bus is running
-if qdbus >/dev/null 2>/dev/null; then
+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?"
+    @xmessage@ -geometry 500x100 "Could not start D-Bus. Can you call qdbus?"
     exit 1
 fi
 
@@ -272,11 +269,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
@@ -298,7 +295,7 @@ export XDG_CURRENT_DESKTOP
 # 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)
+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
@@ -306,37 +303,28 @@ for prefix in "${scriptpath[@]}"; do
   done
 done
 
-# 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
-dbus-update-activation-environment --systemd --all
+@dbus_update_activation_environment@ --systemd --all
 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 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
 
-qdbus org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit
+@qdbus@ org.kde.KSplash /KSplash org.kde.KSplash.setStage kinit
 
 # finally, give the session control to the session manager
 # see kdebase/ksmserver for the description of the rest of the startup sequence
@@ -353,15 +341,15 @@ test -n "$KDEWM" && KDEWM="--windowmanager $KDEWM"
 # lock now and do the rest of the KDE startup underneath the locker.
 KSMSERVEROPTIONS=""
 test -n "$dl" && KSMSERVEROPTIONS=" --lockscreen"
-kwrapper5 ksmserver $KDEWM $KSMSERVEROPTIONS
+@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."
+  @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)
@@ -372,8 +360,8 @@ if test x"$wait_drkonqi"x = x"true"x ; then
         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
@@ -385,12 +373,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 7dc961b310f377e31850e38472afc729b3c3085b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 19 May 2017 07:43:02 -0500
Subject: [PATCH 036/189] qttools: move runtime tools in postFixup

---
 pkgs/development/libraries/qt-5/5.8/qttools/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/qt-5/5.8/qttools/default.nix b/pkgs/development/libraries/qt-5/5.8/qttools/default.nix
index 6c0f540e79b..8c231271607 100644
--- a/pkgs/development/libraries/qt-5/5.8/qttools/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qttools/default.nix
@@ -7,7 +7,8 @@ qtSubmodule {
   qtInputs = [ qtbase ];
   outputs = [ "out" "dev" "bin" ];
   patches = copyPathsToStore (readPathsFromFile ./. ./series);
-  postInstall = ''
+  # qmake moves all binaries to $dev in preFixup
+  postFixup = ''
     moveToOutput "bin/qdbus" "$bin"
     moveToOutput "bin/qtpaths" "$bin"
   '';

From da942ea23f28c5a29882a802b728add1b6f309a6 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 9 May 2017 09:20:39 -0500
Subject: [PATCH 037/189] breeze-gtk: bump GTK3 version

---
 pkgs/desktops/plasma-5/breeze-gtk.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/plasma-5/breeze-gtk.nix b/pkgs/desktops/plasma-5/breeze-gtk.nix
index 9c204e3acb8..3ba952811cf 100644
--- a/pkgs/desktops/plasma-5/breeze-gtk.nix
+++ b/pkgs/desktops/plasma-5/breeze-gtk.nix
@@ -3,6 +3,6 @@
 mkDerivation {
   name = "breeze-gtk";
   nativeBuildInputs = [ extra-cmake-modules ];
-  cmakeFlags = [ "-DWITH_GTK3_VERSION=3.20" ];
+  cmakeFlags = [ "-DWITH_GTK3_VERSION=3.22" ];
   buildInputs = [ qtbase ];
 }

From 30ff56a20fede60f37285abe7e1609d68b965757 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 9 May 2017 09:20:59 -0500
Subject: [PATCH 038/189] breeze-gtk: patch builder to find GTK2 pixmap engine

This does not seem to be strictly necessary, but it also cannot hurt.
---
 pkgs/desktops/plasma-5/breeze-gtk.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/plasma-5/breeze-gtk.nix b/pkgs/desktops/plasma-5/breeze-gtk.nix
index 3ba952811cf..f2d76fe19e6 100644
--- a/pkgs/desktops/plasma-5/breeze-gtk.nix
+++ b/pkgs/desktops/plasma-5/breeze-gtk.nix
@@ -1,8 +1,14 @@
-{ mkDerivation , extra-cmake-modules , qtbase }:
+{ mkDerivation, lib, extra-cmake-modules, gtk2, qtbase, }:
+
+let inherit (lib) getLib; in
 
 mkDerivation {
   name = "breeze-gtk";
   nativeBuildInputs = [ extra-cmake-modules ];
   cmakeFlags = [ "-DWITH_GTK3_VERSION=3.22" ];
   buildInputs = [ qtbase ];
+  postPatch = ''
+    sed -i cmake/FindGTKEngine.cmake \
+      -e "s|\''${KDE_INSTALL_FULL_LIBDIR}|${getLib gtk2}/lib|"
+  '';
 }

From 05ef92e53a325aabd51bd7820a46d1359a53de2e Mon Sep 17 00:00:00 2001
From: Jos van den Oever <jos@vandenoever.info>
Date: Thu, 6 Apr 2017 22:35:12 +0200
Subject: [PATCH 039/189] gpgme: enable Qt 5 bindings

---
 pkgs/development/libraries/gpgme/default.nix         |  6 ++++--
 .../libraries/gpgme/gpgme_libsuffix.patch            | 12 ++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/gpgme/gpgme_libsuffix.patch

diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index 5601a8854ef..36d90604a82 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan }:
+{ stdenv, fetchurl, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan, qt5 }:
 
 stdenv.mkDerivation rec {
   name = "gpgme-1.9.0";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   outputs = [ "out" "dev" "info" ];
   outputBin = "dev"; # gpgme-config; not so sure about gpgme-tool
 
-  propagatedBuildInputs = [ libgpgerror glib libassuan pth ];
+  propagatedBuildInputs = [ libgpgerror glib libassuan pth qt5.qtbase ];
 
   nativeBuildInputs = [ pkgconfig gnupg ];
 
@@ -19,6 +19,8 @@ stdenv.mkDerivation rec {
     "--enable-fixed-path=${gnupg}/bin"
   ];
 
+  patches = [ ./gpgme_libsuffix.patch ];
+
   # https://www.gnupg.org/documentation/manuals/gpgme/Largefile-Support-_0028LFS_0029.html
   NIX_CFLAGS_COMPILE =
     with stdenv; lib.optional (system == "i686-linux") "-D_FILE_OFFSET_BITS=64";
diff --git a/pkgs/development/libraries/gpgme/gpgme_libsuffix.patch b/pkgs/development/libraries/gpgme/gpgme_libsuffix.patch
new file mode 100644
index 00000000000..4abc2757cf6
--- /dev/null
+++ b/pkgs/development/libraries/gpgme/gpgme_libsuffix.patch
@@ -0,0 +1,12 @@
+diff --git a/lang/cpp/src/GpgmeppConfig.cmake.in.in b/lang/cpp/src/GpgmeppConfig.cmake.in.in
+index 928d19f..cbe9713 100644 (file)
+--- a/lang/cpp/src/GpgmeppConfig.cmake.in.in
++++ b/lang/cpp/src/GpgmeppConfig.cmake.in.in
+@@ -63,7 +63,7 @@ add_library(Gpgmepp SHARED IMPORTED)
+ 
+ set_target_properties(Gpgmepp PROPERTIES
+   INTERFACE_INCLUDE_DIRECTORIES "@resolved_includedir@/gpgme++;@resolved_includedir@"
+-  INTERFACE_LINK_LIBRARIES "pthread;@resolved_libdir@/libgpgme@libsuffix@;@LIBASSUAN_LIBS@"
++  INTERFACE_LINK_LIBRARIES "pthread;@resolved_libdir@/libgpgme.so;@LIBASSUAN_LIBS@"
+   IMPORTED_LOCATION "@resolved_libdir@/libgpgmepp.so"
+ )

From f5c00c43bb6d4a4a09e4b4a8a273833deba994cc Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 9 May 2017 10:31:12 -0500
Subject: [PATCH 040/189] qgpgme: init at 1.9.0

---
 pkgs/development/libraries/gpgme/default.nix | 21 +++++++++++++++-----
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index 36d90604a82..8ae88944dd1 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -1,4 +1,7 @@
-{ stdenv, fetchurl, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan, qt5 }:
+{ stdenv, fetchurl, fetchpatch, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan
+, qtbase ? null }:
+
+let inherit (stdenv) lib system; in
 
 stdenv.mkDerivation rec {
   name = "gpgme-1.9.0";
@@ -8,10 +11,20 @@ stdenv.mkDerivation rec {
     sha256 = "1ssc0gs02r4fasabk7c6v6r865k2j02mpb5g1vkpbmzsigdzwa8v";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=commitdiff_plain;h=5d4f977dac542340c877fdd4b1304fa8f6e058e6";
+      sha256 = "0swpxzd3x3b6h2ry2py9j8l0xp3vdw8rixxhgfavzia5p869qyyx";
+      name = "qgpgme-format-security.patch";
+    })
+  ];
+
   outputs = [ "out" "dev" "info" ];
   outputBin = "dev"; # gpgme-config; not so sure about gpgme-tool
 
-  propagatedBuildInputs = [ libgpgerror glib libassuan pth qt5.qtbase ];
+  propagatedBuildInputs =
+    [ libgpgerror glib libassuan pth ]
+    ++ lib.optional (qtbase != null) qtbase;
 
   nativeBuildInputs = [ pkgconfig gnupg ];
 
@@ -19,11 +32,9 @@ stdenv.mkDerivation rec {
     "--enable-fixed-path=${gnupg}/bin"
   ];
 
-  patches = [ ./gpgme_libsuffix.patch ];
-
   # https://www.gnupg.org/documentation/manuals/gpgme/Largefile-Support-_0028LFS_0029.html
   NIX_CFLAGS_COMPILE =
-    with stdenv; lib.optional (system == "i686-linux") "-D_FILE_OFFSET_BITS=64";
+    lib.optional (system == "i686-linux") "-D_FILE_OFFSET_BITS=64";
 
   meta = with stdenv.lib; {
     homepage = "https://gnupg.org/software/gpgme/index.html";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 68a1c2d29ea..153f6c0a7f7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9773,6 +9773,8 @@ with pkgs;
 
     fcitx-qt5 = callPackage ../tools/inputmethods/fcitx/fcitx-qt5.nix { };
 
+    qgpgme = callPackage ../development/libraries/gpgme { };
+
     grantlee = callPackage ../development/libraries/grantlee/5.x.nix { };
 
     inherit (callPackage ../development/libraries/kirigami { })

From 3acfd310507bb6f41dfa947524dbb329714d2e79 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 9 May 2017 18:24:46 -0500
Subject: [PATCH 041/189] akonadi: fix runtime paths

---
 pkgs/applications/kde/akonadi.nix             |  20 ----
 .../kde/akonadi/akonadi-paths.patch           | 105 ++++++++++++++++++
 .../kde/akonadi/akonadi-timestamps.patch      |  14 +++
 pkgs/applications/kde/akonadi/default.nix     |  36 ++++++
 pkgs/applications/kde/akonadi/series          |   2 +
 pkgs/applications/kde/default.nix             |   2 +-
 6 files changed, 158 insertions(+), 21 deletions(-)
 delete mode 100644 pkgs/applications/kde/akonadi.nix
 create mode 100644 pkgs/applications/kde/akonadi/akonadi-paths.patch
 create mode 100644 pkgs/applications/kde/akonadi/akonadi-timestamps.patch
 create mode 100644 pkgs/applications/kde/akonadi/default.nix
 create mode 100644 pkgs/applications/kde/akonadi/series

diff --git a/pkgs/applications/kde/akonadi.nix b/pkgs/applications/kde/akonadi.nix
deleted file mode 100644
index 367fdd36fb8..00000000000
--- a/pkgs/applications/kde/akonadi.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  mkDerivation, lib,
-  extra-cmake-modules,
-  kcompletion, kconfigwidgets, kdbusaddons, kdesignerplugin, kiconthemes,
-  kio,
-  boost, kitemmodels
-}:
-
-mkDerivation {
-  name = "akonadi";
-  meta = {
-    license = [ lib.licenses.lgpl21 ];
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kcompletion kconfigwidgets kdbusaddons kdesignerplugin kiconthemes kio
-  ];
-  propagatedBuildInputs = [ boost kitemmodels ];
-}
diff --git a/pkgs/applications/kde/akonadi/akonadi-paths.patch b/pkgs/applications/kde/akonadi/akonadi-paths.patch
new file mode 100644
index 00000000000..690664791f4
--- /dev/null
+++ b/pkgs/applications/kde/akonadi/akonadi-paths.patch
@@ -0,0 +1,105 @@
+Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp
+===================================================================
+--- akonadi-17.04.0.orig/src/server/storage/dbconfigmysql.cpp
++++ akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp
+@@ -76,20 +76,11 @@ bool DbConfigMysql::init(QSettings &sett
+         defaultServerPath = QStringLiteral(MYSQLD_EXECUTABLE);
+     }
+ #endif
+-    const QStringList mysqldSearchPath = QStringList()
+-                                         << QStringLiteral("/usr/bin")
+-                                         << QStringLiteral("/usr/sbin")
+-                                         << QStringLiteral("/usr/local/sbin")
+-                                         << QStringLiteral("/usr/local/libexec")
+-                                         << QStringLiteral("/usr/libexec")
+-                                         << QStringLiteral("/opt/mysql/libexec")
+-                                         << QStringLiteral("/opt/local/lib/mysql5/bin")
+-                                         << QStringLiteral("/opt/mysql/sbin");
+     if (defaultServerPath.isEmpty()) {
+-        defaultServerPath = XdgBaseDirs::findExecutableFile(QStringLiteral("mysqld"), mysqldSearchPath);
++        defaultServerPath = QStringLiteral(NIXPKGS_MYSQL_MYSQLD);
+     }
+ 
+-    const QString mysqladminPath = XdgBaseDirs::findExecutableFile(QStringLiteral("mysqladmin"), mysqldSearchPath);
++    const QString mysqladminPath = QStringLiteral(NIXPKGS_MYSQL_MYSQLADMIN);
+     if (!mysqladminPath.isEmpty()) {
+ #ifndef Q_OS_WIN
+         defaultCleanShutdownCommand = QStringLiteral("%1 --defaults-file=%2/mysql.conf --socket=%3/mysql.socket shutdown")
+@@ -99,10 +90,10 @@ bool DbConfigMysql::init(QSettings &sett
+ #endif
+     }
+ 
+-    mMysqlInstallDbPath = XdgBaseDirs::findExecutableFile(QStringLiteral("mysql_install_db"), mysqldSearchPath);
++    mMysqlInstallDbPath = QStringLiteral(NIXPKGS_MYSQL_MYSQL_INSTALL_DB);
+     qCDebug(AKONADISERVER_LOG) << "Found mysql_install_db: " << mMysqlInstallDbPath;
+ 
+-    mMysqlCheckPath = XdgBaseDirs::findExecutableFile(QStringLiteral("mysqlcheck"), mysqldSearchPath);
++    mMysqlCheckPath = QStringLiteral(NIXPKGS_MYSQL_MYSQLCHECK);
+     qCDebug(AKONADISERVER_LOG) << "Found mysqlcheck: " << mMysqlCheckPath;
+ 
+     mInternalServer = settings.value(QStringLiteral("QMYSQL/StartServer"), defaultInternalServer).toBool();
+@@ -119,7 +110,7 @@ bool DbConfigMysql::init(QSettings &sett
+     mUserName = settings.value(QStringLiteral("User")).toString();
+     mPassword = settings.value(QStringLiteral("Password")).toString();
+     mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString();
+-    mMysqldPath = settings.value(QStringLiteral("ServerPath"), defaultServerPath).toString();
++    mMysqldPath = QStringLiteral(NIXPKGS_MYSQL_MYSQLD);
+     mCleanServerShutdownCommand = settings.value(QStringLiteral("CleanServerShutdownCommand"), defaultCleanShutdownCommand).toString();
+     settings.endGroup();
+ 
+@@ -196,7 +187,7 @@ bool DbConfigMysql::startInternalServer(
+ #endif
+ 
+     // generate config file
+-    const QString globalConfig = XdgBaseDirs::findResourceFile("config", QStringLiteral("akonadi/mysql-global.conf"));
++    const QString globalConfig = QStringLiteral(NIX_OUT "/etc/xdg/akonadi/mysql-global.conf");
+     const QString localConfig  = XdgBaseDirs::findResourceFile("config", QStringLiteral("akonadi/mysql-local.conf"));
+     const QString actualConfig = StandardDirs::saveDir("data") + QLatin1String("/mysql.conf");
+     if (globalConfig.isEmpty()) {
+Index: akonadi-17.04.0/src/server/storage/dbconfigpostgresql.cpp
+===================================================================
+--- akonadi-17.04.0.orig/src/server/storage/dbconfigpostgresql.cpp
++++ akonadi-17.04.0/src/server/storage/dbconfigpostgresql.cpp
+@@ -97,8 +97,8 @@ bool DbConfigPostgresql::init(QSettings
+         }
+         postgresSearchPath.append(postgresVersionedSearchPaths);
+ 
+-        defaultServerPath = XdgBaseDirs::findExecutableFile(QStringLiteral("pg_ctl"), postgresSearchPath);
+-        defaultInitDbPath = XdgBaseDirs::findExecutableFile(QStringLiteral("initdb"), postgresSearchPath);
++        defaultServerPath = QStringLiteral(NIXPKGS_POSTGRES_PG_CTL);
++        defaultInitDbPath = QStringLiteral(NIXPKGS_POSTGRES_INITDB);
+         defaultHostName = Utils::preferredSocketDirectory(StandardDirs::saveDir("data", QStringLiteral("db_misc")));
+         defaultPgData = StandardDirs::saveDir("data", QStringLiteral("db_data"));
+     }
+Index: akonadi-17.04.0/src/akonadicontrol/agentprocessinstance.cpp
+===================================================================
+--- akonadi-17.04.0.orig/src/akonadicontrol/agentprocessinstance.cpp
++++ akonadi-17.04.0/src/akonadicontrol/agentprocessinstance.cpp
+@@ -62,7 +62,7 @@ bool AgentProcessInstance::start(const A
+     } else {
+         Q_ASSERT(agentInfo.launchMethod == AgentType::Launcher);
+         const QStringList arguments = QStringList() << executable << identifier();
+-        const QString agentLauncherExec = XdgBaseDirs::findExecutableFile(QStringLiteral("akonadi_agent_launcher"));
++        const QString agentLauncherExec = QStringLiteral(NIX_OUT "/bin/akonadi_agent_launcher");
+         mController->start(agentLauncherExec, arguments);
+     }
+     return true;
+Index: akonadi-17.04.0/src/akonadicontrol/agentmanager.cpp
+===================================================================
+--- akonadi-17.04.0.orig/src/akonadicontrol/agentmanager.cpp
++++ akonadi-17.04.0/src/akonadicontrol/agentmanager.cpp
+@@ -102,12 +102,12 @@ AgentManager::AgentManager(bool verbose,
+     mStorageController = new Akonadi::ProcessControl;
+     mStorageController->setShutdownTimeout(15 * 1000);   // the server needs more time for shutdown if we are using an internal mysqld
+     connect(mStorageController, &Akonadi::ProcessControl::unableToStart, this, &AgentManager::serverFailure);
+-    mStorageController->start(QStringLiteral("akonadiserver"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);
++    mStorageController->start(QStringLiteral(NIX_OUT "/bin/akonadiserver"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);
+ 
+     if (mAgentServerEnabled) {
+         mAgentServer = new Akonadi::ProcessControl;
+         connect(mAgentServer, &Akonadi::ProcessControl::unableToStart, this, &AgentManager::agentServerFailure);
+-        mAgentServer->start(QStringLiteral("akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);
++        mAgentServer->start(QStringLiteral(NIX_OUT "/bin/akonadi_agent_server"), serviceArgs, Akonadi::ProcessControl::RestartOnCrash);
+     }
+ 
+ #ifndef QT_NO_DEBUG
diff --git a/pkgs/applications/kde/akonadi/akonadi-timestamps.patch b/pkgs/applications/kde/akonadi/akonadi-timestamps.patch
new file mode 100644
index 00000000000..25a835f5ba2
--- /dev/null
+++ b/pkgs/applications/kde/akonadi/akonadi-timestamps.patch
@@ -0,0 +1,14 @@
+Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp
+===================================================================
+--- akonadi-17.04.0.orig/src/server/storage/dbconfigmysql.cpp
++++ akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp
+@@ -229,8 +229,7 @@ bool DbConfigMysql::startInternalServer(
+     bool confUpdate = false;
+     QFile actualFile(actualConfig);
+     // update conf only if either global (or local) is newer than actual
+-    if ((QFileInfo(globalConfig).lastModified() > QFileInfo(actualFile).lastModified()) ||
+-            (QFileInfo(localConfig).lastModified()  > QFileInfo(actualFile).lastModified())) {
++    if (true) {
+         QFile globalFile(globalConfig);
+         QFile localFile(localConfig);
+         if (globalFile.open(QFile::ReadOnly) && actualFile.open(QFile::WriteOnly)) {
diff --git a/pkgs/applications/kde/akonadi/default.nix b/pkgs/applications/kde/akonadi/default.nix
new file mode 100644
index 00000000000..a264ebc9f09
--- /dev/null
+++ b/pkgs/applications/kde/akonadi/default.nix
@@ -0,0 +1,36 @@
+{
+  mkDerivation, copyPathsToStore, lib,
+  extra-cmake-modules,
+  kcompletion, kconfigwidgets, kdbusaddons, kdesignerplugin, kiconthemes,
+  kio,
+  boost, kitemmodels,
+  mysql
+}:
+
+mkDerivation {
+  name = "akonadi";
+  meta = {
+    license = [ lib.licenses.lgpl21 ];
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [
+    kcompletion kconfigwidgets kdbusaddons kdesignerplugin kiconthemes kio
+  ];
+  propagatedBuildInputs = [ boost kitemmodels ];
+  cmakeFlags = [
+    "-DMYSQLD_EXECUTABLE=${lib.getBin mysql}/bin/mysqld"
+  ];
+  NIX_CFLAGS_COMPILE = [
+    ''-DNIXPKGS_MYSQL_MYSQLD="${lib.getBin mysql}/bin/mysqld"''
+    ''-DNIXPKGS_MYSQL_MYSQLADMIN="${lib.getBin mysql}/bin/mysqladmin"''
+    ''-DNIXPKGS_MYSQL_MYSQL_INSTALL_DB="${lib.getBin mysql}/bin/mysql_install_db"''
+    ''-DNIXPKGS_MYSQL_MYSQLCHECK="${lib.getBin mysql}/bin/mysqlcheck"''
+    ''-DNIXPKGS_POSTGRES_PG_CTL=""''
+    ''-DNIXPKGS_POSTGRES_INITDB=""''
+  ];
+  preConfigure = ''
+    NIX_CFLAGS_COMPILE+=" -DNIX_OUT=\"$out\""
+  '';
+}
diff --git a/pkgs/applications/kde/akonadi/series b/pkgs/applications/kde/akonadi/series
new file mode 100644
index 00000000000..9e067f0a000
--- /dev/null
+++ b/pkgs/applications/kde/akonadi/series
@@ -0,0 +1,2 @@
+akonadi-paths.patch
+akonadi-timestamps.patch
diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 931132cf428..d8b8c4242cb 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -48,7 +48,7 @@ let
       };
     in {
       kdelibs = callPackage ./kdelibs { inherit attica phonon; };
-      akonadi = callPackage ./akonadi.nix {};
+      akonadi = callPackage ./akonadi {};
       akonadi-contacts = callPackage ./akonadi-contacts.nix {};
       akonadi-mime = callPackage ./akonadi-mime.nix {};
       ark = callPackage ./ark/default.nix {};

From be9a4fe6ca399364e732e14a69075bc3a23047d8 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Thu, 18 May 2017 18:28:17 -0500
Subject: [PATCH 042/189] akonadi: do not store path to mysqld in configuration

---
 .../kde/akonadi/akonadi-paths.patch           | 50 +++++++++++++++----
 1 file changed, 41 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/kde/akonadi/akonadi-paths.patch b/pkgs/applications/kde/akonadi/akonadi-paths.patch
index 690664791f4..782b6cede9a 100644
--- a/pkgs/applications/kde/akonadi/akonadi-paths.patch
+++ b/pkgs/applications/kde/akonadi/akonadi-paths.patch
@@ -2,10 +2,23 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp
 ===================================================================
 --- akonadi-17.04.0.orig/src/server/storage/dbconfigmysql.cpp
 +++ akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp
-@@ -76,20 +76,11 @@ bool DbConfigMysql::init(QSettings &sett
-         defaultServerPath = QStringLiteral(MYSQLD_EXECUTABLE);
-     }
+@@ -63,7 +63,6 @@ bool DbConfigMysql::init(QSettings &sett
+     // determine default settings depending on the driver
+     QString defaultHostName;
+     QString defaultOptions;
+-    QString defaultServerPath;
+     QString defaultCleanShutdownCommand;
+ 
+ #ifndef Q_OS_WIN
+@@ -71,25 +70,8 @@ bool DbConfigMysql::init(QSettings &sett
  #endif
+ 
+     const bool defaultInternalServer = true;
+-#ifdef MYSQLD_EXECUTABLE
+-    if (QFile::exists(QStringLiteral(MYSQLD_EXECUTABLE))) {
+-        defaultServerPath = QStringLiteral(MYSQLD_EXECUTABLE);
+-    }
+-#endif
 -    const QStringList mysqldSearchPath = QStringList()
 -                                         << QStringLiteral("/usr/bin")
 -                                         << QStringLiteral("/usr/sbin")
@@ -15,17 +28,16 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp
 -                                         << QStringLiteral("/opt/mysql/libexec")
 -                                         << QStringLiteral("/opt/local/lib/mysql5/bin")
 -                                         << QStringLiteral("/opt/mysql/sbin");
-     if (defaultServerPath.isEmpty()) {
+-    if (defaultServerPath.isEmpty()) {
 -        defaultServerPath = XdgBaseDirs::findExecutableFile(QStringLiteral("mysqld"), mysqldSearchPath);
-+        defaultServerPath = QStringLiteral(NIXPKGS_MYSQL_MYSQLD);
-     }
+-    }
  
 -    const QString mysqladminPath = XdgBaseDirs::findExecutableFile(QStringLiteral("mysqladmin"), mysqldSearchPath);
 +    const QString mysqladminPath = QStringLiteral(NIXPKGS_MYSQL_MYSQLADMIN);
      if (!mysqladminPath.isEmpty()) {
  #ifndef Q_OS_WIN
          defaultCleanShutdownCommand = QStringLiteral("%1 --defaults-file=%2/mysql.conf --socket=%3/mysql.socket shutdown")
-@@ -99,10 +90,10 @@ bool DbConfigMysql::init(QSettings &sett
+@@ -99,10 +81,10 @@ bool DbConfigMysql::init(QSettings &sett
  #endif
      }
  
@@ -38,7 +50,7 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp
      qCDebug(AKONADISERVER_LOG) << "Found mysqlcheck: " << mMysqlCheckPath;
  
      mInternalServer = settings.value(QStringLiteral("QMYSQL/StartServer"), defaultInternalServer).toBool();
-@@ -119,7 +110,7 @@ bool DbConfigMysql::init(QSettings &sett
+@@ -119,7 +101,7 @@ bool DbConfigMysql::init(QSettings &sett
      mUserName = settings.value(QStringLiteral("User")).toString();
      mPassword = settings.value(QStringLiteral("Password")).toString();
      mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString();
@@ -47,7 +59,27 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigmysql.cpp
      mCleanServerShutdownCommand = settings.value(QStringLiteral("CleanServerShutdownCommand"), defaultCleanShutdownCommand).toString();
      settings.endGroup();
  
-@@ -196,7 +187,7 @@ bool DbConfigMysql::startInternalServer(
+@@ -129,9 +111,6 @@ bool DbConfigMysql::init(QSettings &sett
+         // intentionally not namespaced as we are the only one in this db instance when using internal mode
+         mDatabaseName = QStringLiteral("akonadi");
+     }
+-    if (mInternalServer && (mMysqldPath.isEmpty() || !QFile::exists(mMysqldPath))) {
+-        mMysqldPath = defaultServerPath;
+-    }
+ 
+     qCDebug(AKONADISERVER_LOG) << "Using mysqld:" << mMysqldPath;
+ 
+@@ -140,9 +119,6 @@ bool DbConfigMysql::init(QSettings &sett
+     settings.setValue(QStringLiteral("Name"), mDatabaseName);
+     settings.setValue(QStringLiteral("Host"), mHostName);
+     settings.setValue(QStringLiteral("Options"), mConnectionOptions);
+-    if (!mMysqldPath.isEmpty()) {
+-        settings.setValue(QStringLiteral("ServerPath"), mMysqldPath);
+-    }
+     settings.setValue(QStringLiteral("StartServer"), mInternalServer);
+     settings.endGroup();
+     settings.sync();
+@@ -196,7 +172,7 @@ bool DbConfigMysql::startInternalServer(
  #endif
  
      // generate config file

From fceb3794a209437d9c557f0e69a80ad97631a18b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Thu, 18 May 2017 18:30:35 -0500
Subject: [PATCH 043/189] akonadi: do not store path to pg_ctl in configuration

---
 .../kde/akonadi/akonadi-paths.patch           | 62 +++++++++++++++++--
 1 file changed, 58 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/kde/akonadi/akonadi-paths.patch b/pkgs/applications/kde/akonadi/akonadi-paths.patch
index 782b6cede9a..f1ae1f23cc9 100644
--- a/pkgs/applications/kde/akonadi/akonadi-paths.patch
+++ b/pkgs/applications/kde/akonadi/akonadi-paths.patch
@@ -92,17 +92,71 @@ Index: akonadi-17.04.0/src/server/storage/dbconfigpostgresql.cpp
 ===================================================================
 --- akonadi-17.04.0.orig/src/server/storage/dbconfigpostgresql.cpp
 +++ akonadi-17.04.0/src/server/storage/dbconfigpostgresql.cpp
-@@ -97,8 +97,8 @@ bool DbConfigPostgresql::init(QSettings
-         }
-         postgresSearchPath.append(postgresVersionedSearchPaths);
+@@ -58,7 +58,6 @@ bool DbConfigPostgresql::init(QSettings
+     // determine default settings depending on the driver
+     QString defaultHostName;
+     QString defaultOptions;
+-    QString defaultServerPath;
+     QString defaultInitDbPath;
+     QString defaultPgData;
  
+@@ -70,35 +69,7 @@ bool DbConfigPostgresql::init(QSettings
+ 
+     mInternalServer = settings.value(QStringLiteral("QPSQL/StartServer"), defaultInternalServer).toBool();
+     if (mInternalServer) {
+-        QStringList postgresSearchPath;
+-
+-#ifdef POSTGRES_PATH
+-        const QString dir(QStringLiteral(POSTGRES_PATH));
+-        if (QDir(dir).exists()) {
+-            postgresSearchPath << QStringLiteral(POSTGRES_PATH);
+-        }
+-#endif
+-        postgresSearchPath << QStringLiteral("/usr/sbin")
+-                           << QStringLiteral("/usr/local/sbin");
+-        // Locale all versions in /usr/lib/postgresql (i.e. /usr/lib/postgresql/X.Y) in reversed
+-        // sorted order, so we search from the newest one to the oldest.
+-        QStringList postgresVersionedSearchPaths;
+-        QDir versionedDir(QStringLiteral("/usr/lib/postgresql"));
+-        if (versionedDir.exists()) {
+-            const auto versionedDirs = versionedDir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name | QDir::Reversed);
+-            for (const auto &path : versionedDirs) {
+-                // Don't break once PostgreSQL 10 is released, but something more future-proof will be needed
+-                if (path.fileName().startsWith(QLatin1String("10."))) {
+-                    postgresVersionedSearchPaths.prepend(path.absoluteFilePath() + QStringLiteral("/bin"));
+-                } else {
+-                    postgresVersionedSearchPaths.append(path.absoluteFilePath() + QStringLiteral("/bin"));
+-                }
+-            }
+-        }
+-        postgresSearchPath.append(postgresVersionedSearchPaths);
+-
 -        defaultServerPath = XdgBaseDirs::findExecutableFile(QStringLiteral("pg_ctl"), postgresSearchPath);
 -        defaultInitDbPath = XdgBaseDirs::findExecutableFile(QStringLiteral("initdb"), postgresSearchPath);
-+        defaultServerPath = QStringLiteral(NIXPKGS_POSTGRES_PG_CTL);
 +        defaultInitDbPath = QStringLiteral(NIXPKGS_POSTGRES_INITDB);
          defaultHostName = Utils::preferredSocketDirectory(StandardDirs::saveDir("data", QStringLiteral("db_misc")));
          defaultPgData = StandardDirs::saveDir("data", QStringLiteral("db_data"));
      }
+@@ -118,10 +89,7 @@ bool DbConfigPostgresql::init(QSettings
+     mUserName = settings.value(QStringLiteral("User")).toString();
+     mPassword = settings.value(QStringLiteral("Password")).toString();
+     mConnectionOptions = settings.value(QStringLiteral("Options"), defaultOptions).toString();
+-    mServerPath = settings.value(QStringLiteral("ServerPath"), defaultServerPath).toString();
+-    if (mInternalServer && mServerPath.isEmpty()) {
+-        mServerPath = defaultServerPath;
+-    }
++    mServerPath = QStringLiteral(NIXPKGS_POSTGRES_PG_CTL);
+     qCDebug(AKONADISERVER_LOG) << "Found pg_ctl:" << mServerPath;
+     mInitDbPath = settings.value(QStringLiteral("InitDbPath"), defaultInitDbPath).toString();
+     if (mInternalServer && mInitDbPath.isEmpty()) {
+@@ -142,7 +110,6 @@ bool DbConfigPostgresql::init(QSettings
+         settings.setValue(QStringLiteral("Port"), mHostPort);
+     }
+     settings.setValue(QStringLiteral("Options"), mConnectionOptions);
+-    settings.setValue(QStringLiteral("ServerPath"), mServerPath);
+     settings.setValue(QStringLiteral("InitDbPath"), mInitDbPath);
+     settings.setValue(QStringLiteral("StartServer"), mInternalServer);
+     settings.endGroup();
 Index: akonadi-17.04.0/src/akonadicontrol/agentprocessinstance.cpp
 ===================================================================
 --- akonadi-17.04.0.orig/src/akonadicontrol/agentprocessinstance.cpp

From 9149faf6a9701fc3faa45f83fad3282f03d994ea Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 19 May 2017 09:31:44 -0500
Subject: [PATCH 044/189] prison: init at 5.33.0

---
 .../development/libraries/kde-frameworks/default.nix |  1 +
 pkgs/development/libraries/kde-frameworks/prison.nix | 12 ++++++++++++
 pkgs/top-level/all-packages.nix                      |  2 +-
 3 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/kde-frameworks/prison.nix

diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix
index abe17848f3b..3010a211db2 100644
--- a/pkgs/development/libraries/kde-frameworks/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/default.nix
@@ -158,6 +158,7 @@ let
       networkmanager-qt = callPackage ./networkmanager-qt.nix {};
       oxygen-icons5 = callPackage ./oxygen-icons5.nix {};
       plasma-framework = callPackage ./plasma-framework.nix {};
+      prison = callPackage ./prison.nix {};
       solid = callPackage ./solid.nix {};
       sonnet = callPackage ./sonnet.nix {};
       syntax-highlighting = callPackage ./syntax-highlighting.nix {};
diff --git a/pkgs/development/libraries/kde-frameworks/prison.nix b/pkgs/development/libraries/kde-frameworks/prison.nix
new file mode 100644
index 00000000000..905321235c7
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks/prison.nix
@@ -0,0 +1,12 @@
+{
+  mkDerivation, lib,
+  extra-cmake-modules,
+  libdmtx, qrencode, qtbase,
+}:
+
+mkDerivation {
+  name = "prison";
+  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ libdmtx qrencode qtbase ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 153f6c0a7f7..3be50635f8c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9754,7 +9754,7 @@ with pkgs;
       knotifyconfig kpackage kparts kpeople kplotting kpty kross krunner
       kservice ktexteditor ktextwidgets kunitconversion kwallet kwayland
       kwidgetsaddons kwindowsystem kxmlgui kxmlrpcclient modemmanager-qt
-      networkmanager-qt plasma-framework solid sonnet syntax-highlighting
+      networkmanager-qt plasma-framework prison solid sonnet syntax-highlighting
       threadweaver;
 
     ### KDE PLASMA 5

From 087f20e8c66372bdba86fa309dd4e1be3f35d821 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 24 May 2017 13:20:10 -0500
Subject: [PATCH 045/189] kdeFrameworks: sort according to tier

---
 .../libraries/kde-frameworks/default.nix      | 104 ++++++++++--------
 1 file changed, 58 insertions(+), 46 deletions(-)

diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix
index 3010a211db2..71b24a0da6b 100644
--- a/pkgs/development/libraries/kde-frameworks/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/default.nix
@@ -36,6 +36,7 @@ let
   mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {};
 
   packages = self: with self;
+    # SUPPORT
     let
 
       propagateBin =
@@ -90,79 +91,90 @@ let
       };
 
     in {
+      extra-cmake-modules = callPackage ./extra-cmake-modules {};
+
+    # TIER 1
       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 {};
       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.nix {};
-      ktextwidgets = callPackage ./ktextwidgets.nix {};
-      kunitconversion = callPackage ./kunitconversion.nix {};
-      kwallet = callPackage ./kwallet.nix {};
       kwayland = callPackage ./kwayland.nix {};
       kwidgetsaddons = callPackage ./kwidgetsaddons.nix {};
       kwindowsystem = callPackage ./kwindowsystem {};
-      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.nix {};
       prison = callPackage ./prison.nix {};
       solid = callPackage ./solid.nix {};
       sonnet = callPackage ./sonnet.nix {};
       syntax-highlighting = callPackage ./syntax-highlighting.nix {};
       threadweaver = callPackage ./threadweaver.nix {};
+
+    # TIER 2
+      kactivities = callPackage ./kactivities.nix {};
+      kactivities-stats = callPackage ./kactivities-stats.nix {};
+      kauth = callPackage ./kauth {};
+      kcompletion = callPackage ./kcompletion.nix {};
+      kcrash = callPackage ./kcrash.nix {};
+      kdoctools = callPackage ./kdoctools {};
+      kfilemetadata = callPackage ./kfilemetadata {};
+      kimageformats = callPackage ./kimageformats.nix {};
+      kjobwidgets = callPackage ./kjobwidgets.nix {};
+      knotifications = callPackage ./knotifications.nix {};
+      kpackage = callPackage ./kpackage {};
+      kpty = callPackage ./kpty.nix {};
+      kunitconversion = callPackage ./kunitconversion.nix {};
+
+    # TIER 3
+      baloo = callPackage ./baloo.nix {};
+      kbookmarks = callPackage ./kbookmarks.nix {};
+      kcmutils = callPackage ./kcmutils {};
+      kconfigwidgets = callPackage ./kconfigwidgets {};
+      kdeclarative = callPackage ./kdeclarative.nix {};
+      kded = callPackage ./kded.nix {};
+      kdesignerplugin = callPackage ./kdesignerplugin.nix {};
+      kdesu = callPackage ./kdesu.nix {};
+      kemoticons = callPackage ./kemoticons.nix {};
+      kglobalaccel = callPackage ./kglobalaccel.nix {};
+      kiconthemes = callPackage ./kiconthemes {};
+      kinit = callPackage ./kinit {};
+      kio = callPackage ./kio {};
+      knewstuff = callPackage ./knewstuff.nix {};
+      knotifyconfig = callPackage ./knotifyconfig.nix {};
+      kparts = callPackage ./kparts.nix {};
+      kpeople = callPackage ./kpeople.nix {};
+      krunner = callPackage ./krunner.nix {};
+      kservice = callPackage ./kservice {};
+      ktexteditor = callPackage ./ktexteditor.nix {};
+      ktextwidgets = callPackage ./ktextwidgets.nix {};
+      kwallet = callPackage ./kwallet.nix {};
+      kxmlgui = callPackage ./kxmlgui.nix {};
+      kxmlrpcclient = callPackage ./kxmlrpcclient.nix {};
+      plasma-framework = callPackage ./plasma-framework.nix {};
+
+    # TIER 4
+      frameworkintegration = callPackage ./frameworkintegration.nix {};
+
+    # PORTING AIDS
+      kdelibs4support = callPackage ./kdelibs4support {};
+      khtml = callPackage ./khtml.nix {};
+      kjs = callPackage ./kjs.nix {};
+      kjsembed = callPackage ./kjsembed.nix {};
+      kmediaplayer = callPackage ./kmediaplayer.nix {};
+      kross = callPackage ./kross.nix {};
+
     };
 
 in lib.makeScope libsForQt5.newScope packages

From faf0d3e91d7a08a95a9dd8a7faa4d2f5ee5cb4eb Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Mon, 22 May 2017 13:49:07 -0500
Subject: [PATCH 046/189] kdeFrameworks: fixup inputs and outputs

- Reduce environment pollution with a separate $bin output containing programs,
  plugins, and shared data. Libraries remain in $out and are not installed into
  the environment.
- Only propagate build inputs as required.
---
 .../services/x11/desktop-managers/plasma5.nix |  4 +--
 pkgs/applications/kde/akonadi-contacts.nix    |  8 +++--
 pkgs/applications/kde/akonadi-mime.nix        |  5 ++--
 pkgs/applications/kde/ark/default.nix         |  9 +++---
 pkgs/applications/kde/baloo-widgets.nix       |  1 +
 pkgs/applications/kde/dolphin.nix             |  1 +
 pkgs/applications/kde/gwenview.nix            |  5 ++--
 pkgs/applications/kde/kcontacts.nix           |  6 ++--
 pkgs/applications/kde/kmime.nix               |  4 +--
 pkgs/applications/kde/kwalletmanager.nix      |  5 ++--
 pkgs/applications/kde/okular.nix              | 11 ++++---
 pkgs/applications/kde/spectacle.nix           |  3 +-
 pkgs/desktops/plasma-5/bluedevil.nix          |  3 +-
 pkgs/desktops/plasma-5/breeze-qt5.nix         |  6 ++--
 pkgs/desktops/plasma-5/kactivitymanagerd.nix  |  2 +-
 pkgs/desktops/plasma-5/kde-cli-tools.nix      | 10 +++----
 .../plasma-5/kde-gtk-config/default.nix       |  2 +-
 pkgs/desktops/plasma-5/kdeplasma-addons.nix   | 16 +++++-----
 pkgs/desktops/plasma-5/kgamma5.nix            |  8 +++--
 pkgs/desktops/plasma-5/khotkeys.nix           |  6 ++--
 pkgs/desktops/plasma-5/kinfocenter.nix        |  2 +-
 pkgs/desktops/plasma-5/kscreen.nix            |  6 ++--
 pkgs/desktops/plasma-5/kscreenlocker.nix      |  5 ++--
 pkgs/desktops/plasma-5/ksshaskpass.nix        |  8 +++--
 pkgs/desktops/plasma-5/kwallet-pam.nix        |  1 -
 .../plasma-5/kwayland-integration.nix         |  8 +++--
 pkgs/desktops/plasma-5/kwrited.nix            |  8 +++--
 pkgs/desktops/plasma-5/milou.nix              | 14 +++++----
 pkgs/desktops/plasma-5/oxygen.nix             |  7 +++--
 pkgs/desktops/plasma-5/plasma-integration.nix | 14 ++++-----
 pkgs/desktops/plasma-5/plasma-nm/default.nix  | 19 ++++++------
 pkgs/desktops/plasma-5/plasma-pa.nix          | 12 ++++----
 .../libraries/kde-frameworks/attica.nix       |  1 +
 .../libraries/kde-frameworks/baloo.nix        | 15 ++++++----
 .../libraries/kde-frameworks/bluez-qt.nix     |  5 ++--
 .../libraries/kde-frameworks/breeze-icons.nix |  3 +-
 .../libraries/kde-frameworks/default.nix      | 10 ++++---
 .../extra-cmake-modules/setup-hook.sh         | 14 ++++-----
 .../kde-frameworks/frameworkintegration.nix   |  7 +++--
 .../kde-frameworks/kactivities-stats.nix      | 10 +++++--
 .../libraries/kde-frameworks/kactivities.nix  | 13 +++++----
 .../libraries/kde-frameworks/kapidox.nix      |  3 ++
 .../libraries/kde-frameworks/karchive.nix     | 10 +++++--
 .../kde-frameworks/kauth/default.nix          | 11 +++++--
 .../libraries/kde-frameworks/kbookmarks.nix   | 12 +++++---
 .../kde-frameworks/kcmutils/default.nix       |  9 +++---
 .../libraries/kde-frameworks/kcodecs.nix      |  6 ++--
 .../libraries/kde-frameworks/kcompletion.nix  |  6 ++--
 .../libraries/kde-frameworks/kconfig.nix      |  3 +-
 .../kde-frameworks/kconfigwidgets/default.nix | 13 +++++----
 .../libraries/kde-frameworks/kcoreaddons.nix  | 11 +++++--
 .../libraries/kde-frameworks/kcrash.nix       | 10 +++++--
 .../libraries/kde-frameworks/kdbusaddons.nix  | 11 +++++--
 .../libraries/kde-frameworks/kdeclarative.nix |  7 +++--
 .../libraries/kde-frameworks/kded.nix         | 11 ++++---
 .../kdelibs4support/default.nix               | 29 ++++++++++---------
 .../kde-frameworks/kdesignerplugin.nix        |  8 ++---
 .../libraries/kde-frameworks/kdesu.nix        | 10 +++++--
 .../libraries/kde-frameworks/kdnssd.nix       | 10 ++++---
 .../kde-frameworks/kdoctools/default.nix      | 16 ++++++++--
 .../libraries/kde-frameworks/kemoticons.nix   |  5 ++--
 .../kde-frameworks/kfilemetadata/default.nix  |  7 +++--
 .../libraries/kde-frameworks/kglobalaccel.nix | 13 ++++++---
 .../libraries/kde-frameworks/kguiaddons.nix   |  4 ++-
 .../libraries/kde-frameworks/khtml.nix        |  9 +++---
 .../libraries/kde-frameworks/ki18n.nix        |  2 +-
 .../kde-frameworks/kiconthemes/default.nix    |  8 +++--
 .../libraries/kde-frameworks/kidletime.nix    |  3 +-
 .../kde-frameworks/kimageformats.nix          | 10 ++++---
 .../kde-frameworks/kinit/default.nix          | 18 ++++++++++--
 .../libraries/kde-frameworks/kio/default.nix  | 14 +++++----
 .../libraries/kde-frameworks/kitemmodels.nix  |  1 +
 .../libraries/kde-frameworks/kitemviews.nix   |  4 ++-
 .../libraries/kde-frameworks/kjobwidgets.nix  |  2 +-
 .../libraries/kde-frameworks/kjs.nix          |  4 ++-
 .../libraries/kde-frameworks/kjsembed.nix     | 10 ++++---
 .../libraries/kde-frameworks/kmediaplayer.nix |  2 +-
 .../libraries/kde-frameworks/knewstuff.nix    | 16 ++++++----
 .../kde-frameworks/knotifications.nix         |  2 +-
 .../kde-frameworks/knotifyconfig.nix          | 10 +++++--
 .../kde-frameworks/kpackage/default.nix       |  4 +--
 .../libraries/kde-frameworks/kparts.nix       | 15 ++++++----
 .../libraries/kde-frameworks/kpeople.nix      | 10 +++++--
 .../libraries/kde-frameworks/kplotting.nix    |  3 +-
 .../libraries/kde-frameworks/kpty.nix         |  5 ++--
 .../libraries/kde-frameworks/kross.nix        |  6 ++--
 .../libraries/kde-frameworks/krunner.nix      | 13 +++++----
 .../kde-frameworks/kservice/default.nix       | 12 +++++---
 .../libraries/kde-frameworks/ktexteditor.nix  | 16 +++++-----
 .../libraries/kde-frameworks/ktextwidgets.nix | 14 +++++----
 .../kde-frameworks/kunitconversion.nix        |  5 ++--
 .../libraries/kde-frameworks/kwallet.nix      | 14 +++++----
 .../libraries/kde-frameworks/kwayland.nix     |  7 +++--
 .../kde-frameworks/kwidgetsaddons.nix         | 12 +++++---
 .../kde-frameworks/kwindowsystem/default.nix  |  7 +++--
 .../libraries/kde-frameworks/kxmlgui.nix      | 15 ++++++----
 .../kde-frameworks/kxmlrpcclient.nix          |  4 ++-
 .../kde-frameworks/modemmanager-qt.nix        | 11 +++----
 .../kde-frameworks/networkmanager-qt.nix      | 11 +++----
 .../kde-frameworks/oxygen-icons5.nix          |  2 +-
 .../kde-frameworks/plasma-framework.nix       | 17 ++++++-----
 .../libraries/kde-frameworks/prison.nix       |  4 ++-
 .../libraries/kde-frameworks/solid.nix        |  8 +++--
 .../libraries/kde-frameworks/sonnet.nix       |  5 ++--
 .../kde-frameworks/syntax-highlighting.nix    |  5 ++--
 .../libraries/kde-frameworks/threadweaver.nix |  9 ++++--
 106 files changed, 533 insertions(+), 338 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix
index 0a64429c24f..f099117f477 100644
--- a/nixos/modules/services/x11/desktop-managers/plasma5.nix
+++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix
@@ -52,8 +52,8 @@ in
       };
 
       security.wrappers = {
-        kcheckpass.source = "${plasma5.plasma-workspace.out}/lib/libexec/kcheckpass";
-        "start_kdeinit".source = "${pkgs.kinit.out}/lib/libexec/kf5/start_kdeinit";
+        kcheckpass.source = "${lib.getBin plasma5.plasma-workspace}/lib/libexec/kcheckpass";
+        "start_kdeinit".source = "${lib.getBin pkgs.kinit}/lib/libexec/kf5/start_kdeinit";
       };
 
       environment.systemPackages = with pkgs; with qt5; with libsForQt5; with plasma5; with kdeApplications;
diff --git a/pkgs/applications/kde/akonadi-contacts.nix b/pkgs/applications/kde/akonadi-contacts.nix
index 7d017f6496f..3f410b7b8b9 100644
--- a/pkgs/applications/kde/akonadi-contacts.nix
+++ b/pkgs/applications/kde/akonadi-contacts.nix
@@ -1,8 +1,8 @@
 {
   mkDerivation, lib,
   extra-cmake-modules,
-  akonadi-mime, grantlee, kcontacts, kio, kitemmodels, kmime, qtwebengine,
-  akonadi
+  akonadi, akonadi-mime, grantlee, kcontacts, kdbusaddons, ki18n, kiconthemes,
+  kio, kitemmodels, kmime, ktextwidgets, qtwebengine,
 }:
 
 mkDerivation {
@@ -13,7 +13,9 @@ mkDerivation {
   };
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
-    akonadi-mime grantlee kcontacts kio kitemmodels kmime qtwebengine
+    akonadi-mime grantlee kcontacts kdbusaddons ki18n kiconthemes kio
+    kitemmodels kmime ktextwidgets qtwebengine
   ];
   propagatedBuildInputs = [ akonadi ];
+  outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/applications/kde/akonadi-mime.nix b/pkgs/applications/kde/akonadi-mime.nix
index 390ef373528..1fb50756665 100644
--- a/pkgs/applications/kde/akonadi-mime.nix
+++ b/pkgs/applications/kde/akonadi-mime.nix
@@ -1,7 +1,7 @@
 {
   mkDerivation, lib,
   extra-cmake-modules,
-  akonadi, kdbusaddons, kio, kitemmodels, kmime
+  akonadi, kdbusaddons, ki18n, kio, kitemmodels, kmime
 }:
 
 mkDerivation {
@@ -11,5 +11,6 @@ mkDerivation {
     maintainers = [ lib.maintainers.ttuegel ];
   };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ akonadi kdbusaddons kio kitemmodels kmime ];
+  buildInputs = [ akonadi kdbusaddons ki18n kio kitemmodels kmime ];
+  outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/applications/kde/ark/default.nix b/pkgs/applications/kde/ark/default.nix
index f2976c38c39..df15f6b0f18 100644
--- a/pkgs/applications/kde/ark/default.nix
+++ b/pkgs/applications/kde/ark/default.nix
@@ -3,8 +3,8 @@
 
   extra-cmake-modules, kdoctools,
 
-  karchive, kconfig, kcrash, kdbusaddons, ki18n, kiconthemes, khtml, kio,
-  kservice, kpty, kwidgetsaddons, libarchive, kitemmodels,
+  karchive, kconfig, kcrash, kdbusaddons, ki18n, kiconthemes, kitemmodels,
+  khtml, kio, kparts, kpty, kservice, kwidgetsaddons, libarchive,
 
   # Archive tools
   p7zip, unzipNLS, zip,
@@ -17,9 +17,10 @@ mkDerivation {
   name = "ark";
   nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ];
   propagatedBuildInputs = [
-    khtml ki18n kio karchive kconfig kcrash kdbusaddons kiconthemes kservice
-    kpty kwidgetsaddons libarchive kitemmodels
+    karchive kconfig kcrash kdbusaddons khtml ki18n kiconthemes kio kitemmodels
+    kparts kpty kservice kwidgetsaddons libarchive
   ];
+  outputs = [ "out" "dev" ];
   postFixup =
     let
       PATH =
diff --git a/pkgs/applications/kde/baloo-widgets.nix b/pkgs/applications/kde/baloo-widgets.nix
index 17ae75cc479..3479b6600fc 100644
--- a/pkgs/applications/kde/baloo-widgets.nix
+++ b/pkgs/applications/kde/baloo-widgets.nix
@@ -14,4 +14,5 @@ mkDerivation {
   propagatedBuildInputs = [
     baloo kconfig kdelibs4support kfilemetadata ki18n kio kservice
   ];
+  outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/applications/kde/dolphin.nix b/pkgs/applications/kde/dolphin.nix
index ff5be6fdd88..2570e37bf2c 100644
--- a/pkgs/applications/kde/dolphin.nix
+++ b/pkgs/applications/kde/dolphin.nix
@@ -20,4 +20,5 @@ mkDerivation {
     kinit kio knewstuff knotifications kparts ktexteditor kwindowsystem
     phonon solid
   ];
+  outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/applications/kde/gwenview.nix b/pkgs/applications/kde/gwenview.nix
index 99be13ba7f8..233566c1bda 100644
--- a/pkgs/applications/kde/gwenview.nix
+++ b/pkgs/applications/kde/gwenview.nix
@@ -13,9 +13,8 @@ mkDerivation {
     maintainers = [ lib.maintainers.ttuegel ];
   };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  buildInputs = [ exiv2 lcms2 ];
-  propagatedBuildInputs = [
-    baloo kactivities kdelibs4support kio libkdcraw libkipi phonon
+  buildInputs = [
+    baloo exiv2 kactivities kdelibs4support kio libkdcraw lcms2 libkipi phonon
     qtimageformats qtsvg qtx11extras
   ];
   propagatedUserEnvPkgs = [ kipi-plugins ];
diff --git a/pkgs/applications/kde/kcontacts.nix b/pkgs/applications/kde/kcontacts.nix
index e7876d0d43e..96828af9d17 100644
--- a/pkgs/applications/kde/kcontacts.nix
+++ b/pkgs/applications/kde/kcontacts.nix
@@ -1,8 +1,7 @@
 {
   mkDerivation, lib,
   extra-cmake-modules,
-  ki18n,
-  kcoreaddons, kconfig, kcodecs
+  kcoreaddons, kconfig, kcodecs, ki18n, qtbase,
 }:
 
 mkDerivation {
@@ -12,6 +11,5 @@ mkDerivation {
     maintainers = [ lib.maintainers.ttuegel ];
   };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ ki18n ];
-  propagatedBuildInputs = [ kcoreaddons kconfig kcodecs ];
+  buildInputs = [ kcoreaddons kconfig kcodecs ki18n qtbase ];
 }
diff --git a/pkgs/applications/kde/kmime.nix b/pkgs/applications/kde/kmime.nix
index 5bd8762391c..b14e0abcc3f 100644
--- a/pkgs/applications/kde/kmime.nix
+++ b/pkgs/applications/kde/kmime.nix
@@ -1,7 +1,7 @@
 {
   mkDerivation, lib,
   extra-cmake-modules, ki18n,
-  kcodecs
+  kcodecs, qtbase,
 }:
 
 mkDerivation {
@@ -11,5 +11,5 @@ mkDerivation {
     maintainers = [ lib.maintainers.ttuegel ];
   };
   nativeBuildInputs = [ extra-cmake-modules ki18n ];
-  buildInputs = [ kcodecs ];
+  buildInputs = [ kcodecs qtbase ];
 }
diff --git a/pkgs/applications/kde/kwalletmanager.nix b/pkgs/applications/kde/kwalletmanager.nix
index 75420b6600f..e39e7e5157d 100644
--- a/pkgs/applications/kde/kwalletmanager.nix
+++ b/pkgs/applications/kde/kwalletmanager.nix
@@ -8,6 +8,7 @@
 , kcoreaddons
 , kdbusaddons
 , kdelibs4support
+, kwallet
 , kxmlgui
 }:
 
@@ -18,8 +19,8 @@ mkDerivation {
     maintainers = with lib.maintainers; [ fridh ];
   };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  propagatedBuildInputs = [
+  buildInputs = [
     kauth kcmutils kconfigwidgets kcoreaddons kdbusaddons kdelibs4support
-    kxmlgui
+    kwallet kxmlgui
   ];
 }
diff --git a/pkgs/applications/kde/okular.nix b/pkgs/applications/kde/okular.nix
index 8cfd946b810..99b69f45e1e 100644
--- a/pkgs/applications/kde/okular.nix
+++ b/pkgs/applications/kde/okular.nix
@@ -4,18 +4,17 @@
   djvulibre, ebook_tools, kactivities, karchive, kbookmarks, kcompletion,
   kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdegraphics-mobipocket,
   kiconthemes, kjs, khtml, kio, kparts, kpty, kwallet, kwindowsystem, libkexiv2,
-  libspectre, poppler, qca-qt5, qtdeclarative, qtsvg, threadweaver
+  libspectre, phonon, poppler, qca-qt5, qtdeclarative, qtsvg, threadweaver
 }:
 
 mkDerivation {
   name = "okular";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  buildInputs = [ djvulibre ebook_tools ];
-  propagatedBuildInputs = [
-    kactivities karchive kbookmarks kcompletion kconfig kconfigwidgets
+  buildInputs = [
+    djvulibre ebook_tools kactivities karchive kbookmarks kcompletion kconfig kconfigwidgets
     kcoreaddons kdbusaddons kdegraphics-mobipocket kiconthemes kjs khtml kio
-    kparts kpty kwallet kwindowsystem libkexiv2 libspectre poppler qca-qt5
-    qtdeclarative qtsvg threadweaver
+    kparts kpty kwallet kwindowsystem libkexiv2 libspectre phonon poppler
+    qca-qt5 qtdeclarative qtsvg threadweaver
   ];
   meta = {
     platforms = lib.platforms.linux;
diff --git a/pkgs/applications/kde/spectacle.nix b/pkgs/applications/kde/spectacle.nix
index 7fa18289ae1..db1bf2aee65 100644
--- a/pkgs/applications/kde/spectacle.nix
+++ b/pkgs/applications/kde/spectacle.nix
@@ -4,6 +4,7 @@
   ki18n, xcb-util-cursor,
   kconfig, kcoreaddons, kdbusaddons, kdeclarative, kio, kipi-plugins,
   knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi,
+  qtx11extras
 }:
 
 mkDerivation {
@@ -13,7 +14,7 @@ mkDerivation {
   buildInputs = [ ki18n xcb-util-cursor ];
   propagatedBuildInputs = [
     kconfig kcoreaddons kdbusaddons kdeclarative kio knotifications
-    kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi
+    kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi qtx11extras
   ];
   propagatedUserEnvPkgs = [ kipi-plugins ];
 }
diff --git a/pkgs/desktops/plasma-5/bluedevil.nix b/pkgs/desktops/plasma-5/bluedevil.nix
index 6db3e787911..44e8a26eee1 100644
--- a/pkgs/desktops/plasma-5/bluedevil.nix
+++ b/pkgs/desktops/plasma-5/bluedevil.nix
@@ -7,11 +7,10 @@
 mkDerivation {
   name = "bluedevil";
   nativeBuildInputs = [ extra-cmake-modules shared_mime_info ];
-  propagatedBuildInputs = [
+  buildInputs = [
     bluez-qt ki18n kio kwindowsystem plasma-framework qtdeclarative kcoreaddons
     kdbusaddons kded kiconthemes knotifications kwidgetsaddons
   ];
-  propagatedUserEnvPkgs = [ bluez-qt.out ];
   postInstall = ''
     # 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/plasma-5/breeze-qt5.nix b/pkgs/desktops/plasma-5/breeze-qt5.nix
index 11af6fff04b..b1cb3b7f8fc 100644
--- a/pkgs/desktops/plasma-5/breeze-qt5.nix
+++ b/pkgs/desktops/plasma-5/breeze-qt5.nix
@@ -2,7 +2,8 @@
   mkDerivation,
   extra-cmake-modules,
   frameworkintegration, kcmutils, kconfigwidgets, kcoreaddons, kdecoration,
-  kguiaddons, ki18n, kwayland, kwindowsystem, plasma-framework, qtx11extras
+  kguiaddons, ki18n, kwayland, kwindowsystem, plasma-framework, qtdeclarative,
+  qtx11extras
 }:
 
 mkDerivation {
@@ -11,7 +12,8 @@ mkDerivation {
   nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [
     frameworkintegration kcmutils kconfigwidgets kcoreaddons kdecoration
-    kguiaddons ki18n kwayland kwindowsystem plasma-framework qtx11extras
+    kguiaddons ki18n kwayland kwindowsystem plasma-framework qtdeclarative
+    qtx11extras
   ];
   cmakeFlags = [ "-DUSE_Qt4=OFF" ];
 }
diff --git a/pkgs/desktops/plasma-5/kactivitymanagerd.nix b/pkgs/desktops/plasma-5/kactivitymanagerd.nix
index 27f977ea785..629718ab5a0 100644
--- a/pkgs/desktops/plasma-5/kactivitymanagerd.nix
+++ b/pkgs/desktops/plasma-5/kactivitymanagerd.nix
@@ -7,7 +7,7 @@
 mkDerivation {
   name = "kactivitymanagerd";
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [
+  buildInputs = [
     boost kconfig kcoreaddons kdbusaddons kglobalaccel ki18n kio kwindowsystem
     kxmlgui
   ];
diff --git a/pkgs/desktops/plasma-5/kde-cli-tools.nix b/pkgs/desktops/plasma-5/kde-cli-tools.nix
index e18481d6da9..6bcafc5813a 100644
--- a/pkgs/desktops/plasma-5/kde-cli-tools.nix
+++ b/pkgs/desktops/plasma-5/kde-cli-tools.nix
@@ -1,14 +1,14 @@
 {
-  mkDerivation, extra-cmake-modules,
-  kcmutils, kconfig, kdelibs4support, kdesu, kdoctools, ki18n, kiconthemes,
-  kwindowsystem, qtsvg, qtx11extras
+  mkDerivation, extra-cmake-modules, kdoctools,
+  kcmutils, kconfig, kdesu, ki18n, kiconthemes, kinit, kio, kwindowsystem,
+  qtsvg, qtx11extras,
 }:
 
 mkDerivation {
   name = "kde-cli-tools";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  propagatedBuildInputs = [
-    kcmutils kconfig kdesu kdelibs4support ki18n kiconthemes kwindowsystem qtsvg
+  buildInputs = [
+    kcmutils kconfig kdesu ki18n kiconthemes kinit kio kwindowsystem qtsvg
     qtx11extras
   ];
 }
diff --git a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix
index eaa2a906f82..5e959ac8b79 100644
--- a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix
+++ b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix
@@ -16,7 +16,7 @@ mkDerivation {
   name = "kde-gtk-config";
   patches = [ ./0001-follow-symlinks.patch ];
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [
+  buildInputs = [
     ki18n kio glib gtk2 gtk3 karchive kcmutils kconfigwidgets kiconthemes
     knewstuff
   ];
diff --git a/pkgs/desktops/plasma-5/kdeplasma-addons.nix b/pkgs/desktops/plasma-5/kdeplasma-addons.nix
index e3526d56c37..b9f40563ef6 100644
--- a/pkgs/desktops/plasma-5/kdeplasma-addons.nix
+++ b/pkgs/desktops/plasma-5/kdeplasma-addons.nix
@@ -1,17 +1,17 @@
-{ mkDerivation, extra-cmake-modules, kdoctools
-, kconfig, kconfigwidgets, kcoreaddons, kcmutils, kdelibs4support, ki18n
-, kio, knewstuff, kross, krunner, kservice, ksysguard, kunitconversion
-, plasma-framework, plasma-workspace, qtdeclarative, qtx11extras
-, ibus
+{
+  mkDerivation,
+  extra-cmake-modules, kdoctools,
+  kconfig, kconfigwidgets, kcoreaddons, kcmutils, kdelibs4support, ki18n, kio,
+  knewstuff, kross, krunner, kservice, ksysguard, kunitconversion, ibus,
+  plasma-framework, plasma-workspace, qtdeclarative, qtx11extras,
 }:
 
 mkDerivation {
   name = "kdeplasma-addons";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  propagatedBuildInputs = [
+  buildInputs = [
     kconfig kconfigwidgets kcoreaddons kcmutils kdelibs4support kio knewstuff
-    kross krunner kservice ksysguard kunitconversion plasma-framework
+    kross krunner kservice ksysguard kunitconversion ibus plasma-framework
     plasma-workspace qtdeclarative qtx11extras
-    ibus
   ];
 }
diff --git a/pkgs/desktops/plasma-5/kgamma5.nix b/pkgs/desktops/plasma-5/kgamma5.nix
index 8199b5d0330..ea58cad12ae 100644
--- a/pkgs/desktops/plasma-5/kgamma5.nix
+++ b/pkgs/desktops/plasma-5/kgamma5.nix
@@ -1,9 +1,11 @@
-{ mkDerivation, extra-cmake-modules, kdoctools, kdelibs4support
-, qtx11extras
+{
+  mkDerivation,
+  extra-cmake-modules, kdoctools,
+  kconfig, kconfigwidgets, ki18n, qtx11extras,
 }:
 
 mkDerivation {
   name = "kgamma5";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  propagatedBuildInputs = [ kdelibs4support qtx11extras ];
+  buildInputs = [ kconfig kconfigwidgets ki18n qtx11extras ];
 }
diff --git a/pkgs/desktops/plasma-5/khotkeys.nix b/pkgs/desktops/plasma-5/khotkeys.nix
index 32d9c14ddef..be4ccc7b230 100644
--- a/pkgs/desktops/plasma-5/khotkeys.nix
+++ b/pkgs/desktops/plasma-5/khotkeys.nix
@@ -7,8 +7,8 @@
 mkDerivation {
   name = "khotkeys";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  propagatedBuildInputs = [
-    kdelibs4support kglobalaccel ki18n kio plasma-framework plasma-workspace
-    qtx11extras kcmutils kdbusaddons kxmlgui
+  buildInputs = [
+    kcmutils kdbusaddons kdelibs4support kglobalaccel ki18n kio kxmlgui
+    plasma-framework plasma-workspace qtx11extras
   ];
 }
diff --git a/pkgs/desktops/plasma-5/kinfocenter.nix b/pkgs/desktops/plasma-5/kinfocenter.nix
index ee6aa6aebda..d366aa4b36e 100644
--- a/pkgs/desktops/plasma-5/kinfocenter.nix
+++ b/pkgs/desktops/plasma-5/kinfocenter.nix
@@ -9,7 +9,7 @@
 mkDerivation {
   name = "kinfocenter";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  propagatedBuildInputs = [
+  buildInputs = [
     kcmutils kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons
     kdeclarative kdelibs4support ki18n kiconthemes kio kpackage kservice
     kwayland kwidgetsaddons kxmlgui libraw1394 mesa_glu pciutils solid
diff --git a/pkgs/desktops/plasma-5/kscreen.nix b/pkgs/desktops/plasma-5/kscreen.nix
index 93dd0e71050..fcdc922ff94 100644
--- a/pkgs/desktops/plasma-5/kscreen.nix
+++ b/pkgs/desktops/plasma-5/kscreen.nix
@@ -6,8 +6,8 @@
 mkDerivation {
   name = "kscreen";
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [
-    kglobalaccel ki18n libkscreen qtdeclarative qtgraphicaleffects kconfig
-    kconfigwidgets kdbusaddons kwidgetsaddons kxmlgui
+  buildInputs = [
+    kconfig kconfigwidgets kdbusaddons kglobalaccel ki18n kwidgetsaddons kxmlgui
+    libkscreen qtdeclarative qtgraphicaleffects
   ];
 }
diff --git a/pkgs/desktops/plasma-5/kscreenlocker.nix b/pkgs/desktops/plasma-5/kscreenlocker.nix
index 64ea4690513..631719fb535 100644
--- a/pkgs/desktops/plasma-5/kscreenlocker.nix
+++ b/pkgs/desktops/plasma-5/kscreenlocker.nix
@@ -2,7 +2,8 @@
   mkDerivation,
   extra-cmake-modules, kdoctools,
   kcmutils, kcrash, kdeclarative, kdelibs4support, kglobalaccel, kidletime,
-  kwayland, libXcursor, pam, plasma-framework, qtdeclarative, wayland
+  kwayland, libXcursor, pam, plasma-framework, qtdeclarative, qtx11extras,
+  wayland,
 }:
 
 mkDerivation {
@@ -10,6 +11,6 @@ mkDerivation {
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   propagatedBuildInputs = [
     kcmutils kcrash kdeclarative kdelibs4support kglobalaccel kidletime kwayland
-    libXcursor pam plasma-framework qtdeclarative wayland
+    libXcursor pam plasma-framework qtdeclarative qtx11extras wayland
   ];
 }
diff --git a/pkgs/desktops/plasma-5/ksshaskpass.nix b/pkgs/desktops/plasma-5/ksshaskpass.nix
index 94bc5a35da0..39e260f6c70 100644
--- a/pkgs/desktops/plasma-5/ksshaskpass.nix
+++ b/pkgs/desktops/plasma-5/ksshaskpass.nix
@@ -1,9 +1,11 @@
-{ mkDerivation, extra-cmake-modules, kdoctools, kcoreaddons
-, ki18n, kwallet, kwidgetsaddons
+{
+  mkDerivation,
+  extra-cmake-modules, kdoctools,
+  kcoreaddons, ki18n, kwallet, kwidgetsaddons, qtbase,
 }:
 
 mkDerivation {
   name = "ksshaskpass";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  propagatedBuildInputs = [ kcoreaddons ki18n kwallet kwidgetsaddons ];
+  buildInputs = [ kcoreaddons ki18n kwallet kwidgetsaddons qtbase ];
 }
diff --git a/pkgs/desktops/plasma-5/kwallet-pam.nix b/pkgs/desktops/plasma-5/kwallet-pam.nix
index d555701c76d..1cbfb87ea56 100644
--- a/pkgs/desktops/plasma-5/kwallet-pam.nix
+++ b/pkgs/desktops/plasma-5/kwallet-pam.nix
@@ -2,7 +2,6 @@
 
 mkDerivation {
   name = "kwallet-pam";
-
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ pam socat libgcrypt qtbase ];
   postPatch = ''
diff --git a/pkgs/desktops/plasma-5/kwayland-integration.nix b/pkgs/desktops/plasma-5/kwayland-integration.nix
index e5d00eb0800..1344b477f73 100644
--- a/pkgs/desktops/plasma-5/kwayland-integration.nix
+++ b/pkgs/desktops/plasma-5/kwayland-integration.nix
@@ -1,7 +1,11 @@
-{ mkDerivation , extra-cmake-modules , kidletime , kwayland , kwindowsystem }:
+{
+  mkDerivation,
+  extra-cmake-modules,
+  kidletime, kwayland, kwindowsystem, qtbase,
+}:
 
 mkDerivation {
   name = "kwayland-integration";
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ kidletime kwindowsystem kwayland ];
+  buildInputs = [ kidletime kwindowsystem kwayland qtbase ];
 }
diff --git a/pkgs/desktops/plasma-5/kwrited.nix b/pkgs/desktops/plasma-5/kwrited.nix
index 18c4a4af8db..f6f6187e946 100644
--- a/pkgs/desktops/plasma-5/kwrited.nix
+++ b/pkgs/desktops/plasma-5/kwrited.nix
@@ -1,9 +1,11 @@
-{ mkDerivation, extra-cmake-modules, kcoreaddons, ki18n, kpty
-, knotifications, kdbusaddons
+{
+  mkDerivation,
+  extra-cmake-modules,
+  kcoreaddons, kdbusaddons, ki18n, knotifications, kpty, qtbase,
 }:
 
 mkDerivation {
   name = "kwrited";
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ kcoreaddons ki18n kpty knotifications kdbusaddons ];
+  buildInputs = [ kcoreaddons kdbusaddons ki18n knotifications kpty qtbase ];
 }
diff --git a/pkgs/desktops/plasma-5/milou.nix b/pkgs/desktops/plasma-5/milou.nix
index abc35279aba..7f38b74423c 100644
--- a/pkgs/desktops/plasma-5/milou.nix
+++ b/pkgs/desktops/plasma-5/milou.nix
@@ -1,6 +1,8 @@
-{ mkDerivation, extra-cmake-modules, qtscript, qtdeclarative
-, kcoreaddons, ki18n, kdeclarative, kservice, plasma-framework
-, krunner
+{
+  mkDerivation,
+  extra-cmake-modules,
+  kcoreaddons, kdeclarative, ki18n, krunner, kservice, plasma-framework,
+  qtscript, qtdeclarative,
 }:
 
 mkDerivation {
@@ -8,8 +10,8 @@ mkDerivation {
   nativeBuildInputs = [
     extra-cmake-modules
   ];
-  propagatedBuildInputs = [
-    kdeclarative ki18n krunner plasma-framework qtdeclarative qtscript
-    kcoreaddons kservice
+  buildInputs = [
+    kcoreaddons kdeclarative ki18n krunner kservice plasma-framework
+    qtdeclarative qtscript
   ];
 }
diff --git a/pkgs/desktops/plasma-5/oxygen.nix b/pkgs/desktops/plasma-5/oxygen.nix
index 483d987686a..97421191d90 100644
--- a/pkgs/desktops/plasma-5/oxygen.nix
+++ b/pkgs/desktops/plasma-5/oxygen.nix
@@ -2,7 +2,8 @@
   mkDerivation,
   extra-cmake-modules,
   frameworkintegration, kcmutils, kcompletion, kconfig, kdecoration, kguiaddons,
-  ki18n, kwidgetsaddons, kservice, kwayland, kwindowsystem, qtx11extras
+  ki18n, kwidgetsaddons, kservice, kwayland, kwindowsystem, qtdeclarative,
+  qtx11extras
 }:
 
 mkDerivation {
@@ -10,6 +11,8 @@ mkDerivation {
   nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [
     frameworkintegration kcmutils kcompletion kconfig kdecoration kguiaddons
-    ki18n kservice kwayland kwidgetsaddons kwindowsystem qtx11extras
+    ki18n kservice kwayland kwidgetsaddons kwindowsystem qtdeclarative
+    qtx11extras
   ];
+  outputs = [ "out" "dev" "bin" ];
 }
diff --git a/pkgs/desktops/plasma-5/plasma-integration.nix b/pkgs/desktops/plasma-5/plasma-integration.nix
index 2bca3943c34..de46bb4373c 100644
--- a/pkgs/desktops/plasma-5/plasma-integration.nix
+++ b/pkgs/desktops/plasma-5/plasma-integration.nix
@@ -1,17 +1,17 @@
-{ mkDerivation, extra-cmake-modules
-, breeze-qt5, kconfig, kconfigwidgets, kiconthemes, kio, kwayland
-, libXcursor
+{
+  mkDerivation,
+  extra-cmake-modules,
+  breeze-qt5, kconfig, kconfigwidgets, kiconthemes, kio, knotifications,
+  kwayland, libXcursor
 }:
 
 # TODO: install Noto Sans and Oxygen Mono fonts with plasma-integration
 
 mkDerivation {
   name = "plasma-integration";
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
+  nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
-    breeze-qt5 kconfig kconfigwidgets kiconthemes kio kwayland
+    breeze-qt5 kconfig kconfigwidgets kiconthemes kio knotifications kwayland
     libXcursor
   ];
 }
diff --git a/pkgs/desktops/plasma-5/plasma-nm/default.nix b/pkgs/desktops/plasma-5/plasma-nm/default.nix
index 5c343548fcf..8ff98ecfc1d 100644
--- a/pkgs/desktops/plasma-5/plasma-nm/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-nm/default.nix
@@ -1,10 +1,11 @@
-{ mkDerivation, substituteAll, extra-cmake-modules, kdoctools
-, kcompletion, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative
-, kdelibs4support, ki18n, kiconthemes, kinit, kio, kitemviews
-, knotifications, kservice, kwallet, kwidgetsaddons, kwindowsystem
-, kxmlgui, mobile_broadband_provider_info
-, modemmanager-qt, networkmanager-qt, openconnect, plasma-framework
-, qca-qt5, qtdeclarative, solid, openvpn
+{
+  mkDerivation, substituteAll,
+  extra-cmake-modules, kdoctools,
+  kcompletion, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative,
+  kdelibs4support, ki18n, kiconthemes, kinit, kio, kitemviews, knotifications,
+  kservice, kwallet, kwidgetsaddons, kwindowsystem, kxmlgui,
+  mobile_broadband_provider_info, modemmanager-qt, networkmanager-qt,
+  openconnect, openvpn, plasma-framework, qca-qt5, qtdeclarative, qttools, solid
 }:
 
 mkDerivation {
@@ -19,8 +20,8 @@ mkDerivation {
       inherit openvpn;
     })
   ];
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  propagatedBuildInputs = [
+  nativeBuildInputs = [ extra-cmake-modules kdoctools qttools ];
+  buildInputs = [
     kdeclarative kdelibs4support ki18n kio kwindowsystem plasma-framework
     qtdeclarative kcompletion kconfigwidgets kcoreaddons kdbusaddons kiconthemes
     kinit kitemviews knotifications kservice kwallet kwidgetsaddons kxmlgui
diff --git a/pkgs/desktops/plasma-5/plasma-pa.nix b/pkgs/desktops/plasma-5/plasma-pa.nix
index ec40ffb9630..50f53d70a98 100644
--- a/pkgs/desktops/plasma-5/plasma-pa.nix
+++ b/pkgs/desktops/plasma-5/plasma-pa.nix
@@ -1,15 +1,15 @@
 {
   mkDerivation,
-  extra-cmake-modules,
-  gconf, glib, kdoctools, kconfigwidgets, kcoreaddons, kdeclarative, kglobalaccel,
-  ki18n, libcanberra_gtk3, libpulseaudio, plasma-framework
+  extra-cmake-modules, kdoctools,
+  gconf, glib, kconfigwidgets, kcoreaddons, kdeclarative, kglobalaccel, ki18n,
+  libcanberra_gtk3, libpulseaudio, plasma-framework, qtdeclarative
 }:
 
 mkDerivation {
   name = "plasma-pa";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  propagatedBuildInputs = [
-    gconf glib kconfigwidgets kcoreaddons kdeclarative
-    kglobalaccel ki18n libcanberra_gtk3 libpulseaudio plasma-framework
+  buildInputs = [
+    gconf glib kconfigwidgets kcoreaddons kdeclarative kglobalaccel ki18n
+    libcanberra_gtk3 libpulseaudio plasma-framework qtdeclarative
   ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/attica.nix b/pkgs/development/libraries/kde-frameworks/attica.nix
index c70be1b877d..3c725223979 100644
--- a/pkgs/development/libraries/kde-frameworks/attica.nix
+++ b/pkgs/development/libraries/kde-frameworks/attica.nix
@@ -8,4 +8,5 @@ mkDerivation {
   };
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ qtbase ];
+  outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/baloo.nix b/pkgs/development/libraries/kde-frameworks/baloo.nix
index 9bbb9a1101b..d5da9f5af17 100644
--- a/pkgs/development/libraries/kde-frameworks/baloo.nix
+++ b/pkgs/development/libraries/kde-frameworks/baloo.nix
@@ -1,14 +1,17 @@
-{ mkDerivation, lib, extra-cmake-modules, kauth, kconfig
-, kcoreaddons, kcrash, kdbusaddons, kfilemetadata, ki18n, kidletime
-, kio, lmdb, qtbase, solid
+{
+  mkDerivation, lib,
+  extra-cmake-modules,
+  kauth, kconfig, kcoreaddons, kcrash, kdbusaddons, kfilemetadata, ki18n,
+  kidletime, kio, lmdb, qtbase, qtdeclarative, solid,
 }:
 
 mkDerivation {
   name = "baloo";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [
-    kauth kconfig kcoreaddons kcrash kdbusaddons kfilemetadata ki18n kio
-    kidletime lmdb qtbase solid
+  buildInputs = [
+    kauth kconfig kcrash kdbusaddons ki18n kio kidletime lmdb qtdeclarative
+    solid
   ];
+  propagatedBuildInputs = [ kcoreaddons kfilemetadata qtbase ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/bluez-qt.nix b/pkgs/development/libraries/kde-frameworks/bluez-qt.nix
index 2f3b960f3bd..ec4deae6cb4 100644
--- a/pkgs/development/libraries/kde-frameworks/bluez-qt.nix
+++ b/pkgs/development/libraries/kde-frameworks/bluez-qt.nix
@@ -10,9 +10,10 @@ mkDerivation {
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ qtdeclarative ];
+  buildInputs = [ qtdeclarative ];
+  propagatedBuildInputs = [ qtbase ];
   preConfigure = ''
     substituteInPlace CMakeLists.txt \
-      --replace /lib/udev/rules.d "$out/lib/udev/rules.d"
+      --replace /lib/udev/rules.d "$bin/lib/udev/rules.d"
   '';
 }
diff --git a/pkgs/development/libraries/kde-frameworks/breeze-icons.nix b/pkgs/development/libraries/kde-frameworks/breeze-icons.nix
index 1c4ed2a9909..9e4a40b22ab 100644
--- a/pkgs/development/libraries/kde-frameworks/breeze-icons.nix
+++ b/pkgs/development/libraries/kde-frameworks/breeze-icons.nix
@@ -3,8 +3,7 @@
 mkDerivation {
   name = "breeze-icons";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  outputs = [ "out" ];
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ qtsvg ];
-  propagatedUserEnvPkgs = [ qtsvg.out ];
+  outputs = [ "out" ]; # only runtime outputs
 }
diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix
index 71b24a0da6b..8ab1d1b99b6 100644
--- a/pkgs/development/libraries/kde-frameworks/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/default.nix
@@ -39,11 +39,11 @@ let
     # SUPPORT
     let
 
-      propagateBin =
+      propagate = out:
         let setupHook = { writeScript }:
               writeScript "setup-hook.sh" ''
-                # Propagate $bin output
-                propagatedUserEnvPkgs+=" @bin@"
+                # Propagate $${out} output
+                propagatedUserEnvPkgs+=" @${out}@"
 
                 # Propagate $dev so that this setup hook is propagated
                 # But only if there is a separate $dev output
@@ -57,9 +57,11 @@ let
               '';
         in callPackage setupHook {};
 
+      propagateBin = propagate "bin";
+
       callPackage = self.newScope {
 
-        inherit propagateBin;
+        inherit propagate propagateBin;
 
         mkDerivation = args:
           let
diff --git a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh
index a550cda1fa2..c1b1e21852c 100644
--- a/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh
+++ b/pkgs/development/libraries/kde-frameworks/extra-cmake-modules/setup-hook.sh
@@ -1,17 +1,16 @@
-_ecmSetXdgDirs() {
+_ecmEnvHook() {
     addToSearchPath XDG_DATA_DIRS "$1/share"
     addToSearchPath XDG_CONFIG_DIRS "$1/etc/xdg"
 }
+envHooks+=(_ecmEnvHook)
 
-envHooks+=(_ecmSetXdgDirs)
-
-_ecmConfig() {
+_ecmPreConfigureHook() {
     # 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=${!outputBin}/lib/libexec"
+    cmakeFlags+=" -DKDE_INSTALL_LIBEXECDIR=${!outputLib}/lib/libexec"
     cmakeFlags+=" -DKDE_INSTALL_CMAKEPACKAGEDIR=${!outputDev}/lib/cmake"
     cmakeFlags+=" -DKDE_INSTALL_INCLUDEDIR=${!outputInclude}/include"
     cmakeFlags+=" -DKDE_INSTALL_LOCALSTATEDIR=/var"
@@ -25,7 +24,7 @@ _ecmConfig() {
     cmakeFlags+=" -DKDE_INSTALL_KXMLGUI5DIR=${!outputBin}/share/kxmlgui5"
     cmakeFlags+=" -DKDE_INSTALL_KNOTIFY5RCDIR=${!outputBin}/share/knotifications5"
     cmakeFlags+=" -DKDE_INSTALL_ICONDIR=${!outputBin}/share/icons"
-    cmakeFlags+=" -DKDE_INSTALL_LOCALEDIR=${!outputBin}/share/locale"
+    cmakeFlags+=" -DKDE_INSTALL_LOCALEDIR=${!outputLib}/share/locale"
     cmakeFlags+=" -DKDE_INSTALL_SOUNDDIR=${!outputBin}/share/sounds"
     cmakeFlags+=" -DKDE_INSTALL_TEMPLATEDIR=${!outputBin}/share/templates"
     cmakeFlags+=" -DKDE_INSTALL_WALLPAPERDIR=${!outputBin}/share/wallpapers"
@@ -52,5 +51,4 @@ _ecmConfig() {
         cmakeFlags+=" -DKDE_INSTALL_QMLDIR=${!outputBin}/$qtQmlPrefix"
     fi
 }
-
-preConfigureHooks+=(_ecmConfig)
+preConfigureHooks+=(_ecmPreConfigureHook)
diff --git a/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix b/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix
index 8f2d1446fcf..58b064806e5 100644
--- a/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix
+++ b/pkgs/development/libraries/kde-frameworks/frameworkintegration.nix
@@ -9,8 +9,9 @@ mkDerivation {
   name = "frameworkintegration";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [
-    kbookmarks kcompletion kconfig kconfigwidgets ki18n kio kiconthemes
-    knewstuff knotifications kpackage kwidgetsaddons libXcursor qtx11extras
+  buildInputs = [
+    kbookmarks kcompletion kconfig ki18n kio knewstuff knotifications kpackage
+    kwidgetsaddons libXcursor qtx11extras
   ];
+  propagatedBuildInputs = [ kconfigwidgets kiconthemes ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix b/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix
index 99737ea2b83..b558306248a 100644
--- a/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix
+++ b/pkgs/development/libraries/kde-frameworks/kactivities-stats.nix
@@ -1,8 +1,14 @@
-{ mkDerivation, lib, extra-cmake-modules, boost, kactivities, kconfig }:
+{
+  mkDerivation, lib,
+  extra-cmake-modules,
+  boost, kactivities, kconfig, qtbase,
+}:
 
 mkDerivation {
   name = "kactivities-stats";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ boost kactivities kconfig ];
+  buildInputs = [ boost kactivities kconfig ];
+  propagatedBuildInputs = [ qtbase ];
+  outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kactivities.nix b/pkgs/development/libraries/kde-frameworks/kactivities.nix
index 59b5639c24f..eabac6aadd7 100644
--- a/pkgs/development/libraries/kde-frameworks/kactivities.nix
+++ b/pkgs/development/libraries/kde-frameworks/kactivities.nix
@@ -1,14 +1,15 @@
-{ mkDerivation, lib, extra-cmake-modules, boost, kcmutils, kconfig
-, kcoreaddons, kdbusaddons, kdeclarative, kglobalaccel, ki18n
-, kio, kservice, kwindowsystem, kxmlgui, qtdeclarative
+{
+  mkDerivation, lib,
+  extra-cmake-modules,
+  boost, kconfig, kcoreaddons, kio, kwindowsystem, qtbase, qtdeclarative,
 }:
 
 mkDerivation {
   name = "kactivities";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [
-    boost kcmutils kconfig kcoreaddons kdbusaddons kdeclarative kglobalaccel
-    ki18n kio kservice kwindowsystem kxmlgui qtdeclarative
+  buildInputs = [
+    boost kconfig kcoreaddons kio kwindowsystem qtdeclarative
   ];
+  propagatedBuildInputs = [ qtbase ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kapidox.nix b/pkgs/development/libraries/kde-frameworks/kapidox.nix
index 0d3ccc276fc..ca5e773a45b 100644
--- a/pkgs/development/libraries/kde-frameworks/kapidox.nix
+++ b/pkgs/development/libraries/kde-frameworks/kapidox.nix
@@ -4,4 +4,7 @@ mkDerivation {
   name = "kapidox";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules python ];
+  postFixup = ''
+    moveToOutput bin $bin
+  '';
 }
diff --git a/pkgs/development/libraries/kde-frameworks/karchive.nix b/pkgs/development/libraries/kde-frameworks/karchive.nix
index 5f725a75d56..1f90db2bc02 100644
--- a/pkgs/development/libraries/kde-frameworks/karchive.nix
+++ b/pkgs/development/libraries/kde-frameworks/karchive.nix
@@ -1,4 +1,8 @@
-{ mkDerivation, lib, extra-cmake-modules, qtbase }:
+{
+  mkDerivation, lib,
+  extra-cmake-modules,
+  bzip2, lzma, qtbase, zlib,
+}:
 
 mkDerivation {
   name = "karchive";
@@ -7,5 +11,7 @@ mkDerivation {
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtbase ];
+  buildInputs = [ bzip2 lzma zlib ];
+  propagatedBuildInputs = [ qtbase ];
+  outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kauth/default.nix b/pkgs/development/libraries/kde-frameworks/kauth/default.nix
index 25cdb7f4a19..c94c8b91ecd 100644
--- a/pkgs/development/libraries/kde-frameworks/kauth/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kauth/default.nix
@@ -1,12 +1,17 @@
 {
-  mkDerivation, lib, copyPathsToStore,
+  mkDerivation, lib, copyPathsToStore, propagate,
   extra-cmake-modules, kcoreaddons, polkit-qt, qttools
 }:
 
 mkDerivation {
   name = "kauth";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules qttools ];
-  propagatedBuildInputs = [ kcoreaddons polkit-qt ];
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ polkit-qt qttools ];
+  propagatedBuildInputs = [ kcoreaddons ];
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
+  # library stores reference to plugin path,
+  # separating $out from $bin would create a reference cycle
+  outputs = [ "out" "dev" ];
+  setupHook = propagate "out";
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kbookmarks.nix b/pkgs/development/libraries/kde-frameworks/kbookmarks.nix
index 0873094af3d..dc2339632e4 100644
--- a/pkgs/development/libraries/kde-frameworks/kbookmarks.nix
+++ b/pkgs/development/libraries/kde-frameworks/kbookmarks.nix
@@ -1,13 +1,17 @@
 {
-  mkDerivation, lib, extra-cmake-modules,
-  kcodecs, kconfig, kconfigwidgets, kcoreaddons, kiconthemes, kxmlgui
+  mkDerivation, lib,
+  extra-cmake-modules, qttools,
+  kcodecs, kconfig, kconfigwidgets, kcoreaddons, kiconthemes, kwidgetsaddons,
+  kxmlgui, qtbase,
 }:
 
 mkDerivation {
   name = "kbookmarks";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [
+  nativeBuildInputs = [ extra-cmake-modules qttools ];
+  buildInputs = [
     kcodecs kconfig kconfigwidgets kcoreaddons kiconthemes kxmlgui
   ];
+  propagatedBuildInputs = [ kwidgetsaddons qtbase ];
+  outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix b/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix
index fb5779e10bc..023a5b5c003 100644
--- a/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix
@@ -2,16 +2,17 @@
   mkDerivation, lib,
   extra-cmake-modules,
   kconfigwidgets, kcoreaddons, kdeclarative, ki18n, kiconthemes, kitemviews,
-  kpackage, kservice, kxmlgui
+  kpackage, kservice, kxmlgui, qtdeclarative,
 }:
 
 mkDerivation {
   name = "kcmutils";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [
-    kconfigwidgets kcoreaddons kdeclarative ki18n kiconthemes kitemviews
-    kpackage kservice kxmlgui
+  buildInputs = [
+    kcoreaddons kdeclarative ki18n kiconthemes kitemviews kpackage kxmlgui
+    qtdeclarative
   ];
+  propagatedBuildInputs = [ kconfigwidgets kservice ];
   patches = [ ./0001-qdiriterator-follow-symlinks.patch ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kcodecs.nix b/pkgs/development/libraries/kde-frameworks/kcodecs.nix
index f66c422a638..90c9a963a60 100644
--- a/pkgs/development/libraries/kde-frameworks/kcodecs.nix
+++ b/pkgs/development/libraries/kde-frameworks/kcodecs.nix
@@ -6,6 +6,8 @@ mkDerivation {
     maintainers = [ lib.maintainers.ttuegel ];
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
-  nativeBuildInputs = [ extra-cmake-modules qttools ];
-  buildInputs = [ qtbase ];
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ qttools ];
+  propagatedBuildInputs = [ qtbase ];
+  outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kcompletion.nix b/pkgs/development/libraries/kde-frameworks/kcompletion.nix
index bf7556e94a6..fdfe28db6c0 100644
--- a/pkgs/development/libraries/kde-frameworks/kcompletion.nix
+++ b/pkgs/development/libraries/kde-frameworks/kcompletion.nix
@@ -7,6 +7,8 @@
 mkDerivation {
   name = "kcompletion";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules qttools ];
-  propagatedBuildInputs = [ kconfig kwidgetsaddons qtbase ];
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ kconfig kwidgetsaddons qttools ];
+  propagatedBuildInputs = [ qtbase ];
+  outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kconfig.nix b/pkgs/development/libraries/kde-frameworks/kconfig.nix
index f95b50f9de5..78b554017ee 100644
--- a/pkgs/development/libraries/kde-frameworks/kconfig.nix
+++ b/pkgs/development/libraries/kde-frameworks/kconfig.nix
@@ -6,6 +6,7 @@ mkDerivation {
     maintainers = [ lib.maintainers.ttuegel ];
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
-  nativeBuildInputs = [ extra-cmake-modules qttools ];
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ qttools ];
   propagatedBuildInputs = [ qtbase ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix b/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix
index 2b91e003764..3943e5d6d49 100644
--- a/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kconfigwidgets/default.nix
@@ -1,17 +1,20 @@
 {
   mkDerivation, lib, extra-cmake-modules,
-  kauth, kcodecs, kconfig, kdoctools, kguiaddons, ki18n, kwidgetsaddons
+  kauth, kcodecs, kconfig, kdoctools, kguiaddons, ki18n, kwidgetsaddons, qtbase,
 }:
 
 mkDerivation {
   name = "kconfigwidgets";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  propagatedBuildInputs = [
-    kauth kconfig kcodecs kguiaddons ki18n kwidgetsaddons
-  ];
+  buildInputs = [ kguiaddons ki18n qtbase ];
+  propagatedBuildInputs = [ kauth kcodecs kconfig kwidgetsaddons ];
   patches = [ ./0001-qdiriterator-follow-symlinks.patch ];
+  outputs = [ "out" "dev" ];
+  preConfigure = ''
+    outputBin=dev
+  '';
   postInstall = ''
-    moveToOutput "bin/preparetips5" "$dev"
+    moveToOutput share/man $dev
   '';
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix
index 8fa10bd767b..34073d64f89 100644
--- a/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix
+++ b/pkgs/development/libraries/kde-frameworks/kcoreaddons.nix
@@ -1,4 +1,8 @@
-{ mkDerivation, lib, fetchurl, extra-cmake-modules, qtbase, qttools, shared_mime_info }:
+{
+  mkDerivation, lib, fetchurl, writeScript,
+  extra-cmake-modules,
+  qtbase, qttools, shared_mime_info
+}:
 
 mkDerivation {
   name = "kcoreaddons";
@@ -6,6 +10,7 @@ mkDerivation {
     maintainers = [ lib.maintainers.ttuegel ];
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
-  nativeBuildInputs = [ extra-cmake-modules qttools ];
-  propagatedBuildInputs = [ qtbase shared_mime_info ];
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ qttools shared_mime_info ];
+  propagatedBuildInputs = [ qtbase ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kcrash.nix b/pkgs/development/libraries/kde-frameworks/kcrash.nix
index c8e674c88c5..d45d73d33e4 100644
--- a/pkgs/development/libraries/kde-frameworks/kcrash.nix
+++ b/pkgs/development/libraries/kde-frameworks/kcrash.nix
@@ -1,8 +1,14 @@
-{ mkDerivation, lib, extra-cmake-modules, kcoreaddons, kwindowsystem, qtx11extras }:
+{
+  mkDerivation, lib,
+  extra-cmake-modules,
+  kcoreaddons, kwindowsystem, qtbase, qtx11extras,
+}:
 
 mkDerivation {
   name = "kcrash";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ kcoreaddons kwindowsystem qtx11extras ];
+  buildInputs = [ kcoreaddons kwindowsystem qtx11extras ];
+  propagatedBuildInputs = [ qtbase ];
+  outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix b/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix
index 8169c89b5ba..d0c744da886 100644
--- a/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdbusaddons.nix
@@ -1,4 +1,8 @@
-{ mkDerivation, lib, extra-cmake-modules, qtbase, qttools, qtx11extras }:
+{
+  mkDerivation, lib,
+  extra-cmake-modules,
+  qtbase, qttools, qtx11extras
+}:
 
 mkDerivation {
   name = "kdbusaddons";
@@ -6,6 +10,7 @@ mkDerivation {
     maintainers = [ lib.maintainers.ttuegel ];
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
-  nativeBuildInputs = [ extra-cmake-modules qttools ];
-  propagatedBuildInputs = [ qtx11extras ];
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ qttools qtx11extras ];
+  propagatedBuildInputs = [ qtbase ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kdeclarative.nix b/pkgs/development/libraries/kde-frameworks/kdeclarative.nix
index 4b9522ffa5d..7aabeb02154 100644
--- a/pkgs/development/libraries/kde-frameworks/kdeclarative.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdeclarative.nix
@@ -8,8 +8,9 @@ mkDerivation {
   name = "kdeclarative";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [
-    epoxy kconfig kglobalaccel kguiaddons ki18n kiconthemes kio kpackage
-    kwidgetsaddons kwindowsystem qtdeclarative
+  buildInputs = [
+    epoxy kglobalaccel kguiaddons ki18n kiconthemes kio kwidgetsaddons
+    kwindowsystem
   ];
+  propagatedBuildInputs = [ kconfig kpackage qtdeclarative ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kded.nix b/pkgs/development/libraries/kde-frameworks/kded.nix
index 18b8ccd0fb6..65377789582 100644
--- a/pkgs/development/libraries/kde-frameworks/kded.nix
+++ b/pkgs/development/libraries/kde-frameworks/kded.nix
@@ -1,13 +1,16 @@
 {
-  mkDerivation, lib, extra-cmake-modules,
-  kconfig, kcoreaddons, kcrash, kdbusaddons, kdoctools, kinit, kservice
+  mkDerivation, lib, propagate,
+  extra-cmake-modules, kdoctools,
+  kconfig, kcoreaddons, kcrash, kdbusaddons, kinit, kservice, qtbase,
 }:
 
 mkDerivation {
   name = "kded";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  propagatedBuildInputs = [
-    kconfig kcoreaddons kcrash kdbusaddons kinit kservice
+  buildInputs = [
+    kconfig kcoreaddons kcrash kdbusaddons kinit kservice qtbase
   ];
+  outputs = [ "out" "dev" ];
+  setupHook = propagate "out";
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix b/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix
index cf94a706167..6937a4056b2 100644
--- a/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdelibs4support/default.nix
@@ -1,12 +1,11 @@
 {
   mkDerivation, lib, copyPathsToStore,
-  extra-cmake-modules, kdoctools,
-  docbook_xml_dtd_45, kauth, karchive, kcompletion, kconfig, kconfigwidgets,
-  kcoreaddons, kcrash, kdbusaddons, kded, kdesignerplugin, kemoticons,
-  kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kitemmodels, kinit,
-  knotifications, kparts, kservice, ktextwidgets, kunitconversion,
-  kwidgetsaddons, kwindowsystem, kxmlgui, networkmanager, qtsvg, qtx11extras,
-  xlibs
+  docbook_xml_dtd_45, extra-cmake-modules, kdoctools,
+  kauth, karchive, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kcrash,
+  kdbusaddons, kded, kdesignerplugin, kemoticons, kglobalaccel, kguiaddons,
+  ki18n, kiconthemes, kio, kitemmodels, kinit, knotifications, kparts, kservice,
+  ktextwidgets, kunitconversion, kwidgetsaddons, kwindowsystem, kxmlgui,
+  networkmanager, qtbase, qtsvg, qttools, qtx11extras, xlibs
 }:
 
 mkDerivation {
@@ -14,16 +13,20 @@ mkDerivation {
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   setupHook = ./setup-hook.sh;
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  nativeBuildInputs = [ extra-cmake-modules qttools ];
+  propagatedNativeBuildInputs = [ kdoctools ];
+  buildInputs = [
+    kcompletion kconfig kded kglobalaccel ki18n kio kservice kwidgetsaddons
+    kxmlgui networkmanager qtsvg qtx11extras xlibs.libSM
+  ];
   propagatedBuildInputs = [
-    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
+    kauth karchive kconfigwidgets kcoreaddons kcrash kdbusaddons kdesignerplugin
+    kemoticons kguiaddons kiconthemes kitemmodels kinit knotifications kparts
+    ktextwidgets kunitconversion kwindowsystem qtbase
   ];
   cmakeFlags = [
     "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
     "-DDocBookXML4_DTD_VERSION=4.5"
   ];
+  outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix b/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix
index c732a6be22e..91b596cc4d3 100644
--- a/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdesignerplugin.nix
@@ -2,15 +2,15 @@
   mkDerivation, lib,
   extra-cmake-modules, kdoctools,
   kcompletion, kconfig, kconfigwidgets, kcoreaddons, kiconthemes, kio,
-  kitemviews, kplotting, ktextwidgets, kwidgetsaddons, kxmlgui, sonnet
+  kitemviews, kplotting, ktextwidgets, kwidgetsaddons, kxmlgui, qttools, sonnet,
 }:
 
 mkDerivation {
   name = "kdesignerplugin";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  propagatedBuildInputs = [
-    kcompletion kconfig kconfigwidgets kcoreaddons kiconthemes kio
-    kitemviews kplotting ktextwidgets kwidgetsaddons kxmlgui sonnet
+  buildInputs = [
+    kcompletion kconfig kconfigwidgets kcoreaddons kiconthemes kio kitemviews
+    kplotting ktextwidgets kwidgetsaddons kxmlgui qttools sonnet
   ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kdesu.nix b/pkgs/development/libraries/kde-frameworks/kdesu.nix
index e8d72008507..df60511b511 100644
--- a/pkgs/development/libraries/kde-frameworks/kdesu.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdesu.nix
@@ -1,10 +1,14 @@
-{ mkDerivation, lib, extra-cmake-modules, kcoreaddons, ki18n, kpty
-, kservice
+{
+  mkDerivation, lib,
+  extra-cmake-modules,
+  kcoreaddons, ki18n, kpty, kservice, qtbase,
 }:
 
 mkDerivation {
   name = "kdesu";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ kcoreaddons ki18n kpty kservice ];
+  buildInputs = [ kcoreaddons ki18n kpty kservice qtbase ];
+  propagatedBuildInputs = [ kpty ];
+  outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kdnssd.nix b/pkgs/development/libraries/kde-frameworks/kdnssd.nix
index 1d7553090fc..9382db43e2d 100644
--- a/pkgs/development/libraries/kde-frameworks/kdnssd.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdnssd.nix
@@ -1,7 +1,7 @@
 {
   mkDerivation, lib,
-  extra-cmake-modules, qttools,
-  avahi, qtbase
+  extra-cmake-modules,
+  avahi, qtbase, qttools,
 }:
 
 mkDerivation {
@@ -10,6 +10,8 @@ mkDerivation {
     maintainers = [ lib.maintainers.ttuegel ];
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
-  nativeBuildInputs = [ extra-cmake-modules qttools ];
-  propagatedBuildInputs = [ avahi qtbase ];
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ avahi qttools ];
+  propagatedBuildInputs = [ qtbase ];
+  outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix
index 991717cce8c..55d719e8d8c 100644
--- a/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kdoctools/default.nix
@@ -1,18 +1,28 @@
 {
   mkDerivation, lib,
   extra-cmake-modules, docbook_xml_dtd_45, docbook5_xsl,
-  karchive, ki18n, perl, perlPackages
+  karchive, ki18n, qtbase,
+  perl, perlPackages
 }:
 
 mkDerivation {
   name = "kdoctools";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ karchive ki18n ];
   propagatedNativeBuildInputs = [ perl perlPackages.URI ];
+  buildInputs = [ karchive ki18n ];
+  propagatedBuildInputs = [ qtbase ];
+  outputs = [ "out" "dev" ];
+  patches = [ ./kdoctools-no-find-docbook-xml.patch ];
+  preConfigure = ''
+    outputBin=dev
+  '';
   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 ];
+  postFixup = ''
+    moveToOutput "share/doc" "$dev"
+    moveToOutput "share/man" "$dev"
+  '';
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kemoticons.nix b/pkgs/development/libraries/kde-frameworks/kemoticons.nix
index c2060e9c919..b7f4f036db5 100644
--- a/pkgs/development/libraries/kde-frameworks/kemoticons.nix
+++ b/pkgs/development/libraries/kde-frameworks/kemoticons.nix
@@ -1,12 +1,13 @@
 {
   mkDerivation, lib,
   extra-cmake-modules,
-  karchive, kconfig, kcoreaddons, kservice
+  karchive, kcoreaddons, kservice, qtbase,
 }:
 
 mkDerivation {
   name = "kemoticons";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ karchive kconfig kcoreaddons kservice ];
+  buildInputs = [ karchive kcoreaddons ];
+  propagatedBuildInputs = [ kservice qtbase ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix b/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix
index 3fb81c28a7b..7f325c88049 100644
--- a/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kfilemetadata/default.nix
@@ -7,9 +7,10 @@
 mkDerivation {
   name = "kfilemetadata";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [
-    attr ebook_tools exiv2 ffmpeg karchive ki18n poppler qtbase taglib
+  buildInputs = [
+    attr ebook_tools exiv2 ffmpeg karchive ki18n poppler taglib
   ];
+  propagatedBuildInputs = [ qtbase ];
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix b/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix
index cfe767b4d55..05fde45f17d 100644
--- a/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix
+++ b/pkgs/development/libraries/kde-frameworks/kglobalaccel.nix
@@ -2,14 +2,19 @@
   mkDerivation, lib,
   extra-cmake-modules,
   kconfig, kcoreaddons, kcrash, kdbusaddons, kservice, kwindowsystem,
-  qtx11extras
+  qtbase, qttools, qtx11extras,
 }:
 
 mkDerivation {
   name = "kglobalaccel";
-  meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [
-    kconfig kcoreaddons kcrash kdbusaddons kservice kwindowsystem qtx11extras
+  buildInputs = [
+    kconfig kcoreaddons kcrash kdbusaddons kservice kwindowsystem qttools
+    qtx11extras
   ];
+  propagatedBuildInputs = [ qtbase ];
+  postPatch = ''
+    sed -i src/runtime/org.kde.kglobalaccel.service.in \
+        -e "s|@CMAKE_INSTALL_PREFIX@|''${!outputBin}|"
+  '';
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kguiaddons.nix b/pkgs/development/libraries/kde-frameworks/kguiaddons.nix
index 2b4e28ca492..5cc7e360782 100644
--- a/pkgs/development/libraries/kde-frameworks/kguiaddons.nix
+++ b/pkgs/development/libraries/kde-frameworks/kguiaddons.nix
@@ -11,5 +11,7 @@ mkDerivation {
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ qtx11extras ];
+  buildInputs = [ qtx11extras ];
+  propagatedBuildInputs = [ qtbase ];
+  outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/khtml.nix b/pkgs/development/libraries/kde-frameworks/khtml.nix
index d6ec1ab901f..3724d078aff 100644
--- a/pkgs/development/libraries/kde-frameworks/khtml.nix
+++ b/pkgs/development/libraries/kde-frameworks/khtml.nix
@@ -10,9 +10,10 @@ mkDerivation {
   name = "khtml";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules perl ];
-  propagatedBuildInputs = [
-    giflib karchive kcodecs kglobalaccel ki18n kiconthemes kio kjs
-    knotifications kparts ktextwidgets kwallet kwidgetsaddons kwindowsystem
-    kxmlgui phonon qtx11extras sonnet
+  buildInputs = [
+    giflib karchive kcodecs kglobalaccel ki18n kiconthemes kio knotifications
+    kparts ktextwidgets kwallet kwidgetsaddons kwindowsystem kxmlgui phonon
+    qtx11extras sonnet
   ];
+  propagatedBuildInputs = [ kjs ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/ki18n.nix b/pkgs/development/libraries/kde-frameworks/ki18n.nix
index 649f1db3952..805cb201bd7 100644
--- a/pkgs/development/libraries/kde-frameworks/ki18n.nix
+++ b/pkgs/development/libraries/kde-frameworks/ki18n.nix
@@ -12,5 +12,5 @@ mkDerivation {
   };
   nativeBuildInputs = [ extra-cmake-modules ];
   propagatedNativeBuildInputs = [ gettext python ];
-  propagatedBuildInputs = [ qtdeclarative qtscript ];
+  buildInputs = [ qtdeclarative qtscript ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix b/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix
index f1d8503804e..4b8e0059377 100644
--- a/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kiconthemes/default.nix
@@ -1,7 +1,8 @@
 {
   mkDerivation, lib, copyPathsToStore,
   extra-cmake-modules,
-  karchive, kconfigwidgets, ki18n, breeze-icons, kitemviews, qtsvg
+  breeze-icons, karchive, kcoreaddons, kconfigwidgets, ki18n, kitemviews,
+  qtbase, qtsvg,
 }:
 
 mkDerivation {
@@ -9,5 +10,8 @@ mkDerivation {
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ breeze-icons kconfigwidgets karchive ki18n kitemviews qtsvg ];
+  buildInputs = [
+    breeze-icons karchive kcoreaddons kconfigwidgets ki18n kitemviews
+  ];
+  propagatedBuildInputs = [ qtbase qtsvg ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kidletime.nix b/pkgs/development/libraries/kde-frameworks/kidletime.nix
index 4139674cd39..69d83eb0ff5 100644
--- a/pkgs/development/libraries/kde-frameworks/kidletime.nix
+++ b/pkgs/development/libraries/kde-frameworks/kidletime.nix
@@ -11,5 +11,6 @@ mkDerivation {
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ qtbase qtx11extras ];
+  buildInputs = [ qtx11extras ];
+  propagatedBuildInputs = [ qtbase ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kimageformats.nix b/pkgs/development/libraries/kde-frameworks/kimageformats.nix
index b711328cf89..26a8637bafc 100644
--- a/pkgs/development/libraries/kde-frameworks/kimageformats.nix
+++ b/pkgs/development/libraries/kde-frameworks/kimageformats.nix
@@ -1,14 +1,16 @@
 {
   mkDerivation, lib,
   extra-cmake-modules,
-  ilmbase, karchive, qtbase
+  ilmbase, karchive, openexr, qtbase
 }:
 
+let inherit (lib) getDev; in
+
 mkDerivation {
   name = "kimageformats";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ ilmbase qtbase ];
-  propagatedBuildInputs = [ karchive ];
-  NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";
+  buildInputs = [ karchive openexr qtbase ];
+  outputs = [ "out" ]; # plugins only
+  NIX_CFLAGS_COMPILE = "-I${getDev ilmbase}/include/OpenEXR";
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kinit/default.nix b/pkgs/development/libraries/kde-frameworks/kinit/default.nix
index 51c0e40617a..1036ea27745 100644
--- a/pkgs/development/libraries/kde-frameworks/kinit/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kinit/default.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation, lib, copyPathsToStore,
+  mkDerivation, lib, copyPathsToStore, writeScript,
   extra-cmake-modules, kdoctools,
   kconfig, kcrash, ki18n, kio, kparts, kservice, kwindowsystem, plasma-framework
 }:
@@ -10,7 +10,7 @@ mkDerivation {
   name = "kinit";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  propagatedBuildInputs = [
+  buildInputs = [
     kconfig kcrash ki18n kio kservice kwindowsystem
   ];
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
@@ -19,4 +19,18 @@ mkDerivation {
     ''-DNIXPKGS_KF5_PARTS="${getLib kparts}/lib/libKF5Parts.so.5"''
     ''-DNIXPKGS_KF5_PLASMA="${getLib plasma-framework}/lib/libKF5Plasma.so.5"''
   ];
+  postFixup = ''
+    moveToOutput "lib/libexec/kf5/start_kdeinit" "$bin"
+  '';
+  setupHook = writeScript "setup-hook.sh" ''
+    kinitFixupOutputHook() {
+        if [ $prefix != ''${!outputBin} ] && [ -d $prefix/lib ]; then
+            mkdir -p ''${!outputBin}/lib
+            find $prefix/lib -maxdepth 1 -name 'libkdeinit5_*.so' -exec ln -s \{\} ''${!outputBin}/lib \;
+            rmdir --ignore-fail-on-non-empty ''${!outputBin}/lib
+        fi
+    }
+
+    fixupOutputHooks+=(kinitFixupOutputHook)
+  '';
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kio/default.nix b/pkgs/development/libraries/kde-frameworks/kio/default.nix
index 86cb72707a5..e4e4c90bfe1 100644
--- a/pkgs/development/libraries/kde-frameworks/kio/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kio/default.nix
@@ -1,21 +1,23 @@
 {
   mkDerivation, lib, copyPathsToStore,
   extra-cmake-modules, kdoctools,
-  acl, karchive, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons,
+  karchive, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons,
   kdbusaddons, ki18n, kiconthemes, kitemviews, kjobwidgets, knotifications,
   kservice, ktextwidgets, kwallet, kwidgetsaddons, kwindowsystem, kxmlgui,
-  qtscript, qtx11extras, solid, fetchpatch
+  qtbase, qtscript, qtx11extras, solid,
 }:
 
 mkDerivation {
   name = "kio";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [
+    karchive kconfigwidgets kdbusaddons ki18n kiconthemes knotifications
+    ktextwidgets kwallet kwidgetsaddons kwindowsystem qtscript qtx11extras
+  ];
   propagatedBuildInputs = [
-    acl karchive kbookmarks kcompletion kconfig kconfigwidgets kcoreaddons
-    kdbusaddons ki18n kiconthemes kitemviews kjobwidgets knotifications kservice
-    ktextwidgets kwallet kwidgetsaddons kwindowsystem kxmlgui solid qtscript
-    qtx11extras
+    kbookmarks kcompletion kconfig kcoreaddons kitemviews kjobwidgets kservice
+    kxmlgui qtbase solid
   ];
   patches = (copyPathsToStore (lib.readPathsFromFile ./. ./series));
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kitemmodels.nix b/pkgs/development/libraries/kde-frameworks/kitemmodels.nix
index a769d30b3c3..faeb5b16c34 100644
--- a/pkgs/development/libraries/kde-frameworks/kitemmodels.nix
+++ b/pkgs/development/libraries/kde-frameworks/kitemmodels.nix
@@ -12,4 +12,5 @@ mkDerivation {
   };
   nativeBuildInputs = [ extra-cmake-modules ];
   propagatedBuildInputs = [ qtbase ];
+  outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kitemviews.nix b/pkgs/development/libraries/kde-frameworks/kitemviews.nix
index 7e317deef58..c4c0e804e2d 100644
--- a/pkgs/development/libraries/kde-frameworks/kitemviews.nix
+++ b/pkgs/development/libraries/kde-frameworks/kitemviews.nix
@@ -10,6 +10,8 @@ mkDerivation {
     maintainers = [ lib.maintainers.ttuegel ];
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
-  nativeBuildInputs = [ extra-cmake-modules qttools ];
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ qttools ];
   propagatedBuildInputs = [ qtbase ];
+  outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix b/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix
index 048f1290a99..810e2bf8c84 100644
--- a/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix
+++ b/pkgs/development/libraries/kde-frameworks/kjobwidgets.nix
@@ -8,5 +8,5 @@ mkDerivation {
   name = "kjobwidgets";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules qttools ];
-  propagatedBuildInputs = [ kcoreaddons kwidgetsaddons qtx11extras ];
+  buildInputs = [ kcoreaddons kwidgetsaddons qtx11extras ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kjs.nix b/pkgs/development/libraries/kde-frameworks/kjs.nix
index 20459498c3e..62bcc0065b3 100644
--- a/pkgs/development/libraries/kde-frameworks/kjs.nix
+++ b/pkgs/development/libraries/kde-frameworks/kjs.nix
@@ -1,10 +1,12 @@
 {
   mkDerivation, lib,
-  extra-cmake-modules, kdoctools
+  extra-cmake-modules, kdoctools,
+  qtbase,
 }:
 
 mkDerivation {
   name = "kjs";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [ qtbase ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kjsembed.nix b/pkgs/development/libraries/kde-frameworks/kjsembed.nix
index 3a52761e259..e8cd5070ae5 100644
--- a/pkgs/development/libraries/kde-frameworks/kjsembed.nix
+++ b/pkgs/development/libraries/kde-frameworks/kjsembed.nix
@@ -1,11 +1,13 @@
 {
-  mkDerivation, lib, extra-cmake-modules, kdoctools, ki18n, kjs
-, qtsvg
+  mkDerivation, lib,
+  extra-cmake-modules, kdoctools, qttools,
+  ki18n, kjs, qtsvg,
 }:
 
 mkDerivation {
   name = "kjsembed";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  propagatedBuildInputs = [ ki18n kjs qtsvg ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools qttools ];
+  buildInputs = [ ki18n qtsvg ];
+  propagatedBuildInputs = [ kjs ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix b/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix
index 278a4240ab9..a4714c9e4ad 100644
--- a/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix
+++ b/pkgs/development/libraries/kde-frameworks/kmediaplayer.nix
@@ -8,5 +8,5 @@ mkDerivation {
   name = "kmediaplayer";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ kparts kxmlgui ];
+  buildInputs = [ kparts kxmlgui ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/knewstuff.nix b/pkgs/development/libraries/kde-frameworks/knewstuff.nix
index b32a073fb33..70f3cbb3c37 100644
--- a/pkgs/development/libraries/kde-frameworks/knewstuff.nix
+++ b/pkgs/development/libraries/kde-frameworks/knewstuff.nix
@@ -1,14 +1,18 @@
-{ mkDerivation, lib, extra-cmake-modules, attica, karchive
-, kcompletion, kconfig, kcoreaddons, ki18n, kiconthemes, kio
-, kitemviews, kservice, ktextwidgets, kwidgetsaddons, kxmlgui
+{
+  mkDerivation, lib,
+  extra-cmake-modules,
+  attica, karchive, kcompletion, kconfig, kcoreaddons, ki18n, kiconthemes,
+  kio, kitemviews, kservice, ktextwidgets, kwidgetsaddons, kxmlgui, qtbase,
+  qtdeclarative,
 }:
 
 mkDerivation {
   name = "knewstuff";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [
-    attica karchive kcompletion kconfig kcoreaddons ki18n kiconthemes kio
-    kitemviews kservice ktextwidgets kwidgetsaddons kxmlgui
+  buildInputs = [
+    karchive kcompletion kconfig kcoreaddons ki18n kiconthemes kio kitemviews
+    ktextwidgets kwidgetsaddons qtbase qtdeclarative
   ];
+  propagatedBuildInputs = [ attica kservice kxmlgui ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/knotifications.nix b/pkgs/development/libraries/kde-frameworks/knotifications.nix
index 2532f5b4b4f..964e1b44115 100644
--- a/pkgs/development/libraries/kde-frameworks/knotifications.nix
+++ b/pkgs/development/libraries/kde-frameworks/knotifications.nix
@@ -10,7 +10,7 @@ mkDerivation {
   name = "knotifications";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules qttools ];
-  propagatedBuildInputs = [
+  buildInputs = [
     kcodecs kconfig kcoreaddons kwindowsystem libdbusmenu phonon qtx11extras
   ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix b/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix
index 29c779e6598..6739f96183c 100644
--- a/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix
+++ b/pkgs/development/libraries/kde-frameworks/knotifyconfig.nix
@@ -1,10 +1,14 @@
-{ mkDerivation, lib, extra-cmake-modules, kcompletion, kconfig
-, ki18n, kio, phonon
+{
+  mkDerivation, lib,
+  extra-cmake-modules,
+  kcompletion, kconfig, ki18n, kio, phonon, qtbase,
 }:
 
 mkDerivation {
   name = "knotifyconfig";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ kcompletion kconfig ki18n kio phonon ];
+  buildInputs = [ kcompletion kconfig ki18n kio phonon ];
+  propagatedBuildInputs = [ qtbase ];
+  outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kpackage/default.nix b/pkgs/development/libraries/kde-frameworks/kpackage/default.nix
index e83afaa8e82..c0b4b631286 100644
--- a/pkgs/development/libraries/kde-frameworks/kpackage/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kpackage/default.nix
@@ -1,13 +1,13 @@
 {
   mkDerivation, fetchurl, lib, copyPathsToStore,
   extra-cmake-modules, kdoctools,
-  karchive, kconfig, kcoreaddons, ki18n
+  karchive, kconfig, kcoreaddons, ki18n, qtbase,
 }:
 
 mkDerivation {
   name = "kpackage";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  propagatedBuildInputs = [ karchive kconfig kcoreaddons ki18n ];
+  buildInputs = [ karchive kconfig kcoreaddons ki18n qtbase ];
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kparts.nix b/pkgs/development/libraries/kde-frameworks/kparts.nix
index db0eb6c2a2c..f657569277a 100644
--- a/pkgs/development/libraries/kde-frameworks/kparts.nix
+++ b/pkgs/development/libraries/kde-frameworks/kparts.nix
@@ -1,14 +1,17 @@
-{ mkDerivation, lib, extra-cmake-modules, kconfig, kcoreaddons
-, ki18n, kiconthemes, kio, kjobwidgets, knotifications, kservice
-, ktextwidgets, kwidgetsaddons, kxmlgui
+{
+  mkDerivation, lib,
+  extra-cmake-modules,
+  kconfig, kcoreaddons, ki18n, kiconthemes, kio, kjobwidgets, knotifications,
+  kservice, ktextwidgets, kwidgetsaddons, kxmlgui
 }:
 
 mkDerivation {
   name = "kparts";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [
-    kconfig kcoreaddons ki18n kiconthemes kio kjobwidgets knotifications
-    kservice ktextwidgets kwidgetsaddons kxmlgui
+  buildInputs = [
+    kconfig kcoreaddons ki18n kiconthemes kjobwidgets knotifications kservice
+    kwidgetsaddons
   ];
+  propagatedBuildInputs = [ kio ktextwidgets kxmlgui ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kpeople.nix b/pkgs/development/libraries/kde-frameworks/kpeople.nix
index e10abf6ab62..04181fd3e13 100644
--- a/pkgs/development/libraries/kde-frameworks/kpeople.nix
+++ b/pkgs/development/libraries/kde-frameworks/kpeople.nix
@@ -1,12 +1,16 @@
-{ mkDerivation, lib, extra-cmake-modules, kcoreaddons, ki18n
-, kitemviews, kservice, kwidgetsaddons, qtdeclarative
+{
+  mkDerivation, lib,
+  extra-cmake-modules,
+  kcoreaddons, ki18n, kitemviews, kservice, kwidgetsaddons, qtbase,
+  qtdeclarative,
 }:
 
 mkDerivation {
   name = "kpeople";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [
+  buildInputs = [
     kcoreaddons ki18n kitemviews kservice kwidgetsaddons qtdeclarative
   ];
+  propagatedBuildInputs = [ qtbase ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kplotting.nix b/pkgs/development/libraries/kde-frameworks/kplotting.nix
index a0d6b4625d9..5ff37fb1db1 100644
--- a/pkgs/development/libraries/kde-frameworks/kplotting.nix
+++ b/pkgs/development/libraries/kde-frameworks/kplotting.nix
@@ -9,5 +9,6 @@ mkDerivation {
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtbase ];
+  propagatedBuildInputs = [ qtbase ];
+  outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kpty.nix b/pkgs/development/libraries/kde-frameworks/kpty.nix
index 27acf536c36..150c5b3d2b2 100644
--- a/pkgs/development/libraries/kde-frameworks/kpty.nix
+++ b/pkgs/development/libraries/kde-frameworks/kpty.nix
@@ -1,8 +1,9 @@
-{ mkDerivation, lib, extra-cmake-modules, kcoreaddons, ki18n }:
+{ mkDerivation, lib, extra-cmake-modules, kcoreaddons, ki18n, qtbase, }:
 
 mkDerivation {
   name = "kpty";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ kcoreaddons ki18n ];
+  buildInputs = [ kcoreaddons ki18n qtbase ];
+  outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kross.nix b/pkgs/development/libraries/kde-frameworks/kross.nix
index 6b37c118183..f45fb5ecd1d 100644
--- a/pkgs/development/libraries/kde-frameworks/kross.nix
+++ b/pkgs/development/libraries/kde-frameworks/kross.nix
@@ -1,14 +1,14 @@
 { mkDerivation, lib, extra-cmake-modules, kcompletion, kcoreaddons
 , kdoctools, ki18n, kiconthemes, kio, kparts, kwidgetsaddons
-, kxmlgui, qtscript
+, kxmlgui, qtbase, qtscript, qtxmlpatterns,
 }:
 
 mkDerivation {
   name = "kross";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [ kcompletion kcoreaddons kxmlgui ];
   propagatedBuildInputs = [
-    kcompletion kcoreaddons ki18n kiconthemes kio kparts kwidgetsaddons kxmlgui
-    qtscript
+    ki18n kiconthemes kio kparts kwidgetsaddons qtbase qtscript qtxmlpatterns
   ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/krunner.nix b/pkgs/development/libraries/kde-frameworks/krunner.nix
index 2f542591e49..9782320a487 100644
--- a/pkgs/development/libraries/kde-frameworks/krunner.nix
+++ b/pkgs/development/libraries/kde-frameworks/krunner.nix
@@ -1,14 +1,17 @@
-{ mkDerivation, lib, extra-cmake-modules, kconfig, kcoreaddons
-, ki18n, kio, kservice, plasma-framework, solid
-, threadweaver
+{
+  mkDerivation, lib,
+  extra-cmake-modules,
+  kconfig, kcoreaddons, ki18n, kio, kservice, plasma-framework, qtbase,
+  qtdeclarative, solid, threadweaver
 }:
 
 mkDerivation {
   name = "krunner";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [
-    kconfig kcoreaddons ki18n kio kservice plasma-framework solid
+  buildInputs = [
+    kconfig kcoreaddons ki18n kio kservice qtdeclarative solid
     threadweaver
   ];
+  propagatedBuildInputs = [ plasma-framework qtbase ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kservice/default.nix b/pkgs/development/libraries/kde-frameworks/kservice/default.nix
index 2730cf53677..e6822dc2afb 100644
--- a/pkgs/development/libraries/kde-frameworks/kservice/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kservice/default.nix
@@ -1,14 +1,18 @@
 {
   mkDerivation, lib, copyPathsToStore,
   bison, extra-cmake-modules, flex,
-  kconfig, kcoreaddons, kcrash, kdbusaddons, kdoctools, ki18n, kwindowsystem
+  kconfig, kcoreaddons, kcrash, kdbusaddons, kdoctools, ki18n, kwindowsystem,
+  qtbase,
 }:
 
 mkDerivation {
   name = "kservice";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
-  propagatedNativeBuildInputs = [ bison extra-cmake-modules flex ];
-  nativeBuildInputs = [ kdoctools ];
-  propagatedBuildInputs = [ kconfig kcoreaddons kcrash kdbusaddons ki18n kwindowsystem ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  propagatedNativeBuildInputs = [ bison flex ];
+  buildInputs = [
+    kcrash kdbusaddons ki18n kwindowsystem qtbase
+  ];
+  propagatedBuildInputs = [ kconfig kcoreaddons ];
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
 }
diff --git a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix b/pkgs/development/libraries/kde-frameworks/ktexteditor.nix
index bc4dcf6916b..ae4d3a71d53 100644
--- a/pkgs/development/libraries/kde-frameworks/ktexteditor.nix
+++ b/pkgs/development/libraries/kde-frameworks/ktexteditor.nix
@@ -1,17 +1,17 @@
-{ mkDerivation, lib, copyPathsToStore
-, extra-cmake-modules, perl
-, karchive, kconfig, kguiaddons, kiconthemes, kparts
-, libgit2
-, qtscript, qtxmlpatterns
-, ki18n, kio, sonnet, syntax-highlighting
+{
+  mkDerivation, lib, copyPathsToStore,
+  extra-cmake-modules, perl,
+  karchive, kconfig, kguiaddons, ki18n, kiconthemes, kio, kparts, libgit2,
+  qtscript, qtxmlpatterns, sonnet, syntax-highlighting
 }:
 
 mkDerivation {
   name = "ktexteditor";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules perl ];
-  propagatedBuildInputs = [
-    karchive kconfig kguiaddons ki18n kiconthemes kio kparts libgit2 qtscript
+  buildInputs = [
+    karchive kconfig kguiaddons ki18n kiconthemes kio libgit2 qtscript
     qtxmlpatterns sonnet syntax-highlighting
   ];
+  propagatedBuildInputs = [ kparts ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix b/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix
index 695e7b991e7..8b082f7f365 100644
--- a/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix
+++ b/pkgs/development/libraries/kde-frameworks/ktextwidgets.nix
@@ -1,14 +1,16 @@
-{ mkDerivation, lib, extra-cmake-modules, kcompletion, kconfig
-, kconfigwidgets, ki18n, kiconthemes, kservice, kwindowsystem
-, sonnet
+{
+  mkDerivation, lib,
+  extra-cmake-modules,
+  kcompletion, kconfig, kconfigwidgets, ki18n, kiconthemes, kservice,
+  kwindowsystem, qtbase, sonnet,
 }:
 
 mkDerivation {
   name = "ktextwidgets";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [
-    kcompletion kconfig kconfigwidgets ki18n kiconthemes kservice kwindowsystem
-    sonnet
+  buildInputs = [
+    kcompletion kconfig kconfigwidgets kiconthemes kservice kwindowsystem
   ];
+  propagatedBuildInputs = [ ki18n qtbase sonnet ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kunitconversion.nix b/pkgs/development/libraries/kde-frameworks/kunitconversion.nix
index e793bb8828f..d6c079fd83b 100644
--- a/pkgs/development/libraries/kde-frameworks/kunitconversion.nix
+++ b/pkgs/development/libraries/kde-frameworks/kunitconversion.nix
@@ -1,8 +1,9 @@
-{ mkDerivation, lib, extra-cmake-modules, ki18n }:
+{ mkDerivation, lib, extra-cmake-modules, ki18n, qtbase, }:
 
 mkDerivation {
   name = "kunitconversion";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ ki18n ];
+  buildInputs = [ ki18n qtbase ];
+  outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kwallet.nix b/pkgs/development/libraries/kde-frameworks/kwallet.nix
index 31a29dbff92..fca0dedd083 100644
--- a/pkgs/development/libraries/kde-frameworks/kwallet.nix
+++ b/pkgs/development/libraries/kde-frameworks/kwallet.nix
@@ -1,14 +1,18 @@
-{ mkDerivation, lib, extra-cmake-modules, kconfig, kconfigwidgets
-, kcoreaddons , kdbusaddons, kdoctools, ki18n, kiconthemes
-, knotifications , kservice, kwidgetsaddons, kwindowsystem, libgcrypt, gpgme
+{
+  mkDerivation, lib,
+  extra-cmake-modules, kdoctools,
+  kconfig, kconfigwidgets, kcoreaddons , kdbusaddons, ki18n,
+  kiconthemes, knotifications, kservice, kwidgetsaddons, kwindowsystem,
+  libgcrypt, qgpgme, qtbase,
 }:
 
 mkDerivation {
   name = "kwallet";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  propagatedBuildInputs = [
+  buildInputs = [
     kconfig kconfigwidgets kcoreaddons kdbusaddons ki18n kiconthemes
-    knotifications kservice kwidgetsaddons kwindowsystem libgcrypt gpgme
+    knotifications kservice kwidgetsaddons kwindowsystem libgcrypt qgpgme
   ];
+  propagatedBuildInputs = [ qtbase ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kwayland.nix b/pkgs/development/libraries/kde-frameworks/kwayland.nix
index 87c0bf84706..096100980d6 100644
--- a/pkgs/development/libraries/kde-frameworks/kwayland.nix
+++ b/pkgs/development/libraries/kde-frameworks/kwayland.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation, lib,
+  mkDerivation, lib, propagateBin,
   extra-cmake-modules,
   qtbase, wayland
 }:
@@ -11,6 +11,7 @@ mkDerivation {
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtbase ];
-  propagatedBuildInputs = [ wayland ];
+  buildInputs = [ wayland ];
+  propagatedBuildInputs = [ qtbase ];
+  setupHook = propagateBin; # XDG_CONFIG_DIRS
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix b/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix
index 4375cf064e1..e607f90de8d 100644
--- a/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix
+++ b/pkgs/development/libraries/kde-frameworks/kwidgetsaddons.nix
@@ -1,5 +1,7 @@
-{ mkDerivation, lib
-, extra-cmake-modules, qtbase, qttools
+{
+  mkDerivation, lib,
+  extra-cmake-modules,
+  qtbase, qttools
 }:
 
 mkDerivation {
@@ -8,6 +10,8 @@ mkDerivation {
     maintainers = [ lib.maintainers.ttuegel ];
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
-  nativeBuildInputs = [ extra-cmake-modules qttools ];
-  buildInputs = [ qtbase ];
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ qttools ];
+  propagatedBuildInputs = [ qtbase ];
+  outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
index 6fe57449b89..ba43a5668a7 100644
--- a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
@@ -10,10 +10,11 @@ mkDerivation {
     maintainers = [ lib.maintainers.ttuegel ];
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
-  nativeBuildInputs = [ extra-cmake-modules qttools ];
-  propagatedBuildInputs = [ qtx11extras ];
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ qttools qtx11extras ];
+  propagatedBuildInputs = [ qtbase ];
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   preConfigure = ''
-    NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PATH=\"$out/$qtPluginPrefix\""
+    NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PATH=\"''${!outputBin}/$qtPluginPrefix\""
   '';
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kxmlgui.nix b/pkgs/development/libraries/kde-frameworks/kxmlgui.nix
index 80df93c61b8..b9aede81f9a 100644
--- a/pkgs/development/libraries/kde-frameworks/kxmlgui.nix
+++ b/pkgs/development/libraries/kde-frameworks/kxmlgui.nix
@@ -1,14 +1,17 @@
-{ mkDerivation, lib, extra-cmake-modules, attica, kconfig
-, kconfigwidgets, kglobalaccel, ki18n, kiconthemes, kitemviews
-, ktextwidgets, kwindowsystem, sonnet
+{
+  mkDerivation, lib,
+  extra-cmake-modules,
+  attica, kconfig, kconfigwidgets, kglobalaccel, ki18n, kiconthemes, kitemviews,
+  ktextwidgets, kwindowsystem, qtbase, sonnet,
 }:
 
 mkDerivation {
   name = "kxmlgui";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [
-    attica kconfig kconfigwidgets kglobalaccel ki18n kiconthemes kitemviews
-    ktextwidgets kwindowsystem sonnet
+  buildInputs = [
+    attica kglobalaccel ki18n kiconthemes kitemviews ktextwidgets kwindowsystem
+    sonnet
   ];
+  propagatedBuildInputs = [ kconfig kconfigwidgets qtbase ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix b/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix
index 714d768742e..acffde6a7cf 100644
--- a/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix
+++ b/pkgs/development/libraries/kde-frameworks/kxmlrpcclient.nix
@@ -4,5 +4,7 @@ mkDerivation {
   name = "kxmlrpcclient";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ ki18n kio ];
+  buildInputs = [ ki18n ];
+  propagatedBuildInputs = [ kio ];
+  outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix b/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix
index c4edfeca5a3..cdf09a48b4f 100644
--- a/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix
+++ b/pkgs/development/libraries/kde-frameworks/modemmanager-qt.nix
@@ -1,6 +1,7 @@
-{ mkDerivation, lib
-, extra-cmake-modules
-, modemmanager, qtbase
+{
+  mkDerivation, lib,
+  extra-cmake-modules,
+  modemmanager, qtbase
 }:
 
 mkDerivation {
@@ -10,6 +11,6 @@ mkDerivation {
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtbase ];
-  propagatedBuildInputs = [ modemmanager ];
+  propagatedBuildInputs = [ modemmanager qtbase ];
+  outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix b/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix
index 340c76ef778..3ed56bbf718 100644
--- a/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix
+++ b/pkgs/development/libraries/kde-frameworks/networkmanager-qt.nix
@@ -1,6 +1,7 @@
-{ mkDerivation, lib
-, extra-cmake-modules
-, qtbase, networkmanager
+{
+  mkDerivation, lib,
+  extra-cmake-modules,
+  networkmanager, qtbase,
 }:
 
 mkDerivation {
@@ -10,6 +11,6 @@ mkDerivation {
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtbase ];
-  propagatedBuildInputs = [ networkmanager ];
+  propagatedBuildInputs = [ networkmanager qtbase ];
+  outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix b/pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix
index 919c4f36b15..2d795bfc50c 100644
--- a/pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix
+++ b/pkgs/development/libraries/kde-frameworks/oxygen-icons5.nix
@@ -9,7 +9,7 @@ mkDerivation {
     license = lib.licenses.lgpl3Plus;
     maintainers = [ lib.maintainers.ttuegel ];
   };
-  outputs = [ "out" ];
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ qtbase ];
+  outputs = [ "out" ]; # only runtime outputs
 }
diff --git a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix
index f47750145b5..d3a81b50bf1 100644
--- a/pkgs/development/libraries/kde-frameworks/plasma-framework.nix
+++ b/pkgs/development/libraries/kde-frameworks/plasma-framework.nix
@@ -1,17 +1,20 @@
-{ mkDerivation, lib, fetchurl, extra-cmake-modules, kactivities, karchive
-, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative
-, kdoctools, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio
-, knotifications, kpackage, kservice, kwayland, kwindowsystem, kxmlgui
-, qtscript, qtx11extras
+{
+  mkDerivation, lib,
+  extra-cmake-modules, kdoctools,
+  kactivities, karchive, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons,
+  kdeclarative, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio,
+  knotifications, kpackage, kservice, kwayland, kwindowsystem, kxmlgui,
+  qtbase, qtdeclarative, qtscript, qtx11extras,
 }:
 
 mkDerivation {
   name = "plasma-framework";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  propagatedBuildInputs = [
+  buildInputs = [
     kactivities karchive kconfig kconfigwidgets kcoreaddons kdbusaddons
     kdeclarative kglobalaccel kguiaddons ki18n kiconthemes kio knotifications
-    kpackage kservice kwayland kwindowsystem kxmlgui qtscript qtx11extras
+    kwayland kwindowsystem kxmlgui qtdeclarative qtscript qtx11extras
   ];
+  propagatedBuildInputs = [ kpackage kservice qtbase ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/prison.nix b/pkgs/development/libraries/kde-frameworks/prison.nix
index 905321235c7..2d86f3fbf05 100644
--- a/pkgs/development/libraries/kde-frameworks/prison.nix
+++ b/pkgs/development/libraries/kde-frameworks/prison.nix
@@ -8,5 +8,7 @@ mkDerivation {
   name = "prison";
   meta = { maintainers = [ lib.maintainers.ttuegel ]; };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ libdmtx qrencode qtbase ];
+  buildInputs = [ libdmtx qrencode ];
+  propagatedBuildInputs = [ qtbase ];
+  outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/solid.nix b/pkgs/development/libraries/kde-frameworks/solid.nix
index f64b9936046..24705d6c114 100644
--- a/pkgs/development/libraries/kde-frameworks/solid.nix
+++ b/pkgs/development/libraries/kde-frameworks/solid.nix
@@ -1,7 +1,7 @@
 {
   mkDerivation, lib,
   bison, extra-cmake-modules, flex,
-  qtbase, qtdeclarative, qttools
+  media-player-info, qtbase, qtdeclarative, qttools
 }:
 
 mkDerivation {
@@ -10,6 +10,8 @@ mkDerivation {
     maintainers = [ lib.maintainers.ttuegel ];
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
-  nativeBuildInputs = [ bison extra-cmake-modules flex qttools ];
-  propagatedBuildInputs = [ qtdeclarative ];
+  nativeBuildInputs = [ bison extra-cmake-modules flex ];
+  buildInputs = [ qtdeclarative qttools ];
+  propagatedBuildInputs = [ qtbase ];
+  propagatedUserEnvPkgs = [ media-player-info ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/sonnet.nix b/pkgs/development/libraries/kde-frameworks/sonnet.nix
index 06165a57c3a..90e2169c166 100644
--- a/pkgs/development/libraries/kde-frameworks/sonnet.nix
+++ b/pkgs/development/libraries/kde-frameworks/sonnet.nix
@@ -9,6 +9,7 @@ mkDerivation {
     maintainers = [ lib.maintainers.ttuegel ];
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
-  nativeBuildInputs = [ extra-cmake-modules qttools ];
-  buildInputs = [ hunspell qtbase ];
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ hunspell qttools ];
+  propagatedBuildInputs = [ qtbase ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix b/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix
index ebc33a8346e..82c8f323a0d 100644
--- a/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix
+++ b/pkgs/development/libraries/kde-frameworks/syntax-highlighting.nix
@@ -8,6 +8,7 @@ mkDerivation {
     maintainers = [ lib.maintainers.ttuegel ];
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
-  nativeBuildInputs = [ extra-cmake-modules perl qttools ];
-  buildInputs = [ qtbase ];
+  nativeBuildInputs = [ extra-cmake-modules perl ];
+  buildInputs = [ qttools ];
+  propagatedBuildInputs = [ qtbase ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/threadweaver.nix b/pkgs/development/libraries/kde-frameworks/threadweaver.nix
index 3afedf18ecb..8861d2853ba 100644
--- a/pkgs/development/libraries/kde-frameworks/threadweaver.nix
+++ b/pkgs/development/libraries/kde-frameworks/threadweaver.nix
@@ -1,5 +1,7 @@
-{ mkDerivation, lib
-, extra-cmake-modules, qtbase
+{
+  mkDerivation, lib,
+  extra-cmake-modules,
+  qtbase
 }:
 
 mkDerivation {
@@ -9,5 +11,6 @@ mkDerivation {
     broken = builtins.compareVersions qtbase.version "5.6.0" < 0;
   };
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtbase ];
+  propagatedBuildInputs = [ qtbase ];
+  outputs = [ "out" "dev" ];
 }

From fc72335570e7063d9dfffef3635e3384a56de4bb Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Thu, 25 May 2017 13:28:16 -0500
Subject: [PATCH 047/189] kio: print plugin name when loading fails

---
 .../kio/kio-debug-module-loader.patch               | 13 +++++++++++++
 .../development/libraries/kde-frameworks/kio/series |  1 +
 2 files changed, 14 insertions(+)
 create mode 100644 pkgs/development/libraries/kde-frameworks/kio/kio-debug-module-loader.patch

diff --git a/pkgs/development/libraries/kde-frameworks/kio/kio-debug-module-loader.patch b/pkgs/development/libraries/kde-frameworks/kio/kio-debug-module-loader.patch
new file mode 100644
index 00000000000..d26af49e5eb
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks/kio/kio-debug-module-loader.patch
@@ -0,0 +1,13 @@
+Index: kio-5.33.0/src/kiod/kiod_main.cpp
+===================================================================
+--- kio-5.33.0.orig/src/kiod/kiod_main.cpp
++++ kio-5.33.0/src/kiod/kiod_main.cpp
+@@ -60,7 +60,7 @@ void KIOD::loadModule(const QString &nam
+         module = factory->create<KDEDModule>();
+     }
+     if (!module) {
+-        qCWarning(KIOD_CATEGORY) << "Error loading plugin:" << loader.errorString();
++        qCWarning(KIOD_CATEGORY) << "Error loading plugin" << name << loader.errorString();
+         return;
+     }
+     module->setModuleName(name); // makes it register to DBus
diff --git a/pkgs/development/libraries/kde-frameworks/kio/series b/pkgs/development/libraries/kde-frameworks/kio/series
index 77ca1545004..5330c40a330 100644
--- a/pkgs/development/libraries/kde-frameworks/kio/series
+++ b/pkgs/development/libraries/kde-frameworks/kio/series
@@ -1 +1,2 @@
 samba-search-path.patch
+kio-debug-module-loader.patch

From 7af16e5bd79295e16c8ec4c47cac0136cf91d0d1 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Thu, 25 May 2017 13:32:15 -0500
Subject: [PATCH 048/189] kcmutils: print plugin name when loading fails

---
 .../kde-frameworks/kcmutils/default.nix       |  4 ++--
 .../kcmutils-debug-module-loader.patch        | 13 +++++++++++
 ...s.patch => kcmutils-follow-symlinks.patch} | 22 +++++--------------
 .../libraries/kde-frameworks/kcmutils/series  |  2 ++
 4 files changed, 22 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-debug-module-loader.patch
 rename pkgs/development/libraries/kde-frameworks/kcmutils/{0001-qdiriterator-follow-symlinks.patch => kcmutils-follow-symlinks.patch} (54%)
 create mode 100644 pkgs/development/libraries/kde-frameworks/kcmutils/series

diff --git a/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix b/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix
index 023a5b5c003..0c661dcdd48 100644
--- a/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kcmutils/default.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation, lib,
+  mkDerivation, lib, copyPathsToStore,
   extra-cmake-modules,
   kconfigwidgets, kcoreaddons, kdeclarative, ki18n, kiconthemes, kitemviews,
   kpackage, kservice, kxmlgui, qtdeclarative,
@@ -14,5 +14,5 @@ mkDerivation {
     qtdeclarative
   ];
   propagatedBuildInputs = [ kconfigwidgets kservice ];
-  patches = [ ./0001-qdiriterator-follow-symlinks.patch ];
+  patches = (copyPathsToStore (lib.readPathsFromFile ./. ./series));
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-debug-module-loader.patch b/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-debug-module-loader.patch
new file mode 100644
index 00000000000..0411755f45a
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-debug-module-loader.patch
@@ -0,0 +1,13 @@
+Index: kcmutils-5.33.0/src/kcmoduleloader.cpp
+===================================================================
+--- kcmutils-5.33.0.orig/src/kcmoduleloader.cpp
++++ kcmutils-5.33.0/src/kcmoduleloader.cpp
+@@ -96,7 +96,7 @@ KCModule *KCModuleLoader::loadModule(con
+             KPluginLoader loader(KPluginLoader::findPlugin(QLatin1String("kcms/") + mod.service()->library()));
+             KPluginFactory* factory = loader.factory();
+             if (!factory) {
+-                qWarning() << "Error loading plugin:" << loader.errorString();
++                qWarning() << "Error loading KCM plugin" << mod.service()->library() << loader.errorString();
+             } else {
+                 KQuickAddons::ConfigModule *cm = factory->create<KQuickAddons::ConfigModule >();
+                 if (!cm) {
diff --git a/pkgs/development/libraries/kde-frameworks/kcmutils/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-follow-symlinks.patch
similarity index 54%
rename from pkgs/development/libraries/kde-frameworks/kcmutils/0001-qdiriterator-follow-symlinks.patch
rename to pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-follow-symlinks.patch
index 0d861fa9501..5e1007b7fc0 100644
--- a/pkgs/development/libraries/kde-frameworks/kcmutils/0001-qdiriterator-follow-symlinks.patch
+++ b/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-follow-symlinks.patch
@@ -1,17 +1,8 @@
-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,
+Index: kcmutils-5.33.0/src/kpluginselector.cpp
+===================================================================
+--- kcmutils-5.33.0.orig/src/kpluginselector.cpp
++++ kcmutils-5.33.0/src/kpluginselector.cpp
+@@ -305,7 +305,7 @@ void KPluginSelector::addPlugins(const Q
      QStringList desktopFileNames;
      const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, componentName + QStringLiteral("/kpartplugins"), QStandardPaths::LocateDirectory);
      Q_FOREACH (const QString &dir, dirs) {
@@ -20,6 +11,3 @@ index 9c3431d..d6b1ee2 100644
          while (it.hasNext()) {
              desktopFileNames.append(it.next());
          }
--- 
-2.5.2
-
diff --git a/pkgs/development/libraries/kde-frameworks/kcmutils/series b/pkgs/development/libraries/kde-frameworks/kcmutils/series
new file mode 100644
index 00000000000..f2c22554a45
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks/kcmutils/series
@@ -0,0 +1,2 @@
+kcmutils-follow-symlinks.patch
+kcmutils-debug-module-loader.patch

From 86dac81a706fa7015522eb6b3da8f951200f4b21 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 27 May 2017 07:57:31 -0500
Subject: [PATCH 049/189] kcmutils: fix kcm plugin path

---
 .../kcmutils/kcmutils-fix-plugin-path.patch         | 13 +++++++++++++
 .../libraries/kde-frameworks/kcmutils/series        |  1 +
 2 files changed, 14 insertions(+)
 create mode 100644 pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-fix-plugin-path.patch

diff --git a/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-fix-plugin-path.patch b/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-fix-plugin-path.patch
new file mode 100644
index 00000000000..e82ce7d592c
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks/kcmutils/kcmutils-fix-plugin-path.patch
@@ -0,0 +1,13 @@
+Index: kcmutils-5.33.0/src/kcmoduleloader.cpp
+===================================================================
+--- kcmutils-5.33.0.orig/src/kcmoduleloader.cpp
++++ kcmutils-5.33.0/src/kcmoduleloader.cpp
+@@ -93,7 +93,7 @@ KCModule *KCModuleLoader::loadModule(con
+         if (module) {
+             return module;
+         } else {
+-            KPluginLoader loader(KPluginLoader::findPlugin(QLatin1String("kcms/") + mod.service()->library()));
++            KPluginLoader loader(KPluginLoader::findPlugin(mod.service()->library()));
+             KPluginFactory* factory = loader.factory();
+             if (!factory) {
+                 qWarning() << "Error loading KCM plugin" << mod.service()->library() << loader.errorString();
diff --git a/pkgs/development/libraries/kde-frameworks/kcmutils/series b/pkgs/development/libraries/kde-frameworks/kcmutils/series
index f2c22554a45..6fbc4ca6563 100644
--- a/pkgs/development/libraries/kde-frameworks/kcmutils/series
+++ b/pkgs/development/libraries/kde-frameworks/kcmutils/series
@@ -1,2 +1,3 @@
 kcmutils-follow-symlinks.patch
 kcmutils-debug-module-loader.patch
+kcmutils-fix-plugin-path.patch

From a4be1a68f8d45d87e9dec36dc81070ed1f2b722e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 26 May 2017 15:43:31 -0500
Subject: [PATCH 050/189] plasma-desktop: pass path to hwclock through
 preprocessor macro

---
 pkgs/desktops/plasma-5/plasma-desktop/default.nix        | 5 ++++-
 pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/plasma-5/plasma-desktop/default.nix b/pkgs/desktops/plasma-5/plasma-desktop/default.nix
index a1ccaea6ea3..377bc4cdd14 100644
--- a/pkgs/desktops/plasma-5/plasma-desktop/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-desktop/default.nix
@@ -32,7 +32,10 @@ mkDerivation rec {
 
     sed '1i#include <cmath>' -i kcms/touchpad/src/backends/x11/synapticstouchpad.cpp
   '';
-  NIX_CFLAGS_COMPILE = [ "-I${xorgserver.dev}/include/xorg" ];
+  NIX_CFLAGS_COMPILE = [
+    "-I${lib.getDev xorgserver}/include/xorg"
+    ''-DNIXPKGS_HWCLOCK="${lib.getBin utillinux}/sbin/hwclock"''
+  ];
   cmakeFlags = [
     "-DEvdev_INCLUDE_DIRS=${xf86inputevdev.dev}/include/xorg"
     "-DSynaptics_INCLUDE_DIRS=${xf86inputsynaptics.dev}/include/xorg"
diff --git a/pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch b/pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch
index 5623de84668..a46212af10f 100644
--- a/pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch
+++ b/pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch
@@ -18,7 +18,7 @@ Index: plasma-desktop-5.8.5/kcms/dateandtime/helper.cpp
  void ClockHelper::toHwclock()
  {
 -    QString hwclock = KStandardDirs::findExe(QStringLiteral("hwclock"), exePath);
-+    QString hwclock = "@hwclock@";
++    QString hwclock = QLatin1String(NIXPKGS_HWCLOCK);
      if (!hwclock.isEmpty()) {
          KProcess::execute(hwclock, QStringList() << QStringLiteral("--systohc"));
      }

From 7f95d4834f772607fb4c9b2ffa4611ccd0a1006f Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 26 May 2017 15:44:07 -0500
Subject: [PATCH 051/189] kwin: pass path to Xwayland through preprocessor
 macro

---
 pkgs/desktops/plasma-5/kwin/default.nix    | 7 +++----
 pkgs/desktops/plasma-5/kwin/xwayland.patch | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix
index ab8cc4d2498..08f0e346855 100644
--- a/pkgs/desktops/plasma-5/kwin/default.nix
+++ b/pkgs/desktops/plasma-5/kwin/default.nix
@@ -25,10 +25,9 @@ mkDerivation {
     udev wayland xcb-util-cursor xwayland
   ];
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
-  postPatch = ''
-    substituteInPlace main_wayland.cpp \
-        --subst-var-by xwayland ${lib.getBin xwayland}/bin/Xwayland
-  '';
+  NIX_CFLAGS_COMPILE = [
+    ''-DNIXPKGS_XWAYLAND="${lib.getBin xwayland}/bin/Xwayland"''
+  ];
   cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" ];
   postInstall = ''
     # Some package(s) refer to these service types by the wrong name.
diff --git a/pkgs/desktops/plasma-5/kwin/xwayland.patch b/pkgs/desktops/plasma-5/kwin/xwayland.patch
index 5fde01d08bf..51f15c87d27 100644
--- a/pkgs/desktops/plasma-5/kwin/xwayland.patch
+++ b/pkgs/desktops/plasma-5/kwin/xwayland.patch
@@ -7,7 +7,7 @@ Index: kwin-5.7.3/main_wayland.cpp
      m_xwaylandProcess = new Process(kwinApp());
      m_xwaylandProcess->setProcessChannelMode(QProcess::ForwardedErrorChannel);
 -    m_xwaylandProcess->setProgram(QStringLiteral("Xwayland"));
-+    m_xwaylandProcess->setProgram(QStringLiteral("@xwayland@"));
++    m_xwaylandProcess->setProgram(QLatin1String(NIXPKGS_XWAYLAND));
      QProcessEnvironment env = m_environment;
      env.insert("WAYLAND_SOCKET", QByteArray::number(wlfd));
      m_xwaylandProcess->setProcessEnvironment(env);

From 8538d75734e4776807203b66f91a281f4da4e801 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 26 May 2017 15:44:36 -0500
Subject: [PATCH 052/189] plasma5: fixup inputs and outputs

---
 pkgs/desktops/plasma-5/breeze-grub.nix        |  1 -
 pkgs/desktops/plasma-5/breeze-gtk.nix         |  2 +-
 .../plasma-5/breeze-plymouth/default.nix      |  1 -
 pkgs/desktops/plasma-5/breeze-qt4.nix         |  1 +
 pkgs/desktops/plasma-5/breeze-qt5.nix         |  1 +
 pkgs/desktops/plasma-5/default.nix            | 40 +++++++++++++---
 pkgs/desktops/plasma-5/kactivitymanagerd.nix  |  9 ++--
 .../plasma-5/kde-gtk-config/default.nix       | 19 +++-----
 pkgs/desktops/plasma-5/kdecoration.nix        |  1 +
 pkgs/desktops/plasma-5/khotkeys.nix           | 10 ++--
 pkgs/desktops/plasma-5/kmenuedit.nix          |  2 +-
 pkgs/desktops/plasma-5/kscreen.nix            |  8 ++--
 pkgs/desktops/plasma-5/kscreenlocker.nix      |  3 +-
 pkgs/desktops/plasma-5/ksysguard.nix          |  5 +-
 pkgs/desktops/plasma-5/kwin/default.nix       | 45 ++++++++++--------
 pkgs/desktops/plasma-5/libkscreen/default.nix | 13 +++---
 .../plasma-5/libksysguard/default.nix         |  3 +-
 pkgs/desktops/plasma-5/milou.nix              |  4 +-
 .../plasma-5/plasma-desktop/default.nix       | 46 ++++++++++---------
 pkgs/desktops/plasma-5/plasma-nm/default.nix  | 16 +++----
 .../plasma-5/plasma-workspace-wallpapers.nix  |  9 +---
 .../plasma-5/plasma-workspace/default.nix     | 35 +++++++-------
 pkgs/desktops/plasma-5/powerdevil.nix         | 12 +++--
 pkgs/desktops/plasma-5/systemsettings.nix     |  3 +-
 24 files changed, 162 insertions(+), 127 deletions(-)

diff --git a/pkgs/desktops/plasma-5/breeze-grub.nix b/pkgs/desktops/plasma-5/breeze-grub.nix
index e8ac5c1e208..eed396b5437 100644
--- a/pkgs/desktops/plasma-5/breeze-grub.nix
+++ b/pkgs/desktops/plasma-5/breeze-grub.nix
@@ -4,7 +4,6 @@
 
 mkDerivation {
   name = "breeze-grub";
-  outputs = [ "out" ];
   installPhase = ''
     runHook preInstall
 
diff --git a/pkgs/desktops/plasma-5/breeze-gtk.nix b/pkgs/desktops/plasma-5/breeze-gtk.nix
index f2d76fe19e6..cc51c4b0471 100644
--- a/pkgs/desktops/plasma-5/breeze-gtk.nix
+++ b/pkgs/desktops/plasma-5/breeze-gtk.nix
@@ -5,10 +5,10 @@ let inherit (lib) getLib; in
 mkDerivation {
   name = "breeze-gtk";
   nativeBuildInputs = [ extra-cmake-modules ];
-  cmakeFlags = [ "-DWITH_GTK3_VERSION=3.22" ];
   buildInputs = [ qtbase ];
   postPatch = ''
     sed -i cmake/FindGTKEngine.cmake \
       -e "s|\''${KDE_INSTALL_FULL_LIBDIR}|${getLib gtk2}/lib|"
   '';
+  cmakeFlags = [ "-DWITH_GTK3_VERSION=3.22" ];
 }
diff --git a/pkgs/desktops/plasma-5/breeze-plymouth/default.nix b/pkgs/desktops/plasma-5/breeze-plymouth/default.nix
index 898d9cd78a5..41a4dd66b2c 100644
--- a/pkgs/desktops/plasma-5/breeze-plymouth/default.nix
+++ b/pkgs/desktops/plasma-5/breeze-plymouth/default.nix
@@ -8,7 +8,6 @@ mkDerivation {
   name = "breeze-plymouth";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ plymouth ];
-  outputs = [ "out" ];
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   postPatch = ''
       substituteInPlace cmake/FindPlymouth.cmake --subst-var out
diff --git a/pkgs/desktops/plasma-5/breeze-qt4.nix b/pkgs/desktops/plasma-5/breeze-qt4.nix
index 6c9d0c5c4ce..6c31398037b 100644
--- a/pkgs/desktops/plasma-5/breeze-qt4.nix
+++ b/pkgs/desktops/plasma-5/breeze-qt4.nix
@@ -9,6 +9,7 @@ mkDerivation {
   sname = "breeze";
   buildInputs = [ kdelibs4 qt4 xproto ];
   nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
+  outputs = [ "out" "dev" ];
   cmakeFlags = [
     "-DUSE_KDE4=ON"
     "-DQT_QMAKE_EXECUTABLE=${qt4}/bin/qmake"
diff --git a/pkgs/desktops/plasma-5/breeze-qt5.nix b/pkgs/desktops/plasma-5/breeze-qt5.nix
index b1cb3b7f8fc..c0e55dec76d 100644
--- a/pkgs/desktops/plasma-5/breeze-qt5.nix
+++ b/pkgs/desktops/plasma-5/breeze-qt5.nix
@@ -15,5 +15,6 @@ mkDerivation {
     kguiaddons ki18n kwayland kwindowsystem plasma-framework qtdeclarative
     qtx11extras
   ];
+  outputs = [ "out" "dev" "bin" ];
   cmakeFlags = [ "-DUSE_Qt4=OFF" ];
 }
diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix
index 10d5a152f13..e101d4e14c5 100644
--- a/pkgs/desktops/plasma-5/default.nix
+++ b/pkgs/desktops/plasma-5/default.nix
@@ -36,21 +36,44 @@ let
     mirror = "mirror://kde";
   };
 
+  mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {};
+
   packages = self: with self;
     let
+
+      propagate = out:
+        let setupHook = { writeScript }:
+              writeScript "setup-hook.sh" ''
+                # Propagate $${out} output
+                propagatedUserEnvPkgs+=" @${out}@"
+
+                # Propagate $dev so that this setup hook is propagated
+                # But only if there is a separate $dev output
+                if [ "$outputDev" != out ]; then
+                    if [ -n "$crossConfig" ]; then
+                      propagatedBuildInputs+=" @dev@"
+                    else
+                      propagatedNativeBuildInputs+=" @dev@"
+                    fi
+                fi
+              '';
+        in callPackage setupHook {};
+
+      propagateBin = propagate "bin";
+
       callPackage = self.newScope {
         mkDerivation = args:
           let
             inherit (args) name;
             sname = args.sname or name;
             inherit (srcs."${sname}") src version;
-            mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {};
-          in
-          mkDerivation (args // {
-            name = "${name}-${version}";
-            inherit src;
 
-            outputs = args.outputs or [ "out" "dev" ];
+            outputs = args.outputs or [ "out" ];
+            hasBin = lib.elem "bin" outputs;
+            hasDev = lib.elem "dev" outputs;
+
+            defaultSetupHook = if hasBin && hasDev then propagateBin else null;
+            setupHook = args.setupHook or defaultSetupHook;
 
             meta = {
               license = with lib.licenses; [
@@ -60,8 +83,13 @@ let
               maintainers = with lib.maintainers; [ ttuegel ];
               homepage = "http://www.kde.org";
             } // (args.meta or {});
+          in
+          mkDerivation (args // {
+            name = "${name}-${version}";
+            inherit meta outputs setupHook src;
           });
       };
+
     in {
       bluedevil = callPackage ./bluedevil.nix {};
       breeze-gtk = callPackage ./breeze-gtk.nix {};
diff --git a/pkgs/desktops/plasma-5/kactivitymanagerd.nix b/pkgs/desktops/plasma-5/kactivitymanagerd.nix
index 629718ab5a0..ae2736fde11 100644
--- a/pkgs/desktops/plasma-5/kactivitymanagerd.nix
+++ b/pkgs/desktops/plasma-5/kactivitymanagerd.nix
@@ -1,7 +1,8 @@
-{ mkDerivation
-, extra-cmake-modules
-, boost, kconfig, kcoreaddons, kdbusaddons, ki18n, kio, kglobalaccel
-, kwindowsystem, kxmlgui
+{
+  mkDerivation,
+  extra-cmake-modules,
+  boost, kconfig, kcoreaddons, kdbusaddons, ki18n, kio, kglobalaccel,
+  kwindowsystem, kxmlgui
 }:
 
 mkDerivation {
diff --git a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix
index 5e959ac8b79..38bab58c829 100644
--- a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix
+++ b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix
@@ -1,25 +1,18 @@
-{ mkDerivation
-, extra-cmake-modules
-, glib
-, gtk2
-, gtk3
-, karchive
-, kcmutils
-, kconfigwidgets
-, ki18n
-, kiconthemes
-, kio
-, knewstuff
+{
+  mkDerivation,
+  extra-cmake-modules,
+  glib, gtk2, gtk3, karchive, kcmutils, kconfigwidgets, ki18n, kiconthemes, kio,
+  knewstuff
 }:
 
 mkDerivation {
   name = "kde-gtk-config";
-  patches = [ ./0001-follow-symlinks.patch ];
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
     ki18n kio glib gtk2 gtk3 karchive kcmutils kconfigwidgets kiconthemes
     knewstuff
   ];
+  patches = [ ./0001-follow-symlinks.patch ];
   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/plasma-5/kdecoration.nix b/pkgs/desktops/plasma-5/kdecoration.nix
index 9efdb8cff81..d8f996421ac 100644
--- a/pkgs/desktops/plasma-5/kdecoration.nix
+++ b/pkgs/desktops/plasma-5/kdecoration.nix
@@ -4,4 +4,5 @@ mkDerivation {
   name = "kdecoration";
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ qtbase ];
+  outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/desktops/plasma-5/khotkeys.nix b/pkgs/desktops/plasma-5/khotkeys.nix
index be4ccc7b230..abfb85a867c 100644
--- a/pkgs/desktops/plasma-5/khotkeys.nix
+++ b/pkgs/desktops/plasma-5/khotkeys.nix
@@ -1,7 +1,8 @@
-{ mkDerivation, extra-cmake-modules, kdoctools, kcmutils
-, kdbusaddons, kdelibs4support, kglobalaccel, ki18n, kio, kxmlgui
-, plasma-framework, plasma-workspace, qtx11extras
-, fetchpatch
+{
+  mkDerivation,
+  extra-cmake-modules, kdoctools,
+  kcmutils, kdbusaddons, kdelibs4support, kglobalaccel, ki18n, kio, kxmlgui,
+  plasma-framework, plasma-workspace, qtx11extras
 }:
 
 mkDerivation {
@@ -11,4 +12,5 @@ mkDerivation {
     kcmutils kdbusaddons kdelibs4support kglobalaccel ki18n kio kxmlgui
     plasma-framework plasma-workspace qtx11extras
   ];
+  outputs = [ "out" "dev" "bin" ];
 }
diff --git a/pkgs/desktops/plasma-5/kmenuedit.nix b/pkgs/desktops/plasma-5/kmenuedit.nix
index 164c378a60d..016ea940d99 100644
--- a/pkgs/desktops/plasma-5/kmenuedit.nix
+++ b/pkgs/desktops/plasma-5/kmenuedit.nix
@@ -8,7 +8,7 @@
 mkDerivation {
   name = "kmenuedit";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  propagatedBuildInputs = [
+  buildInputs = [
     kdbusaddons kdelibs4support khotkeys ki18n kiconthemes kio kxmlgui sonnet
   ];
 }
diff --git a/pkgs/desktops/plasma-5/kscreen.nix b/pkgs/desktops/plasma-5/kscreen.nix
index fcdc922ff94..7fdaedbb78d 100644
--- a/pkgs/desktops/plasma-5/kscreen.nix
+++ b/pkgs/desktops/plasma-5/kscreen.nix
@@ -1,6 +1,8 @@
-{ mkDerivation, extra-cmake-modules, kconfig, kconfigwidgets
-, kdbusaddons, kglobalaccel, ki18n, kwidgetsaddons, kxmlgui
-, libkscreen, qtdeclarative, qtgraphicaleffects
+{
+  mkDerivation,
+  extra-cmake-modules,
+  kconfig, kconfigwidgets, kdbusaddons, kglobalaccel, ki18n, kwidgetsaddons,
+  kxmlgui, libkscreen, qtdeclarative, qtgraphicaleffects
 }:
 
 mkDerivation {
diff --git a/pkgs/desktops/plasma-5/kscreenlocker.nix b/pkgs/desktops/plasma-5/kscreenlocker.nix
index 631719fb535..e748121132c 100644
--- a/pkgs/desktops/plasma-5/kscreenlocker.nix
+++ b/pkgs/desktops/plasma-5/kscreenlocker.nix
@@ -9,8 +9,9 @@
 mkDerivation {
   name = "kscreenlocker";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  propagatedBuildInputs = [
+  buildInputs = [
     kcmutils kcrash kdeclarative kdelibs4support kglobalaccel kidletime kwayland
     libXcursor pam plasma-framework qtdeclarative qtx11extras wayland
   ];
+  outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/desktops/plasma-5/ksysguard.nix b/pkgs/desktops/plasma-5/ksysguard.nix
index 63aeda685ba..150b97be50d 100644
--- a/pkgs/desktops/plasma-5/ksysguard.nix
+++ b/pkgs/desktops/plasma-5/ksysguard.nix
@@ -9,9 +9,8 @@
 mkDerivation {
   name = "ksysguard";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  buildInputs = [ lm_sensors ];
-  propagatedBuildInputs = [
+  buildInputs = [
     kconfig kcoreaddons kitemviews knewstuff kiconthemes libksysguard
-    kdelibs4support ki18n qtwebkit
+    kdelibs4support ki18n lm_sensors qtwebkit
   ];
 }
diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix
index 08f0e346855..09708b65487 100644
--- a/pkgs/desktops/plasma-5/kwin/default.nix
+++ b/pkgs/desktops/plasma-5/kwin/default.nix
@@ -1,29 +1,34 @@
 {
   mkDerivation, lib, copyPathsToStore,
   extra-cmake-modules, kdoctools,
-  breeze-qt5, 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, libICE, libSM, libinput, libxkbcommon, plasma-framework,
-  qtdeclarative, qtmultimedia, qtscript, qtx11extras, udev, wayland,
-  xcb-util-cursor, xwayland
+
+  epoxy,libICE, libSM, libinput, libxkbcommon, udev, wayland, xcb-util-cursor,
+  xwayland,
+
+  qtdeclarative, qtmultimedia, qtscript, qtx11extras,
+
+  breeze-qt5, kactivities, kcompletion, kcmutils, kconfig, kconfigwidgets,
+  kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel, ki18n,
+  kiconthemes, kidletime, kinit, kio, knewstuff, knotifications, kpackage,
+  kscreenlocker, kservice, kwayland, kwidgetsaddons, kwindowsystem, kxmlgui,
+  plasma-framework,
 }:
 
 mkDerivation {
   name = "kwin";
-  nativeBuildInputs = [
-    extra-cmake-modules
-    kdoctools
-  ];
-  propagatedBuildInputs = [
-    breeze-qt5 epoxy kactivities kcmutils kcompletion kconfig kconfigwidgets
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [
+    epoxy libICE libSM libinput libxkbcommon udev wayland xcb-util-cursor
+    xwayland
+
+    qtdeclarative qtmultimedia qtscript qtx11extras
+
+    breeze-qt5 kactivities kcmutils kcompletion kconfig kconfigwidgets
     kcoreaddons kcrash kdeclarative kdecoration kglobalaccel ki18n kiconthemes
     kidletime kinit kio knewstuff knotifications kpackage kscreenlocker kservice
-    kwayland kwidgetsaddons kwindowsystem kxmlgui libICE libSM libxkbcommon
-    libinput plasma-framework qtdeclarative qtmultimedia qtscript qtx11extras
-    udev wayland xcb-util-cursor xwayland
+    kwayland kwidgetsaddons kwindowsystem kxmlgui plasma-framework
   ];
+  outputs = [ "out" "dev" "bin" ];
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   NIX_CFLAGS_COMPILE = [
     ''-DNIXPKGS_XWAYLAND="${lib.getBin xwayland}/bin/Xwayland"''
@@ -32,9 +37,9 @@ mkDerivation {
   postInstall = ''
     # Some package(s) refer to these service types by the wrong name.
     # I would prefer to patch those packages, but I cannot find them!
-    ln -s $out/share/kservicetypes5/kwineffect.desktop \
-          $out/share/kservicetypes5/kwin-effect.desktop
-    ln -s $out/share/kservicetypes5/kwinscript.desktop \
-          $out/share/kservicetypes5/kwin-script.desktop
+    ln -s ''${!outputBin}/share/kservicetypes5/kwineffect.desktop \
+          ''${!outputBin}/share/kservicetypes5/kwin-effect.desktop
+    ln -s ''${!outputBin}/share/kservicetypes5/kwinscript.desktop \
+          ''${!outputBin}/share/kservicetypes5/kwin-script.desktop
   '';
 }
diff --git a/pkgs/desktops/plasma-5/libkscreen/default.nix b/pkgs/desktops/plasma-5/libkscreen/default.nix
index 82a254c3a37..b81755ed757 100644
--- a/pkgs/desktops/plasma-5/libkscreen/default.nix
+++ b/pkgs/desktops/plasma-5/libkscreen/default.nix
@@ -1,15 +1,16 @@
-{ mkDerivation, lib, copyPathsToStore
-, extra-cmake-modules
-, kwayland, libXrandr
-, qtx11extras
+{
+  mkDerivation, lib, copyPathsToStore,
+  extra-cmake-modules,
+  kwayland, libXrandr, qtx11extras
 }:
 
 mkDerivation {
   name = "libkscreen";
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ kwayland libXrandr qtx11extras ];
+  buildInputs = [ kwayland libXrandr qtx11extras ];
+  outputs = [ "out" "dev" ];
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   preConfigure = ''
-    NIX_CFLAGS_COMPILE+=" -DNIXPKGS_LIBKSCREEN_BACKENDS=\"''${!outputLib}/$qtPluginPrefix/kf5/kscreen\""
+    NIX_CFLAGS_COMPILE+=" -DNIXPKGS_LIBKSCREEN_BACKENDS=\"''${!outputBin}/$qtPluginPrefix/kf5/kscreen\""
   '';
 }
diff --git a/pkgs/desktops/plasma-5/libksysguard/default.nix b/pkgs/desktops/plasma-5/libksysguard/default.nix
index e7cdf28a728..4e88cd3df0e 100644
--- a/pkgs/desktops/plasma-5/libksysguard/default.nix
+++ b/pkgs/desktops/plasma-5/libksysguard/default.nix
@@ -12,9 +12,10 @@ mkDerivation {
     ./0001-qdiriterator-follow-symlinks.patch
   ];
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [
+  buildInputs = [
     kauth kconfig ki18n kiconthemes kwindowsystem kcompletion kconfigwidgets
     kcoreaddons kservice kwidgetsaddons plasma-framework qtscript qtx11extras
     qtwebkit
   ];
+  outputs = [ "out" "dev" "bin" ];
 }
diff --git a/pkgs/desktops/plasma-5/milou.nix b/pkgs/desktops/plasma-5/milou.nix
index 7f38b74423c..fa4ad3fcd29 100644
--- a/pkgs/desktops/plasma-5/milou.nix
+++ b/pkgs/desktops/plasma-5/milou.nix
@@ -7,9 +7,7 @@
 
 mkDerivation {
   name = "milou";
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
+  nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [
     kcoreaddons kdeclarative ki18n krunner kservice plasma-framework
     qtdeclarative qtscript
diff --git a/pkgs/desktops/plasma-5/plasma-desktop/default.nix b/pkgs/desktops/plasma-5/plasma-desktop/default.nix
index 377bc4cdd14..18675159df6 100644
--- a/pkgs/desktops/plasma-5/plasma-desktop/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-desktop/default.nix
@@ -1,35 +1,37 @@
 {
   mkDerivation, lib, copyPathsToStore,
   extra-cmake-modules, kdoctools,
-  attica, baloo, boost, fontconfig, ibus, kactivities, kactivities-stats, kauth,
-  kcmutils, kdbusaddons, kdeclarative, kded, kdelibs4support, kemoticons,
-  kglobalaccel, ki18n, kitemmodels, knewstuff, knotifications, knotifyconfig,
-  kpeople, krunner, ksysguard, kwallet, kwin, libXcursor, libXft,
-  libcanberra_kde, libpulseaudio, libxkbfile, phonon, plasma-framework,
-  plasma-workspace, qtdeclarative, qtquickcontrols, qtquickcontrols2, qtsvg,
-  qtx11extras, xf86inputevdev, xf86inputsynaptics, xinput, xkeyboard_config,
-  xorgserver,
-  utillinux
+
+  boost, fontconfig, ibus, libXcursor, libXft, libcanberra_kde, libpulseaudio,
+  libxkbfile, xf86inputevdev, xf86inputsynaptics, xinput, xkeyboard_config,
+  xorgserver, utillinux,
+
+  qtdeclarative, qtquickcontrols, qtquickcontrols2, qtsvg, qtx11extras,
+
+  attica, baloo, kactivities, kactivities-stats, kauth, kcmutils, kdbusaddons,
+  kdeclarative, kded, kdelibs4support, kemoticons, kglobalaccel, ki18n,
+  kitemmodels, knewstuff, knotifications, knotifyconfig, kpeople, krunner,
+  kscreenlocker, ksysguard, kwallet, kwin, phonon, plasma-framework,
+  plasma-workspace,
 }:
 
 mkDerivation rec {
   name = "plasma-desktop";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
-    attica boost fontconfig ibus kcmutils kdbusaddons kded kitemmodels knewstuff
-    knotifications knotifyconfig kwallet libcanberra_kde libXcursor
-    libpulseaudio libXft libxkbfile phonon qtsvg xf86inputevdev
-    xf86inputsynaptics xkeyboard_config xinput baloo kactivities
-    kactivities-stats kauth kdeclarative kdelibs4support kemoticons kglobalaccel
-    ki18n kpeople krunner kwin plasma-framework plasma-workspace qtdeclarative
-    qtquickcontrols qtquickcontrols2 qtx11extras ksysguard
+    boost fontconfig ibus libcanberra_kde libpulseaudio libXcursor libXft
+    libxkbfile phonon xf86inputevdev xf86inputsynaptics xinput xkeyboard_config
+
+    qtdeclarative qtquickcontrols qtquickcontrols2 qtsvg qtx11extras
+
+    attica baloo kactivities kactivities-stats kauth kcmutils kdbusaddons
+    kdeclarative kded kdelibs4support kemoticons kglobalaccel ki18n kitemmodels
+    knewstuff knotifications knotifyconfig kpeople krunner kscreenlocker
+    ksysguard kwallet kwin plasma-framework plasma-workspace
   ];
 
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   postPatch = ''
-    substituteInPlace kcms/dateandtime/helper.cpp \
-        --subst-var hwclock "${utillinux}/sbin/hwclock"
-
     sed '1i#include <cmath>' -i kcms/touchpad/src/backends/x11/synapticstouchpad.cpp
   '';
   NIX_CFLAGS_COMPILE = [
@@ -37,12 +39,12 @@ mkDerivation rec {
     ''-DNIXPKGS_HWCLOCK="${lib.getBin utillinux}/sbin/hwclock"''
   ];
   cmakeFlags = [
-    "-DEvdev_INCLUDE_DIRS=${xf86inputevdev.dev}/include/xorg"
-    "-DSynaptics_INCLUDE_DIRS=${xf86inputsynaptics.dev}/include/xorg"
+    "-DEvdev_INCLUDE_DIRS=${lib.getDev xf86inputevdev}/include/xorg"
+    "-DSynaptics_INCLUDE_DIRS=${lib.getDev xf86inputsynaptics}/include/xorg"
   ];
   postInstall = ''
     # Display ~/Desktop contents on the desktop by default.
-    sed -i "$out/share/plasma/shells/org.kde.plasma.desktop/contents/defaults" \
+    sed -i "''${!outputBin}/share/plasma/shells/org.kde.plasma.desktop/contents/defaults" \
         -e 's/Containment=org.kde.desktopcontainment/Containment=org.kde.plasma.folder/'
   '';
 }
diff --git a/pkgs/desktops/plasma-5/plasma-nm/default.nix b/pkgs/desktops/plasma-5/plasma-nm/default.nix
index 8ff98ecfc1d..cc1dcb7ee9f 100644
--- a/pkgs/desktops/plasma-5/plasma-nm/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-nm/default.nix
@@ -10,6 +10,14 @@
 
 mkDerivation {
   name = "plasma-nm";
+  nativeBuildInputs = [ extra-cmake-modules kdoctools qttools ];
+  buildInputs = [
+    kdeclarative kdelibs4support ki18n kio kwindowsystem plasma-framework
+    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
+  ];
   patches = [
     (substituteAll {
       src = ./0001-mobile-broadband-provider-info-path.patch;
@@ -20,12 +28,4 @@ mkDerivation {
       inherit openvpn;
     })
   ];
-  nativeBuildInputs = [ extra-cmake-modules kdoctools qttools ];
-  buildInputs = [
-    kdeclarative kdelibs4support ki18n kio kwindowsystem plasma-framework
-    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
-  ];
 }
diff --git a/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix b/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix
index fb0830eb59a..cb068166c1d 100644
--- a/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix
+++ b/pkgs/desktops/plasma-5/plasma-workspace-wallpapers.nix
@@ -1,11 +1,6 @@
-{ mkDerivation
-, extra-cmake-modules
-}:
+{ mkDerivation , extra-cmake-modules }:
 
 mkDerivation {
   name = "plasma-workspace-wallpapers";
-  outputs = [ "out" ];
-  nativeBuildInputs = [
-    extra-cmake-modules
-  ];
+  nativeBuildInputs = [ extra-cmake-modules ];
 }
diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix
index 175a80fcb4c..29d92f9a9df 100644
--- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix
@@ -3,13 +3,15 @@
 
   extra-cmake-modules, kdoctools,
 
+  isocodes, libdbusmenu, libSM, libXcursor, pam, wayland,
+
   baloo, kactivities, kcmutils, kconfig, kcrash, kdbusaddons, kdeclarative,
   kdelibs4support, kdesu, kglobalaccel, kidletime, kjsembed, knewstuff,
-  knotifyconfig, kpackage, krunner, ktexteditor, ktextwidgets, kwallet,
-  kwayland, kwin, kxmlrpcclient, libkscreen, libksysguard, networkmanager-qt,
-  phonon, plasma-framework, qtgraphicaleffects, qtquickcontrols,
-  qtquickcontrols2, qtscript, qtx11extras, solid, isocodes, libdbusmenu, libSM,
-  libXcursor, pam, wayland
+  knotifyconfig, kpackage, krunner, kscreenlocker, ktexteditor, ktextwidgets,
+  kwallet, kwayland, kwin, kxmlrpcclient, libkscreen, libksysguard,
+  networkmanager-qt, phonon, plasma-framework, prison, solid,
+
+  qtgraphicaleffects, qtquickcontrols, qtquickcontrols2, qtscript, qtx11extras,
 }:
 
 mkDerivation {
@@ -18,27 +20,28 @@ mkDerivation {
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
     isocodes libdbusmenu libSM libXcursor pam wayland
-  ];
-  propagatedBuildInputs = [
+
     baloo kactivities kcmutils kconfig kcrash kdbusaddons kdeclarative
     kdelibs4support kdesu kglobalaccel kidletime kjsembed knewstuff
-    knotifyconfig kpackage krunner ktexteditor ktextwidgets kwallet kwayland
-    kwin kxmlrpcclient libkscreen libksysguard networkmanager-qt phonon
-    plasma-framework solid qtgraphicaleffects qtquickcontrols qtquickcontrols2
-    qtscript qtx11extras
+    knotifyconfig kpackage krunner kscreenlocker ktexteditor ktextwidgets
+    kwallet kwayland kwin kxmlrpcclient libkscreen libksysguard
+    networkmanager-qt phonon plasma-framework prison solid
+
+    qtgraphicaleffects qtquickcontrols qtquickcontrols2 qtscript qtx11extras
   ];
+  outputs = [ "out" "dev" "bin" ];
 
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
 
   postPatch = ''
     substituteInPlace startkde/kstartupconfig/kstartupconfig.cpp \
-        --replace kdostartupconfig5 $out/bin/kdostartupconfig5
+        --replace kdostartupconfig5 ''${!outputBin}/bin/kdostartupconfig5
   '';
 
   postInstall = ''
-    rm "$out/bin/startkde"
-    rm "$out/bin/startplasmacompositor"
-    rm "$out/lib/libexec/startplasma"
-    rm -r "$out/share/wayland-sessions"
+    rm "''${!outputBin}/bin/startkde"
+    rm "''${!outputBin}/bin/startplasmacompositor"
+    rm "''${!outputLib}/lib/libexec/startplasma"
+    rm -r "''${!outputBin}/share/wayland-sessions"
   '';
 }
diff --git a/pkgs/desktops/plasma-5/powerdevil.nix b/pkgs/desktops/plasma-5/powerdevil.nix
index 4660efd66ab..65fc5446c16 100644
--- a/pkgs/desktops/plasma-5/powerdevil.nix
+++ b/pkgs/desktops/plasma-5/powerdevil.nix
@@ -1,13 +1,15 @@
-{ mkDerivation, extra-cmake-modules, kdoctools, bluez-qt, kactivities
-, kauth, kconfig, kdbusaddons, kdelibs4support, kglobalaccel, ki18n
-, kidletime, kio, knotifyconfig, kwayland, libkscreen, networkmanager-qt
-, plasma-workspace, qtx11extras, solid, udev
+{
+  mkDerivation,
+  extra-cmake-modules, kdoctools,
+  bluez-qt, kactivities, kauth, kconfig, kdbusaddons, kdelibs4support,
+  kglobalaccel, ki18n, kidletime, kio, knotifyconfig, kwayland, libkscreen,
+  networkmanager-qt, plasma-workspace, qtx11extras, solid, udev
 }:
 
 mkDerivation {
   name = "powerdevil";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  propagatedBuildInputs = [
+  buildInputs = [
     kconfig kdbusaddons knotifyconfig solid udev bluez-qt kactivities kauth
     kdelibs4support kglobalaccel ki18n kio kidletime kwayland libkscreen
     networkmanager-qt plasma-workspace qtx11extras
diff --git a/pkgs/desktops/plasma-5/systemsettings.nix b/pkgs/desktops/plasma-5/systemsettings.nix
index 10fc7a3a5b7..a24eabc39f3 100644
--- a/pkgs/desktops/plasma-5/systemsettings.nix
+++ b/pkgs/desktops/plasma-5/systemsettings.nix
@@ -7,8 +7,9 @@
 mkDerivation {
   name = "systemsettings";
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  propagatedBuildInputs = [
+  buildInputs = [
     kcmutils kconfig kdbusaddons khtml ki18n kiconthemes kio kitemviews kservice
     kwindowsystem kxmlgui qtquickcontrols qtquickcontrols2
   ];
+  outputs = [ "out" "dev" "bin" ];
 }

From acc45767c511946907257aeea27ff9e53975e108 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Sat, 27 May 2017 11:14:20 -0500
Subject: [PATCH 053/189] kservice: propagate shared_mime_info to environment

---
 pkgs/development/libraries/kde-frameworks/kservice/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/kde-frameworks/kservice/default.nix b/pkgs/development/libraries/kde-frameworks/kservice/default.nix
index e6822dc2afb..3ac4f4dc268 100644
--- a/pkgs/development/libraries/kde-frameworks/kservice/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kservice/default.nix
@@ -2,7 +2,7 @@
   mkDerivation, lib, copyPathsToStore,
   bison, extra-cmake-modules, flex,
   kconfig, kcoreaddons, kcrash, kdbusaddons, kdoctools, ki18n, kwindowsystem,
-  qtbase,
+  qtbase, shared_mime_info,
 }:
 
 mkDerivation {
@@ -14,5 +14,6 @@ mkDerivation {
     kcrash kdbusaddons ki18n kwindowsystem qtbase
   ];
   propagatedBuildInputs = [ kconfig kcoreaddons ];
+  propagatedUserEnvPkgs = [ shared_mime_info ]; # for kbuildsycoca5
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
 }

From d9094c087e73ebc4aca615a354ec58194d2c1bc3 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 23 May 2017 11:01:19 -0500
Subject: [PATCH 054/189] libkscreen: use QLatin1String instead of
 QStringLiteral

QStringLiteral stores strings in UTF-16 format, preventing Nix from detecting
dependencies.
---
 .../desktops/plasma-5/libkscreen/libkscreen-backends-path.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/plasma-5/libkscreen/libkscreen-backends-path.patch b/pkgs/desktops/plasma-5/libkscreen/libkscreen-backends-path.patch
index 9d3cf49b9cd..48be0d037df 100644
--- a/pkgs/desktops/plasma-5/libkscreen/libkscreen-backends-path.patch
+++ b/pkgs/desktops/plasma-5/libkscreen/libkscreen-backends-path.patch
@@ -17,7 +17,7 @@ Index: libkscreen-5.9.4/src/backendmanager.cpp
 -        finfos.append(dir.entryInfoList());
 -    }
 -    return finfos;
-+    const QDir dir(QStringLiteral(NIXPKGS_LIBKSCREEN_BACKENDS),
++    const QDir dir(QLatin1String(NIXPKGS_LIBKSCREEN_BACKENDS),
 +                   QStringLiteral("KSC_*"),
 +                   QDir::SortFlags(QDir::QDir::Name),
 +                   QDir::NoDotAndDotDot | QDir::Files);

From b7f895d9725fd17c682f2f2625656c8816354a9f Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 23 May 2017 11:02:49 -0500
Subject: [PATCH 055/189] kwindowsystem: use QLatin1String instead of
 QStringLiteral

---
 .../libraries/kde-frameworks/kwindowsystem/default.nix          | 1 +
 .../kde-frameworks/kwindowsystem/platform-plugins-path.patch    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
index ba43a5668a7..fa9078eeb20 100644
--- a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
+++ b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
@@ -17,4 +17,5 @@ mkDerivation {
   preConfigure = ''
     NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PATH=\"''${!outputBin}/$qtPluginPrefix\""
   '';
+  outputs = [ "out" "dev" ];
 }
diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem/platform-plugins-path.patch b/pkgs/development/libraries/kde-frameworks/kwindowsystem/platform-plugins-path.patch
index ed24897d342..ae0da37922e 100644
--- a/pkgs/development/libraries/kde-frameworks/kwindowsystem/platform-plugins-path.patch
+++ b/pkgs/development/libraries/kde-frameworks/kwindowsystem/platform-plugins-path.patch
@@ -14,7 +14,7 @@ Index: kwindowsystem-5.32.0/src/pluginwrapper.cpp
 -        foreach (const QString &entry, pluginDir.entryList(QDir::Files | QDir::NoDotAndDotDot)) {
 -            ret << pluginDir.absoluteFilePath(entry);
 -        }
-+    QDir pluginDir(QStringLiteral(NIXPKGS_QT_PLUGIN_PATH) + QLatin1Literal("/kf5/org.kde.kwindowsystem.platforms"));
++    QDir pluginDir(QLatin1String(NIXPKGS_QT_PLUGIN_PATH) + QLatin1Literal("/kf5/org.kde.kwindowsystem.platforms"));
 +    foreach (const QString &entry, pluginDir.entryList(QDir::Files | QDir::NoDotAndDotDot)) {
 +        ret << pluginDir.absoluteFilePath(entry);
      }

From f392614251e9162fbf75f601c1e3bb8dd948029c Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 23 May 2017 11:06:31 -0500
Subject: [PATCH 056/189] qt58.qtbase: use QLatin1String instead of
 QStringLiteral

---
 .../libraries/qt-5/5.8/qtbase/compose-search-path.patch       | 2 +-
 pkgs/development/libraries/qt-5/5.8/qtbase/qgtk-env.patch     | 4 ++--
 .../libraries/qt-5/5.8/qtbase/qpa-platform-plugin-path.patch  | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/compose-search-path.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/compose-search-path.patch
index d0bea4afaa3..225d47f8e22 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/compose-search-path.patch
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/compose-search-path.patch
@@ -12,7 +12,7 @@ Index: qtbase-opensource-src-5.8.0/src/plugins/platforminputcontexts/compose/gen
 -    m_possibleLocations.append(QStringLiteral("/usr/local/lib/X11/locale"));
      m_possibleLocations.append(QStringLiteral(X11_PREFIX "/share/X11/locale"));
      m_possibleLocations.append(QStringLiteral(X11_PREFIX "/lib/X11/locale"));
-+    m_possibleLocations.append(QStringLiteral(NIXPKGS_QTCOMPOSE));
++    m_possibleLocations.append(QLatin1String(NIXPKGS_QTCOMPOSE));
  }
  
  QString TableGenerator::findComposeFile()
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/qgtk-env.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/qgtk-env.patch
index 6a22b203afc..8e5e2c71828 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/qgtk-env.patch
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/qgtk-env.patch
@@ -19,13 +19,13 @@ Index: qtbase-opensource-src-5.8.0/src/plugins/platformthemes/gtk3/main.cpp
 +
 +#ifdef NIXPKGS_QGTK3_XDG_DATA_DIRS
 +        QStringList XDG_DATA_DIRS = QFile::decodeName(qgetenv("XDG_DATA_DIRS")).split(':');
-+        XDG_DATA_DIRS << QStringLiteral(NIXPKGS_QGTK3_XDG_DATA_DIRS);
++        XDG_DATA_DIRS << QLatin1String(NIXPKGS_QGTK3_XDG_DATA_DIRS);
 +        qputenv("XDG_DATA_DIRS", QFile::encodeName(XDG_DATA_DIRS.join(':')));
 +#endif
 +
 +#ifdef NIXPKGS_QGTK3_GIO_EXTRA_MODULES
 +        QStringList GIO_EXTRA_MODULES = QFile::decodeName(qgetenv("GIO_EXTRA_MODULES")).split(':');
-+        GIO_EXTRA_MODULES << QStringLiteral(NIXPKGS_QGTK3_GIO_EXTRA_MODULES);
++        GIO_EXTRA_MODULES << QLatin1String(NIXPKGS_QGTK3_GIO_EXTRA_MODULES);
 +        qputenv("GIO_EXTRA_MODULES", QFile::encodeName(GIO_EXTRA_MODULES.join(':')));
 +#endif
 +
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/qpa-platform-plugin-path.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/qpa-platform-plugin-path.patch
index 270116e1978..18780db05e7 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/qpa-platform-plugin-path.patch
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/qpa-platform-plugin-path.patch
@@ -9,7 +9,7 @@ Index: qtbase-opensource-src-5.8.0/src/gui/kernel/qplatformintegrationfactory.cp
 -        if (QPlatformIntegration *ret = qLoadPlugin<QPlatformIntegration, QPlatformIntegrationPlugin>(directLoader(), platform, paramList, argc, argv))
 -            return ret;
      }
-+    QCoreApplication::addLibraryPath(QStringLiteral(NIXPKGS_QPA_PLATFORM_PLUGIN_PATH));
++    QCoreApplication::addLibraryPath(QLatin1String(NIXPKGS_QPA_PLATFORM_PLUGIN_PATH));
 +    if (QPlatformIntegration *ret = qLoadPlugin<QPlatformIntegration, QPlatformIntegrationPlugin>(directLoader(), platform, paramList, argc, argv))
 +        return ret;
  #else
@@ -29,7 +29,7 @@ Index: qtbase-opensource-src-5.8.0/src/gui/kernel/qplatformintegrationfactory.cp
 -                (*it).append(postFix);
 -        }
 +    }
-+    QCoreApplication::addLibraryPath(QStringLiteral(NIXPKGS_QPA_PLATFORM_PLUGIN_PATH));
++    QCoreApplication::addLibraryPath(QLatin1String(NIXPKGS_QPA_PLATFORM_PLUGIN_PATH));
 +    list = directLoader()->keyMap().values();
 +    if (!list.isEmpty()) {
 +        const QString postFix = QLatin1String(" (from ")

From b1dcd271d1cd752ea720ca4ac8c8d07d7a7cdb6c Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 23 May 2017 11:09:04 -0500
Subject: [PATCH 057/189] qt58.qtserialport: use QLatin1String instead of
 QStringLiteral

---
 .../0001-dlopen-serialport-udev.patch         | 28 -------------------
 .../qt-5/5.8/qtserialport/default.nix         | 14 ++++------
 .../qtserialport-dlopen-udev.patch            | 22 +++++++++++++++
 .../libraries/qt-5/5.8/qtserialport/series    |  1 +
 4 files changed, 29 insertions(+), 36 deletions(-)
 delete mode 100644 pkgs/development/libraries/qt-5/5.8/qtserialport/0001-dlopen-serialport-udev.patch
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qtserialport/qtserialport-dlopen-udev.patch
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qtserialport/series

diff --git a/pkgs/development/libraries/qt-5/5.8/qtserialport/0001-dlopen-serialport-udev.patch b/pkgs/development/libraries/qt-5/5.8/qtserialport/0001-dlopen-serialport-udev.patch
deleted file mode 100644
index 3a813dc8007..00000000000
--- a/pkgs/development/libraries/qt-5/5.8/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.8/qtserialport/default.nix b/pkgs/development/libraries/qt-5/5.8/qtserialport/default.nix
index 1fde2c2bd18..925e8a808f2 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtserialport/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtserialport/default.nix
@@ -1,14 +1,12 @@
-{ stdenv, qtSubmodule, qtbase, substituteAll, systemd }:
+{ stdenv, qtSubmodule, lib, copyPathsToStore, qtbase, substituteAll, systemd }:
 
-with stdenv.lib;
+let inherit (lib) getLib optional; in
 
 qtSubmodule {
   name = "qtserialport";
   qtInputs = [ qtbase ];
-  patches = optionals (stdenv.isLinux) [
-    (substituteAll {
-      src = ./0001-dlopen-serialport-udev.patch;
-      libudev = systemd.lib;
-    })
-  ];
+  patches =  copyPathsToStore (lib.readPathsFromFile ./. ./series);
+  NIX_CFLAGS_COMPILE =
+    optional stdenv.isLinux
+    ''-DNIXPKGS_LIBUDEV="${getLib systemd}/lib/libudev"'';
 }
diff --git a/pkgs/development/libraries/qt-5/5.8/qtserialport/qtserialport-dlopen-udev.patch b/pkgs/development/libraries/qt-5/5.8/qtserialport/qtserialport-dlopen-udev.patch
new file mode 100644
index 00000000000..65bb64710eb
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/qtserialport/qtserialport-dlopen-udev.patch
@@ -0,0 +1,22 @@
+Index: qtserialport-opensource-src-5.8.0/src/serialport/qtudev_p.h
+===================================================================
+--- qtserialport-opensource-src-5.8.0.orig/src/serialport/qtudev_p.h
++++ qtserialport-opensource-src-5.8.0/src/serialport/qtudev_p.h
+@@ -111,9 +111,17 @@ inline QFunctionPointer resolveSymbol(QL
+ inline bool resolveSymbols(QLibrary *udevLibrary)
+ {
+     if (!udevLibrary->isLoaded()) {
++#ifdef NIXPKGS_LIBUDEV
++        udevLibrary->setFileNameAndVersion(QLatin1String(NIXPKGS_LIBUDEV), 1);
++#else
+         udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 1);
++#endif
+         if (!udevLibrary->load()) {
++#ifdef NIXPKGS_LIBUDEV
++            udevLibrary->setFileNameAndVersion(QLatin1String(NIXPKGS_LIBUDEV), 0);
++#else
+             udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 0);
++#endif
+             if (!udevLibrary->load()) {
+                 qWarning("Failed to load the library: %s, supported version(s): %i and %i", qPrintable(udevLibrary->fileName()), 1, 0);
+                 return false;
diff --git a/pkgs/development/libraries/qt-5/5.8/qtserialport/series b/pkgs/development/libraries/qt-5/5.8/qtserialport/series
new file mode 100644
index 00000000000..83f4abf094e
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/qtserialport/series
@@ -0,0 +1 @@
+qtserialport-dlopen-udev.patch

From c546c26e3a7c20e23d82209176e378ccbb00fdb8 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 23 May 2017 11:12:19 -0500
Subject: [PATCH 058/189] qt58.qtwebkit: use QLatin1String instead of
 QStringLiteral

---
 .../0001-dlopen-webkit-nsplugin.patch         | 53 ---------------
 .../5.8/qtwebkit/0002-dlopen-webkit-gtk.patch | 25 --------
 .../qtwebkit/0003-dlopen-webkit-udev.patch    | 31 ---------
 .../libraries/qt-5/5.8/qtwebkit/default.nix   | 31 ++++-----
 .../5.8/qtwebkit/qtwebkit-dlopen-gtk.patch    | 64 +++++++++++++++++++
 .../5.8/qtwebkit/qtwebkit-dlopen-udev.patch   |  0
 ...in.patch => qtwebkit-icucore-darwin.patch} |  4 +-
 .../libraries/qt-5/5.8/qtwebkit/series        |  3 +
 8 files changed, 82 insertions(+), 129 deletions(-)
 delete mode 100644 pkgs/development/libraries/qt-5/5.8/qtwebkit/0001-dlopen-webkit-nsplugin.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.8/qtwebkit/0002-dlopen-webkit-gtk.patch
 delete mode 100644 pkgs/development/libraries/qt-5/5.8/qtwebkit/0003-dlopen-webkit-udev.patch
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qtwebkit/qtwebkit-dlopen-gtk.patch
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qtwebkit/qtwebkit-dlopen-udev.patch
 rename pkgs/development/libraries/qt-5/5.8/qtwebkit/{0004-icucore-darwin.patch => qtwebkit-icucore-darwin.patch} (75%)
 create mode 100644 pkgs/development/libraries/qt-5/5.8/qtwebkit/series

diff --git a/pkgs/development/libraries/qt-5/5.8/qtwebkit/0001-dlopen-webkit-nsplugin.patch b/pkgs/development/libraries/qt-5/5.8/qtwebkit/0001-dlopen-webkit-nsplugin.patch
deleted file mode 100644
index 0eeacce1bc0..00000000000
--- a/pkgs/development/libraries/qt-5/5.8/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.8/qtwebkit/0002-dlopen-webkit-gtk.patch b/pkgs/development/libraries/qt-5/5.8/qtwebkit/0002-dlopen-webkit-gtk.patch
deleted file mode 100644
index bb5d1f74364..00000000000
--- a/pkgs/development/libraries/qt-5/5.8/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.8/qtwebkit/0003-dlopen-webkit-udev.patch b/pkgs/development/libraries/qt-5/5.8/qtwebkit/0003-dlopen-webkit-udev.patch
deleted file mode 100644
index 1c360cd81aa..00000000000
--- a/pkgs/development/libraries/qt-5/5.8/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.8/qtwebkit/default.nix b/pkgs/development/libraries/qt-5/5.8/qtwebkit/default.nix
index bee3786ef32..664281aac31 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtwebkit/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtwebkit/default.nix
@@ -1,4 +1,5 @@
-{ qtSubmodule, stdenv, qtdeclarative, qtlocation, qtsensors
+{ qtSubmodule, stdenv, copyPathsToStore, lib
+, qtdeclarative, qtlocation, qtsensors
 , fontconfig, gdk_pixbuf, gtk2, libwebp, libxml2, libxslt
 , sqlite, systemd, glib, gst_all_1
 , bison2, flex, gdb, gperf, perl, pkgconfig, python2, ruby
@@ -7,7 +8,7 @@
 , flashplayerFix ? false
 }:
 
-with stdenv.lib;
+let inherit (lib) optional optionals getLib; in
 
 qtSubmodule {
   name = "qtwebkit";
@@ -22,23 +23,15 @@ qtSubmodule {
     "/usr/lib/libicucore.dylib"
   ];
 
-  patches =
-    let dlopen-webkit-nsplugin = substituteAll {
-          src = ./0001-dlopen-webkit-nsplugin.patch;
-          gtk = gtk2.out;
-          gdk_pixbuf = gdk_pixbuf.out;
-        };
-        dlopen-webkit-gtk = substituteAll {
-          src = ./0002-dlopen-webkit-gtk.patch;
-          gtk = gtk2.out;
-        };
-        dlopen-webkit-udev = substituteAll {
-          src = ./0003-dlopen-webkit-udev.patch;
-          libudev = systemd.lib;
-        };
-    in optionals flashplayerFix [ dlopen-webkit-nsplugin dlopen-webkit-gtk ]
-    ++ optionals (!stdenv.isDarwin) [ dlopen-webkit-udev ]
-    ++ optionals (stdenv.isDarwin) [ ./0004-icucore-darwin.patch ];
+  patches =  copyPathsToStore (lib.readPathsFromFile ./. ./series);
+
+  NIX_CFLAGS_COMPILE =
+    optionals flashplayerFix
+      [
+        ''-DNIXPKGS_LIBGTK2="${getLib gtk2}/lib/libgtk-x11-2.0"''
+        ''-DNIXPKGS_LIBGDK2="${getLib gdk_pixbuf}/lib/libgdk-x11-2.0"''
+      ]
+    ++ optional (!stdenv.isDarwin) ''-DNIXPKGS_LIBUDEV="${getLib systemd}/lib/libudev"'';
 
   # Hack to avoid TMPDIR in RPATHs.
   preFixup = ''rm -rf "$(pwd)" && mkdir "$(pwd)" '';
diff --git a/pkgs/development/libraries/qt-5/5.8/qtwebkit/qtwebkit-dlopen-gtk.patch b/pkgs/development/libraries/qt-5/5.8/qtwebkit/qtwebkit-dlopen-gtk.patch
new file mode 100644
index 00000000000..e34eda592af
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/qtwebkit/qtwebkit-dlopen-gtk.patch
@@ -0,0 +1,64 @@
+Index: qtwebkit-opensource-src-5.8.0/Source/WebCore/plugins/qt/PluginPackageQt.cpp
+===================================================================
+--- qtwebkit-opensource-src-5.8.0.orig/Source/WebCore/plugins/qt/PluginPackageQt.cpp
++++ qtwebkit-opensource-src-5.8.0/Source/WebCore/plugins/qt/PluginPackageQt.cpp
+@@ -136,7 +136,11 @@ static void initializeGtk(QLibrary* modu
+         }
+     }
+ 
++#ifdef NIXPKGS_LIBGTK2
++    QLibrary library(QLatin1String(NIXPKGS_LIBGTK2), 0);
++#else
+     QLibrary library(QLatin1String("libgtk-x11-2.0"), 0);
++#endif
+     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");
+Index: qtwebkit-opensource-src-5.8.0/Source/WebCore/plugins/qt/PluginViewQt.cpp
+===================================================================
+--- qtwebkit-opensource-src-5.8.0.orig/Source/WebCore/plugins/qt/PluginViewQt.cpp
++++ qtwebkit-opensource-src-5.8.0/Source/WebCore/plugins/qt/PluginViewQt.cpp
+@@ -697,7 +697,11 @@ 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());
++#ifdef NIXPKGS_LIBGDK2
++    QLibrary library(QLatin1String(NIXPKGS_LIBGDK2), 0);
++#else
+     QLibrary library(QLatin1String("libgdk-x11-2.0"), 0);
++#endif
+     if (!library.load())
+         return 0;
+ 
+Index: qtwebkit-opensource-src-5.8.0/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
+===================================================================
+--- qtwebkit-opensource-src-5.8.0.orig/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
++++ qtwebkit-opensource-src-5.8.0/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
+@@ -64,7 +64,11 @@ static Display* getPluginDisplay()
+     // The code below has the same effect as this one:
+     // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default());
+ 
++#ifdef NIXPKGS_LIBGDK2
++    QLibrary library(QLatin1String(NIXPKGS_LIBGDK2), 0);
++#else
+     QLibrary library(QLatin1String("libgdk-x11-2.0"), 0);
++#endif
+     if (!library.load())
+         return 0;
+ 
+Index: qtwebkit-opensource-src-5.8.0/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp
+===================================================================
+--- qtwebkit-opensource-src-5.8.0.orig/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp
++++ qtwebkit-opensource-src-5.8.0/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp
+@@ -53,7 +53,11 @@ static void messageHandler(QtMsgType typ
+ 
+ static bool initializeGtk()
+ {
++#ifdef NIXPKGS_LIBGTK2
++    QLibrary gtkLibrary(QLatin1String(NIXPKGS_LIBGTK2), 0);
++#else
+     QLibrary gtkLibrary(QLatin1String("libgtk-x11-2.0"), 0);
++#endif
+     if (!gtkLibrary.load())
+         return false;
+     typedef void* (*gtk_init_ptr)(void*, void*);
diff --git a/pkgs/development/libraries/qt-5/5.8/qtwebkit/qtwebkit-dlopen-udev.patch b/pkgs/development/libraries/qt-5/5.8/qtwebkit/qtwebkit-dlopen-udev.patch
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/pkgs/development/libraries/qt-5/5.8/qtwebkit/0004-icucore-darwin.patch b/pkgs/development/libraries/qt-5/5.8/qtwebkit/qtwebkit-icucore-darwin.patch
similarity index 75%
rename from pkgs/development/libraries/qt-5/5.8/qtwebkit/0004-icucore-darwin.patch
rename to pkgs/development/libraries/qt-5/5.8/qtwebkit/qtwebkit-icucore-darwin.patch
index a1cc1892288..63c653da94e 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtwebkit/0004-icucore-darwin.patch
+++ b/pkgs/development/libraries/qt-5/5.8/qtwebkit/qtwebkit-icucore-darwin.patch
@@ -1,6 +1,8 @@
+Index: qtwebkit-opensource-src-5.8.0/Source/WTF/WTF.pri
+===================================================================
 --- qtwebkit-opensource-src-5.8.0.orig/Source/WTF/WTF.pri
 +++ qtwebkit-opensource-src-5.8.0/Source/WTF/WTF.pri
-@@ -12,7 +12,7 @@
+@@ -12,7 +12,7 @@ mac {
      # Mac OS does ship libicu but not the associated header files.
      # Therefore WebKit provides adequate header files.
      INCLUDEPATH = $${ROOT_WEBKIT_DIR}/Source/WTF/icu $$INCLUDEPATH
diff --git a/pkgs/development/libraries/qt-5/5.8/qtwebkit/series b/pkgs/development/libraries/qt-5/5.8/qtwebkit/series
new file mode 100644
index 00000000000..140e2a3dd4e
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.8/qtwebkit/series
@@ -0,0 +1,3 @@
+qtwebkit-dlopen-gtk.patch
+qtwebkit-dlopen-udev.patch
+qtwebkit-icucore-darwin.patch

From 8cc09c9e3e2d84042adde250ac9b983316feb0c2 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 23 May 2017 11:13:27 -0500
Subject: [PATCH 059/189] qt56.qtwebkit: use QLatin1String instead of
 QStringLiteral

---
 .../qtwebkit/0003-dlopen-webkit-udev.patch    |  6 +-
 .../libraries/qt-5/5.6/qtwebkit/default.nix   | 41 ++++++------
 .../5.6/qtwebkit/qtwebkit-dlopen-gtk.patch    | 64 +++++++++++++++++++
 .../5.6/qtwebkit/qtwebkit-dlopen-udev.patch   |  0
 .../qtwebkit/qtwebkit-icucore-darwin.patch    | 13 ++++
 .../libraries/qt-5/5.6/qtwebkit/series        |  3 +
 6 files changed, 104 insertions(+), 23 deletions(-)
 create mode 100644 pkgs/development/libraries/qt-5/5.6/qtwebkit/qtwebkit-dlopen-gtk.patch
 create mode 100644 pkgs/development/libraries/qt-5/5.6/qtwebkit/qtwebkit-dlopen-udev.patch
 create mode 100644 pkgs/development/libraries/qt-5/5.6/qtwebkit/qtwebkit-icucore-darwin.patch
 create mode 100644 pkgs/development/libraries/qt-5/5.6/qtwebkit/series

diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebkit/0003-dlopen-webkit-udev.patch b/pkgs/development/libraries/qt-5/5.6/qtwebkit/0003-dlopen-webkit-udev.patch
index 1c360cd81aa..19de7d99c85 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtwebkit/0003-dlopen-webkit-udev.patch
+++ b/pkgs/development/libraries/qt-5/5.6/qtwebkit/0003-dlopen-webkit-udev.patch
@@ -11,18 +11,18 @@ diff --git a/Source/WebCore/platform/qt/GamepadsQt.cpp b/Source/WebCore/platform
 index 60ff317..da8ac69 100644
 --- a/Source/WebCore/platform/qt/GamepadsQt.cpp
 +++ b/Source/WebCore/platform/qt/GamepadsQt.cpp
-@@ -111,12 +111,12 @@ private:
+@@ -111,13 +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_libUdev.setFileNameAndVersion(QLatin1String(NIXPKGS_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_libUdev.setFileNameAndVersion(QLatin1String(NIXPKGS_LIBUDEV), 0);
          m_loaded = m_libUdev.load();
          return resolveMethods();
      }
diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebkit/default.nix b/pkgs/development/libraries/qt-5/5.6/qtwebkit/default.nix
index 23a45dd44ed..664281aac31 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtwebkit/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/qtwebkit/default.nix
@@ -1,39 +1,40 @@
-{ qtSubmodule, stdenv, qtdeclarative, qtlocation, qtsensors
+{ qtSubmodule, stdenv, copyPathsToStore, lib
+, qtdeclarative, qtlocation, qtsensors
 , fontconfig, gdk_pixbuf, gtk2, libwebp, libxml2, libxslt
 , sqlite, systemd, glib, gst_all_1
 , bison2, flex, gdb, gperf, perl, pkgconfig, python2, ruby
+, darwin
 , substituteAll
 , flashplayerFix ? false
 }:
 
-with stdenv.lib;
+let inherit (lib) optional optionals getLib; in
 
 qtSubmodule {
   name = "qtwebkit";
   qtInputs = [ qtdeclarative qtlocation qtsensors ];
-  buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite glib gst_all_1.gstreamer gst_all_1.gst-plugins-base ];
+  buildInputs = [ fontconfig libwebp libxml2 libxslt sqlite glib gst_all_1.gstreamer gst_all_1.gst-plugins-base ]
+    ++ optionals (stdenv.isDarwin) (with darwin.apple_sdk.frameworks; [ OpenGL ]);
   nativeBuildInputs = [
     bison2 flex gdb gperf perl pkgconfig python2 ruby
   ];
-  patches =
-    let dlopen-webkit-nsplugin = substituteAll {
-          src = ./0001-dlopen-webkit-nsplugin.patch;
-          gtk = gtk2.out;
-          gdk_pixbuf = gdk_pixbuf.out;
-        };
-        dlopen-webkit-gtk = substituteAll {
-          src = ./0002-dlopen-webkit-gtk.patch;
-          gtk = gtk2.out;
-        };
-        dlopen-webkit-udev = substituteAll {
-          src = ./0003-dlopen-webkit-udev.patch;
-          libudev = systemd.lib;
-        };
-    in optionals flashplayerFix [ dlopen-webkit-nsplugin dlopen-webkit-gtk ]
-    ++ [ dlopen-webkit-udev ];
+
+  __impureHostDeps = optionals (stdenv.isDarwin) [
+    "/usr/lib/libicucore.dylib"
+  ];
+
+  patches =  copyPathsToStore (lib.readPathsFromFile ./. ./series);
+
+  NIX_CFLAGS_COMPILE =
+    optionals flashplayerFix
+      [
+        ''-DNIXPKGS_LIBGTK2="${getLib gtk2}/lib/libgtk-x11-2.0"''
+        ''-DNIXPKGS_LIBGDK2="${getLib gdk_pixbuf}/lib/libgdk-x11-2.0"''
+      ]
+    ++ optional (!stdenv.isDarwin) ''-DNIXPKGS_LIBUDEV="${getLib systemd}/lib/libudev"'';
 
   # Hack to avoid TMPDIR in RPATHs.
   preFixup = ''rm -rf "$(pwd)" && mkdir "$(pwd)" '';
 
-  meta.maintainers = with stdenv.lib.maintainers; [ abbradar ];
+  meta.maintainers = with stdenv.lib.maintainers; [ abbradar periklis ];
 }
diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebkit/qtwebkit-dlopen-gtk.patch b/pkgs/development/libraries/qt-5/5.6/qtwebkit/qtwebkit-dlopen-gtk.patch
new file mode 100644
index 00000000000..e34eda592af
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.6/qtwebkit/qtwebkit-dlopen-gtk.patch
@@ -0,0 +1,64 @@
+Index: qtwebkit-opensource-src-5.8.0/Source/WebCore/plugins/qt/PluginPackageQt.cpp
+===================================================================
+--- qtwebkit-opensource-src-5.8.0.orig/Source/WebCore/plugins/qt/PluginPackageQt.cpp
++++ qtwebkit-opensource-src-5.8.0/Source/WebCore/plugins/qt/PluginPackageQt.cpp
+@@ -136,7 +136,11 @@ static void initializeGtk(QLibrary* modu
+         }
+     }
+ 
++#ifdef NIXPKGS_LIBGTK2
++    QLibrary library(QLatin1String(NIXPKGS_LIBGTK2), 0);
++#else
+     QLibrary library(QLatin1String("libgtk-x11-2.0"), 0);
++#endif
+     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");
+Index: qtwebkit-opensource-src-5.8.0/Source/WebCore/plugins/qt/PluginViewQt.cpp
+===================================================================
+--- qtwebkit-opensource-src-5.8.0.orig/Source/WebCore/plugins/qt/PluginViewQt.cpp
++++ qtwebkit-opensource-src-5.8.0/Source/WebCore/plugins/qt/PluginViewQt.cpp
+@@ -697,7 +697,11 @@ 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());
++#ifdef NIXPKGS_LIBGDK2
++    QLibrary library(QLatin1String(NIXPKGS_LIBGDK2), 0);
++#else
+     QLibrary library(QLatin1String("libgdk-x11-2.0"), 0);
++#endif
+     if (!library.load())
+         return 0;
+ 
+Index: qtwebkit-opensource-src-5.8.0/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
+===================================================================
+--- qtwebkit-opensource-src-5.8.0.orig/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
++++ qtwebkit-opensource-src-5.8.0/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp
+@@ -64,7 +64,11 @@ static Display* getPluginDisplay()
+     // The code below has the same effect as this one:
+     // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default());
+ 
++#ifdef NIXPKGS_LIBGDK2
++    QLibrary library(QLatin1String(NIXPKGS_LIBGDK2), 0);
++#else
+     QLibrary library(QLatin1String("libgdk-x11-2.0"), 0);
++#endif
+     if (!library.load())
+         return 0;
+ 
+Index: qtwebkit-opensource-src-5.8.0/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp
+===================================================================
+--- qtwebkit-opensource-src-5.8.0.orig/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp
++++ qtwebkit-opensource-src-5.8.0/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp
+@@ -53,7 +53,11 @@ static void messageHandler(QtMsgType typ
+ 
+ static bool initializeGtk()
+ {
++#ifdef NIXPKGS_LIBGTK2
++    QLibrary gtkLibrary(QLatin1String(NIXPKGS_LIBGTK2), 0);
++#else
+     QLibrary gtkLibrary(QLatin1String("libgtk-x11-2.0"), 0);
++#endif
+     if (!gtkLibrary.load())
+         return false;
+     typedef void* (*gtk_init_ptr)(void*, void*);
diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebkit/qtwebkit-dlopen-udev.patch b/pkgs/development/libraries/qt-5/5.6/qtwebkit/qtwebkit-dlopen-udev.patch
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebkit/qtwebkit-icucore-darwin.patch b/pkgs/development/libraries/qt-5/5.6/qtwebkit/qtwebkit-icucore-darwin.patch
new file mode 100644
index 00000000000..63c653da94e
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.6/qtwebkit/qtwebkit-icucore-darwin.patch
@@ -0,0 +1,13 @@
+Index: qtwebkit-opensource-src-5.8.0/Source/WTF/WTF.pri
+===================================================================
+--- qtwebkit-opensource-src-5.8.0.orig/Source/WTF/WTF.pri
++++ qtwebkit-opensource-src-5.8.0/Source/WTF/WTF.pri
+@@ -12,7 +12,7 @@ mac {
+     # Mac OS does ship libicu but not the associated header files.
+     # Therefore WebKit provides adequate header files.
+     INCLUDEPATH = $${ROOT_WEBKIT_DIR}/Source/WTF/icu $$INCLUDEPATH
+-    LIBS += -licucore
++    LIBS += /usr/lib/libicucore.dylib
+ } else:!use?(wchar_unicode): {
+     win32 {
+         CONFIG(static, static|shared) {
diff --git a/pkgs/development/libraries/qt-5/5.6/qtwebkit/series b/pkgs/development/libraries/qt-5/5.6/qtwebkit/series
new file mode 100644
index 00000000000..140e2a3dd4e
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.6/qtwebkit/series
@@ -0,0 +1,3 @@
+qtwebkit-dlopen-gtk.patch
+qtwebkit-dlopen-udev.patch
+qtwebkit-icucore-darwin.patch

From 99ed5853eb0a051d43c51df4dae353ac952baaf8 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 23 May 2017 11:14:07 -0500
Subject: [PATCH 060/189] qt56.qtserialport: use QLatin1String instead of
 QStringLiteral

---
 .../0001-dlopen-serialport-udev.patch         |  6 ++---
 .../qt-5/5.6/qtserialport/default.nix         | 14 ++++++------
 .../qtserialport-dlopen-udev.patch            | 22 +++++++++++++++++++
 .../libraries/qt-5/5.6/qtserialport/series    |  1 +
 4 files changed, 33 insertions(+), 10 deletions(-)
 create mode 100644 pkgs/development/libraries/qt-5/5.6/qtserialport/qtserialport-dlopen-udev.patch
 create mode 100644 pkgs/development/libraries/qt-5/5.6/qtserialport/series

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
index 3a813dc8007..9893fdff9a5 100644
--- 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
@@ -11,15 +11,15 @@ 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
+@@ -105,10 +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);
++        udevLibrary->setFileNameAndVersion(QLatin1String(NIXPKGS_LIBUDEV), 1);
          if (!udevLibrary->load()) {
 -            udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 0);
-+            udevLibrary->setFileNameAndVersion(QStringLiteral("@libudev@/lib/libudev"), 0);
++            udevLibrary->setFileNameAndVersion(QLatin1String(NIXPKGS_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;
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 2bffd0a2bd6..925e8a808f2 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtserialport/default.nix
+++ b/pkgs/development/libraries/qt-5/5.6/qtserialport/default.nix
@@ -1,12 +1,12 @@
-{ qtSubmodule, qtbase, substituteAll, systemd }:
+{ stdenv, qtSubmodule, lib, copyPathsToStore, qtbase, substituteAll, systemd }:
+
+let inherit (lib) getLib optional; in
 
 qtSubmodule {
   name = "qtserialport";
   qtInputs = [ qtbase ];
-  patches = [
-    (substituteAll {
-      src = ./0001-dlopen-serialport-udev.patch;
-      libudev = systemd.lib;
-    })
-  ];
+  patches =  copyPathsToStore (lib.readPathsFromFile ./. ./series);
+  NIX_CFLAGS_COMPILE =
+    optional stdenv.isLinux
+    ''-DNIXPKGS_LIBUDEV="${getLib systemd}/lib/libudev"'';
 }
diff --git a/pkgs/development/libraries/qt-5/5.6/qtserialport/qtserialport-dlopen-udev.patch b/pkgs/development/libraries/qt-5/5.6/qtserialport/qtserialport-dlopen-udev.patch
new file mode 100644
index 00000000000..65bb64710eb
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.6/qtserialport/qtserialport-dlopen-udev.patch
@@ -0,0 +1,22 @@
+Index: qtserialport-opensource-src-5.8.0/src/serialport/qtudev_p.h
+===================================================================
+--- qtserialport-opensource-src-5.8.0.orig/src/serialport/qtudev_p.h
++++ qtserialport-opensource-src-5.8.0/src/serialport/qtudev_p.h
+@@ -111,9 +111,17 @@ inline QFunctionPointer resolveSymbol(QL
+ inline bool resolveSymbols(QLibrary *udevLibrary)
+ {
+     if (!udevLibrary->isLoaded()) {
++#ifdef NIXPKGS_LIBUDEV
++        udevLibrary->setFileNameAndVersion(QLatin1String(NIXPKGS_LIBUDEV), 1);
++#else
+         udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 1);
++#endif
+         if (!udevLibrary->load()) {
++#ifdef NIXPKGS_LIBUDEV
++            udevLibrary->setFileNameAndVersion(QLatin1String(NIXPKGS_LIBUDEV), 0);
++#else
+             udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 0);
++#endif
+             if (!udevLibrary->load()) {
+                 qWarning("Failed to load the library: %s, supported version(s): %i and %i", qPrintable(udevLibrary->fileName()), 1, 0);
+                 return false;
diff --git a/pkgs/development/libraries/qt-5/5.6/qtserialport/series b/pkgs/development/libraries/qt-5/5.6/qtserialport/series
new file mode 100644
index 00000000000..83f4abf094e
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.6/qtserialport/series
@@ -0,0 +1 @@
+qtserialport-dlopen-udev.patch

From f3ce852355bee730427326b2f76e09a96d39d17a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 2 Jun 2017 08:51:47 -0500
Subject: [PATCH 061/189] nixpkgs: remove comments from manual about wrapping
 Qt packages

It is no longer necessary to wrap Qt packages
---
 doc/languages-frameworks/qt.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/doc/languages-frameworks/qt.xml b/doc/languages-frameworks/qt.xml
index b6c8f0e899e..4193fc5f16e 100644
--- a/doc/languages-frameworks/qt.xml
+++ b/doc/languages-frameworks/qt.xml
@@ -20,13 +20,11 @@
 
 <para>It is generally best to build an application package against the <varname>libsForQt5</varname> library set. In case a package does not build with the latest Qt version, it is possible to pick a set pinned to a particular version, e.g. <varname>libsForQt55</varname> for Qt 5.5, if that is the latest version the package supports.</para>
 
-<para>Qt-based applications require that several paths be set at runtime. This is accomplished by wrapping the provided executables in a package with <literal>wrapQtProgram</literal> or <literal>makeQtWrapper</literal> during the <literal>postFixup</literal> phase. To use the wrapper generators, add <literal>makeQtWrapper</literal> to <literal>nativeBuildInputs</literal>. The wrapper generators support the same options as <literal>wrapProgram</literal> and <literal>makeWrapper</literal> respectively. It is usually only necessary to generate wrappers for programs intended to be invoked by the user.</para>
-
 </section>
 
 <section xml:id="ssec-qt-kde"><title>KDE</title>
 
-<para>The KDE Frameworks are a set of libraries for Qt 5 which form the basis of the Plasma desktop environment and the KDE Applications suite. Packaging a Frameworks-based library does not require any steps beyond those described above for general Qt-based libraries. Frameworks-based applications should not use <literal>makeQtWrapper</literal>; instead, use <literal>kdeWrapper</literal> to create the necessary wrappers: <literal>kdeWrapper { unwrapped = <replaceable>expr</replaceable>; targets = <replaceable>exes</replaceable>; }</literal>, where <replaceable>expr</replaceable> is the un-wrapped package expression and <replaceable>exes</replaceable> is a list of strings giving the relative paths to programs in the package which should be wrapped.</para>
+<para>The KDE Frameworks are a set of libraries for Qt 5 which form the basis of the Plasma desktop environment and the KDE Applications suite. Packaging a Frameworks-based package does not require any steps beyond those described above for general Qt-based packages.</para>
 
 </section>
 

From ce28d8947d3e698f48cbbf4c3291c9427124886e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 2 Jun 2017 08:59:18 -0500
Subject: [PATCH 062/189] nixpkgs: remark about running Qt applications

---
 doc/languages-frameworks/qt.xml | 52 ++++++++++++++++++++++++---------
 1 file changed, 39 insertions(+), 13 deletions(-)

diff --git a/doc/languages-frameworks/qt.xml b/doc/languages-frameworks/qt.xml
index 4193fc5f16e..1dbbb5341ba 100644
--- a/doc/languages-frameworks/qt.xml
+++ b/doc/languages-frameworks/qt.xml
@@ -2,29 +2,55 @@
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xml:id="sec-language-qt">
 
-<title>Qt and KDE</title>
+<title>Qt</title>
 
-<para>Qt is a comprehensive desktop and mobile application development toolkit for C++. Legacy support is available for Qt 3 and Qt 4, but all current development uses Qt 5. The Qt 5 packages in Nixpkgs are updated frequently to take advantage of new features, but older versions are typically retained to support packages that may not be compatible with the latest version. When packaging applications and libraries for Nixpkgs, it is important to ensure that compatible versions of Qt 5 are used throughout; this consideration motivates the tools described below.</para>
+<para>
+Qt is a comprehensive desktop and mobile application development toolkit for C++.
+Legacy support is available for Qt 3 and Qt 4, but all current development uses Qt 5.
+The Qt 5 packages in Nixpkgs are updated frequently to take advantage of new features,
+but older versions are typically retained until their support window ends.
+The most important consideration in packaging Qt-based software is ensuring that each package and all its dependencies use the same version of Qt 5;
+this consideration motivates most of the tools described below.
+</para>
 
-<section xml:id="ssec-qt-libraries"><title>Libraries</title>
+<section xml:id="ssec-qt-libraries"><title>Packaging Libraries for Nixpkgs</title>
 
-<para>Libraries that depend on Qt 5 should be built with each available version to avoid linking a dependent package against incompatible versions of Qt 5. (Although Qt 5 maintains backward ABI compatibility, linking against multiple versions at once is generally not possible; at best it will lead to runtime faults.) Packages that provide libraries should be added to the top-level function <varname>mkLibsForQt5</varname>, which is used to build a set of libraries for every Qt 5 version. The <varname>callPackage</varname> provided in this scope will ensure that only one Qt version will be used throughout the dependency tree. Dependencies should be imported unqualified, i.e. <literal>qtbase</literal> not <literal>qt5.qtbase</literal>, so that <varname>callPackage</varname> can do its work. <emphasis>Do not</emphasis> import a package set such as <literal>qt5</literal> or <literal>libsForQt5</literal> into your package; although it may work fine in the moment, it could well break at the next Qt update.</para>
+<para>
+Whenever possible, libraries that use Qt 5 should be built with each available version.
+Packages providing libraries should be added to the top-level function <varname>mkLibsForQt5</varname>,
+which is used to build a set of libraries for every Qt 5 version.
+A special <varname>callPackage</varname> function is used in this scope to ensure that the entire dependency tree uses the same Qt 5 version.
+Import dependencies unqualified, i.e., <literal>qtbase</literal> not <literal>qt5.qtbase</literal>.
+<emphasis>Do not</emphasis> import a package set such as <literal>qt5</literal> or <literal>libsForQt5</literal>.
+</para>
 
-<para>If a library does not support a particular version of Qt 5, it is best to mark it as broken by setting its <literal>meta.broken</literal> attribute. A package may be marked broken for certain versions by testing the <literal>qtbase.version</literal> attribute, which will always give the current Qt 5 version.</para>
+<para>
+If a library does not support a particular version of Qt 5, it is best to mark it as broken by setting its <literal>meta.broken</literal> attribute.
+A package may be marked broken for certain versions by testing the <literal>qtbase.version</literal> attribute, which will always give the current Qt 5 version.
+</para>
 
 </section>
 
-<section xml:id="ssec-qt-applications"><title>Applications</title>
+<section xml:id="ssec-qt-applications"><title>Packaging Applications for Nixpkgs</title>
 
-<para>Applications generally do not need to be built with every Qt version because they do not provide any libraries for dependent packages to link against. The primary consideration is merely ensuring that the application itself and its dependencies are linked against only one version of Qt. To call your application expression, use <literal>libsForQt5.callPackage</literal> instead of <literal>callPackage</literal>. Dependencies should be imported unqualified, i.e. <literal>qtbase</literal> not <literal>qt5.qtbase</literal>. <emphasis>Do not</emphasis> import a package set such as <literal>qt5</literal> or <literal>libsForQt5</literal> into your package; although it may work fine in the moment, it could well break at the next Qt update.</para>
+<para>
+Call your application expression using <literal>libsForQt5.callPackage</literal> instead of <literal>callPackage</literal>.
+Import dependencies unqualified, i.e., <literal>qtbase</literal> not <literal>qt5.qtbase</literal>.
+<emphasis>Do not</emphasis> import a package set such as <literal>qt5</literal> or <literal>libsForQt5</literal>.
+</para>
 
-<para>It is generally best to build an application package against the <varname>libsForQt5</varname> library set. In case a package does not build with the latest Qt version, it is possible to pick a set pinned to a particular version, e.g. <varname>libsForQt55</varname> for Qt 5.5, if that is the latest version the package supports.</para>
+<para>
+Qt 5 maintains strict backward compatibility, so it is generally best to build an application package against the latest version using the <varname>libsForQt5</varname> library set.
+In case a package does not build with the latest Qt version, it is possible to pick a set pinned to a particular version, e.g. <varname>libsForQt55</varname> for Qt 5.5, if that is the latest version the package supports.
+If a package must be pinned to an older Qt version, be sure to file a bug upstream;
+because Qt is strictly backwards-compatible, any incompatibility is by definition a bug in the application.
+</para>
 
-</section>
-
-<section xml:id="ssec-qt-kde"><title>KDE</title>
-
-<para>The KDE Frameworks are a set of libraries for Qt 5 which form the basis of the Plasma desktop environment and the KDE Applications suite. Packaging a Frameworks-based package does not require any steps beyond those described above for general Qt-based packages.</para>
+<para>
+When testing applications in Nixpkgs, it is a common practice to build the package with <literal>nix-build</literal> and run it using the created symbolic link.
+This will not work with Qt applications, however, because they have many hard runtime requirements that can only be guaranteed if the package is actually installed.
+To test a Qt application, install it with <literal>nix-env</literal> or run it inside <literal>nix-shell</literal>.
+</para>
 
 </section>
 

From dab7700f6ce9266e02a630eea0c4440470ba58e5 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Thu, 15 Jun 2017 07:58:55 -0500
Subject: [PATCH 063/189] qt58: determine plugin and import paths from PATH

Plugin and QML import paths were previously determined by NIX_PROFILES. Using
PATH instead allows Qt applications to work under nix-shell without further
modification.
---
 .../services/x11/display-managers/sddm.nix    |  6 ++-
 .../sddm/sddm-nix-profiles.patch              | 24 -----------
 .../applications/display-managers/sddm/series |  3 +-
 .../libraries/qt-5/5.8/qtbase/default.nix     |  1 -
 ...ibrary-paths.patch => library-paths.patch} | 12 +++---
 .../5.8/qtbase/qpa-platform-plugin-path.patch | 43 -------------------
 .../libraries/qt-5/5.8/qtbase/series          |  3 +-
 ...-import-paths.patch => import-paths.patch} | 12 +++---
 .../libraries/qt-5/5.8/qtdeclarative/series   |  2 +-
 9 files changed, 19 insertions(+), 87 deletions(-)
 delete mode 100644 pkgs/applications/display-managers/sddm/sddm-nix-profiles.patch
 rename pkgs/development/libraries/qt-5/5.8/qtbase/{nix-profiles-library-paths.patch => library-paths.patch} (64%)
 delete mode 100644 pkgs/development/libraries/qt-5/5.8/qtbase/qpa-platform-plugin-path.patch
 rename pkgs/development/libraries/qt-5/5.8/qtdeclarative/{nix-profiles-import-paths.patch => import-paths.patch} (64%)

diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix
index bf516235eb2..e6cc02e4d49 100644
--- a/nixos/modules/services/x11/display-managers/sddm.nix
+++ b/nixos/modules/services/x11/display-managers/sddm.nix
@@ -197,8 +197,10 @@ in
       logsXsession = true;
 
       environment = {
-        # Take themes system environment
-        NIX_PROFILES = "/run/current-system/sw";
+        # Load themes from system environment
+        QT_PLUGIN_PATH = "/run/current-system/sw/" + pkgs.qt5.qtbase.qtPluginPrefix;
+        QML2_IMPORT_PATH = "/run/current-system/sw/" + pkgs.qt5.qtbase.qtQmlPrefix;
+
         XDG_DATA_DIRS = "/run/current-system/sw/share";
       };
 
diff --git a/pkgs/applications/display-managers/sddm/sddm-nix-profiles.patch b/pkgs/applications/display-managers/sddm/sddm-nix-profiles.patch
deleted file mode 100644
index 1783164af46..00000000000
--- a/pkgs/applications/display-managers/sddm/sddm-nix-profiles.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: sddm-0.14.0/src/daemon/Greeter.cpp
-===================================================================
---- sddm-0.14.0.orig/src/daemon/Greeter.cpp
-+++ sddm-0.14.0/src/daemon/Greeter.cpp
-@@ -157,18 +157,7 @@ namespace SDDM {
-                 << args;
- 
-             // greeter environment
--            QProcessEnvironment env;
--            QProcessEnvironment sysenv = QProcessEnvironment::systemEnvironment();
--
--            insertEnvironmentList({QStringLiteral("LANG"), QStringLiteral("LANGUAGE"),
--                                   QStringLiteral("LC_CTYPE"), QStringLiteral("LC_NUMERIC"), QStringLiteral("LC_TIME"), QStringLiteral("LC_COLLATE"),
--                                   QStringLiteral("LC_MONETARY"), QStringLiteral("LC_MESSAGES"), QStringLiteral("LC_PAPER"), QStringLiteral("LC_NAME"),
--                                   QStringLiteral("LC_ADDRESS"), QStringLiteral("LC_TELEPHONE"), QStringLiteral("LC_MEASUREMENT"), QStringLiteral("LC_IDENTIFICATION"),
--                                   QStringLiteral("LD_LIBRARY_PATH"),
--                                   QStringLiteral("QML2_IMPORT_PATH"),
--                                   QStringLiteral("QT_PLUGIN_PATH"),
--                                   QStringLiteral("XDG_DATA_DIRS")
--            }, sysenv, env);
-+            QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
- 
-             env.insert(QStringLiteral("PATH"), mainConfig.Users.DefaultPath.get());
-             env.insert(QStringLiteral("DISPLAY"), m_display->name());
diff --git a/pkgs/applications/display-managers/sddm/series b/pkgs/applications/display-managers/sddm/series
index 703fb6a3fe1..cb6ea65fedb 100644
--- a/pkgs/applications/display-managers/sddm/series
+++ b/pkgs/applications/display-managers/sddm/series
@@ -1,2 +1 @@
-sddm-ignore-config-mtime.patch
-sddm-nix-profiles.patch
+sddm-ignore-config-mtime.patch
\ No newline at end of file
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
index 3048baeb327..93be661b7da 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/default.nix
@@ -132,7 +132,6 @@ stdenv.mkDerivation {
         -docdir $out/$qtDocPrefix"
 
     NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PREFIX=\"$qtPluginPrefix\""
-    NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QPA_PLATFORM_PLUGIN_PATH=\"''${!outputLib}/$qtPluginPrefix/platforms\""
   '';
 
 
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/nix-profiles-library-paths.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/library-paths.patch
similarity index 64%
rename from pkgs/development/libraries/qt-5/5.8/qtbase/nix-profiles-library-paths.patch
rename to pkgs/development/libraries/qt-5/5.8/qtbase/library-paths.patch
index f626e399288..38eecbe2c64 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/nix-profiles-library-paths.patch
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/library-paths.patch
@@ -6,12 +6,12 @@ Index: qtbase-opensource-src-5.8.0/src/corelib/kernel/qcoreapplication.cpp
          QStringList *app_libpaths = new QStringList;
          coreappdata()->app_libpaths.reset(app_libpaths);
  
-+        // Add library paths derived from NIX_PROFILES.
-+        const QStringList profiles = QFile::decodeName(qgetenv("NIX_PROFILES")).split(' ');
-+        const QString plugindir = QStringLiteral(NIXPKGS_QT_PLUGIN_PREFIX);
-+        for (const QString &profile: profiles) {
-+            if (!profile.isEmpty()) {
-+                app_libpaths->append(profile + QDir::separator() + plugindir);
++        // Add library paths derived from PATH
++        const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(':');
++        const QString plugindir = QStringLiteral("../" NIXPKGS_QT_PLUGIN_PREFIX);
++        for (const QString &path: paths) {
++            if (!path.isEmpty()) {
++                app_libpaths->append(QDir::cleanPath(path + QDir::separator() + plugindir));
 +            }
 +        }
 +
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/qpa-platform-plugin-path.patch b/pkgs/development/libraries/qt-5/5.8/qtbase/qpa-platform-plugin-path.patch
deleted file mode 100644
index 18780db05e7..00000000000
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/qpa-platform-plugin-path.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Index: qtbase-opensource-src-5.8.0/src/gui/kernel/qplatformintegrationfactory.cpp
-===================================================================
---- qtbase-opensource-src-5.8.0.orig/src/gui/kernel/qplatformintegrationfactory.cpp
-+++ qtbase-opensource-src-5.8.0/src/gui/kernel/qplatformintegrationfactory.cpp
-@@ -62,9 +62,10 @@ QPlatformIntegration *QPlatformIntegrati
-     // Try loading the plugin from platformPluginPath first:
-     if (!platformPluginPath.isEmpty()) {
-         QCoreApplication::addLibraryPath(platformPluginPath);
--        if (QPlatformIntegration *ret = qLoadPlugin<QPlatformIntegration, QPlatformIntegrationPlugin>(directLoader(), platform, paramList, argc, argv))
--            return ret;
-     }
-+    QCoreApplication::addLibraryPath(QLatin1String(NIXPKGS_QPA_PLATFORM_PLUGIN_PATH));
-+    if (QPlatformIntegration *ret = qLoadPlugin<QPlatformIntegration, QPlatformIntegrationPlugin>(directLoader(), platform, paramList, argc, argv))
-+        return ret;
- #else
-     Q_UNUSED(platformPluginPath);
- #endif
-@@ -84,15 +85,16 @@ QStringList QPlatformIntegrationFactory:
- #ifndef QT_NO_LIBRARY
-     if (!platformPluginPath.isEmpty()) {
-         QCoreApplication::addLibraryPath(platformPluginPath);
--        list = directLoader()->keyMap().values();
--        if (!list.isEmpty()) {
--            const QString postFix = QLatin1String(" (from ")
--                                    + QDir::toNativeSeparators(platformPluginPath)
--                                    + QLatin1Char(')');
--            const QStringList::iterator end = list.end();
--            for (QStringList::iterator it = list.begin(); it != end; ++it)
--                (*it).append(postFix);
--        }
-+    }
-+    QCoreApplication::addLibraryPath(QLatin1String(NIXPKGS_QPA_PLATFORM_PLUGIN_PATH));
-+    list = directLoader()->keyMap().values();
-+    if (!list.isEmpty()) {
-+        const QString postFix = QLatin1String(" (from ")
-+            + QDir::toNativeSeparators(platformPluginPath)
-+            + QLatin1Char(')');
-+        const QStringList::iterator end = list.end();
-+        for (QStringList::iterator it = list.begin(); it != end; ++it)
-+            (*it).append(postFix);
-     }
- #else
-     Q_UNUSED(platformPluginPath);
diff --git a/pkgs/development/libraries/qt-5/5.8/qtbase/series b/pkgs/development/libraries/qt-5/5.8/qtbase/series
index 03f5e6b1002..f3387694518 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtbase/series
+++ b/pkgs/development/libraries/qt-5/5.8/qtbase/series
@@ -2,9 +2,8 @@ dlopen-resolv.patch
 tzdir.patch
 dlopen-libXcursor.patch
 xdg-config-dirs.patch
-nix-profiles-library-paths.patch
+library-paths.patch
 libressl.patch
-qpa-platform-plugin-path.patch
 dlopen-gl.patch
 compose-search-path.patch
 cmake-paths.patch
diff --git a/pkgs/development/libraries/qt-5/5.8/qtdeclarative/nix-profiles-import-paths.patch b/pkgs/development/libraries/qt-5/5.8/qtdeclarative/import-paths.patch
similarity index 64%
rename from pkgs/development/libraries/qt-5/5.8/qtdeclarative/nix-profiles-import-paths.patch
rename to pkgs/development/libraries/qt-5/5.8/qtdeclarative/import-paths.patch
index 2d51f7b6759..d50ee823a78 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtdeclarative/nix-profiles-import-paths.patch
+++ b/pkgs/development/libraries/qt-5/5.8/qtdeclarative/import-paths.patch
@@ -6,12 +6,12 @@ Index: qtdeclarative-opensource-src-5.8.0/src/qml/qml/qqmlimport.cpp
      QString installImportsPath =  QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath);
      addImportPath(installImportsPath);
  
-+    // Add library paths derived from NIX_PROFILES.
-+    const QStringList profiles = QFile::decodeName(qgetenv("NIX_PROFILES")).split(' ');
-+    const QString qmldir = QStringLiteral(NIXPKGS_QML2_IMPORT_PREFIX);
-+    for (const QString &profile: profiles) {
-+        if (!profile.isEmpty()) {
-+            addImportPath(profile + QDir::separator() + qmldir);
++    // Add import paths derived from PATH
++    const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(':');
++    const QString qmldir = QStringLiteral("../" NIXPKGS_QML2_IMPORT_PREFIX);
++    for (const QString &path: paths) {
++        if (!path.isEmpty()) {
++            addImportPath(QDir::cleanPath(path + QDir::separator() + qmldir));
 +        }
 +    }
 +
diff --git a/pkgs/development/libraries/qt-5/5.8/qtdeclarative/series b/pkgs/development/libraries/qt-5/5.8/qtdeclarative/series
index 7dbe197c56e..38abb916a50 100644
--- a/pkgs/development/libraries/qt-5/5.8/qtdeclarative/series
+++ b/pkgs/development/libraries/qt-5/5.8/qtdeclarative/series
@@ -1 +1 @@
-nix-profiles-import-paths.patch
+import-paths.patch

From e6cf9b9df0dbb8aa2b0db9d797645b2bd4b827ab Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 16 Jun 2017 08:27:05 -0500
Subject: [PATCH 064/189] qt56: determine plugin and import paths from PATH

Plugin and QML import paths were previously determined by NIX_PROFILES. Using
PATH instead allows Qt applications to work under nix-shell without further modification.
---
 .../libraries/qt-5/5.6/qtbase/dlopen-resolv.patch  | 14 +++++++-------
 ...les-library-paths.patch => library-paths.patch} | 12 ++++++------
 pkgs/development/libraries/qt-5/5.6/qtbase/series  |  3 +--
 .../libraries/qt-5/5.6/qtbase/tzdir.patch          | 10 +++++-----
 ...files-import-paths.patch => import-paths.patch} | 12 ++++++------
 .../libraries/qt-5/5.6/qtdeclarative/series        |  2 +-
 6 files changed, 26 insertions(+), 27 deletions(-)
 rename pkgs/development/libraries/qt-5/5.6/qtbase/{nix-profiles-library-paths.patch => library-paths.patch} (64%)
 rename pkgs/development/libraries/qt-5/5.6/qtdeclarative/{nix-profiles-import-paths.patch => import-paths.patch} (64%)

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
index a0b546aaa3a..e9d3c2734d1 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-resolv.patch
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/dlopen-resolv.patch
@@ -1,8 +1,8 @@
-Index: qtbase-opensource-src-5.6.1/src/network/kernel/qdnslookup_unix.cpp
+Index: qtbase-opensource-src-5.6.2/src/network/kernel/qdnslookup_unix.cpp
 ===================================================================
---- qtbase-opensource-src-5.6.1.orig/src/network/kernel/qdnslookup_unix.cpp
-+++ qtbase-opensource-src-5.6.1/src/network/kernel/qdnslookup_unix.cpp
-@@ -78,7 +78,7 @@ static bool resolveLibraryInternal()
+--- qtbase-opensource-src-5.6.2.orig/src/network/kernel/qdnslookup_unix.cpp
++++ qtbase-opensource-src-5.6.2/src/network/kernel/qdnslookup_unix.cpp
+@@ -83,7 +83,7 @@ static bool resolveLibraryInternal()
      if (!lib.load())
  #endif
      {
@@ -11,10 +11,10 @@ Index: qtbase-opensource-src-5.6.1/src/network/kernel/qdnslookup_unix.cpp
          if (!lib.load())
              return false;
      }
-Index: qtbase-opensource-src-5.6.1/src/network/kernel/qhostinfo_unix.cpp
+Index: qtbase-opensource-src-5.6.2/src/network/kernel/qhostinfo_unix.cpp
 ===================================================================
---- qtbase-opensource-src-5.6.1.orig/src/network/kernel/qhostinfo_unix.cpp
-+++ qtbase-opensource-src-5.6.1/src/network/kernel/qhostinfo_unix.cpp
+--- qtbase-opensource-src-5.6.2.orig/src/network/kernel/qhostinfo_unix.cpp
++++ qtbase-opensource-src-5.6.2/src/network/kernel/qhostinfo_unix.cpp
 @@ -94,7 +94,7 @@ static bool resolveLibraryInternal()
      if (!lib.load())
  #endif
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/library-paths.patch
similarity index 64%
rename from pkgs/development/libraries/qt-5/5.6/qtbase/nix-profiles-library-paths.patch
rename to pkgs/development/libraries/qt-5/5.6/qtbase/library-paths.patch
index dfc2dccdeb6..fecbce59050 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtbase/nix-profiles-library-paths.patch
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/library-paths.patch
@@ -6,12 +6,12 @@ Index: qtbase-opensource-src-5.6.2/src/corelib/kernel/qcoreapplication.cpp
          QStringList *app_libpaths = new QStringList;
          coreappdata()->app_libpaths.reset(app_libpaths);
  
-+        // Add library paths derived from NIX_PROFILES.
-+        const QStringList profiles = QFile::decodeName(qgetenv("NIX_PROFILES")).split(' ');
-+        const QString plugindir = QStringLiteral(NIXPKGS_QT_PLUGIN_PREFIX);
-+        for (const QString &profile: profiles) {
-+            if (!profile.isEmpty()) {
-+                app_libpaths->append(profile + QDir::separator() + plugindir);
++        // Add library paths derived from PATH
++        const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(':');
++        const QString plugindir = QStringLiteral("../" NIXPKGS_QT_PLUGIN_PREFIX);
++        for (const QString &path: paths) {
++            if (!path.isEmpty()) {
++                app_libpaths->append(QDir::cleanPath(path + QDir::separator() + plugindir));
 +            }
 +        }
 +
diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/series b/pkgs/development/libraries/qt-5/5.6/qtbase/series
index 3527a91c84d..bacb3a4ed89 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtbase/series
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/series
@@ -4,7 +4,6 @@ dlopen-libXcursor.patch
 dlopen-openssl.patch
 dlopen-dbus.patch
 xdg-config-dirs.patch
-nix-profiles-library-paths.patch
+library-paths.patch
 compose-search-path.patch
 libressl.patch
-qpa-platform-plugin-path.patch
diff --git a/pkgs/development/libraries/qt-5/5.6/qtbase/tzdir.patch b/pkgs/development/libraries/qt-5/5.6/qtbase/tzdir.patch
index 16e88d7c4f0..f197211ded7 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtbase/tzdir.patch
+++ b/pkgs/development/libraries/qt-5/5.6/qtbase/tzdir.patch
@@ -1,8 +1,8 @@
-Index: qtbase-opensource-src-5.6.0/src/corelib/tools/qtimezoneprivate_tz.cpp
+Index: qtbase-opensource-src-5.6.2/src/corelib/tools/qtimezoneprivate_tz.cpp
 ===================================================================
---- qtbase-opensource-src-5.6.0.orig/src/corelib/tools/qtimezoneprivate_tz.cpp
-+++ qtbase-opensource-src-5.6.0/src/corelib/tools/qtimezoneprivate_tz.cpp
-@@ -62,7 +62,10 @@ typedef QHash<QByteArray, QTzTimeZone> Q
+--- qtbase-opensource-src-5.6.2.orig/src/corelib/tools/qtimezoneprivate_tz.cpp
++++ qtbase-opensource-src-5.6.2/src/corelib/tools/qtimezoneprivate_tz.cpp
+@@ -64,7 +64,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()
  {
@@ -14,7 +14,7 @@ Index: qtbase-opensource-src-5.6.0/src/corelib/tools/qtimezoneprivate_tz.cpp
      if (!QFile::exists(path))
          path = QStringLiteral("/usr/lib/zoneinfo/zone.tab");
  
-@@ -560,12 +563,18 @@ void QTzTimeZonePrivate::init(const QByt
+@@ -636,12 +639,18 @@ void QTzTimeZonePrivate::init(const QByt
          if (!tzif.open(QIODevice::ReadOnly))
              return;
      } else {
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/import-paths.patch
similarity index 64%
rename from pkgs/development/libraries/qt-5/5.6/qtdeclarative/nix-profiles-import-paths.patch
rename to pkgs/development/libraries/qt-5/5.6/qtdeclarative/import-paths.patch
index 50e9490b6d9..a942d837c30 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtdeclarative/nix-profiles-import-paths.patch
+++ b/pkgs/development/libraries/qt-5/5.6/qtdeclarative/import-paths.patch
@@ -6,12 +6,12 @@ Index: qtdeclarative-opensource-src-5.6.2/src/qml/qml/qqmlimport.cpp
      QString installImportsPath =  QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath);
      addImportPath(installImportsPath);
  
-+    // Add library paths derived from NIX_PROFILES.
-+    const QStringList profiles = QFile::decodeName(qgetenv("NIX_PROFILES")).split(' ');
-+    const QString qmldir = QStringLiteral(NIXPKGS_QML2_IMPORT_PREFIX);
-+    for (const QString &profile: profiles) {
-+        if (!profile.isEmpty()) {
-+            addImportPath(profile + QDir::separator() + qmldir);
++    // Add import paths derived from PATH
++    const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(':');
++    const QString qmldir = QStringLiteral("../" NIXPKGS_QML2_IMPORT_PREFIX);
++    for (const QString &path: paths) {
++        if (!path.isEmpty()) {
++            addImportPath(QDir::cleanPath(path + QDir::separator() + qmldir));
 +        }
 +    }
 +
diff --git a/pkgs/development/libraries/qt-5/5.6/qtdeclarative/series b/pkgs/development/libraries/qt-5/5.6/qtdeclarative/series
index 7dbe197c56e..38abb916a50 100644
--- a/pkgs/development/libraries/qt-5/5.6/qtdeclarative/series
+++ b/pkgs/development/libraries/qt-5/5.6/qtdeclarative/series
@@ -1 +1 @@
-nix-profiles-import-paths.patch
+import-paths.patch

From 92fc4a374f572c4ca4d5cb48195776441ae0f905 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 18 Jun 2017 14:52:11 +0100
Subject: [PATCH 065/189] Revert "gdbGuile: mark as broken"

This reverts commit 08d25152b85fb24f7b5b85efe25d6be4deb12227.
---
 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 3be50635f8c..25824654fa1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7161,7 +7161,7 @@ with pkgs;
     inherit (gnu) mig;
   };
 
-  gdbGuile = lowPrio (gdb.override { inherit guile; broken = true; });
+  gdbGuile = lowPrio (gdb.override { inherit guile; });
 
   gdb-multitarget = lowPrio (gdb.override { multitarget = true; });
 

From 13d026e219c2f6c6f35f39abf5c911eca4884355 Mon Sep 17 00:00:00 2001
From: Kirill Elagin <kirelagin@gmail.com>
Date: Sat, 17 Jun 2017 22:05:07 +0300
Subject: [PATCH 066/189] bind: Use rndc to control the daemon

---
 nixos/modules/services/networking/bind.nix | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/bind.nix b/nixos/modules/services/networking/bind.nix
index 0272b6ceff2..e6d9e67116b 100644
--- a/nixos/modules/services/networking/bind.nix
+++ b/nixos/modules/services/networking/bind.nix
@@ -10,6 +10,11 @@ let
 
   confFile = pkgs.writeText "named.conf"
     ''
+      include "/etc/bind/rndc.key";
+      controls {
+        inet 127.0.0.1 allow {localhost;} keys {"rndc-key";};
+      };
+
       acl cachenetworks { ${concatMapStrings (entry: " ${entry}; ") cfg.cacheNetworks} };
       acl badnetworks { ${concatMapStrings (entry: " ${entry}; ") cfg.blockedNetworks} };
 
@@ -151,11 +156,21 @@ in
       wantedBy = [ "multi-user.target" ];
 
       preStart = ''
+        mkdir -m 0755 -p /etc/bind
+        if ! [ -f "/etc/bind/rndc.key" ]; then
+          ${pkgs.bind.out}/sbin/rndc-confgen -r /dev/urandom -c /etc/bind/rndc.key -u ${bindUser} -a -A hmac-sha256 2>/dev/null
+        fi
+
         ${pkgs.coreutils}/bin/mkdir -p /var/run/named
         chown ${bindUser} /var/run/named
       '';
 
-      script = "${pkgs.bind.out}/sbin/named -u ${bindUser} ${optionalString cfg.ipv4Only "-4"} -c ${cfg.configFile} -f";
+      serviceConfig = {
+        ExecStart  = "${pkgs.bind.out}/sbin/named -u ${bindUser} ${optionalString cfg.ipv4Only "-4"} -c ${cfg.configFile} -f";
+        ExecReload = "${pkgs.bind.out}/sbin/rndc -k '/etc/bind/rndc.key' reload";
+        ExecStop   = "${pkgs.bind.out}/sbin/rndc -k '/etc/bind/rndc.key' stop";
+      };
+
       unitConfig.Documentation = "man:named(8)";
     };
   };

From fd072b98d082edf7841f515b9d27f22608684c2f Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Sun, 18 Jun 2017 18:15:42 +0300
Subject: [PATCH 067/189] ps_mem: init at 3.9

---
 pkgs/tools/system/ps_mem/default.nix | 23 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/tools/system/ps_mem/default.nix

diff --git a/pkgs/tools/system/ps_mem/default.nix b/pkgs/tools/system/ps_mem/default.nix
new file mode 100644
index 00000000000..bbac78f4864
--- /dev/null
+++ b/pkgs/tools/system/ps_mem/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, pythonPackages, fetchFromGitHub }:
+
+let
+  version = "3.9";
+  pname = "ps_mem";
+in pythonPackages.buildPythonApplication rec {
+  name = "${pname}-${version}";
+
+  src = fetchFromGitHub {
+    owner = "pixelb";
+    repo = "${pname}";
+    rev = "f0891def54f1edb78a70006603d2b025236b830f";
+    sha256 = "1vy0z5nhia61hpqndf7kkjm12mgi0kh33jx5g1glggy45ymcisif";
+  };
+
+  meta = with stdenv.lib; {
+    description = "A utility to accurately report the in core memory usage for a program";
+    homepage = https://github.com/pixelb/ps_mem;
+    license = licenses.lgpl21;
+    maintainers = [ maintainers.gnidorah ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ad5281f6bf5..89a3edc361d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1066,6 +1066,8 @@ with pkgs;
 
   playerctl = callPackage ../tools/audio/playerctl { };
 
+  ps_mem = callPackage ../tools/system/ps_mem { };
+
   socklog = callPackage ../tools/system/socklog { };
 
   staccato = callPackage ../tools/text/staccato { };

From 6818848facb2648952e9186120573862ef12e69c Mon Sep 17 00:00:00 2001
From: Eric Bailey <eric@ericb.me>
Date: Sun, 18 Jun 2017 11:32:18 -0500
Subject: [PATCH 068/189] polyml: enable libffi and gmp

Thanks, @Mic92.
---
 pkgs/development/compilers/polyml/default.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/polyml/default.nix b/pkgs/development/compilers/polyml/default.nix
index 3ad8585edf3..1ffc08e969e 100644
--- a/pkgs/development/compilers/polyml/default.nix
+++ b/pkgs/development/compilers/polyml/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook }:
+{ stdenv, fetchFromGitHub, autoreconfHook, gmp, libffi }:
 
 stdenv.mkDerivation rec {
   name = "polyml-${version}";
@@ -8,7 +8,14 @@ stdenv.mkDerivation rec {
     substituteInPlace configure.ac --replace stdc++ c++
   '';
 
-  buildInputs = stdenv.lib.optional stdenv.isDarwin autoreconfHook;
+  buildInputs = [ libffi gmp ] ++
+    stdenv.lib.optional stdenv.isDarwin autoreconfHook;
+
+  configureFlags = [
+    "--enable-shared"
+    "--with-system-libffi"
+    "--with-gmp"
+  ];
 
   src = fetchFromGitHub {
     owner = "polyml";

From 0f51a2a0294d9141edfc6592f98ed500f38e0c61 Mon Sep 17 00:00:00 2001
From: Eric Bailey <eric@ericb.me>
Date: Sun, 18 Jun 2017 11:39:01 -0500
Subject: [PATCH 069/189] polyml: autoreconfHook -> nativeBuildInputs

Thanks, @peterhoeg.
---
 pkgs/development/compilers/polyml/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/polyml/default.nix b/pkgs/development/compilers/polyml/default.nix
index 1ffc08e969e..390d37dd245 100644
--- a/pkgs/development/compilers/polyml/default.nix
+++ b/pkgs/development/compilers/polyml/default.nix
@@ -8,8 +8,9 @@ stdenv.mkDerivation rec {
     substituteInPlace configure.ac --replace stdc++ c++
   '';
 
-  buildInputs = [ libffi gmp ] ++
-    stdenv.lib.optional stdenv.isDarwin autoreconfHook;
+  buildInputs = [ libffi gmp ];
+
+  nativeBuildInputs = stdenv.lib.optional stdenv.isDarwin autoreconfHook;
 
   configureFlags = [
     "--enable-shared"

From 2fb67d9b83f2b6ab1632c3e89c7a91aae603ee7e Mon Sep 17 00:00:00 2001
From: Gleb Peregud <gleber.p@gmail.com>
Date: Sun, 18 Jun 2017 19:32:51 +0200
Subject: [PATCH 070/189] qt: fix qmakeHook -> qmake in few packages.

This seem to have been broken in #26336.
---
 pkgs/applications/networking/feedreaders/rssguard/default.nix | 4 ++--
 pkgs/tools/misc/ultrastar-creator/default.nix                 | 4 ++--
 pkgs/tools/misc/ultrastar-manager/default.nix                 | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/feedreaders/rssguard/default.nix b/pkgs/applications/networking/feedreaders/rssguard/default.nix
index a9e3c1d74e2..d1c272fc383 100644
--- a/pkgs/applications/networking/feedreaders/rssguard/default.nix
+++ b/pkgs/applications/networking/feedreaders/rssguard/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, qmakeHook, qtwebengine, qttools, wrapGAppsHook }:
+{ stdenv, fetchgit, qmake, qtwebengine, qttools, wrapGAppsHook }:
 
 stdenv.mkDerivation rec {
   name = "rssguard-${version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs =  [ qtwebengine qttools ];
-  nativeBuildInputs = [ qmakeHook wrapGAppsHook ];
+  nativeBuildInputs = [ qmake wrapGAppsHook ];
   qmakeFlags = [ "CONFIG+=release" ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/misc/ultrastar-creator/default.nix b/pkgs/tools/misc/ultrastar-creator/default.nix
index 0700c43b26e..197c0536603 100644
--- a/pkgs/tools/misc/ultrastar-creator/default.nix
+++ b/pkgs/tools/misc/ultrastar-creator/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub
-, qmakeHook, qtbase, makeQtWrapper
+, qmake, qtbase, makeQtWrapper
 , pkgconfig, taglib, libbass, libbass_fx }:
 
 stdenv.mkDerivation rec {
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     cd src
   '';
 
-  nativeBuildInputs = [ qmakeHook makeQtWrapper pkgconfig ];
+  nativeBuildInputs = [ qmake makeQtWrapper pkgconfig ];
   buildInputs = [ qtbase taglib libbass libbass_fx ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/tools/misc/ultrastar-manager/default.nix b/pkgs/tools/misc/ultrastar-manager/default.nix
index 61b2c6aaa22..503ffe735fd 100644
--- a/pkgs/tools/misc/ultrastar-manager/default.nix
+++ b/pkgs/tools/misc/ultrastar-manager/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, symlinkJoin, qmakeHook, diffPlugins
+{ stdenv, fetchFromGitHub, pkgconfig, symlinkJoin, qmake, diffPlugins
 , qtbase, qtmultimedia, makeQtWrapper
 , taglib, libmediainfo, libzen, libbass }:
 
@@ -60,7 +60,7 @@ let
     name = "ultrastar-manager-${name}-plugin-${version}";
     src = patchedSrc;
 
-    buildInputs = [ qmakeHook ] ++ buildInputs;
+    buildInputs = [ qmake ] ++ buildInputs;
 
     postPatch = ''
       sed -e "s|DESTDIR = .*$|DESTDIR = $out|" \

From 89e02c7516ff301d28301926e9d7b373f29836fe Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Sun, 18 Jun 2017 20:04:30 +0200
Subject: [PATCH 071/189] lean: 3.1.0 -> 3.2.0

---
 pkgs/applications/science/logic/lean/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix
index a863b01f43a..08861341a1a 100644
--- a/pkgs/applications/science/logic/lean/default.nix
+++ b/pkgs/applications/science/logic/lean/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "lean-${version}";
-  version = "3.1.0";
+  version = "3.2.0";
 
   src = fetchFromGitHub {
     owner  = "leanprover";
     repo   = "lean";
     rev    = "v${version}";
-    sha256 = "0w4cdai6mzx4wr7gscv4sl5q4mxx1agjbpp4smvrslav7gpbz025";
+    sha256 = "13sb9rwgc9ni2j5zx77imjhkzhix9d7klsdb8cg68c17b20sy1g3";
   };
 
   buildInputs = [ gmp cmake ];

From f8d79426fadfd2c66fb82d1be1248f8ab4b81c56 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 18 Jun 2017 22:00:58 +0200
Subject: [PATCH 072/189] youtubeDL: 2017.05.29 -> 2017.06.18

---
 pkgs/tools/misc/youtube-dl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 853f644634d..0af3b72f6af 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -15,11 +15,11 @@ with stdenv.lib;
 buildPythonApplication rec {
 
   name = "youtube-dl-${version}";
-  version = "2017.05.29";
+  version = "2017.06.18";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${name}.tar.gz";
-    sha256 = "11zh0h4hwwx39iv6qbkqbvf5a5mgj71ngj2kp7zmq7g0qh37x9rx";
+    sha256 = "16az9rwr71hvs2z2xagnk71xqs7si0nb8rkn63r7pfv4rb134ggm";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 558b5fbd534d7a9d68938ce304e0c97aaafa90ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 18 Jun 2017 22:32:30 +0100
Subject: [PATCH 073/189] ultrastar-creator: remove makeQtWrapper

---
 pkgs/tools/misc/ultrastar-creator/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/ultrastar-creator/default.nix b/pkgs/tools/misc/ultrastar-creator/default.nix
index 197c0536603..30473059d6d 100644
--- a/pkgs/tools/misc/ultrastar-creator/default.nix
+++ b/pkgs/tools/misc/ultrastar-creator/default.nix
@@ -1,6 +1,5 @@
 { stdenv, fetchFromGitHub
-, qmake, qtbase, makeQtWrapper
-, pkgconfig, taglib, libbass, libbass_fx }:
+, qmake, qtbase, pkgconfig, taglib, libbass, libbass_fx }:
 
 stdenv.mkDerivation rec {
   name = "ultrastar-creator-${version}";
@@ -29,7 +28,7 @@ stdenv.mkDerivation rec {
     cd src
   '';
 
-  nativeBuildInputs = [ qmake makeQtWrapper pkgconfig ];
+  nativeBuildInputs = [ qmake pkgconfig ];
   buildInputs = [ qtbase taglib libbass libbass_fx ];
 
   meta = with stdenv.lib; {

From 9f14594cbc7313f6aac5ad58c1f789ad45ac6f24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 18 Jun 2017 22:38:33 +0100
Subject: [PATCH 074/189] ultrastar-manager: remove makeQtWrapper

---
 pkgs/tools/misc/ultrastar-manager/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/ultrastar-manager/default.nix b/pkgs/tools/misc/ultrastar-manager/default.nix
index 503ffe735fd..af443661b6c 100644
--- a/pkgs/tools/misc/ultrastar-manager/default.nix
+++ b/pkgs/tools/misc/ultrastar-manager/default.nix
@@ -1,6 +1,5 @@
 { stdenv, fetchFromGitHub, pkgconfig, symlinkJoin, qmake, diffPlugins
-, qtbase, qtmultimedia, makeQtWrapper
-, taglib, libmediainfo, libzen, libbass }:
+, qtbase, qtmultimedia, taglib, libmediainfo, libzen, libbass }:
 
 let
   version = "2017-05-24";
@@ -109,7 +108,7 @@ in stdenv.mkDerivation {
     make install
   '';
 
-  nativeBuildInputs = [ makeQtWrapper pkgconfig ];
+  nativeBuildInputs = [ pkgconfig ];
   inherit buildInputs;
 
   meta = with stdenv.lib; {

From 5fc48529bc8dcdd578b71c9fdb919fefba0f8c74 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 18 Jun 2017 23:49:24 +0200
Subject: [PATCH 075/189] expat: 2.2.0 -> 2.2.1

Includes fixes for CVE-2017-9233 and CVE-2016-9063.
---
 pkgs/development/libraries/expat/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix
index 1001afff0d4..3cbfc4c568d 100644
--- a/pkgs/development/libraries/expat/default.nix
+++ b/pkgs/development/libraries/expat/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "expat-2.2.0";
+  name = "expat-2.2.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/expat/${name}.tar.bz2";
-    sha256 = "1zq4lnwjlw8s9mmachwfvfjf2x3lk24jm41746ykhdcvs7r0zrfr";
+    sha256 = "11c8jy1wvllvlk7xdc5cm8hdhg0hvs8j0aqy6s702an8wkdcls0q";
   };
 
   outputs = [ "out" "dev" ]; # TODO: fix referrers
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
+  preCheck = "patchShebangs ./run.sh";
+
   meta = with stdenv.lib; {
     homepage = http://www.libexpat.org/;
     description = "A stream-oriented XML parser library written in C";

From 3d5a0f8c2f2efbb252d21e11738394489d8cff73 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 18 Jun 2017 16:12:46 -0500
Subject: [PATCH 076/189] mopidy-spotify: 3.0.0 -> 3.1.0

---
 pkgs/applications/audio/mopidy-spotify/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/mopidy-spotify/default.nix b/pkgs/applications/audio/mopidy-spotify/default.nix
index 045c400a17f..999883dc26c 100644
--- a/pkgs/applications/audio/mopidy-spotify/default.nix
+++ b/pkgs/applications/audio/mopidy-spotify/default.nix
@@ -2,11 +2,11 @@
 
 pythonPackages.buildPythonApplication rec {
   name = "mopidy-spotify-${version}";
-  version = "3.0.0";
+  version = "3.1.0";
 
   src = fetchurl {
     url = "https://github.com/mopidy/mopidy-spotify/archive/v${version}.tar.gz";
-    sha256 = "0w7bhq6nz2xly5g72xd98r7lyzmx7nzfdpghk7vklkx0x41qccz8";
+    sha256 = "1mh87w4j0ypvsrnax7kkjgfxfpnw3l290jvfzg56b8qlwf20khjl";
   };
 
   propagatedBuildInputs = [ mopidy pythonPackages.pyspotify ];

From 5eac427ff27a75b919050f38645ad0196572812c Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sun, 18 Jun 2017 13:52:49 +0800
Subject: [PATCH 077/189] kde-frameworks: 5.33 -> 5.34

---
 .../libraries/kde-frameworks/fetch.sh         |   2 +-
 .../libraries/kde-frameworks/srcs.nix         | 592 +++++++++---------
 2 files changed, 297 insertions(+), 297 deletions(-)

diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh
index 361426d1de6..1be04bf3cb7 100644
--- a/pkgs/development/libraries/kde-frameworks/fetch.sh
+++ b/pkgs/development/libraries/kde-frameworks/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( http://download.kde.org/stable/frameworks/5.33/ -A '*.tar.xz' )
+WGET_ARGS=( http://download.kde.org/stable/frameworks/5.34/ -A '*.tar.xz' )
diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix
index ebcc4fc7c38..88a943c4fcd 100644
--- a/pkgs/development/libraries/kde-frameworks/srcs.nix
+++ b/pkgs/development/libraries/kde-frameworks/srcs.nix
@@ -3,595 +3,595 @@
 
 {
   attica = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/attica-5.33.0.tar.xz";
-      sha256 = "1dr5yhg0cy4b6k91mk6w090zjizgxaa808h799m14jqzgj63z5d6";
-      name = "attica-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/attica-5.34.0.tar.xz";
+      sha256 = "0l8gmsmpwzg6nzwwlnsdl6r6qkhnhirpmrkag9xpd2sbmy734x53";
+      name = "attica-5.34.0.tar.xz";
     };
   };
   baloo = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/baloo-5.33.0.tar.xz";
-      sha256 = "174my99i5mggab98l38y2bk27xp25mpz58rl8rhnb3wsbgxcx7iz";
-      name = "baloo-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/baloo-5.34.0.tar.xz";
+      sha256 = "0z53lnniq9xdk09d73z0p1xs1qmaf71m4znm4hmq956yg4yqa1ya";
+      name = "baloo-5.34.0.tar.xz";
     };
   };
   bluez-qt = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/bluez-qt-5.33.0.tar.xz";
-      sha256 = "0cpkdv4k68f0rcg3j91418i59dmc94qlnv3xk1chq0fdi0cssrri";
-      name = "bluez-qt-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/bluez-qt-5.34.0.tar.xz";
+      sha256 = "040gs2a1fx996gqdx2pwxh00szb1vb85055z946nqvqfn01921df";
+      name = "bluez-qt-5.34.0.tar.xz";
     };
   };
   breeze-icons = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/breeze-icons-5.33.0.tar.xz";
-      sha256 = "07nb4xq00fw50r4vf10npa2z690rwkmlxdy42lxx3ixci4qw4204";
-      name = "breeze-icons-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/breeze-icons-5.34.0.tar.xz";
+      sha256 = "1znzlggb6yrkw5rr2n75g7cfv9x5p9d55hss09c4i79lxrh1bk4a";
+      name = "breeze-icons-5.34.0.tar.xz";
     };
   };
   extra-cmake-modules = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/extra-cmake-modules-5.33.0.tar.xz";
-      sha256 = "013adgrz8s0w7a7z2ahkv28cq4c2cy00cw6y8akpkxazqhv5xzzk";
-      name = "extra-cmake-modules-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/extra-cmake-modules-5.34.0.tar.xz";
+      sha256 = "1r3dyvrv77xrpjlzpa6yazwkknirvx1ccvdyj9x0mlk4vfi05nh5";
+      name = "extra-cmake-modules-5.34.0.tar.xz";
     };
   };
   frameworkintegration = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/frameworkintegration-5.33.0.tar.xz";
-      sha256 = "01c1jq77hm3v5xi84gn5hymlnnn1igcpz9v49yxgyvnihlblb1ll";
-      name = "frameworkintegration-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/frameworkintegration-5.34.0.tar.xz";
+      sha256 = "0hq1r2znjzy0wzm3nsclqmih1aia5300bsf87a2l4919q0ildb20";
+      name = "frameworkintegration-5.34.0.tar.xz";
     };
   };
   kactivities = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kactivities-5.33.0.tar.xz";
-      sha256 = "092gk0zn15qm4pihxf1h4qn2n618wp43k67ffy3saw4fadqmxpsz";
-      name = "kactivities-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kactivities-5.34.0.tar.xz";
+      sha256 = "0dg6bkdxf4sicij4szmi55npn6chp0sfmw27qi1s582ymqzjgf5m";
+      name = "kactivities-5.34.0.tar.xz";
     };
   };
   kactivities-stats = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kactivities-stats-5.33.0.tar.xz";
-      sha256 = "1269nh4l94b3yxyvzdjw6vb8pxjylrvnrv28vnar8dmx0sbh5jpf";
-      name = "kactivities-stats-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kactivities-stats-5.34.0.tar.xz";
+      sha256 = "1dfaq4hsd9wm1ka45dkxbl9wwr7s5ixbnnghqwxhl7a60imc680r";
+      name = "kactivities-stats-5.34.0.tar.xz";
     };
   };
   kapidox = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kapidox-5.33.0.tar.xz";
-      sha256 = "162x868dwl92361ss1dxv0gqh8g4apshcgb1ww4nizy239mfj8h0";
-      name = "kapidox-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kapidox-5.34.0.tar.xz";
+      sha256 = "190d5z6i71jrvfna6vnlim2p9rgc33s1fxl0zarn276683i1rwvg";
+      name = "kapidox-5.34.0.tar.xz";
     };
   };
   karchive = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/karchive-5.33.0.tar.xz";
-      sha256 = "0i5grm0dhm9z6fd63ppykd6vl45k5nam4q8w1psrz7vjmr6sd924";
-      name = "karchive-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/karchive-5.34.0.tar.xz";
+      sha256 = "0g8jskdar2znviwh9bs3kia093wgfnhl04x4jcg2rvh78ylkpvxw";
+      name = "karchive-5.34.0.tar.xz";
     };
   };
   kauth = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kauth-5.33.0.tar.xz";
-      sha256 = "1lfi4w4jgc9m83q6v3jf8p91x12vvcc3g59dlg7dh2agrh07r9y7";
-      name = "kauth-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kauth-5.34.0.tar.xz";
+      sha256 = "06cw1bsp7inh5wglajm8aahy17p35ixgnijb7d74gjqzbj4cv93d";
+      name = "kauth-5.34.0.tar.xz";
     };
   };
   kbookmarks = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kbookmarks-5.33.0.tar.xz";
-      sha256 = "186difbzrpqlbi140ylkzb50d3fmn2pdz8i0r3gbc71726fqld82";
-      name = "kbookmarks-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kbookmarks-5.34.0.tar.xz";
+      sha256 = "0ggn4rz8ch82ph64q6yik9fb1mp6kmsd7n33p769zl1lw7fldn0v";
+      name = "kbookmarks-5.34.0.tar.xz";
     };
   };
   kcmutils = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kcmutils-5.33.0.tar.xz";
-      sha256 = "0n0cmjxlp0kkgrxng2ympnl1v5a1bjr2d9c20hf31xhvmya3y9nd";
-      name = "kcmutils-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kcmutils-5.34.0.tar.xz";
+      sha256 = "1b52lwn7qjqrn06va7j1jswlzs6bx0drs90myf3607k52ffbf4hy";
+      name = "kcmutils-5.34.0.tar.xz";
     };
   };
   kcodecs = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kcodecs-5.33.0.tar.xz";
-      sha256 = "1pdijdlrl9p5w6dixqx0lmkzwsk5xarzjhpwh616j2sinfra0w31";
-      name = "kcodecs-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kcodecs-5.34.0.tar.xz";
+      sha256 = "0k51s4qlf0kq6i8f3wrsz5lrkzjqb1j26hrmlmg57vn91r58iash";
+      name = "kcodecs-5.34.0.tar.xz";
     };
   };
   kcompletion = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kcompletion-5.33.0.tar.xz";
-      sha256 = "13mv5mm90jv4k56h4n6d7r2a0pax2mhdrm51xd99fjynad129lhi";
-      name = "kcompletion-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kcompletion-5.34.0.tar.xz";
+      sha256 = "18hvdk5b1nkh6b3vx0jajri57rl266b0qjsiwirh5wmjc81xbpcw";
+      name = "kcompletion-5.34.0.tar.xz";
     };
   };
   kconfig = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kconfig-5.33.0.tar.xz";
-      sha256 = "1inhpil19pv3jjf7mz4f5g367n1ciiixndij10p1zxk5zy46zzmf";
-      name = "kconfig-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kconfig-5.34.0.tar.xz";
+      sha256 = "0blbx6b3fk6p8cv2iywk2avn9w1411bb0g5wwv456a9ggi01988x";
+      name = "kconfig-5.34.0.tar.xz";
     };
   };
   kconfigwidgets = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kconfigwidgets-5.33.0.tar.xz";
-      sha256 = "0sd974r7xrpnhyqabgix0zb1rlis32ijj0wiabbqi4ns0nhhi3qf";
-      name = "kconfigwidgets-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kconfigwidgets-5.34.0.tar.xz";
+      sha256 = "0h4kappsffrp2qgg8wza1ybgah2dlcgpz591llfvaz31ldsml9hk";
+      name = "kconfigwidgets-5.34.0.tar.xz";
     };
   };
   kcoreaddons = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kcoreaddons-5.33.0.tar.xz";
-      sha256 = "1906jscfc2kpd22d7yk88ziy3ky3hcfxy5y593pfzjl41gyhsiyl";
-      name = "kcoreaddons-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kcoreaddons-5.34.0.tar.xz";
+      sha256 = "1ybr4bv8rhp4cxpf8mfsc4dk0klzrfh1z8g2cw6zasmksxmmwi90";
+      name = "kcoreaddons-5.34.0.tar.xz";
     };
   };
   kcrash = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kcrash-5.33.0.tar.xz";
-      sha256 = "136wlvaf4r54k8x0z0jvs7l35m0v22y6zqkhc8f91dr1y2ym2jnk";
-      name = "kcrash-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kcrash-5.34.0.tar.xz";
+      sha256 = "1cshay7dhbqgh62nq85vd9sm20gq9s9f70mdnzjjh1q7cajybkp3";
+      name = "kcrash-5.34.0.tar.xz";
     };
   };
   kdbusaddons = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kdbusaddons-5.33.0.tar.xz";
-      sha256 = "1xxbmr88w7hqxsrhjbgic0pn4adkydhv9xd77vwbzjj47123mph2";
-      name = "kdbusaddons-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kdbusaddons-5.34.0.tar.xz";
+      sha256 = "1skblxfnjhbyiwavsfhksc2ybc2sikw3xr0js6mlfbpmvqzghn6h";
+      name = "kdbusaddons-5.34.0.tar.xz";
     };
   };
   kdeclarative = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kdeclarative-5.33.0.tar.xz";
-      sha256 = "1333vv6kbdk4sdkkc8lnncgmm3203ca8ybn9nj6ch3zqwyxcaagk";
-      name = "kdeclarative-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kdeclarative-5.34.0.tar.xz";
+      sha256 = "1mfj32p631zvwz9ldk8536ifb4n825zxbhx69bfllhw2vn1am7z2";
+      name = "kdeclarative-5.34.0.tar.xz";
     };
   };
   kded = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kded-5.33.0.tar.xz";
-      sha256 = "02g66ip0d0cwb8grb6f3z1j7178w76pfs2f8d2dl1rax4hnjppd0";
-      name = "kded-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kded-5.34.0.tar.xz";
+      sha256 = "0qy4w7bcg60gyf6y6c11kqcshnld55a8w4fzglpwgqfbliyi5yzq";
+      name = "kded-5.34.0.tar.xz";
     };
   };
   kdelibs4support = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/portingAids/kdelibs4support-5.33.0.tar.xz";
-      sha256 = "1gyyvp4kqnjaf764y2z24jk68h5h0ax1z9h25msczy6bd4ify5v9";
-      name = "kdelibs4support-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/portingAids/kdelibs4support-5.34.0.tar.xz";
+      sha256 = "0q9jjsjcvc43va4yvfay2xi40vb95lnqhgzavpqcndzjihixwmi0";
+      name = "kdelibs4support-5.34.0.tar.xz";
     };
   };
   kdesignerplugin = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kdesignerplugin-5.33.0.tar.xz";
-      sha256 = "1f4f53xag6xbvacpn5j0zrsdwimksnckdza6kswcri5q258yb6ks";
-      name = "kdesignerplugin-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kdesignerplugin-5.34.0.tar.xz";
+      sha256 = "1jnarg7wrhdjfq73q4wplazxsz927mpf0l6m0i4akq4dlp1b7aah";
+      name = "kdesignerplugin-5.34.0.tar.xz";
     };
   };
   kdesu = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kdesu-5.33.0.tar.xz";
-      sha256 = "06scns6jgs372xx7fssdj63110nrnvy9dmm1k7gc0pyhn0a5yk8a";
-      name = "kdesu-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kdesu-5.34.0.tar.xz";
+      sha256 = "04mx0d6kf8slgkkgbna3cyv4c491jvlwcwqxc7zikz0i03l341id";
+      name = "kdesu-5.34.0.tar.xz";
     };
   };
   kdewebkit = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kdewebkit-5.33.0.tar.xz";
-      sha256 = "0lxca56ib5pldc6f3z2gw05jbi2kyd9rqp52pgzfs4kgvvs6gblh";
-      name = "kdewebkit-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kdewebkit-5.34.0.tar.xz";
+      sha256 = "155rn5bib4jq1ml35l4hll9cv30bp83wva4kgrhfc4y8cp46p9wk";
+      name = "kdewebkit-5.34.0.tar.xz";
     };
   };
   kdnssd = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kdnssd-5.33.0.tar.xz";
-      sha256 = "11pnh18z030zzkiibvd9lfp5i194qwk3pccncc9968nnc0bgghxa";
-      name = "kdnssd-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kdnssd-5.34.0.tar.xz";
+      sha256 = "082mdim9wykdap4fmjfayk443rbarsk1p8cn3mspx2nw047yja80";
+      name = "kdnssd-5.34.0.tar.xz";
     };
   };
   kdoctools = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kdoctools-5.33.0.tar.xz";
-      sha256 = "04d48gi5d273x3p7572szlpyiz8iyw1ic53b9jblhyfyp93gvpb9";
-      name = "kdoctools-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kdoctools-5.34.0.tar.xz";
+      sha256 = "145jjhsd0whmcj91zbjz2b1jyj4wasw60hbwyd4xvqds8cp0l02h";
+      name = "kdoctools-5.34.0.tar.xz";
     };
   };
   kemoticons = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kemoticons-5.33.0.tar.xz";
-      sha256 = "0p9320zln553wi055ql04j8kk329l3wiksprg9rkgzya2gynflyl";
-      name = "kemoticons-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kemoticons-5.34.0.tar.xz";
+      sha256 = "02h12qy0w6mcgkczi3md1znnvp7r47l8h416nd080ljpsydalgx8";
+      name = "kemoticons-5.34.0.tar.xz";
     };
   };
   kfilemetadata = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kfilemetadata-5.33.0.tar.xz";
-      sha256 = "1bbw1h8kml8glnck8hh4s13abbksw2fa7g93p25vbhdcyr7zgkr0";
-      name = "kfilemetadata-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kfilemetadata-5.34.0.tar.xz";
+      sha256 = "1rvlg6by8daiq5ff3qlxcw9k2iq4qicsj0c8a00xfy3w4h9ip9h5";
+      name = "kfilemetadata-5.34.0.tar.xz";
     };
   };
   kglobalaccel = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kglobalaccel-5.33.0.tar.xz";
-      sha256 = "0hc46vwiz81iqzkrc0qahd7gn71kh5wc32kjvh6h4ijlnfmdih07";
-      name = "kglobalaccel-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kglobalaccel-5.34.0.tar.xz";
+      sha256 = "1i32dq70qxjbfvlw0wqxvqvl6ysydmpg3zbiflff4z1qrmvmpw6a";
+      name = "kglobalaccel-5.34.0.tar.xz";
     };
   };
   kguiaddons = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kguiaddons-5.33.0.tar.xz";
-      sha256 = "171lvykvznrrqdi1frm9akzx5rsrj04vvav3sv64x7hfsas0a7p1";
-      name = "kguiaddons-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kguiaddons-5.34.0.tar.xz";
+      sha256 = "1nmlwvy2jdmh0m6bmahvk68vl2rs9s28c10dkncpi6gvhsdkigqx";
+      name = "kguiaddons-5.34.0.tar.xz";
     };
   };
   khtml = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/portingAids/khtml-5.33.0.tar.xz";
-      sha256 = "0j9viw8fydh1x548wx39bphk5bf11fyrghshxz14a79rll8w7qmc";
-      name = "khtml-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/portingAids/khtml-5.34.0.tar.xz";
+      sha256 = "0j490jfnz8pbfl1i11wj514nw0skpnxr2fvi9pqpfql9lfhsanxv";
+      name = "khtml-5.34.0.tar.xz";
     };
   };
   ki18n = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/ki18n-5.33.0.tar.xz";
-      sha256 = "02xf9q3vnw8nn2if6a3pfj8v96414j7gnc6097k0wxfyis9i46k1";
-      name = "ki18n-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/ki18n-5.34.0.tar.xz";
+      sha256 = "0glvmmy01mp6hnix79aichgwjq842kgf5q5zynkg6mch85y4ary7";
+      name = "ki18n-5.34.0.tar.xz";
     };
   };
   kiconthemes = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kiconthemes-5.33.0.tar.xz";
-      sha256 = "1zys55d7jjjjllyi9p4difnr6xg9580bgcg5pnm966ak6zhj6682";
-      name = "kiconthemes-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kiconthemes-5.34.0.tar.xz";
+      sha256 = "0hbl82r6qc8dh9v9n9xjkx966czkq5yjxx2rx7sbilj2p9v3saii";
+      name = "kiconthemes-5.34.0.tar.xz";
     };
   };
   kidletime = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kidletime-5.33.0.tar.xz";
-      sha256 = "0z6i224kmj9l15x923pa30mlhjw66chm9v8qvzg1vhmk36jyw789";
-      name = "kidletime-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kidletime-5.34.0.tar.xz";
+      sha256 = "0z8x6iz52y2m8llsp2q4qayxswkzay7ksimzy47crfag442bw24g";
+      name = "kidletime-5.34.0.tar.xz";
     };
   };
   kimageformats = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kimageformats-5.33.0.tar.xz";
-      sha256 = "1m9d51pvrc7fa38mp4jn4cdn558nd6kvik3ry6gvv8im67qyq4ga";
-      name = "kimageformats-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kimageformats-5.34.0.tar.xz";
+      sha256 = "0q9ng4clqk2dqw43nk1pmq1d61rahc3qr4dmg4y3kjvz3ahnnijw";
+      name = "kimageformats-5.34.0.tar.xz";
     };
   };
   kinit = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kinit-5.33.0.tar.xz";
-      sha256 = "0v3dcgbi5qwg9nmn668r2v1b257qhmkdb2l3p7hhx06ygypk4yjp";
-      name = "kinit-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kinit-5.34.0.tar.xz";
+      sha256 = "08429kjihpaip73wszr3rsii8sdlwgm3kxx7g0hpjhkj9d2jq3m1";
+      name = "kinit-5.34.0.tar.xz";
     };
   };
   kio = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kio-5.33.0.tar.xz";
-      sha256 = "1pls5yjkhz7fkawks4c0lmsix0nafv7hyp33yh7dm4hijd8zy5cf";
-      name = "kio-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kio-5.34.0.tar.xz";
+      sha256 = "1i23ld5b9gafh2x3lv79jbggbd92xyhk7rg3n765w3bsfpg2ijva";
+      name = "kio-5.34.0.tar.xz";
     };
   };
   kitemmodels = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kitemmodels-5.33.0.tar.xz";
-      sha256 = "1ma21qydbmj2qr4ib4qv13wip99lq3lm8d6p137bg9x6nqfa4qzn";
-      name = "kitemmodels-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kitemmodels-5.34.0.tar.xz";
+      sha256 = "1liq1ppa7xb1dcncv25c2a0xy3l9bvb2a56cff90c0b0vwr239q5";
+      name = "kitemmodels-5.34.0.tar.xz";
     };
   };
   kitemviews = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kitemviews-5.33.0.tar.xz";
-      sha256 = "1nc07lxh37l1fwz6xmsrcplimgmrna9ij2dq3pnfrxr319c29890";
-      name = "kitemviews-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kitemviews-5.34.0.tar.xz";
+      sha256 = "054accbis471zj1gbfxbc99062r2hvpb04i6w3r8fa4ml8s6brqk";
+      name = "kitemviews-5.34.0.tar.xz";
     };
   };
   kjobwidgets = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kjobwidgets-5.33.0.tar.xz";
-      sha256 = "01adg7axi1bp59z1c7xnxg2p1ahhrzxwxrjn3ci805m8ns6d40cz";
-      name = "kjobwidgets-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kjobwidgets-5.34.0.tar.xz";
+      sha256 = "0lrx761vf947mb2q1l2jgi0wgwj8cz2nn1xg0j38bh99sgddmzpf";
+      name = "kjobwidgets-5.34.0.tar.xz";
     };
   };
   kjs = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/portingAids/kjs-5.33.0.tar.xz";
-      sha256 = "1w0kdxnzcwmgskl4qsw6aq5189yxqyhq9qajihr2yga0hyglf3iv";
-      name = "kjs-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/portingAids/kjs-5.34.0.tar.xz";
+      sha256 = "18b7k1hi73iqn06c1ryy9lcmvscr9d08q7n1wwkrn0l2xmy05xsq";
+      name = "kjs-5.34.0.tar.xz";
     };
   };
   kjsembed = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/portingAids/kjsembed-5.33.0.tar.xz";
-      sha256 = "1vk2m8i315nrys9c4kk3hdlp8hdn2ils0lb8v4nnkvbj3s1f4a8p";
-      name = "kjsembed-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/portingAids/kjsembed-5.34.0.tar.xz";
+      sha256 = "17w8i370pqks1fj3pcziz7j014chnc6yi7md7w2p4xprw54pbmbk";
+      name = "kjsembed-5.34.0.tar.xz";
     };
   };
   kmediaplayer = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/portingAids/kmediaplayer-5.33.0.tar.xz";
-      sha256 = "13xpvi0vxd3vva2d64x8l1knj270al4329kwf9xaays66g6gshgs";
-      name = "kmediaplayer-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/portingAids/kmediaplayer-5.34.0.tar.xz";
+      sha256 = "1mq87qf86sdvwhas4w7rspd221qp4x9kds4nd0lpldiay4483k86";
+      name = "kmediaplayer-5.34.0.tar.xz";
     };
   };
   knewstuff = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/knewstuff-5.33.0.tar.xz";
-      sha256 = "1j4jj2k6jngcp98mfxq1cdp7x0j43rgr5gxn9viqp92liak68lsh";
-      name = "knewstuff-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/knewstuff-5.34.0.tar.xz";
+      sha256 = "19d53ylwr92dzl9agk4j765zvb897rcm55z7pr6841aj58jk9b82";
+      name = "knewstuff-5.34.0.tar.xz";
     };
   };
   knotifications = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/knotifications-5.33.0.tar.xz";
-      sha256 = "17ppfwhl3mqd3l4r56whqcxagx6br02hdwlqy7npn32g797hkayd";
-      name = "knotifications-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/knotifications-5.34.0.tar.xz";
+      sha256 = "12z5hza0n5zr6mv3gkwhzb8zkrmk6dvgq8hrzwm8rzkgphjr6pi9";
+      name = "knotifications-5.34.0.tar.xz";
     };
   };
   knotifyconfig = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/knotifyconfig-5.33.0.tar.xz";
-      sha256 = "0m9fdvbakv0plq3m7sj6wj980wfd3m37cabximz9gmi0zkcadzmw";
-      name = "knotifyconfig-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/knotifyconfig-5.34.0.tar.xz";
+      sha256 = "0lwl22vq770jyp45j32s0ss8yiqdwbink6cdhkbapg3pzbiwklyk";
+      name = "knotifyconfig-5.34.0.tar.xz";
     };
   };
   kpackage = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kpackage-5.33.0.tar.xz";
-      sha256 = "03ls567fj54fzibc8fafffas97abyanl0sn041z51sr7mjp425cs";
-      name = "kpackage-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kpackage-5.34.0.tar.xz";
+      sha256 = "0wdymhcrjggxb7andz36cfk9f240vvbq5yahlxyhfp9z69lriw5q";
+      name = "kpackage-5.34.0.tar.xz";
     };
   };
   kparts = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kparts-5.33.0.tar.xz";
-      sha256 = "0fd0dqmaf8ksx3czzihjd4z0yg682a9bcy09vdhj2grki7w9fxha";
-      name = "kparts-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kparts-5.34.0.tar.xz";
+      sha256 = "1a5n0f7ljdc2bm6vggzwbvpblyxjqn9m9pam70iab964pqqalgp7";
+      name = "kparts-5.34.0.tar.xz";
     };
   };
   kpeople = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kpeople-5.33.0.tar.xz";
-      sha256 = "19vag6ci82jh5lw5c7734rlp89wr7xb0d8as98ykz2wmkk0mqql7";
-      name = "kpeople-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kpeople-5.34.0.tar.xz";
+      sha256 = "0krm74dl80s48nhiygga4dvkvqqimxdx4nczbk4qvj7j1g9p2rsh";
+      name = "kpeople-5.34.0.tar.xz";
     };
   };
   kplotting = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kplotting-5.33.0.tar.xz";
-      sha256 = "0niqhj270l36il3ql6xljg9gbb0yw25ky8wsc7l0021mxvhficri";
-      name = "kplotting-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kplotting-5.34.0.tar.xz";
+      sha256 = "1ffy9b08128ym024wlfgnzk52vpy0mbaa91dhndpr40qcz0i67sh";
+      name = "kplotting-5.34.0.tar.xz";
     };
   };
   kpty = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kpty-5.33.0.tar.xz";
-      sha256 = "0xcmqdphqy2a44bksqiv8cjlzfkjpbpazfk5f8ml97vdqvwa6qp5";
-      name = "kpty-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kpty-5.34.0.tar.xz";
+      sha256 = "00k5hhz7nf3nf47xb003ni1chi03imyrfajap6ay4zp90l8fr950";
+      name = "kpty-5.34.0.tar.xz";
     };
   };
   kross = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/portingAids/kross-5.33.0.tar.xz";
-      sha256 = "13dldb4df4spsqr3878bimv009fzq4pdvmwlaw753c0lrp97pd9l";
-      name = "kross-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/portingAids/kross-5.34.0.tar.xz";
+      sha256 = "092qz8vyiialv9fvk4wvn8mrfhz5i5hnbq0xnz6nvi1pk3db6bxq";
+      name = "kross-5.34.0.tar.xz";
     };
   };
   krunner = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/krunner-5.33.0.tar.xz";
-      sha256 = "0za052rsqf5kaz1c48k63a905b3x953wi6f07m44m6dm38p5ixq8";
-      name = "krunner-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/krunner-5.34.0.tar.xz";
+      sha256 = "0n527p708k719zgmvvbmp20xmg72f85cll05q05p4h317g7wz6i5";
+      name = "krunner-5.34.0.tar.xz";
     };
   };
   kservice = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kservice-5.33.0.tar.xz";
-      sha256 = "0jqq4ahscnqvzv8inhfzb9s6x97s60c4w8chpg16qwc7dqag887h";
-      name = "kservice-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kservice-5.34.0.tar.xz";
+      sha256 = "0sikwn49s2iq1nj518q55m2p0hvdvwm98cpf0dkjb1z1v6fgjc37";
+      name = "kservice-5.34.0.tar.xz";
     };
   };
   ktexteditor = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/ktexteditor-5.33.0.tar.xz";
-      sha256 = "12fcqcxamkxv38w4j9waqmim7k801v6r6izlyg59iiy56yks4ms5";
-      name = "ktexteditor-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/ktexteditor-5.34.0.tar.xz";
+      sha256 = "182a0swfgdqr0faq3ksk6hlfvdi1afd0hpys5vayjjf263m19xxw";
+      name = "ktexteditor-5.34.0.tar.xz";
     };
   };
   ktextwidgets = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/ktextwidgets-5.33.0.tar.xz";
-      sha256 = "09rjr3655pbzwgjsmwbjsm7jwrxydl2jwhgbk8ziv1bgcg6cjrjy";
-      name = "ktextwidgets-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/ktextwidgets-5.34.0.tar.xz";
+      sha256 = "1hri34b373bww5gv14qli2nm77k05pk170nbb2vv2zvzv93g25gw";
+      name = "ktextwidgets-5.34.0.tar.xz";
     };
   };
   kunitconversion = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kunitconversion-5.33.0.tar.xz";
-      sha256 = "0bflic2va9bc17q0smc4dzmgh72cjfjjaahhsvvnj54g2qggznkq";
-      name = "kunitconversion-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kunitconversion-5.34.0.tar.xz";
+      sha256 = "0v4x0flbfavrzfiqh71mdkqgp1fzk4f52msvq6w60i2s3sz7hcsm";
+      name = "kunitconversion-5.34.0.tar.xz";
     };
   };
   kwallet = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kwallet-5.33.0.tar.xz";
-      sha256 = "1jpybsksai9gm2bihcgl5m56rjfd0crj9i8j0l2s4vmmzxyflczj";
-      name = "kwallet-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kwallet-5.34.0.tar.xz";
+      sha256 = "08z3ddsam5n5qn2svscp4hgksf6qd1h8lqw1v382p01nnmhxadz5";
+      name = "kwallet-5.34.0.tar.xz";
     };
   };
   kwayland = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kwayland-5.33.0.tar.xz";
-      sha256 = "18nvdhfijnvzjiy0vjmqvf2nwz64ymxpnhlhs75y1d2ib8rm8qfq";
-      name = "kwayland-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kwayland-5.34.0.tar.xz";
+      sha256 = "1zxb9ram47vbiik8h0czyvacrdiijhnslkpcm61l4r1rb0ybb0ib";
+      name = "kwayland-5.34.0.tar.xz";
     };
   };
   kwidgetsaddons = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kwidgetsaddons-5.33.0.tar.xz";
-      sha256 = "1dnspi7zf57lsihdynbik2iwvnhv8098vqyz0rps8s8pnjl7x8k4";
-      name = "kwidgetsaddons-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kwidgetsaddons-5.34.0.tar.xz";
+      sha256 = "0hw87iig75mfgl5p3ph6zkwap31h357bm7rlyv5d9nnp10bq0hfg";
+      name = "kwidgetsaddons-5.34.0.tar.xz";
     };
   };
   kwindowsystem = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kwindowsystem-5.33.0.tar.xz";
-      sha256 = "1dj18774rlpxh9p8a07shhb4dzc0zpv4qvmh4j2y4c1g6v7n6b3p";
-      name = "kwindowsystem-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kwindowsystem-5.34.0.tar.xz";
+      sha256 = "1sp2x7afhw19vmhdp2qyrmljz8h0875xjk95n8c5gzypk7sr0l83";
+      name = "kwindowsystem-5.34.0.tar.xz";
     };
   };
   kxmlgui = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kxmlgui-5.33.0.tar.xz";
-      sha256 = "1q89xsrdhrsz7jb68hq8r3xdmhz0s19zwvd06skn6cfqx7r32ng0";
-      name = "kxmlgui-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kxmlgui-5.34.0.tar.xz";
+      sha256 = "1v8m6qzjqg3ic14a5ki37bf13kifzcbhly68zcxgs5b92hr953iy";
+      name = "kxmlgui-5.34.0.tar.xz";
     };
   };
   kxmlrpcclient = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/kxmlrpcclient-5.33.0.tar.xz";
-      sha256 = "1zc6pn412day923k22br82xypvk24znb0ns1qsdlmrd2cnmv8l28";
-      name = "kxmlrpcclient-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/kxmlrpcclient-5.34.0.tar.xz";
+      sha256 = "0kp3ab50m5jl2jgw883ip67s6gs0l3saprzrqa9r3hydn2c4s3md";
+      name = "kxmlrpcclient-5.34.0.tar.xz";
     };
   };
   modemmanager-qt = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/modemmanager-qt-5.33.0.tar.xz";
-      sha256 = "098l3plck45bn7lph7mfkm03q18zxl1s8aa3pyh6b69wk45r7j54";
-      name = "modemmanager-qt-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/modemmanager-qt-5.34.0.tar.xz";
+      sha256 = "1cf5nsc8h7djvr19fm5dphzplh1wm3asvn0a7r71spg0i7lzi89h";
+      name = "modemmanager-qt-5.34.0.tar.xz";
     };
   };
   networkmanager-qt = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/networkmanager-qt-5.33.0.tar.xz";
-      sha256 = "0pc4n4m93ypx1ryasw8n3bqll7v4yqa3749ir0qi096y5vysdd2m";
-      name = "networkmanager-qt-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/networkmanager-qt-5.34.0.tar.xz";
+      sha256 = "05s0irvkg0g57acriablyha2wb9c7w3xhq223vdddjqpcdx0pnkl";
+      name = "networkmanager-qt-5.34.0.tar.xz";
     };
   };
   oxygen-icons5 = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/oxygen-icons5-5.33.0.tar.xz";
-      sha256 = "17kp66hra0vfkcvd7fh5q23wr040h0z6di4gdrm2zi1w5jbhw9kn";
-      name = "oxygen-icons5-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/oxygen-icons5-5.34.0.tar.xz";
+      sha256 = "0cmxxssir5zbp5nlxq81h2xfd6wrxbbkydyw93dby7r56isl7ga5";
+      name = "oxygen-icons5-5.34.0.tar.xz";
     };
   };
   plasma-framework = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/plasma-framework-5.33.0.tar.xz";
-      sha256 = "0rqm773n2r6vwmv41x27lr2zmx26s5s27ym3a6qy0w18fr86fxsd";
-      name = "plasma-framework-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/plasma-framework-5.34.0.tar.xz";
+      sha256 = "0waicqskfwc8xpmrym165hwlfv6nzbwc783sac5vrhbyk4bwk8x9";
+      name = "plasma-framework-5.34.0.tar.xz";
     };
   };
   prison = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/prison-5.33.0.tar.xz";
-      sha256 = "0hh065294s7sjj34vfwwb8zgagf1sa09l9filadl1ly0ig9f6h1r";
-      name = "prison-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/prison-5.34.0.tar.xz";
+      sha256 = "00wj4yyfhhcq9b54civ5hy1grz70mmi676x50y12crcbbgkxm1lx";
+      name = "prison-5.34.0.tar.xz";
     };
   };
   solid = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/solid-5.33.0.tar.xz";
-      sha256 = "0jb8jjv6mhwriqxfkd9fj0b7y1ab6vnwqi53sk4w4vw53d0wkqxm";
-      name = "solid-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/solid-5.34.0.tar.xz";
+      sha256 = "02kz21p3p1s1rg7gf34fr6ynhji6x97yvsfdpvbfxbhijabbh4ib";
+      name = "solid-5.34.0.tar.xz";
     };
   };
   sonnet = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/sonnet-5.33.0.tar.xz";
-      sha256 = "096ybf95rx5ybvl74nlnn9x2yb2j1akn8g8ywv1vwi2ckfpnp3sd";
-      name = "sonnet-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/sonnet-5.34.0.tar.xz";
+      sha256 = "06gxrh8rb75ydkqxk5dhlmwndnczp264jx588ryfwlf3vlnk99vs";
+      name = "sonnet-5.34.0.tar.xz";
     };
   };
   syntax-highlighting = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/syntax-highlighting-5.33.0.tar.xz";
-      sha256 = "0nn078sw0bkw1m5vsv02n46sc05blg3qnhxpmph2cikz5y86x9jq";
-      name = "syntax-highlighting-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/syntax-highlighting-5.34.0.tar.xz";
+      sha256 = "0ryfwblvzj9rd5jj7l8scmbb49ygzk77ng05hrznsipczin2cjw8";
+      name = "syntax-highlighting-5.34.0.tar.xz";
     };
   };
   threadweaver = {
-    version = "5.33.0";
+    version = "5.34.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.33/threadweaver-5.33.0.tar.xz";
-      sha256 = "16y7irjyyp4smy7nm7j4zc3gk9a046bwxvv51l7rfs7n4z0550ki";
-      name = "threadweaver-5.33.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.34/threadweaver-5.34.0.tar.xz";
+      sha256 = "1gylpl283qf1jcfyib4q5xwnpdq13hnd2cp2i7xjazdw2jp40zhr";
+      name = "threadweaver-5.34.0.tar.xz";
     };
   };
 }

From f151daaa67c63f287066d2c28f85a7820106d30a Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Thu, 15 Jun 2017 13:48:48 +0800
Subject: [PATCH 078/189] plasma: 5.9.5 -> 5.10.2

---
 pkgs/desktops/plasma-5/fetch.sh |   2 +-
 pkgs/desktops/plasma-5/srcs.nix | 336 +++++++++++++++++---------------
 2 files changed, 177 insertions(+), 161 deletions(-)

diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh
index 3553d0f01ea..29a3e3726ad 100644
--- a/pkgs/desktops/plasma-5/fetch.sh
+++ b/pkgs/desktops/plasma-5/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( http://download.kde.org/stable/plasma/5.9.5/ -A '*.tar.xz' )
+WGET_ARGS=( http://download.kde.org/stable/plasma/5.10.2/ -A '*.tar.xz' )
diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix
index 678c44d6e69..899f6a3f63c 100644
--- a/pkgs/desktops/plasma-5/srcs.nix
+++ b/pkgs/desktops/plasma-5/srcs.nix
@@ -3,323 +3,339 @@
 
 {
   bluedevil = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/bluedevil-5.9.5.tar.xz";
-      sha256 = "0szdfim94c9zjq6jl7n6xpnxf7c4b62wk5b6vv1yfday51gi643r";
-      name = "bluedevil-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/bluedevil-5.10.2.tar.xz";
+      sha256 = "1510gjbvyjr4bg00m28hz9ynz7m7h35c859ksq7r1y102kjxgyr7";
+      name = "bluedevil-5.10.2.tar.xz";
     };
   };
   breeze = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/breeze-5.9.5.tar.xz";
-      sha256 = "0g9y0lsx5c3r7qzrdxbanya86lqkbaf5f7has736nqw28a2jncc3";
-      name = "breeze-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/breeze-5.10.2.tar.xz";
+      sha256 = "1wywa8y07ssxvl59xw4xifi41wj9dd594hy17vjigfp1xi7h62br";
+      name = "breeze-5.10.2.tar.xz";
     };
   };
   breeze-grub = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/breeze-grub-5.9.5.tar.xz";
-      sha256 = "02ml0v3srim4vdw1bwycb3wi6ijdvmf1ph0my3w5ci1k5fj402s4";
-      name = "breeze-grub-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/breeze-grub-5.10.2.tar.xz";
+      sha256 = "0xb7gvl1yrh8g75w1f97wvwig99fwqfk8azkpxxhrg8j5nr4vaz2";
+      name = "breeze-grub-5.10.2.tar.xz";
     };
   };
   breeze-gtk = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/breeze-gtk-5.9.5.tar.xz";
-      sha256 = "0na40qrgyml0fc3p8lgxls4zy7ifigns0594q9i3jwfz1izsiprj";
-      name = "breeze-gtk-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/breeze-gtk-5.10.2.tar.xz";
+      sha256 = "06pgbkf078zl57vyfvsmm1bll8g2x419fy2waqh9n7jkycihlinx";
+      name = "breeze-gtk-5.10.2.tar.xz";
     };
   };
   breeze-plymouth = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/breeze-plymouth-5.9.5.tar.xz";
-      sha256 = "1fnqq4f7pr7bwfgrgk1d2qjai178lxsfsxr1jjdx61wrn1fnc3yk";
-      name = "breeze-plymouth-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/breeze-plymouth-5.10.2.tar.xz";
+      sha256 = "0db00k3h7vsp3pf7xnix8kazsw5wcjzkcj1wfkn4c7vdcvfv48pd";
+      name = "breeze-plymouth-5.10.2.tar.xz";
     };
   };
   discover = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/discover-5.9.5.tar.xz";
-      sha256 = "0846xskdy0sv9p76i78cbj7qy2xcq90lir78haiy6s8pfnxc27i3";
-      name = "discover-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/discover-5.10.2.tar.xz";
+      sha256 = "0ky5yk5nknipxy4hamy6i6m46jhv3n1lsmcs149j687jw2l6ryls";
+      name = "discover-5.10.2.tar.xz";
     };
   };
   kactivitymanagerd = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/kactivitymanagerd-5.9.5.tar.xz";
-      sha256 = "0jf0kxwgyc0b3fkr05mz678p99fkr42rljqw57sjq7qhypknzd07";
-      name = "kactivitymanagerd-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/kactivitymanagerd-5.10.2.tar.xz";
+      sha256 = "1x7fc3nszg9fcksyf2c9dyagsa9486ybh6yrrn4c6d6z813479qj";
+      name = "kactivitymanagerd-5.10.2.tar.xz";
     };
   };
   kde-cli-tools = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/kde-cli-tools-5.9.5.tar.xz";
-      sha256 = "196h4gsfqx1338jps1rkvaabi6zmsncv7ywylqvirn6mxrfq7r2n";
-      name = "kde-cli-tools-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/kde-cli-tools-5.10.2.tar.xz";
+      sha256 = "0d1vfxgi0anggjirp1ncaqr1l7rlbniiv74gf5npb3f260h6yr0h";
+      name = "kde-cli-tools-5.10.2.tar.xz";
     };
   };
   kdecoration = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/kdecoration-5.9.5.tar.xz";
-      sha256 = "1vjj8gjh8ig0bxbfjjmyga7rl497yzqdprgpqfkg92g9pxhr2lnl";
-      name = "kdecoration-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/kdecoration-5.10.2.tar.xz";
+      sha256 = "05mg8aacayfx63mx8yb6g1j6wx7kkk21msl33krks7bdqx0jx9kw";
+      name = "kdecoration-5.10.2.tar.xz";
     };
   };
   kde-gtk-config = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/kde-gtk-config-5.9.5.tar.xz";
-      sha256 = "1aafc9zrraqz9x830v9fgyygsqy17iwr2hf2vrcn2ffhw6ix47cy";
-      name = "kde-gtk-config-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/kde-gtk-config-5.10.2.tar.xz";
+      sha256 = "096dfl5nm65v6m4m6r1smwbcxv5fkxnbgrgi17x5lfipa9mmrf58";
+      name = "kde-gtk-config-5.10.2.tar.xz";
     };
   };
   kdeplasma-addons = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/kdeplasma-addons-5.9.5.tar.xz";
-      sha256 = "107j3szxslc4cqin2f32y25lbwyi0a6lqsp9739113zr0jjrwlll";
-      name = "kdeplasma-addons-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/kdeplasma-addons-5.10.2.tar.xz";
+      sha256 = "1yznzz0yrjckv4b1h58fsn0sww5iwmkqvsajdqhgzqw1cs4v98p0";
+      name = "kdeplasma-addons-5.10.2.tar.xz";
     };
   };
   kgamma5 = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/kgamma5-5.9.5.tar.xz";
-      sha256 = "1kzqix97qh17lfz9ksqywmas630aw0z4y44mcwp34w9gp79i5dj5";
-      name = "kgamma5-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/kgamma5-5.10.2.tar.xz";
+      sha256 = "0hwnn057jbqpzbp8jryfcdp2qlypmyvh5zmfay8iy9vy068zzcmc";
+      name = "kgamma5-5.10.2.tar.xz";
     };
   };
   khotkeys = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/khotkeys-5.9.5.tar.xz";
-      sha256 = "05y6kbcbalvlrldm9kfkj9aj0r6nbyj1gbj28g37jv58l6qc75d9";
-      name = "khotkeys-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/khotkeys-5.10.2.tar.xz";
+      sha256 = "1kdvdb5i0mjrv4h4m539kikdrb0vybgphaahxk4392npv2zqz1xs";
+      name = "khotkeys-5.10.2.tar.xz";
     };
   };
   kinfocenter = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/kinfocenter-5.9.5.tar.xz";
-      sha256 = "0jbi3qavqwvx691biy8gbq4m2c3ksy6p1hpyi41qaaczksr3fvsg";
-      name = "kinfocenter-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/kinfocenter-5.10.2.tar.xz";
+      sha256 = "1r0q8xmb9m0xgcw21a6klagfh560ywzdcnly6r36fpwj0hjv60hj";
+      name = "kinfocenter-5.10.2.tar.xz";
     };
   };
   kmenuedit = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/kmenuedit-5.9.5.tar.xz";
-      sha256 = "1mfy1z70zfw3x40h8qjp49i7pp5c5fprh7znwwj4hk2qkn1zrn0j";
-      name = "kmenuedit-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/kmenuedit-5.10.2.tar.xz";
+      sha256 = "0dcy5r829dpzfmkqzmcbwxv5bqdamq0lvz7khd0n08f4h7a32wnz";
+      name = "kmenuedit-5.10.2.tar.xz";
     };
   };
   kscreen = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/kscreen-5.9.5.tar.xz";
-      sha256 = "1df0h1js6b6060cxm27sp70lvk8fak14ibzzrm6f3yv32wlzxwfi";
-      name = "kscreen-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/kscreen-5.10.2.tar.xz";
+      sha256 = "0304vi87xq7p8l6dibgb74dzcf7721nps18cm6p9a05nnlvpr1l7";
+      name = "kscreen-5.10.2.tar.xz";
     };
   };
   kscreenlocker = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/kscreenlocker-5.9.5.tar.xz";
-      sha256 = "1hf0zgfdgd7vinmbk2k73w6mpfbfv830kqfvw23qk4nrrap131bi";
-      name = "kscreenlocker-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/kscreenlocker-5.10.2.tar.xz";
+      sha256 = "079vkca9q509qg5qq4kwlzl3dmnqrigs0xm6vyz000589cpg6ib5";
+      name = "kscreenlocker-5.10.2.tar.xz";
     };
   };
   ksshaskpass = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/ksshaskpass-5.9.5.tar.xz";
-      sha256 = "1ilydfc64s2yc5xrqcc0k2s9ijnppql32dkb9cpmwfqi608digi1";
-      name = "ksshaskpass-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/ksshaskpass-5.10.2.tar.xz";
+      sha256 = "1mjbpsaj3qyrd7f5yqnw0y81d8srjjd537sx7yjgvyijaf2v0vyz";
+      name = "ksshaskpass-5.10.2.tar.xz";
     };
   };
   ksysguard = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/ksysguard-5.9.5.tar.xz";
-      sha256 = "1dhzkm3rc8rl92ym0mampf49p8ippbpfbwcvwzg6rakhxxifd4q6";
-      name = "ksysguard-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/ksysguard-5.10.2.tar.xz";
+      sha256 = "1ndz3l91chq1n3p9xrw57mkdxa7hw778baydk8y9pbdr2yr961cv";
+      name = "ksysguard-5.10.2.tar.xz";
     };
   };
   kwallet-pam = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/kwallet-pam-5.9.5.tar.xz";
-      sha256 = "0nchpbw5yxy7vsz3mx1mx5hk36yvwqarnzzigssh1kz1r19jn6rn";
-      name = "kwallet-pam-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/kwallet-pam-5.10.2.tar.xz";
+      sha256 = "01ki2rfn4sw8m8qh7lwwikcr9kxwiv9x7mv86h86ssd1hfzwzhda";
+      name = "kwallet-pam-5.10.2.tar.xz";
     };
   };
   kwayland-integration = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/kwayland-integration-5.9.5.tar.xz";
-      sha256 = "07la7q6dvmysdv6clk2siq1c3b9jbx5kblgc5qf3233bg57hqw7r";
-      name = "kwayland-integration-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/kwayland-integration-5.10.2.tar.xz";
+      sha256 = "1fna7llnimcqvzhmxb93m92gvicjiddqxd9lwqgyv7fww6bhsj3a";
+      name = "kwayland-integration-5.10.2.tar.xz";
     };
   };
   kwin = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/kwin-5.9.5.tar.xz";
-      sha256 = "13f9drny8lxpxmgqmirk7k0zapx6bp74jyxxzh7ii36davlhckjd";
-      name = "kwin-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/kwin-5.10.2.tar.xz";
+      sha256 = "1gvby6k865snh6hsrnk53hwhb3242iamclz9nq9fzgy23a6g8mzj";
+      name = "kwin-5.10.2.tar.xz";
     };
   };
   kwrited = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/kwrited-5.9.5.tar.xz";
-      sha256 = "1spcsixpcn4g4dm5c1hfqfpkkmma3fgdx0bkm2zzh5q72jzl3bda";
-      name = "kwrited-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/kwrited-5.10.2.tar.xz";
+      sha256 = "1hz6p6il839c28bkf2bn9fqjpipiqdxk603v0h0iqvspfj00z7n8";
+      name = "kwrited-5.10.2.tar.xz";
     };
   };
   libkscreen = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/libkscreen-5.9.5.tar.xz";
-      sha256 = "1sq078ri8vz3s4r606n3i9j9cb4drga2mwwa5glkirnazps32004";
-      name = "libkscreen-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/libkscreen-5.10.2.tar.xz";
+      sha256 = "0w1adz5c32si1kcmxy015wzjxkln68f0inya2499jag2v9hd3vhn";
+      name = "libkscreen-5.10.2.tar.xz";
     };
   };
   libksysguard = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/libksysguard-5.9.5.tar.xz";
-      sha256 = "0b0lvpss5sdjnxbrwaa5w7x87mzpbk23n2ly5vyg6imcycnxh7kw";
-      name = "libksysguard-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/libksysguard-5.10.2.tar.xz";
+      sha256 = "1x13mb3c5bzbi5nw3ahgy12x1df50qirr2h4c7igacxrv4m3zrih";
+      name = "libksysguard-5.10.2.tar.xz";
     };
   };
   milou = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/milou-5.9.5.tar.xz";
-      sha256 = "1qzqa26sxggpqw4jkrjasf20xfijpjyjg7x96bvbjs1gcp1fi9gw";
-      name = "milou-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/milou-5.10.2.tar.xz";
+      sha256 = "06c4pb3gls1bgk1sffh6vj035i5vhiy04rmifypcp8gps98j6izw";
+      name = "milou-5.10.2.tar.xz";
     };
   };
   oxygen = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/oxygen-5.9.5.tar.xz";
-      sha256 = "0p73dyyg887by1yi8gjaj366l7vm0p19z10m5fkmhylhmzihv4z3";
-      name = "oxygen-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/oxygen-5.10.2.tar.xz";
+      sha256 = "08d3rdj5vabrxrrlbzhw3ixnb3msm99idbhnpyzdkaw00l444f1p";
+      name = "oxygen-5.10.2.tar.xz";
     };
   };
   plasma-desktop = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/plasma-desktop-5.9.5.tar.xz";
-      sha256 = "1f9mq7q05abj6xgpchzkhghs0mwf7qycjvg3l4c7y7p9hsn3gx71";
-      name = "plasma-desktop-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/plasma-desktop-5.10.2.tar.xz";
+      sha256 = "1mjz52n6jm1vi3v7432g9v9rh6bbgcwkrg12yahpzlz026hsyxrn";
+      name = "plasma-desktop-5.10.2.tar.xz";
     };
   };
   plasma-integration = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/plasma-integration-5.9.5.tar.xz";
-      sha256 = "05qxrrrfhq0m2xq9ig0cgxrl692hmv9lhckhs22m8a1dppsgv10w";
-      name = "plasma-integration-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/plasma-integration-5.10.2.tar.xz";
+      sha256 = "0gzrv3plcn35rkwr7izn0363zbp91rdjw9k8n9s50p9rdx3rx8ly";
+      name = "plasma-integration-5.10.2.tar.xz";
     };
   };
   plasma-nm = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/plasma-nm-5.9.5.tar.xz";
-      sha256 = "1bdg7mnfxffzwp7s4hbmk8zj17408fnwj5z4j68l64lbn1lmwq0w";
-      name = "plasma-nm-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/plasma-nm-5.10.2.tar.xz";
+      sha256 = "0bw5vyzzvpklhgq02yhcq1sv7pz00kffvgvfjkgk45g5x47h7hw1";
+      name = "plasma-nm-5.10.2.tar.xz";
     };
   };
   plasma-pa = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/plasma-pa-5.9.5.tar.xz";
-      sha256 = "0xam3rnd36mvn7021zzs9y5i02ac8c15alnpag8shrsbdv2cbyry";
-      name = "plasma-pa-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/plasma-pa-5.10.2.tar.xz";
+      sha256 = "1bbmlp5i2k4ygcn76frijjxzy88v3m5cpydslv7i5y41apm8bvip";
+      name = "plasma-pa-5.10.2.tar.xz";
     };
   };
   plasma-sdk = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/plasma-sdk-5.9.5.tar.xz";
-      sha256 = "0dvxw7b65pn86qzf9j30c4pw0vi12kasgf7idbgmhzwl17k4i1mx";
-      name = "plasma-sdk-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/plasma-sdk-5.10.2.tar.xz";
+      sha256 = "0npccg4zzrd2cx4qa5qi0yr722x2yh8v0zd8dv76znqf8lsgwpj4";
+      name = "plasma-sdk-5.10.2.tar.xz";
     };
   };
   plasma-tests = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/plasma-tests-5.9.5.tar.xz";
-      sha256 = "06sn7gz5psmnsilhaprqag2ma03kzj24m7r0gf8wdaqgsla05vwg";
-      name = "plasma-tests-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/plasma-tests-5.10.2.tar.xz";
+      sha256 = "1kyah0r138x3i35glb2slacwivdwbwvq19xp1hz2zrmiy52zq65i";
+      name = "plasma-tests-5.10.2.tar.xz";
     };
   };
   plasma-workspace = {
-    version = "5.9.5.1";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/plasma-workspace-5.9.5.1.tar.xz";
-      sha256 = "07lbq3b3h0ibf4xbk4mxyi3kx17wrqv0s1bqf01azm1wgni70xw5";
-      name = "plasma-workspace-5.9.5.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/plasma-workspace-5.10.2.tar.xz";
+      sha256 = "11q1p3ifs2fwrhm8ylvqacshz746dhl68w0s4dfykvr2r7mqqqf2";
+      name = "plasma-workspace-5.10.2.tar.xz";
     };
   };
   plasma-workspace-wallpapers = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/plasma-workspace-wallpapers-5.9.5.tar.xz";
-      sha256 = "05k56vsmhxh0wdz9msk1x3lq2dblladl4002111fi9s92hg4dmsn";
-      name = "plasma-workspace-wallpapers-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/plasma-workspace-wallpapers-5.10.2.tar.xz";
+      sha256 = "1hsm731fckv5bnl7faz7bbizi80df5zb35hmiz90fhdz4x2i7krp";
+      name = "plasma-workspace-wallpapers-5.10.2.tar.xz";
+    };
+  };
+  plymouth-kcm = {
+    version = "5.10.2";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.10.2/plymouth-kcm-5.10.2.tar.xz";
+      sha256 = "1fxz15yc081i6y3qvpxqy8ca6khm492hxxmji87ds30634d0033a";
+      name = "plymouth-kcm-5.10.2.tar.xz";
     };
   };
   polkit-kde-agent = {
-    version = "1-5.9.5";
+    version = "1-5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/polkit-kde-agent-1-5.9.5.tar.xz";
-      sha256 = "05qzq07g7wb6942p6yyrah37vyadbfyz7akk87zrxwiahiighy42";
-      name = "polkit-kde-agent-1-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/polkit-kde-agent-1-5.10.2.tar.xz";
+      sha256 = "04s9338c8y7krqsp5k812vrwphx0ibplh5gg0w6n38m8am78cxnz";
+      name = "polkit-kde-agent-1-5.10.2.tar.xz";
     };
   };
   powerdevil = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/powerdevil-5.9.5.tar.xz";
-      sha256 = "0i8rri9ndm9ins4ii4qmdsmjkxqf69xpz85lwcdsv0sci6imxhcz";
-      name = "powerdevil-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/powerdevil-5.10.2.tar.xz";
+      sha256 = "1gw9swqi2wsdb8wbjf3ns7j4bj3a1mc06ynk7xklb7wan5psa9my";
+      name = "powerdevil-5.10.2.tar.xz";
     };
   };
   sddm-kcm = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/sddm-kcm-5.9.5.tar.xz";
-      sha256 = "0q0q3c439dbrvb4snfjfymgf8pld26gdqbak4gyp3j7nc2gjisk6";
-      name = "sddm-kcm-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/sddm-kcm-5.10.2.tar.xz";
+      sha256 = "10pg414ddx86nx46zkhl3fbvsijk4sifsh5cim17rp4b5wjay38y";
+      name = "sddm-kcm-5.10.2.tar.xz";
     };
   };
   systemsettings = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/systemsettings-5.9.5.tar.xz";
-      sha256 = "0xg8y8hpm0v2bflsh6l85yx969jn1nqlszwydp3ryvdwliv5hgg9";
-      name = "systemsettings-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/systemsettings-5.10.2.tar.xz";
+      sha256 = "1p6jg1vaa9svz4liqpb2435wbirdhjsqd6l1qd1lsp1r5szmwpz8";
+      name = "systemsettings-5.10.2.tar.xz";
     };
   };
   user-manager = {
-    version = "5.9.5";
+    version = "5.10.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.9.5/user-manager-5.9.5.tar.xz";
-      sha256 = "056rnca3v6vs7sjqz9drndir3csz457qkzf30rp0dh5dl9k9cxxn";
-      name = "user-manager-5.9.5.tar.xz";
+      url = "${mirror}/stable/plasma/5.10.2/user-manager-5.10.2.tar.xz";
+      sha256 = "1ac10z44y7d2n618j04r00cnklxglyk7xdh5vp0pl4zfcm4cx98w";
+      name = "user-manager-5.10.2.tar.xz";
+    };
+  };
+  xdg-desktop-portal-kde = {
+    version = "5.10.2";
+    src = fetchurl {
+      url = "${mirror}/stable/plasma/5.10.2/xdg-desktop-portal-kde-5.10.2.tar.xz";
+      sha256 = "16qdvds3k4cjv3dvvxr26r5rjnysqabv4zqf18g52z9lsbc46imv";
+      name = "xdg-desktop-portal-kde-5.10.2.tar.xz";
     };
   };
 }

From 359aff876c86b7e38dee5bd952cc6e1a66905046 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Sun, 18 Jun 2017 16:59:15 +0800
Subject: [PATCH 079/189] plasma-workspace: requires libXtst

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

diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix
index 29d92f9a9df..b866ebab0e5 100644
--- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix
+++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix
@@ -3,7 +3,7 @@
 
   extra-cmake-modules, kdoctools,
 
-  isocodes, libdbusmenu, libSM, libXcursor, pam, wayland,
+  isocodes, libdbusmenu, libSM, libXcursor, libXtst, pam, wayland,
 
   baloo, kactivities, kcmutils, kconfig, kcrash, kdbusaddons, kdeclarative,
   kdelibs4support, kdesu, kglobalaccel, kidletime, kjsembed, knewstuff,
@@ -19,8 +19,9 @@ mkDerivation {
 
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
-    isocodes libdbusmenu libSM libXcursor pam wayland
-
+    isocodes libdbusmenu libSM libXcursor libXtst pam wayland
+  ];
+  propagatedBuildInputs = [
     baloo kactivities kcmutils kconfig kcrash kdbusaddons kdeclarative
     kdelibs4support kdesu kglobalaccel kidletime kjsembed knewstuff
     knotifyconfig kpackage krunner kscreenlocker ktexteditor ktextwidgets

From d454675ef6e6d06a933ce471c3ff69643138a1a8 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Thu, 15 Jun 2017 01:42:55 +0200
Subject: [PATCH 080/189] faust: 2.0.a51 -> 2.1.0

---
 pkgs/applications/audio/faust/faust2.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix
index 6289688c53c..274f7c9c3b8 100644
--- a/pkgs/applications/audio/faust/faust2.nix
+++ b/pkgs/applications/audio/faust/faust2.nix
@@ -1,6 +1,6 @@
 { stdenv
 , coreutils
-, fetchurl
+, fetchFromGitHub
 , makeWrapper
 , pkgconfig
 , clang
@@ -16,11 +16,13 @@ with stdenv.lib.strings;
 
 let
 
-  version = "2.0.a51";
+  version = "2.1.0";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/project/faudiostream/faust-${version}.tgz";
-    sha256 = "1yryjqfqmxs7lxy95hjgmrncvl9kig3rcsmg0v49ghzz7vs7haxf";
+  src = fetchFromGitHub {
+    owner = "grame-cncm";
+    repo = "faust";
+    rev = "v${builtins.replaceStrings ["."] ["-"] version}";
+    sha256 = "1pmiwy287g79ipz9pppnkfrdgls3l912kpkr7dfymk9wk5y5di9m";
   };
 
   meta = with stdenv.lib; {
@@ -67,7 +69,7 @@ let
       #
       # For now, fix this by 1) pinning the llvm version; 2) manually setting LLVM_VERSION
       # to something the makefile will recognize.
-      sed '52iLLVM_VERSION=3.8.0' -i compiler/Makefile.unix
+      sed '52iLLVM_VERSION=${stdenv.lib.getVersion llvm}' -i compiler/Makefile.unix
     '';
 
     # Remove most faust2appl scripts since they won't run properly
@@ -194,8 +196,8 @@ let
         # export parts of the build environment
         for script in "$out"/bin/*; do
           wrapProgram "$script" \
-            --set FAUSTLIB "${faust}/lib/faust" \
-            --set FAUST_LIB_PATH "${faust}/lib/faust" \
+            --set FAUSTLIB "${faust}/share/faust" \
+            --set FAUST_LIB_PATH "${faust}/share/faust" \
             --set FAUSTINC "${faust}/include/faust" \
             --prefix PATH : "$PATH" \
             --prefix PKG_CONFIG_PATH : "$PKG_CONFIG_PATH" \

From c1e5ca92b774325f6779bda203e3c04e60ed087d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 16 Jun 2017 20:25:05 +0200
Subject: [PATCH 081/189] aws-sdk-cpp: Better fix for the failing credentials
 test

---
 pkgs/development/libraries/aws-sdk-cpp/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix
index 434c685e823..974989dc24b 100644
--- a/pkgs/development/libraries/aws-sdk-cpp/default.nix
+++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix
@@ -43,8 +43,11 @@ in stdenv.mkDerivation rec {
       for i in testing-resources aws-cpp-sdk-*; do
         export ${loaderVar}=$(pwd)/$i:''${${loaderVar}}
       done
+    '';
 
-      export HOME=$TMPDIR
+  preConfigure =
+    ''
+      rm aws-cpp-sdk-core-tests/aws/auth/AWSCredentialsProviderTest.cpp
     '';
 
   NIX_LDFLAGS = lib.concatStringsSep " " (

From 9ea503fa55763f52b5a750fd440e270fb41326c1 Mon Sep 17 00:00:00 2001
From: Robert Vollmert <rob@vllmrt.net>
Date: Mon, 19 Jun 2017 13:24:46 +0200
Subject: [PATCH 082/189] python-modules/protobuf: fix darwin build by passing
 C++ includes explicitly

Fixes #26531.

Copies the matplotlib solution, as mentioned by @knedlsepp.
---
 pkgs/development/python-modules/protobuf.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/protobuf.nix b/pkgs/development/python-modules/protobuf.nix
index f2f0f5025d1..44b9ed70a18 100644
--- a/pkgs/development/python-modules/protobuf.nix
+++ b/pkgs/development/python-modules/protobuf.nix
@@ -1,5 +1,5 @@
 { stdenv, python, buildPythonPackage
-, protobuf, google_apputils, pyext
+, protobuf, google_apputils, pyext, libcxx
 , disabled, doCheck ? true }:
 
 with stdenv.lib;
@@ -8,6 +8,9 @@ buildPythonPackage rec {
   inherit (protobuf) name src;
   inherit disabled doCheck;
 
+  # work around python distutils compiling C++ with $CC
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
+
   propagatedBuildInputs = [ protobuf google_apputils ];
   buildInputs = [ google_apputils pyext ];
 

From 63011015b93986a98760b7553cf0a8938d1d74bb Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 19 Jun 2017 19:26:13 +0800
Subject: [PATCH 083/189] virtmanager-qt: 0.43.70.2 -> 0.43.72

---
 pkgs/applications/virtualization/virt-manager/qt.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/virt-manager/qt.nix b/pkgs/applications/virtualization/virt-manager/qt.nix
index 783a424e18c..fe885d86456 100644
--- a/pkgs/applications/virtualization/virt-manager/qt.nix
+++ b/pkgs/applications/virtualization/virt-manager/qt.nix
@@ -5,13 +5,13 @@
 
 mkDerivation rec {
   name = "virt-manager-qt-${version}";
-  version = "0.43.70.2";
+  version = "0.43.72";
 
   src = fetchFromGitHub {
     owner  = "F1ash";
     repo   = "qt-virt-manager";
     rev    = "${version}";
-    sha256 = "06123bywzgs5y2yskqm8qypj9diym5xip2bdlghfhw30957pcxxg";
+    sha256 = "0m8aqs58wnk404z2hav5j4yjsy8f0vfsm771pm0gprsfbx4sm3qg";
   };
 
   cmakeFlags = [

From 392f4acee9b1ed4ef6a6b617932be8dd5b1cba71 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 19 Jun 2017 12:31:26 +0800
Subject: [PATCH 084/189] kde-applications: fix command in doc

---
 pkgs/applications/kde/fetch.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh
index d0f31d6a2a5..c270e196f8c 100644
--- a/pkgs/applications/kde/fetch.sh
+++ b/pkgs/applications/kde/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( http://download.kde.org/stable/applications/17.04.1/ -A '*.tar.xz' )
+WGET_ARGS=( http://download.kde.org/stable/applications/17.04.2/ -A '*.tar.xz' )

From 9193bcb6b4488a768ca96dc542f16866758a4b74 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 19 Jun 2017 12:31:42 +0800
Subject: [PATCH 085/189] kde-applications: 17.04.1 -> 17.04.2

use https as the remote server expects it
---
 pkgs/applications/kde/default.nix             |    2 +-
 pkgs/applications/kde/fetch.sh                |    2 +-
 pkgs/applications/kde/srcs.nix                | 2232 ++++++++---------
 pkgs/desktops/plasma-5/fetch.sh               |    2 +-
 .../libraries/kde-frameworks/fetch.sh         |    2 +-
 5 files changed, 1120 insertions(+), 1120 deletions(-)

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index d8b8c4242cb..207228a65b0 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -18,7 +18,7 @@ still shows most of the available features is in `./gwenview.nix`.
 # Updates
 
 1. Update the URL in `./fetch.sh`.
-2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/kde-5/applications`
+2. Run `./maintainers/scripts/fetch-kde-qt.sh pkgs/applications/kde`
    from the top of the Nixpkgs tree.
 3. Use `nox-review wip` to check that everything builds.
 4. Commit the changes and open a pull request.
diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh
index c270e196f8c..ad521a2b038 100644
--- a/pkgs/applications/kde/fetch.sh
+++ b/pkgs/applications/kde/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( http://download.kde.org/stable/applications/17.04.2/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/applications/17.04.2/ -A '*.tar.xz' )
diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix
index fa8bfa687e1..0fa168e0a23 100644
--- a/pkgs/applications/kde/srcs.nix
+++ b/pkgs/applications/kde/srcs.nix
@@ -3,2235 +3,2235 @@
 
 {
   akonadi = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/akonadi-17.04.1.tar.xz";
-      sha256 = "0dsxbc03rwd3rrcq4kvadcfwbfgpbgl41735j68mhb9y8gfdniyj";
-      name = "akonadi-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/akonadi-17.04.2.tar.xz";
+      sha256 = "08b3xyrff3y3s3c39l1fv3i55rdz6fq9mrsi3g80vs4i4x70f46d";
+      name = "akonadi-17.04.2.tar.xz";
     };
   };
   akonadi-calendar = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/akonadi-calendar-17.04.1.tar.xz";
-      sha256 = "1xcmy0a305r94yns9mq2fcm9aix1djdk7xc73kfxs5n1jk5w44pl";
-      name = "akonadi-calendar-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/akonadi-calendar-17.04.2.tar.xz";
+      sha256 = "17nx990k3l0mgwssrdg9avvp4yf6ichakx0cq4yg4mif5rc4angd";
+      name = "akonadi-calendar-17.04.2.tar.xz";
     };
   };
   akonadi-calendar-tools = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/akonadi-calendar-tools-17.04.1.tar.xz";
-      sha256 = "1aslp4grljmn19zxxcfwylwsifimbgvj4r1zjnwfd9mx1d8m60cm";
-      name = "akonadi-calendar-tools-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/akonadi-calendar-tools-17.04.2.tar.xz";
+      sha256 = "1qbj5fkzia0bjzyv8mybqf2gg917dyjqmiywf4asr0xlqxwydccj";
+      name = "akonadi-calendar-tools-17.04.2.tar.xz";
     };
   };
   akonadiconsole = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/akonadiconsole-17.04.1.tar.xz";
-      sha256 = "14hybly50bckpjam7f9fndqgj99pwinc5cm7z62bj5d76r5bma7c";
-      name = "akonadiconsole-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/akonadiconsole-17.04.2.tar.xz";
+      sha256 = "00wps8p6094bywkc6yrh9rpqp0q49nq68kmnbm7jqd9k07g93mxz";
+      name = "akonadiconsole-17.04.2.tar.xz";
     };
   };
   akonadi-contacts = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/akonadi-contacts-17.04.1.tar.xz";
-      sha256 = "0ab3i5aw38igi32zqw6i7lcqbhmac9flr1m5mqsrjb50m40xd5sk";
-      name = "akonadi-contacts-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/akonadi-contacts-17.04.2.tar.xz";
+      sha256 = "0fnmfcfxzjghfh3plliksa7sffjy8m2hif1s8gsdv2bl5v13gxbz";
+      name = "akonadi-contacts-17.04.2.tar.xz";
     };
   };
   akonadi-import-wizard = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/akonadi-import-wizard-17.04.1.tar.xz";
-      sha256 = "1a7a0fm7y97znja3wpx49lpz4m8351ybf3bqragklkjp9649j2j3";
-      name = "akonadi-import-wizard-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/akonadi-import-wizard-17.04.2.tar.xz";
+      sha256 = "0wg1nnrfafmpdb0li7d9i3qfdam4v2ybkbrbwgdwiawdqs9znaaa";
+      name = "akonadi-import-wizard-17.04.2.tar.xz";
     };
   };
   akonadi-mime = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/akonadi-mime-17.04.1.tar.xz";
-      sha256 = "0g4mb0y0npn4cplw64dwm6qyjrvrdj8af229nv7zhlkdw74x1xhf";
-      name = "akonadi-mime-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/akonadi-mime-17.04.2.tar.xz";
+      sha256 = "1ariwnjgsyccfa3iky3sf8lz08hv44jd6xa4hjfyz4bkp822grld";
+      name = "akonadi-mime-17.04.2.tar.xz";
     };
   };
   akonadi-notes = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/akonadi-notes-17.04.1.tar.xz";
-      sha256 = "0ycw2cync7r03vvpcx9640dv9j66fala2060dawsv5xynr3x4qcq";
-      name = "akonadi-notes-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/akonadi-notes-17.04.2.tar.xz";
+      sha256 = "00p7sksfid7lln43f65jna8dr4w47wkxqyls2gzbgnblpd7m2rqg";
+      name = "akonadi-notes-17.04.2.tar.xz";
     };
   };
   akonadi-search = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/akonadi-search-17.04.1.tar.xz";
-      sha256 = "0jrphb4s8i4rij88s1l4vvx3nk8giw5hshpd1ad69nabdb60flvk";
-      name = "akonadi-search-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/akonadi-search-17.04.2.tar.xz";
+      sha256 = "111r1fplrd13xb7s36cm9bk5zkj8ap33d252xarwmzpj51q0l3vh";
+      name = "akonadi-search-17.04.2.tar.xz";
     };
   };
   akregator = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/akregator-17.04.1.tar.xz";
-      sha256 = "1i3d59fcd6ca1pw52np540dbkhka2xsczxilqb21rlqji2a9v7vz";
-      name = "akregator-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/akregator-17.04.2.tar.xz";
+      sha256 = "0ngpw432pm57p34y4wcvrxlrlmixlgrpqawgn2b73dhvb2m8ypvy";
+      name = "akregator-17.04.2.tar.xz";
     };
   };
   analitza = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/analitza-17.04.1.tar.xz";
-      sha256 = "1zjz7dy4ihicirwfkz7zfg5w4gm8avgps9qamvggy6h1j027wp6i";
-      name = "analitza-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/analitza-17.04.2.tar.xz";
+      sha256 = "0qs2mp7nlca9y8lpycwfsmdd33ficz36z2fbmqzqm837w1r5jplp";
+      name = "analitza-17.04.2.tar.xz";
     };
   };
   ark = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/ark-17.04.1.tar.xz";
-      sha256 = "08rjkm6k1vl29svh7vqp56yr2fns6m51blspjyyf08hsm9bxqhmn";
-      name = "ark-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/ark-17.04.2.tar.xz";
+      sha256 = "0zdyxd7ghwrj48avyqv4q6dpyrxryzrg8v5ljwwsizlb7lp25afx";
+      name = "ark-17.04.2.tar.xz";
     };
   };
   artikulate = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/artikulate-17.04.1.tar.xz";
-      sha256 = "11xyiclc47mdh89in3lhapxn7kr54bzc58jx3nxb85vsyxvpmy5k";
-      name = "artikulate-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/artikulate-17.04.2.tar.xz";
+      sha256 = "0rjqpn8aa0y3v2940qgfxl9xdrls1jw6yfvgqdsicrhd9qwpr6i2";
+      name = "artikulate-17.04.2.tar.xz";
     };
   };
   audiocd-kio = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/audiocd-kio-17.04.1.tar.xz";
-      sha256 = "07b9k4nry6825yd0fmaib39wfxfzh63vilm2x8j2irw8bs2j9ban";
-      name = "audiocd-kio-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/audiocd-kio-17.04.2.tar.xz";
+      sha256 = "0h6zvlhyi9dxmcxgcnn12pj056r62a6389nd9dnqzcc3m7jp0ypi";
+      name = "audiocd-kio-17.04.2.tar.xz";
     };
   };
   baloo-widgets = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/baloo-widgets-17.04.1.tar.xz";
-      sha256 = "0sc0iysxcxwqjpkvdbxrpvw01pr86jzimf89l1px4v2q36x1s61s";
-      name = "baloo-widgets-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/baloo-widgets-17.04.2.tar.xz";
+      sha256 = "1fspq5n53zgnwpvnq0z9g77xhfspd3indcvim8j8ls5qhmn4c8g9";
+      name = "baloo-widgets-17.04.2.tar.xz";
     };
   };
   blinken = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/blinken-17.04.1.tar.xz";
-      sha256 = "1mip3j21d9m16cj5km08k45svqb8ax7qz3dsdljia5q04x0lxibl";
-      name = "blinken-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/blinken-17.04.2.tar.xz";
+      sha256 = "12pzbgxhdrzjnzg02hd96pxcqpjnzfrlv2bjpkpzb7ng70wb50ia";
+      name = "blinken-17.04.2.tar.xz";
     };
   };
   blogilo = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/blogilo-17.04.1.tar.xz";
-      sha256 = "1r5i5877aywmgk4pw194ha534wamj79zgky2xb0qgd7s1qvgi6m8";
-      name = "blogilo-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/blogilo-17.04.2.tar.xz";
+      sha256 = "14pn6l2qvgf7ab05i93lnhm6fjhy41xwnxa5v7an7xc8ismi5ric";
+      name = "blogilo-17.04.2.tar.xz";
     };
   };
   bomber = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/bomber-17.04.1.tar.xz";
-      sha256 = "0iy0y3wwdlgskg2lgnfi678y9rnix8w13piqc1hyj31ad77nld4c";
-      name = "bomber-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/bomber-17.04.2.tar.xz";
+      sha256 = "19c5ak9cw3ybcvw21rzjh7k0q7g1j9dv060pvjdfsphfyzkym5m3";
+      name = "bomber-17.04.2.tar.xz";
     };
   };
   bovo = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/bovo-17.04.1.tar.xz";
-      sha256 = "0bh3q7dgimi4mnb7bh3viiwyj68r9fvkwd3va56znl9j97ggjl2p";
-      name = "bovo-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/bovo-17.04.2.tar.xz";
+      sha256 = "0z4ajphzrnag1zqv3d9i6cvrfn5b74sklacxhn09hgjgx6ihps77";
+      name = "bovo-17.04.2.tar.xz";
     };
   };
   calendarsupport = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/calendarsupport-17.04.1.tar.xz";
-      sha256 = "0h3p5l3xw0jjcz22f8wz57xy9q5k32asl4xq57j7k4bg4rn0cbhq";
-      name = "calendarsupport-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/calendarsupport-17.04.2.tar.xz";
+      sha256 = "1n2nb15fn3v6hlp8ya3ah3pdyjjss1632a51k696lg474dhxvlzk";
+      name = "calendarsupport-17.04.2.tar.xz";
     };
   };
   cantor = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/cantor-17.04.1.tar.xz";
-      sha256 = "140rhfd2yi4blikj1ybqkvfwvzd7i1hm4qgpd25jv3n1hc0i9b41";
-      name = "cantor-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/cantor-17.04.2.tar.xz";
+      sha256 = "0811770qn76ri11mgx2pac7vg67mj5qg3v3zhx4ym3f072lfp57i";
+      name = "cantor-17.04.2.tar.xz";
     };
   };
   cervisia = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/cervisia-17.04.1.tar.xz";
-      sha256 = "0fps66icbkns0r4qvzs50772f9nd8ydkali8695vwza4b5mixgvr";
-      name = "cervisia-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/cervisia-17.04.2.tar.xz";
+      sha256 = "1gar8rx9vknpc7fnwlg7kvwj90wv9wd8c3dd59fj55d9fpwin3qg";
+      name = "cervisia-17.04.2.tar.xz";
     };
   };
   dolphin = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/dolphin-17.04.1.tar.xz";
-      sha256 = "1rrb6ncyykf0dj3fx9qzpcac2yn12rrxnkpnnaiw84aqxdg0gbi7";
-      name = "dolphin-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/dolphin-17.04.2.tar.xz";
+      sha256 = "1yd0fawz9n64gsd868qzp424h653f5lf22r5mf116bkgxia59b25";
+      name = "dolphin-17.04.2.tar.xz";
     };
   };
   dolphin-plugins = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/dolphin-plugins-17.04.1.tar.xz";
-      sha256 = "0nr82063805axbhmisim97w4zzvi30jp0a0q7xxgnrp80b89zqam";
-      name = "dolphin-plugins-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/dolphin-plugins-17.04.2.tar.xz";
+      sha256 = "1h8g962pmpwahhrnzzd7x15j7p3bcxg92csfkd0y2mn6pfl9zb5s";
+      name = "dolphin-plugins-17.04.2.tar.xz";
     };
   };
   dragon = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/dragon-17.04.1.tar.xz";
-      sha256 = "1wlf9z4qqhvg60x5x3k813k1lhvhkn25dsifwjprg6239fhayy7p";
-      name = "dragon-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/dragon-17.04.2.tar.xz";
+      sha256 = "0yp0bswjq9zymczyscy3y186d7g921jmah6i5wd36j1vgff3i0ry";
+      name = "dragon-17.04.2.tar.xz";
     };
   };
   eventviews = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/eventviews-17.04.1.tar.xz";
-      sha256 = "01nsj4mzz5ck677zma3zhz0gq9bnx7il8mhgrnwk5gjkr7hdnzhh";
-      name = "eventviews-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/eventviews-17.04.2.tar.xz";
+      sha256 = "0rf87q002ax5r6qh99hmbdrm528grw3ib5zi5pnjai3l403vd6g6";
+      name = "eventviews-17.04.2.tar.xz";
     };
   };
   ffmpegthumbs = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/ffmpegthumbs-17.04.1.tar.xz";
-      sha256 = "0wa1k1ns8jxywkrvzbdy1av4lb21r7pb23i7gac7l2508gmdsy3n";
-      name = "ffmpegthumbs-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/ffmpegthumbs-17.04.2.tar.xz";
+      sha256 = "02i9x2amkwc40a7fpk939spgwbrcfm1s9swgmp1wzyg7arrf4qz3";
+      name = "ffmpegthumbs-17.04.2.tar.xz";
     };
   };
   filelight = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/filelight-17.04.1.tar.xz";
-      sha256 = "0hfa1c2c81jfxgfgr68dkacgbikpymyhb4n2kg9ld5710zid02bd";
-      name = "filelight-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/filelight-17.04.2.tar.xz";
+      sha256 = "0wpcmk6i8hfalzymj8m1hsg1qi2hil8x51nvxg0c55x1cqg6k9a0";
+      name = "filelight-17.04.2.tar.xz";
     };
   };
   granatier = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/granatier-17.04.1.tar.xz";
-      sha256 = "0dyj49x1rfcxr1wpmkzcwl2nnxvpx7j3b3n9kd5m0ggql3xq6wl7";
-      name = "granatier-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/granatier-17.04.2.tar.xz";
+      sha256 = "0bxf4cv1351bzz3yafdadih8bdcjjn0119zazmll2jjdnh4qiq0z";
+      name = "granatier-17.04.2.tar.xz";
     };
   };
   grantlee-editor = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/grantlee-editor-17.04.1.tar.xz";
-      sha256 = "00hbymma9b836a5313aj6k29cyzivzf1j0izxyd3xdwk1lzcxpyx";
-      name = "grantlee-editor-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/grantlee-editor-17.04.2.tar.xz";
+      sha256 = "1sjrsljp0g53gi4vlcmz6r9k657k4wr1l10743sfmg268skvs84b";
+      name = "grantlee-editor-17.04.2.tar.xz";
     };
   };
   grantleetheme = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/grantleetheme-17.04.1.tar.xz";
-      sha256 = "0sl01blx5wba6y492fazk1srm60hyjqggwglx9cxpf9kyy0480f7";
-      name = "grantleetheme-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/grantleetheme-17.04.2.tar.xz";
+      sha256 = "102a49ifkvjpz2703fr6dv45ksyg7y1yjc6xm0im95vb66aw3cb5";
+      name = "grantleetheme-17.04.2.tar.xz";
     };
   };
   gwenview = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/gwenview-17.04.1.tar.xz";
-      sha256 = "04fh4x15w1f5afscn70ayd87q8hr4jdcj2l3j4bw4s9zbl1rbmch";
-      name = "gwenview-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/gwenview-17.04.2.tar.xz";
+      sha256 = "0x9pxw33ahzn0h4klgiw7ifcgkdwv7l1zzfapbh9gr9h3rbrpsra";
+      name = "gwenview-17.04.2.tar.xz";
     };
   };
   incidenceeditor = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/incidenceeditor-17.04.1.tar.xz";
-      sha256 = "0mhkqyhwnjpjlcqvlcff10rdyismr7n08vyhkv4xgvwxpin5rwcd";
-      name = "incidenceeditor-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/incidenceeditor-17.04.2.tar.xz";
+      sha256 = "1qhkmw6n402xnv5ggpfp586gii5z6r5gqmgfd0jzxlnygslqd784";
+      name = "incidenceeditor-17.04.2.tar.xz";
     };
   };
   jovie = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/jovie-17.04.1.tar.xz";
-      sha256 = "0kip2736g5bw92i6x0ivm4hjb7dkdmipprrn6k3m0r72ib3k98a5";
-      name = "jovie-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/jovie-17.04.2.tar.xz";
+      sha256 = "0mcv00hk1h1hl7hg4n2pcbsjw1g21k98fls7424jjh6vgvarbxmg";
+      name = "jovie-17.04.2.tar.xz";
     };
   };
   juk = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/juk-17.04.1.tar.xz";
-      sha256 = "0bi37n7wlfwxmy1r4b5cv1729p1331dwpasl8hwh295z6s1fgwjn";
-      name = "juk-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/juk-17.04.2.tar.xz";
+      sha256 = "01lsmfd5h1km5w9xz9bwh07qvxlgh2j8nl638bxx6k9vydg53gll";
+      name = "juk-17.04.2.tar.xz";
     };
   };
   k3b = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/k3b-17.04.1.tar.xz";
-      sha256 = "0mxwja0fdk55x2bq7vgwgpgankfryzdzankx4xj8jxcvz5xhzn1v";
-      name = "k3b-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/k3b-17.04.2.tar.xz";
+      sha256 = "1yv2rgwsvabyj7pj91yir6zj7bc4n9psazg0q658pyqbdkgwrkx8";
+      name = "k3b-17.04.2.tar.xz";
     };
   };
   kaccessible = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kaccessible-17.04.1.tar.xz";
-      sha256 = "1qr4vif0a5427d7mrgn0fyq1dkjpqy0fvalbwxca6ax0rgkjixn2";
-      name = "kaccessible-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kaccessible-17.04.2.tar.xz";
+      sha256 = "00m2ya93isyhr9cbx7fa79pi1iqnj5nqqnjmh8kqx9abkpvy2yff";
+      name = "kaccessible-17.04.2.tar.xz";
     };
   };
   kaccounts-integration = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kaccounts-integration-17.04.1.tar.xz";
-      sha256 = "1zizqd2smr00nyvl55g5w3g21h2zfjz4f6vybwav3s4kwmixzp49";
-      name = "kaccounts-integration-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kaccounts-integration-17.04.2.tar.xz";
+      sha256 = "0wrfyfczm92qz0w6gyvaac8n0763fviglji7ls73y0gy7xm1lfmj";
+      name = "kaccounts-integration-17.04.2.tar.xz";
     };
   };
   kaccounts-providers = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kaccounts-providers-17.04.1.tar.xz";
-      sha256 = "1zp6rj0wz4wdx0sph3abz4k3rqzrgj301rq74ijgjx0qf0w5z1mg";
-      name = "kaccounts-providers-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kaccounts-providers-17.04.2.tar.xz";
+      sha256 = "0y2y231f0xyysxnwdprlffp3m4wxyxabc2d4j8sr9w9gn0qfzdkj";
+      name = "kaccounts-providers-17.04.2.tar.xz";
     };
   };
   kaddressbook = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kaddressbook-17.04.1.tar.xz";
-      sha256 = "14hd7vaznw3k7znlvi8mly9gq4gcqd1mrfb3in8hxp9vh8w2bxbr";
-      name = "kaddressbook-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kaddressbook-17.04.2.tar.xz";
+      sha256 = "0y44b3wwpgpzim3an8kvrhqnw1wg0m2fcmanm2sj9vvccayy9fl6";
+      name = "kaddressbook-17.04.2.tar.xz";
     };
   };
   kajongg = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kajongg-17.04.1.tar.xz";
-      sha256 = "0n7xq1jqa7slh7537my13mhym8fzbvzs0qj07acwrgi278x6pq2x";
-      name = "kajongg-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kajongg-17.04.2.tar.xz";
+      sha256 = "08wzxkhfwagh2awcs4wdg56ks628bwysim5whwhrvw3rzc30v2ig";
+      name = "kajongg-17.04.2.tar.xz";
     };
   };
   kalarm = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kalarm-17.04.1.tar.xz";
-      sha256 = "1vprwk17b6gyxdsf8wgcmayvy4ryi2rdq0bwxhmlv8a1zhpbra4r";
-      name = "kalarm-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kalarm-17.04.2.tar.xz";
+      sha256 = "0km7fzhd8iskg4bkn6x62y9pgcvq8zwrjk3w7qvrx5j6dszjw11w";
+      name = "kalarm-17.04.2.tar.xz";
     };
   };
   kalarmcal = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kalarmcal-17.04.1.tar.xz";
-      sha256 = "0bj1sgfavm7hcmr0rz4i9cn2xhr36yksllxfc1i1dys5b1ag13gr";
-      name = "kalarmcal-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kalarmcal-17.04.2.tar.xz";
+      sha256 = "0rca71h85rd88fkx0pkxj40c8fnyiwfcnvmczkd9xb729hvrfblk";
+      name = "kalarmcal-17.04.2.tar.xz";
     };
   };
   kalgebra = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kalgebra-17.04.1.tar.xz";
-      sha256 = "1dg6rylry1nfri8ffzg7szkcl3ffzh482lnbri8zbrnly551g6mk";
-      name = "kalgebra-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kalgebra-17.04.2.tar.xz";
+      sha256 = "12496gk238ipi2zmxx4njwc58mx9q3w463qp9ji23abv3c59g44f";
+      name = "kalgebra-17.04.2.tar.xz";
     };
   };
   kalzium = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kalzium-17.04.1.tar.xz";
-      sha256 = "0mg4kypwy1mmx87zbmqgla9mqq1pbv6ac59pqwxw6bkb8k37ya8z";
-      name = "kalzium-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kalzium-17.04.2.tar.xz";
+      sha256 = "0gckmnbgym09kq53q0n3jsqfiaz4g7235ylpnwsaids3243jpa06";
+      name = "kalzium-17.04.2.tar.xz";
     };
   };
   kamera = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kamera-17.04.1.tar.xz";
-      sha256 = "04smnjlq28k6x4z0sgxj2jgvn2gr240zsgp39ylnxhaddy94xmaw";
-      name = "kamera-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kamera-17.04.2.tar.xz";
+      sha256 = "1ikniri791v63zzsng7yjvdil6vz08cw2iz9f0dwxzldlwws41j6";
+      name = "kamera-17.04.2.tar.xz";
     };
   };
   kanagram = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kanagram-17.04.1.tar.xz";
-      sha256 = "0g9kkvxfi66sn1a3mywvbncda4q58y3qkkrjn3kw830xwqlk8sa0";
-      name = "kanagram-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kanagram-17.04.2.tar.xz";
+      sha256 = "06yqc197yzzzzga45db8i05q2yr4jyjf5bvry0k22nss3wgsy8mk";
+      name = "kanagram-17.04.2.tar.xz";
     };
   };
   kapman = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kapman-17.04.1.tar.xz";
-      sha256 = "0g04la8fpbcvrlpk4xr1y1i2c4dmka3fj87fi0nvl9p2gnjp569h";
-      name = "kapman-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kapman-17.04.2.tar.xz";
+      sha256 = "15yyp69m096wbmpi52fi2ca6i83w0agjgsy1j6qiy6ki0fj2xyry";
+      name = "kapman-17.04.2.tar.xz";
     };
   };
   kapptemplate = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kapptemplate-17.04.1.tar.xz";
-      sha256 = "1pvnlay791mpfvpjmgzbrfvb3yd20y58awar86dm1ylqwm0mm7vs";
-      name = "kapptemplate-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kapptemplate-17.04.2.tar.xz";
+      sha256 = "0v5v6m0z7jgq5lzlpa3qkza3s0amx6xikwcg1lbzivnwfjvyb9nj";
+      name = "kapptemplate-17.04.2.tar.xz";
     };
   };
   kate = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kate-17.04.1.tar.xz";
-      sha256 = "1lpz5aw0qf4hvk4ph9dqxjywsc772xr5xdhagmn7ghp2hk1ydvil";
-      name = "kate-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kate-17.04.2.tar.xz";
+      sha256 = "1bya5xh57icsbx9jmk5w330xm97bjs3amvlnj0i8rplawjzcai8h";
+      name = "kate-17.04.2.tar.xz";
     };
   };
   katomic = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/katomic-17.04.1.tar.xz";
-      sha256 = "0widwj9qpai0ir97gz58kc43752dskylrs5dflsv9agrjld3cplk";
-      name = "katomic-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/katomic-17.04.2.tar.xz";
+      sha256 = "06bdvc8nckckd3rin7q7cjajxv0yzsq6m1jwzmyh90mm2sbq5g0j";
+      name = "katomic-17.04.2.tar.xz";
     };
   };
   kblackbox = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kblackbox-17.04.1.tar.xz";
-      sha256 = "02k53virnylfsm79cn7995qcdpl5hbnj325j6fbfhqb0c5420gcw";
-      name = "kblackbox-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kblackbox-17.04.2.tar.xz";
+      sha256 = "1z6ladzhd1mgcqv0y199wv3dafpmy7h6yfgy7hgl26pqgw2qpz9z";
+      name = "kblackbox-17.04.2.tar.xz";
     };
   };
   kblocks = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kblocks-17.04.1.tar.xz";
-      sha256 = "17nb3k4skarnzzz9xlw8iyviws9avlka6fs20ziigza7ickk9r8l";
-      name = "kblocks-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kblocks-17.04.2.tar.xz";
+      sha256 = "0a3d4q2kph192zp6lcm2wxh8f55s3wj3wvxvfjk3v5vwjld6a298";
+      name = "kblocks-17.04.2.tar.xz";
     };
   };
   kblog = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kblog-17.04.1.tar.xz";
-      sha256 = "15hf4y2s25kvdn6wbck116xp6jaxn86h53plkxirjczszfwg3dyj";
-      name = "kblog-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kblog-17.04.2.tar.xz";
+      sha256 = "1w97qkp2mwf7wqjwrrq94sah32cdybgxp2rzs5ypwaszka77xcd9";
+      name = "kblog-17.04.2.tar.xz";
     };
   };
   kbounce = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kbounce-17.04.1.tar.xz";
-      sha256 = "0yjmh48x6gsrc6kplc8yii49cp9lwyafc48vmnhmjdda5akwiqvz";
-      name = "kbounce-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kbounce-17.04.2.tar.xz";
+      sha256 = "1mgbjgbp2wmghvjgyf1s3gjwnwg4c8h6ni01mazqv8jlf0v14g1j";
+      name = "kbounce-17.04.2.tar.xz";
     };
   };
   kbreakout = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kbreakout-17.04.1.tar.xz";
-      sha256 = "15avdlg6mnzanq7lpygwcsykzjh1w7k3niwkiw3d9x9mc80sbw9h";
-      name = "kbreakout-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kbreakout-17.04.2.tar.xz";
+      sha256 = "1pydl6p7f8f1jxd6k8d563wwigx52fg850d2x736wzw1nk4vwg8b";
+      name = "kbreakout-17.04.2.tar.xz";
     };
   };
   kbruch = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kbruch-17.04.1.tar.xz";
-      sha256 = "1lj2sx6627a99yikz55wkr29mdjdywb5ipdimck8g5lfw125micw";
-      name = "kbruch-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kbruch-17.04.2.tar.xz";
+      sha256 = "0kpzqlnx3wzygnna5l1rssclz9fkvl6mzr5jnr730d5c3r7hymby";
+      name = "kbruch-17.04.2.tar.xz";
     };
   };
   kcachegrind = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kcachegrind-17.04.1.tar.xz";
-      sha256 = "0y0qx773fjqfvrnp0625hcxhzs0f318580m92n09spgc71x5b9zf";
-      name = "kcachegrind-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kcachegrind-17.04.2.tar.xz";
+      sha256 = "148wmzq482jarpg0sywdlrjc0bgb2vkg0g2pn7wqj1czijs5l0rv";
+      name = "kcachegrind-17.04.2.tar.xz";
     };
   };
   kcalc = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kcalc-17.04.1.tar.xz";
-      sha256 = "1fsd3rspdjwf3q4rh76wpqp8aw3r0fiidjg5qhxm1w1gzsygmvvy";
-      name = "kcalc-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kcalc-17.04.2.tar.xz";
+      sha256 = "03lzvhs4kyj9cvhw6kh1xmhs2r9vaa4a9ibqnkjb6xx1nx4cpm84";
+      name = "kcalc-17.04.2.tar.xz";
     };
   };
   kcalcore = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kcalcore-17.04.1.tar.xz";
-      sha256 = "0bl4qykivavzyvcdd74s47p40bl4mghgyjd15hkarsg875h5867s";
-      name = "kcalcore-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kcalcore-17.04.2.tar.xz";
+      sha256 = "05v1w8k70cdvvw5kv4994llbifrq2almir74i44v4i1449x7ziqn";
+      name = "kcalcore-17.04.2.tar.xz";
     };
   };
   kcalutils = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kcalutils-17.04.1.tar.xz";
-      sha256 = "1xpq3kb4vwx71l4yxm2676rj7s1vv5vkp3c6swq42hpfyvv2h8iq";
-      name = "kcalutils-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kcalutils-17.04.2.tar.xz";
+      sha256 = "1hj3k4lqj019cy8p7j6f20lkc75g8wma1p8vwynzlclnz43bsikp";
+      name = "kcalutils-17.04.2.tar.xz";
     };
   };
   kcharselect = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kcharselect-17.04.1.tar.xz";
-      sha256 = "0q5zmqbhchj2j8l8a17n0sf59apmwg5pyac7n8wp1y9bamli51w1";
-      name = "kcharselect-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kcharselect-17.04.2.tar.xz";
+      sha256 = "1xw5sd93zkkkp3v75p718bwrd9m391pryb12slrk66nsq1lbw1wn";
+      name = "kcharselect-17.04.2.tar.xz";
     };
   };
   kcolorchooser = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kcolorchooser-17.04.1.tar.xz";
-      sha256 = "1l2f61f81kagfpxkpl5pka603j4f7qcx4sndzcqjbir6wa505h1d";
-      name = "kcolorchooser-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kcolorchooser-17.04.2.tar.xz";
+      sha256 = "156w22x3hx244l6v1zlndl45bxq25nnagji6zl0jspsa4csbzfrn";
+      name = "kcolorchooser-17.04.2.tar.xz";
     };
   };
   kcontacts = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kcontacts-17.04.1.tar.xz";
-      sha256 = "0wcgqdkz2xil699jy7jmkywih7wc9p4b2z7xjbwwxb77dfvrk1gp";
-      name = "kcontacts-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kcontacts-17.04.2.tar.xz";
+      sha256 = "0nj7kff7yk7pbmq8g65qpj4g489mxfgwh8axbxsz8z31fgsg1i7s";
+      name = "kcontacts-17.04.2.tar.xz";
     };
   };
   kcron = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kcron-17.04.1.tar.xz";
-      sha256 = "1pvfsyqc73gswiwc8m5d6iiw1jsmjksybzqdqhc8c80ykdvg3iwq";
-      name = "kcron-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kcron-17.04.2.tar.xz";
+      sha256 = "1k3ya01icz65zyl33p3668p6ivkrlfpp95aydfmnfcd2q365vksx";
+      name = "kcron-17.04.2.tar.xz";
     };
   };
   kdav = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kdav-17.04.1.tar.xz";
-      sha256 = "06a5v505sdqh58vmgxq9pbqk1v773mlh2b9ikj8spc270y228frk";
-      name = "kdav-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kdav-17.04.2.tar.xz";
+      sha256 = "0yhjl9p4rnd6r5jwscxhwgv9d2xkj34mx4hh3rk4mc28bhy3yw9w";
+      name = "kdav-17.04.2.tar.xz";
     };
   };
   kdebugsettings = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kdebugsettings-17.04.1.tar.xz";
-      sha256 = "1h9iswm306ipx5dk3f6d89dfj0g1819nxjkap03h0b4819xk653s";
-      name = "kdebugsettings-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kdebugsettings-17.04.2.tar.xz";
+      sha256 = "1c05zh66ahnm1ann35bm9q93lg6cylrfsyawki8g5485ivxfs5xh";
+      name = "kdebugsettings-17.04.2.tar.xz";
     };
   };
   kde-dev-scripts = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-dev-scripts-17.04.1.tar.xz";
-      sha256 = "0b5qkg27x61m487lrdp78zbgk11p6q5j7fcqxajfhyh05a007ybz";
-      name = "kde-dev-scripts-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-dev-scripts-17.04.2.tar.xz";
+      sha256 = "1vid5j08x8pkzzhqr78nsn4r9nnhisvsb7bfl9a1pc609y461y31";
+      name = "kde-dev-scripts-17.04.2.tar.xz";
     };
   };
   kde-dev-utils = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-dev-utils-17.04.1.tar.xz";
-      sha256 = "1l441qha293yx45i7awsnzz0hzh20izrhzlm48biw787qqmd03mn";
-      name = "kde-dev-utils-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-dev-utils-17.04.2.tar.xz";
+      sha256 = "1xf20zdlrinp9kxdky9a5lvflxikzdzv2yj211nlir8a63iv0bz7";
+      name = "kde-dev-utils-17.04.2.tar.xz";
     };
   };
   kdeedu-data = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kdeedu-data-17.04.1.tar.xz";
-      sha256 = "012h97wkxqbk2yij4yirmd30gv92yixnhdn6zcmfps5m1ndjzj4v";
-      name = "kdeedu-data-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kdeedu-data-17.04.2.tar.xz";
+      sha256 = "1bdh14d9ypai97jcxf1sfaw6ccfnf2ckj677fc8gl8g7fid094np";
+      name = "kdeedu-data-17.04.2.tar.xz";
     };
   };
   kdegraphics-mobipocket = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kdegraphics-mobipocket-17.04.1.tar.xz";
-      sha256 = "1gmb7i7bckaa481lxadzm34bzda1qfbaz5a1hc37cihj8p2avlpl";
-      name = "kdegraphics-mobipocket-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kdegraphics-mobipocket-17.04.2.tar.xz";
+      sha256 = "0qyv804a9cvqm0dm77zd79jj27i09jbw2cpgmazg3jn0plb5lkm6";
+      name = "kdegraphics-mobipocket-17.04.2.tar.xz";
     };
   };
   kdegraphics-thumbnailers = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kdegraphics-thumbnailers-17.04.1.tar.xz";
-      sha256 = "1mmkg73bg1jxr6l3idrkgq97csyahrlv7k1780jy0202x1avswda";
-      name = "kdegraphics-thumbnailers-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kdegraphics-thumbnailers-17.04.2.tar.xz";
+      sha256 = "06vr377nr59n599dsmi250nak78ka1zkfa8ckp93sasp5nlilbnp";
+      name = "kdegraphics-thumbnailers-17.04.2.tar.xz";
     };
   };
   kde-l10n-ar = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-ar-17.04.1.tar.xz";
-      sha256 = "1a3vssv88746dwwdwbnm4ydqxsmfj88g64cw7iarw77wchhx7g3v";
-      name = "kde-l10n-ar-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ar-17.04.2.tar.xz";
+      sha256 = "0w675vdbvms758y9hywjkg72sl37i2q1n8wq7mrqkvbgd7fri198";
+      name = "kde-l10n-ar-17.04.2.tar.xz";
     };
   };
   kde-l10n-ast = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-ast-17.04.1.tar.xz";
-      sha256 = "06cxr26bwf7s4lcqs3v72ygn6ss3hlz150fz08qzxqlg5i8ddwql";
-      name = "kde-l10n-ast-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ast-17.04.2.tar.xz";
+      sha256 = "0v6qsn1x6rgll1hpr482jis0pljmqw0bax31a7vvr16ahp0rlrmk";
+      name = "kde-l10n-ast-17.04.2.tar.xz";
     };
   };
   kde-l10n-bg = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-bg-17.04.1.tar.xz";
-      sha256 = "14d1609bdhavpmxkww3bainbd8sxg033d4ljnnfygysfz58dsgc9";
-      name = "kde-l10n-bg-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-bg-17.04.2.tar.xz";
+      sha256 = "0hi7dvv25yji3924983k3fjgxynz1avp6l9amj7frn6g0c68lbp4";
+      name = "kde-l10n-bg-17.04.2.tar.xz";
     };
   };
   kde-l10n-bs = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-bs-17.04.1.tar.xz";
-      sha256 = "14a03pg5am75vcdgc6x0ig4rfy2yz46f47svdmhadlw5fx88h011";
-      name = "kde-l10n-bs-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-bs-17.04.2.tar.xz";
+      sha256 = "11sikg952dv75f12rd7sky9rwamr9w4szdqkd9zw9kdgy6q2izn7";
+      name = "kde-l10n-bs-17.04.2.tar.xz";
     };
   };
   kde-l10n-ca = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-ca-17.04.1.tar.xz";
-      sha256 = "16r3pz3ksky7l02kpqy8c6a5w8qy4ilbx6ak43sf299a83mf5z0j";
-      name = "kde-l10n-ca-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ca-17.04.2.tar.xz";
+      sha256 = "0s4j2vqxbpbsira0zyxz13kd59iicam2fhqz6xnlrd769vbfcbbv";
+      name = "kde-l10n-ca-17.04.2.tar.xz";
     };
   };
   kde-l10n-ca_valencia = {
-    version = "ca_valencia-17.04.1";
+    version = "ca_valencia-17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-ca@valencia-17.04.1.tar.xz";
-      sha256 = "04nrxwpi1zkpq6h6q1w7yjm4n98ymwvpscbzr0201hhf8lr1vrlf";
-      name = "kde-l10n-ca_valencia-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ca@valencia-17.04.2.tar.xz";
+      sha256 = "1dib0xvjcpg996smni56vncdq9wb9jcfr4abvqm7x3v50ip95f7f";
+      name = "kde-l10n-ca_valencia-17.04.2.tar.xz";
     };
   };
   kde-l10n-cs = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-cs-17.04.1.tar.xz";
-      sha256 = "1nkhqhl9p5hliynlq3magcwcxkgg7x5wrfm80dxj9bivbq9sxi5c";
-      name = "kde-l10n-cs-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-cs-17.04.2.tar.xz";
+      sha256 = "05hjzfrzafb9xabsb15lq5hl152brqf68hvl3h0vsmxyw7hqzxrj";
+      name = "kde-l10n-cs-17.04.2.tar.xz";
     };
   };
   kde-l10n-da = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-da-17.04.1.tar.xz";
-      sha256 = "1wb6yb8d3wyz1zl0g6zfszd8k7svgazphghnc0fp97rngbjfdfmm";
-      name = "kde-l10n-da-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-da-17.04.2.tar.xz";
+      sha256 = "05g8vh33fxvi6dmj6ryr6i2j3l4fd4cj3dkzch76bgvi00750fah";
+      name = "kde-l10n-da-17.04.2.tar.xz";
     };
   };
   kde-l10n-de = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-de-17.04.1.tar.xz";
-      sha256 = "0nxkyky0rlsia80k6h91qh4fkdbdy4x9rbg01xw3cgcskj61198m";
-      name = "kde-l10n-de-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-de-17.04.2.tar.xz";
+      sha256 = "1hiqbscd2py88z45g7blbj74ayqj4mmgy0b8z6hcxn9n0ph4sidb";
+      name = "kde-l10n-de-17.04.2.tar.xz";
     };
   };
   kde-l10n-el = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-el-17.04.1.tar.xz";
-      sha256 = "14vsbgp8mjzwwzcfmyadcdd6q26viqffzc7q25k9as1m3a5ibxsd";
-      name = "kde-l10n-el-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-el-17.04.2.tar.xz";
+      sha256 = "066n3r1vi9j8nln4xyhgpjhsl7gwhl6q7gqbdcp6zpwgxhwv6zic";
+      name = "kde-l10n-el-17.04.2.tar.xz";
     };
   };
   kde-l10n-en_GB = {
-    version = "en_GB-17.04.1";
+    version = "en_GB-17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-en_GB-17.04.1.tar.xz";
-      sha256 = "08h7qzy22lbfn8rri7646fpy9ydchaw7xr59pccyck385ini7cbz";
-      name = "kde-l10n-en_GB-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-en_GB-17.04.2.tar.xz";
+      sha256 = "1307v713djkhny8rcg2schcwljn1cp728yllh227m30znprrqn41";
+      name = "kde-l10n-en_GB-17.04.2.tar.xz";
     };
   };
   kde-l10n-eo = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-eo-17.04.1.tar.xz";
-      sha256 = "1g487qr0yj2mi68zac9wj6bijrghb9id94yy1m6sdynjlwd27ik5";
-      name = "kde-l10n-eo-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-eo-17.04.2.tar.xz";
+      sha256 = "06i2m3g4s4raa1vzynfw5m89ydkcgjlbd96a4qxx76v888q65lsl";
+      name = "kde-l10n-eo-17.04.2.tar.xz";
     };
   };
   kde-l10n-es = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-es-17.04.1.tar.xz";
-      sha256 = "00yx9mlym8icsjsl6fl6sd3na7wzk8912518a35q54sgp6kg3g57";
-      name = "kde-l10n-es-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-es-17.04.2.tar.xz";
+      sha256 = "1al4figznf5f6lgpz2l57x01n87jlaqxldgp7gi545672lxzyx44";
+      name = "kde-l10n-es-17.04.2.tar.xz";
     };
   };
   kde-l10n-et = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-et-17.04.1.tar.xz";
-      sha256 = "0z5i3hsb24jigixvsk9byknnvia7xwqbwl94qfnvj6zfs4qw1aiv";
-      name = "kde-l10n-et-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-et-17.04.2.tar.xz";
+      sha256 = "1dhqk1sj32pij4wc4pgfih3i8g3jf9b223rnraymhbsima200hx4";
+      name = "kde-l10n-et-17.04.2.tar.xz";
     };
   };
   kde-l10n-eu = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-eu-17.04.1.tar.xz";
-      sha256 = "00b04kwgv1d7r8vwyxq8lbb1fpf1vc1qbly0brx4vgimkir875nk";
-      name = "kde-l10n-eu-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-eu-17.04.2.tar.xz";
+      sha256 = "0kix9qs15488ns71hv67yvp3w03n68lxjll6cjxhyhrfcji9ldwc";
+      name = "kde-l10n-eu-17.04.2.tar.xz";
     };
   };
   kde-l10n-fa = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-fa-17.04.1.tar.xz";
-      sha256 = "06hsj30na3l5rmx1kknfca3qqzwp9378nragdsd4bjkcd7qgfcrr";
-      name = "kde-l10n-fa-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-fa-17.04.2.tar.xz";
+      sha256 = "1867hgiqh51f6nzdmkq6nplnq7hs22lvzpishckhzw8x770sv10b";
+      name = "kde-l10n-fa-17.04.2.tar.xz";
     };
   };
   kde-l10n-fi = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-fi-17.04.1.tar.xz";
-      sha256 = "1jxzh32wzggr7757yz6l63pgzgdclq797ml75kfd252k08s4fmz1";
-      name = "kde-l10n-fi-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-fi-17.04.2.tar.xz";
+      sha256 = "1p4agangwvdzcx9029wslq5228wkgk4kpxddi2alzhlcxd25fk7b";
+      name = "kde-l10n-fi-17.04.2.tar.xz";
     };
   };
   kde-l10n-fr = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-fr-17.04.1.tar.xz";
-      sha256 = "0wxrjwxjc78sr9s3s5fhm52q2igqhb3im7qfxsp9wnqrl2hib026";
-      name = "kde-l10n-fr-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-fr-17.04.2.tar.xz";
+      sha256 = "0lby60rklzcjk62qw2inslvhv4fli57kjn6a76hidcwvwmi3kcyh";
+      name = "kde-l10n-fr-17.04.2.tar.xz";
     };
   };
   kde-l10n-ga = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-ga-17.04.1.tar.xz";
-      sha256 = "14zp828861bbfymvrkn6rmzcrd6lmy46pklaapwpvr49janmvwww";
-      name = "kde-l10n-ga-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ga-17.04.2.tar.xz";
+      sha256 = "06xkiizvcsg61ww8gdqjn84ymhwcxr9pkf8p0g5mrplvnxc9v1ys";
+      name = "kde-l10n-ga-17.04.2.tar.xz";
     };
   };
   kde-l10n-gl = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-gl-17.04.1.tar.xz";
-      sha256 = "1p76kw6x956p8jyvqfj2660n3qb71w07p47x4ad183zswq3i5rgd";
-      name = "kde-l10n-gl-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-gl-17.04.2.tar.xz";
+      sha256 = "059xv4a7mgf16h3wj2m4j1f32r8msvk0fdw62dlfypk0xi8lnzch";
+      name = "kde-l10n-gl-17.04.2.tar.xz";
     };
   };
   kde-l10n-he = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-he-17.04.1.tar.xz";
-      sha256 = "1sp8k3hw6c1mxglyh6gsa468cs9mf12fsmf033v5ccdmqslxv0cn";
-      name = "kde-l10n-he-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-he-17.04.2.tar.xz";
+      sha256 = "1w3rc832ngw91m1yrd988hxp8y0aaqgvkizkgmjiki0gqk3fkj25";
+      name = "kde-l10n-he-17.04.2.tar.xz";
     };
   };
   kde-l10n-hi = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-hi-17.04.1.tar.xz";
-      sha256 = "11dbisbgs309mr233x01qxmzqsm0xwsdvkbbkidl9cxfplgfmach";
-      name = "kde-l10n-hi-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-hi-17.04.2.tar.xz";
+      sha256 = "1kd4yxq3m5kg3crn6w86aiipslkfa4z79prm3fd6d4a5zpacmqbf";
+      name = "kde-l10n-hi-17.04.2.tar.xz";
     };
   };
   kde-l10n-hr = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-hr-17.04.1.tar.xz";
-      sha256 = "1iizjqldw44dpsilb6x524d4xib6bb67rp9czjc0b3hkibjbjhzy";
-      name = "kde-l10n-hr-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-hr-17.04.2.tar.xz";
+      sha256 = "1m3avcrbyz31ir8qwwf9lhl4xr4qg241j99jbv28mgmsiv73ifji";
+      name = "kde-l10n-hr-17.04.2.tar.xz";
     };
   };
   kde-l10n-hu = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-hu-17.04.1.tar.xz";
-      sha256 = "0ab3p8q72vhxc2angfwyyvwxs9j5m47325d36vsmdvh8ny0hsx2b";
-      name = "kde-l10n-hu-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-hu-17.04.2.tar.xz";
+      sha256 = "1vh94d0ffjak5gwf4flgc2giq6vswyh57i334sq7n3vbpg6rwh7s";
+      name = "kde-l10n-hu-17.04.2.tar.xz";
     };
   };
   kde-l10n-ia = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-ia-17.04.1.tar.xz";
-      sha256 = "1ss1vhg728qx4a4hbqjxbj8cqfajsxp2vifinax1ndhlyzrd8i63";
-      name = "kde-l10n-ia-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ia-17.04.2.tar.xz";
+      sha256 = "0k391rwrrj6bd86nd791pk0ih7g3z1b7vva43dmlishh5xind12p";
+      name = "kde-l10n-ia-17.04.2.tar.xz";
     };
   };
   kde-l10n-id = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-id-17.04.1.tar.xz";
-      sha256 = "17v0dr8pcm23jd2wa8pppzmswn5l4gbnirrp2nczbr5ffpymiqlx";
-      name = "kde-l10n-id-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-id-17.04.2.tar.xz";
+      sha256 = "13pfybpngzv1lscd3q4x4qh8kxs2k7md9biyibrs1vpyr28jw01c";
+      name = "kde-l10n-id-17.04.2.tar.xz";
     };
   };
   kde-l10n-is = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-is-17.04.1.tar.xz";
-      sha256 = "088ksp2z55w18yiknk4wz8mlfgnjgks3ncyc4qn8lh1p790ispv8";
-      name = "kde-l10n-is-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-is-17.04.2.tar.xz";
+      sha256 = "19cngzf26438amwfc7prz6hrszlqr78j2w9djm7y24gy7r6blfjq";
+      name = "kde-l10n-is-17.04.2.tar.xz";
     };
   };
   kde-l10n-it = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-it-17.04.1.tar.xz";
-      sha256 = "064b6gd391z0kwadr9lcn1kzshn1gzdhbkllsvqjhadz3r9p6fsj";
-      name = "kde-l10n-it-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-it-17.04.2.tar.xz";
+      sha256 = "0wfsvrhmmarl277qvgwh4w9nl3rcqslkd4fjsl88m7230xzcjy6k";
+      name = "kde-l10n-it-17.04.2.tar.xz";
     };
   };
   kde-l10n-ja = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-ja-17.04.1.tar.xz";
-      sha256 = "015y0a9r8h91j4g8ly4jc269pnw97iv1npczpn4jpqxd4b9gj3ag";
-      name = "kde-l10n-ja-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ja-17.04.2.tar.xz";
+      sha256 = "1b41f8pki75rc2swjaf1hvdvvjqvfz0glawrh4dda872naw65mhy";
+      name = "kde-l10n-ja-17.04.2.tar.xz";
     };
   };
   kde-l10n-kk = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-kk-17.04.1.tar.xz";
-      sha256 = "097ms01vx5ibrpdmcnshsg44vild3a8gkkh2lwkdcn2h1dm4f8dz";
-      name = "kde-l10n-kk-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-kk-17.04.2.tar.xz";
+      sha256 = "01jrsjwlv10qdyzlwljf74cdwxprmsfvhi1pdlhv271z2ix661w5";
+      name = "kde-l10n-kk-17.04.2.tar.xz";
     };
   };
   kde-l10n-km = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-km-17.04.1.tar.xz";
-      sha256 = "01x46n9schmbsamickxdqmnq6prywpn1i7l1izqmicgbwrik4jy3";
-      name = "kde-l10n-km-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-km-17.04.2.tar.xz";
+      sha256 = "1fw62awnkmk7q4ybjqiszj8d0jkmm247lq25l6h8zsmidc9x4xz9";
+      name = "kde-l10n-km-17.04.2.tar.xz";
     };
   };
   kde-l10n-ko = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-ko-17.04.1.tar.xz";
-      sha256 = "1nfahnsrlvmf8mxjs0m6zs6sz3b5kv117sgz1c7cf1bb07qjldmg";
-      name = "kde-l10n-ko-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ko-17.04.2.tar.xz";
+      sha256 = "1b5pqr5q7kn4vh7p8kngsw82ya7lv1jzbn8ngzrr8qkf6hh6ig2a";
+      name = "kde-l10n-ko-17.04.2.tar.xz";
     };
   };
   kde-l10n-lt = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-lt-17.04.1.tar.xz";
-      sha256 = "035nxx0psh77xv5mfiyjkfdz9m0pgk5ghbid4rrp8qhhw4zn9iq9";
-      name = "kde-l10n-lt-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-lt-17.04.2.tar.xz";
+      sha256 = "06pn3dx7dx26w16lfcwdrzphakvnk709bs5mki9p08pdmamjdr7w";
+      name = "kde-l10n-lt-17.04.2.tar.xz";
     };
   };
   kde-l10n-lv = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-lv-17.04.1.tar.xz";
-      sha256 = "150av9ah9xqkzsw2y555yh41y8gy3r494mx29fnwjvnc699yl7w2";
-      name = "kde-l10n-lv-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-lv-17.04.2.tar.xz";
+      sha256 = "0a2kchx1qkyqzmqa7ajadfpxa5zywyhv55db5qax2xncz1w7v515";
+      name = "kde-l10n-lv-17.04.2.tar.xz";
     };
   };
   kde-l10n-mr = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-mr-17.04.1.tar.xz";
-      sha256 = "17zcfxpws1q1cw286xx2zzv3pykx4830lv44vpr7b9aqnkj8i2r4";
-      name = "kde-l10n-mr-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-mr-17.04.2.tar.xz";
+      sha256 = "0mjg9v484ayafgdz0z6ahsqsdlyn3iv9sa0xwg2x2fc04r5k5dni";
+      name = "kde-l10n-mr-17.04.2.tar.xz";
     };
   };
   kde-l10n-nb = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-nb-17.04.1.tar.xz";
-      sha256 = "1cgc6k22iazikvwsdj0jfssx0gajiz414bcq9fffpdzsxvjqjll3";
-      name = "kde-l10n-nb-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-nb-17.04.2.tar.xz";
+      sha256 = "0bxq83qg39ivcr0qvxb0cd0q9mkjwp9j4h86s14wp5yq6jp0vcni";
+      name = "kde-l10n-nb-17.04.2.tar.xz";
     };
   };
   kde-l10n-nds = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-nds-17.04.1.tar.xz";
-      sha256 = "0k4li1kzk728h9vqy3wzqxpwwmsk6qgl4dpp9q4drvb74iwjm0hs";
-      name = "kde-l10n-nds-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-nds-17.04.2.tar.xz";
+      sha256 = "0rpdbk83rmj24m3by7igvab5aaskizfqxwfyvcjj0zhxpals0px4";
+      name = "kde-l10n-nds-17.04.2.tar.xz";
     };
   };
   kde-l10n-nl = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-nl-17.04.1.tar.xz";
-      sha256 = "0gbwg30lf5w5dvrxi3kzwbwwiglb0247pqybva5irvprw9vcnfsi";
-      name = "kde-l10n-nl-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-nl-17.04.2.tar.xz";
+      sha256 = "180dsd92qap14pkqr4xv63zdaqz4s1jyx590d705yvbf3mkc1bwx";
+      name = "kde-l10n-nl-17.04.2.tar.xz";
     };
   };
   kde-l10n-nn = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-nn-17.04.1.tar.xz";
-      sha256 = "16chm04bi7bjjbw9d3w9ljj6cd21k29qmsy6d7sdnhqxda8lv74q";
-      name = "kde-l10n-nn-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-nn-17.04.2.tar.xz";
+      sha256 = "1vbb3jvhhv8pksff8330i2b2qjksb4lksw3pb52ph2h77gb36bh3";
+      name = "kde-l10n-nn-17.04.2.tar.xz";
     };
   };
   kde-l10n-pa = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-pa-17.04.1.tar.xz";
-      sha256 = "1hg1sz2jr2v1w4gal2zr4k4vbx6fidns1hdx04ain2qmm4qxi1yq";
-      name = "kde-l10n-pa-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-pa-17.04.2.tar.xz";
+      sha256 = "0v0a6bcrnrpy2ayj7d4v6lfgaxly3nk3d6dgmy26nydgmyg0xfsa";
+      name = "kde-l10n-pa-17.04.2.tar.xz";
     };
   };
   kde-l10n-pl = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-pl-17.04.1.tar.xz";
-      sha256 = "0j3nwkadncw2bqf06cznhy7n1zcksk1x11sq3yz3ykssplbf3gr7";
-      name = "kde-l10n-pl-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-pl-17.04.2.tar.xz";
+      sha256 = "0chzlzyxjhh1rv4gl7pbph7fs09p932mkl7az8yihj3zl5cvw82n";
+      name = "kde-l10n-pl-17.04.2.tar.xz";
     };
   };
   kde-l10n-pt = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-pt-17.04.1.tar.xz";
-      sha256 = "183lwmdy5lq1picvvl1607xq8zj9lp5b9nc3lz93jswkd266707l";
-      name = "kde-l10n-pt-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-pt-17.04.2.tar.xz";
+      sha256 = "14yp29l7fb2jlpx2dd12zn64q39yf7p9p79iynjsg3spwfdm5zpi";
+      name = "kde-l10n-pt-17.04.2.tar.xz";
     };
   };
   kde-l10n-pt_BR = {
-    version = "pt_BR-17.04.1";
+    version = "pt_BR-17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-pt_BR-17.04.1.tar.xz";
-      sha256 = "0sc6hr35ly9jxm8wqnw2y1y94xcyba74qfpr19pr53791bcnrdaw";
-      name = "kde-l10n-pt_BR-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-pt_BR-17.04.2.tar.xz";
+      sha256 = "12g1mbdhw18pga063gczsxvmigdwgncc0qk8vy1rj6h5q3w6kkfm";
+      name = "kde-l10n-pt_BR-17.04.2.tar.xz";
     };
   };
   kde-l10n-ro = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-ro-17.04.1.tar.xz";
-      sha256 = "0v98kgm6x1anld8yqykkwf2c30y9qh8sr9nv6v3ipxrf02pz67g7";
-      name = "kde-l10n-ro-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ro-17.04.2.tar.xz";
+      sha256 = "0sqym2mx927pfvdq5lny64scg80xyrz3q1vlg3sk8gyil0n942gv";
+      name = "kde-l10n-ro-17.04.2.tar.xz";
     };
   };
   kde-l10n-ru = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-ru-17.04.1.tar.xz";
-      sha256 = "01cdgj50vz47pa4k25l6ykax9jfvjbg5gsc8cf5ibl5rp57fxxfc";
-      name = "kde-l10n-ru-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ru-17.04.2.tar.xz";
+      sha256 = "1gcy1ssir2fgg1djv7jbh9jv3y1pxs3yrxaqdd0m4zdkva1knx5p";
+      name = "kde-l10n-ru-17.04.2.tar.xz";
     };
   };
   kde-l10n-sk = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-sk-17.04.1.tar.xz";
-      sha256 = "1jq9rj8xb1z3992sakm47y95v0kyfx5535wn882kxx3ac18pyflh";
-      name = "kde-l10n-sk-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-sk-17.04.2.tar.xz";
+      sha256 = "0yq5b9z77bijfa3y1dx2d6avpirwzbdsz9zng93r8a3lzyv3syfi";
+      name = "kde-l10n-sk-17.04.2.tar.xz";
     };
   };
   kde-l10n-sl = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-sl-17.04.1.tar.xz";
-      sha256 = "0zpj50sf9vn9dkdrvf533wrlxivqxz1xdavkmasnjbpf6w910rr3";
-      name = "kde-l10n-sl-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-sl-17.04.2.tar.xz";
+      sha256 = "1k117r37waxlxhdhlh7s2fii2iyv8himfkxnbm4lcxfbmhqj82cn";
+      name = "kde-l10n-sl-17.04.2.tar.xz";
     };
   };
   kde-l10n-sr = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-sr-17.04.1.tar.xz";
-      sha256 = "1r6i7qy19k4m13vrv6sysqb308kgaqqfbcszm2xw9dvlwcl0xsi8";
-      name = "kde-l10n-sr-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-sr-17.04.2.tar.xz";
+      sha256 = "17xpb1q7qamz70qbg2k9i4jfbz1qsv4n0j5hw4ix9bm2dncaaqa9";
+      name = "kde-l10n-sr-17.04.2.tar.xz";
     };
   };
   kde-l10n-sv = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-sv-17.04.1.tar.xz";
-      sha256 = "0chpjchpcjk3jvrs9fgc48aw1j54nxp8q8p5z2p534c6ncwgqjh4";
-      name = "kde-l10n-sv-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-sv-17.04.2.tar.xz";
+      sha256 = "1xlzc96pcwlbja3m0m15ii8n4lxf8h8ganyyh43zgxikcibcny70";
+      name = "kde-l10n-sv-17.04.2.tar.xz";
     };
   };
   kde-l10n-tr = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-tr-17.04.1.tar.xz";
-      sha256 = "0k3bsfjqkgqyk2vnzpzkp5m5006vbxgkxn5fahjybj4p206ry2j6";
-      name = "kde-l10n-tr-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-tr-17.04.2.tar.xz";
+      sha256 = "1fmmwv85cgazk655hdaykljjrh4cgghh0wkjf57n8lkkc7503278";
+      name = "kde-l10n-tr-17.04.2.tar.xz";
     };
   };
   kde-l10n-ug = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-ug-17.04.1.tar.xz";
-      sha256 = "0dx9yv7680aqmbfqzmn2kv5kvfx4w776ihw3ag8z0m6acjzk7k4m";
-      name = "kde-l10n-ug-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-ug-17.04.2.tar.xz";
+      sha256 = "0l350qq3bfbvs7621lrl9azlx4mw5vdlrndp606v878abxaw16bh";
+      name = "kde-l10n-ug-17.04.2.tar.xz";
     };
   };
   kde-l10n-uk = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-uk-17.04.1.tar.xz";
-      sha256 = "1iq84dpsj49wb0qp37hykjfw391pffsrdjngv5jh5p6hiq1k6ajj";
-      name = "kde-l10n-uk-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-uk-17.04.2.tar.xz";
+      sha256 = "1xnkknd2k8zdiq322nbiim9hg7gvww5zv3x7gqjrrqy7nha75mh4";
+      name = "kde-l10n-uk-17.04.2.tar.xz";
     };
   };
   kde-l10n-wa = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-wa-17.04.1.tar.xz";
-      sha256 = "02b2yvi3r014h2vya54p42lwwk75zxg2dqhs920mc4sydnbrc90s";
-      name = "kde-l10n-wa-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-wa-17.04.2.tar.xz";
+      sha256 = "1f9sphx3rlc5m1ji0ihxs3p6wb7b53acfjyd5vps3b3cbf3j4aa3";
+      name = "kde-l10n-wa-17.04.2.tar.xz";
     };
   };
   kde-l10n-zh_CN = {
-    version = "zh_CN-17.04.1";
+    version = "zh_CN-17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-zh_CN-17.04.1.tar.xz";
-      sha256 = "1bggh1p2ahcjnslcgrikdk0954xyqkls32w1ckmfp1ixc1g4bkxh";
-      name = "kde-l10n-zh_CN-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-zh_CN-17.04.2.tar.xz";
+      sha256 = "1258f5s3pg6a9mfniwdf44w3y6pnf14m8nmqpfy534z68ypw6ymw";
+      name = "kde-l10n-zh_CN-17.04.2.tar.xz";
     };
   };
   kde-l10n-zh_TW = {
-    version = "zh_TW-17.04.1";
+    version = "zh_TW-17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-l10n/kde-l10n-zh_TW-17.04.1.tar.xz";
-      sha256 = "0c5h3q39hb3qbjcbh09gwiw2mqb2sd16jrb69r1xf0vxxmam5xvq";
-      name = "kde-l10n-zh_TW-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-l10n/kde-l10n-zh_TW-17.04.2.tar.xz";
+      sha256 = "0qz66hz1yabdgx3yq7cc6i5w9m01yp8pjrh46blskq6apwfwdhmg";
+      name = "kde-l10n-zh_TW-17.04.2.tar.xz";
     };
   };
   kdelibs = {
-    version = "4.14.32";
+    version = "4.14.33";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kdelibs-4.14.32.tar.xz";
-      sha256 = "10xxhgs0k2k2qyw5gjrsqckg0bj2fc3wcskapmspq68wn9iyhcr1";
-      name = "kdelibs-4.14.32.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kdelibs-4.14.33.tar.xz";
+      sha256 = "0594ak7d93sqk293p3jdi0mad2wwglk7m7x6sgj2jgaxjn3c5amq";
+      name = "kdelibs-4.14.33.tar.xz";
     };
   };
   kdenetwork-filesharing = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kdenetwork-filesharing-17.04.1.tar.xz";
-      sha256 = "14rnggp7dc99ac8gf83njw28ihw621dsawk361gf5b5x9kjcc8yx";
-      name = "kdenetwork-filesharing-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kdenetwork-filesharing-17.04.2.tar.xz";
+      sha256 = "1fac78wbh61vsk1ibkvhffgnlpds9a6ax6jyly2n9lrcqifann64";
+      name = "kdenetwork-filesharing-17.04.2.tar.xz";
     };
   };
   kdenlive = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kdenlive-17.04.1.tar.xz";
-      sha256 = "027d9azwg5mghj7a2v3z579vyp2vvzsp55crz19ansszsbapj70v";
-      name = "kdenlive-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kdenlive-17.04.2.tar.xz";
+      sha256 = "1jzwar4bdjrbf97i9g6njzibv3ywcwha4cjkmj70pql67d5nmki9";
+      name = "kdenlive-17.04.2.tar.xz";
     };
   };
   kdepim-addons = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kdepim-addons-17.04.1.tar.xz";
-      sha256 = "07s9sn012vscxabj4y5kvjg3qcjx4i8bzg9mxzvspkal1kq32nip";
-      name = "kdepim-addons-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kdepim-addons-17.04.2.tar.xz";
+      sha256 = "08hcgkjk3mwlg07g5k2b02kc67xyp2kxgh80f0v342kg455lq3fw";
+      name = "kdepim-addons-17.04.2.tar.xz";
     };
   };
   kdepim-apps-libs = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kdepim-apps-libs-17.04.1.tar.xz";
-      sha256 = "17rsw0471398ramyp8n1xipxlkrcfxdbx3a1yf65r3d0bvayl542";
-      name = "kdepim-apps-libs-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kdepim-apps-libs-17.04.2.tar.xz";
+      sha256 = "1ala5hqzhpny0sncm96kpalj7dxkh06p6j0sk3725lpjqhr1ng15";
+      name = "kdepim-apps-libs-17.04.2.tar.xz";
     };
   };
   kdepim-runtime = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kdepim-runtime-17.04.1.tar.xz";
-      sha256 = "07wjz79l02cnjk5jg5bw9ind0braypd9gssc18larhr8086h8722";
-      name = "kdepim-runtime-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kdepim-runtime-17.04.2.tar.xz";
+      sha256 = "16crq3yc7djsas9klg1vl9nmk27fqj9770lfpysgz0pglb6j6k92";
+      name = "kdepim-runtime-17.04.2.tar.xz";
     };
   };
   kde-runtime = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kde-runtime-17.04.1.tar.xz";
-      sha256 = "0rradnyh2mn3nk1z7xxda6dbh4jls7rblh2sz6rvr90cgr5iv80l";
-      name = "kde-runtime-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kde-runtime-17.04.2.tar.xz";
+      sha256 = "1885cyarf6g460mnfl1wij0xg5n4z7w406lmlrk1w4h90ql48j69";
+      name = "kde-runtime-17.04.2.tar.xz";
     };
   };
   kdesdk-kioslaves = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kdesdk-kioslaves-17.04.1.tar.xz";
-      sha256 = "09jc1nxrbmzylhp7367g9r38dww3i9q3q7vhy3piwgnhn5jyba8h";
-      name = "kdesdk-kioslaves-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kdesdk-kioslaves-17.04.2.tar.xz";
+      sha256 = "10sigid2zwgjfw737gr4wmm2ajx31v1y8y28l7dqd6y4jlkzf34j";
+      name = "kdesdk-kioslaves-17.04.2.tar.xz";
     };
   };
   kdesdk-thumbnailers = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kdesdk-thumbnailers-17.04.1.tar.xz";
-      sha256 = "0c6zg5cb3mg0qzpzrq8f885invqjdzcws50z21klbg2d4fvz2qx9";
-      name = "kdesdk-thumbnailers-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kdesdk-thumbnailers-17.04.2.tar.xz";
+      sha256 = "1bq36gqqkf2cklj6rh35r88d4vknn22p0x3p6mq9ixca0sw7yc4a";
+      name = "kdesdk-thumbnailers-17.04.2.tar.xz";
     };
   };
   kdf = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kdf-17.04.1.tar.xz";
-      sha256 = "1shb4zk27v5mr5v8iag9dw58g8x649pdvdbq1y7cnphg8xsgk3v6";
-      name = "kdf-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kdf-17.04.2.tar.xz";
+      sha256 = "00g9jyl4bxmrbxri1q3893gw362v4rzp0gpc94d46v2vi6xqb501";
+      name = "kdf-17.04.2.tar.xz";
     };
   };
   kdialog = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kdialog-17.04.1.tar.xz";
-      sha256 = "004wj2q0ljcbmzb1m3gmfaawb6b8pxsfzzw3bbcsm5qcniky8lap";
-      name = "kdialog-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kdialog-17.04.2.tar.xz";
+      sha256 = "184fyajhv4isirlv4sp8w2zxr7zkijknhsh6a1qpvr1r48ivw5aw";
+      name = "kdialog-17.04.2.tar.xz";
     };
   };
   kdiamond = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kdiamond-17.04.1.tar.xz";
-      sha256 = "0dqvxxdimhr4ax3cpc3jx18p56rqc4jrfky5zw9h4zznn2f3g17n";
-      name = "kdiamond-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kdiamond-17.04.2.tar.xz";
+      sha256 = "0krnb2g63zww655xmx1yn1105zkqryid5ip2vkn3cva2l1x8zfwr";
+      name = "kdiamond-17.04.2.tar.xz";
     };
   };
   keditbookmarks = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/keditbookmarks-17.04.1.tar.xz";
-      sha256 = "0h7h6czfjbjw24rs03xsbx7ygad85ymmsbz2sff2s3nwf7qpzdh1";
-      name = "keditbookmarks-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/keditbookmarks-17.04.2.tar.xz";
+      sha256 = "12s9v5m681f9sz49h1xdnpriik8q2zswgr051kvvckbdrxj46rqc";
+      name = "keditbookmarks-17.04.2.tar.xz";
     };
   };
   kfilereplace = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kfilereplace-17.04.1.tar.xz";
-      sha256 = "11qmxdv7pnsadk698223a8bcg4fsk7fyjcz39ms6g0wy5i8h3qc1";
-      name = "kfilereplace-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kfilereplace-17.04.2.tar.xz";
+      sha256 = "1das2szmhw3lcpl2r3cqcylx3dx3xnvqclnasr3h5ahg4z86aqhn";
+      name = "kfilereplace-17.04.2.tar.xz";
     };
   };
   kfind = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kfind-17.04.1.tar.xz";
-      sha256 = "0kic45g57fnbvszg8yk86v9wxb34xwljypnxga30i37hbr589cnn";
-      name = "kfind-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kfind-17.04.2.tar.xz";
+      sha256 = "0d04p14fzwryf9kjx7ancqi9cfhsmy9xc9ylyi7frbafr6kac5va";
+      name = "kfind-17.04.2.tar.xz";
     };
   };
   kfloppy = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kfloppy-17.04.1.tar.xz";
-      sha256 = "1faxviqz8shmh2msphglrc77h6srj0055qgsbms9cikp2pk1lybb";
-      name = "kfloppy-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kfloppy-17.04.2.tar.xz";
+      sha256 = "1f2aah2kskvyxpwkglv38ql955x1870saycym20b058dirinxg42";
+      name = "kfloppy-17.04.2.tar.xz";
     };
   };
   kfourinline = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kfourinline-17.04.1.tar.xz";
-      sha256 = "1gh2d883vicpp19ag4yk7n82w2mi25sxw4kl46kk070dj8k1448x";
-      name = "kfourinline-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kfourinline-17.04.2.tar.xz";
+      sha256 = "1423hcikj2fyy26vm5nl5q5pg6xbsjppkvd6qhjwzj9csd9m2ysr";
+      name = "kfourinline-17.04.2.tar.xz";
     };
   };
   kgeography = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kgeography-17.04.1.tar.xz";
-      sha256 = "0hifb15fnvmj0w9119v66cybf0971r4s88yfa6b3rq4nc6m59zal";
-      name = "kgeography-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kgeography-17.04.2.tar.xz";
+      sha256 = "1f7g9i4a2phi5gi5h6phn4w8l1yw2hf862yl6wwsgp4lb3agwcjb";
+      name = "kgeography-17.04.2.tar.xz";
     };
   };
   kget = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kget-17.04.1.tar.xz";
-      sha256 = "11sxrq6fpx30xfn3z8yi6isa7i2fbx36bfcphmwy0nq9xalzmwf3";
-      name = "kget-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kget-17.04.2.tar.xz";
+      sha256 = "0hnizzplcmhvkyl270bbsi587f6adb1n6vpjji1scwnfjz42pjma";
+      name = "kget-17.04.2.tar.xz";
     };
   };
   kgoldrunner = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kgoldrunner-17.04.1.tar.xz";
-      sha256 = "1hnz1nkv3m4127vk15wvp2rcy02by7ps87pmm7yjg3lwz9fgxr64";
-      name = "kgoldrunner-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kgoldrunner-17.04.2.tar.xz";
+      sha256 = "0ihh2qr7dn5ibax0ljh7ahzhr193a5ghmzgaxkfk4649qc34vnx5";
+      name = "kgoldrunner-17.04.2.tar.xz";
     };
   };
   kgpg = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kgpg-17.04.1.tar.xz";
-      sha256 = "1gdfrrk724kr5jpwpf5q7sqyqqig0rq7bzp0r2nknq42p29ssd79";
-      name = "kgpg-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kgpg-17.04.2.tar.xz";
+      sha256 = "0svr1qv9g6dm1m5ilbyws1mhrdjjq31iw0dwza3fri3vsmhhqpmx";
+      name = "kgpg-17.04.2.tar.xz";
     };
   };
   khangman = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/khangman-17.04.1.tar.xz";
-      sha256 = "12dxbj07qk5zqfw6x6prb7kap9vk8h1q5a0n7k81a0vsp5qqqpqr";
-      name = "khangman-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/khangman-17.04.2.tar.xz";
+      sha256 = "1g06sm5fwdhysj7hjsrdj19hdf0q1kzc5li4h6klp4gim8hzji7w";
+      name = "khangman-17.04.2.tar.xz";
     };
   };
   khelpcenter = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/khelpcenter-17.04.1.tar.xz";
-      sha256 = "1h6sl83dcycpi8k5mv2q8dgqf73kgpbkbr5l1if4znicsy7k52a5";
-      name = "khelpcenter-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/khelpcenter-17.04.2.tar.xz";
+      sha256 = "0zggqlyfgmpxgvjy83lqah9y927xzj8dy13pih0slnk01z50386c";
+      name = "khelpcenter-17.04.2.tar.xz";
     };
   };
   kholidays = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kholidays-17.04.1.tar.xz";
-      sha256 = "09j7594yd54pz187qg4lxm82jf9043nk79y4s9x7xgz708wvy911";
-      name = "kholidays-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kholidays-17.04.2.tar.xz";
+      sha256 = "1cyncg08binky75n93r0l5qlx1zw73dqx3xp4i7xajc7qkmiy1x9";
+      name = "kholidays-17.04.2.tar.xz";
     };
   };
   kidentitymanagement = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kidentitymanagement-17.04.1.tar.xz";
-      sha256 = "15mbd1a7ix028r3my22r34f5i2q31wq39zqlbf5hr0vq9kh0a10w";
-      name = "kidentitymanagement-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kidentitymanagement-17.04.2.tar.xz";
+      sha256 = "00pxbbnl4l4cq5mlmgf89ndfy4wykbfvhslws4is6wm3qf9v99gm";
+      name = "kidentitymanagement-17.04.2.tar.xz";
     };
   };
   kig = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kig-17.04.1.tar.xz";
-      sha256 = "1rxdqdgy93l0j37ycqlhm6cnjmy8jrvyhj85hw14b083nbrng7hj";
-      name = "kig-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kig-17.04.2.tar.xz";
+      sha256 = "0w1gl28rqqprijlqsfc8x6qjjc6nylniqvlpm71rgiwyq0zpyl1p";
+      name = "kig-17.04.2.tar.xz";
     };
   };
   kigo = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kigo-17.04.1.tar.xz";
-      sha256 = "0ghpnngpgqcbsh2n9sh9vnglig5zcwcwksfad8kwivs72ks5989j";
-      name = "kigo-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kigo-17.04.2.tar.xz";
+      sha256 = "01yjdwcfwibw1c7dgk2alyp9mj9vy70fki0zf85gi91cwkrqklsi";
+      name = "kigo-17.04.2.tar.xz";
     };
   };
   killbots = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/killbots-17.04.1.tar.xz";
-      sha256 = "1kbh25hzzgdbcn29wxa3pj4fnw0zxvnvxjn1ivfr7srqfhdqcpq7";
-      name = "killbots-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/killbots-17.04.2.tar.xz";
+      sha256 = "09a6h7q0nwj4lk81mrh1cpi27pjyxpdrk9lr2kgmjxgksavsi1p6";
+      name = "killbots-17.04.2.tar.xz";
     };
   };
   kimagemapeditor = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kimagemapeditor-17.04.1.tar.xz";
-      sha256 = "1q54zrmsjmrsmlinagzg8szbwp6mw9vbwx60fhmnrsbshp85mldv";
-      name = "kimagemapeditor-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kimagemapeditor-17.04.2.tar.xz";
+      sha256 = "00ln9mkmsky4fjn931d6y94f34fp7p11cx2vg1rafxzygr4zv0wz";
+      name = "kimagemapeditor-17.04.2.tar.xz";
     };
   };
   kimap = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kimap-17.04.1.tar.xz";
-      sha256 = "1wd445s14kl2lk7f3fk2pn0qdwy3pahmc7izzxh66jrrvbwg34jn";
-      name = "kimap-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kimap-17.04.2.tar.xz";
+      sha256 = "1g0j3n1ybx4vwyil7nic4rva2xn0dc86kbh1awcrk5q61pvkwmlr";
+      name = "kimap-17.04.2.tar.xz";
     };
   };
   kio-extras = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kio-extras-17.04.1.tar.xz";
-      sha256 = "14gw6wrhbc7lw8pjdv9z38spnciw24566b6flzbbkx29vl9m8rdq";
-      name = "kio-extras-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kio-extras-17.04.2.tar.xz";
+      sha256 = "1k84yn9q5w0wsa0rfr5rkz9pnsnhpn0xmdxx2r3kriq866iy2wfh";
+      name = "kio-extras-17.04.2.tar.xz";
     };
   };
   kiriki = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kiriki-17.04.1.tar.xz";
-      sha256 = "033g2v76ryjzsyv6scv4j5k7b9wdszycsw4zxdlp6zslbmsfi1lr";
-      name = "kiriki-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kiriki-17.04.2.tar.xz";
+      sha256 = "116llc5p785h17wlqmy7hhjm3h8cbzsa8wh5hc13g3db58zyy3l4";
+      name = "kiriki-17.04.2.tar.xz";
     };
   };
   kiten = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kiten-17.04.1.tar.xz";
-      sha256 = "10xc1zmyq0byzvpaqk3k5mrs54d7rcixsb5x8ga1axhya25n2nbi";
-      name = "kiten-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kiten-17.04.2.tar.xz";
+      sha256 = "0khyg5m13ax2i7ml7cf23jq5zr090vdqm03b6m1959lhk3warvjw";
+      name = "kiten-17.04.2.tar.xz";
     };
   };
   kjumpingcube = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kjumpingcube-17.04.1.tar.xz";
-      sha256 = "1qvkwdnpq50waycizdp0m91ypydsh2718shz8dk586ka314jhw17";
-      name = "kjumpingcube-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kjumpingcube-17.04.2.tar.xz";
+      sha256 = "073hdjv6aa6lannn2avanjcxzgsz5pdfh5xi3r1hlmcwzwx4ydis";
+      name = "kjumpingcube-17.04.2.tar.xz";
     };
   };
   kldap = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kldap-17.04.1.tar.xz";
-      sha256 = "13dnbxz57idslqsawgkrf4qahipdxi3hl8lzzzh6342dmy7pfm2s";
-      name = "kldap-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kldap-17.04.2.tar.xz";
+      sha256 = "1d5fbw11hz071rk814pfqa8gy8plznnr5wx5y16vb75a4sll1iw4";
+      name = "kldap-17.04.2.tar.xz";
     };
   };
   kleopatra = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kleopatra-17.04.1.tar.xz";
-      sha256 = "1s6fwlpq4ljhfr0kxdvzzgqp78sq4rh9wr9xz68xrq76i6r71zkh";
-      name = "kleopatra-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kleopatra-17.04.2.tar.xz";
+      sha256 = "0ph1rmxgq8n3yb61rhphw3b3kv8drdw13a418xwzc1kddpksa8r8";
+      name = "kleopatra-17.04.2.tar.xz";
     };
   };
   klettres = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/klettres-17.04.1.tar.xz";
-      sha256 = "0ai4hlc8fd1r82mn2qws3dbm6wm6rc9cwbni74ahbv6y7qdlsn8x";
-      name = "klettres-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/klettres-17.04.2.tar.xz";
+      sha256 = "093fb3n6dza44v3dqjragwkirid86frdv2v4yf54smpj8i5ykz21";
+      name = "klettres-17.04.2.tar.xz";
     };
   };
   klickety = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/klickety-17.04.1.tar.xz";
-      sha256 = "1y1nlg1hmr0020qx605r71q9b7q6nmrifacw66bh52yvscrjh8bk";
-      name = "klickety-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/klickety-17.04.2.tar.xz";
+      sha256 = "18xian4xwsj7wm5i6239cnabigzy05w02gwall884xk61mjwgqi7";
+      name = "klickety-17.04.2.tar.xz";
     };
   };
   klines = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/klines-17.04.1.tar.xz";
-      sha256 = "0dnvm0xmj6n3g23fcabmqnh6qjszv12yjq7pmhg0zy7bmf6rvg5g";
-      name = "klines-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/klines-17.04.2.tar.xz";
+      sha256 = "0va4ia1za6mynb0xxyn1z9xag0vs3pscgwkq1jfjyrd1k5inribr";
+      name = "klines-17.04.2.tar.xz";
     };
   };
   klinkstatus = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/klinkstatus-17.04.1.tar.xz";
-      sha256 = "06qhkc7hm79fda2a5afl4b8dqck8m56yqcajpn679324847qg4hx";
-      name = "klinkstatus-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/klinkstatus-17.04.2.tar.xz";
+      sha256 = "0mx16r98nr8ic5j9aqy32sz946v58cdzvhja4hxy56a2619pn7p8";
+      name = "klinkstatus-17.04.2.tar.xz";
     };
   };
   kmag = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kmag-17.04.1.tar.xz";
-      sha256 = "1aqfm6nsanzym2n20spkkm21mrvjmnnb8mysv9ll6zg32qpbyyak";
-      name = "kmag-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kmag-17.04.2.tar.xz";
+      sha256 = "1aswvc7zy8sd2jplyjmn05yvz4zjsjxy7arpzr5pb6q0za1fx1f0";
+      name = "kmag-17.04.2.tar.xz";
     };
   };
   kmahjongg = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kmahjongg-17.04.1.tar.xz";
-      sha256 = "0wgrx88alkk3w3hm4dv3rv0nv06zhxq5v35ywrd2xjhlnfp8aqbi";
-      name = "kmahjongg-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kmahjongg-17.04.2.tar.xz";
+      sha256 = "116ahf9yaw23bxz0hvfd8bs8276vc2nr3b383vahsgywakvcq71q";
+      name = "kmahjongg-17.04.2.tar.xz";
     };
   };
   kmail = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kmail-17.04.1.tar.xz";
-      sha256 = "0jfs12k2kf3rxliq0v1hl622vgz8as5zw0qpp8k063m26x54ymb4";
-      name = "kmail-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kmail-17.04.2.tar.xz";
+      sha256 = "0vqhfnr9jz2yfjbk5cghmdxhdxlhk3x6mw9b33xq2cn9iink0n4l";
+      name = "kmail-17.04.2.tar.xz";
     };
   };
   kmail-account-wizard = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kmail-account-wizard-17.04.1.tar.xz";
-      sha256 = "0h0716cmpcymi47xqdpg2bm6ggz57vzlfahjpr6apcxmxv1fg812";
-      name = "kmail-account-wizard-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kmail-account-wizard-17.04.2.tar.xz";
+      sha256 = "1l7fq7yzhp9ad1ij8fj47j9pq7adl9p2jgwsyg7gkhrfa8s02ygv";
+      name = "kmail-account-wizard-17.04.2.tar.xz";
     };
   };
   kmailtransport = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kmailtransport-17.04.1.tar.xz";
-      sha256 = "193azi5n134kicpwa08g2vkcwjcnjhsb4dl8fwk99wyvnjd2b79j";
-      name = "kmailtransport-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kmailtransport-17.04.2.tar.xz";
+      sha256 = "0yjzvfwyz546486n9d1r8lr0q41ffjlg5c3klg8zc54d8290ghdw";
+      name = "kmailtransport-17.04.2.tar.xz";
     };
   };
   kmbox = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kmbox-17.04.1.tar.xz";
-      sha256 = "16fq3m8m2wqa9xzfxggsq9r5jggax27nxlw6dn0ryg7fcbn1bdr7";
-      name = "kmbox-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kmbox-17.04.2.tar.xz";
+      sha256 = "0p1pf1a96h5bqhs5lmid0z9nd613x9vlwpraqdym5kyrzndvccys";
+      name = "kmbox-17.04.2.tar.xz";
     };
   };
   kmime = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kmime-17.04.1.tar.xz";
-      sha256 = "0blskiiiihnkyn353iajlfydqsqk01b2yvmz1hf4v2219f2cgyr8";
-      name = "kmime-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kmime-17.04.2.tar.xz";
+      sha256 = "1jz4bj2rgcn4fmjybvrlq5i6fpx1jzqlzk0z5dv0yrqrln20lmw8";
+      name = "kmime-17.04.2.tar.xz";
     };
   };
   kmines = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kmines-17.04.1.tar.xz";
-      sha256 = "1wwk8phpljccqdiyzr6156pc5a86zbag1x20r7jkzv4q1r8mm3mn";
-      name = "kmines-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kmines-17.04.2.tar.xz";
+      sha256 = "0py92mbjqni0zpds8lf5wmirjwf8cw84ybirba73x6w40ysl3ny8";
+      name = "kmines-17.04.2.tar.xz";
     };
   };
   kmix = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kmix-17.04.1.tar.xz";
-      sha256 = "1zkzcmd8x76ijnhbnam3pd0dbb41m5s0g6j39f1hk37bp5d4l2md";
-      name = "kmix-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kmix-17.04.2.tar.xz";
+      sha256 = "1dgxz6c2mm5wnmap6pj3pbiajgpm5xx1q2kklhqxc2gkqxrz25a2";
+      name = "kmix-17.04.2.tar.xz";
     };
   };
   kmousetool = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kmousetool-17.04.1.tar.xz";
-      sha256 = "1g17jhwwqfzf8d73c4bj22c4z83v147n3x97y5yr8ybj2yfw2fpa";
-      name = "kmousetool-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kmousetool-17.04.2.tar.xz";
+      sha256 = "065s73yksb39yawdz2ai221jncphanmxpxirdfnhljbg8d551k30";
+      name = "kmousetool-17.04.2.tar.xz";
     };
   };
   kmouth = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kmouth-17.04.1.tar.xz";
-      sha256 = "1k4k3n2127qr1bldvvqfxii3qk61z49jnyn3660q8xy7d2hlgrhn";
-      name = "kmouth-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kmouth-17.04.2.tar.xz";
+      sha256 = "1iqa059169w4r94r99w338z5mbkxhcfz6xjycrw2nkvnp5spc4mw";
+      name = "kmouth-17.04.2.tar.xz";
     };
   };
   kmplot = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kmplot-17.04.1.tar.xz";
-      sha256 = "10iqlm72i69wg6m1zx64bqijpvfvg9gg4f91ais5raacw4fzxz66";
-      name = "kmplot-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kmplot-17.04.2.tar.xz";
+      sha256 = "0rdg9ywmxd0bicb030kpyhcrgbhpvaac339gxwq1q2arrczds38x";
+      name = "kmplot-17.04.2.tar.xz";
     };
   };
   knavalbattle = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/knavalbattle-17.04.1.tar.xz";
-      sha256 = "1j0ivzjxi15yxv2nsbnypp7i3vq4c71n0rra7nr2mds29n33vrw3";
-      name = "knavalbattle-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/knavalbattle-17.04.2.tar.xz";
+      sha256 = "091wvhnj98s1c0as90h6qy0sx47bb95gbczljq2rrnxz6sjw3x52";
+      name = "knavalbattle-17.04.2.tar.xz";
     };
   };
   knetwalk = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/knetwalk-17.04.1.tar.xz";
-      sha256 = "0m0ywdh6hyl06cypq0ql4pzxrwpwcpzdd1q54a02z7vhz3pg4y7i";
-      name = "knetwalk-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/knetwalk-17.04.2.tar.xz";
+      sha256 = "0g0q9m63qc33gfklpqpncvd3qdjpbjb53701ypiby3dlyb1znf3d";
+      name = "knetwalk-17.04.2.tar.xz";
     };
   };
   knotes = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/knotes-17.04.1.tar.xz";
-      sha256 = "1iv7r1ick6m3692l0p3hjval4g5swbg55ac3mrp5nxxczwl2m9h1";
-      name = "knotes-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/knotes-17.04.2.tar.xz";
+      sha256 = "1ypl677rhgq8hmy9y5zryfs4zcyzj88ajlwvsxd3lv9ybkc7ymhy";
+      name = "knotes-17.04.2.tar.xz";
     };
   };
   kolf = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kolf-17.04.1.tar.xz";
-      sha256 = "0g6j8irmbs7j2h4bdjixqxl25wbk672cdlfj0r6icv7s43cbkm61";
-      name = "kolf-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kolf-17.04.2.tar.xz";
+      sha256 = "157gppkzgv3394pcxr3mc9vi0bd8hy9bjmmjcq9g8p5gdpj148ag";
+      name = "kolf-17.04.2.tar.xz";
     };
   };
   kollision = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kollision-17.04.1.tar.xz";
-      sha256 = "0h50dg4ch7ll8naz3ivvlwn4bk686322064ycggbb77nqny9pjlx";
-      name = "kollision-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kollision-17.04.2.tar.xz";
+      sha256 = "065h6lm71h4184jk8lh1gz5bq1kyxnpyf7jg0y50q9g8fm147s5j";
+      name = "kollision-17.04.2.tar.xz";
     };
   };
   kolourpaint = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kolourpaint-17.04.1.tar.xz";
-      sha256 = "1mzp0v5l4y45zdb4y4qwy6blnv3ndw009dcsgaylzb4vx7d39j3f";
-      name = "kolourpaint-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kolourpaint-17.04.2.tar.xz";
+      sha256 = "09kgmkqzcr534vz24w9p27zzd0hwh43cz09pjfdcgcwq5bsnni3s";
+      name = "kolourpaint-17.04.2.tar.xz";
     };
   };
   kompare = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kompare-17.04.1.tar.xz";
-      sha256 = "1y19xx5sgnl8p5kvpyqcrgji8ccrkj0m24lbli3scqwngqvv4qj9";
-      name = "kompare-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kompare-17.04.2.tar.xz";
+      sha256 = "0q6mi2l3bvl15qrylngdrngsvzv2dc26550pkjm1db94byx1qfk2";
+      name = "kompare-17.04.2.tar.xz";
     };
   };
   konqueror = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/konqueror-17.04.1.tar.xz";
-      sha256 = "12i82amdi9lpq1iwbmzq975190vssl99bw76mbf285r2bk3w0m5c";
-      name = "konqueror-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/konqueror-17.04.2.tar.xz";
+      sha256 = "0f36frk1wzw75w982clzlfxic7nj8nmslwy2wk855p3arcrg2dcq";
+      name = "konqueror-17.04.2.tar.xz";
     };
   };
   konquest = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/konquest-17.04.1.tar.xz";
-      sha256 = "08r3kanqhvfkfr7mk9c5xdlcag6knmqhbldvxj5f6ikf3al61n7g";
-      name = "konquest-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/konquest-17.04.2.tar.xz";
+      sha256 = "10apw2dj9xxrv4rw200lxb1iiqd2kpikb7njkf1x0h7c6lp7isxc";
+      name = "konquest-17.04.2.tar.xz";
     };
   };
   konsole = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/konsole-17.04.1.tar.xz";
-      sha256 = "0km8w0mjzywpzz7qq7fchm0s9q2pzrq72wsqsc5gbd1ip5wlgcmk";
-      name = "konsole-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/konsole-17.04.2.tar.xz";
+      sha256 = "1v37v4shq0k3kv8vqnp9b1ghdirjj3vsjcvalkiagz94w1g61vyl";
+      name = "konsole-17.04.2.tar.xz";
     };
   };
   kontact = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kontact-17.04.1.tar.xz";
-      sha256 = "1ik4qib3wsqw5vwnd794w3jig9zngsv3ss9jdlkw0y4q5695wrxi";
-      name = "kontact-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kontact-17.04.2.tar.xz";
+      sha256 = "12gd453gdxmwbnqrlnbbqnqxd8chpf57mnjv498nhjv6sfj6mshv";
+      name = "kontact-17.04.2.tar.xz";
     };
   };
   kontactinterface = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kontactinterface-17.04.1.tar.xz";
-      sha256 = "1yb3dmfhsgm2pmbha3q22lzpfgj63d6qhanrwpmc2zy67r7r26ap";
-      name = "kontactinterface-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kontactinterface-17.04.2.tar.xz";
+      sha256 = "1q4fdf4lglq84n0pva7fdqq4fqbwkq9g0qyp5mfq3fhvzbba3as1";
+      name = "kontactinterface-17.04.2.tar.xz";
     };
   };
   kopete = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kopete-17.04.1.tar.xz";
-      sha256 = "1cv9fg4jr88w60ajgnbfhbvlylvxbv6r4j01sqmljwn8gsgbhpyi";
-      name = "kopete-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kopete-17.04.2.tar.xz";
+      sha256 = "0bicwm8r4rl4awxkpi4hin95n37yj4ln29gp0z6j97fzc7kpiqlj";
+      name = "kopete-17.04.2.tar.xz";
     };
   };
   korganizer = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/korganizer-17.04.1.tar.xz";
-      sha256 = "1dlv5gcv4ic7np4raxirgjcrlvmqkzmblhws1v0hwy49dximic88";
-      name = "korganizer-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/korganizer-17.04.2.tar.xz";
+      sha256 = "0lrxy232v2gn40sd63xspyszkmqn1v6l40zcxpv9r7x62wn4v55r";
+      name = "korganizer-17.04.2.tar.xz";
     };
   };
   kpat = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kpat-17.04.1.tar.xz";
-      sha256 = "15sxp8f7cr91s1iczqqnh92zsj027r67hq8a6sgkrkvsb5f3j9a8";
-      name = "kpat-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kpat-17.04.2.tar.xz";
+      sha256 = "1r8i5aisllg9ykgy75gfnma2y8v6y67fa91z6r0q16bg66l2ij44";
+      name = "kpat-17.04.2.tar.xz";
     };
   };
   kpimtextedit = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kpimtextedit-17.04.1.tar.xz";
-      sha256 = "1lazicp6a2j9pj4sh0q8cnd6k9imcr8j0l9y7ix3gad3mfh9m0y4";
-      name = "kpimtextedit-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kpimtextedit-17.04.2.tar.xz";
+      sha256 = "0d739nadn8n2393hq9rm2v8qx8l9jk7n1wgpbdbsddfq2lxz8g39";
+      name = "kpimtextedit-17.04.2.tar.xz";
     };
   };
   kppp = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kppp-17.04.1.tar.xz";
-      sha256 = "1wqam64c2gmmf1ckwwyhaf7n8sqzn7liy5jx0dr4icppxpprc6ki";
-      name = "kppp-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kppp-17.04.2.tar.xz";
+      sha256 = "1nm6kzjdwrl7206gwd47irhkj94vifxqhikc4g8jkvfh60rh87j8";
+      name = "kppp-17.04.2.tar.xz";
     };
   };
   kqtquickcharts = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kqtquickcharts-17.04.1.tar.xz";
-      sha256 = "10bmkwq58yqkhchgz59gi3x8lb4lr8rhpwji3jysz3sfkvz765pi";
-      name = "kqtquickcharts-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kqtquickcharts-17.04.2.tar.xz";
+      sha256 = "0zjb7p3yxlpz8cyczsr9xwh44l7k1ddg1zwxqah91igdk7mc620x";
+      name = "kqtquickcharts-17.04.2.tar.xz";
     };
   };
   krdc = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/krdc-17.04.1.tar.xz";
-      sha256 = "0d5m8sizvjn6pbn63686vhfkh1cklxwjlphs2zrg0yaa00c71k2f";
-      name = "krdc-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/krdc-17.04.2.tar.xz";
+      sha256 = "0y8s28rwxjbpgq6kfhmrq9qr4h19iplfrgab7rb25zl881g9wycg";
+      name = "krdc-17.04.2.tar.xz";
     };
   };
   kremotecontrol = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kremotecontrol-17.04.1.tar.xz";
-      sha256 = "1855hsz5cndc26g7x0rw2k2mdvix80bi251dh5gz92w5d3jms9mz";
-      name = "kremotecontrol-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kremotecontrol-17.04.2.tar.xz";
+      sha256 = "1lw45vnarqw975zz38z9nnmqvk91j2viijl0sf4h2ikx0myqiif7";
+      name = "kremotecontrol-17.04.2.tar.xz";
     };
   };
   kreversi = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kreversi-17.04.1.tar.xz";
-      sha256 = "1x99b5q03vhxxr3xy2qxh6rglcz3qld62s29bnykpbzl2h2wdy63";
-      name = "kreversi-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kreversi-17.04.2.tar.xz";
+      sha256 = "1xhw4i4s7g7k3v4siprg2d1h9g4smqjwhz4qjzz236wmgky7na1b";
+      name = "kreversi-17.04.2.tar.xz";
     };
   };
   krfb = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/krfb-17.04.1.tar.xz";
-      sha256 = "115jrbf4nfdyks90gf1lmz7fl3cj07kqn0pg8mq1dhrv8vh4v6ys";
-      name = "krfb-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/krfb-17.04.2.tar.xz";
+      sha256 = "17lcv2kplawmvakashvrpk50g5ycw5fai4fiz0ijsj05ivqmrb6z";
+      name = "krfb-17.04.2.tar.xz";
     };
   };
   kross-interpreters = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kross-interpreters-17.04.1.tar.xz";
-      sha256 = "0mnfj0rjy6lv5ps6rmxr2ci16bsialpinnr7imh493rxhpnkaqa3";
-      name = "kross-interpreters-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kross-interpreters-17.04.2.tar.xz";
+      sha256 = "0m2adnwhdclhhql0v3g2ay31g7ly67m3782ryq0vp9r8rcd5ga1b";
+      name = "kross-interpreters-17.04.2.tar.xz";
     };
   };
   kruler = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kruler-17.04.1.tar.xz";
-      sha256 = "1dc4n8awj5hj8z843a4x10ijx4p5y5v1w26zvw5mfixznv3csry4";
-      name = "kruler-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kruler-17.04.2.tar.xz";
+      sha256 = "175c67m1wi9sl6is9f5pbsb3p6siyi9w7219p4ff6wbbjqjxpj2f";
+      name = "kruler-17.04.2.tar.xz";
     };
   };
   ksaneplugin = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/ksaneplugin-17.04.1.tar.xz";
-      sha256 = "1b35jksdyvqaqchdgixx7arbgwd9p6wpsqgvs3br4za4z2mccrvw";
-      name = "ksaneplugin-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/ksaneplugin-17.04.2.tar.xz";
+      sha256 = "16j4mpl9ick5d43rxnwmvfsb2wr5zgpmr3mlnmn99cvpr27v9mkg";
+      name = "ksaneplugin-17.04.2.tar.xz";
     };
   };
   kscd = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kscd-17.04.1.tar.xz";
-      sha256 = "18mdkkwr843kpb1hf45lvmmbl9m5nyzxx6i1yd3nllcja8ybdx0j";
-      name = "kscd-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kscd-17.04.2.tar.xz";
+      sha256 = "0cgxbhmmw8n7fwin3glzgfx0m1sdx2k4yhkrjislni3raiq4rv9x";
+      name = "kscd-17.04.2.tar.xz";
     };
   };
   kshisen = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kshisen-17.04.1.tar.xz";
-      sha256 = "0xpnn1hg73lmb1zhdzdq4wj99fmyn085n3kggqzb8w2mspl431r7";
-      name = "kshisen-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kshisen-17.04.2.tar.xz";
+      sha256 = "0644aadh6svdhxb64hzhnvm11w071gax6bj30r0ad3zbqljzhnfv";
+      name = "kshisen-17.04.2.tar.xz";
     };
   };
   ksirk = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/ksirk-17.04.1.tar.xz";
-      sha256 = "0rjjgz6s05zv2clh9h75qlmdqq2dijd3avpg7hdczx425ji96fgh";
-      name = "ksirk-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/ksirk-17.04.2.tar.xz";
+      sha256 = "0zh304xwknka6336avzpc5dvv2v6sl474d5q9vqzj8h0ybhdr5pb";
+      name = "ksirk-17.04.2.tar.xz";
     };
   };
   ksnakeduel = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/ksnakeduel-17.04.1.tar.xz";
-      sha256 = "10lqvf9904yc9rbmhicjbsq2dhnar55kk4dfp4w9lwy39snjpaxl";
-      name = "ksnakeduel-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/ksnakeduel-17.04.2.tar.xz";
+      sha256 = "137am9qi5wfg90b7zf4hk0nsa8pm9f8cj7iraij492d6naif8an5";
+      name = "ksnakeduel-17.04.2.tar.xz";
     };
   };
   kspaceduel = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kspaceduel-17.04.1.tar.xz";
-      sha256 = "00sghhxbkpcig2r9sdhyfqkmlk03f34vf44iwma1lyi2vb22bjsj";
-      name = "kspaceduel-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kspaceduel-17.04.2.tar.xz";
+      sha256 = "0jkr7xbgrgnwa94fdr1w03xxy75nksr31wb1sr2b3kpwp5ax1380";
+      name = "kspaceduel-17.04.2.tar.xz";
     };
   };
   ksquares = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/ksquares-17.04.1.tar.xz";
-      sha256 = "11y7m98x1zxk3wk9bc91y9m9j5d4bhgzk504k0zq0nm4hbxrvj81";
-      name = "ksquares-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/ksquares-17.04.2.tar.xz";
+      sha256 = "07fn872d126wv0gcfd58jd72ypajlpkfcd4njzj0v05x6i0njir0";
+      name = "ksquares-17.04.2.tar.xz";
     };
   };
   kstars = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kstars-17.04.1.tar.xz";
-      sha256 = "0n2yjnaks4l2irfh978bdmifvrpfwgqlanvssibnnnarlq99mmbb";
-      name = "kstars-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kstars-17.04.2.tar.xz";
+      sha256 = "1r47l3zifb0carmgn0rv6wddqn483q9jadrwbahqp7b1yy14rkcj";
+      name = "kstars-17.04.2.tar.xz";
     };
   };
   ksudoku = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/ksudoku-17.04.1.tar.xz";
-      sha256 = "1ba79iy8qly5js7ak2gycvmbhqzh3wk3xkms5fphav06f9xxapd4";
-      name = "ksudoku-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/ksudoku-17.04.2.tar.xz";
+      sha256 = "11cvix24p1lpiss472yflcrwvygn0cxw4b5p9qhra643sx6bw5h5";
+      name = "ksudoku-17.04.2.tar.xz";
     };
   };
   ksystemlog = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/ksystemlog-17.04.1.tar.xz";
-      sha256 = "0jjy6l8dvs56qn1gnb3zz5aigy3lz89f3xb412k500mx8sghlghn";
-      name = "ksystemlog-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/ksystemlog-17.04.2.tar.xz";
+      sha256 = "1sw5f89khflmcbwwd1z399bwlnnl2lqp2qrj7wfdxb7s91j4jk2m";
+      name = "ksystemlog-17.04.2.tar.xz";
     };
   };
   kteatime = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kteatime-17.04.1.tar.xz";
-      sha256 = "1dnkpjxs5a1s5lz1kdxp51yaix5wbcxd93hljzv82kr8j60jgi06";
-      name = "kteatime-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kteatime-17.04.2.tar.xz";
+      sha256 = "10yqww3hybjirncjsxpya08c49ca0ac6zn6anjc1mb9nvji203xb";
+      name = "kteatime-17.04.2.tar.xz";
     };
   };
   ktimer = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/ktimer-17.04.1.tar.xz";
-      sha256 = "0l34i73464jc2ij6ain01wg91047vfi020bxd3kn056064pv0fz7";
-      name = "ktimer-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/ktimer-17.04.2.tar.xz";
+      sha256 = "19b27l308xb70wbx06fxykdwzcan3cjf7naj51fgma4qcm6xjdir";
+      name = "ktimer-17.04.2.tar.xz";
     };
   };
   ktnef = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/ktnef-17.04.1.tar.xz";
-      sha256 = "1x112a71b2ccmhd9i3rpp7fjdns4338c3cwd3w6ajq5rwiw5nkw7";
-      name = "ktnef-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/ktnef-17.04.2.tar.xz";
+      sha256 = "0vpq81gyjr14xf94h654v8cmfvndhc9wn8zznp9a7jbpzp4wdfnj";
+      name = "ktnef-17.04.2.tar.xz";
     };
   };
   ktouch = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/ktouch-17.04.1.tar.xz";
-      sha256 = "1jx915vxln4iyxkv01fnpqsy3mwiyds1shpxah7ldm2jwxffb672";
-      name = "ktouch-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/ktouch-17.04.2.tar.xz";
+      sha256 = "17chk2vzvb8manyfcsnr73pfnvy128fi8g20r1gnidhgw6ix0s1r";
+      name = "ktouch-17.04.2.tar.xz";
     };
   };
   ktp-accounts-kcm = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/ktp-accounts-kcm-17.04.1.tar.xz";
-      sha256 = "1mgkbgj61y4y5jwi8mm7i94wgrdk4xm541srvyi2qj6hif6m46zg";
-      name = "ktp-accounts-kcm-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/ktp-accounts-kcm-17.04.2.tar.xz";
+      sha256 = "0kbnhkhw787bbgkpnchxkmwnzr2s4nqwmknzf34h613mlv7wspvg";
+      name = "ktp-accounts-kcm-17.04.2.tar.xz";
     };
   };
   ktp-approver = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/ktp-approver-17.04.1.tar.xz";
-      sha256 = "03m7fp3bas46v9qf0mdcy429nmbbng12ypc73prw1y46i8qxhf5b";
-      name = "ktp-approver-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/ktp-approver-17.04.2.tar.xz";
+      sha256 = "0986j2yy57jzg5z4czmrjw625ihw1393mv8h8kqipw727vvchka9";
+      name = "ktp-approver-17.04.2.tar.xz";
     };
   };
   ktp-auth-handler = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/ktp-auth-handler-17.04.1.tar.xz";
-      sha256 = "0pd803ygjdv1ip27ipjwygzv0gs7a9wjkiv97cs0z5pwvy9aa9gl";
-      name = "ktp-auth-handler-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/ktp-auth-handler-17.04.2.tar.xz";
+      sha256 = "0hlch8d2fj6xnnd39v5q9vri8svn1852am1kbvvyws770kgldj49";
+      name = "ktp-auth-handler-17.04.2.tar.xz";
     };
   };
   ktp-call-ui = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/ktp-call-ui-17.04.1.tar.xz";
-      sha256 = "0knn3nz6fml04yg8j9sl39w3c2kgnlhp416vsp0flnxaqlh2jpb2";
-      name = "ktp-call-ui-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/ktp-call-ui-17.04.2.tar.xz";
+      sha256 = "070ms5wyifqnc64x3r835vvbvn0l253qkn1li7bkqmsjg50q5sm7";
+      name = "ktp-call-ui-17.04.2.tar.xz";
     };
   };
   ktp-common-internals = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/ktp-common-internals-17.04.1.tar.xz";
-      sha256 = "1jb3xjdr6jmawc5rdd6fp0di2gw0hqkqffbxnjvszdpnck2dk550";
-      name = "ktp-common-internals-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/ktp-common-internals-17.04.2.tar.xz";
+      sha256 = "01xrdn1609ag2kha3wp756fh4kszvcp8biky3cgp52qasmp6k4k2";
+      name = "ktp-common-internals-17.04.2.tar.xz";
     };
   };
   ktp-contact-list = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/ktp-contact-list-17.04.1.tar.xz";
-      sha256 = "16qwkbhxk5n11j6f02wjq2sjid7apn8xxcn157pinhg0wfkvbysz";
-      name = "ktp-contact-list-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/ktp-contact-list-17.04.2.tar.xz";
+      sha256 = "03iwx1xsd1scgw20s7n8cj7ai6cnlna19dd93s2a7r3z4jhwxkx0";
+      name = "ktp-contact-list-17.04.2.tar.xz";
     };
   };
   ktp-contact-runner = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/ktp-contact-runner-17.04.1.tar.xz";
-      sha256 = "1x7zkylc4p1al3ikb0srf4yx3p3qdwi2jas88pz7gyrs8sk1d3l0";
-      name = "ktp-contact-runner-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/ktp-contact-runner-17.04.2.tar.xz";
+      sha256 = "1fal6g5zrh0s4wcxsqgps3a20xfdjc3pyw4dhdpgnsr6ig1z7rwn";
+      name = "ktp-contact-runner-17.04.2.tar.xz";
     };
   };
   ktp-desktop-applets = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/ktp-desktop-applets-17.04.1.tar.xz";
-      sha256 = "0djjcd4rnqvjqijyygcaiv0p0yga5gx28lfqa3pjbwfqnqwp1r2q";
-      name = "ktp-desktop-applets-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/ktp-desktop-applets-17.04.2.tar.xz";
+      sha256 = "0306lar375vh2wr9g2iicjawd5rm5zh7vp81jl0hgmzx7kxcjxgz";
+      name = "ktp-desktop-applets-17.04.2.tar.xz";
     };
   };
   ktp-filetransfer-handler = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/ktp-filetransfer-handler-17.04.1.tar.xz";
-      sha256 = "1f3ks1m30k496yxlhjnbxnnqmj6y3arxw0m2fwjykk5c4jxq6h3a";
-      name = "ktp-filetransfer-handler-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/ktp-filetransfer-handler-17.04.2.tar.xz";
+      sha256 = "044sr00rlcvxfw59f5m4i33jg4f8i77a8yjf3sdwjrnh03nsbjxz";
+      name = "ktp-filetransfer-handler-17.04.2.tar.xz";
     };
   };
   ktp-kded-module = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/ktp-kded-module-17.04.1.tar.xz";
-      sha256 = "0smgqwbkfnkcyk86whrb1mazmglrmgczd5y3a0ah4ry5z0bqgv4m";
-      name = "ktp-kded-module-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/ktp-kded-module-17.04.2.tar.xz";
+      sha256 = "19f5kdd3g54791a7ilsaas5ibj3f8gb889n82gh88lq7q9zrs5f3";
+      name = "ktp-kded-module-17.04.2.tar.xz";
     };
   };
   ktp-send-file = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/ktp-send-file-17.04.1.tar.xz";
-      sha256 = "0pjc1qpx4jnvvpjvc5np3w2bsvkaryb8fa1zkx5a0dzcg0dwr7ab";
-      name = "ktp-send-file-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/ktp-send-file-17.04.2.tar.xz";
+      sha256 = "1ydwnmyqwbf5qjhy9w2z2788p7maa591nlc946ar32wg2sc6ik57";
+      name = "ktp-send-file-17.04.2.tar.xz";
     };
   };
   ktp-text-ui = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/ktp-text-ui-17.04.1.tar.xz";
-      sha256 = "0jmpnv2mb4s9pxyifggj5qaafw9l54af3dgmgmpyhjyhl3g8rpcb";
-      name = "ktp-text-ui-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/ktp-text-ui-17.04.2.tar.xz";
+      sha256 = "1s5dhhc1ihnlz08a2vwalzmk6zm2kb157smn07a9ilq0l64psdqa";
+      name = "ktp-text-ui-17.04.2.tar.xz";
     };
   };
   ktuberling = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/ktuberling-17.04.1.tar.xz";
-      sha256 = "0plzn26j9kinaq2amm9x6mr57zl5mp79k7g74mrnpw1qbvvfbnsf";
-      name = "ktuberling-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/ktuberling-17.04.2.tar.xz";
+      sha256 = "18krcrj9xlajj3q6vspw79snwnliqc00djpq8ra6yg2l56xqbwym";
+      name = "ktuberling-17.04.2.tar.xz";
     };
   };
   kturtle = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kturtle-17.04.1.tar.xz";
-      sha256 = "0i8h202irr40lw5n1rwq4vzwd6ifmbhww8yfj4jlm2vacsc9qs7a";
-      name = "kturtle-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kturtle-17.04.2.tar.xz";
+      sha256 = "140j7xws7kfw0cf4axf0jgfk9ywvrds79906iwzf1nig8rbxrfy1";
+      name = "kturtle-17.04.2.tar.xz";
     };
   };
   kubrick = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kubrick-17.04.1.tar.xz";
-      sha256 = "0jasrbiafhxv5fdcmsrhwfszq5il6671ng4wlngmny660y850zh5";
-      name = "kubrick-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kubrick-17.04.2.tar.xz";
+      sha256 = "0pli70hkmb973j935fnjsaaml4gnck4jmzh3kph78wrhlxwqanqh";
+      name = "kubrick-17.04.2.tar.xz";
     };
   };
   kwalletmanager = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kwalletmanager-17.04.1.tar.xz";
-      sha256 = "0wn0z48nnay2ch6nqnkfz8lbwajcdy84xhxi1wbr7xm8w2qy07f1";
-      name = "kwalletmanager-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kwalletmanager-17.04.2.tar.xz";
+      sha256 = "1y1h7j6jg0nm5kfw03k5b9m39v5vfyflcfrfcqz4q19c3zx7msrw";
+      name = "kwalletmanager-17.04.2.tar.xz";
     };
   };
   kwave = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kwave-17.04.1.tar.xz";
-      sha256 = "1rzm48n3kgh8xhpvjg9r4ifa67v800q3km8fblznqzkarihmaiff";
-      name = "kwave-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kwave-17.04.2.tar.xz";
+      sha256 = "0zk3xq76asz1lq1bvn5xyrly9qwz1bvipwsj03psckzzm0j2wx2j";
+      name = "kwave-17.04.2.tar.xz";
     };
   };
   kwordquiz = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/kwordquiz-17.04.1.tar.xz";
-      sha256 = "024hypbi1d2j8vj2fnv1smqc0avp9b24lm6v15g50rhzrlzhz71s";
-      name = "kwordquiz-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/kwordquiz-17.04.2.tar.xz";
+      sha256 = "00x9l00d3aq8jcg4522faj9mp94k0526i41ls3wvmfd7q1i18viz";
+      name = "kwordquiz-17.04.2.tar.xz";
     };
   };
   libgravatar = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/libgravatar-17.04.1.tar.xz";
-      sha256 = "170ddmgclpw3ww1d7ars96ccygr9zpd9b8wxw2c93gjc2w92b9gd";
-      name = "libgravatar-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/libgravatar-17.04.2.tar.xz";
+      sha256 = "1w36qj6n40k2yxva1qw9naag6zz05gcnia3sqmfamzxdji4l3nis";
+      name = "libgravatar-17.04.2.tar.xz";
     };
   };
   libkcddb = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/libkcddb-17.04.1.tar.xz";
-      sha256 = "1xyyy74nx8h0zljj0mf2i88jj6wrawi2n9wlzbcb5qn2jxbswkjk";
-      name = "libkcddb-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/libkcddb-17.04.2.tar.xz";
+      sha256 = "0cvy01krgvayc3hmsv55rrqjp72d27fz58clzw51p6zf2kvjn4q3";
+      name = "libkcddb-17.04.2.tar.xz";
     };
   };
   libkcompactdisc = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/libkcompactdisc-17.04.1.tar.xz";
-      sha256 = "0s0a84vxy3lahjdsa18cwx1pm5pdlrrx780plw1phs0vv1wwyhiq";
-      name = "libkcompactdisc-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/libkcompactdisc-17.04.2.tar.xz";
+      sha256 = "1ywpghj4dy8ly15g55q8mhmx85xlxz3zasblhzsyxqh6rgwhnab6";
+      name = "libkcompactdisc-17.04.2.tar.xz";
     };
   };
   libkdcraw = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/libkdcraw-17.04.1.tar.xz";
-      sha256 = "1a0qz0zrplyzfcsfgajflfxb0yiz51chfkjy2b9nmnrp43qbjrpy";
-      name = "libkdcraw-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/libkdcraw-17.04.2.tar.xz";
+      sha256 = "17dd68wlc7528prywps7slv6f9jfzbfhfmdlv20q0lzrjlxb2jxk";
+      name = "libkdcraw-17.04.2.tar.xz";
     };
   };
   libkdegames = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/libkdegames-17.04.1.tar.xz";
-      sha256 = "1zccwm3cdwdqimq6q0rbz6kcwqig721fq2gz6vip7ywv79f0a4rm";
-      name = "libkdegames-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/libkdegames-17.04.2.tar.xz";
+      sha256 = "07vs2077w7g6hvzaa9m7p6w3qc9daly174x7sq5an3wxb78zaj4k";
+      name = "libkdegames-17.04.2.tar.xz";
     };
   };
   libkdepim = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/libkdepim-17.04.1.tar.xz";
-      sha256 = "10dlvlh01c3mm84sbk9zkmcfclzs2n38ga0w1p7cnqj1ln7p497x";
-      name = "libkdepim-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/libkdepim-17.04.2.tar.xz";
+      sha256 = "1s6vvbxjrhvgc147ila9ryy5z1c76dqc9nrxdblkdk36kgj193xs";
+      name = "libkdepim-17.04.2.tar.xz";
     };
   };
   libkeduvocdocument = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/libkeduvocdocument-17.04.1.tar.xz";
-      sha256 = "008d1cpxv9by2b4a7bbf0k0g9pib5nc22k6hxcpg6qds2wivdgxn";
-      name = "libkeduvocdocument-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/libkeduvocdocument-17.04.2.tar.xz";
+      sha256 = "1lakkz3ffp3qkhp15l8g04f1izgigv96ravj13yqvlafcj0l4wwh";
+      name = "libkeduvocdocument-17.04.2.tar.xz";
     };
   };
   libkexiv2 = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/libkexiv2-17.04.1.tar.xz";
-      sha256 = "1a01y4hd4ysz3icp2l88qly2mzpy5kgr97zs8ck62p4dr8p06q62";
-      name = "libkexiv2-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/libkexiv2-17.04.2.tar.xz";
+      sha256 = "113gfmdvk85mlgq97hi5n4sn0ar55qy4lvrngzp70hr5gyk6jx87";
+      name = "libkexiv2-17.04.2.tar.xz";
     };
   };
   libkface = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/libkface-17.04.1.tar.xz";
-      sha256 = "0hjq0zv36fp2yyryiz3bbq0v15xl6qhnlpj1ixx3d6krmc5pkyia";
-      name = "libkface-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/libkface-17.04.2.tar.xz";
+      sha256 = "04cp6fqji8s6zsv09nbdkv9ikff5df5gb2nqbfdhh5hdyl5k9a6y";
+      name = "libkface-17.04.2.tar.xz";
     };
   };
   libkgapi = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/libkgapi-17.04.1.tar.xz";
-      sha256 = "19iv2mzmr3wp1grnjdmck4i22jagjzr49lnpdb5ljgyf0xlqzwir";
-      name = "libkgapi-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/libkgapi-17.04.2.tar.xz";
+      sha256 = "1awcfwf1haa38vnr5273y5xk9b64s7m139aqgyr7r72czm96ql8s";
+      name = "libkgapi-17.04.2.tar.xz";
     };
   };
   libkgeomap = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/libkgeomap-17.04.1.tar.xz";
-      sha256 = "1bh4h2ymb4gh0bhqg8akwpq9d8a5vcwiscavnnc9ihjjhnhzz79w";
-      name = "libkgeomap-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/libkgeomap-17.04.2.tar.xz";
+      sha256 = "0gbri3vfan9n3za0qd5bzbwvmkslbsylg5rw11zlcl9r8c5yz23p";
+      name = "libkgeomap-17.04.2.tar.xz";
     };
   };
   libkipi = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/libkipi-17.04.1.tar.xz";
-      sha256 = "0bqxjhj9h22r7i770ibfsxzyxp9y81174xvn9fvi0v77m2myfnb4";
-      name = "libkipi-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/libkipi-17.04.2.tar.xz";
+      sha256 = "0spy876l7mzpb1kgbwxpi8nfyysd1xijg2ilbvbiisxf92krvxny";
+      name = "libkipi-17.04.2.tar.xz";
     };
   };
   libkleo = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/libkleo-17.04.1.tar.xz";
-      sha256 = "1541aalr8pw690qp2rh133yyby877c5fiz1x3qmzhznm7jhjh293";
-      name = "libkleo-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/libkleo-17.04.2.tar.xz";
+      sha256 = "05pz45g11sxjcmijdklb4kp2n7ydi33vbdfl43fjl0s7rv7vmzr4";
+      name = "libkleo-17.04.2.tar.xz";
     };
   };
   libkmahjongg = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/libkmahjongg-17.04.1.tar.xz";
-      sha256 = "0wjyy5ic7draw09s8kfcng6m0bp0sxd0nr1vqgfcjg4gqicdqpc7";
-      name = "libkmahjongg-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/libkmahjongg-17.04.2.tar.xz";
+      sha256 = "1dd58zz8zlcrwwn1zkhp2lw8h83fwiajaxf2yibwbk0bza1ydp3r";
+      name = "libkmahjongg-17.04.2.tar.xz";
     };
   };
   libkomparediff2 = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/libkomparediff2-17.04.1.tar.xz";
-      sha256 = "1rc0kvxjmnwhaadl6f9x61n4lnr50g7w0k8d7k9y73fib60wjcvp";
-      name = "libkomparediff2-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/libkomparediff2-17.04.2.tar.xz";
+      sha256 = "156s5lyna9wgj1cfqm36snyax9hybsr9xa72n246a94z81r6afsz";
+      name = "libkomparediff2-17.04.2.tar.xz";
     };
   };
   libksane = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/libksane-17.04.1.tar.xz";
-      sha256 = "15qmlrxhs45xscjsrnr8c0ag20l4wclmbbmsb3cpa35lrfh5ybp0";
-      name = "libksane-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/libksane-17.04.2.tar.xz";
+      sha256 = "12h6l6wa8g2qfddl9ylm9q4f8f2w7bgmii1v6yrmfb4nyr4bflda";
+      name = "libksane-17.04.2.tar.xz";
     };
   };
   libksieve = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/libksieve-17.04.1.tar.xz";
-      sha256 = "0i5qy9skd100y4khsr8wnyibz2jmjk5gwz21afhx6hrrv5sv8bbg";
-      name = "libksieve-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/libksieve-17.04.2.tar.xz";
+      sha256 = "0kz8nzd3cgipc3s3zif57d681ddb6xmb7kid25j3aypcz0i7gck1";
+      name = "libksieve-17.04.2.tar.xz";
     };
   };
   lokalize = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/lokalize-17.04.1.tar.xz";
-      sha256 = "06kvrg6dm4hm7dz2lkxmqk5q2nqpxhwcqfwgh1bzlp7lydych5nx";
-      name = "lokalize-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/lokalize-17.04.2.tar.xz";
+      sha256 = "0a85gjj40r5iw6mf190s4r4c4xsh1nfixj15g86acz02dn43zapn";
+      name = "lokalize-17.04.2.tar.xz";
     };
   };
   lskat = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/lskat-17.04.1.tar.xz";
-      sha256 = "1062qyih9dsybkp5njd6r71r6hz6ymm60gga7v17sfj98995znwb";
-      name = "lskat-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/lskat-17.04.2.tar.xz";
+      sha256 = "0blnnyb7q6vxblvi6f1xigln70m1vjfpwav05qhm7msblhh5qp2j";
+      name = "lskat-17.04.2.tar.xz";
     };
   };
   mailcommon = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/mailcommon-17.04.1.tar.xz";
-      sha256 = "15gykamn47cc2n9k7b7dwly3h1s6j3j9hqr68p2bv6sf11jg32sn";
-      name = "mailcommon-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/mailcommon-17.04.2.tar.xz";
+      sha256 = "1f826r9m0xb418sqgx9lb23zf5am6cmgvcrx2d54c2va2vq97xgk";
+      name = "mailcommon-17.04.2.tar.xz";
     };
   };
   mailimporter = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/mailimporter-17.04.1.tar.xz";
-      sha256 = "0h7hy57sm9f2wivwd82fpw6jrrl546hapca2bxmnm1z654amh480";
-      name = "mailimporter-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/mailimporter-17.04.2.tar.xz";
+      sha256 = "06q8k3x2nvhbgk1kh542rmqnc5c0hj4yzwl1c1clvjwlw7vpxdwh";
+      name = "mailimporter-17.04.2.tar.xz";
     };
   };
   marble = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/marble-17.04.1.tar.xz";
-      sha256 = "1hr8lgc23m7lbai92nh8jms4v1iqw4gj8yh78manyhdam42h1vm5";
-      name = "marble-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/marble-17.04.2.tar.xz";
+      sha256 = "1z24infjp65d2s2zlcvr0v9425a6wxwkaz262mvqqvx64qmhd6ca";
+      name = "marble-17.04.2.tar.xz";
     };
   };
   mbox-importer = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/mbox-importer-17.04.1.tar.xz";
-      sha256 = "1bndznqwhgn5cpp06wdq5qap324cmh2yqxcmrbfz2cf2hb1bdqgs";
-      name = "mbox-importer-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/mbox-importer-17.04.2.tar.xz";
+      sha256 = "1mq3wbj9fcrcny4m9vs4gk0cw7xyxv1sbpby0wl6a63hb6r4nvca";
+      name = "mbox-importer-17.04.2.tar.xz";
     };
   };
   messagelib = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/messagelib-17.04.1.tar.xz";
-      sha256 = "17fdz2c4n7wl3895cmxs245bzv6w7g6sgz95fs1il94ghj70ldqc";
-      name = "messagelib-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/messagelib-17.04.2.tar.xz";
+      sha256 = "1fxajqxigfknl7ll755blz1ypy99idgr3gmi3p37ca3ld10f7ffv";
+      name = "messagelib-17.04.2.tar.xz";
     };
   };
   minuet = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/minuet-17.04.1.tar.xz";
-      sha256 = "0qqgld8rf99n9djbkz1i2s5d2kx163hpc6fpk5gabjkkm7m0rsbn";
-      name = "minuet-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/minuet-17.04.2.tar.xz";
+      sha256 = "0p2ii0wfqswliqf4fk04mx9z6nfhifa11l2w7bid4aj78b29138g";
+      name = "minuet-17.04.2.tar.xz";
     };
   };
   okteta = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/okteta-17.04.1.tar.xz";
-      sha256 = "1kg4s88vfapdn349jl76l4rdhvp45hzb6chs00akb3n40migx7yn";
-      name = "okteta-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/okteta-17.04.2.tar.xz";
+      sha256 = "0w1xi3kd083dss69gnq4ghmhfr3w2cz42jbfjsaidzf4qcqlfr40";
+      name = "okteta-17.04.2.tar.xz";
     };
   };
   okular = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/okular-17.04.1.tar.xz";
-      sha256 = "17mw0j3ngrwj39bjr0nsx3jl4vq8sra7x13zldy2pjryx236hh7g";
-      name = "okular-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/okular-17.04.2.tar.xz";
+      sha256 = "0rqc6h3zb48smrmp835zk4agvlwnmjwmzwv3rh3lgwfw9i3jq2zf";
+      name = "okular-17.04.2.tar.xz";
     };
   };
   palapeli = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/palapeli-17.04.1.tar.xz";
-      sha256 = "0mx60j52i8dr9wq6hhls8zvrrlc42j3f1fc8zqz1mmvqyym8053j";
-      name = "palapeli-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/palapeli-17.04.2.tar.xz";
+      sha256 = "0lcdkpvqmlsj73z88pi8v2hxd57bbbxlvf5yqj3zw33xb4nxw9bd";
+      name = "palapeli-17.04.2.tar.xz";
     };
   };
   parley = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/parley-17.04.1.tar.xz";
-      sha256 = "0is581jhb17zzhy7jbrqfy1r33wcrficfbvrv989i45jhcp3hr2h";
-      name = "parley-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/parley-17.04.2.tar.xz";
+      sha256 = "02pcyl8lnpxi936k6i7hah7vzlwzsag7lpsc0ly6q6q9rm4iwkqj";
+      name = "parley-17.04.2.tar.xz";
     };
   };
   picmi = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/picmi-17.04.1.tar.xz";
-      sha256 = "0byhmm9sczl0swibg89hl6sq9m8hba6pn9q0sfjsa1y8k3h34mi7";
-      name = "picmi-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/picmi-17.04.2.tar.xz";
+      sha256 = "0dqqaqfrqxwcp9daxfs8qmbf4kj6gn68v6l7dhj5r9mjvva0r4p5";
+      name = "picmi-17.04.2.tar.xz";
     };
   };
   pimcommon = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/pimcommon-17.04.1.tar.xz";
-      sha256 = "16x789mf7zgxdig48ixz0n4x4iq3ik4dgr60ka2qwfvcqgli4sx2";
-      name = "pimcommon-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/pimcommon-17.04.2.tar.xz";
+      sha256 = "1yvhf7hd2gm734i7k4smg57xq15wspbiq909crxs0ga82qx09hcg";
+      name = "pimcommon-17.04.2.tar.xz";
     };
   };
   pim-data-exporter = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/pim-data-exporter-17.04.1.tar.xz";
-      sha256 = "03wj8hjn1d6jkamh1p06jcpm8f2sxdimkxdzhd7s08rhdi3pz90n";
-      name = "pim-data-exporter-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/pim-data-exporter-17.04.2.tar.xz";
+      sha256 = "1q5qb4jbfdwp7h8d0drx0fyzmb7ffpcfrmirw22z8xk50r2r4v0i";
+      name = "pim-data-exporter-17.04.2.tar.xz";
     };
   };
   pim-sieve-editor = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/pim-sieve-editor-17.04.1.tar.xz";
-      sha256 = "0cfc0hj3d5xgq4v8z9pmzwb161qvvrcsrg5wsk99hw05dydz6sfc";
-      name = "pim-sieve-editor-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/pim-sieve-editor-17.04.2.tar.xz";
+      sha256 = "17aymflaqwci21h70s3lb8cfmh1qkynaswfkjqipravk58a302ni";
+      name = "pim-sieve-editor-17.04.2.tar.xz";
     };
   };
   poxml = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/poxml-17.04.1.tar.xz";
-      sha256 = "00hljgjacsmr8kjh37m7bsvk3a0h35q8zjrdj2m2wdj65x7hw517";
-      name = "poxml-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/poxml-17.04.2.tar.xz";
+      sha256 = "1cv7k4xilpx75z07l6mpzwinxn1cdw6h1qglqhs5i35ii4cbbw40";
+      name = "poxml-17.04.2.tar.xz";
     };
   };
   print-manager = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/print-manager-17.04.1.tar.xz";
-      sha256 = "1hjnfzihcn9mh9k9w6a2zjzly2cd2xn8fc96sa4c82pvb0606a7b";
-      name = "print-manager-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/print-manager-17.04.2.tar.xz";
+      sha256 = "19hs25cgf54c6igm0sp5by4fayaz1w793drwz1szcl5b631sdywj";
+      name = "print-manager-17.04.2.tar.xz";
     };
   };
   rocs = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/rocs-17.04.1.tar.xz";
-      sha256 = "0jja9nd8c8i06vmc2n71d4pynxp868zzahcr3mvf3s4cvm6ysq6l";
-      name = "rocs-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/rocs-17.04.2.tar.xz";
+      sha256 = "0ahrbxs675zvwb81fmlp55hz72xx8zlzwjgq01p03ih8jsq71s4j";
+      name = "rocs-17.04.2.tar.xz";
     };
   };
   signon-kwallet-extension = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/signon-kwallet-extension-17.04.1.tar.xz";
-      sha256 = "0m91afp5haissvi8jl0mk0b6q55hm9vkjya0dff4vgzlsas5kilg";
-      name = "signon-kwallet-extension-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/signon-kwallet-extension-17.04.2.tar.xz";
+      sha256 = "1qcv8b5bmjd2dklbd4msp3cmh61qp6z6ml2ps6gzx4la1vp6qfmv";
+      name = "signon-kwallet-extension-17.04.2.tar.xz";
     };
   };
   spectacle = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/spectacle-17.04.1.tar.xz";
-      sha256 = "0jzcc63xlpmp88af381nrckqd0yd6hbbh0a8jhipxcf6p3f13sjw";
-      name = "spectacle-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/spectacle-17.04.2.tar.xz";
+      sha256 = "1hab13wky0i7688jrzqy2m4kc49mz7fxjjk8z1rw2f4dxxaiymhf";
+      name = "spectacle-17.04.2.tar.xz";
     };
   };
   step = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/step-17.04.1.tar.xz";
-      sha256 = "1rln0vczinvk2hm0hvmy62rk5yywdik8kprjs1axdhm9l4rnvy2h";
-      name = "step-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/step-17.04.2.tar.xz";
+      sha256 = "16mhi1z5x403764k5csnr60zg2nwkjj7b3b39kqv1qb9540dmb2y";
+      name = "step-17.04.2.tar.xz";
     };
   };
   svgpart = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/svgpart-17.04.1.tar.xz";
-      sha256 = "1aqnn5s275rz7axgmn1w6zv4109m2kbmw0lk2g1179vfgip8zwss";
-      name = "svgpart-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/svgpart-17.04.2.tar.xz";
+      sha256 = "1cns31z5pr78ilc1mhls31dchddwwzzwvbfddhygy2513067pca4";
+      name = "svgpart-17.04.2.tar.xz";
     };
   };
   sweeper = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/sweeper-17.04.1.tar.xz";
-      sha256 = "176qx6g6mamqkzsyi2vn4574h5dgcci4hmx4nxq4zcdzxamixq78";
-      name = "sweeper-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/sweeper-17.04.2.tar.xz";
+      sha256 = "0zarr01q1v3yq0ipb213i48q27qivrgcrhvynw7livs5s35mx844";
+      name = "sweeper-17.04.2.tar.xz";
     };
   };
   syndication = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/syndication-17.04.1.tar.xz";
-      sha256 = "0hw22qvlslichvjgpis1zwmj1cbk2fwkmkshwpf02bz38kzpls1m";
-      name = "syndication-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/syndication-17.04.2.tar.xz";
+      sha256 = "19flj4f552yvvaih3wvw3i2p2nl60f5pgnl1ylimz5ga0c074vqq";
+      name = "syndication-17.04.2.tar.xz";
     };
   };
   umbrello = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/umbrello-17.04.1.tar.xz";
-      sha256 = "0dmkdzrgn004j59s97m34mz54zs23rkbp70cypksvl1mc0vg1h3v";
-      name = "umbrello-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/umbrello-17.04.2.tar.xz";
+      sha256 = "0jhxifv8s9a0pg6g2vlla901fwral8gyzzhy1mxbah907mj912k1";
+      name = "umbrello-17.04.2.tar.xz";
     };
   };
   zeroconf-ioslave = {
-    version = "17.04.1";
+    version = "17.04.2";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.04.1/src/zeroconf-ioslave-17.04.1.tar.xz";
-      sha256 = "1yqpkmvcx7zbx17qlcimqshn2iivyji70zwb8g3lg78asxil02n2";
-      name = "zeroconf-ioslave-17.04.1.tar.xz";
+      url = "${mirror}/stable/applications/17.04.2/src/zeroconf-ioslave-17.04.2.tar.xz";
+      sha256 = "10fm62dik7a0pnram7mdraryrbk1sscsp9i46j6sp243ndd13015";
+      name = "zeroconf-ioslave-17.04.2.tar.xz";
     };
   };
 }
diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh
index 29a3e3726ad..1ebc6553ff2 100644
--- a/pkgs/desktops/plasma-5/fetch.sh
+++ b/pkgs/desktops/plasma-5/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( http://download.kde.org/stable/plasma/5.10.2/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/plasma/5.10.2/ -A '*.tar.xz' )
diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh
index 1be04bf3cb7..480b11622c0 100644
--- a/pkgs/development/libraries/kde-frameworks/fetch.sh
+++ b/pkgs/development/libraries/kde-frameworks/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( http://download.kde.org/stable/frameworks/5.34/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/frameworks/5.34/ -A '*.tar.xz' )

From 76beb0831384b5ae53592513507524990017e973 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 19 Jun 2017 13:43:19 +0200
Subject: [PATCH 086/189] python.pkgs: several maintenance bumps

---
 pkgs/development/python-modules/Nikola/default.nix       | 4 ++--
 pkgs/development/python-modules/aenum/default.nix        | 4 ++--
 pkgs/development/python-modules/asgi_redis/default.nix   | 4 ++--
 pkgs/development/python-modules/channels/default.nix     | 4 ++--
 pkgs/development/python-modules/edward/default.nix       | 4 ++--
 pkgs/development/python-modules/fonttools/default.nix    | 4 ++--
 pkgs/development/python-modules/keras/default.nix        | 4 ++--
 pkgs/development/python-modules/markdown2.nix            | 4 ++--
 pkgs/development/python-modules/netcdf4/default.nix      | 4 ++--
 pkgs/development/python-modules/phonenumbers/default.nix | 4 ++--
 pkgs/development/python-modules/plotly/default.nix       | 4 ++--
 pkgs/development/python-modules/pyroute2/default.nix     | 4 ++--
 pkgs/development/python-modules/trezor/default.nix       | 4 ++--
 pkgs/development/python-modules/typed-ast/default.nix    | 4 ++--
 pkgs/development/python-modules/xarray/default.nix       | 4 ++--
 pkgs/development/python-modules/yarl/default.nix         | 4 ++--
 16 files changed, 32 insertions(+), 32 deletions(-)

diff --git a/pkgs/development/python-modules/Nikola/default.nix b/pkgs/development/python-modules/Nikola/default.nix
index 5ba7c0d0413..a4127806853 100644
--- a/pkgs/development/python-modules/Nikola/default.nix
+++ b/pkgs/development/python-modules/Nikola/default.nix
@@ -30,7 +30,7 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "Nikola";
-  version = "7.8.7";
+  version = "7.8.8";
 
   # Nix contains only Python 3 supported version of doit, which is a dependency
   # of Nikola. Python 2 support would require older doit 0.29.0 (which on the
@@ -47,7 +47,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d9c77ce9758cc0e848d4c99229a28314e8bd2a590c77c56540fa919fca4d779f";
+    sha256 = "a45272e96ea8311e79ab6ea5523d792207d549cba418d623f03bf80d5e5e3e5a";
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/aenum/default.nix b/pkgs/development/python-modules/aenum/default.nix
index 61edcca4804..3aa03aaa599 100644
--- a/pkgs/development/python-modules/aenum/default.nix
+++ b/pkgs/development/python-modules/aenum/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "aenum";
-  version = "2.0.7";
+  version = "2.0.8";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "2c5db863b5531cc059313018e57bc765b0ef1fc96ba799f105ea45d99b1c2d23";
+    sha256 = "3209fa41b8c41345442e8d9b5158a57d3e96d84c3d5ebbe8e521e1e2eff1598d";
   };
 
   doCheck = !isPy3k;
diff --git a/pkgs/development/python-modules/asgi_redis/default.nix b/pkgs/development/python-modules/asgi_redis/default.nix
index 1ca6f417bd8..c289a096d83 100644
--- a/pkgs/development/python-modules/asgi_redis/default.nix
+++ b/pkgs/development/python-modules/asgi_redis/default.nix
@@ -2,13 +2,13 @@
   asgiref, asgi_ipc, msgpack, six, redis, cryptography
 }:
 buildPythonPackage rec {
-  version = "1.4.0";
+  version = "1.4.1";
   pname = "asgi_redis";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/a/asgi_redis/${name}.tar.gz";
-    sha256 = "ec137829a9ebfb0de1c034bc699240c9747b97a3eb2dc4df6c812f82290a0f9f";
+    sha256 = "71a6147c8b08833815993f16e2b665a0e5483fae392f03decb8da54ed0882904";
   };
 
   # Requires a redis server available
diff --git a/pkgs/development/python-modules/channels/default.nix b/pkgs/development/python-modules/channels/default.nix
index e99fcdc4802..0a445b4c651 100644
--- a/pkgs/development/python-modules/channels/default.nix
+++ b/pkgs/development/python-modules/channels/default.nix
@@ -4,11 +4,11 @@
 buildPythonPackage rec {
   pname = "channels";
   name = "${pname}-${version}";
-  version = "1.1.3";
+  version = "1.1.5";
 
   src = fetchurl {
     url = "mirror://pypi/c/channels/${name}.tar.gz";
-    sha256 = "182war437i6wsxwf2v4szn8ig0nkpinpn4n27fxhh5q8w832hj93";
+    sha256 = "a9005bcb6104d26a7f93d9cf012bcf6765a0ff444a449ac68d6e1f16721f8ed3";
   };
 
   # Files are missing in the distribution
diff --git a/pkgs/development/python-modules/edward/default.nix b/pkgs/development/python-modules/edward/default.nix
index 4d78acf78de..93ac292282a 100644
--- a/pkgs/development/python-modules/edward/default.nix
+++ b/pkgs/development/python-modules/edward/default.nix
@@ -3,14 +3,14 @@
 
 buildPythonPackage rec {
   pname = "edward";
-  version = "1.3.2";
+  version = "1.3.3";
   name  = "${pname}-${version}";
 
   disabled = !(isPy27 || pythonAtLeast "3.4");
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "24aa0bf237965f47dd39d2b2ff43718ba75cb12c471b26ff80a972a66ff32de3";
+    sha256 = "104d58321c5040235b3039ae3215c3c7881073e6aa88bb0b8ca1141ca87c4891";
   };
 
   # disabled for now due to Tensorflow trying to create files in $HOME:
diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix
index b9ef3ba94b6..602fa50d00c 100644
--- a/pkgs/development/python-modules/fonttools/default.nix
+++ b/pkgs/development/python-modules/fonttools/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "fonttools";
-  version = "3.13.0";
+  version = "3.13.1";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "5ec278ff231d0c88afe8266e911ee0f8e66c8501c53f5f144a1a0abbc936c6b8";
+    sha256 = "ded1f9a6cdd6ed19a3df05ae40066d579ffded17369b976f9e701cf31b7b1f2d";
     extension = "zip";
   };
 
diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix
index c397ff43074..43e576b1b31 100644
--- a/pkgs/development/python-modules/keras/default.nix
+++ b/pkgs/development/python-modules/keras/default.nix
@@ -12,12 +12,12 @@
 
 buildPythonPackage rec {
   pname = "Keras";
-  version = "2.0.4";
+  version = "2.0.5";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1cbe62af6821963321b275d5598fd94e63c11feaa1d4deaa79c9eb9ee0e1d68a";
+    sha256 = "cbce24758530e070fe1b403d6d21391cbea78c037b70bf6afc1ca9f1f8269eff";
   };
 
   checkInputs = [
diff --git a/pkgs/development/python-modules/markdown2.nix b/pkgs/development/python-modules/markdown2.nix
index e5c22bc4dc6..f614eb0747b 100644
--- a/pkgs/development/python-modules/markdown2.nix
+++ b/pkgs/development/python-modules/markdown2.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "markdown2";
-  version = "2.3.1";
+  version = "2.3.4";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/m/markdown2/${name}.zip";
-    sha256 = "03nqcx79r9lr5gp2zpqa1n54hnxqczdq27f2j3aazr3r9rsxsqs4";
+    sha256 = "264731e7625402227ff6fb01f2d814882da7705432659a18a419c508e8bfccb1";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/python-modules/netcdf4/default.nix b/pkgs/development/python-modules/netcdf4/default.nix
index 8f06957bf22..75b4723b0b5 100644
--- a/pkgs/development/python-modules/netcdf4/default.nix
+++ b/pkgs/development/python-modules/netcdf4/default.nix
@@ -4,13 +4,13 @@
 buildPythonPackage rec {
   pname = "netCDF4";
   name = "${pname}-${version}";
-  version = "1.2.8";
+  version = "1.2.9";
 
   disabled = isPyPy;
 
   src = fetchurl {
     url = "mirror://pypi/n/netCDF4/${name}.tar.gz";
-    sha256 = "31eb4eae5fd3b2bd8f828721142ddcefdbf10287281bf6f636764dd7957f8450";
+    sha256 = "259edab1f03b1c1b93bdbaa804d50211a0c9d8a15eee4f23988b5685c6c0d2c0";
   };
 
   buildInputs = [
diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix
index 5c1d69b00be..aba0631a536 100644
--- a/pkgs/development/python-modules/phonenumbers/default.nix
+++ b/pkgs/development/python-modules/phonenumbers/default.nix
@@ -2,7 +2,7 @@
 
 buildPythonPackage rec {
   pname = "phonenumbers";
-  version = "8.5.0";
+  version = "8.5.1";
   name = "${pname}-${version}";
 
   meta = {
@@ -14,6 +14,6 @@ buildPythonPackage rec {
 
   src = fetchurl {
     url = "mirror://pypi/p/phonenumbers/${name}.tar.gz";
-    sha256 = "6d3d82a3dcb0418431099d1b1c24efb280cbec8f81c7ce3d1abf417c238b8859";
+    sha256 = "b7d1a5832650fad633d1e4159873788ebfb15e053292c20ab9f5119a574f3a67";
   };
 }
diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix
index 4c78ac63d30..383dbd1e08f 100644
--- a/pkgs/development/python-modules/plotly/default.nix
+++ b/pkgs/development/python-modules/plotly/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "plotly";
-  version = "2.0.9";
+  version = "2.0.10";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1b82ec9e09179b5191297b82a3f89f61055b730b09a1821c71fac18e82857e8f";
+    sha256 = "8c013a01bb11c4c269c38a7086ffb92d6a2827922c49706131842498a49b3b81";
   };
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/pyroute2/default.nix b/pkgs/development/python-modules/pyroute2/default.nix
index 757933bd6b6..de1651ec2b0 100644
--- a/pkgs/development/python-modules/pyroute2/default.nix
+++ b/pkgs/development/python-modules/pyroute2/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "pyroute2";
-  version = "0.4.15";
+  version = "0.4.16";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/p/pyroute2/${name}.tar.gz";
-    sha256 = "273530e78261ac5e9e2985f12fad9e6c4231f8e49b8c285c05a23dcda5afce58";
+    sha256 = "5c692efd83369cb44086572b3e1e95ab11f1bc516a89c8ca2429795a789f32a9";
   };
 
   # requires root priviledges
diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix
index 6fc6622cf3f..29e6a7d1743 100644
--- a/pkgs/development/python-modules/trezor/default.nix
+++ b/pkgs/development/python-modules/trezor/default.nix
@@ -3,11 +3,11 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "trezor";
-  version = "0.7.13";
+  version = "0.7.15";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d05f388bb56b6f61cc727999cc725078575238a0b6172450322bc55c437fefe5";
+    sha256 = "f7e4f509263ca172532b4c0a440d164add7cdc021b4370a253d51eba5806b618";
   };
 
   propagatedBuildInputs = [ protobuf3_0 hidapi ];
diff --git a/pkgs/development/python-modules/typed-ast/default.nix b/pkgs/development/python-modules/typed-ast/default.nix
index 213f2d33f3b..45aea2de1a4 100644
--- a/pkgs/development/python-modules/typed-ast/default.nix
+++ b/pkgs/development/python-modules/typed-ast/default.nix
@@ -1,11 +1,11 @@
 { buildPythonPackage, fetchPypi, isPy3k, lib, pythonOlder }:
 buildPythonPackage rec {
   pname = "typed-ast";
-  version = "1.0.3";
+  version = "1.0.4";
   name = "${pname}-${version}";
   src = fetchPypi{
     inherit pname version;
-    sha256 = "67184179697ea9128fa8fec1d3b4e26b41d6a2eceab4674c6e3da4b024309862";
+    sha256 = "73f09aac0119f6664a3f471a1ec1c9b719f572bc9212913cea96a78b22c2e96e";
   };
   # Only works with Python 3.3 and newer;
   disabled = pythonOlder "3.3";
diff --git a/pkgs/development/python-modules/xarray/default.nix b/pkgs/development/python-modules/xarray/default.nix
index fe0497bc0e8..7b9712dfd02 100644
--- a/pkgs/development/python-modules/xarray/default.nix
+++ b/pkgs/development/python-modules/xarray/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "xarray";
-  version = "0.9.5";
+  version = "0.9.6";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d23bfcc317829570daa1fe8306ad7ff62cd77847bbd68e3ffc53d847bff7c36d";
+    sha256 = "f649a41d43b5a6c64bdcbd57e994932656b689f9593a86dd0be95778a2b47494";
   };
 
   buildInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/yarl/default.nix b/pkgs/development/python-modules/yarl/default.nix
index 03732c5343b..0455efc3127 100644
--- a/pkgs/development/python-modules/yarl/default.nix
+++ b/pkgs/development/python-modules/yarl/default.nix
@@ -8,12 +8,12 @@
 
 let
   pname = "yarl";
-  version = "0.10.2";
+  version = "0.10.3";
 in buildPythonPackage rec {
   name = "${pname}-${version}";
   src = fetchurl {
     url = "mirror://pypi/${builtins.substring 0 1 pname}/${pname}/${name}.tar.gz";
-    sha256 = "a042c5b3584531cd09cd5ca647f71553df7caaa3359b9b3f7eb34c3b1045b38d";
+    sha256 = "27b24ba3ef3cb8475aea1a655a1750bb11918ba139278af21db5846ee9643138";
   };
 
   buildInputs = [ pytest pytestrunner ];

From 56be4bee34ad4913f5697f6c920090ab5651c668 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 19 Jun 2017 13:54:55 +0200
Subject: [PATCH 087/189] cabal-install: fix closure size on OSX

---
 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 bf94bb7045a..642da50bd49 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5427,7 +5427,7 @@ with pkgs;
 
   inherit (haskellPackages) ghc;
 
-  cabal-install = haskell.lib.disableSharedExecutables haskellPackages.cabal-install;
+  cabal-install = haskell.lib.justStaticExecutables haskellPackages.cabal-install;
 
   stack = haskell.lib.justStaticExecutables haskellPackages.stack;
   hlint = haskell.lib.justStaticExecutables haskellPackages.hlint;

From 9d0441434db401bf5fbfb0b8681e17ce7a04f3cb Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Thu, 15 Jun 2017 01:47:09 +0200
Subject: [PATCH 088/189] jackaudio: 1.9.10 -> 1.9.11-RC1

---
 .../libraries/libsoundio/default.nix          |  4 +-
 pkgs/misc/jackaudio/default.nix               | 20 ++---
 pkgs/misc/jackaudio/jack-gcc5.patch           | 26 -------
 pkgs/misc/jackaudio/unstable.nix              | 78 -------------------
 pkgs/top-level/all-packages.nix               |  1 -
 5 files changed, 8 insertions(+), 121 deletions(-)
 delete mode 100644 pkgs/misc/jackaudio/jack-gcc5.patch
 delete mode 100644 pkgs/misc/jackaudio/unstable.nix

diff --git a/pkgs/development/libraries/libsoundio/default.nix b/pkgs/development/libraries/libsoundio/default.nix
index 788a5db13cd..18d18941b88 100644
--- a/pkgs/development/libraries/libsoundio/default.nix
+++ b/pkgs/development/libraries/libsoundio/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, alsaLib, libjack2Unstable, libpulseaudio }:
+{ stdenv, fetchFromGitHub, cmake, alsaLib, libjack2, libpulseaudio }:
 
 stdenv.mkDerivation rec {
   version = "1.1.0";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0mw197l4bci1cjc2z877gxwsvk8r43dr7qiwci2hwl2cjlcnqr2p";
   };
 
-  buildInputs = [ cmake alsaLib libjack2Unstable libpulseaudio ];
+  buildInputs = [ cmake alsaLib libjack2 libpulseaudio ];
 
   meta = with stdenv.lib; {
     description = "Cross platform audio input and output";
diff --git a/pkgs/misc/jackaudio/default.nix b/pkgs/misc/jackaudio/default.nix
index a38c9b76410..62c734859d5 100644
--- a/pkgs/misc/jackaudio/default.nix
+++ b/pkgs/misc/jackaudio/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, python2Packages, makeWrapper
-, bash, libsamplerate, libsndfile, readline
+{ stdenv, fetchFromGitHub, pkgconfig, python2Packages, makeWrapper
+, bash, libsamplerate, libsndfile, readline, eigen, celt
 
 # Optional Dependencies
 , dbus ? null, libffado ? null, alsaLib ? null
@@ -24,32 +24,24 @@ let
 in
 stdenv.mkDerivation rec {
   name = "${prefix}jack2-${version}";
-  version = "1.9.10";
+  version = "1.9.11-RC1";
 
   src = fetchFromGitHub {
     owner = "jackaudio";
     repo = "jack2";
     rev = "v${version}";
-    sha256 = "1a2213l7x6sgqg2hq3yhnpvvvqyskhsmx8j3z0jgjsqwz9xa3wbr";
+    sha256 = "0i708ar3ll5p8yj0h7ffg84nrn49ap47l2yy75rxyw30cyywhxp4";
   };
 
   nativeBuildInputs = [ pkgconfig python makeWrapper ];
-  buildInputs = [ python libsamplerate libsndfile readline
+  buildInputs = [ python libsamplerate libsndfile readline eigen celt
     optDbus optPythonDBus optLibffado optAlsaLib optLibopus
   ];
 
-  prePatch = ''
+  patchPhase = ''
     substituteInPlace svnversion_regenerate.sh --replace /bin/bash ${bash}/bin/bash
   '';
 
-  patches = [
-    ./jack-gcc5.patch
-    (fetchpatch {
-      url = "https://github.com/jackaudio/jack2/commit/ff1ed2c4524095055140370c1008a2d9cccc5645.patch";
-      sha256 = "0vywakbmlskvs9ginij9ilk39wjyzg7w6cf1qxp11hb0hj69fir5";
-    })
-  ];
-
   configurePhase = ''
     python waf configure --prefix=$out \
       ${optionalString (optDbus != null) "--dbus"} \
diff --git a/pkgs/misc/jackaudio/jack-gcc5.patch b/pkgs/misc/jackaudio/jack-gcc5.patch
deleted file mode 100644
index f18042c6e32..00000000000
--- a/pkgs/misc/jackaudio/jack-gcc5.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From d3c8e2d8d78899fba40a3e677ed4dbe388d82269 Mon Sep 17 00:00:00 2001
-From: Adrian Knoth <adi@drcomp.erfurt.thur.de>
-Date: Thu, 18 Sep 2014 18:29:23 +0200
-Subject: [PATCH] Fix FTBFS with clang++
-
-Forwarded from http://bugs.debian.org/757820
----
- common/memops.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/common/memops.c b/common/memops.c
-index 27f6194..2d416b6 100644
---- a/common/memops.c
-+++ b/common/memops.c
-@@ -198,7 +198,7 @@ static inline __m128i float_24_sse(__m128 s)
-  */
- static unsigned int seed = 22222;
- 
--inline unsigned int fast_rand() {
-+static inline unsigned int fast_rand() {
- 	seed = (seed * 96314165) + 907633515;
- 	return seed;
- }
--- 
-2.4.0
-
diff --git a/pkgs/misc/jackaudio/unstable.nix b/pkgs/misc/jackaudio/unstable.nix
deleted file mode 100644
index a2026dacc93..00000000000
--- a/pkgs/misc/jackaudio/unstable.nix
+++ /dev/null
@@ -1,78 +0,0 @@
-{ stdenv, fetchFromGitHub, pkgconfig, python2Packages, makeWrapper
-, bash, libsamplerate, libsndfile, readline, eigen, celt
-
-# Optional Dependencies
-, dbus ? null, libffado ? null, alsaLib ? null
-, libopus ? null
-
-# Extra options
-, prefix ? ""
-}:
-
-with stdenv.lib;
-let
-  inherit (python2Packages) python dbus-python;
-  shouldUsePkg = pkg: if pkg != null && stdenv.lib.any (x: x == stdenv.system) pkg.meta.platforms then pkg else null;
-
-  libOnly = prefix == "lib";
-
-  optDbus = shouldUsePkg dbus;
-  optPythonDBus = if libOnly then null else shouldUsePkg dbus-python;
-  optLibffado = if libOnly then null else shouldUsePkg libffado;
-  optAlsaLib = if libOnly then null else shouldUsePkg alsaLib;
-  optLibopus = shouldUsePkg libopus;
-in
-stdenv.mkDerivation rec {
-  name = "${prefix}jack2-unstable-${version}";
-  version = "2017-02-23";
-
-  src = fetchFromGitHub {
-    owner = "jackaudio";
-    repo = "jack2";
-    rev = "4cf826c82c8f865c281833f92f8182d457277b3a";
-    sha256 = "100pkc324m57ci3fb99d3api6wh6g58lya6ssly9hxyhdsa3i7bk";
-  };
-
-  nativeBuildInputs = [ pkgconfig python makeWrapper ];
-  buildInputs = [
-    python
-
-    libsamplerate libsndfile readline eigen celt
-
-    optDbus optPythonDBus optLibffado optAlsaLib optLibopus
-  ];
-
-  patchPhase = ''
-    substituteInPlace svnversion_regenerate.sh --replace /bin/bash ${bash}/bin/bash
-  '';
-
-  configurePhase = ''
-    python waf configure --prefix=$out \
-      ${optionalString (optDbus != null) "--dbus"} \
-      --classic \
-      ${optionalString (optLibffado != null) "--firewire"} \
-      ${optionalString (optAlsaLib != null) "--alsa"} \
-      --autostart=${if (optDbus != null) then "dbus" else "classic"} \
-  '';
-
-  buildPhase = ''
-    python waf build
-  '';
-
-  installPhase = ''
-    python waf install
-  '' + (if libOnly then ''
-    rm -rf $out/{bin,share}
-    rm -rf $out/lib/{jack,libjacknet*,libjackserver*}
-  '' else ''
-    wrapProgram $out/bin/jack_control --set PYTHONPATH $PYTHONPATH
-  '');
-
-  meta = {
-    description = "JACK audio connection kit, version 2 with jackdbus";
-    homepage = "http://jackaudio.org";
-    license = licenses.gpl2Plus;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ goibhniu wkennington ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ad5281f6bf5..c9858b2dbca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18380,7 +18380,6 @@ with pkgs;
     libopus = libopus.override { withCustomModes = true; };
   };
   libjack2 = jack2Full.override { prefix = "lib"; };
-  libjack2Unstable = callPackage ../misc/jackaudio/unstable.nix { };
 
   keynav = callPackage ../tools/X11/keynav { };
 

From a19514df76481c2306e84811bc6f188c2fd1eeff Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Mon, 19 Jun 2017 15:09:23 +0200
Subject: [PATCH 089/189] firefox-beta-bin: 54.0b13 -> 55.0b2

---
 .../browsers/firefox-bin/beta_sources.nix     | 764 +++++++++---------
 1 file changed, 387 insertions(+), 377 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
index 0c4126a4add..967fd1e1595 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix
@@ -1,945 +1,955 @@
 {
-  version = "54.0b13";
+  version = "55.0b2";
   sources = [
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/ach/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ach/firefox-55.0b2.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "b76584a4027ae3c05b4350952bf231e1701c3f161355d86f028379a04cf7f3f1fcefd67736dfd2cbc02fffca670ea7e62b1729ba1647746da62dff30969d74dc";
+      sha512 = "7164db8b579c12976ab86770f3c238d8b4b4334a41107f995d03b87c77e7998e1c7d48b36b2305d67f1eddb4d3cbe0b9bfb9c27169abaac00839d90a0e80d38f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/af/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/af/firefox-55.0b2.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "c8cfb40ba81947254a58dde6438a5e6eac9b4279701800353b8538ca74776fe09da4f6e5384d93a197bfbd3c88b30e3b56231aa4d9530c61da84a712d0ba0473";
+      sha512 = "994024e45c16b1dda3680ad4d73fa7a2a84bf43ce3be8df4fa61a695b9041fcdf88ae750c0ab34bf9dd814cbcde10b14832d5b03682e8c83e4dc43a316b6c75f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/an/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/an/firefox-55.0b2.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "072e89337c05b9dc4f82eb4746464cb19b897d3c4eda1f50c9d0c7d1d38e9c1b2301f9c0416ad26809c31e0bb5099872cc577540ce722ad5e54ca04ef3b7c003";
+      sha512 = "dc4a8db0c9bd87ef140d8c2fa2e4deb63e664a97353d88f94f99fd10ed358091a6215b62f8a441ef65dfa6774989ede451e55749bdffb0f670904959f5e8bb70";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/ar/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ar/firefox-55.0b2.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "4c63f391b072b5d33f61020dd2bd5f2fbaf644b0a411070297ecc31ea5c7059af373cc58d6b49e377ce6db239ef4df64f301612db0c45b118662178b750fb069";
+      sha512 = "94d018fe2116733bd14daf51d9d9f09022a745b3797773422ac79511a8fd1e14e9fea879f7873c1043e0b63d2df4425c806645467764325400f71600a2f1cc1c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/as/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/as/firefox-55.0b2.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "22e95dba78581460159f24130bda330557348516ea9442644055159a6c7cae3ad4529890676fdc43f8a8cd902d4a75fb06de50262db72fc1297e08d9e14e2d0d";
+      sha512 = "6b5811c9ec50be18a34e0102438e95fea58c8667a0a19c9c4c5f4ac93c8ae8b9cd929252c81de7f19a15b82ed6a01e8fe37fda7aafc63cac223cc09b1d9dbd11";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/ast/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ast/firefox-55.0b2.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "527ff1bd64649b475a863f3d3e40e900d40d5c1e5a404e0dcc2678e7708fd24dd0a68fa85f1f3cc8e23f12edac41530310d0f65e1eea390f5e01460c2ac90e0c";
+      sha512 = "4deb4aff290277f870d5c3148e375a9bd2071b455ff93f10e28c9afe149a8f11689bef936db8a87c0fd4cda5bdda70aced4580395343916e7510ab7970269fdd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/az/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/az/firefox-55.0b2.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "c3184445a3a4cd205140a43adbd498571a0339175fc9ba05ebc2306fb37990095f4c66dba0eec1a121a7b5aafb6c3d6d5f5ff68485382ee61ad7ebfba190fd8d";
+      sha512 = "3cf69626fbcd8667c83978e540cf0e8e0123408dd080073e95f543a0c98085320bd95caf77fb814002e45694cefa5542c6d436d258c66abb8435d52ce85f111c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/bg/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/be/firefox-55.0b2.tar.bz2";
+      locale = "be";
+      arch = "linux-x86_64";
+      sha512 = "0318b4bbf69fda1586665dbe7626d4ba1c4768acf310b5bcb0d49c1212199704d4f0c0da6dcd99f75dd7871d39a4725497c47ec2f980b1c458b101a4e18531e5";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/bg/firefox-55.0b2.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "e1eb42e04be44f4b091fd6675af506c80098886a20be0b37eadbd907dc8925b1bbc0c99145417e16534d6a59f1f6ef718769819d9f79ebbfac22f05ba5ad95a3";
+      sha512 = "0de32e72eba0fae0e19c1d1cf8e8f8f99926d66df6831317742a74bd0e90f909cd4a55432f9fde3e25c33e37160f5e92d0ca97b2236089d4059c5789e89823f7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/bn-BD/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/bn-BD/firefox-55.0b2.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "9d09de31bb8207533a2e222a1fa8888f3a323046dbf8521f6cad0aaffc9d91ebe35b0ce766fa2b292d1058f370298f60479312a5f8c749bef5599c60e88777d8";
+      sha512 = "333b28b03e6a4612b0e5636e14bc83d6e152237fbcd4129acf25767f3049835bf262040caacba1976d2791ec06fa89e3c70ed1abea414bbf4289729296099993";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/bn-IN/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/bn-IN/firefox-55.0b2.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "1656bdd3844c968d448fafffb7b1fa5994e8dc4a590f4b39965df095ca29a8914fa4f8dee1fea4a15b6c4716a6555841f4b9c72b432adc1b60b02f561cd3ef7d";
+      sha512 = "ba989a0555fdc40e9ce9d834eef26b19c30b19616d85b5864d26253572fd79bf02b7a0b9bfd00dddaa192950c7f9d52c20887569b7cad8b03622ac0df55baadb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/br/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/br/firefox-55.0b2.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "945f866e86a8ff5e6a8d2216abb3fef9a1a93b585599267f54a38b5acb0843c1cab5ecb4440f6277e7604fd4fe730b5d2b57b4708bc1639ad2adcc0e217ca716";
+      sha512 = "e43ec7e1ba0d977938e5a1bc3f985196211fb6587c44018958f750b35fea78f2dd94a8fbd1b91f70e41c3f3cc0da194bed76306d4b63bca3dfde7a65a6a7532a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/bs/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/bs/firefox-55.0b2.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "cd555e3638139d6e36b59fbc72a53a4e233e33557c7000e9c308cc292d963d458261c0404d130353abd071e23927c11d8232add50b455063fb3c261faac35594";
+      sha512 = "7ed042ecf92e7f873f93e0f6a7ab27418e960adcc2417e18fe9ee8b468157af85dfbd8e56df7f0dba97027b3a38aeb6279d81451579cc97a9fec814064b74e58";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/ca/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ca/firefox-55.0b2.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "ffce1a6bba525cd67880f695f6c21b1078fe419ee32cb878519f5f36d4d403b5cd2dfc6f1d9ed02f4f38dd2f7404670f63b34484180137c6a597f407c24b638b";
+      sha512 = "0953320dfdebfda3b2f135fb5277ebbdcae1c13f431b4452e0398515d990fd6faa8137dd4f49bf4336b385c70422f340e0bd8a466c07f76146d9ff32655cbe1d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/cak/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/cak/firefox-55.0b2.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "e1d2750edd967f15a51af0daae4599f78add80211ddcfb13c7480ba696426e0e69da3bbd5331979aaf88ec6f611aa33c98f7924c1428e7cc37f2d9fb30c3ac6d";
+      sha512 = "e79e1e6a2784e3e61637624ddd8b628b784090c61daa35d36a3ebbb68db1801ead01b86bb04d7b2bb3037fb53b42197a50de78013afcc2443136b65df6f0b9dc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/cs/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/cs/firefox-55.0b2.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "c8ca0cdea3742f5a18992c9743c994d9676bfd6765b458d0f13e03038f61a9add04b48f434c41fcacc67c303be2488e8833aaa8d8d68150e00e3ccd2affd6a0e";
+      sha512 = "c48991f37c786982f90ba12d43120dbefdc046d30c9ccbba630224b1f08dbce2b73eb4456e1b588f5ca0518ad19b8148e9dd5cf4a9f47f8d4ca0e90e2988f18d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/cy/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/cy/firefox-55.0b2.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "954ba8941fb42595fb05ee03ced136b1dfd3617c08d14042b63fc2e53984b71f490471e3e680bb67f2ee31ae72ca329198272b9c354681e1ad9fa6e12bd32b16";
+      sha512 = "a01937ba6f1e56b34ed4d16acbfa336338391c8fe4e33e5f06ec2a35c3c6010a35f20f7949ef1f6d50c9d6f6d9db115eb95cac50762d7d6a3b642f78192a6b4c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/da/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/da/firefox-55.0b2.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "144d754470b59b95e3706516224e21c1c53b0d2260541cf4a4a2afdfc7af39dcd0ae97204e8558e29d627853e1667f2f0a337cd257d05409c355f96f9ffbb453";
+      sha512 = "d7861e3765acac1e8e5a1b302986fcfbdc262a22308ead2239e7acb3617534f1b8bc101c2ca6d5aa1758bc13a6cac5f31fa062dd31ef239113cc815c9d4d22a5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/de/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/de/firefox-55.0b2.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "1bbe368dc61546c4d2cfb09ba0d0b8414abbaff2a58ddc60e6961fc3f387a8d90a75a44c3b4736df1ee3d2777cc6732c02b42a897486bde9b9f030e8a599aabc";
+      sha512 = "2b6efac1ab738f42fe52a6c8e4bd20fea1e044577a4dd82fea54ef403adf2ea9f7cb64268de68dc55799afd3f5e90f724c98b9f705affc704e1a58118c674dac";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/dsb/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/dsb/firefox-55.0b2.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "407728ddb4062f0961a856e34d7f4db5f137f9674b95a7cd509c57878813e4dd469487ceb91e3f0a182f08e2e95116348d7f9f12e23a6c45d5911f3c8af3c0bf";
+      sha512 = "c5de911eea687279d6d14b8dc745597c6450c733cc332e104de6ebd9a7a64b877474fb0da0bbe59ef4c8424549eff4fc6b57a93379c09df00fda761bc7347e54";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/el/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/el/firefox-55.0b2.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "5473cb886a94aaf59065f65029c01e31e162d38e54e85b19109fa29929c97a7872149e802fa131ffdd1189ba5a20184f081f483cb783de90d287469f6300a0de";
+      sha512 = "b531426207bf42f74f87ba8807441926f9476f0f15caf8a21594d099992c7c91d2cda6d71d318d899863185bdf776f4bf46820fff77b37f8a95c52f570f9247d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/en-GB/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/en-GB/firefox-55.0b2.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "8fb73d0a889c33fe2163f51847054c5d8dfd491ff4ae3c5e1333b93aada953a03d376b1f3afcf26189b3a333639a28dc380ff967cbfbb2a2f11a92c1750a59a5";
+      sha512 = "4c1c99501cf1ff1320d27c7709d9572837a1a1fb7d8dea4578075836e013b5fd79c84afababb45bbb5cf95655b51b0503ac45023746ff6d4831bda93c493e539";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/en-US/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/en-US/firefox-55.0b2.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "66b68bdb3043436548d057d435a065b896a815c4c0eaf7f4c072c306ee379de4e98aa750362175df822767786b2202744586fd6aacf789f987ee7528b6bae865";
+      sha512 = "82678293b35fe73c27c5842589de97858a8cb5186d7f1309693f16a516ddd62a59bd96e84358571367b706354625a98bec7fff9f7c598c96f025594baad44aa2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/en-ZA/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/en-ZA/firefox-55.0b2.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "4f3917809ad8b62bdf6bfcae453b297d956e938c346b48613758c362d0c32be098d158fd660ec24ffd000a9f8f6be0cf026ea6533878c756e6b476135d0483a4";
+      sha512 = "ded063ef65018cb0b138298b9e9df9a2aedaadf92d5c77248120cee6504542d18967b01c1bf497e264a9aeac7c119c8bc9885fb202dd0abcb0ba00344ad30397";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/eo/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/eo/firefox-55.0b2.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "bc0682dfdb05432df784ae6abc1202f638e16c04e0deb53211118cd0890bfcc07608dd94feacbcd4e6abfb3f6403c9d1c1746579834ab1111e4870396bf0dd41";
+      sha512 = "205dc910f37c5501b27ff044f5bbb197fd4bbc3d8a5512ea01b0b4c155cd8b2f19eb6c400cb999a6136f2534ac0ede511ddf827ffd59f97ba00b538852c9a0a7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/es-AR/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/es-AR/firefox-55.0b2.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "b9490b0a0fa01e7e8e09b8af4d77ec42ab89a7859b70106e0c4294dc0a03df215de2a34854fe48f8e033138d9dc5b553e2a71b629c0e351712e1d66afc0aaeb8";
+      sha512 = "95a026ce800722d1e89237a675a58fee8243e5b4a900d1ce42a4f139dbb43e940478660f78d9c4593b9d09af7c3dc843984b7a362b465d99317aba9bb213b371";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/es-CL/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/es-CL/firefox-55.0b2.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "524a89e97ccd1919a86b2ba38beaaa42b6664af46d36e4da0f5f17f7d8f9b1c428be8fcd111a42c3fa951108724c139f54aa5e4f4a7577dd6f58895b3a3d99ed";
+      sha512 = "42f0703824210feedd7da2f78a4d0823d1d0f3b23d4edaa07d63a5021847ba55871fec33676915b9f2b411ebd9cdf31de155f2de0a47586428bf0e1a3fe7457e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/es-ES/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/es-ES/firefox-55.0b2.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "58660dea649a468e97d12d054a59dce61d7abf33e4a5620c40f1c42eb30ec3411738aecec666f0334e46b3458a48caab97b5dd7e9e1b0699f5c16330401b5aac";
+      sha512 = "d11dd1264e4692da710d18ef5c18d7f5bc1db36214cfd28a7f567d56a35ac6e56f838a58ef6ebfc2d68b115417cdd19fd49ae2f6a13f1a57bb2eacd122945f1c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/es-MX/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/es-MX/firefox-55.0b2.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "2c5cfc09b15daedf69ce16ecb12b07aab99cbd0b68d7ff5b65ac9116a59790d32aa1f0c3a931e9837b381c82d4e50f3e14237c39cb5c45e652d11310d0e01faa";
+      sha512 = "ab33b21aaacb43f4676856e74f4d93e2d449b67095500907669db42f678fe0d7448f2205f42c3f85885cef0a2c262818368808ecc336205411dc27b99e42f272";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/et/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/et/firefox-55.0b2.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "6301197a08de0912a9195b0d78d95df338f3c2ee2c90045108d220c9309edc8504a6ff6aa5f0c8db21df33d6bb0e624d713d59c6e49fceada3a510d22613d59f";
+      sha512 = "2a87e6a9bd6c3aa22d278f114d0bd18779c7847cab2e6257c4e601f3749df703f2d0a25f5646ad91802a2cd093bd1734305fb350aa2be269c1fc5fd2d621d4db";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/eu/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/eu/firefox-55.0b2.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "2ca00edb210c879a48f1107137378818e6f4beeb2f3a2b1941d12a7da6f474bc164d07158ef3713cf9e79c222b4f2f9a243ce924b21802dfb4374f48c18954cc";
+      sha512 = "9017cc8bed387b103f78870b157a50c18f8e36858eca1bcbce8ac5ceb06f6d7b178760f7dc733ce570cdbdc3204d277a98a4b4324a0d3691d1fe3f6b1e9725df";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/fa/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/fa/firefox-55.0b2.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "ded6f7d1daaaa417ca62dede3e6a0ae4acc66852dbbf6230e8b1ff5ad74ce4438369fe6c3280f9c8abd3a1c22fa05f2c9e36dee20531fb5d3eeae3c736984b63";
+      sha512 = "d70f1a793d67f1b52f740bbcdc4fb01056495fdc5b14672b35a48a500c71ac7cd0cc6272e7f6b4b4fcac65874f32ee64338435f76131c1d74ef82ca7a512eab7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/ff/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ff/firefox-55.0b2.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "59c5c0604faf14bc0478cebdfe09982d0a184a5735c791458254b14ba1031fb9e18c09dcfada0e921a088fd7168d231cef52dd45eb703553a5e5624ca38b9363";
+      sha512 = "c16463456725b2f0263b8fee2d0729bd4951a352b1dfdee819bc2af0e138cda73d169eec63a27ed2900a0703648db0c784969a41df874336b1a84170ddaa71a4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/fi/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/fi/firefox-55.0b2.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "10e9aa82198338f1bb21c6fd5663a939b14d1db5b1a5b672d0c81aea26d910e9b6c8b53d7e40105e5dbd9e4b67bbaaa50803b323dd648ff85699cb88384c3c23";
+      sha512 = "00bf17dab47261470f57b94a18fcd5fcca0344be1b1d6352968e132c7f3fdfc5b5229c80eaca1a9802e75d432e09bb6e0dd3dbd40ee9f0c783ca007da61b52de";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/fr/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/fr/firefox-55.0b2.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "b267baea7bf0c9fefab7bca2b32aee9dd0d6f9e435c477ecbdc622e9cb2a08ac4adc1c26db88e2f61b1ef55416c079e49d4af6a4366f2b893504fe814021b674";
+      sha512 = "7599fed77975a7b4667c9d3456a5536e3b7eb1725acd624c504d061330ea84c3a19dd72914a0f7644068972b94a7a058708e3b1e3618e084315b920e8f671f13";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/fy-NL/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/fy-NL/firefox-55.0b2.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "afaa720f4b935ee8674b61362972a90ed9aeabddac17e5768eb05f72eccb1b54ab6836524bb8a189e08cd06f6b24c8863208f9917d02d12f622b7a3c4b96ca8b";
+      sha512 = "c665bb33f04b7d3b9790580b0db992ce223e75fdd3915b16f79125a72bac91cec098b1ae73b1223f5b03597c1e19522b46fe11c5c05a7cfe0c932a21bf94f90c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/ga-IE/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ga-IE/firefox-55.0b2.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "c60fa858865ba80ca17fdfc29f2ae85c77528d570f8b4f43b890eb0316807ddb2049fbb4c6005fedfc0f05ed85b211901e88a6d06fa51f9cda214b2999b7de76";
+      sha512 = "c775e3e6858732104ba3251de42a0e9ba5031ade5f89207b357e93c6f6e4acd07bcc91a5fa558a9884f07438ca0de6bf10065ff7e37d980914da392428bc57e9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/gd/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/gd/firefox-55.0b2.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "37d7f0b8159e7c23454b0f1a15902280fe5def086001befbed3d17d21e4e3684c40609a5888fef3cc22888bf57860302633a680a4d01ad1ad0e765ef14a3cce5";
+      sha512 = "c8df95449757099a7c8d50c04f42aace7ce25297c78622296feb336352cecb53726f3873210af6cab96d90f65e21daa084b08f6b943e1130c75f68e6de1168a3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/gl/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/gl/firefox-55.0b2.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "2749dd7a2379c3eb2e2f52441717ef065d3bb07c6cc58aab02bcb3c050e3f1fc14310c479bd58da5bfe9a17a91fd0ca44d032aa81f2f098cec1bd2922876cdae";
+      sha512 = "4488db080b8bbf7e437a684d1d7cbe219d1d730db055cd9988706cd71deb110b9496a87684ca32d172f3eeb3308ec1ee2ad0ab3b1e206d012c62311db45db911";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/gn/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/gn/firefox-55.0b2.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "28f3f810fe9e2ef555d5f72714284eda44750f5525a560f93b9e47bc56f5f2b83d2c73af3da8245b387260e4c82341272518034aa6b8c968665ef9ae0a201a9b";
+      sha512 = "272c43aabe7c63b769df2aea4eac5350c9cf90326ece8ac2f096db421f7785e630cbdcfdb84e41c516e36165f1a67d9b22ee0090d84ca9d58fef275d119c2dad";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/gu-IN/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/gu-IN/firefox-55.0b2.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "76a246d75ac07afdf824307706b9834c2d7eb558448097c9b078e37b61973447fce723c3b697aa4ba464f93d584901bc174a635aaaf7bbc27efa21f923dd7452";
+      sha512 = "415b1ff89552f6bb83458a96905c2c6b7b6b25a974b72ab4a4d4a0a1a5b1e431b82e519466393bd6a8e8031954eacbca97529cb0e4513d722563e13eb97a8fbd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/he/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/he/firefox-55.0b2.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "e0de309d1c0f1e9f3182eb95e91b0384bef6a52e26a921d47e896f16e9c58b270ef30b6c1b4e4007c1eb3b75fe41c12be5193a4fcf88d15bbd7f2892c0d5bb40";
+      sha512 = "1110e4c1c6121a00fd76f25bc513f0c877bfdc7751af2b5958f38f2a7892d8a00c9b5eaa6adab34213535480228a4e0b3aef3ec3a3ab4adde74bfa2fc7dbde94";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/hi-IN/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/hi-IN/firefox-55.0b2.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "1b9e63cac216f3f043c17b8b4a701ea5e8fb5522a25f6e21d0b5ddee07210ab0ae1afcb8419b0e6018abdc25b989a5a3fe554d1d04f52c38f545172869d95e08";
+      sha512 = "b1279b0f0a97413799598fbd3c6efca475b8aef7a0b05c401cddf283722ba423ad2524341962360845951798d9083019a5b8b431e658513001c3046b6a3fedff";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/hr/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/hr/firefox-55.0b2.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "959a5760577f5ef026f3230a196ee26de93425a452ced9cf9770b5bff8f3f44c2dae2cdda7e01f68cba2297b320d2df299cb774e9fce2b68adaf986a1af26a09";
+      sha512 = "77474e40120fd4ad50a109c6b46fa93c070bfaf899e187bd4bac0ad4a53fc12c7f7d9d2a2003a871e8666dcfc60de4f3ea26b79008f4fe7ee1c5a358307b2eb4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/hsb/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/hsb/firefox-55.0b2.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "50390a8d09b6a19fd8441f55a1d0310ca279fec250557124271e3791ad8869b1a4b361176c0ac95f8acfefb8a00c80095c2422314c5da557895a85bf194fc011";
+      sha512 = "b1e440f25ef20da7fd6e3d6a403b7c448e5493bfa410e09c3b9d59b32450883a938967b167a8e84cbfcaee546d36e28c8152a6c048070b543479072bb8df6189";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/hu/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/hu/firefox-55.0b2.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "8ca51f25ee3c06b918fb4a4c034ffaf493c30c67f1c3eebc0fc268f09ac6fe62ac163ad260f4a4ca592a7bdd80bcf3a916660ffbfc8681e46b40e416e3e7380b";
+      sha512 = "7ce8bedd243fb6d8cfe28eea17aafda028d1b85d96dd60c734f239f258dad8e7c132439614d48494e58088f99903f8a2a8824fc4878366400d9affffed203b84";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/hy-AM/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/hy-AM/firefox-55.0b2.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "49da49d63b28110d98156df0d07528e6261a01f5db9aefcb1ba1f04dd1b45e812bb026b6bc183fa27bac57a9a735009278ac86394ad43c54ba5760b9d4a05de9";
+      sha512 = "ab5054bc6cbc515af08763e61351275411edb2507b7013152185c49e3c7bad0263def5ad187cfe5fc4bb0f93e86a1596e131746646b25e452293f24216116543";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/id/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/id/firefox-55.0b2.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "6cf45812cfd16071b12c3b87226a37e5353fd0f331b65a575a4fc094709b20f3b0fe00064af1a82bb4c9430caabf2d2c4361f90cb2e90b1d5385a57a171c5955";
+      sha512 = "122b20868a4ee4d1bd42efb3bd281f137bda130d4328e830b3b21176777c6b993f562948671fd8e020d039b5e5798b150f1fbcf734f245615a2a3beda8d44e85";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/is/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/is/firefox-55.0b2.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "db48948f72641b83078dc44354dc3bf6a0919695a69c155d836154f260a4d32b8d325c138d6db863006dcc80f75d6cefcde0f9e445eeed89d9d8f89a7aa5a048";
+      sha512 = "033451b816392acf472f6f62f3367f929e4d4c2b749629138120580b7bb854c5409251c49650d3359e6f48929eeb62bb9a475ff46a8b57cf11c34d6035c67f70";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/it/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/it/firefox-55.0b2.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "2d63a2dd3d5b56c3c630b3badd764ca50e6bf4eb0ba551cb1207c849f0d3006de96781c59b8ba86ef93659487be74e2c5ce0621b3df921e3091debded91b6a56";
+      sha512 = "99bccadd7b8994c20ade9907301ac695ef01542407032588bb17cd3353e4941ed70944c8f9a28aa0fee5b49990d2bfbc5ac37d9c3d4fb88d13c473d50ecaf849";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/ja/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ja/firefox-55.0b2.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "f7bb1e8cc1cd72363f8be0d25173f8abca5383277c101585198e6941c4b4fddd222942fa6711f5ccdcb2dde97dcdf974229392ced1488d37bad30274987decac";
+      sha512 = "ec7193a6eb610bf1ee67791f1f7ed9ab951cc8a53bdcbddffb1078479919d5a70c43235e3b4ec4c20eb89514f283dc8223a4f61835f039f347744d07727058ce";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/ka/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ka/firefox-55.0b2.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "a36808e207a1277bada5793ac8431a381dddf11a600c795d077d0136997380d294a59f7606ed2a64643df53675b607ea249e6ac9518d57b91b2f905c76a2cb1f";
+      sha512 = "753c48c6dc9de12787705574fe0319ca9e4d5f9db67166d62fe0391fe5b8867d7f5da9d21f829420bee034444762a6ac3166c109a36e0001e6e7752c93304f77";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/kab/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/kab/firefox-55.0b2.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "498ac5ac757560c131e21a5b03e956e63e329a3ba9b3d7085d1448e722a78ef17c022cbe22a5786931c9190d79081806f408ecd79b3538b6c042e91f04baf65d";
+      sha512 = "a64d1b1f69d18d06810d72ad10aaae40153e696a29efaba4327d44e45d167a4526cc00811cfb764288df8971576c281fee1d8b737597f1de0f0755a4d2e78126";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/kk/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/kk/firefox-55.0b2.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "2b3abe204415dc66119edf9d09dbeb26b026b89a9bbf06cdcc9d624281f96269f2e0cb39f8bdc0a21be373ab4b0cd41aa93f9db556dbc910dda58e44619c2f73";
+      sha512 = "e95905b00476f33a8e5c39b427e592f844f04d267263dec65f9edee3e2a91790382cfde6731e2eec0193d535267d041d2254c4645a7f8cb6b1e3ecbaa40f37aa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/km/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/km/firefox-55.0b2.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "27d3ca7572fea00b1bb6409b55262ac85fdbf8a0a3a49146fc158636780cea266bb2eb52885eee25d198a5b6484476532f6a4d6e9f1e0f2c479bfd0c82ce3943";
+      sha512 = "3dd5c83d82e6a47aebecee97c49e94018169a06a9f81ac61bcfa7d6ff337b5c4ca66d10ae552f5642cda20ce545752ffa0f2589163fd1e01bd7e61c24c88e7fb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/kn/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/kn/firefox-55.0b2.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "d98e7a94cdb367ffa7c2f3453e7f2530acc09562a28139b431c17424c68973b27293a18cbdcdefd86bb9d3348fc37a4938502affc1b18e2f2e1e4c36fbea0d62";
+      sha512 = "cfcc5d048fbfa18aa0030114c445b40ada42064ac56194add35d51340173b3f6dffa1c9faca87fe4ca2f5aee608d7d05903ac8540095236d19aed3f939f88914";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/ko/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ko/firefox-55.0b2.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "55eac7a2667f90789e148f0dff06492c80253ee6a7d65af2e9897a7fef5209a64c4a9a018c6d5b8e137ebed60780ffdd1932287d1d5e174462f9208dfd181581";
+      sha512 = "9e7b63568e745d5299fa0315dac87478bef0a30cdad42b05e33acdf188f8346e23ccac0ca3c544f1284e4cd216d8b5c792ef448d6cac31318ad711ec21ec4b05";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/lij/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/lij/firefox-55.0b2.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "e86ee02d85ab92f61544f590692bb00ea49fcdf3b1d0475dff6dc0fc003663582fc3e87f1ea03cda90e20fd073da9e2663795e620b9e6adae2ecd98f434ae9e6";
+      sha512 = "1c8ffd773a5c259d32a6bb6ed6472c041f5337f01f21f6e5e18f774ddb04480cf0772ccc6bac7710e9c22f760d7bd2b234d6d21e1281d9ce2a26483ccd6e928b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/lt/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/lt/firefox-55.0b2.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "57659b95a6421d0db8370dd17e5ee767433136eb939dd69ff5a29e7ee351c0c05a3339c70984d5146c198e6922f8c2f41a9d164dc1690b779a25d62d4e1b7edc";
+      sha512 = "2f087692eba683bb0e865b5d4abc712edff5cffae647e8bfe382b2c15acfca481bb56c20f6b14742e7f16dedaf27848e8ae4d5078492762185d36c040c7e33ef";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/lv/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/lv/firefox-55.0b2.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "ae547b8db7236199787cf455d2277d5dcfa7cbd88dcfc226b5f1552054313a4d56144d828ff1819aa341ecdcd84609e30e4c4ce22884493031fde62cc8d523d8";
+      sha512 = "0f6869d9528ba56a8e03e2dd85d8b76d74a359a17eb84c575a94580f965fa8c3d253933b798e2c426f742fe5d8d0d7709a7280e21e7eb41ce3799ee98cdd3af1";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/mai/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/mai/firefox-55.0b2.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "61aeb8fe7c8af0b411435868f6ef540e575a5ad6ae353d2d40538c1d50f154534e8216c3d479f838f4eab4d76b07280a8d1a76d2e73ec6a8d32d99bf79f9f14c";
+      sha512 = "31c2449b7127b4b537d407330cb618e1ffc24259f9bb455f95e2b535a4ca17aff8249c77e98e8f36375671390d4225552b18ba21346e3f1062482e8b8d3cc288";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/mk/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/mk/firefox-55.0b2.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "778ed9879a57b2e6a8e7fc48bfe109a3b60c4686163ede1b8df225a3daaa9e2a854af79caa3f83e2e756b32fd2d6f5177dd145eaad1d670c4420a4482a6c7baa";
+      sha512 = "0722b24e72fb8d0423e37d47035be6c2e90db45d99590961dea6cd5be6dbc7f1851234f20e4d8d741c4a36b82c31675b2e39884d2949f5134954b53ae6db6ac5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/ml/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ml/firefox-55.0b2.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "3a3058ac0a0dac34a601e82209482dbadd2cbfe9228ee64726fe1ec60d3e6c0029b6cedf243f0a82bbb57c8ffdaa17a14f3c75c8300c31ffa41a07a9c390c83a";
+      sha512 = "4944473b377fabc233f30a6269ebf02aff87ecdd02a75e528b8f0c737dba37ad9eb322f99b1ffae1392a67144b737307bfedf0c6d45e65562f964bcb9dd3fdc0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/mr/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/mr/firefox-55.0b2.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "a2218eae78eb1cd9e27af11dc578302e5ba47530cfb8e05b8518b3c9378eb0397e6409d093742e00708955144e4d6574366f70253ddc9753dbbad53230f27882";
+      sha512 = "5b2bf5731f4a988d1bdcdac74abf00b0633b4f9b63c1b999309d5c4eb5390d0e823d170b7cedc278b49d018d74e6eaa83373ad5c2a26151b78e9e831bf38f14c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/ms/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ms/firefox-55.0b2.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "46c04289d100455e926c9e54d77ad9ee9f920bb7d928ab11dc346872bbc6fc888e3e4e8e66e1cc2e169b33a4aedb9fb7d0d205ccbb052d9846b14af9772f9679";
+      sha512 = "e96483b5e5800a6a33a9e9d065a90476ad76c94b6e75fe006881c209469e2f37173ef6d67b4f2b2cb216c46ad44bd0db9dcfb9d2e5afe864297e26eee93898d8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/my/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/my/firefox-55.0b2.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "84e9fa1ae7ead0f9ed4240c4923fb6a4485f81d3a725793c490c644ac0b8bcbf8e2fc0b7675b3d146dbb3f14adae243f1e10fd0b95ff08a90d674166c3af72ad";
+      sha512 = "4d145815f5cdd37666a60b0db476925b89495b1add8bfba42cd15580a294610f20fa340c449c04fa9cd2714a62e09c61e742037cbe26b5f11671eb72dc8a5008";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/nb-NO/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/nb-NO/firefox-55.0b2.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "0fea5208d74fc9d4b184413e3f6437130beb816cc21425555108ffbe1c15d2b5bfb4478fd81d81f5a57fb8ab2c90ec8efced100b9c022940b7ac6db701829088";
+      sha512 = "3763bbc87d2ff21b6db0d45b684b91f1080e3dd9fa1b2240edd56c2db1100b66ae04748c67df410cc9c0802e83fcb2a6661fa35fce6e8615a787c280ded8ebd6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/nl/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/nl/firefox-55.0b2.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "b125f32a93e2509e404cf0e7ae8f21d227d863586869f83fcdb577da76bcbc5c4457bd7c79ca4c1d51046aed6cf68c772c9dfd6447da139dd4abae1ffe97d952";
+      sha512 = "eaaccd4746477ff10af5ee15b6e18020e8e1bf36bea7176cd3ca92903d983b97cea4d73a516a976827ad46dc4a03b000935f1d1d353af90ae205df435cdc3004";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/nn-NO/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/nn-NO/firefox-55.0b2.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "155e45030d15bdd1db33cfb862df509cdadea5dd9425c8639bace7ec8bbca4265ed501c608911454001022ed01fd27600ad0b9c526e721b6faca9d30f30236c8";
+      sha512 = "7df043f3e917978b9d2c3ec6128275daed830d1402a4bcb98160b2bbdb98012e5db116b7ae6537206de95f65b3c7472326b7739979a12e452bc045e738071ffa";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/or/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/or/firefox-55.0b2.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "dc1590c5d3a51b2a1d3cead15d432df33f58a4de6ca57ca0ff207a10e239575d177f931c31e03294c6a5f6d4938de04dcbeb7e356c73f25a7b9a187481d0a8f2";
+      sha512 = "04e46a2cc75b662404fd5c107a7df37761c6cde2bbe93f040d2b1b745ca6e3fad978ae868536aeb526e26b4af1f7b961e9327a3a9660e1ae9823c9688a8ab3fc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/pa-IN/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/pa-IN/firefox-55.0b2.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "c02641857f7742ee2eff502ce47cebc00548efd54521f73760c0afda0dbd59190a2364862f3589d2b5caacda451811bdc19bbf381ae849065fd5af4e715d72ca";
+      sha512 = "a5a7a0ce8df208b595f895428030fab8e19eca9b88ae2484e915766376d249e0455986b3a79fb4314889b35f52abb6aeca7e7b979ee86672b85ec777f8ad9a5e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/pl/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/pl/firefox-55.0b2.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "1baa6b00ee15366413a081172a67fc835eaead6b053268ed7bbfb093c6d3cd0ba4168f10f88d2a3451c3fdb421c3a91962b8ae2523d5b32c7ca6f774c3041419";
+      sha512 = "427a76174ed62b38ab83fdca0c64eab60c8d8626bf350d15c269056d126a3eb2263ce75f6cdd476ffed3c59b27a77119bc28317640d3407e54a2d17497207a5e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/pt-BR/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/pt-BR/firefox-55.0b2.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "c74567b9c3ba8fdceb309b72c6dc267c8ae81fb5281e9903ddb19f45ca0c10b988b548fcbb7abe7ec67ed4cd314ce9c9d75ef11f1cc6ae3e411f807d8b9a5fbe";
+      sha512 = "6f93c44b4e3990680eb37af208a1040de5a77008485e7163db861443334cd8fbc86ce387341737699dd0f9197df4ec9aa7668a2b3862c133f0df983d1abab0c7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/pt-PT/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/pt-PT/firefox-55.0b2.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "aa7b19c3f40c376c82945ae4e3a7136127d0be75502e143bfd206e738be1def4edb9173d4defbe0cbcfef59c2c168bcf983a23d721ec61311fcccb4b3dc8ebf6";
+      sha512 = "255a1297cd0c2c8c3f872173276a81a0847f9991d1dd4180555e3299379740a1a65318596c66c8d464dd74bb2b4c6a395fba3f905c98eac3a97a0b0cb4ebf45d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/rm/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/rm/firefox-55.0b2.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "0f2452d45e213daefc3fdbf68f92f3ac9d4644dfa33f880f9a0e2597c58e93998011ce4e7a6b6d4add46ed205f5234f5ca7d5d0161336480ec0013bc33582815";
+      sha512 = "69c0e8248a17c54879e3e50b6bbf2054afa8d2f85a7006e6201d6dadf5112ba558d4f8e2839bf65c622dfc55f537aeaaf6fe267e6861317cda6bcf86eb9a3ddc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/ro/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ro/firefox-55.0b2.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "7de63c520fa69a218bdd602ff17418e8f586343c676d5f0880fd5dbc7185e9272ce75b39bed5d949ecf4112b2787e72b02643c6be7fae2a87ec3124f2ecd71f3";
+      sha512 = "dd696d3f948e3fc5a6330fef299c93d2958daf96eb688826d58f76457931cd69b0a68cd9e1366e52407a2bcc650542c42f592c0b10c682d07faeaae968b0d74c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/ru/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ru/firefox-55.0b2.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "788a723a5fdadf2cf4149575c860d883858b798af34fb429b3d74d7542d230198c6ffdff20d07b224dd1f140ef84801dbc52962447a26dac9999c397b78da0d5";
+      sha512 = "5c788e031ab302a82cc4b7d51f7f2c7d1aeb9a32be241f4001fc8bb64c2331db391b5013480b15ae9426d970eb80fb95d72e3e2819c3ede8d54f9e47c6bfc76b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/si/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/si/firefox-55.0b2.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "3ce0498800ffff07caf920dfb8bb32838f519d6111574a687c2c6e864d0e99d644c2f2c33d2f312560f0c0c3fc50b7b592b3bca8cdd87ed700503323d7398b92";
+      sha512 = "2a87bd1040627364b6830604b9148df4b9c826ff9c8d6a9b8709ffa491503ea25ba32f8e186946021358d66129f0b84be98561be9682369a701bd56ca13d990a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/sk/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/sk/firefox-55.0b2.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "73966742be3916d1a9ff31d55071bf50fcb21bc8913d27109f75b3fe63849dd982bbe9329733e9f050d1c884468bd91ed0b8a47cb713dee79929cfc8c1417d96";
+      sha512 = "defa6ba4b5f00922a45d173fd85982e13a099760ef025c202cd3096366e6fa236ecda704ab97fdc3460f1c66c83e3e8cccfaa313a752f6a038118e2420626039";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/sl/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/sl/firefox-55.0b2.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "1550d741812085658fbfe82212b0a10408d5dc1ae23fc77441d4559bbc5fefdc54052fc62387aedd7fca0a81902de068a9fe24aeca9cfc338e64ba43e8513a51";
+      sha512 = "adf3e6886f3e500e62f3706ef79e03924e6e9390775b16fe20799d5f7fd6618e5d0c520a8b409b3ee4eb737d8bd2e0f87e1aa8c2b34ee2e0cae1651913215593";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/son/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/son/firefox-55.0b2.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "25816528ca8907e502a7fe3533bbd3c8dd3448ad9fcb8149ceeac0c397fcb28c7f92965b76f1586e3a7be53575999c6e013064454f6dc2aaf1405b0633e68676";
+      sha512 = "d6e1e6b2b0fda67a38eb9f7eb8c3bc50f1274fe81118491974372b46fe323419ddb990549c74be040900b372fd52c2cfc193e417714215f8a1b3b07259f2dd79";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/sq/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/sq/firefox-55.0b2.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "22980b382acae61fcd6cf5ba65fc0f969231a8e4d1cb3dc6d09d1773ebd23eda2b6bdb5da10e752f0f69991e45938046b0ecc0bddd377f7e458146f3de387dd1";
+      sha512 = "a787b2df5b1fd9ba57bfe5cc66bc4b774dd4a4b81d11c0d5f0b9c54e1c72590e58d11688ca0ea64d9775a3e4f65524cbfa9740d990197a0b6972034bd4bac9b2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/sr/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/sr/firefox-55.0b2.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "db418099ecb1f34efe3fe3fecefcd40dd2ee720a8dc46da1c10ccca7eb27f3e062756a78c9b6c86314f66be641362e8a82cf344c18721300a432a792c9f71530";
+      sha512 = "3127231295510a1681808d4c65735f2581991ef04fc7af8ee705ccf57b556f3e085a3abf0fe105533c608a27273bc659b8ac8941f2b044a1ec8a9b085b0a2124";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/sv-SE/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/sv-SE/firefox-55.0b2.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "8ae1fb40b7b2240a014d1f25547f8afb8dbcafaae62cdbb84b027887427fbec6111fc3ff1325d692341b3d9800bcfd8c9036ecfe32a9fc9146b511668c03d67e";
+      sha512 = "a1bcf79292ddd3efa08d2382a35ca00022e7be2930d832523a4f94db9f25b7ca45054d6d6b6c456f3793038fe4167d8659496f4b0bc812ddc8c58a1e83e279c4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/ta/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ta/firefox-55.0b2.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "2e22c50f9905aa744b2cef1fe087332cc17cc7ab51c144e34327153bca833cf5b5783f0adfe5315e2965f30c237729f2093f670c9a00e39a1db8659a94297528";
+      sha512 = "c3ce64381471908f7aa7d4004c8c00d1b05d852c200343ce48cf7d428558d0182c4b13b23190e266269c556165c6f51ed55baa1bad9f55f3c355935c09bc9f3d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/te/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/te/firefox-55.0b2.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "c2add5e606be0a210ed6af6c06c3e916905d3053dc63e282ae54e5d4209b800906ccfe0b23279ec2cce1e2eec7f40b6604cf21652fdf626dd0e261881552724b";
+      sha512 = "9427ada27b5ad79a556f4e0f7d1fccecec7bafcb44ee19af9257c16e4235bc2078af94acf9e0c0240d11a32a59176040ac54721fa7b934ba12320a67c3207183";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/th/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/th/firefox-55.0b2.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "2c5b5e170e75dd7ec9b4e98fdfb2cd6f228ca6aec0907b6ecf837855a2084b9d2e0ec6000e6f82d1bd9b7b09db23afba8ffa6e813060df3f69dae7a5f04d4907";
+      sha512 = "83276f41443e931b7e55914fbf32547ab01d58f9d5bce5335cb931b783fd9845f20514b76889f82e357e489b65afa3dd0894544d4004625df08bd2021aeba8e0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/tr/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/tr/firefox-55.0b2.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "a16330055ddce9502e69b8ddd6381ac421836ad98d0002591cf0ad28ea199ee607ff747651228fd2e5528a9be773aa9fa6f0ac58e57d13996e104a0c2c6fcb34";
+      sha512 = "c93877ccb3a0d4ba9164363b869577a5cd36d85cb05a8d1ff882fac21e333b7ff8c4597647243de753c037525f1ad7fba21dc1acb2ad212802b514af9402896d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/uk/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/uk/firefox-55.0b2.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "e9537030c06093d21230cf8e07913f05d9b02a89d31d952debf558c346d77b2cb95f3129a9ff6a249e3abfd769d41d0d67a57335d4dd39b1ca1c13eb9bd6cc9e";
+      sha512 = "1512592dc0ec9a19e2e92fd39db30b50fb5b26886c1683038885c9d7b18a863182dbe1cef7b8265aaa82e60dcf94c45b84892ae19a25a8a9339382ddab13e327";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/ur/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/ur/firefox-55.0b2.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "754c986845dfc0d376fdaad04bef71498982259524a458cf1b89ab84439cfa4bd0ad6d7092e7499cc91e3eb45dcfed3f93a2fd1bbcde5f2b678d17fa4d62ee99";
+      sha512 = "3a90c751054ce848aae996641133e2aa573c4d6329d3dc58465562e45ff450bdbe820828c551de71f0719210458cc71aaa4d0d3745a7feb27731f91befcff3d3";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/uz/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/uz/firefox-55.0b2.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "ced181d692de83928a297f18bc62391c9ad9c05b27d0d9e2db3b9f0c7d37d726eb4406837a4e223534e15358fce4daec1961fafe284ed032916c39e49c0880f4";
+      sha512 = "33d3c67687b235c231e09b6564fa525049e1d99c37c3a5fd6905feee5674c305af313d381eef5af990e878fca36f6af0cddbb399a5a297affa4e3aab5f3c103d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/vi/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/vi/firefox-55.0b2.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "ebd4bcacff95dcb7ac6a58da2ede2b4fa7d44598cc96761e870e49d65c827f89d5fb7b2b144252026475379b3dcc88801a46de8793a8b75f17997edd56f90679";
+      sha512 = "8dc83c33bf9e27dd0605c945a746035bf16a189b6d5f0e52a9d65e4f45964d8fadead1b539d9b906ab13cd43a7b2157b4c7040c1d155f4eb7aa67dc987819a3a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/xh/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/xh/firefox-55.0b2.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "80d32cc0d735e54691b1c4cd59cc1a46b187dbe4e2b2dc3d3738b66b5355324313c7c5e61c778ad058b236e48dbd8238a1bb796cff6185398515a9fe5ca42385";
+      sha512 = "b0535a8704b8879b86d27cb4867f13269395ffafd54a5acdf49124808f9c606f52cdf9e64a6378fc0cc37a6eb4f955b3613af07076567a6bde71a5e61a521c9a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/zh-CN/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/zh-CN/firefox-55.0b2.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "c63f0fc1174d40dbd2c1c57d92cf02d594c1a64ff12e90b5a58b28d7ea991fcb615a0e8029f96ebad12c59ef1fcea39575ac58b69eb25f31ec4d5c9de5cf72b8";
+      sha512 = "17c5996c8002cdfd0b07ac796be9b437582cb0c5401fbe0f405dd0f8b4aa3f45aab24bb5a8f364320d62550eba7d228e1c20bc7805e741a86666c225db3046cd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-x86_64/zh-TW/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-x86_64/zh-TW/firefox-55.0b2.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "54fed20629960f34306e290eb60fddb7cdf20dd7b95a21a632557a41c99ca24cfa03215924138debe7c6aab9772197a0680f6afa3f35da841ae8df553349ea18";
+      sha512 = "68d9b507ac39d9e175285e5bb4f4f24396687e57622ff31448cf77d73ea8e8817230b65e70c493121b40f4ae91b145be59eda2ab9d572be3d48c14ddacfb28d8";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/ach/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ach/firefox-55.0b2.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "baf49f88f15e62a5b2a60c8c09f1cdf8e414083dd816403df8ccc4fd760e74e66b2b86cbed075ee78a504e03cf6de5e90d92a0228fe0b3e889ea301758c8e95b";
+      sha512 = "e6b59ce7c5c6289d57edbf019e74d2529b2d38f09552110a50d94eb82e7470103791c69c59066405b8e5d1cbf5058730c3bef780cab7b95444eee756b593eabc";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/af/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/af/firefox-55.0b2.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "39d3f8fe582222fdcb2e2435cc02806bd34637deb2377276faac5dc30a7df0bccaba1636e9d04e86ff1ee4f376e7da4eab2d63cdaf00c4a20e7c048c76a39e38";
+      sha512 = "38393317412a3310ce7984e77a5dd12a70edc3da8691ca38b5133355c1c60e2ee61a12ecd5af7ea7b47d20f2718da2bce56c9b6b8b056fd75f9b93d1e196f52f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/an/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/an/firefox-55.0b2.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "3045e008ec29253728d6dd9fe99f220aa00555c721747dd684a6806bc87d60539e79c7b547fee0d3b740df09ebb8febec9e44961369d8f614b9fb34b8d04f1e0";
+      sha512 = "584ffa243d0d070aa642d3b0e5fa4b7db553f68032d1f0f251034f4c636529f382451930217da9a3fcfa62e7912108f41e280a2f277b5ca9faa2b05ee0a86487";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/ar/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ar/firefox-55.0b2.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "c4b147f35e18d3ae864d641b686af9dfe25d5ed58e1b84df16c2ed0f4574039549f71b019d2102bfe60a5c84f2bef9ec20bcb4f56d914ec69b5d91910e7b6378";
+      sha512 = "b04ec9e9698e2c70149c772818a8c4ba2e0516e3049b31ea8fe9db3b1f69724094bd2c05685a864f3364978362eb89a51b0e15e7931c61ab3cd4693dfa8d7517";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/as/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/as/firefox-55.0b2.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "3f8b2001af4064b4273dfd543f4df1f6b534df9b5b56fa6f3ba2eda0f924757b4ccd567295ff5874e463e330be1669ef4d5850f33a1e081b0f077b571fd90dd4";
+      sha512 = "2f76402d2333572483ac9441faf070bf55f39bc22a7d995c6e6f06e7f478e54209b1b61fdea9a350f1466b508c35a5640a3db0c4f5f0451de14e535dbc4760e5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/ast/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ast/firefox-55.0b2.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "20575f29d9409afb7c9cbc78b1f2a16e975b9844fa9d47946fc36fc3d9cec14c340b97643147a6d021a53daea07b22e0d9b791caa954686ecf573c98136176c9";
+      sha512 = "1b5c6de905494d0773a7089df87987435b70b5c734de77a6ec44ffb941709d0e8713c54de8293c0f84a77a96fc3b7ca11e9ad892c870236c24a86031e62e35e2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/az/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/az/firefox-55.0b2.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "29f374dddf442ae9abcce6be49a234a45b95987dc547e76eb9d3ff7e48781a58bf00303b72cf13624ebda702d9dfdda70ed594f17d59d1573783b643b54f2241";
+      sha512 = "d1ed01e6854e3ab1f8e8f339e7d4c3bbe4941ccda88090e09a44eb8828a62e59749218072fa248358c073ab76e84b18d59cbb3cd39550834de9e8c91b81a8477";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/bg/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/be/firefox-55.0b2.tar.bz2";
+      locale = "be";
+      arch = "linux-i686";
+      sha512 = "807a7bbdfe7e556c4f8071ea8e148cd3cdf2cc32c6c00d91a0563ebbb378599debd0d3e0a5f96f75f4ef0bde552c5050c8e798f6d1bb65a37019aa0b1b61b55b";
+    }
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/bg/firefox-55.0b2.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "a2126b3a3875ae62b21eb2a0ec840f0b5f0ccf8c81c945b0b6f80fc0ff5e2aca3cb6cb9554bcc8737b85d65fc6494fd80effe9fbff277f6f5a7fbbe4b8eb6477";
+      sha512 = "fe499058210285f65d81397d182b7e37ede56e60ee21cc7e0680fba8c9dff58a0e8747d6c99e789cc2b7578bba62b5a04b83d1cd1f8e533213ee3ece4957acba";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/bn-BD/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/bn-BD/firefox-55.0b2.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "7bd043b9bb24fffb8f2a8a288ccd67195d36ef5e3908ce83b559efd37278c2d7275a85341c03edb42763cddfe2c95b917387f536738b7f8b54c743361045a2f9";
+      sha512 = "df14ba0acae51673edcee4e2da4ebcbde1f44e615a56777712b4bf1261c49a1007249b4b547d378906b64e4b97959b53285bd5d0c074fd3e0080537a5ef24c1c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/bn-IN/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/bn-IN/firefox-55.0b2.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "62218d525722f55e1ed9ebe86961311573e53a08eb87f8a459d44e08f2a2e627fd0bb8b67c4a8de1b63fa14aebede187428bd728ffa68caaa8390c46d5bf148d";
+      sha512 = "5db62ceaf945411c01066e244fd08a95ac72134867619c488f54df05659e6e335af77c6a5341370cbcdfc7c9142a5654aa843b1a392a1531c10062052cf97c5a";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/br/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/br/firefox-55.0b2.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "1638a7b3091f243adcbbb87566eaa8d95c5a6c315b8c67263181e33d5e014342e3f062da4a749972dc36da029d15cf10a4762ed607cccff934c19a9acc3d6e72";
+      sha512 = "02d4f4a010cc1ec71d93c1b6236bf891b290bddfca87ce9502f12f530033b26b94a1ea993f591911cb48d52145f2351a34be8b63b67a74498f6a10ee7744cc75";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/bs/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/bs/firefox-55.0b2.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "e577bf44f0f0cafb96a33f8aae0a2b538ebf46d6bf3be51e4bd59e77261b4022f45619ae098c66c11546dcfe6baf4b596f1d9ae7f4bd1266c3786310567a0487";
+      sha512 = "458d234394e79ffb87fa3181c6722c63eecf19af4e6c10eaba372f01f4209db60ee01d932fddb335f0f1dfd2781cb3e651e98ab4e69b71974316be78693d05e2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/ca/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ca/firefox-55.0b2.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "dc0dbc0b86ab3079863dc37d62851fdeda415728546bc0a2799c9c0546df258de0ea47968ef2b941e443ee4110cc8aec632eefd6879b4e76be905f66981d0290";
+      sha512 = "cb0e2dce6a8dc0c211a72bb4e868bc3d04c2baf19478ddb4af6f6adf6c97b7a0ac334017d7faca08d51185e3352140b13c818b2a64f1c74956dca8aaba1edda4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/cak/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/cak/firefox-55.0b2.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "c1c02e89db0421c9f1355c618cf2831ab54eac9fdc8bd61efa5aadc37999b28e2cb91c56edef23748141becc36c4e315a9670856323ab7abf64fa5b37432add0";
+      sha512 = "984b28925fdf204b1d0dfb4080f503a520ae38288370ab2e36ac1f32e579b5fcfbce3106896a351472dad078de42656c566bdd56b32088b52fe4bc6ffbada247";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/cs/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/cs/firefox-55.0b2.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "8d8d2f7cb0f352c70681b2deff30b23caaee1247e11e0b6ff977fe4f12352db8a3fcf2f4c9463ccd8c3a8631be7432295fd82f74aa2ade8a67bdb89916e5c57a";
+      sha512 = "18bfdd25f92324a7ca00183f47ec0c43eebf582ba4493a36b6b39b7f178974333df29a2238fec5974baeba271a3f83ff3f274ffc15488c24e89cc2d17766ef64";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/cy/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/cy/firefox-55.0b2.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "9ec90347d3ec2a1d23db120f309bb6a5266b8c6cf85004a97cef798c7ce14169e28f752dcd6d89bccce7947cf0be04457c8e96a8cdee6cd2e4bfbfc84193fd4d";
+      sha512 = "1aad954d11eb33704782e1ae502d86fe9c428c9cd0d7dfad020e7510348443adcdc7db789fbcffe96691e68880da2dde1ee331d5f51503dc90b839f14aa44ebe";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/da/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/da/firefox-55.0b2.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "ad20e0ca46c567d8cd27a44af43c7c8855be4cb50905f7697a102af7378009449ad940cbb66e24b9326136ec98b90782fd569ee411951b5313c9444a516a4184";
+      sha512 = "0dd9a02adc2aa39fe5ec4ebbd0b6cfa0968b0daf50b558d088f1f0680cb06a8baa526ebf96fe63babdd8dc85561910a5a6645ac11e02e641361491a2c9185738";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/de/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/de/firefox-55.0b2.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "21d414a1c906675cc8eab081f499438c5b01fa1b535a048ca0538815403f18226fe8c7fda818afeb05128497dbe1c53d17868418c1e0efb92dd41bb112496ec8";
+      sha512 = "a3f13abc0d8ccc445a495cd87cc690e5875c9c79aebdf6adb04f469483a5870d45fe7a61231bcb3ce07eb64c38ef04ff6e16e75c4852864a3ed1f385d3dfb79d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/dsb/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/dsb/firefox-55.0b2.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "d7472be94b33967a8f65764e5afcf6ffc8762d507d6fdebdc87aaddba28bf0aaf1b31a546c69adca4e53effa0a349f5795ba2ac52d51f2726094a4901263a042";
+      sha512 = "e5bcf46a200adfa34191063503dc5875bcad0cc298f9ccecee7a1346c15b22dad5aeffee2ab7d17b98bd3cd659544422c05ee9f79ff8a0702e592b7d1b8e5b32";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/el/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/el/firefox-55.0b2.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "ea5e5520cf1559e92bbd0b94f5c7f8451e1fd53c09b92d5aaf2ee2e48c1693cd9b22abdf418ee1bb1551768a7ebc220903c1b0476935fbd95cf9476b7b6e5a30";
+      sha512 = "eefcc3ebb84bd75472ee0614d386a5bfe718a77b2fcb7e4296dae1131415e6541f3158b072314e8aaf46851ab718d0bef12339cdfcbf1ce4d1ae19004fc82153";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/en-GB/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/en-GB/firefox-55.0b2.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "3e685d42bf1156dd736622b6ecba811dd4b3333f6be268ec616961088b2784eefda7ea0fae8440d9ddbc2a54507e90f33a801aa885baa70bbd82f0d2e0b206da";
+      sha512 = "c03a785ece38365eb69893ff4346f468199ce8753329c781241bf6ed96f595696c0927285db41fb00a15cb548eb74c66696e3962560c5add5b0be7a29936c8a5";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/en-US/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/en-US/firefox-55.0b2.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "f9fce327dc51338160dfcfa22733f299df0598e4f2f2d0f86b7376e7582d10a183bc8eaece746bd7b598ebf0f07efa35f61ce1c5996e35d4d4d60a891a14d01f";
+      sha512 = "26d4b175dd8ce02cee25c2f8d6eea4e60ec3ebbf4858a185d38d3593f4397131fbb60208043f4c53affbd075299c69d5916b4ad55b910cbc8cc15952c78d9b2e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/en-ZA/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/en-ZA/firefox-55.0b2.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "1c6378b8c5ec23b8988b9232175213151adcf6b60c9d7d8f36874e21bdac58b55d788d588ca99ac7dbb235de619cd62fdd66f607f467fd681dc0c0dfc48e4a0a";
+      sha512 = "f99136eb3831a304ec84044cda5d5fdcdefd1a4814f6372c9edfbffb98d93b551d0cbc8fb45e8386f251eeb0f0a4aebcc12013267a901c2533bcca197ca6b5d7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/eo/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/eo/firefox-55.0b2.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "8f991d8e5a85e7890d868cdd5683f24ebd5fea2ddd01de9efdaeb1d8978c81ef36084603e76f487fc844a4261d65a467471bf30910ac9b0c33dad874cd1a5094";
+      sha512 = "3ede053c3018b41f113d64f5d5dc14ee1d2bf219e1d7b37ae7ae8b36aab349b1364331d7364850cf40f7913294119c85468a8441f524cfa6f18fbb55c4bb2644";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/es-AR/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/es-AR/firefox-55.0b2.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "65c1099c7fd660ad90d12a0297729c6212336b9e06f96128fbfe7c52e419869d8db443cc19f4b61e86e4f7ad275952a7e7d570361e7829927d4507e20b95a964";
+      sha512 = "51736e77004f5c9cbe4f303f00ac6c32c9459e55a1cdcab958ece590ae8d575f119ded5bb013600f077fe388e3572d01f31a41f462defc5407d9bcb6da743fde";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/es-CL/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/es-CL/firefox-55.0b2.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "ffc3863b8e25fcbcebbe01fa0ba28070bb97813f87a5f4f80eb25c7bc96df133140ed9a646438618ab297749890d0860c65ea77284ca101903b064b975a5e2a9";
+      sha512 = "9ea21d6a5b9d0eab81eafa1a5757aa566b806fd16a925609e46002ad126a633d2373fa8ef27db9388c3f6f4680dc76b946b5ad9f71afa8dc69382323cf1dae22";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/es-ES/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/es-ES/firefox-55.0b2.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "6cb1a2b2c1da715733ca83e9a1af5e20c313887b1973010b1871be3e5b1faa35ef81c4e3c1c0084d23bbfb2b9151cc684179fc285852115cf3f79fc3538e93ce";
+      sha512 = "3d77e61ddb1738c24af8edfd8a2b9905732626ffb51d1c64b2a27c229121ec8df0e7ad61389ffc0c78ed545a6ce8ad9deb424f65c6d6fcad427753f9cee6f1fd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/es-MX/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/es-MX/firefox-55.0b2.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "f54c7a2da3a00cbe3c744e0234ff8f258a37f67590f92a271df313a87de1f15c05387b83525dc01029fcfa2db536809ce24cce1d067c765441d6fe6909aa6eca";
+      sha512 = "155eae1468c3f4ad4a38e3ab135f79e352da4e96b1f1bd2a20771d9eca6e4ee89a0bf6db92c2a3aa4ea92df8fa41cc63f35d3b78c3f14fa4ccb4521d7fddf102";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/et/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/et/firefox-55.0b2.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "af3ec37d2edf1d0f0f7da6de779923b0bc446a066443484241783b8a76fd96a8b2ae7044967b3d4854349fc6f0bd18b2032a50272ffbebb1a53f851ec3d2ef19";
+      sha512 = "08f8ff1dfc92fbf4d26eef4ed6b05caa6b911fc8a2ef1c655fd6a6216a5469e3086a514deed1b6722e6207a439feac717d3df851caa08f71a9796033b6292a90";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/eu/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/eu/firefox-55.0b2.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "504764ad92b0250b203bcf8b42c6c2eaf0ddf4ac0b5a3419b9c4d84f4ef4e50e3275079514aa89595a3127162c139078262bc90e0b998922bd2c06f8a90f9f7a";
+      sha512 = "407844c56a06d6464446390d35cba2b0ef983084beecd03f4cb9ea93607e0571be882b4ebd35bb25c6f2fc4f65bc64321c1e6f522838c1dd68bab46ea9bee779";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/fa/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/fa/firefox-55.0b2.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "8c632dc5b05a2b0711e917a4d3599775bdbb59aba448f408660e7df02f3aa21313301b4ff8b4237ab7ef9c6e61c5b3331860d79413abfe447dfd262ca4d817f2";
+      sha512 = "f5c27b8987623ce46979083aeb2c7cbe0efb9e92c2df6909fefb54e78a25ac3792d78605fcbd50fcf71dca8d09b60c5e92dc4ffce22f3a24130a0e1e5fc13918";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/ff/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ff/firefox-55.0b2.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "b37986236fa7467d513b643534e0b4fb7e9676dda8856b6600ee2287b671cef974c4fd781ea1254e20ae66445168e2fdf2fff1e761f489e2a0fd6d0138adcdaf";
+      sha512 = "12367b1f896f88a06c3eb906a10a5b288fa6b3d689fb1a452ae93677e37ed89957499937025d50f29ed808b93c359bc9cffced49e013e95a588e2828a4bd3d65";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/fi/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/fi/firefox-55.0b2.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "57164b97daf88d76e7e3fe73463d1b583893165dcd79ddaf824e76e0e8fc182f9e4c168ba5a78091d5f2cc7af0b36bf538b056d5837a5dbf1d53d0c29c0de5b2";
+      sha512 = "40ccce97079cc5ca9a7db1ab2aba581c4e92d10c83748c654e48d922ca14d28632bec850d138b97c847e9325162bc34a20d4e672aab9b191aed7f5784dbdf814";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/fr/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/fr/firefox-55.0b2.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "5e29ce0a9890cd6679a0f7b2b074f27d8a0f4c0df00c0bf15fb07dc5ae7d4d5147a3a21412d7916c00c67befee21febc8399045ef90f9c776d77853488551d1c";
+      sha512 = "5639d6800f4e8265bae4b3b49fac10312fceb04be944a51c11b37c33b49c4f418f0c2a6481ff0860652adfd7a0259612be93d784a802769465fb29cf02780c6b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/fy-NL/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/fy-NL/firefox-55.0b2.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "023e82bd8d6fd4378d88f063b28b92254440c9eea4306fa046b1abf31ea91d43259ed55c330f788cd686d152e17c1f94626eb05ffd0cb27857070ddb8d546298";
+      sha512 = "f73acd20403e4cf38d365f9b49de1879a750f73ec2842a3ee91da657c5fdb6eaf0695540efdbf3e67cd72234cb9007c2620b3d146a5bee72e30453c9fc6264b7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/ga-IE/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ga-IE/firefox-55.0b2.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "249f6f582f5cf7adc8cd755e26c44a3d48712b10f65a436cbb43332dc7a72b3d11ad20c4d456c7c685d174243166ef1ca11a834c155f691249bb1de4a157b996";
+      sha512 = "b588a3a9782621b33d9b43e252311e78bee1a49b290bbe055cb01b45eed1ecaa79c8cbe326a4a462a632a4452978a2978d6ac73f7d56d9b4b51aac479bcc5c0c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/gd/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/gd/firefox-55.0b2.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "447a9ecb093576cad7dd24f9c9d8656d31d4b23db33f76ac35325bdd8cacbf0d64625734aaee4d5849b9f450dc7f4300af8ea284ccb0fdf9d1532cfa74556613";
+      sha512 = "ecc2d97c4713a3646a3c38ea5cc1245ca7a0bc690305bbe0ac3d9b09d903e27265cf87b73f1baf98b50547b321ae4ff984bcb4f9afc788efef9b17962c9ac28b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/gl/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/gl/firefox-55.0b2.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "cd0ad5f227caa5bd3213ac35b9cb73c315b23d9eba789a192ae21265a81ad85a5718ab088c1ab9ef7242df5c3e03271be333a59c40db55744de1b5be3e066e33";
+      sha512 = "0715dd37ac757f9c70d41bdd0faa26cb6f45745ed17b9e627d51bfc040d9d637f236546cf1eae77c8cabad59f82bf2bf95758e5eb675dd9fb6813eb43214163c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/gn/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/gn/firefox-55.0b2.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "918afbfa4fb7cb8a553cea7638f0ae26ed6cd360e5d1dde81c2699e4d9de24583a126cd75ebde7a6b4a42cd9b220ac1472a1b96d9c63ce5c53f241f6008a2264";
+      sha512 = "7617f00ec13a6a672b80fda28108e467124d0ee22b5e0dc366e2bc04d5be5eab91c9ec4edc275df7bc7ccf45197629fea909e945c633f58f88c8165ef2628b37";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/gu-IN/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/gu-IN/firefox-55.0b2.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "d680af2d9e62d7460d1c683bd17ca079022e3641b14d2c51ab1deb226c6f68a9f0228a0a394b683d4adf27268cb68af87122725f4b3e6556a61f231a1472f2e4";
+      sha512 = "15e94de3500b185668ee87880667ebebeccb23bf69c324cd64c9a5f94e6ad1844861c773eb0a7b7479c169de63c8612845902c8c468ff670b37684b1d6059d1e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/he/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/he/firefox-55.0b2.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "a2e79d3e819c6f161d9d03b3c2614968de2d7ae266c56ef928051a8682e3edae2cb76f850de3a33e475757570f79d2c6cb580781424c03f1453d9f82c558e7fc";
+      sha512 = "86a94619d93861ad797bd9457a768f62472f980076d0d526a95e1caff52cbb0136abad76825e191003ec55611429f2b35bab9dcf4a1d62aa226db89261e234f2";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/hi-IN/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/hi-IN/firefox-55.0b2.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "7a4b6a513e70b0645a9b96d2b08dacee9f14ab2d6209b82937fe4bbb7b08b4af64e513921baa17384e66a5f61c18f5fb20c4f70a99afd878cbfa1f42a33befc9";
+      sha512 = "639469d7c987b366a5be59b45058f8aaa2e5322e0534a4784c19f434d48ba5cc7e6d2da824de48d49e09a56085521e16680e1cc29261c97cf18cd4dcdfc79c27";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/hr/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/hr/firefox-55.0b2.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "102726454dbed95a25e17a5bc438fa5c78f3c17fac6cb91537007c58e3d12199e0341e6726c16dbc899a6bed37efcb9acafba6ab1b73347a7efbbd7b9e049143";
+      sha512 = "8c4021a8591de29704240d152bfe3283901b405e8b4296196eda3f0b9591b33fe8c08871c3248afa82c3967c7d025896d584478d1ec3b761ec5f97cff498e098";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/hsb/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/hsb/firefox-55.0b2.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "6aa930b7658d9347b2f17acd829d71791e289aade826614d6515ff5f8596ed9a95fce0a63df18a98ca28e1dec7bc15661f2f55905241e698c27ba4ae20303fa9";
+      sha512 = "7316554b2d0d3b1cd559057374b67e9cf805bc827a40652e70d00bbddbc892f68c7e65fff08af2d4742115df124185c3e3ca862901a85ef56ccd658f799ac757";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/hu/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/hu/firefox-55.0b2.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "c4db23836c13f371027145bcc1e6c9e8096c8299c0007fac948ddf46ce2099f7c1a5f0d8415d6cf42ca83cb08cb61f86fd3927f07a974055517e8bbec72a7894";
+      sha512 = "1365f7b1e55eed2fb7d579fb2d9a2efb57d93a4e78051d57980e7b1bf3213b2f577eef6c0f1c53dcb47a7af92ea0b0ba9558e25e84c72e0f32e573c393dc8d4e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/hy-AM/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/hy-AM/firefox-55.0b2.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "b66112e99b41c2c357d285789f636b9f6f4da848ba4ca013c7d24f7338b1f724f6f81651faa9f82bb082a9182ff9d4fab442eae581117d2d02493f215bca621e";
+      sha512 = "14e0a798b4fd9af769a464ff8c2fc87ea69116f7ec66326cb623f4fbdcf4c99f285bb8e65492e9b65cbb86dcf66a52669bd81df37ed00359546072a3709f20f7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/id/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/id/firefox-55.0b2.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "d0d9b990e145730396a8b88bacbecbd320f3ab9f2e07bc9f56493900b93693ea7ca04ffd077229e488c847014de8cf16d481ec078a4b30058eef73903c5dff9f";
+      sha512 = "dc15d01a33d3fbd10f26bb9a1758df13f53aeb9f6b0a62abfe8bca1e7a3e233aa0a06981d04085e79e91c629a1cb51510bdb744ff34a6522f374444c9bbb84ca";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/is/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/is/firefox-55.0b2.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "a23c64f8dbfa1c5a6bb2e31fe2fbc80d02485abeebe57e091cf101355e07532fa2e1d75ba91f4c5a0cb112dd941440f8f2b83cbeceb17eea026f29bfcaa37779";
+      sha512 = "13761e766b5fede7eb123f304bca45bc3a7cf5ffa4661e2a961ece5653c2986a61aee742cca3dc0cdc8bef54b38a66b08e9a45223e42cce9c0a99a857d6bf45b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/it/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/it/firefox-55.0b2.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "e7084183c5bcadad2eab62db7276c1342522da64996f442eb9ea0dfb3354c5f75f19acb53d937d055d8723b68b4445580b7bcb8328a063abd601614cff501542";
+      sha512 = "23dc06fc36ef32c148990692ea5bc5266f1ae61aab4a3853034f85f3debee5ea5a5a71d741ffa29136db54d63857edeeca75805f9c7f75c278f06a6c930ac248";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/ja/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ja/firefox-55.0b2.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "0f8e6cdb01c5aef004ea12b63bf24797276676ec4ef0a3bd63b596552322a33cd8905efb075259955189ff5952c99738a1017cfab8dde90ffe90d978182f193e";
+      sha512 = "f33b38709a7c4701debf19a901e36302b364c911405d96f952c0510fbf95fc4e24869a34e3a336718a0e0f26b5c7fc88fd1a3955c329a352bc1077b73cede937";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/ka/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ka/firefox-55.0b2.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "6e1556802092f186cd57edc995ce53b596ebcc70fbf37dfde19fc8884441b5f84431e9c8b023c93578c538ac14d5d17caec96cbb6178f330f6105f21133fa07c";
+      sha512 = "7b684624e52e189ccfd31d6d910b18148f9040eddfe0518710388dbc1160c2ac068f0de39faa42eccfba7823372290f932d3693ad898a0c7ce20f6368e696f1c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/kab/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/kab/firefox-55.0b2.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "9e25fcd718b65c66c8e99a5d63d06603e120f518c36cabe47cbea3ba9d2b4b61d9baa805a13c7860cb22405d8a5c2978fb2fee1e911dbd2d3d87ed2d25b4aa95";
+      sha512 = "9a9f8ec3cb7b86866dfca4a4f5ac25e13135896144af816ed2242091fa8719535a7d2c225be6650cdbe17a9bdc7bd2bdb962e40abd16428702c2570cd06a798f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/kk/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/kk/firefox-55.0b2.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "0411b45af993bc0df101640db9c13b8a041f9e73712b3b41ce8c3b92e0174d366279e8e61a286982ba0214ed2dbbd6b23bc940a2f06947bfa534d8fa9f3574f6";
+      sha512 = "c7aa9195a8bf39d65deeb4233139c6941433a7bef77797532fa346b509cf91c8e2041a24569996f7a5e7d2fb0e4a108bb40337cf1283195b257a5526d89b3bf0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/km/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/km/firefox-55.0b2.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "621de21c64bb7a10aaae1bf277d2a869a2897270f6075dce9c543b6864be03221d278aae9b6ce7d67af5024fd9c5ce807e7f6c9e9c5b9eb8206c5ada0460fc70";
+      sha512 = "45a5dbd1ecbfbc69a4ff99327a234e9b26f06b9e280cdb2e0689b4378a84eefc4fe3a511bf8b111db873ccf39f7b99c1d256218accf190975d53ed574d565747";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/kn/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/kn/firefox-55.0b2.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "f446dbacccb0bb89c48137166aaeb2ecb781f11441b6610508cf3119759cc8a1c12ea713e231e6c05ea4001c2e7a750d2880765ba09315d3c593975a7bec8035";
+      sha512 = "75574a88816ff42e8f20555a55f41bacb9d33d2535843b38d3079d0487bd1190b392e07e7d97f288c51f38c053bbbacc7acb34a835a7ae39814d6ff2ebfb1510";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/ko/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ko/firefox-55.0b2.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "2d941257c88db0617c230e877a48fa54a6753cb1c46897b92c752159e9ccb0300cd7916d9854e7671688394d2e147330fa97e16a716ce1133b0f0c37727a1553";
+      sha512 = "2bbe4f990e2265e1d210c52987759486e6127a875ee55707bdd8fbceb44943215c28faa5f6c06161db7b7f18c2c2c3864882ffcc1eda286edc59aec7e33aca0d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/lij/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/lij/firefox-55.0b2.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "6705fa1ad8aa7fb4a463561a2c91c8f6a70d491418877d3dc6a9d98c903f3367e649d66a6f1b7b1ad417fa65b0cb44a792a49db479842eda27ab5bc5791bef5c";
+      sha512 = "9c3580a05057f7e04f6efbf60b281c50b64970064dac547cf6a84ed305c8dab5d014f96719e70c87e67124f61afa3e1a44ecc3627fd6a3181e3dbfc28ed175c4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/lt/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/lt/firefox-55.0b2.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "246416023a4a2c8231ac60a5339c3164301f2d51a2ed6bb23f58f0715b6eb834f874b992268639e7d2000ec41a404b61c5ad191a218a3fe68f09244bc8fd8b3a";
+      sha512 = "37b30fdf603cd41617db37cc9ba7e546c58a6bb58833b461fdced4caaf128bbc1a36ed774370548b8249da884302bfedf52681af61348313c5599628576e9c57";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/lv/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/lv/firefox-55.0b2.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "e47f984c68e98927e15d66b62588f8a159c012bbfbff931625e297e28c8a1b2ca06eaea60a13d62392d8fd5285b2fb0cc42c9e4d68c1123dedf87964401d39de";
+      sha512 = "7d075198482100a338105bb80d2d40d97d24460f2a6b15b72b349d249ebb638112e69bcecbf32578375d5621f3a46e6267401629d2fbe1ab6dc5d72dba454086";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/mai/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/mai/firefox-55.0b2.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "7bb51a53327f85883b3aeb58a00cd78a5921fd6746f2110a22eccd38d735262c05d97cdd84dac1dfa29502bbfe333ff365d7ca163ed4f6c946156df11dd5d9ca";
+      sha512 = "7e052470a133931183439deba29a16097ad50383b63f97d5a1c03b7a3ce0c6485811c1afa2ea78bf9f03def2b0678bb43acefb2c1b944d8c12ee18e44b5d520c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/mk/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/mk/firefox-55.0b2.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "e94346e4b53c26523f2de965f4e0de11b835cba2dc19553a3a58cb789b9b1bcd146f37fb932184b9fef6d991db04f7dffdb9b838db758e159f654f6c24beb196";
+      sha512 = "ef6b8ad5fdeb7300c9676a2232accca1cac1b47896987455ec93ae8b8cf46dc092e224b417f922bc4cc0c41ce941d607c4c3fde6e305e274750af72b8c405389";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/ml/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ml/firefox-55.0b2.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "1c2aabf2587e312ef071acd5e97a508ad2c5d61f3bed5ea36eaf47758ff60d5f46f9966e09954c15a0bd389d2351f3cc4fd36ccbbdf8fdfcb1cff92d8832e56d";
+      sha512 = "79dd88442e22ec9b98d432985deafc68b6b5c3dcadf6fa0a04292b019b3245c24b2fd08784d4c4d804c3b913bdf379753df4ba24ec69cdfcf9fdd659c8a18e4b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/mr/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/mr/firefox-55.0b2.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "0f04e81a05c37ef0919dc03787ec069a78de21154fc167ebde8c256738cbe23bfe2585e0c76eb8a4687b6d17bf69efa6fc142de27b30c519aa446e34ff6c52e0";
+      sha512 = "d474b05fc960f2c12319bbf994027945ed655bb8b6e766e1ba04f9c863e4d5b6d1ab8d632e0051d1191bbaab87e4793e8c1240372b9b0e0f170da03856c5d8d0";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/ms/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ms/firefox-55.0b2.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "82c95552769bbde10239ceed7c5f37d3d2dca19c7ca4556404e5340253f8396e66f88577b475f7f0d6a367a6ab1df556bcdfb1859ac9b673604555a396e391b3";
+      sha512 = "c5372584abf3c3ccf858c50927d26099504efa43feecf487639ab7a73e87da6137e29f31a440d7b6eae43092701e68c02325a39207f95c73fa2db303c3b402d6";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/my/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/my/firefox-55.0b2.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "af03cfbcfd4594129a6e8812136c5984a62ac09aae238432ae69e825e767ab22c720005350fad22a0d3b774bf58e460f567c7d4438d32bfd6370b44f5fc19869";
+      sha512 = "e5374a80b05eab9dd8b4a279ac96edc52930ee730a9108f76a022e3908f5d81c3e5db9ffedcad492edee532c2606982a6c76733a971cb5d8f64ce68d04b113ea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/nb-NO/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/nb-NO/firefox-55.0b2.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "33216bfcff1cbdcbd1aa656614d442a1dde16e033954065f7cbabf5ef065cf9f1722f4ce17989c3dbb822aa7b2e21818b9e7b25e0ea0da9bdfe157d6e7713547";
+      sha512 = "5077c2c497fda39bca53fd140241fd9bd3cde4f4e1ce3e7fbb101fed4a24d61df81d99db40453d4745750e24499382afd83e78cb67e82bbbf91158505472472f";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/nl/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/nl/firefox-55.0b2.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "520e225e72413a9649ac0025a1c3fb9b58a2bbda0d28aad15c2608feba53e53e61dbc7f06ef22e655c3c2b77c0b1be853a79057cb08afc75900bd852ae8077f0";
+      sha512 = "9eb8e46b9ea30e2865a009beed1c4c515830b1acddf79c2a0c035e8005dc646f2ec1d011474cfe53c07f3bbc73071765e7a88aaf0ce24378b1501cf5f246b106";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/nn-NO/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/nn-NO/firefox-55.0b2.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "c564b555844d104a82d6b02e35349778fd0afdc7dad20d8560713a1f32614557fe3009bed29bcabc16da245825cc6a4281a64ee0bc82a78d4b45b21a887e8d23";
+      sha512 = "afe2b9c41cdd692b9166ddfecdb78ab94a3bb91d60b91e3e79a203a1f928a92d40eaf7889ceef19427dda1464155f85d0e166e98bd9eace6b071d3b30f954071";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/or/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/or/firefox-55.0b2.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "1ee6ca370ab28f36fd379daa2ba4259e715d6dd5905c72ae6ba05eef5eafd4ce08511c4c4134ccf640834e053d1993bee85688c108ee4cbe89ea5f8acad11f9d";
+      sha512 = "5eb2662445fa000b626e5f4a0195a44d8e00c630e09fe386eb7d77fb514b2ea939c07c23f299ae050260c06e6e68abda8e32a2ca8c5155e5f1d5e223add04e48";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/pa-IN/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/pa-IN/firefox-55.0b2.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "d66120b15473b145f8b5429a1a683950eb5766372f5f1a98c3a3ed69c68b9220f5dc45e5d114a6bea83851dc9b4941ea735c75ac45ceb661e601c6069d9d7534";
+      sha512 = "7e6ab9ace1aff3de1209992336567da167a3d6681af81354b05e36012545df1ff06e1a825668de7146e843a56c4e3a110ea530351ed83b129f9989d24bf86a2b";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/pl/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/pl/firefox-55.0b2.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "4b6f5155e5b763a7a19cd230cb37a6864beb07b29e4181aaaf5cfbb9fc7bf9fc67cdb8bcd9b0a35780b40a7dc8744ba04fc73acebeba49e32bbf53250a78d395";
+      sha512 = "fbddea93b51eb530f26de74d16a1d373ca9b86a8fc89b7f12c8ee4e2f3c3af8be22560ec11ee4afc7d93c305eb8f352931a06b2e7dcc11eb1e9ec755a2afc2a4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/pt-BR/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/pt-BR/firefox-55.0b2.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "1b74ef30b836d7490b155b194ea6a9b1e4461d955f5f16ff0afaf1c1f1980dc1e7f60b600c2ceab1e655038e84574e4408c15fe0c7cf48ac99c0961e8a04b135";
+      sha512 = "6ae90c6b37258ef9e9b93fdad261c7b2522ee3b251c36f03dc6bf964d91da86a05937b0a65c75bb3531b7c10be6d5ada3a88b2240dbcf1c64c5b3f624acedcb7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/pt-PT/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/pt-PT/firefox-55.0b2.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "3c5a2881d06820a3f54d3a2e73be720d1c0f06233114766196ac344f5f9f0ddaf0f9056367b5f2a7199ce7852e81ad77f5c55dafa3626afbda92a4bfdbf5db47";
+      sha512 = "0f1d035f72a3f0739f843e97e1ab27c3b5b5901e88eb8adb9d8b343f6b5f571133fb8e9f40b3df14e4d7e1144aa7f1af86e7100df5786602185e4ebe425c8f97";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/rm/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/rm/firefox-55.0b2.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "d8b5fa46c953746a7feabf4dc0fd7526128f3268cc3fb92962d67d2c03afb61088cd82d7e5054ff14a4f8e0ea411e0734af8745f743412cad1368414593e0162";
+      sha512 = "7ec0f5792e812fb2d57d420ecdca006f5242f6c3599b58da01e3ee65df896d1853fb61ae0413ff59834a669690ab40b74244a31be5033ca215bbe784a7a8cb3c";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/ro/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ro/firefox-55.0b2.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "070ad441190f46741ac49c15d72264ac81d9a0576d382f5696e940482f6de6634bd5f8bdc1855d3e3da6040b632100d333cc06058414eb7f25acb12914de5e3c";
+      sha512 = "653e8942d04dc440d998229ad8a10ec8a1098ef85331abd8e1676c05398dd4b514f5fbdfd15c1b20ab0fa83216d7ad0b0e4d20b6555aab9a02f7fdf139d11e35";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/ru/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ru/firefox-55.0b2.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "935cbe5dd97db312ecf7045bd38d8d3ac84e812da507256e9c5abe465e5111bd20131373c6aa43bcc8b6848dfb6d77e72df60b19d6378d808a6f8a095eeb1b03";
+      sha512 = "66c45ddea853348cf0084fb64710ce0b077dc6521767a27a83eadfc237becf05e26335d85fd1701ba4790e80a2f5f971986c1a3847cc84efa2aaa8623d0b3556";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/si/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/si/firefox-55.0b2.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "a4db271cf567f9010fb8c3ac1bd859c4bad8772dd26a068eed1c5f7c048fa969b5492f0b4e12ee221da6be9581790348253ae8838b4e21a8824718efb14b6ec8";
+      sha512 = "69bc89b863e9a4ffde9ff478331a88b93a42a2cc5d51114acc995189c63301144093b4cd156864e6094940d64285797f83ef920b3231a427a149c5f6dac37dc9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/sk/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/sk/firefox-55.0b2.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "a617d8bd5cd8827f7858dc4a881c4da326e7909caa9dc20194f4a150340897bbb07e397918057265573f35c6cbda269b857cec31b90a9c41535d65f8c2e5f22c";
+      sha512 = "6b36b64b3edd9a16ba7051727a8ef326473859a07006159cd2b8a6fff25b0cd9649511dad03e5286e384ed74fca4b80d257cb0e754ee4ecd6eaa7c589478a5b9";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/sl/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/sl/firefox-55.0b2.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "3ef4245014e3eebb31207e084d9c50b39ebfe16408f6b96bf0ddf66c9c69e9d717266152c643e2412358bef30d517f84ec482ffc57bc826a9d1a9474848fac7c";
+      sha512 = "19a6c7c7d7f8cc2a2f03bbb23f28c4691152ffda292399b6e438dbc3afe89dee98be86ea4d7f27d9d4f736e68a6ff21db1cbb746bcbcb9cd6ba9d7e23155cc21";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/son/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/son/firefox-55.0b2.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "2bbfcbd5945be669b779e58c0ac925b4d83836a3117732d5c85f9cc009cd87302e8ea5793d286951ec830ee4b8996413b3fb004b9d48eeca506cb289b99efa6c";
+      sha512 = "df598c9156ba76218f4f0d87ff301a3220979abb3a4f5af19d0545b6a3ad48719a8267da22a31f646e6d20ad1f6f090579c9587e949be91559aa58455502a156";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/sq/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/sq/firefox-55.0b2.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "c59ab2f574e605528d90ff4c25b67f1815e778458aac7ca4a7ed105668d8f59daa9ee4e4df33e62c359ce3818c4d717a520d99cb367c84f329321357083e1ae6";
+      sha512 = "e8d53fa58ce1d34d22c7460c9b9d9111233047148e503e5a628d8d8e1c689b2c4a302048931dab44ee33ba2c4831362d3e74c294e907f1c5eee23d464007343d";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/sr/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/sr/firefox-55.0b2.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "80e49c1e72e12f63dabb6a73b3e05de635aa63f8523251a38d9762dd80aacc0ce2db7a37b8e4ba8cb804c2f41540fb5c9790279dd6a02c06bb1a7a1ff944b75d";
+      sha512 = "5d3e8d3741ee0ab535479ded3035379858ba092a8cebbd5ac8bcc525e88159594f5cef90894bb0fdc5eb9c349c435913b89a030ebf942054110d37e57bcc50cd";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/sv-SE/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/sv-SE/firefox-55.0b2.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "47569b272c2b42c0149790fc008894dcadf35dd82d64cfefb07146a75dba85e8052524151d7baf8cc929879342c4af7a8161d6df02aec7582bc3df4cc99e1c57";
+      sha512 = "98da270b0da5091cff599cfdc9a0d241ab8463c1c9e2771f81e8c0dd7ecf567e2cf4ea536b81cfd6b1679e449d7f1d4157b8927f1b1b0a03f3cb7dbfbd267d65";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/ta/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ta/firefox-55.0b2.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "1c64a7ace3abedcbcaec3d3ca884538aca70bed9c9c736a721152bb3dfa7c7b0a1f12305fb54ca2ba7658ce9c2f42bc2c87049e3e792b8548091bfe4e10824b4";
+      sha512 = "63287a39d325111c7e18b62a9b76cf0e7564709846cad78a946852fce761475edc61e292e31491821215b0cd2f392e8c41b7ecf0ba78ac3440cdd4f7f9b52d21";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/te/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/te/firefox-55.0b2.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "2a55a67577d2de5dee7b526a716b5061fc4bcbc670db5286cf8290629139d72325f086217689bc55a5d260f3d30b572360d62b01370685028acd9825ae748fc2";
+      sha512 = "476840816b36816b967f86c9796f6df4afdb3d7524f4268cd867393eac83ff868645eb14ed5766aec87ba3c226e593099e15d44aa63a01bf422a12a4bb5c77ea";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/th/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/th/firefox-55.0b2.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "22c796f3d0bfa8ca93654ac73a8e1be30b7d2d02a1700008243d98c4cd367b4b5e5712a2def5fd8b3a40d7deb3e638cdb4edc7e609d37bf7726b9fad69f9225d";
+      sha512 = "b5dd1a09db20a788261a2f6812a6b35be7164d14cce7c700af51dc1cb187801c2ecc0d0b035386ec4340af25c8cf651f9dd4c679bd61b335866fd2d7a531f7ef";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/tr/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/tr/firefox-55.0b2.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "8c50483a7bf1b8016349e9c9a088efac8750bb51bde35d3af78b82827f0ddf951a1605a193b3a1ebf6e03af1224defc48f9d0decfa317f3e1c507e20b1c552b8";
+      sha512 = "08a002ec452956730d02985e74c9c1c615783d19fde6c1ee3da3adaeb1ea021c05c865e72d8dd7c930f9351ee376cd42b20fb90916d276344e7b2d17eda6f458";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/uk/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/uk/firefox-55.0b2.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "2dbcf145a1ec46a2239f0340e881228f887e8ada2c8cfdd4f77a0229440f3de7c4e7f40706973dde6171ccf45e2da41e77c1e5fc4375d857e4a2a74722dd9d10";
+      sha512 = "7c75010a3a15f2208774f3e92317dd88c2a821c468a84a5855e4db193c5fa6d639d4b6969d3ef72bbc90c47212854abd0002295f163b06998285d439f50ccde4";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/ur/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/ur/firefox-55.0b2.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "69acb4094d4a302c4c62328dcfeac0733576188b3e4548dfcd3ca9d3cf7e49379771122090bf99acf6e47624d2216a790b3593dec4d4a578b346139027e9d619";
+      sha512 = "2d94f170a3eb66ef776c0c78c53d16716aef47218122bd5a9c7910fc6f821a5ae54192cee0314c48c7d6c5336f442532594c31e4e0821cb427f617590b8b7ae7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/uz/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/uz/firefox-55.0b2.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "287dc219c456f2bd60cd4a1552d42f7656f6321780cfe11ef7b67772601d55c03eb8cc83d239b90e45a47869e5104a1c1aab77131c788693aad8bc86c61ec53e";
+      sha512 = "21880c1a14e339e7b716f742c2910451662712a3870605db9eac00729b6cf9c2043cc49035c86044af8512239fbf05ea51ef476aebd234a7fa9317cefbd43a29";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/vi/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/vi/firefox-55.0b2.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "8cc0f6c83328a67cbad2dc3427678a985fb74863b0f7baf4bf65074771c1e5a18576e274f725d65901c1627d0a9a0b6ae1d815d28dcaf5c4b9b6d830dbf3c245";
+      sha512 = "5efca9a9fac37440d41c444497ecb2a5eb56b47881b46c66cf65b3b78353fd8a18d37c93d83400be1207193c7dc3a901402d679c50ebe55ddb93687439d4874e";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/xh/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/xh/firefox-55.0b2.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "28d803a22ec0d5061edd6a8185638842e55ba5748b0f1ed5fca85ea9e7ceac33319e9d5b282b308f092c2583e747ed981dd731a0f375eb826d878eecd31f65a5";
+      sha512 = "03927d0b8bf3c261fd00a043d8499e3686c7abc51eedac63f049d100095da2b858a2cea582c8aa2e3f65e1269b7094559709c22fd633a0cda29c6b21f3987eb7";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/zh-CN/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/zh-CN/firefox-55.0b2.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "0fd9414050a69c8731e1ca8fc8f1a5f721d7aad48114a9680550b133b149da043bf550d42102c6fc066392a5463697afd55d3f08a5f94cc755d961bb29e261d7";
+      sha512 = "75a77fff929aa72700b9af9452e2d0fa93f21136cd7651a32970fec24332d3c9a7afd58a823e3dffe1aa63ca49057c62ba5ce579021a783a096733c23c71bbfb";
     }
-    { url = "http://archive.mozilla.org/pub/firefox/releases/54.0b13/linux-i686/zh-TW/firefox-54.0b13.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/firefox/releases/55.0b2/linux-i686/zh-TW/firefox-55.0b2.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "3e460f2eae2ee0c40dc32138d6102aea4b47471f320dad3cff9884efa6e3bd23dba1c5b825a7a907ff6f7f7a08f145854de3d82bbe9bb85d518538822918c547";
+      sha512 = "d83bb672b5587b6fc8e2c4028f144821282b1596ca88f1aa889f4a2601d46fac44c7302d30f23179db6540e84e878244c4291dceadb56045f3edbdd41bc42a19";
     }
     ];
 }

From b1f76ebb738df969cce17b38dce5bd17f406290d Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Mon, 19 Jun 2017 15:09:44 +0200
Subject: [PATCH 090/189] firefox-devedition-bin: 54.0b14 -> 55.0b2

---
 .../firefox-bin/devedition_sources.nix        | 764 +++++++++---------
 1 file changed, 387 insertions(+), 377 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
index cab4d330f43..a436cd46a11 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/devedition_sources.nix
@@ -1,945 +1,955 @@
 {
-  version = "54.0b14";
+  version = "55.0b2";
   sources = [
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/ach/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ach/firefox-55.0b2.tar.bz2";
       locale = "ach";
       arch = "linux-x86_64";
-      sha512 = "8f19c1210c95d5dbb845caa05ceb90bfee3dbc8e7ee630849766fea2e06b5eb20660d1c7387a89112daeb4b11bc6a05e274429bf48dfd9b6c010700c6998da14";
+      sha512 = "003297708bc29bdfd471ae4af99a39f3c4732a067ad56e7f5a49fe8caff7a88dbff9245a4e8843f504f80c0defd2c2fa62819e6b71c176da6cd0cfe9d1c614d2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/af/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/af/firefox-55.0b2.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha512 = "daade55b9ed5a4390ec65498680b600fb1ee0ad9f73f73066236a376c8b86687480f11cd5c97c254681d3b227759e84ed292b3050ee368337514338ba918a688";
+      sha512 = "4f32ca70b0891bf25fe68196f5e78fc9368cef5dd2016f8cb0c0b099fca34b154bbc6b8faee831320fd0bbfd35f81ad379e44c7778d78b1b517175b3d5a42dd4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/an/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/an/firefox-55.0b2.tar.bz2";
       locale = "an";
       arch = "linux-x86_64";
-      sha512 = "41836c83842fb5429938964faca59a763a7bf7fc1d38611274d7bfc559ac9f167841d1b43deddfd9494508bdce515e2842684482bb808b2509ca27eb5a4937d1";
+      sha512 = "01d1d9df2c24c6e41ab6a29028ef0c38630c7a786cb310eefa93adbd334d8b1e65335225b3fdb9f21bd8740d4d9710085d750144b2670b4a30e326bae0d96d78";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/ar/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ar/firefox-55.0b2.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha512 = "b97e47a261bee9e512ea2478c4c1447de4144928adc84ab251b951a650c20774b9c42fae2da4d033120a7830129e2c9196ee960a8de58a112c06704dee2e8451";
+      sha512 = "731ab03cf719f8181c097a40436c5123c2fac528a4c420b5564d79d094bd506dfe58c8718d7fa1a0d3e3223b67173de1826046fe09c763248bea79b7e1485c4b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/as/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/as/firefox-55.0b2.tar.bz2";
       locale = "as";
       arch = "linux-x86_64";
-      sha512 = "c60ffa06a01ea84f28bbeb5a48ce4c60a95332fb90534465bb6a66d9aeac99d23ca7f8b8c38aea706b245f5abc482829365e7cc20dd683534e93dca14d89b3d3";
+      sha512 = "78f9203b0cae15830ee289b540d56e6664a486f107f99b42020809375ead3193da2e4e1bc7bc25ac20256ac07c55e4c619302615220b0a1ae742ded4f4d6afe7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/ast/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ast/firefox-55.0b2.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha512 = "e0d798c61111c7fa8ec59ca54bdff1375576d83c94063edd2fd9a2fb9f15603e864f2daef85e760578305574f69e475930a7d276c1f4ce5cf2fc82af338fb276";
+      sha512 = "401afbb8c2945724b0754d95b0385822d77a9018874c067b83864546c5565735d403ccd1a9f999af0be10b806ec2b64bda5f28306f90e5171406b8a79dfe5975";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/az/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/az/firefox-55.0b2.tar.bz2";
       locale = "az";
       arch = "linux-x86_64";
-      sha512 = "262a818ff21e88763626ee9d1bff84308efd3fa06695b3f011007f808657ddca8b4b7de82542e43a4e4264beae88885923dee7571a542c9bcaf1a1a1be782242";
+      sha512 = "953b91a7681e033219fe80d63ec41ed50025f1bda91cde9f6124bee46ed89e38c8470257e1791878443adfda94a579c9261c2ada6c8d415a62dc27b38cf6cb66";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/bg/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/be/firefox-55.0b2.tar.bz2";
+      locale = "be";
+      arch = "linux-x86_64";
+      sha512 = "366f951b05f62a0f158bd1a345fe1540647c3a1d5b91c49c2d104f76974a64030e830dda3afc15828309f88100c4f12d5dfee98827565c96acd62a4e0db24e74";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/bg/firefox-55.0b2.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha512 = "43a5df2c83b731e5983938a69f636ee3cf0977de21cffe57792313f30740dba696a71a8e93c8addf5d13ae1402d83a8bf4eb20fb18d174e5777fbfbddffc2ffe";
+      sha512 = "51542bf88583b2f2dba75e1abfc892c0595737e74ccc6844cb470513bbad7c337e1ccfaa628f08a8d5ce09b91812ea07758831d5bab54ac961652f905c9b216b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/bn-BD/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/bn-BD/firefox-55.0b2.tar.bz2";
       locale = "bn-BD";
       arch = "linux-x86_64";
-      sha512 = "6797547ba2d94a14d0b5409e51104b8622aca1b6ec988a16deff7e8528b4a77b571484bf2f92a72716f565bbf707c4c72fbb59d67476e22ffabf23c7db1e7b96";
+      sha512 = "9f41fae202b3a38115b1efccb0358f3b8896d8f44730f4e53896fc48c9048d6a1ca8904217312c6bd9f9ebeee1514a85c1723acae8e293559289aaa6b63661ac";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/bn-IN/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/bn-IN/firefox-55.0b2.tar.bz2";
       locale = "bn-IN";
       arch = "linux-x86_64";
-      sha512 = "733c9889f7dc782656846bba3cadc0b0197c03233428b966f638ef3c8ad64881379e78742c2afbd4f9fc14f42de77145a24e26d4742294b589d2011f8cb65aa3";
+      sha512 = "6c617687ee2e1460addc86c383a9967803a6900845a2c98d4ef67f2007d3cbe82e6e8b046e4d990b59b8a001f60eaaaa34a50494cc1c8b9d5bfdf3951494022b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/br/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/br/firefox-55.0b2.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha512 = "c3baa5e4f44c8e7fae99323494d0364b933231b67d164cfc5eb3bbe919e2cbeceb0d9d9838922def26639becdeadde5101bcb514250b8335d1fdd0081158cde4";
+      sha512 = "23cc36ad34c20003cd3a4c11eb22e6b35ba1fc43ec81fbbef0ca3c7aee445920d66620d355b60e6439296ff19805d29f7266060c2abc5937b266fe45f5af251c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/bs/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/bs/firefox-55.0b2.tar.bz2";
       locale = "bs";
       arch = "linux-x86_64";
-      sha512 = "2fb80dec95921067a879cf836bd2b191d6f628122d813f22b242f1d6a0e605d71f74dece30c51c18bbbf35e64b20df4ad3fe11e8812f11f44fd98ced49fbd792";
+      sha512 = "97b1bac5f6637c07578e689011721e261feef2535feabef4a86856a45c3a48c34da692dcff7aedd4c381159ce016eaec0b6c50acf21f9e045a4679e494c01a3e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/ca/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ca/firefox-55.0b2.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha512 = "276a1b0ff9df2606d6626203de6e22d3eab41f853e29dc87d478825cab41e0c8a93feef4dced6b731025135103922140b3e7c5f9e1fe49f02a1a3e09f3f3351c";
+      sha512 = "e188a8de2f0fb240655f88176a138a7816929a5acc708fd66960b8f51798fb240e63932498eb7db64868eab95d2b9c95935eb6475a0752e1525c5c6403a78616";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/cak/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/cak/firefox-55.0b2.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha512 = "a20244e8aa7a7d935fc948eb474f265a3695b23dac6dfbf585d782ab1c224f4a922de43c52317966ffa735e3dd38d0b4742f6a3b87edd545bbb8608fa0827ca8";
+      sha512 = "f98825c86e87c3010a48e2e71752b4b61d118e72fc4ef16f2c3eecba54e6af37671ba18c4a7564157b8f65eb552c92c461ca190b80b344103714946dec00da3b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/cs/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/cs/firefox-55.0b2.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha512 = "a2bfb5f97fb367e16c2737f60ee269447a9ee92a9b2917183053d602713fece31706e7f1c64742893496c881d11b62c34e594eb5fd17b92bd41082a0f09cb7f5";
+      sha512 = "b5e007f882126d7c1e40d9750c9016dcf98674177cec15185ee340ac779cfb81efca0d23486bf7bcada25654e7bc15dd2cc78ad948981e668d0a00a5f138f62f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/cy/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/cy/firefox-55.0b2.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha512 = "336c46fdb5a8dab5dbcd6b75c3f82805defb0f8be45465ade68f5d3c5ebf0b080fb0694a220efaf9f7e5e1265c1e0cb151066f53542f8534c29260efd2e4e2b2";
+      sha512 = "ceb4f5eff71192a8be67ca79feb3a42390501e11c2c2d2c3a9bbda42a6fcb71362665e991a84fae660442269eb4b91ce1cd8c860a6b801eeda2569a1e7800291";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/da/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/da/firefox-55.0b2.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha512 = "c3bbcaf4ac2dc38a2903d48596ee5c836baab94bdba016074eb8138c1f22e0d30281de862abd6823b0c4918660226e66abcb8946a26c30156f47efc946f860a2";
+      sha512 = "c0cf7ef6fcad94ba4ac44ca8b4d272fb88c0e63a477b4829a675585204e19c88086b8f21f89c52c1954624dfc1f0f9a836d3333ad8c6989fd398afe2eb92234a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/de/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/de/firefox-55.0b2.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha512 = "f871bbc4cce559fad162d4579c46623a81c8a9faec2b0328f5f3e9492bfcdb64d5311cc8aa75ec3e8ebb2c0f2823193fff163a345e3cca43e70df0bd355e998a";
+      sha512 = "fb4423b8f154f0f124ad0a36ae692ad8962564aa9ff7747d412a73ca983e1164bec45d8ae6f983f91f2e657701bb268b96d4ddbe8261d68bd41e07d4f7c9fd5a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/dsb/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/dsb/firefox-55.0b2.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha512 = "29b063bd654d9704a999c27265a79dd75dedab388b1b4ec3c52ca89a8d99e82de59a7f552f7ab0eac6b03b1469cf8882a70e439806be97bf3e0e70b3e34df950";
+      sha512 = "f17bcbd5885a0caa72380f1dafc65c4e104897abaa03f89703501af9dce33ab9e9dd133ea8fd518809e02f99ef6c10a9c5f516b56e05d700b6324b3a101de18d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/el/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/el/firefox-55.0b2.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha512 = "a11b8d9bf8ea151d62a33bc0630570098babc02a09bb355d0f0c3ac0d316ebfcd9dcc786115ef1cc36e447f3697fec57511f77e678b401d2c75294429a4c66c4";
+      sha512 = "cf0304640af1f3b27b992b32e59a215d5cf95e8b0744266a86ac7738988faa8e2fcbe6b22a50990298cd7a6512747a0000e9788e50b1c32684fa616a7159cbcf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/en-GB/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/en-GB/firefox-55.0b2.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha512 = "9ddeaa9e89c08ef7e918d5d480e35e34df5feeaeeff2500c2a8a48bf5bb685fd29d74ee1aafdc4c3ff8dba0da7baad20ef0fcd522f14ab9a9e6eb739f8d1fb26";
+      sha512 = "dde0c233b45cd72b63b39a4a99e0d3c0a2f0a63999fb6ba9bf8bddeb686afe6b03a441215e5f2d5d192a19e49b63dc3cb14555c2aaac4efe196e7d58ee83fb27";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/en-US/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/en-US/firefox-55.0b2.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha512 = "ad39e7bd5164c754d596c15eb14a07f32985dc86486774bf76fbc60f8eda4a9690df37295b1cb99411e2bd1c83af89498b133404c7180fe5819befcc194b517e";
+      sha512 = "d5e35480eac87eb0f073e0ca413eec6ba6f54c7b14b0ffbaace7a130e07703215d5f7ed3c6f7356154f6a0388f4ddd695419a4d84e4ea42a85c967202110016c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/en-ZA/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/en-ZA/firefox-55.0b2.tar.bz2";
       locale = "en-ZA";
       arch = "linux-x86_64";
-      sha512 = "2a80bec8e181242482d5dd4f28b41a3290a473ca380f7a85138eca7814192fff70b8ee24c6f613fce201d5eacbbd221ba3dbac571801586af2a5c771a1a3d992";
+      sha512 = "3831f3003fa5376b88fa216dc309a15b2332d4a9ba332d78b0067a38b774f7db40cb86d82daf7e0dbe5785ed72f603feb3542a84fe219bd4798cfeef1c46a268";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/eo/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/eo/firefox-55.0b2.tar.bz2";
       locale = "eo";
       arch = "linux-x86_64";
-      sha512 = "6b47ecbc39d16e1d142440ef58aa375f7987284e5b85cf7edb802405127dff89e3fcdffcc47a23148daa925e58af17f538c3f5520347d0ca8391ed6ef51a5a96";
+      sha512 = "5dddcc0fefb98d0364097fc374f033b8063cfe07ed77b0ef0f8f3c58cd907b27c860ee2776952d3900b99f0084494c304aa38eb07f659dd60765d991f86ff69b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/es-AR/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/es-AR/firefox-55.0b2.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha512 = "67e0fd7cd860951656b6dcf60450dc9ed5439afc0be8d6be0c549521c6f92bb90fbb2f941a8f9d1d96cfdbd6d1ba9ca3590a8866a4b48062f878917a570913eb";
+      sha512 = "4c1f58fb03e85a96ae339447135712ac59a5280643035f2b1ad684858d58147e62dccb9d793829a30160056891538c56df5f8a73b3342b8aaceca8a8c8b7ec40";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/es-CL/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/es-CL/firefox-55.0b2.tar.bz2";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha512 = "90ec508d87a799c3e3b6a26582cd1c6b6b81923d715ff6e2cb2b6cc7a88c4db78bcee0b5e53f27513aa763ca7368f5a23093e62a5be2b41289b4631464179a50";
+      sha512 = "b96414975770592a829fa95c46dbd9c14cf1509bcbd8787442d23b55765dc3abf406cbd3fd100ad3f8ba243103798e1b060a6bbc1deabcdce24d52401b6e065a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/es-ES/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/es-ES/firefox-55.0b2.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha512 = "cae140a83a1be44b0e1d42e37d9718dde01ed3f9241cf98c62fce2319a9c73c724d94c65f6eb6f066bff644ad591111334ccaf32986c0d79f01194066ccaf6f2";
+      sha512 = "bb5d87a32d9c9c10a54273cab014caee57a68d5b1ad3de3ea10ccfd9517118a97d351b789e171514720d684e4d1c5fd89554f3c776f832d69e546d729bffa01b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/es-MX/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/es-MX/firefox-55.0b2.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha512 = "778abfde377ec538ce3e1cf6bf65a30de7c5d6f5a1748f6e587bff5a182419577bb305dedcaa01a650c4c8cd1f078279e192d9a4c807f7afd38f4dfbacc55071";
+      sha512 = "5136699c8ec08604d1b8040bea67477dc021a50af8eaf7cb30dc9d5462fd1fbf6be2e418ad531056a033c5a661d47e9c8841e3087b8ebca3f9b1eee24d0cc20a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/et/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/et/firefox-55.0b2.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha512 = "2a832ab5fde11c3728d4ab8f4802413f5da0aec9faabe3dfc58b1558f741182d093ba351f8b6c7cca846a014132770eb13775d9d7f345f57c7f4f817e2877fd8";
+      sha512 = "77b0dc7274c941efb10f25ef80d2cbc70c3d3243e6ecc07459bba933fbb01382e6d8757c77c0fc26fa42f39be0761cf07d783a1e2cf5064a73910adb420556ba";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/eu/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/eu/firefox-55.0b2.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha512 = "ee0af554a7bab3a6661424b42360cd7ed85e68fa1436c893fd5796a54b0eaf01b86af77b6b33d3ce722ad897fc403187a55da3557c0ad767e70488a24f4c5b7c";
+      sha512 = "f842af2f0b7e1894d49da17dcfa910df6976976cc59e58603d119adbc1fd7e4a4316ade167896b57a40e6480acf54f168a5630d3b30a7136360b3e9a6dd10d05";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/fa/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/fa/firefox-55.0b2.tar.bz2";
       locale = "fa";
       arch = "linux-x86_64";
-      sha512 = "11944b7afe0df66d929760ad2bb7af3d1058573083c2f710ce52a1ddf607b6b4b28926a7c140044135fd7cbecffd338be08a94991b08a81edbbcfbf8e5b00ac0";
+      sha512 = "37899d6ed1c16785d9b41dd2593f504c5fd9169210b6f4bf79e4f8c3a7f00dbce74e88eca4884fbf08c28191408d886d0762f2d79928bac1820181321a53ebd8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/ff/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ff/firefox-55.0b2.tar.bz2";
       locale = "ff";
       arch = "linux-x86_64";
-      sha512 = "ae4b81503613f9ca69de12e86131bc507d7eb6c10a26ee5ec702fc7a98e22aae6254f04fb8a11c553cf1b0836c1112ac41797920a54988a2753c91f2d1f7ab87";
+      sha512 = "3a0a3cb965822ccfe51c662986fe2acea2802a72bdb9506f48c3b58e70e55f7c283ef590946e4c5c6b9aeec026980a43846dbe2fbe41744d4c9cadfabfef79f6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/fi/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/fi/firefox-55.0b2.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha512 = "3049f77695c0eda7f77f4c6a785b5d5a70a6d961618f99ff4364e062efeb8629e966e222e4fdcb1f85b652358854cd7ef859e7e7d9f657c7157a43911fbd00c3";
+      sha512 = "a1d3bb077e396caa2df99a1b95a8eebb32d929980273c8f748958b7ffa6f1f7eabbf486afb195cad613d2012f3af0a355152a631066215d717bb7e270c05b72b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/fr/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/fr/firefox-55.0b2.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha512 = "d45cbecd191b05d219e71ca77a190a43b3f4ea2acaad12e442e960ce1df3fa3552378f5e5c8cfceca5b0cbba66eb6f7652986d4c907db8cd662f45d91b1216be";
+      sha512 = "012bb9748fa46c6a61d958bdcbce045ae050b1571ba4cc19a91314468f2144976a804183340f3ec0c249eb548ea323db872529a0a3cae391b840069ab43ef397";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/fy-NL/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/fy-NL/firefox-55.0b2.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha512 = "701271caa493338d73a6a6fbafd0f48c8d6b548ea400146339155aaf723e8f28c3a3e4154cb79cb7a9aac3a77c6fcbc4aa155793a27a8f46a58a43ab6443f1b0";
+      sha512 = "f78c749867899de82295aa928a4afd256f5749f1a02b149eb2bb26660b9073e3bc4ba6a7acbb02a050ca54a1961541b2b9458e5827cbf7cc4a31e813234940ef";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/ga-IE/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ga-IE/firefox-55.0b2.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha512 = "0dfa071841e5609302dee5525788fe37e705b7c4ee78c05b718356eacdf48870a00cda237c78a5eff6c55d403ed0688cf64ba3895b7e687f87fe86d0f2e223dd";
+      sha512 = "88652cc3006f731ffa9549cce2ed3d21553753105eacd7260e0274bd63acc4f77b5ee60ee2967cf963c37779e27290f95f61731701666d22d5ca3dcee257cf5f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/gd/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/gd/firefox-55.0b2.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha512 = "03a29bf45820adeb9bb792e599dbbe8fdcfeefc7ffd2003d5fd9516951e8f19fd340fb0c0d05beb026de880806b206e3805184a6b5976848235ed97b110a05ef";
+      sha512 = "a0eb1f4e1ba442deeffee4cf074ced94844e167fe58ecb2985555ae233f22990b11ea5eed9a219f407adfcd8fc18ca6c21f191802cbb12fbf767a0d2742154a1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/gl/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/gl/firefox-55.0b2.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha512 = "0f479c94f552c72c20581913bbaf2c0b832765f8cef3fa18e649940c5e4a4678dfb82e6fa61fc5dd70295c3de68556b671fa66238fe0b1de9afc4725c353689d";
+      sha512 = "51363ace7df993022052162a5eb6b1ad65bf66eb48e1cb713deac1594f3883401f42f0a2f5c1bd7a73eef1d45f34df7a8d1976bc1d115bec134d9c7cd671b1f3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/gn/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/gn/firefox-55.0b2.tar.bz2";
       locale = "gn";
       arch = "linux-x86_64";
-      sha512 = "23290b9d07bc7ebf6b0ad4977fc1ce8a2314867c240f3f139acb43e7bb2fd44e127cc89dc338ca960096605db72667fc40a31824e8e915ec9ea6d89012d334fb";
+      sha512 = "93549b7a3ffdb275a4f4dba8a80f292cae039506990085484a9f6a54665a7588ff04c29ff5746f8c76e9d387272e18312ca58313cc255327b0fbfab53598515b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/gu-IN/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/gu-IN/firefox-55.0b2.tar.bz2";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha512 = "52479a691379fa2793932380ad54f14019818158653e4a6e00e63298cf7eee489eb8fcfb62999d90c726e990a8df95b190cd59c7ddb54bf2eb04ec3181839054";
+      sha512 = "5da0acb3b9c1588f971cfd3b40041a46cd32102b619984e3e9b16ce9f6b950c37ccd16990cd6b912bdc5af42e9cbbdf6849fd7b3716a85b2217f890b5241233c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/he/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/he/firefox-55.0b2.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha512 = "e440421111559ba38dae4c1b2a5a02b551050426b8d294405a4cdc1f8e05ee226c0959ee1fcce894398eb3f9b146bb8cdbdaa44f57cfb4ef921f720864f74e75";
+      sha512 = "f5e703361f106f63d101df3c591c0f63930df88b72bcaa0a93ca1ab0709c325edb1680d1955eb678103343c97719fa0b38b1ab8f12458538087f4a5f31080060";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/hi-IN/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/hi-IN/firefox-55.0b2.tar.bz2";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha512 = "a911950fd9299543a95391fe280a0fa88147aabb0ed8cb1ada320537d3b02bd77c2528c018480039653be44a9a18878dd6cd0b91266ed30be0190dd365fff890";
+      sha512 = "237e1fb08f8dba0bf72cfa32de252af6cde28820ae0f46d4756fa4a82893752a343d9cabfa4c719a4e39897fd6e41a32349ce2fdce61824a0dcc101cf9254681";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/hr/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/hr/firefox-55.0b2.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha512 = "085277f8e4949a6f3484f2e374ff82ff215d91772357e2f91327334f9045d97f42bea3e7cdb2eb8a0d25655d4a5001c3ae287134329fec209add20d24fe9a1f6";
+      sha512 = "908dc023c384b447af89b7dda7c60d2d2cdac3f386d1c4005d78490b4df5b69400b72ac743e9cbd0c700e4989583945cc2da0f2b8c0e1a87917ab1d37c842f4d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/hsb/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/hsb/firefox-55.0b2.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha512 = "02b9a28af54c9abf5f6bc0bed73e9ea6e14bc12bb23c3bd92673fa5422b4f77263690ba5f83a45cde0d6edb1cb67007f951b13b5bbf6f5c6bc7cecc43830f3e5";
+      sha512 = "c4a91ab0f38eb0f565d021e798c30dd07e4d259624a50ba1f51969b46e257396b9faf8a0676675799f476ed9c71fab540d0bede002e4ff6e63d3114a7114c47b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/hu/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/hu/firefox-55.0b2.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha512 = "6760b7e056e61e25f439cb6aba0de3e3624693097578e392c8f4b3a2fe3a0447cdeade3aed421bd6693059d9d6d52ba4df183e77edb499ff5bb1b440fbd95b9b";
+      sha512 = "cc8d632d7b9aa675f60780d0d16bc5da2f9853813917d6e89a7e0f47db288092fd2da94bbe28c0959d4589c23422df1d15101ed340059a3e5ebb9c622aaf9c46";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/hy-AM/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/hy-AM/firefox-55.0b2.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha512 = "4a5b0c868a2ae6ea6b1b133182c8c147dc10995f69b31e83517f05d150616d3c2c92daeee767ee44d22a691446683d6729de786efbd37429e52038ffc3b08910";
+      sha512 = "aa37883c2b1b880f807ab3bf2ce4cdc99e83cd8a80e5856055f33a0eed68eed21a3f8b5d20394ad706b0ae707d2469918bfc70c52e270b2b0303953d560e34b5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/id/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/id/firefox-55.0b2.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha512 = "245a1856af9fd7345e4925c560de1efa8b786483415431ec3a7bd22a7216296cb6d74756d8300d06d5b1c86ce1fa04eb807c050698d4777e9c9fd58308823ced";
+      sha512 = "cad8f320178124b82fa27947908191b02536691e9129fbfe9b782ca0a15a6d7adbfeccd2b6bf2bdbb4aa1d4b3d4949cb55b4188b49078685e4d07ce2a90eac20";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/is/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/is/firefox-55.0b2.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha512 = "63e14be658c33020dc32bc974578f4b329fcfba60ed070e11c833135c25ebf8039f6fe968fcd3ee2a5d33b13f1ba8c23bb3e268eae20d86f56b9cfe83bb34a3a";
+      sha512 = "7f64839be67ff5709d4ee08838a4c15e9e7971032a89390335e27781176c9d1fe555a070968f23a9cf786c3515ef028cb4911b4fb6615c38f94fdc700d35c169";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/it/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/it/firefox-55.0b2.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha512 = "992610d09e22da69f6425b4a427181a2c69ef9bca7f94aaec8175d9f2e35885f03852f45d4b692ee780c470f3304e66696c33ea4f2abac6c4c928f1919280773";
+      sha512 = "bd1f6c79c108f1fa1c01b445acd9f9ecb0a9f088cda0a113b48e1ebeb7503fdf36789881643cef359407e587eaad6d0dbe27298554b5025602f90d11e3c9ae0b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/ja/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ja/firefox-55.0b2.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha512 = "c26f7772fb0b5f45b9aa5cfa8f1d7b34bdc97e7e7bc3e841ee39614cc5f345d6c45b5053827b5fd4f62180a36b1229034570d23e3f4734d276ff33916d8fb68d";
+      sha512 = "2f9eb69e4f1db37c46a63eb3f71edd461727ab98e5fd2ea6925cab501c2f7aa81b8870bd42af2d4e30410e8d6083cd103baa83f07177ab7370a0d96afeaf424a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/ka/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ka/firefox-55.0b2.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha512 = "4d6b1b599ec6006fe1f5d4365c4ccab4b3d496ef412986a9afc1a646d596ed2269b2d67f4c42af95afcbaeeaa4b8d5f4eaece649a22097484bf0971b8e90ddf2";
+      sha512 = "b6b2728e9b74bf6c1eec3859c1dd8ee7d2ee98ccbc45fc28e2caaf45f1bb71e05b42361a25e3c4e5d71138b5b23b764d9e8e5288874cfc7b96b8b0db33088147";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/kab/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/kab/firefox-55.0b2.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha512 = "0e1d510b7f1e7e345d119c41f31f8ded78ac61c6a05258bf6c6671aca1b4dddb16508e1baa68c130bdbe959f038a9add353c58fe3b1d02e76cd1630b87324897";
+      sha512 = "a4c3dd17640fff69deff932488c7322c687263c28d8bb352af37f7bec8ae442aa821782f011953e07b34c37ebd62f55c1b913a6fe6d634af41a41137c57e89ac";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/kk/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/kk/firefox-55.0b2.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha512 = "61ee97413139b6e794fcfe1d318cca08f4b726dcb3f0ea21c7f9cb6cda16957d24db360f6cd547a2e0e6a6e031d1a200f4c8bcb9afaaf7e297fd80aec10d0f9e";
+      sha512 = "ddda306e1944d9ed37f9372ee247a2008c362235eacdc1f85ee2b875b88c968736e111b8db8d9954a3c6b0d31b76822b69968bf54394269f426ab3d4a3b11e50";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/km/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/km/firefox-55.0b2.tar.bz2";
       locale = "km";
       arch = "linux-x86_64";
-      sha512 = "e6ff303470ccd2f5f98b722746b191d0a60cf53569e37f6d8f62366d975a1e7f71bcee51afd47766566561c1869956e81feaa7040add09bb512c0578714283e8";
+      sha512 = "651cb45d7efbf85dfd081c0358def68cf1b98f9ac0025a00a112ea43c034d974a8caddc07460ffa2bf4638cf2e9c8730408cc2d5907e74645f3509861f2ee5eb";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/kn/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/kn/firefox-55.0b2.tar.bz2";
       locale = "kn";
       arch = "linux-x86_64";
-      sha512 = "be552d120b3a39241ab90c64673974f27ac10576328448f7b23c4b4d395190ce32f4f215336e86450f07f5a222492467b7b481a55e7bd9aed6c131e23c09f756";
+      sha512 = "ace13edd7b784ae7496e6c6e7959e8c343cca43ef77cf9cb9fc43895720db85989b794228296af05068c6326e8704929bd2d3568b475429a839765c9c9bb18b2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/ko/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ko/firefox-55.0b2.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha512 = "cfa83333a94c0227b97a7fc0381894d97afef80aaa0808031d95b12d79acfc144de525350c1b29a7f53d10fbcf53ecf0029c9203c7d4511af071ab0c93e55127";
+      sha512 = "4cc11703b836f50e5797638922bd5c3fd79dcce4b200c1eb2036876569d317733dbc38dfaf10eaa3fbd4309a1a131dddb62ce360608f82aa08c78b1a383981df";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/lij/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/lij/firefox-55.0b2.tar.bz2";
       locale = "lij";
       arch = "linux-x86_64";
-      sha512 = "8332db66b531b2d685e9d9a3349f1d82c4185c0fdd79bf3383112b38cfddcf24c2379031443eba19dc5cd51e602fd9a508c09c7622b92f4423376393163c5824";
+      sha512 = "4f57f8ebb8a2d2d2237b23f703e791daa92f4692c0801fd63a1079c82f658c96b33d4c64be5b05c976f05cce74321d3cc0a3d09350461830fe89361b23a71916";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/lt/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/lt/firefox-55.0b2.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha512 = "00cc56db7b2711b8f8c91459b9e1cb19bc158b09566d9218663411adb084f967d7ca2f312fa023e26da31a2d016168ca748ad7fa7a81eefc1444474babbe338d";
+      sha512 = "1dc3fedf53e70e5a299ea925484e3c995a670fba7227b56767a4887422aa4da7d536baad2655432fee86b89404fad7cd239b4c814a545e7be27db6a2ed91b725";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/lv/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/lv/firefox-55.0b2.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha512 = "2eeb912b4b787f82d0b997646d13e019dd8762b08ccde5d2823358df0515fd05855caf991ededc17aa9cef1c3524d59cf651f14a4c592c70fecf44f3b2fb0f1b";
+      sha512 = "c97cdde91fe876bfb5da846e486d1f34ac9ba9f14d39ecdd53bd397c37fbe44254df3110d0854b3598c3a6e89883c220afc69293e09877fdaa49d7c286be5cdf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/mai/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/mai/firefox-55.0b2.tar.bz2";
       locale = "mai";
       arch = "linux-x86_64";
-      sha512 = "4e61c996041804cfac7c62c410fe0315f153e592cb423b57ac9b96070bda7d37cdad02e3e047319951c4a2c7fe1b41f06b98af0f71f876949611f7a52cff3c72";
+      sha512 = "afe506e36a228dbf1c8a3918077bade8a69d51c801cbb274209055e6062c9cbca340e153842d9a24637c62cb6833f99e69fcf3b92b82ec16afa882d566cf44c0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/mk/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/mk/firefox-55.0b2.tar.bz2";
       locale = "mk";
       arch = "linux-x86_64";
-      sha512 = "338d4b3fc0ec34edb5acb3a4e86b9e8b64d16c470303f0ed127d060c1d38b176bd51251eccb3ab3df19c140007d44ab6649983c0c9aab8daa5ea348f5b34dfde";
+      sha512 = "b9cbec5c7f75d6dd2fc69aea6f182bd8682cc2974425973b5d7f42982fa7f69b384bafae1bdab4fa225f7965f9d2a37c0e127ff12d7ad1991f998b19deaded63";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/ml/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ml/firefox-55.0b2.tar.bz2";
       locale = "ml";
       arch = "linux-x86_64";
-      sha512 = "1c7f8fcf9a0cb5a8a18a21ef5c258d6edd26cf0b6b847eb64b0c4d8bb963b4814df06be0b9adaf4ebe1d384afbe76c9bb60609c9f9773e466ad8fdf36e4e5d88";
+      sha512 = "2e7cffa6991ee2ee8018dfbed50163c6c905e1e9394ec880d92f12bde8d180ef6445a8f20c217f620b3ed19efc5505ab2b158a679adc97a904b83d46561ba0e1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/mr/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/mr/firefox-55.0b2.tar.bz2";
       locale = "mr";
       arch = "linux-x86_64";
-      sha512 = "ceeccd3c53a1bf3d3cff32cbdc8a3845db7c383e98b7666fbab71ee748ea57b8f103ab337e8cc08cc25a0b5c28c57748864ed098259ceff167faf4cf5e3bff8f";
+      sha512 = "9e3ffcb028a9809dc34969587585fec94c31e3f8561c969bec5a1f6d9c436ac02648185a56c4cb95a16b400d6abcb1c01293505c51b8e9149625bdd910523aca";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/ms/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ms/firefox-55.0b2.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha512 = "d08fff37dfc1ab4ad2a629562a3294aeca275a4f86110e9a21839653849cdce9ab709228bea30e33b3b1695cf7a84fc0cacd1b068a060c5ad1cbb39553eb1299";
+      sha512 = "29f08c10050013832f709bb0b42ea1f6a3ed191ba979efaeffba44e5ff27220c7bae9717d68a9478c2a452eaf0ef1e8da390eced1f5f7a37ce1ae5ee6f4bfa6a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/my/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/my/firefox-55.0b2.tar.bz2";
       locale = "my";
       arch = "linux-x86_64";
-      sha512 = "fd5cad2fe03a2029b1cb63fff9807cdeb5555ce7b3e84f0a8ef334a41ee15f2d499221e1280c68fdb846393bc5aee86e2dbb1a5373873e4c50cda495cbac3475";
+      sha512 = "5f58e403b72cff6963a51a4e32ae55f94680460a658ff5ede90e859aa1de849c89abab33036cc194b9a3eded23b61d53ff9e9f98bb653785a1e60848e32533dc";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/nb-NO/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/nb-NO/firefox-55.0b2.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha512 = "baef1e2bded7e56a4fb3d1104548ca5e9b9a8a9ab5650c39ebf822199feafd960d24859bd24cdf652edaac8276a7b235110d1e3a7ef6219f6152d6e0a6c48e7b";
+      sha512 = "2e6c4cbc3a73c4669e7703b9847a52849bdde3a5cf332ff0aa76cf5336f21f62177daf050d655250e552c7beb4a05043cfddc276896feae1e03b5dade016e0c7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/nl/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/nl/firefox-55.0b2.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha512 = "ea47b33ab1b2b7de0d461f50d0784157ed3ff0eef3ce6753d9ba5c11372d182b887cb521afdd8697ade0c077c9a329ac0c47dae928aae68dc6e49b45071d45d5";
+      sha512 = "bd0afc4ef24c68e1a503ac93ecdb969a29427548d5991f47b86583941d2a1bd8d9af88e3a46b74b52b5957cc80d05a2dde659cae2c33028f87fc48beea637366";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/nn-NO/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/nn-NO/firefox-55.0b2.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha512 = "54df10b892ff31a6decc0c4d3dda5687499512e21f42d69ea68823ee99dcf41e8f1f1aa99cb210f6d3e01bc07aff5b0a7b6e55b2b6a41627e654efc02645a461";
+      sha512 = "c342102835e18d7d14e18e1f7185547d1b2385ce4157554ee65e76766885edc62d1d7e4a911af206d2bf34caa0377b6e256e18c06c41082074a868c5a6367f45";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/or/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/or/firefox-55.0b2.tar.bz2";
       locale = "or";
       arch = "linux-x86_64";
-      sha512 = "eac033a46ab0de8deddd1a4ee88c8c4eb7d814ce559862b92fdc7a2f8a0549913208d4ba151a1a746acaff3d627916e6d09bafe2ad6d78ad54f01aa691be75c1";
+      sha512 = "154b729897c7fa4e243eb42c7e365f658f3857b0b799a633e446ed1ef7257e6387d755c0534ce2cf81e0008caaa205c18ba512a3b3c4e6f31f6a5789674e16f7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/pa-IN/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/pa-IN/firefox-55.0b2.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha512 = "cd6f0d6f30627d50011e0f193754815256b45200fe743e820b6bb6b98120a29936cfeb84676e92e9d90ec8f71774d8bebd57dd68860d4bd77339bea154cdf28d";
+      sha512 = "39cb1b7546ba00c9f2a7f5794c7920f6a110ccddc20605b829945cd85dd5172465f03fff0dfd3d22f67769c15f43130d5f034fe48e52659b864bed7cd5e869a5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/pl/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/pl/firefox-55.0b2.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha512 = "749592aea4e2c18472981ee9d7b6d3cfdbe9c41fe2c0566c3e7eb62c0d910104a6301dfdefb19ac2972edfa65aac509ff485af7ecb73aed365d1a0b052ae63c0";
+      sha512 = "a5d30cc38ec170a5d23fc721a91802c09ce913356217c34684887b292c523f9da5b0d2a16e882d324a38cac871f541e08c86446c36f8dd69cf2c6a60d0a2dfd0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/pt-BR/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/pt-BR/firefox-55.0b2.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha512 = "d6e8ce82e79368c9fde059e8763bc9a5b4b6927672f503f52f525a86eec4e39829790d63a009477d1cb4f27be7ef5624c9ee3b2ad58603d76eb5400a8a758754";
+      sha512 = "0ac69c4cd827cb724507202bb88ef00cddebc10e7785a23ed3adfc0fc537e981c45d8141d299f6d6e6c84017cb16361022357750b69c5cf70e643d14e12c99a8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/pt-PT/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/pt-PT/firefox-55.0b2.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha512 = "d3ec8279b1c4ce984cfc57b4b9dd67b923aa73314c21b87f5800e9c1d64d4d23ec8077dc571bdad068e9ce6ce7aeca2b358cf1b12cc6a05c24a58fb876630a4f";
+      sha512 = "34ce2df0f0501610a73b4faff1fee7cc60c0c0d675c60a769b99362c7ea82a5f780804f1fd5d1b010063b0ec5fa67db5d6dcf661b0638274563c0af588c86238";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/rm/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/rm/firefox-55.0b2.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha512 = "49310bc21921933c4daeb096c059730d69c22696121af66a4db8b305376fa2cdba73ac58201c12b8afffa751ac30e0f7668d6fbd811077bde055baebfe106bf1";
+      sha512 = "8053d904c427dbe66837445b471793c80e23fcabc673f2df5090b9acde7f29ba38f74d786183b8d4a1808c5af0c7ec147a02735a0aab3a8d812c7e8d541e2167";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/ro/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ro/firefox-55.0b2.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha512 = "44bb06eb3de9dc5ba0b6446c782335a50ac058bfdd0dbe69801c7e1b2b55af8ce1a846527baa65afa251c062ad4e325403970b04e939aa9b25ae317b6354ac8f";
+      sha512 = "6faf8c31b8457e11e627309c851ffac67821966e7d2f363ea54e133f25195fe35eb593de6b8f6698b01940604b4b5ba13b37259de6e24a817fc4cb402cebb52f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/ru/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ru/firefox-55.0b2.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha512 = "1278da77065621c5738a66bd7c8bf8fc361f6bfc8ae7b2d47a454bee53bb3ce47118b490ef0219f9fb56cd956d34f9b24ecb50ef2b5290f8731192b64cbcf413";
+      sha512 = "1ef8163cbffdc6887cbc5bc26e999adeecb43d9ce45bc805da9c3d307659100a83038038cac411aaae384cf20c45be081ad1fc1211110a68d023ec1551e52b2b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/si/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/si/firefox-55.0b2.tar.bz2";
       locale = "si";
       arch = "linux-x86_64";
-      sha512 = "5537d26bff86ee2d7249809cd47d093f980a4b882e72dbe0d97dab3c368000c2e25b6fbb762bcbf7249524c7fa40e65c9fc15a79004825cbc09be4ed62ee54a0";
+      sha512 = "556eded9643cd1f482e6b4f83fb52e73d2a182065df441e7244256472dca276903a76e19ede5bdcd02c9facdbd09c7c2d533163e3165c68e54087b592dec4fc5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/sk/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/sk/firefox-55.0b2.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha512 = "85a544edb4948f0d828908da796f0d6bed5ee0370cba310acd31adc5adc3786f639bc86563904194302e9198f61c9d266aeebd48cf3a2b7d6a96f7dcfa35a75d";
+      sha512 = "8b1cb4342ed920bba9e3770b6679817475205e9b18f94892cf86af0348a10530616622ace83173ad71b7889917dd0e6fdfce391b5a4c667230bcc63ee14f5050";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/sl/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/sl/firefox-55.0b2.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha512 = "aac17e2a1ef5166aacabe96933d7179165a185da27da11d1810bec8ce15f9c738eebd3b1e079f03fea30b7079602e110a7c1d536a91ecc513cecbd20cebffc44";
+      sha512 = "69aa0ed87116ab8c1d0b0ef1c086d014b55b7e1441c1c41a10377eab81ae0ff66516dff7be201faec156e541d17262aa1f46d82f4041eda791086906c7795826";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/son/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/son/firefox-55.0b2.tar.bz2";
       locale = "son";
       arch = "linux-x86_64";
-      sha512 = "23dfa3759617bc04758c779b47323edf9a96f3d3fa655b72c6f2cd885fc9e6b19b1b34ba39ec8ad6a4395a6d502d8689fdcefbe489cc0673ca3df8bf9b64cb64";
+      sha512 = "4bd0d7510c9977013a9fdfd3453361380b497dc600b1418856a0652ead5625c67b1aaa554d75fa8c10dc1ff4c3e60fe2218a421c623ace151e8ad078c63fdb74";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/sq/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/sq/firefox-55.0b2.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha512 = "bc7bc6da2111e0a211a75aa3f37736b7ee6d4c2193f7c884d0ce1b5b0d88019b24de9f7cdc2da1eb4649ac3ee7d06b3c4a580c4f6797ecaf65067178fca7a63d";
+      sha512 = "37c7bbeaff9004b3facad06afdaffb2ce75e1a49147a3801113124f1e6827e96ccd41b38b59f5230e97c1f9060e9db4cbfd399b362bc8d3619e9f4c4786e7f65";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/sr/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/sr/firefox-55.0b2.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha512 = "50a6875b26453414dcb61860f6f595ea46e7563cc9231d00e1df97b6a940570a0bc370c99a76ef97d03dddf75b75842102b3d63062aad989b3620426c880978d";
+      sha512 = "ca2f26e74b20fa6e1d9d43517a26426817bfd40f0d73fc487f7341485bc1ffec6a722cd1c3212fee03f0584fb7807b554465979bf8d8228f1870eca139baf752";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/sv-SE/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/sv-SE/firefox-55.0b2.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha512 = "e8c400e7250e1d4f03072c674762d7eba488f6e9526139657ac4bae7ceedb6eb85b070acf7b94c609492bdc74534f4d1fa2404dadf3ec3c0732804afbd6d6d11";
+      sha512 = "9233da6de53b4304e19b27a8188314ee42ebccf49c65b48c3bfc5a06f9ffcd2cabc4843f2995f881eaa2262a9a0d8f1e6b68943d5e1d81c1290dc1d21adf3e14";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/ta/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ta/firefox-55.0b2.tar.bz2";
       locale = "ta";
       arch = "linux-x86_64";
-      sha512 = "7896fda2249da5444d3dcbb4dc6381005c79c9e93e2275261ee46f8b9b7a586250ac8722acccf1e4a0d5a4ef8a0c3d7b4cea1518e4dd9ff3d99ba49e9f9a99db";
+      sha512 = "12ada3e1b3816c257538deacb8138819b4924a900f71397c95286f37e2e941c3705db504ae4f5a964d6af142a39305cb9ab5a63cd2a3060047aa55fb6c288f4f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/te/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/te/firefox-55.0b2.tar.bz2";
       locale = "te";
       arch = "linux-x86_64";
-      sha512 = "0868096328171e221db7a5ec57121682dbe0134300da0b520b68379e23a88e88817b2480673d508b76d61a91b010ea2daeefe711444c931352775d96b51e7e67";
+      sha512 = "cf2bd733d492edefe19af9ab68f36298e825d66cdfb89995bd20ffc3a405e078af26e6a7f07bdb1b04bd09daa516b9dfced7fe524cbeace8b9aec324b8826ba9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/th/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/th/firefox-55.0b2.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha512 = "8bbdba7486615b3591bf396b0997c74e0bb3da0547d4f9aa40a1c2274d7eee6f11a866a1176167e38614d9f182c853f2ed884d982dc2219069a4051f7b41ca35";
+      sha512 = "dd6c976d58a61a50bd6f6ab3773c43f778ddb08b2dbef7ca3709219ec4ddf14db479fa8b9a9136d28875bb71c493b085b9e668c5f4d02dc307c0e350be2b81f3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/tr/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/tr/firefox-55.0b2.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha512 = "948888566da0b04eadc9135989f8c4940c6fe8edf25e3f093fcf81e39bd09b730e105f07c461844ab72a69e7782b6dfa24996768caa99fdf4dfe5082f1613583";
+      sha512 = "6bcb6a25b985261506e47bf984302153074811c88f2134987a15651f96d2e373ca6867c3509eddd34690e2731ea0552c575097b3e083e9fed8d9aaf03b95da75";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/uk/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/uk/firefox-55.0b2.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha512 = "d12e0c53ea756b4406e650f1b11010ec6c0682afcf6edc7eec4732322e82e0e2e4904aa5b3587f87b5124f98a3712bfcf60adab62ea0c8309e03f80e83d7ba19";
+      sha512 = "403ab45582319cc2ded9c5f6c39791cc35e040cba808ab416a4d6104accfa75df56f858597c714bb5087f41471e4dac54d0f6ab62ee767de6925ccf0a10097a7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/ur/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/ur/firefox-55.0b2.tar.bz2";
       locale = "ur";
       arch = "linux-x86_64";
-      sha512 = "648267564541e466291a055180d2aed657931be70674e51c204f46c9effd5133d4bc35064902692194e433d609b727822d9bc9a0221aed0e538371acf6343032";
+      sha512 = "4dcd348076640ae39ee104cde115e6b207aca400cf9fdfc65d00334271e18ba78fd185136ff54211a162f32f0eec46d696f3c5a02ae969addcce95b839f45260";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/uz/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/uz/firefox-55.0b2.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha512 = "afbc0b0af8882b8f14a965475ee9b4421b315dfea064b3d00bce51879448d8a22f64af95991e4290a545a2db77dccc97ea6beeb22ac10298ab71d9f423011467";
+      sha512 = "f6d38f2de149b4fb2494582e6ee3a562d4c7af71aa957ba30fedc9c1cfea314d11849fc1c8a11d19cc43045d73c1939845f1fb3e334c4d32eeb0c2881b9ca724";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/vi/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/vi/firefox-55.0b2.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha512 = "1caddc6f94250d9142d99b9ba221f52f157e252b7b36bfce253b0ed1de68e38d859c6afd0be23e642c9aa7d51a82f04ff0ad1d63397bbcb6bf47b918a6d7826f";
+      sha512 = "277f09e65c5d07539346282b9f70a662494a2c5640c78ad56089e0c50c651ab0c0fadabfb67148bdcc5de190ea83d1abe70c3aa5fc50ae1cb870937d10d95be4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/xh/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/xh/firefox-55.0b2.tar.bz2";
       locale = "xh";
       arch = "linux-x86_64";
-      sha512 = "c03d230edc7078a3efa322d359e10b45b129689702704c8ec6ed869c7db1cf99b7f57d50442e2ff64b730ed5c72f39ced56efd9ac2ba65654b3a735f3a381866";
+      sha512 = "e541a068ccd072724fb19a0bd830a2a95665a20a08ad9e398be02545a0a6ae8488d3f30f8dfa25c1149df2a90eca5f586fbe116740cfe630efbe00f002d3278b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/zh-CN/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/zh-CN/firefox-55.0b2.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha512 = "0ee7ab138d09638b9ef34c7e5dd155c4bfcc13414fe91696ccba38bc0df3ec7cbbedc39f02c790448d9b0079a20b49c3ec47b02c29469ee6a1d53fcc7b9046a1";
+      sha512 = "3f9163e25fd67048456bcae71c86c287d5052c45caedbb19d6fc65e421d1dbc66cafd61582137b7e3a6a5535fb19be110f93d11ea1cd6462f5e4a16ac2bac182";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-x86_64/zh-TW/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-x86_64/zh-TW/firefox-55.0b2.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha512 = "0dd312831aaa9801246e0124d80f239b4e7311a64d64823111e32a93b3165401fb27f484d0023751af87b204df22e4a7961db0f37787025babe195f185ac920e";
+      sha512 = "12508fd22dc5ec22cb272ad8c62150ca2d7ed680e91d398e304ea07633b55eba1b44ef7668e3b0510f0ef2bd21c8d83c28ae07d2f519e138b4100c5f8fb35ae1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/ach/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ach/firefox-55.0b2.tar.bz2";
       locale = "ach";
       arch = "linux-i686";
-      sha512 = "a97800319c06e5433e3b31ea80c153d03f203804c9013eff166b57b7dba3edbab74ae565a57565c36371f609d53a76ac2657965d8e2da936ee753d614ceb6de8";
+      sha512 = "de723b9dca94cc4f35c329e2e31596df20e8d873b54cfc0c4d0cba1ce27b25bbe7af37f50cb360e933b4ae69b1e9d9d2874a84d4357d39d7ec06dbd62fbe9187";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/af/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/af/firefox-55.0b2.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha512 = "50ba89db1ba882fb84be61875caf147d29e0c7c64402088a95293b58f98065d49228d47fcedf0a2ecee9cf5d994303c2b8576cfa9fe1939eaf9ac2ae5ff89266";
+      sha512 = "ff3da99e585bcf41f1205e62e2d2a0f7aeaf09a8d06472d6d26c74555ffbb8600fff7266730459cd2596766029ef968f613dd2e793f444ece9967a793754de14";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/an/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/an/firefox-55.0b2.tar.bz2";
       locale = "an";
       arch = "linux-i686";
-      sha512 = "fa33fb132888398d38d1ce923c2740b0976f3f87f661c1c30b016a8e8cd60fa8b57d3f53e20b008fc6b6adfcd6b5c632f0550361b078248495dea8ccacccd274";
+      sha512 = "8c9d07c589a2fd0f6fb6229a3c83ebf26d07e4535b915fbc737e8a54c64985731a7101e6474023e03c048d30c34c57e6d0a47c530a642072167093671a67f144";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/ar/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ar/firefox-55.0b2.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha512 = "463593d809774306e88fcc3484aae8dc329580e5327f48f463f487493b3cfdc73ae6b943bc301227244d12869acf0c766c234868981b38c63bea673dec204b36";
+      sha512 = "f8242f8bbfd54bef69d9480c1a3b78811c91332ed26b1ab3db731e9a2b4633b4db1e5dace3f8351210f38f383d9396d6372dde7b1c3c20a99a4631d095c387ea";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/as/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/as/firefox-55.0b2.tar.bz2";
       locale = "as";
       arch = "linux-i686";
-      sha512 = "7d804ad62497a7fa22e418826677db500dd59bd6583729c8c1ff8d49fd13eb8979e35749055b707c0d9ef98af3c78a7e80f3b0609cbd34868efbe0bf7c7f166e";
+      sha512 = "830cd3edabf5584fad8e5f77201b0980859b2fe8a2c6ec5c0ec886a5b7fe1c81c3513d93a9e99b6ad350d3d699376ba3a027caea1b8b092137f580379cc34d59";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/ast/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ast/firefox-55.0b2.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha512 = "bbc13a6cf87e047243a6aa17bda1ecb13aafb00f3c8baf84cd5e64db0cd0fb2dfc679cc8f1dcd1d877c7bf42503d716049c5fec163a946dc47f1ff72f495ab7b";
+      sha512 = "5ef46e285b2c7015f8c0de1a4cbf59883f1ad0a98ae9bd4fe2a5ebbaf9f27ca5522233517d7a50281cf75375a3cba0036a0d77d493e28fa8230e4af3b888456d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/az/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/az/firefox-55.0b2.tar.bz2";
       locale = "az";
       arch = "linux-i686";
-      sha512 = "b9357217c5f1ebe06fb6c1a399ac94637388e8866a291ad6bdcbdd0c6d2820bb2beb8b66d6e1c6557abd87835e857b50f01a45f8fe21aa8c053d44417b8466fa";
+      sha512 = "6db4270e17b883c6970988287a365497a5905f12c581ed40e442712cc61f61cb78f82dc67c5d1806f61d31302f6e914df95f3116c96404c09c07945de13e6556";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/bg/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/be/firefox-55.0b2.tar.bz2";
+      locale = "be";
+      arch = "linux-i686";
+      sha512 = "779561717f27e6090de5d63646ae0ee7de5b029422889a9b8701f30cee2ab1e1c7737f6d61a6f8bfb7106b7f05cccb060a7cb30f8bb593210ed7a04d72137c98";
+    }
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/bg/firefox-55.0b2.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha512 = "bb94f0186705cf5a0d9b377b1ed9b465cbf6632a0528dc6fb9697409a85ea1963f53b5517cc97fc16db13022da69d8bc43682dc80b54fb7b4bbb8650d8723935";
+      sha512 = "889172aef9743e4a38cbbca387528e03b3a3c9882b2a2459acb0da697bec2080a51491cc0998955921ebbfad4b272f0f82ae7029313209a887984a768552fcb5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/bn-BD/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/bn-BD/firefox-55.0b2.tar.bz2";
       locale = "bn-BD";
       arch = "linux-i686";
-      sha512 = "c25f755fe5a82a2bad51c8060e6c152a4e66901e9c2adb53b79e08f64bf2e673b83aead21ef83b28390b9506b65685a8c373b62ba1002f3f8ba59ecdcd530b73";
+      sha512 = "0b93d432172814b44e5d879f044799c0d6002e8c631766a43e892d76fee156614fb64ec5333ade7bb65451c73d04443d30202d054b8c7dc2d82d3e63b196d472";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/bn-IN/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/bn-IN/firefox-55.0b2.tar.bz2";
       locale = "bn-IN";
       arch = "linux-i686";
-      sha512 = "7291294306a82b9c6ebd2861715a9954169192909e096391ca342d7b82cf7b45855b1f9315e2f447749209b0c3979ea1545532b61b52ccefd68031028473f0a4";
+      sha512 = "708637cca38914670df1a237fb5b3d30cc6fa93f75c9b13585fc1d80b11b986511139aac1a984e0ce27143e554092be538d91a9e54841ea44fb5feec9128eeee";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/br/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/br/firefox-55.0b2.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha512 = "1c14ef7d74da4c9925b1891a60480e7cae632f95ed46180c77eae8706aeb3e778a6a131f670abeb2b2d4640edb265da4d3b848d993d17f604cc0fe6d3e322c29";
+      sha512 = "0343c096b3b9c98ca65a4934aaeff8d08166a2b6c806ed81cf89cd1942cea9bfd2464a42cd54037c5bd78b3c05951f29710894e852ba65f24c5f7bb0cff3f885";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/bs/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/bs/firefox-55.0b2.tar.bz2";
       locale = "bs";
       arch = "linux-i686";
-      sha512 = "426384268d285b1c4e4ef14edc348cc2e6be1bd27abbdfd1eb1ac4cd4a9cf36c2e0af269ec778a36d413da40186adeaeede3aed6695fc7fc9699fbc57a48b956";
+      sha512 = "00d309e92d80941318ac41a56ad41ffe3fce590ab084974bf2745ed7be2637192829c4cebf230a86d77d2eebf9aebd19495b4674a5d469563ba00b124f526a9e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/ca/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ca/firefox-55.0b2.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha512 = "6c20671af78f50aee715e9d9583923c9df086232e9fbb6dcb7211ad2a2c605671fb1d5484a9b1fc35062bf568aae2d15c79af26e9d56692ed3ec51eee0584254";
+      sha512 = "ad25a897f3d9a58156f1ad95bb17da94a3fef84603da874cbd12db8b0f51868b95e8157b71cc8c1b88253b043bcfb5f58897f052c20f4ee703afcdcf3279a15b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/cak/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/cak/firefox-55.0b2.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha512 = "d4c5b4e344caf327a261e06fb0aff1d8071ec2ee61fb77ce2008eacb0ce4937b53d91bfd8e0369979de996c9db665302fec8278e6d024857fabe975b3f01b4d6";
+      sha512 = "d10a6222212fac4f69b2cbf5fd82954160dc6495a901f2e790fb5dfdbac5548f017d611df93b5ee74d688b53a0002f8927c2d360a7c2a907e2ce72d3961c06f9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/cs/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/cs/firefox-55.0b2.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha512 = "c0e10ef87dcf787a337f7f5dd14eaf1f327d248cf3cf2cc0b42b5e9fa426a19c65fcd83cf6ad5898b84f1d8cb70390aafc8e3b7b5cbf2880d9713e854f070b9f";
+      sha512 = "f18dff7152d0b83955ad8221f1b3e46ad0b34c082f0be17296eb459639addd076060b26036548b79aa1da73ac11a53ad82ea2e6069e12babc90570e23ea8681a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/cy/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/cy/firefox-55.0b2.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha512 = "b9d8bcd6e05d9a975fe9947d766012150fe504e26384b4cf42591b009201cb1d035ba1157eeaf8dde4c08e7d37814b7177eb46df0f4fb5cc775a62ccbccb06b4";
+      sha512 = "04aeeac12aa2ea1ee0064daba05f33147c376c3f6acec38abd64e794ec78f72783ae865ec17b855c165c80990812ee3e0555ec55e24592806cfb02854379e32d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/da/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/da/firefox-55.0b2.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha512 = "3676798548d36ddb1ae0e9b17c970e21572882ec75d81f78d4d63d6ee6581338f75a934b257764c3d43129d139fc8d9be585568d105550b61b5c1146aedb3071";
+      sha512 = "53034182c7115b8f2a24662823571b290f86977e2be663dfd40c02d9a8f2cd5db3d3563873af5cfff89bdb67e7a2e60c14c21e755b070bea0a5942c2821140ec";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/de/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/de/firefox-55.0b2.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha512 = "f42a2d8acdd380157bf145ba5341b574f5b065705e3ca536f99b23784ff4763c16decc784b62c6d0c6a98ffe088526cbbd6b07cc97c5e0a62268f073c8b8945b";
+      sha512 = "9a1ee91fa95b6ca8e0618dfd84930c2e41cb03a1daf33b03ac8ac9a92e113d43ab41e922537eee477bb5e706c7f018a817dd640460df5cf10288684811eb9585";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/dsb/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/dsb/firefox-55.0b2.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha512 = "80bcfed6c5788919b2ddd85942dd47ba4a0de1de33840fcc2a7b4ed18dff748c2665d12dcbf3a68ae09f9199292a466be02cf141478e303912c2efed4aab3f33";
+      sha512 = "935e7ee75c34045393dde791d14be3f4f7c5d57bcef5c4b8a6e291941acdb21550e6b5aa54bb559f3deb64cc6922f4709bec360fd62273b4b693718b69de532b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/el/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/el/firefox-55.0b2.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha512 = "42bc0ce9c2b9a8e5d9655b921009820c1e0e05a48ff104e68533df9cd4e17e9acd19c8d9bd88d4dff48f851c9532f4e58bdc175f8c0cd14d1b98bedcb96fec17";
+      sha512 = "371d5b023d63923bb65acfdf3d4d7efb5acfff3b2b6de7ba94e0b475b7e45b268612303373e7b10b420ca2c398e9eaf340dd481390f36c5a0b50beb54ddcfc1e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/en-GB/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/en-GB/firefox-55.0b2.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha512 = "cc4ae041a4595d6386a1dd24ca83440497e04f552d748566d4fcc1a17aeecc63771a130ac212d2f5a12f2691128c201f673edc3ca3ea76c808a44bb0a771c8f3";
+      sha512 = "c99cfd1283ab71d78ab8311616ea6645cc1d492dfb5091d2bee19299ecaa9455228639f85ea366e7b4ebd28270f06446897b1a99c9c9b54bb2c69b4f4d3fec1d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/en-US/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/en-US/firefox-55.0b2.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha512 = "dcdc0828e37d46046c4793440d1ce236b53b67426bb9395f4134700d78027d01670b0948fc668f7ba38c2daa3f1909882441d056f1f8f4216773ff4151f2cb56";
+      sha512 = "7a81c06e4b85e7e839aba4ea4fb41f1da871c3de705a843c013965648b1bedea86f0ab73a616b7b864da10da0c47624819178063f2894508fefd34d7971e3714";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/en-ZA/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/en-ZA/firefox-55.0b2.tar.bz2";
       locale = "en-ZA";
       arch = "linux-i686";
-      sha512 = "f8f1629e0824f14dad1d315e0a02356cc6581fb09cbfc89899071e376a5fc359820bf5c0fefad003cf714c344a4fdbcbfa6117e618e9d01fbdb6bce4ec2b0cd7";
+      sha512 = "4f0b171169b73fa526e25a7c7c9dfa1a0fd557fec07b69e761a948de71172f733bc2a1d2e3d1f44d6deed0f42568279e78541e32352ba1a27fb45274d76768e0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/eo/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/eo/firefox-55.0b2.tar.bz2";
       locale = "eo";
       arch = "linux-i686";
-      sha512 = "5360d73ea0fb4bf9ac0312a9f636ff3c350bf3332e1051a24b69b9f2abea038c9924055ff6b1b8ead926e20d6f4a56349312184bdb6d8977b3e8325a76e8491b";
+      sha512 = "d992ef007b02ec7c33b8efb7d69f71a9656d410dbb30ddd3c2a7e39ec6f358ea02fa9404af84bde1bf0da524d5a359655847d729f10a877e81b3846c77a74a15";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/es-AR/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/es-AR/firefox-55.0b2.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha512 = "242cf9863fdeac1bce45d307ea666b3c1903778704f0e417f39a37afc22395d3ce231f4dd33b6e4e9ac31d256d3ad8926bee3ae2c22f062a981061443607b2d2";
+      sha512 = "5e4303d24df249bf07a84e6f76bedefb906e8846db787c12422890240faa3c231e9b87afb1fc210ccb1e8b3abc7aafa84f1896d535d7e1c24854d87971be8bb3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/es-CL/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/es-CL/firefox-55.0b2.tar.bz2";
       locale = "es-CL";
       arch = "linux-i686";
-      sha512 = "4978958d499534a8c6f330dfd56e1ef40c0a92bfa27115019855d8630d9c1b1bd4f26fecfd5fec866e44f7c93f8dbf93feb7e1247af5285c62562ff7e449cbb1";
+      sha512 = "0be7306ad2da4072abebea8e93ae7a826e7f4be78855400fadd930e9d7d4f114b7c0e6d830a571da17d3c67d9fd3ba7b0d3fb861ed8f61c7681b3f23dd8bf381";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/es-ES/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/es-ES/firefox-55.0b2.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha512 = "e321bf3bdac860f2bd2e163e05fecbbd002fdd5f7ac068ece7bf2352aa5a5efee184d47b0d4b95c2323cd786cc874ef81fcb772cc585b0bc217886e6cf588791";
+      sha512 = "df9e70df387da42984bd27e5f032e2194eaac20605c2c50be0b41bfbba2a1b71237380e7ad68ba02da3ab426575f5dcdcaa7a31b3871b9e565239571699d9fcd";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/es-MX/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/es-MX/firefox-55.0b2.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha512 = "3a38e786861f16a6c228ea5416d2bd0ba643f27fa02bcc0621f705db537ba6e89eeae1f1c191bee6b499e4c6a1ef9af66df80979f32598b54db118bfe963ec79";
+      sha512 = "cb021bb04ed655c92120a6dee9f65109ce5951d1496c5acd2aee2ff0e8204e36e3b226cc08a1aa947cebc693e84b41c87de91edddcd47265835c883f6078dbb4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/et/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/et/firefox-55.0b2.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha512 = "d452515192a70bc20640d3cb6443c91dcd878ca354288d825426c6b395a8a299ee18b781da1f210acca58799ef34f6c6149f4fb758609ae7264dcc698e810d76";
+      sha512 = "c3199f20eb4db23791bc7ce076b97bf08bffa447efb15542c34f2e6def2ee64bc6e2bdaf9de094eac35ace1bab6693bfab4f0ea0bccb2754948cc9fb13a99989";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/eu/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/eu/firefox-55.0b2.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha512 = "41939bc714c4cf0ee9a58ec99851329495a6eebfb8d6e7b3429a246497d7e917457958eecb273e2d4adc65d70a018534ed5692a1b2b6d018b0a03bf5d3babbe1";
+      sha512 = "8c168058d15a7b0f7fcb72bf8e25de041a6c8ff8b70744645dc03c57b7380a273d419090779ca755ee114b997e6beabea060542df53adf6b4dbb32527425b15f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/fa/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/fa/firefox-55.0b2.tar.bz2";
       locale = "fa";
       arch = "linux-i686";
-      sha512 = "7834266f460d0a98a4f863f03f77770a1a76a107dd9bd3cc44e5e26c40a310a08cbc51518aac8db989dc843ddd31f0bf342b58ee065565a06e00d81470d8eb13";
+      sha512 = "2c263b26f64e565fc4873201e21cc2cae483ae691f628b4252928f3277d919eda1a5b3b0504da04a6da3df8875dbfd86d2aca440c9fd65fdf31992d87842a3b5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/ff/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ff/firefox-55.0b2.tar.bz2";
       locale = "ff";
       arch = "linux-i686";
-      sha512 = "f89b33dbc852913b44658691c558a98881c5b9a6dde0a60caa7dcaf9cf7d833bb841216f9217616be8ef0f4343d5221cdf64bccca4960bb39430d2629ad4f592";
+      sha512 = "089903272e4245ac8cc4b3a2f60809a2b11affeee2ba1befe03031bf05c8cbef239189f2a729d0489cf5593ceb9ea5356a21039b464b25c8f4613bb7ac787e17";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/fi/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/fi/firefox-55.0b2.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha512 = "2bf12c99f929224dccb1937ca241610a741af9ff5af92fa06752c27857cbb7e3c6f9bee5cd453d7e88e9cdbe2dd57940a6b00069a2f795447fce943eca84a15d";
+      sha512 = "a9f5bcded43b63766ec18f2a846b3c4c57fdfab15a0a570eaa10b9b09b817abe63eb7e9ed67bd6e1bc31805582b8458ecb3249c125aaae1803ed5036a66460c6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/fr/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/fr/firefox-55.0b2.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha512 = "a14d18ee73bb8665d86b603c8806391ab937f3571808034216d69aa2f8ab1a6b97d52d47c34f44ca0f6eecd48e5ae58142d25e840a6c14721f8948c387795c37";
+      sha512 = "4689fba26647f5ba64eef2e8b188366747df8c2e957fc903845de131969e25aeb25b8f4528210be0c6d4a6a5db8a21079e1627aa8edcf087a5eafc8f9b0f8f2a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/fy-NL/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/fy-NL/firefox-55.0b2.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha512 = "6cffe5d50a37469b7a1f2ca62b9e05d8c2f2e5d9686a07ac365e34357c2827d95c767044a7f5f5fe1124e38690560cd99adf8b733df9d76275049032196a1af1";
+      sha512 = "c9ccaf00b75d0032f3fa7c79bad37e672b944dddcf07cb6783b401a4115e283ef11c90684f3a1a589a745e08f2dff9e27456509fb78a6f894e83c24cab141185";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/ga-IE/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ga-IE/firefox-55.0b2.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha512 = "619489d201b72f96d23be570e8b02654f851f4eac81cccc65e978b0ee69d4af5b205dcda42d95e3b2539959fd697807a0519a1da64acb3784830aeb53e263469";
+      sha512 = "a62af4ccedf1b6c443a13efd6c41b6d6f492f31d1d7701946871ffbbf00df000eef59eac69292f6ea8be64d9512d064ea86d7cdf07656b8ab2bc234106468db2";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/gd/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/gd/firefox-55.0b2.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha512 = "9e198c4392396379057570a5200e41eb44ecf8c7b427a4cf9d307404d58d23ab440aa1f29798b38887959beea217bf3ab12a80012da66479260438ce45bb12dd";
+      sha512 = "177f3584b81bd03ceceb0f7083114b38ba826974b115e962d8c6065c001aefda7c65c273c1a833cf7dabd24b69e0c42079ccd6842f882f196de1a2fdb7ce8605";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/gl/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/gl/firefox-55.0b2.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha512 = "6a8439062f17c97e76a7f660ce9d25461e92089494bd8b12857e08bd712e9c4ef300252fb6145335884dcae8ef867e562f0e4cb901f07c8a037eb7f03615d562";
+      sha512 = "6dd9fc8420093f8faf0eaafbb1cf4326360d610593fc8642e488a3850d9f94a249e27c89123eb3a25e476100b63fff1a88dc85f3e5714080ebc9078dc9309ca4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/gn/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/gn/firefox-55.0b2.tar.bz2";
       locale = "gn";
       arch = "linux-i686";
-      sha512 = "6be9a7cf4c3727aa603747476a2033b24be6e848ab2e5f8ea834fa07e96af05774b7a06d8e004be975f6ffd83ded606486a996d0b7132e7759f81da43bf5f003";
+      sha512 = "3badcdbd0642ac510cf978e978ea7a9fbd1d6a0de7ca541aa2eba16bd2b788b5616fbdaec06a3d29975c6b4fbe8894b6f38e2522a6495b4d8d1564efd4c2c656";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/gu-IN/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/gu-IN/firefox-55.0b2.tar.bz2";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha512 = "c97c4ac9a0359a040d07e3a62fe0200c7eb767d4f4748801241a0aeaed930761ea306dad1789c8c6cbbea75a90e55a4f00e04c450a528e8242a3821af803a19a";
+      sha512 = "85b254c78925a8f30798e37afe5e452c50bbdfdac683a16cb0407c8cdeb1a9dfc23be4f7bedd44c8f434d2d1b16b65603448e356e5d82ca41bd698bc275da80b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/he/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/he/firefox-55.0b2.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha512 = "27597aa4743b1bc4dfc8c26e79d5ccdccab812b576ed8d2a1d6cdd5c6971fffe00dd10f69fe13e00cb972ca78ddf47822485c1e053e81c179d2a187c9b46590b";
+      sha512 = "49c6aad468a893d77f9b158883095fa0429e4acc0a18aff2b284cc90036f11a04de9951a2fc18ba87ecf1d3fa6c55673e9e0e69428bce980638fc270356e11c3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/hi-IN/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/hi-IN/firefox-55.0b2.tar.bz2";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha512 = "5e9e484fded08a42b2499417327b2373e92d2321cc3550cec25e4f0462c7c4e22a1490c972f6b31c30776b858faf50345a03ee52c6a67e2e0da062837c07d245";
+      sha512 = "6f64ce83bfd5156c6fef02fbd0e7bac47f8a04848ba5da619c9809510b1f1eefba396c3c9f48ad6f9d0ee700e2b19a6edf1f0b104ec05bc798c22b8dd2b4a6e7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/hr/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/hr/firefox-55.0b2.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha512 = "44a49025664ff4e5fb34a5d8d02e1dd7dbe581b0aa5d014c2c9e9c052be9957bb04d6d9bfaa0aab15963b2eafda2f2e414fcabe826c73d9286923eb5e8ce1300";
+      sha512 = "0c4f520f2da27b1a5a59bfef7fc9648b9794bf0e4e471082f0527471bc824ce999ca668ac6cfe39566eee81cdcc66d5a09a15dc4aaa528345786288fc4ee4531";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/hsb/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/hsb/firefox-55.0b2.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha512 = "6a71f8e721270d1c450c19c627ed1212f56a7f4d1b3f3cfb5e72609c58f6e040d76aea4e57f8f15c912c5f35c7f7e91c604f2355b51551808399593548724b24";
+      sha512 = "b7753e082c93d169aa559bbb9314de29cedfb3bed336e9b2bf2f4514269fca3ffef52e5298322c9f5d354aea160bf0e1538cb51f570a2c29d504d398c6fbe262";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/hu/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/hu/firefox-55.0b2.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha512 = "8ac3c4c1b078daf9a671f22cb77f7bd056175b11d20606e710017b1cf564ed648264d3ce23c9e28ee507ff0c0f5bf78cf897a62df03c5ab5e25571c1c04d546f";
+      sha512 = "84642ded2af2d558cf93960af568cd224ebff05f13f26d4fca84425df14f6ea8ad3ff459df16b0f035f28697723a264d2f3ecf8121022ba9659ed47163faee7f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/hy-AM/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/hy-AM/firefox-55.0b2.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha512 = "6a97cc2fbbf92050d1055dc288ccd5346284ff6927b05aa0467bb369dfdb1a2b54c0b57f3356add342e1221c391a7d381d2fa895bb0aded5d82cb85071582a76";
+      sha512 = "fbb79684d496b4780bfeedd2d682fda002bd190f5148343d3f3720673d2dc26609fdafe402feb96093de0db960135293dada87218612bec562a6be2760514a77";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/id/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/id/firefox-55.0b2.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha512 = "19c32f612c53bf98bfc108f02adfd6345ba3d7c544d1ae93168f57d95e9360718fb57fffd8f205550417fb237639dc4e21e098f2a95bccf8598a11b464497a2a";
+      sha512 = "405635feea5949d6ef58632809fc69ade5f77f6dd19f0c190059698558c429f28f94fdf08612c0346ffac4e54bbe806dd6c01ebceb9202a4c7911f86ccb1f747";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/is/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/is/firefox-55.0b2.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha512 = "570c0832f57f46b398b6370a3f80439d3ea5bad1877af242f6c57b9a35f6bb148946b13475ef95c60a920cb51505887c09b6e2530fa2c802d09e4a1967847d1f";
+      sha512 = "5c6e9021355b7e9bf4d13db20d7bbb09dbcb94c4c8213e2aa313b6a451ace1bb394e31ded52d36ac80770b64bbd7b9cee93c7df233338a6ca9e4e5a8f0a8fa80";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/it/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/it/firefox-55.0b2.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha512 = "54e6f03f1e8473d407ac31267378eb5432ba7c366a309a646076ca2d02e342cc586ded7dbadc83117bd71a24d1654cfae63ee5b1b1ecda2cbafcdbca8009ab94";
+      sha512 = "2fc8eb314a9328cd91029aa28234acded5ee1318b2708fc167171f4ea8cbe25a87e0130ce3c13300fb15bc5e8d09ce504da9ea5ab46cb5b01498b083d067499a";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/ja/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ja/firefox-55.0b2.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha512 = "e73625a90586b9b845f9a2870838a3ac4f1b194fd04202b60d00805506102f65fd1ab69a3781e86f5db5580c881b7570c1d611c3933c271c43d32e15c3214db7";
+      sha512 = "5cd5fe41c714f9efcd7a0d4aef259c01ff4a3a0ac05ebfd6b011fb2984f1399803199f7f91703fb55e3e4cd8d0032bc6469065dade99a4290dc2af1109fce044";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/ka/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ka/firefox-55.0b2.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha512 = "72c070a815511e483eba416ba4172f6ad4d026f2469d1b2b0beaa07cb49f219275b7612e3eb39140601c7d9aa55b0fa687f768ed358a3245c1d467100b6c0cd5";
+      sha512 = "1e84b3d9fd78c884a125a18b003dd03834b6ffc8cffae93644bac3d78e6041cddb831ceda58d5d4d461e3fe900204d3916a917d5e5056e12684a8ec471df9d20";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/kab/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/kab/firefox-55.0b2.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha512 = "15a2566f74412625329444b2b95fa3c8d0873da9b40a0305b9d2add6a9494574e9350860e87ede63daed36f3347d617b0901aecfe7c3c20a8fe0e44e2117c085";
+      sha512 = "a650cdebc1c89f5f65d60f36449650ed36f9ab79b4e5bd084717f88c089312a105388bc6cf6cb6b05aaa05ef4168225ec1378d574f82b0c7ae2fcadd9ba549b6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/kk/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/kk/firefox-55.0b2.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha512 = "f56ffefb3278b3cf580fd6506a1d1b69fe5a693f259cf630a33f0fab8ec413fbb49f1dc118ff389ec513288f346cbebf379dd4c6da6475c740de3133e5b53130";
+      sha512 = "901a7f524fb6cab92a6f686ae2951ac4668b2373f0306572b4214b9dff76762e36372afb6d5eb319eafb0c1595a62a8020078938a650531dedf26e4951f7e519";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/km/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/km/firefox-55.0b2.tar.bz2";
       locale = "km";
       arch = "linux-i686";
-      sha512 = "bb26a6a7a90cd0925f0e809ae904e7d81f9bbdb5a0e56b084f5c5bf22647ea19ef8d445917a03d5924ae551affae375eb2706c83efc930e7027f0753db168638";
+      sha512 = "a86ad7c74e87ebe0e4885914a07e352349d353507708e79e37be2af57653f4778f0203b1d72580909a725aa696e8e8f491fc817237f553f526400aa47da0f03c";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/kn/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/kn/firefox-55.0b2.tar.bz2";
       locale = "kn";
       arch = "linux-i686";
-      sha512 = "b500573653885e3452aa4e05a4dbf7bc9631fc9751b62e23dea013fc4f845a4e370848b53b999d416552c44a176304187ec2333bb51b2c4231fb52b6fcf3d429";
+      sha512 = "6f8e697482ac61565c2030164ea08fb92803e91cbd3f562ba70f982b2db7c0d9effea7347acf3a4cdaa7c7cbe393a3455b4a7333957ac2ee707f5b542ecefabf";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/ko/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ko/firefox-55.0b2.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha512 = "51e6ff26f2721d8750e230aac93def8579c9fbf066413977c8c8216b435c77ee45e597864b778b2e79ba01dfc9e994578920a75e67269c379f767f662bafcdcc";
+      sha512 = "83a7ce342c38ee014142e60590d59e42373a38475a36f4c9e03dfd12890e4649e34a0ab5c3153c93ee9eeab9810c78ddb5332e4bd92c891c462e1df2a2305bfe";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/lij/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/lij/firefox-55.0b2.tar.bz2";
       locale = "lij";
       arch = "linux-i686";
-      sha512 = "8cbf424675d8289648d77b3a4b3b37150762647b08941ca7f78fc67e2a5d6a96e800985f8861d5515d6d5339008962066dd5bd5fb16a04789a9101a158fb6d4a";
+      sha512 = "8a8b686894ac4c211381e31e29d0020f43b11c92edf8158c89838e73713576e21e3d25349d8f3bfa1da3a9b232a1c058f6252af15e0f2181a77cc24fd046ef7e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/lt/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/lt/firefox-55.0b2.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha512 = "0344d94606aa384757bbfd07982762a66683cc27ea446c16ec3206fa2c0b299fab06462cc203a25cd0db5070e160daeda11047b2dcb8b4af2bcae130b6a1ed2e";
+      sha512 = "141f50e9bcb95e456204620f25e670ba3299b3cc06f86afe7bda652dc59745d09e9014737f70caf12c5f6a52c8b5f0777405969b92efe272a579d2eca817e22b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/lv/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/lv/firefox-55.0b2.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha512 = "8b80056b0d6897cca46fbcd3836096cfdc3c4824154b71837573eec75b5f4ee1d0e82cdf0dd1d73a651707aad7888d2413505154bffb0e56beabb379f5b96105";
+      sha512 = "c51ff24bf9ecf43e49064aede96d9487240e3a14bf5b6e61da1c83de01b5d5e974432e43b93d28fef0c473311f528cd06ea2d2a3fb09cc7a7e8fbbcc07c7e4f7";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/mai/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/mai/firefox-55.0b2.tar.bz2";
       locale = "mai";
       arch = "linux-i686";
-      sha512 = "365cc9a52dae47e9391c95dcd84230d0667816266e561b5a26dec8e21b1b82fa891acb851cfcc70a162a852d2ce21492701fa277d3fe98d6dcd6f3cad1c704f4";
+      sha512 = "2307008568c8140d7b90ff4dce3d4c6fa6bf5f1776d93fd7979b14ffc384916f15261f611dfd3c0e83e5d1e8980bff9c551ae9978ed16540a399f6cc7ff64c84";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/mk/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/mk/firefox-55.0b2.tar.bz2";
       locale = "mk";
       arch = "linux-i686";
-      sha512 = "2ee12219fcee798550da2dccebe800fc67b81a41ca7aa543d0a39cdc10fcc4db5d2503a9053fb2f46e76c34e3300a1c025aa87a639f74a2b14e8585487b7f949";
+      sha512 = "b6746b827a3c45e0f8a7bdf4423f63197ae728fe0bcaf0a6781e44fc42dc6c31cbe1e4ec4f1b97f96f1534550aa6921f453ad9732e62ea8fa0737a36a10e3479";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/ml/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ml/firefox-55.0b2.tar.bz2";
       locale = "ml";
       arch = "linux-i686";
-      sha512 = "38bab91c0e1019369f9aaf84abf145045810a3f89b1f437dd3851fc2267524f1b23daa0668f60740678ed659e5ae1990d2e6798944e7f81621cccfcce60b0da0";
+      sha512 = "7f1a44de725ba6ae31eb21e005fccf6434e7987acd8a480493fe872163ceb5d7052e9fed2475ce65ff487f0824b3a090c917b2a8119b4b9b47a3c6e5f7fc43a1";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/mr/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/mr/firefox-55.0b2.tar.bz2";
       locale = "mr";
       arch = "linux-i686";
-      sha512 = "011868a403e71693274139de118051dbd0d0c6771a5c780406672f373e5b7470183836bcc0c6aa67c3e9369d401e919def3d6889d0e1758ff2b5152a8f118bca";
+      sha512 = "e751aebda7834a0532fb0885da223316e19f4c0606a88b5a70956d0a72bf37069370d0478c2809400ac09f76822b34706d776f5ee6237b7b33ad4237ee4f7fd8";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/ms/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ms/firefox-55.0b2.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha512 = "d4a4891090b122f5ed2462c9c42f148f431c9b9eaad831698479ac1eb15ae41fa4355740f3fb44d7367a34e552c3313a44f43c76ebd2889990a546ba2ed5d61a";
+      sha512 = "ceaf89d467075799f95ebbf7b93bddf4c1961fead16fb86962bc857caf3ace620c42e2d11152b9cb2819f9a8a16625e5e276263ebe9066dba0840696a2a0a052";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/my/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/my/firefox-55.0b2.tar.bz2";
       locale = "my";
       arch = "linux-i686";
-      sha512 = "ec14ee7fdef28210a232fc7a0fa4ab3e891d1bf59be498a1842fae465b1ea8738bb6bf24297ffe8b77e043772be3c5a4bdfeea4ef13ace543b050a25418544ff";
+      sha512 = "d7d6ca947e04fc99d28abfa9d9fb07e85f4f71b71b381cda0c8587460c6274a860ae26b60432566ac9af25c752e8d5edbf8cda515cd523521958e2f3bae4cbe4";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/nb-NO/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/nb-NO/firefox-55.0b2.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha512 = "7cea11945a09933f75efb1385224f49ff08f395669ef3b6cab296b02ac2e597e9b424c6ff7c08180b0cd3763b2772a7c288e9cc9c42dbe27e1eb285d209a62d3";
+      sha512 = "4d5f7c260011e00a202c841f2ef103aa9fb6b6e329a51175656bf9cc3952664da5c0e90de571f9bb6c0886363e1988b8a81a8fe3ce0daddcd1ae284b68b8be34";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/nl/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/nl/firefox-55.0b2.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha512 = "25418b1377a9ed0a0389f5d4a04099197a2e364e7337368ca8c096f30b249a16d4988f3bdf941661f548bb7c478be5a74169dca9fd5d4800c56af5a6c93b9728";
+      sha512 = "994ee217f580dd8bf8eb06cea6f9ab509f7a430e8f74946d518465ec26b6b2d7c61e775374a9c1c3101c3a7c663326903226af0b585b01b40cd57151aa909a39";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/nn-NO/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/nn-NO/firefox-55.0b2.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha512 = "eaad38fae776a49f53448bd9e652f75299946b19839f440ba470afe5aa813c5e8230ce62388d923b411f662011c72cdc5d6a0c400024677b92183d13aa3af585";
+      sha512 = "ae39cb50182999233a46c6a5326ead7b5e2f363cfc10505f246d14e70fa52bab5f51804a03a7f20485b9761dbc4dfba3596feefe27e6026dc530646da0cc4b14";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/or/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/or/firefox-55.0b2.tar.bz2";
       locale = "or";
       arch = "linux-i686";
-      sha512 = "a055a1bba667fb338c55f015e5380fdea48bcb7a6311060412171a7dc573c76c087b74108d505b35b7738998516632df54143ddb5949946ffced477d408d3f99";
+      sha512 = "9b8346e09115651b58a2aca7a7ee2f4346155fbe6d77dda6c06f3a3e92ad4956ee5775dfcdd9c193a36a00407132aa2041311ba92e7b59c10cab287f8c8c4716";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/pa-IN/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/pa-IN/firefox-55.0b2.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha512 = "d93f23ac36daef173869ca9a0ab32d986b1acfeda96b2d277a6a555fda14f501c4f3c98f4dc8e77905098a0d20073e801f83e245b2654aa6c4e6519fd1ce3be1";
+      sha512 = "64bda267943ca748f6151498d477687bfe06f52110ef10e5bb2a744548878f3cbdbb5dd707bda4607c45e8ea1037981a2ced01143ffa596a3847792db4849371";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/pl/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/pl/firefox-55.0b2.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha512 = "586a4162866ba6f4b0851278cc987389aeb5f4f2582241fae9337cb00a62fd909348046f57492af9872e0a41f0e3167698f80cb7e37ef98a8dc7cb8c13fecd66";
+      sha512 = "dd38f64466c58cd4aee750d4489e598c0e934c6eb904ca8eccf1c2c1c092bb87af739a624f5f210e6c4ed25a6ac3dff233f13f1de5abf7a9bc831e02b4630f60";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/pt-BR/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/pt-BR/firefox-55.0b2.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha512 = "69ef7b9bc482bd073471383258b15e8bec77a4513502ae797bd1428e618525c8d2e037eca4ee957f6537ef4f3fd261d1a0e9c14d8597bd354652c482f315ab7f";
+      sha512 = "b1265e3274779c415db96c6a8c2518b159311d4f7aa638c030d90ec4169db70b6388df9b5c94fe31c4e41417cce2e65a227a6f6e9c47322a365fc6941d50e1e5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/pt-PT/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/pt-PT/firefox-55.0b2.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha512 = "ad7bb1f211b5167c3a091f832248ff14c5f9d197e7065bd962245f8c2e1e54c0835d148f63b2760fdfb2e6720f4ac3f64c6f154267b5fae29683bf9d88a7d232";
+      sha512 = "30e5d4ed87cc28fd51340d407e506b56fcda3cc23fc382d1c471af2c3b990222a5d2fb7b645373c1f067825df56875ec6c2f9bd7b2b259bcf0e466f5070bbb2e";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/rm/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/rm/firefox-55.0b2.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha512 = "e25b7a201fa2a77f6f8b9dbe815e59548c598218cab74919d726281e27a8cd4b1dce0a89beff79ac21ff0bcd5c1faea3f436acea5405dd1a899e66fb5a7a7754";
+      sha512 = "c3d31a0e8704bd7dbf6aab569aaba68df60489ee38001905f445849fc9bd1eb4666cfba8bef959a8559dd0dd9c16222429f64b398a55502b4d8dfd7fbc8d614d";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/ro/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ro/firefox-55.0b2.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha512 = "12419f032ccbc2a7bd54f1f04de77d5318531426b6ed0030076b52d4330037ca606f1319606831f485ab994d0bbeec50455a770b0448c24c1731e137f9cae51a";
+      sha512 = "d9833be482f828da584c2d30480230e5f79432bf3479f05b5be978d7068e11d76f07f697f85ab8c84b68f49e78593cd1a3fd9067b888f11657e96ca8a2dc3872";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/ru/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ru/firefox-55.0b2.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha512 = "79a76a1d54d4449031755a2298efeb60d94290f77a003263dea2d771975bcfd66a7a81e1eaab298f9c72eafc1cdf28060554a901a01bdf26ca8f39b1b927d375";
+      sha512 = "e1f1778d4e7d019f2a945a8c83338bd3af7b6db0277af921e869c6c94fa22579240570f6d7edbf5f42c28044b6537f724bd33719d4d7cbaedca77ca7e17dfc20";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/si/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/si/firefox-55.0b2.tar.bz2";
       locale = "si";
       arch = "linux-i686";
-      sha512 = "d93baf7dc43228f94f2e38e9884f37ac638f69fe367998b86c75f5cd735f012b408b270cc86a78b18f86ba344739baef22ee022dcb8397d83dd341e8da63be05";
+      sha512 = "63580c6e8820bdc3ea48dca090ab3ba2393d02051ce26905fc3097a36dd9e76efbd19b704145a0d3960a86d52462c7c58497591fbe50f6351e7d727871ec77c3";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/sk/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/sk/firefox-55.0b2.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha512 = "61e6388daa5f1ce30a313d2d93378bdd8119ae0c3d84b60f1b7caf5e78033e30602a808b0a1169d4017d581daab2e905dd03c202ef394ae765b083518b45a890";
+      sha512 = "9df80f36ecb8607613f30254aa8c3af5b6d417575c937dd6f428b5e62989ba9bf9237d7244b0ea598127ccd4bd2aa35db31a54412506022fbe4f2e65eb603d4b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/sl/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/sl/firefox-55.0b2.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha512 = "3d72f18632eb1142da5ea6b9423a7832b030d246af261cd46516810c721bc9024cc147cfd5fbc7c3cfbbd8fbf920b543d23c203325baaac024e726a040715809";
+      sha512 = "820cebffee19a05c2c03ab25b5c86ac7468989dd2a1118d3324dd7be5d3827675a791e3ec0b92ec32907fc585666b5b1050c81c5e16f57ffadc11da3b6de013b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/son/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/son/firefox-55.0b2.tar.bz2";
       locale = "son";
       arch = "linux-i686";
-      sha512 = "6a7a960468213dad0970e6793716aa4882f82c3dae1cc24c875190dcbd93953fe89a862d6141744d1cf7fafc6aae723c3d271094242b82d4fe76738aaaeeacd3";
+      sha512 = "b70dc6963e44a225254aa8b9487c40abd03ba1e1cb96cc2ab4a8b24908b26f5093bc715ae2dfc727257465ef8cd01bb5b15628a328a9cf5fd6b78b7f35771855";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/sq/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/sq/firefox-55.0b2.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha512 = "170b0ff5fcd665c50dd33cc05ef5ba79d4b6b7b66c04c0e679c294e03395aac07ff8b47b7178f2b7075aee4e42e9398e911c670671cdf15f1f1a465f57c95ef9";
+      sha512 = "ce2d445084c4db468e1a116fa9e4b741ff44ba994ebe5c575295bb6cd69cb72e5305b8a0326f7b43ee620a5e219279696b862ef512f3c4bfc32d3b6b2ab2321b";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/sr/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/sr/firefox-55.0b2.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha512 = "3f57ec3fe394f1a39bb4cf2f7017b52680d3d13b3147c6385edcf36885afdec0a0613919c27c276994fe30fd1f28b53ffdee99ed0701688b65cb6a0ce4ec6010";
+      sha512 = "4a5b4f4e8e9aa944d7dff5e1bc40f44141b04672666663c8c4a1b7844faf2289d3323427efec373f5f4fdc7ef5c79494dba416db8ced23b1a5f387b462d609b5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/sv-SE/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/sv-SE/firefox-55.0b2.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha512 = "021ecd06e900dfe961a527d7ac80e02d74cbe12daaa79db293b3c88d638fa46407523a5e80de193d6f9733954c8c309ec51337abf30c6f3679d54443c6f8247d";
+      sha512 = "56ca783a26d7c4c022001c72c96f02f79fc78bea625a73e3fb2be7602c96cb3753a718a184b7c1c5d154a755fdb4862a53137e4f8d1795345d6e5855cfe3faf5";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/ta/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ta/firefox-55.0b2.tar.bz2";
       locale = "ta";
       arch = "linux-i686";
-      sha512 = "f5d624139725c96dea05a2bed5430f004da09c5e6cde7e82226589889ed6a6bbf5cde458cda787463eb7a71366678213fb04ca75f05c10385d9ae7c3e2144f39";
+      sha512 = "9fe7f93308392fe970aeca2fa72fc7d709c592ebab1bbae768a511c6928c914c4679eadf3832f416dad9e23cadb241de6fba3345739b419d8118523b0c35aec9";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/te/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/te/firefox-55.0b2.tar.bz2";
       locale = "te";
       arch = "linux-i686";
-      sha512 = "d024a530ad5adffab0077644f119d0bd6fe538d9849ef2db4fedf0af299375de4b0035926041288957367d77ed868c85f95fba426e2c5d8a3021865d603204ff";
+      sha512 = "0d1333de541d617aa61741b03368c82ec8c76374741c086866d1d53832d97b9b0ad115d406914bed8061d348c0ea1bb5ce84a61e57596afd5ae318022b8f50b6";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/th/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/th/firefox-55.0b2.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha512 = "37e4be8ecff2e594778710c4ee1f779a4e53ccce4fe38644122850f55071f9be025346ac3efd74dd8d7789a6772638cfa6d0e32028025269a8b1de1c4c39127a";
+      sha512 = "cb607b0394cb81e6db0f52b080866fb26f4776d3f81ba9b040553fcb087817795049b4c12128b9c00bc17d9d0554dc428f680de531f80cadcf24fc3dc1f15a89";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/tr/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/tr/firefox-55.0b2.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha512 = "a7897a83625bd5b7d0121ea62bb97bd0e6f802e6e010d27ef2f535438c62a7aafbb91b0a1194571e9bd35a673aea1527949b5da0ddafb721c82662ecd1f8db59";
+      sha512 = "3549abe03ea546bbdb0c0837829c7c9402a2d791f1fecfd7d8b9f3a3c14f496c26f758096cef959f9f9e5538397526b8d500e4d97062363f6c370cb7b8ea2b95";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/uk/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/uk/firefox-55.0b2.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha512 = "a4f133b7184d8a80777b0032012007ef12edb3fc9ffece00774deea31836e0b4ff9d8f372454db3c2d9a167298e304055fe59488996a2f3fcfd93aef77715f8e";
+      sha512 = "f65108c24e28daa73d79d52bb2c58c0d590c6bee90f4a57202954d556ea04cb082ab61f588747bdbdd7d1c752272d83e47708bb5a2c7e346f6bbd5f1bc8e5746";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/ur/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/ur/firefox-55.0b2.tar.bz2";
       locale = "ur";
       arch = "linux-i686";
-      sha512 = "71d75174c843d68cb677676b318b2239b6f2e295b8014c13f2be5ef5d050d91182f5c60d95491e6e1afc25df98b431f6eee0b058607289baf14e28ea60716938";
+      sha512 = "f138ec6164a608d03d7873af6f4ee8fd51f553912c06841e41214b24890f232bb342c2c33df388a58a958d932ca803ac671f2daf139ceba4f46c8fe5cd038bf0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/uz/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/uz/firefox-55.0b2.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha512 = "fd317b715c9a2eaf995ab95293652f61984f63b47e487e7e0c4e226d65163ee26ef13725d29357beab6555015fae0a6bb9dd273996bcbc0d60463cfee9b2af0d";
+      sha512 = "7c427f89f4aa7462a2e3a35755c5dd82cfc5ced2d82fbfbfaf8804d152326d02e88fec8230d4905f89eaf27020f522c4096cdb844d38fbb0ef4c5c54c250745f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/vi/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/vi/firefox-55.0b2.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha512 = "a964992502ef7f2e32c9a525fdede156a5e9e0eb88224b9112541f706bb9162b5ba68dab049c99206b5afa3bf232489e8cf25149e012f42f9d299176e48ab990";
+      sha512 = "6bd2810d6683ff537aa47b97dd8e4778604a8aa58e7cd8f5a1aeea7cebdabc8f7111c025131ad6255428711a5a6ae69bd1118b3636f6f4ab3ce4022aef293de0";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/xh/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/xh/firefox-55.0b2.tar.bz2";
       locale = "xh";
       arch = "linux-i686";
-      sha512 = "ae4d335ceaa94e4b95a2fd6223d08087d20ddc666253bdbae17290f50fa0d425243aefab62d25362f2efee1dbf2abd7df4cf6acb5704ba487395e139060df6ef";
+      sha512 = "d23be8509fc11f3726efdcad75847390055e2d4d9fe775e9ea007290e21e9e9583dbe5a2a74dca0866f7d0cc2d3066f9afc4bb1e6665e94cb808b3e9f3250439";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/zh-CN/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/zh-CN/firefox-55.0b2.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha512 = "c4975f9645aa875df6d948d9f89a00a1758843b7ec706814b6632d5e2b5f8ef272f25ba48ba9ea0b4b00e41d5d2fb7094aa1c7e2d1dd8b5e0715c51adbdd6e6b";
+      sha512 = "42361dd8de84b011d860b0fd4a7f7ae59b3cd8297c57275283f61ecf51275e8263a67af9730e82251c1c9f19c5216b0e2d65adde5987c4dfa88f3f95eea8086f";
     }
-    { url = "http://archive.mozilla.org/pub/devedition/releases/54.0b14/linux-i686/zh-TW/firefox-54.0b14.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/devedition/releases/55.0b2/linux-i686/zh-TW/firefox-55.0b2.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha512 = "ce2050031406d912f6c812ed6b29a07d0c41c1569eb28a4e4280544ba286fa088967b16113181ef5d2be14e00ac84c89d0bfa9b4c25c700874d1b514493260cb";
+      sha512 = "44735872e5600fbfe03a5ecafc0f25b8f193572b067a8a18a598ea4972952747023a93c10727887e6f598922691bbf2bd90a76c8a966abc69ae946ab09aa0c81";
     }
     ];
 }

From ffa04893104debbc01a434e8cae6a26af4ab3fa4 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Mon, 19 Jun 2017 15:09:54 +0300
Subject: [PATCH 091/189] afl: 2.42b -> 2.43b

---
 pkgs/tools/security/afl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/afl/default.nix b/pkgs/tools/security/afl/default.nix
index 4fa200e5bbd..1d6307f807c 100644
--- a/pkgs/tools/security/afl/default.nix
+++ b/pkgs/tools/security/afl/default.nix
@@ -9,11 +9,11 @@ let
 in
 stdenv.mkDerivation rec {
   name    = "afl-${version}";
-  version = "2.42b";
+  version = "2.43b";
 
   src = fetchurl {
     url    = "http://lcamtuf.coredump.cx/afl/releases/${name}.tgz";
-    sha256 = "16ckgi4rh48rdmqcyxgabzcsmkfq77jjaghbxw9smkkm4sbx3yhk";
+    sha256 = "1jv2y9b53k3p8hngm78ikakhcf4vv3yyz6ip17jhg5gsis29gdwx";
   };
 
   # Note: libcgroup isn't needed for building, just for the afl-cgroup

From f19f6317ea1bc2d730bc8a80df08a8456a8bbf5a Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Mon, 19 Jun 2017 15:10:04 +0300
Subject: [PATCH 092/189] fio: 2.20 -> 2.21

---
 pkgs/tools/system/fio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix
index c4e0724dddc..3320f2abab3 100644
--- a/pkgs/tools/system/fio/default.nix
+++ b/pkgs/tools/system/fio/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub, libaio, python, zlib }:
 
 let
-  version = "2.20";
-  sha256 = "06sn9ll75xbr2rr7zn8xzdy1v705kqfxv6q1zx6ysvxwri0sxrfx";
+  version = "2.21";
+  sha256 = "0nvvnhmls9gbn093lzcgps1w8824ylgyz674af85768pw2bvczzy";
 in
 
 stdenv.mkDerivation rec {

From 31703358bd38845e5bcc47df3c564f0e132272c5 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Mon, 19 Jun 2017 15:10:13 +0300
Subject: [PATCH 093/189] yle-dl: 2.16 -> 2.17

---
 pkgs/tools/misc/yle-dl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/yle-dl/default.nix b/pkgs/tools/misc/yle-dl/default.nix
index 1de8f8c9a10..8da61ddc4af 100644
--- a/pkgs/tools/misc/yle-dl/default.nix
+++ b/pkgs/tools/misc/yle-dl/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "yle-dl-${version}";
-  version = "2.16";
+  version = "2.17";
 
   src = fetchFromGitHub {
     owner = "aajanki";
     repo = "yle-dl";
     rev = version;
-    sha256 = "1ahv7b3r52mvi2b5ji77l62hy543b6pdmq8hnd9xxvnxai463k35";
+    sha256 = "06szrcm1xlz6i736qkxzhhvrzg63shxzy2bww91bgxfccmkapa14";
   };
 
   patchPhase = ''

From 5446934b41cf180aa50c2fb69e12593720522036 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 19 Jun 2017 19:01:05 +0200
Subject: [PATCH 094/189] nix: 1.11.10 -> 1.11.11

(cherry picked from commit 7b1e936b24ca60810cdb6d46b68300cd179836f1)
---
 nixos/modules/installer/tools/nix-fallback-paths.nix | 6 +++---
 pkgs/tools/package-management/nix/default.nix        | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix
index 6ccc645a125..80241cd3ebe 100644
--- a/nixos/modules/installer/tools/nix-fallback-paths.nix
+++ b/nixos/modules/installer/tools/nix-fallback-paths.nix
@@ -1,5 +1,5 @@
 {
-  x86_64-linux = "/nix/store/qiiwjyc338xigks5wqyxn0nnqiwy7xav-nix-1.11.10";
-  i686-linux = "/nix/store/30fi96qqggjs51c5085y3fiws0a3wdcl-nix-1.11.10";
-  x86_64-darwin = "/nix/store/zs6msqwjgjr9v9kbs5s0sap7vhdw692z-nix-1.11.10";
+  x86_64-linux = "/nix/store/crqd5wmrqipl4n1fcm5kkc1zg4sj80js-nix-1.11.11";
+  i686-linux = "/nix/store/wsjn14xp5ja509d4dxb1c78zhirw0b5x-nix-1.11.11";
+  x86_64-darwin = "/nix/store/zqkqnhk85g2shxlpb04y72h1i3db3gpl-nix-1.11.11";
 }
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index bef203e588e..3aa18fad942 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -148,10 +148,10 @@ in rec {
   nix = nixStable;
 
   nixStable = (common rec {
-    name = "nix-1.11.10";
+    name = "nix-1.11.11";
     src = fetchurl {
       url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
-      sha256 = "b29a458c2b803bcc07d8b58cd016ca6ad0788a73ca74edaeaebc588961322467";
+      sha256 = "f5b9da21fb412e4c35b6e2bc771cfbf4ca44746be5d99868ff29d6e7604760e5";
     };
   }) // { perl-bindings = nixStable; };
 

From 10c2f39df0d94204bb9fe1197e2d7bce95a48657 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 19 Jun 2017 18:53:16 +0100
Subject: [PATCH 095/189] vimPlugins.vimwiki: readd

was remove accidentally removed in 425bc07d43
---
 pkgs/misc/vim-plugins/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index c871e422638..dbba9597ce7 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -2382,6 +2382,16 @@ rec {
 
   };
 
+  vimwiki = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vimwiki-2017-04-15";
+    src = fetchgit {
+      url = "git://github.com/vimwiki/vimwiki";
+      rev = "8cdc1c15388cc7f4edb827ff15dbc31d592a79af";
+      sha256 = "0hzmssyz7y7hv3mv67zkqwxc13crkpwv0plm7z701943h2zxj08h";
+    };
+    dependencies = [];
+  };
+
   vinegar = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vinegar-2017-05-23";
     src = fetchgit {

From cb6a99d878c34b9e805fd74a7f9d6459d048403b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 18 Jun 2017 16:24:25 +0200
Subject: [PATCH 096/189] haskell-test-framework-quickcheck2: force update to
 latest version

We need 0.3.0.4 to build successfully. LTS 8.x will catch up, eventually, but
until then we force the update.
---
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 493181ea16c..acee7acef24 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2067,7 +2067,7 @@ default-package-overrides:
   - test-fixture ==0.5.0.1
   - test-framework ==0.8.1.1
   - test-framework-hunit ==0.3.0.2
-  - test-framework-quickcheck2 ==0.3.0.3
+  - test-framework-quickcheck2 < 0.4
   - test-framework-smallcheck ==0.2
   - test-framework-th ==0.2.4
   - test-invariant ==0.4.5.0

From bb394afa2509fb730f00a8d9a888cf29f58e01a9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 18 Jun 2017 16:30:47 +0200
Subject: [PATCH 097/189] haskell-ghc-syb-utils: force update to latest version

We need 0.2.3.2 to build successfully. LTS 8.x will catch up, eventually, but
until then we force the update.

Closes https://github.com/NixOS/nixpkgs/issues/26689.
---
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index acee7acef24..80b70b9fad3 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -740,7 +740,7 @@ default-package-overrides:
   - ghc-mod ==5.7.0.0
   - ghc-paths ==0.1.0.9
   - ghc-prof ==1.3.0.2
-  - ghc-syb-utils ==0.2.3.1
+  - ghc-syb-utils < 0.3
   - ghc-tcplugins-extra ==0.2
   - ghc-typelits-extra ==0.2.3
   - ghc-typelits-knownnat ==0.2.4

From 534a8efe170215aeb840c7e840d184de5d1b5e28 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 18 Jun 2017 15:12:26 +0200
Subject: [PATCH 098/189] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.2.1-11-gb2cb3cb from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/da66240a000524241e8b6bc53fb83e2740ac01ea.
---
 .../haskell-modules/hackage-packages.nix      | 1429 ++++++++++++++---
 1 file changed, 1195 insertions(+), 234 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index a384a682757..3ad53530c40 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -2978,21 +2978,18 @@ self: {
      }) {};
 
   "ConcurrentUtils" = callPackage
-    ({ mkDerivation, array, base, binary, bytestring, containers
-     , crypto-random, cryptohash, list-extras, MonadRandom, monads-tf
-     , network, parallel, process, reexport-crypto-random, RSA
-     , securemem, tagged
+    ({ mkDerivation, array, arrows, base, containers, hashable
+     , hashtables, list-extras, monad-loops, MonadRandom, monads-tf
+     , parallel, stm, strict, tagged, ttrie
      }:
      mkDerivation {
        pname = "ConcurrentUtils";
-       version = "0.4.4.0";
-       sha256 = "1zvh3y5mph98l696sgabwqia4cq176dfkhswl28cz6h6blrjv5dz";
+       version = "0.4.5.0";
+       sha256 = "1kf5g4d8q28hs4wfd0fvc7k1bfir40z7rzx3lxflci36inr1d6dc";
        libraryHaskellDepends = [
-         array base binary bytestring containers crypto-random cryptohash
-         list-extras MonadRandom monads-tf network parallel process
-         reexport-crypto-random RSA securemem tagged
+         array arrows base containers hashable hashtables list-extras
+         monad-loops MonadRandom monads-tf parallel stm strict tagged ttrie
        ];
-       homepage = "http://alkalisoftware.net";
        description = "Concurrent utilities";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -10521,6 +10518,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "JuicyPixels_3_2_8_2" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, deepseq, mtl
+     , primitive, transformers, vector, zlib
+     }:
+     mkDerivation {
+       pname = "JuicyPixels";
+       version = "3.2.8.2";
+       sha256 = "1s3qakm7jn2kjx59nlp81hkysz6bxidj3khd8xlny7x8gvjqjk5p";
+       libraryHaskellDepends = [
+         base binary bytestring containers deepseq mtl primitive
+         transformers vector zlib
+       ];
+       homepage = "https://github.com/Twinside/Juicy.Pixels";
+       description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "JuicyPixels-canvas" = callPackage
     ({ mkDerivation, base, containers, JuicyPixels }:
      mkDerivation {
@@ -13331,6 +13346,8 @@ self: {
        pname = "Only";
        version = "0.1";
        sha256 = "0rdj3a629fk2vp121jq8mf2smkblrz5w3cxhlsyx6my2x29s2ymb";
+       revision = "1";
+       editedCabalFile = "1ahk7p34kmh041mz7lyc10nhcxgv2i4z8nvzxvqm2x34gslmsbzr";
        libraryHaskellDepends = [ base deepseq ];
        description = "The 1-tuple type or single-value \"collection\"";
        license = stdenv.lib.licenses.bsd3;
@@ -15682,6 +15699,8 @@ self: {
        pname = "STMonadTrans";
        version = "0.4.3";
        sha256 = "1nr26fnmi5fdjc6d00w13kjhmfyvb5b837d0006w4dj0yxndaksp";
+       revision = "1";
+       editedCabalFile = "09kqrv9a4yhsdpix49h9qjw0j2fhxrgkjnfrnyxg1nspmqrvl50m";
        libraryHaskellDepends = [ array base mtl ];
        testHaskellDepends = [ array base Cabal mtl ];
        description = "A monad transformer version of the ST monad";
@@ -16529,6 +16548,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Spintax_0_3_2" = callPackage
+    ({ mkDerivation, attoparsec, base, extra, mtl, mwc-random, text }:
+     mkDerivation {
+       pname = "Spintax";
+       version = "0.3.2";
+       sha256 = "0j7hkdskc66h02yxrw6aah1drqrwxdhq9c33w5mg0rg0gj0j1rpp";
+       libraryHaskellDepends = [
+         attoparsec base extra mtl mwc-random text
+       ];
+       homepage = "https://github.com/MichelBoucey/spintax";
+       description = "Random text generation based on spintax";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "Spock" = callPackage
     ({ mkDerivation, base, base64-bytestring, bytestring, containers
      , cryptonite, focus, hashable, hspec, hspec-wai, http-types, hvect
@@ -36336,6 +36370,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "burnt-explorer" = callPackage
+    ({ mkDerivation, aeson, base, bitcoin-script, bytestring, process
+     , scientific
+     }:
+     mkDerivation {
+       pname = "burnt-explorer";
+       version = "0.1.1";
+       sha256 = "1swv8xy06bk3wkhg788mzlpgwghyp7v3g3c22c09jji9kxwsgslv";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         aeson base bitcoin-script bytestring process scientific
+       ];
+       homepage = "https://gitlab.com/KrzysiekJ/burnt-explorer";
+       description = "List OP_RETURN cryptocurrency transaction outputs";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "burst-detection" = callPackage
     ({ mkDerivation, base, criterion, deepseq }:
      mkDerivation {
@@ -39745,6 +39797,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "cassava_0_5_0_0" = callPackage
+    ({ mkDerivation, array, attoparsec, base, bytestring
+     , bytestring-builder, containers, deepseq, hashable, HUnit, Only
+     , QuickCheck, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "cassava";
+       version = "0.5.0.0";
+       sha256 = "1fdydyl2qn8qgjcrdij3gff13zwzp2fqmr3a8g0j35qfhq4lnzl4";
+       libraryHaskellDepends = [
+         array attoparsec base bytestring bytestring-builder containers
+         deepseq hashable Only text unordered-containers vector
+       ];
+       testHaskellDepends = [
+         attoparsec base bytestring hashable HUnit QuickCheck test-framework
+         test-framework-hunit test-framework-quickcheck2 text
+         unordered-containers vector
+       ];
+       homepage = "https://github.com/hvr/cassava";
+       description = "A CSV parsing and encoding library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cassava-conduit" = callPackage
     ({ mkDerivation, array, base, bifunctors, bytestring, cassava
      , conduit, conduit-extra, containers, criterion, mtl, QuickCheck
@@ -42423,6 +42500,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "clay_0_12_2" = callPackage
+    ({ mkDerivation, base, hspec, hspec-expectations, mtl, text }:
+     mkDerivation {
+       pname = "clay";
+       version = "0.12.2";
+       sha256 = "12p9hrky0dynsraz46ddhr4ah5aw9kragvcd5xza7j388ni9b2za";
+       libraryHaskellDepends = [ base mtl text ];
+       testHaskellDepends = [ base hspec hspec-expectations mtl text ];
+       homepage = "http://fvisser.nl/clay";
+       description = "CSS preprocessor as embedded Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "clckwrks" = callPackage
     ({ mkDerivation, acid-state, aeson, aeson-qq, attoparsec, base
      , blaze-html, bytestring, cereal, containers, directory, filepath
@@ -43751,20 +43842,21 @@ self: {
 
   "codecov-haskell" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, cmdargs
-     , containers, curl, hpc, HUnit, process, regex-posix, safe, split
+     , containers, curl, hpc, HUnit, process, regex-posix, retry, safe
+     , split
      }:
      mkDerivation {
        pname = "codecov-haskell";
-       version = "0.4.0.2";
-       sha256 = "0y1vv9iayjvikjfp4y41m4gypybxd1lq3pv4154nvbjpfapmndsw";
+       version = "0.5.0";
+       sha256 = "0g9m1z4qpjgyav8wa10cxdprsgf0b5ij430ql7jyw4sj20warhfg";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base bytestring cmdargs containers curl hpc safe split
+         aeson base bytestring cmdargs containers curl hpc retry safe split
        ];
        executableHaskellDepends = [
          aeson async base bytestring cmdargs containers curl hpc process
-         regex-posix safe split
+         regex-posix retry safe split
        ];
        testHaskellDepends = [ base HUnit ];
        homepage = "https://github.com/guillaume-nargeot/codecov-haskell";
@@ -47718,8 +47810,8 @@ self: {
      }:
      mkDerivation {
        pname = "core-compiler";
-       version = "0.1.0.0";
-       sha256 = "0bh7z1mbg299xk07ms6d6n3n3q8yz7i4if2r1x0zhp12cf139zh6";
+       version = "0.1.0.1";
+       sha256 = "0qyrqarqf35z9kp2znaq3qvfpkjlvyahkvarr1jhl2z12alfvzns";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -55240,23 +55332,23 @@ self: {
      }) {};
 
   "dhall" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, bytestring, charset
-     , containers, http-client, http-client-tls, lens
+    ({ mkDerivation, ansi-wl-pprint, base, bytestring, case-insensitive
+     , charset, containers, http-client, http-client-tls, lens
      , neat-interpolation, optparse-generic, parsers, system-fileio
      , system-filepath, tasty, tasty-hunit, text, text-format
      , transformers, trifecta, unordered-containers, vector
      }:
      mkDerivation {
        pname = "dhall";
-       version = "1.3.0";
-       sha256 = "1d34qx1nq49r0phdq10cvzdx9d82169xi03yq829pqnyxwc03ws4";
+       version = "1.4.2";
+       sha256 = "0wnfqm0478h9fqav13q6fqnj8fzbhigsndnasr0hbcjd3s3qvf0d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         ansi-wl-pprint base bytestring charset containers http-client
-         http-client-tls lens neat-interpolation parsers system-fileio
-         system-filepath text text-format transformers trifecta
-         unordered-containers vector
+         ansi-wl-pprint base bytestring case-insensitive charset containers
+         http-client http-client-tls lens neat-interpolation parsers
+         system-fileio system-filepath text text-format transformers
+         trifecta unordered-containers vector
        ];
        executableHaskellDepends = [ base optparse-generic text trifecta ];
        testHaskellDepends = [
@@ -55273,8 +55365,8 @@ self: {
      }:
      mkDerivation {
        pname = "dhall-bash";
-       version = "1.0.1";
-       sha256 = "1944g78k66hpqgmr5pw6w6jigcyjmfhczgz07l157vv98v5fwqab";
+       version = "1.0.2";
+       sha256 = "19nzf0wh7z3xjpkn48dmi66hqayjscwi3r2w0nkxpkwrcfagrkw2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -55313,8 +55405,8 @@ self: {
      }:
      mkDerivation {
        pname = "dhall-json";
-       version = "1.0.2";
-       sha256 = "1si2ishkam9l8brz02wvczxd10532m7nqflnlb7hwkc84javyvm1";
+       version = "1.0.3";
+       sha256 = "1q3b3vcvkpz5b79xcdh66p0vqqvjlnd52pvdanlf7vp819n2zsdy";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -55333,8 +55425,8 @@ self: {
      }:
      mkDerivation {
        pname = "dhall-nix";
-       version = "1.0.3";
-       sha256 = "14h0sszkkzxhzvi6r6jva2rinayd20b1cb8ybjbbpph7b103ph90";
+       version = "1.0.4";
+       sha256 = "19sv7n3fn7vkrclmcbjn141ypxi4ja78ahlndnmci6vbv40hm2vf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -55347,6 +55439,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "dhall-text" = callPackage
+    ({ mkDerivation, base, dhall, optparse-generic, text }:
+     mkDerivation {
+       pname = "dhall-text";
+       version = "1.0.0";
+       sha256 = "1xbgzvmxd9y1f58nh9a495rqn3s7yfq93l61by5g9sd81vvbcgqd";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [ base dhall optparse-generic text ];
+       description = "Template text using Dhall";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "dhcp-lease-parser" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, chronos, ip, tasty
      , tasty-hunit, text
@@ -56942,31 +57047,75 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "discord-gateway" = callPackage
+    ({ mkDerivation, aeson, base, discord-types, hslogger, transformers
+     , url, websockets, wuss
+     }:
+     mkDerivation {
+       pname = "discord-gateway";
+       version = "0.2.2";
+       sha256 = "1pc8j2pqrpmgvf31kx24gwj6n96npxdjj6mjf2w9wzh500rdrrzy";
+       libraryHaskellDepends = [
+         aeson base discord-types hslogger transformers url websockets wuss
+       ];
+       homepage = "https://github.com/jano017/Discord.hs";
+       description = "An API wrapper for Discord in Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "discord-hs" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, case-insensitive, comonad
-     , containers, data-default, hakyll, hashable, hslogger, http-client
-     , mmorph, mtl, pipes, req, split, stm, stm-conduit, text, time
-     , transformers, unordered-containers, url, vector, websockets, wuss
+    ({ mkDerivation, base, discord-gateway, discord-rest, discord-types
+     , hashable, mtl, url, websockets
      }:
      mkDerivation {
        pname = "discord-hs";
-       version = "0.3.2";
-       sha256 = "1y2nir530gaal4nxxax86z33bb7d2rlavdx47dff5s5lqn06kc1f";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.4.2";
+       sha256 = "0lv299wn7jisgavmcpm2h7vf9dalz5dmi6j8qvlbbiyqg1c0jn2a";
        libraryHaskellDepends = [
-         aeson base bytestring case-insensitive comonad containers
-         data-default hashable hslogger http-client mmorph mtl pipes req stm
-         stm-conduit text time transformers unordered-containers url vector
-         websockets wuss
+         base discord-gateway discord-rest discord-types hashable mtl url
+         websockets
        ];
-       executableHaskellDepends = [ base hakyll split ];
        homepage = "https://github.com/jano017/Discord.hs";
        description = "An API wrapper for Discord in Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "discord-rest" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, comonad, data-default
+     , discord-types, hashable, hslogger, http-client, mtl, req, stm
+     , text, time, url
+     }:
+     mkDerivation {
+       pname = "discord-rest";
+       version = "0.2.2";
+       sha256 = "02sg05zf2m83d6hq5z51cjvw7ycarrmwx9y00c71wiw3hvb84fb3";
+       libraryHaskellDepends = [
+         aeson base bytestring comonad data-default discord-types hashable
+         hslogger http-client mtl req stm text time url
+       ];
+       homepage = "https://github.com/jano017/Discord.hs";
+       description = "An API wrapper for Discord in Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "discord-types" = callPackage
+    ({ mkDerivation, aeson, base, hashable, text, time, transformers
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "discord-types";
+       version = "0.2.2";
+       sha256 = "12smb4z6mrj9hhk7jc9r2cz6p4lcix2016ahwp9qapklrql539sc";
+       libraryHaskellDepends = [
+         aeson base hashable text time transformers unordered-containers
+         vector
+       ];
+       homepage = "https://github.com/jano017/Discord.hs";
+       description = "Type information for discord-hs";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "discordian-calendar" = callPackage
     ({ mkDerivation, base, time }:
      mkDerivation {
@@ -63019,14 +63168,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "errors_2_2_0" = callPackage
+  "errors_2_2_1" = callPackage
     ({ mkDerivation, base, exceptions, safe, text, transformers
      , transformers-compat, unexceptionalio
      }:
      mkDerivation {
        pname = "errors";
-       version = "2.2.0";
-       sha256 = "0z31r5pq8xbfkdwibf0r51fdw4jz11jxrql3hi6xrmsh37lwk8gx";
+       version = "2.2.1";
+       sha256 = "0cgmalid229snvn788sk2w16bqgfzgwc4ir2p60jvwqbj63yp5s1";
        libraryHaskellDepends = [
          base exceptions safe text transformers transformers-compat
          unexceptionalio
@@ -65044,19 +65193,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "extra_1_5_3" = callPackage
+  "extra_1_6" = callPackage
     ({ mkDerivation, base, clock, directory, filepath, process
      , QuickCheck, time, unix
      }:
      mkDerivation {
        pname = "extra";
-       version = "1.5.3";
-       sha256 = "0w4csmpzj88vkgyngyw4i91f9hfali50xqrqyycr4jh0qyq5sjx4";
+       version = "1.6";
+       sha256 = "1pqlggdbbhfj71yaby5595shf4hpzv9700sczksgy36qz9bfcrh7";
        libraryHaskellDepends = [
          base clock directory filepath process time unix
        ];
        testHaskellDepends = [
-         base clock directory filepath QuickCheck time unix
+         base clock directory filepath QuickCheck unix
        ];
        homepage = "https://github.com/ndmitchell/extra#readme";
        description = "Extra functions I use";
@@ -68393,8 +68542,8 @@ self: {
      }:
      mkDerivation {
        pname = "fltkhs";
-       version = "0.5.2.6";
-       sha256 = "1krjwrwhfjyp80anb8y79a5rgfcs3qdlw6mgwdid5hfpddjbc1nd";
+       version = "0.5.2.7";
+       sha256 = "03x9322rqafviaxfwkiq2g1jlsqh6hw6q4x9ywa6pi7s45d2rm78";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal directory filepath ];
@@ -69506,14 +69655,14 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "foundation_0_0_11" = callPackage
+  "foundation_0_0_12" = callPackage
     ({ mkDerivation, base, criterion, ghc-prim, mtl, QuickCheck, tasty
      , tasty-hunit, tasty-quickcheck
      }:
      mkDerivation {
        pname = "foundation";
-       version = "0.0.11";
-       sha256 = "0jgxcr532vb7376h43l88g0rjgbil2caqnknmznfsprawy6a9s1v";
+       version = "0.0.12";
+       sha256 = "1dlrknx0rhi1vjiw8pb25n5ml5rfahhhvwj64svdg51zm3m3aiyr";
        libraryHaskellDepends = [ base ghc-prim ];
        testHaskellDepends = [
          base mtl QuickCheck tasty tasty-hunit tasty-quickcheck
@@ -70625,6 +70774,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "fswait" = callPackage
+    ({ mkDerivation, base, hinotify, optparse-applicative
+     , optparse-generic, semigroups, stm, system-filepath, text
+     , time-units, turtle
+     }:
+     mkDerivation {
+       pname = "fswait";
+       version = "1.0.0";
+       sha256 = "0w29f6qwks54zxi8x9wd9s4k5ryb6fz9flip9clm4l53vkx1s3b0";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base hinotify optparse-applicative optparse-generic semigroups stm
+         system-filepath text time-units turtle
+       ];
+       homepage = "https://github.com/ixmatus/fswait";
+       description = "Wait and observe events on the filesystem for a path, with a timeout";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "fswatcher" = callPackage
     ({ mkDerivation, base, directory, fsnotify, optparse-applicative
      , process, regex-pcre-builtin, system-filepath, unix
@@ -73843,19 +74012,6 @@ self: {
      }) {};
 
   "ghc-syb-utils" = callPackage
-    ({ mkDerivation, base, directory, filepath, ghc, ghc-paths, syb }:
-     mkDerivation {
-       pname = "ghc-syb-utils";
-       version = "0.2.3.1";
-       sha256 = "13gazr6ydlxrj5yfg9pqhrgm7az9a36m7cfxmmvv1hkq2plfgw7y";
-       libraryHaskellDepends = [ base ghc syb ];
-       testHaskellDepends = [ base directory filepath ghc ghc-paths ];
-       homepage = "http://github.com/nominolo/ghc-syb";
-       description = "Scrap Your Boilerplate utilities for the GHC API";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ghc-syb-utils_0_2_3_2" = callPackage
     ({ mkDerivation, base, directory, filepath, ghc, ghc-paths, syb }:
      mkDerivation {
        pname = "ghc-syb-utils";
@@ -73866,7 +74022,6 @@ self: {
        homepage = "http://github.com/nominolo/ghc-syb";
        description = "Scrap Your Boilerplate utilities for the GHC API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-tcplugins-extra" = callPackage
@@ -74929,8 +75084,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-ostree";
-       version = "1.0.2";
-       sha256 = "0x9scavp8pbmky70j8c9l8khp2r33517fq1w38cp4la18ba5dqv8";
+       version = "1.0.3";
+       sha256 = "0b9x7w6v8w62wbvwc2p3fk5q2mar7db9ch1a0idf8s667jhmzdfj";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
          base bytestring containers gi-gio gi-glib gi-gobject haskell-gi
@@ -85091,6 +85246,50 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) utillinux;};
 
+  "hakyll_4_9_8_0" = callPackage
+    ({ mkDerivation, base, binary, blaze-html, blaze-markup, bytestring
+     , containers, cryptohash, data-default, deepseq, directory
+     , filepath, fsnotify, http-conduit, http-types, lrucache, mtl
+     , network, network-uri, optparse-applicative, pandoc
+     , pandoc-citeproc, parsec, process, QuickCheck, random, regex-base
+     , regex-tdfa, resourcet, scientific, system-filepath, tagsoup
+     , tasty, tasty-hunit, tasty-quickcheck, text, time
+     , time-locale-compat, unordered-containers, utillinux, vector, wai
+     , wai-app-static, warp, yaml
+     }:
+     mkDerivation {
+       pname = "hakyll";
+       version = "4.9.8.0";
+       sha256 = "0jjy1j79vzkdpi2ksql5bzwv2bw3bk6h0jgi73ngj8lkrm6q80b3";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base binary blaze-html blaze-markup bytestring containers
+         cryptohash data-default deepseq directory filepath fsnotify
+         http-conduit http-types lrucache mtl network network-uri
+         optparse-applicative pandoc pandoc-citeproc parsec process random
+         regex-base regex-tdfa resourcet scientific system-filepath tagsoup
+         text time time-locale-compat unordered-containers vector wai
+         wai-app-static warp yaml
+       ];
+       executableHaskellDepends = [ base directory filepath ];
+       testHaskellDepends = [
+         base binary blaze-html blaze-markup bytestring containers
+         cryptohash data-default deepseq directory filepath fsnotify
+         http-conduit http-types lrucache mtl network network-uri
+         optparse-applicative pandoc pandoc-citeproc parsec process
+         QuickCheck random regex-base regex-tdfa resourcet scientific
+         system-filepath tagsoup tasty tasty-hunit tasty-quickcheck text
+         time time-locale-compat unordered-containers vector wai
+         wai-app-static warp yaml
+       ];
+       testToolDepends = [ utillinux ];
+       homepage = "http://jaspervdj.be/hakyll";
+       description = "A static website compiler library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) utillinux;};
+
   "hakyll-R" = callPackage
     ({ mkDerivation, base, directory, filepath, hakyll, pandoc, process
      }:
@@ -93824,20 +94023,22 @@ self: {
      }) {};
 
   "hfmt" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, Cabal, Diff, directory
-     , filepath, haskell-src-exts, hindent, hlint, HUnit
-     , optparse-applicative, pipes, pretty, stylish-haskell
-     , test-framework, test-framework-hunit, text
+    ({ mkDerivation, ansi-wl-pprint, base, bytestring, Cabal, Diff
+     , directory, exceptions, filepath, haskell-src-exts, hindent, hlint
+     , HUnit, optparse-applicative, path, path-io, pipes, pretty
+     , stylish-haskell, test-framework, test-framework-hunit, text
+     , transformers, yaml
      }:
      mkDerivation {
        pname = "hfmt";
-       version = "0.0.2.3";
-       sha256 = "165s5azjq08f50s247xbx891iyq4s2mxygxknc5cxkkfj8gxgki2";
+       version = "0.1.0";
+       sha256 = "13dcywy7i9r8silc6rpm6pqj3zs2cq2zqzpz015563rkbwmi42zy";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base Cabal directory filepath haskell-src-exts hindent hlint HUnit
-         pipes stylish-haskell text
+         base bytestring Cabal directory exceptions filepath
+         haskell-src-exts hindent hlint HUnit path path-io pipes
+         stylish-haskell text transformers yaml
        ];
        executableHaskellDepends = [
          ansi-wl-pprint base Diff optparse-applicative pipes pretty
@@ -95994,8 +96195,8 @@ self: {
        pname = "hledger-ui";
        version = "1.2";
        sha256 = "02mhhhkk6zz3bjcv6x0yhp4f2ifhj3pdk1z4wf6qkwm7jqsamqk1";
-       revision = "1";
-       editedCabalFile = "0ryr7rwf4bc9biwdpn3mjm82jlsr91773a7wsr0xw765mvgxvzbf";
+       revision = "2";
+       editedCabalFile = "0w3w4llvb9fmdd555q4823dagw7ibqwas8cycra5pvw50ciia4xd";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -97942,6 +98143,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hopfli_0_2_2_1" = callPackage
+    ({ mkDerivation, base, bytestring, hspec, QuickCheck, zlib }:
+     mkDerivation {
+       pname = "hopfli";
+       version = "0.2.2.1";
+       sha256 = "061as7aa806xzcpch35isrkqbgqhwdy48fs049f491wwb47xqwad";
+       libraryHaskellDepends = [ base bytestring zlib ];
+       testHaskellDepends = [ base bytestring hspec QuickCheck zlib ];
+       homepage = "https://github.com/ananthakumaran/hopfli";
+       description = "Bidings to Google's Zopfli compression library";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hoppy-docs" = callPackage
     ({ mkDerivation, base, haskell-src, hoppy-generator, hoppy-runtime
      }:
@@ -102020,6 +102235,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hspec-pg-transact" = callPackage
+    ({ mkDerivation, base, bytestring, hspec, pg-transact
+     , postgresql-simple, resource-pool, text, tmp-postgres
+     }:
+     mkDerivation {
+       pname = "hspec-pg-transact";
+       version = "0.1.0.2";
+       sha256 = "030wy3ajlfd7pi6gwfn6xcsl2yi0gvznxl8m7kq001bkiabjmv55";
+       libraryHaskellDepends = [
+         base bytestring hspec pg-transact postgresql-simple resource-pool
+         text tmp-postgres
+       ];
+       homepage = "https://github.com/jfischoff/pg-transact-hspec#readme";
+       description = "Helpers for creating database tests with hspec and pg-transact";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hspec-server" = callPackage
     ({ mkDerivation, base, containers, hspec, hspec-contrib, hspec-core
      , hspec-expectations, HUnit, process, regex-posix, temporary
@@ -103836,6 +104068,30 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "http-client-tls_0_3_5_1" = callPackage
+    ({ mkDerivation, base, bytestring, case-insensitive, connection
+     , containers, criterion, cryptonite, data-default-class, exceptions
+     , hspec, http-client, http-types, memory, network, network-uri
+     , text, tls, transformers
+     }:
+     mkDerivation {
+       pname = "http-client-tls";
+       version = "0.3.5.1";
+       sha256 = "0n4mi8z77qaggfyq17z79cl304nf1f4h6gag60v4wjwghvmj7yn1";
+       libraryHaskellDepends = [
+         base bytestring case-insensitive connection containers cryptonite
+         data-default-class exceptions http-client http-types memory network
+         network-uri text tls transformers
+       ];
+       testHaskellDepends = [ base hspec http-client http-types ];
+       benchmarkHaskellDepends = [ base criterion http-client ];
+       doCheck = false;
+       homepage = "https://github.com/snoyberg/http-client";
+       description = "http-client backend using the connection package and tls library";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "http-common" = callPackage
     ({ mkDerivation, base, base64-bytestring, blaze-builder, bytestring
      , case-insensitive, directory, mtl, network, text, transformers
@@ -105040,17 +105296,19 @@ self: {
      }) {};
 
   "hurriyet" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, hspec, http-client
-     , http-client-tls, text
+    ({ mkDerivation, aeson, base, bytestring, containers, here, hspec
+     , http-client, http-client-tls, mtl, text
      }:
      mkDerivation {
        pname = "hurriyet";
-       version = "0.1.0.0";
-       sha256 = "07hklxgf6308a81p0myykn6hn4p2rn1zyxypjld3q3l7pcdhsn7d";
+       version = "0.2.0.0";
+       sha256 = "1czdal0dxic0gw5qjp29jcbq8z0syffgrfmdqcg579y37ah1hgqg";
        libraryHaskellDepends = [
-         aeson base bytestring http-client http-client-tls text
+         aeson base bytestring http-client http-client-tls mtl text
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers here hspec text
        ];
-       testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/yigitozkavci/hurriyet-haskell";
        description = "Haskell bindings for Hurriyet API";
        license = stdenv.lib.licenses.bsd3;
@@ -108541,6 +108799,27 @@ self: {
        license = "GPL";
      }) {};
 
+  "incremental-parser_0_2_5_1" = callPackage
+    ({ mkDerivation, base, bytestring, checkers, criterion, deepseq
+     , monoid-subclasses, QuickCheck, tasty, tasty-quickcheck, text
+     }:
+     mkDerivation {
+       pname = "incremental-parser";
+       version = "0.2.5.1";
+       sha256 = "1kdrpwnj3sbil0mhmqspi2jbh1pibrzaybyijcknvvvm5ldrgafz";
+       libraryHaskellDepends = [ base monoid-subclasses ];
+       testHaskellDepends = [
+         base checkers monoid-subclasses QuickCheck tasty tasty-quickcheck
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion deepseq monoid-subclasses text
+       ];
+       homepage = "https://github.com/blamario/incremental-parser";
+       description = "Generic parser library capable of providing partial results from partial input";
+       license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "incremental-sat-solver" = callPackage
     ({ mkDerivation, base, containers, mtl }:
      mkDerivation {
@@ -108928,8 +109207,8 @@ self: {
      }:
      mkDerivation {
        pname = "influxdb";
-       version = "1.1.2.2";
-       sha256 = "038031446gpby3s805j1imffriwfq35jvkmd7z8gjnz5x5xciz9b";
+       version = "1.2.1";
+       sha256 = "0sgc29kiflgq0b3h1irnnim1ih6sk8h309yk1xd3z9hwyd9c121w";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -109964,15 +110243,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "intro_0_3_0_0" = callPackage
+  "intro_0_3_0_1" = callPackage
     ({ mkDerivation, base, bifunctors, binary, bytestring, containers
      , deepseq, dlist, extra, hashable, lens, mtl, QuickCheck, safe
      , text, transformers, unordered-containers, writer-cps-mtl
      }:
      mkDerivation {
        pname = "intro";
-       version = "0.3.0.0";
-       sha256 = "0jhy1s8pivswmb4cbcgbn1wxpb306x5lg87caxy6v9d3s0vhqh54";
+       version = "0.3.0.1";
+       sha256 = "0yc163r255w7df0hjly30bh5dqgx38f1z5lk3x3i7jh93j97cpn0";
        libraryHaskellDepends = [
          base bifunctors binary bytestring containers deepseq dlist extra
          hashable mtl safe text transformers unordered-containers
@@ -110803,8 +111082,8 @@ self: {
        pname = "irc-dcc";
        version = "2.0.1";
        sha256 = "1pyj4ngh6rw0k1cd9nlrhwb6rr3jmpiwaxs6crik8gbl6f3s4234";
-       revision = "1";
-       editedCabalFile = "0i8ihmlldkk692ckxhhgb3sj6kipnckxgi5b4l234k983yk5h4dj";
+       revision = "2";
+       editedCabalFile = "1zw5a6aj2jfl482197v741rjsrc13bsirq0a290qbjsyyib9jjzk";
        libraryHaskellDepends = [
          attoparsec base binary bytestring io-streams iproute irc-ctcp mtl
          network path safe-exceptions transformers utf8-string
@@ -115474,6 +115753,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "kmp-dfa" = callPackage
+    ({ mkDerivation, array, base, QuickCheck }:
+     mkDerivation {
+       pname = "kmp-dfa";
+       version = "0.1.0.1";
+       sha256 = "0h0jk0pidikk655yw8nwmgrvwknhikjmalhizqspfd28w9ijxprg";
+       libraryHaskellDepends = [ array base QuickCheck ];
+       testHaskellDepends = [ array base QuickCheck ];
+       homepage = "https://github.com/paolino/kmp-dfa";
+       description = "KMP algorithm implementation, based on Deterministic Finite State Automata";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "knead" = callPackage
     ({ mkDerivation, base, llvm-extra, llvm-tf, storable-record
      , storable-tuple, transformers, utility-ht
@@ -124688,8 +124980,8 @@ self: {
      }:
      mkDerivation {
        pname = "madlang";
-       version = "2.3.0.6";
-       sha256 = "143plaxlnlrjb947ysysqz8x4070jka0g39w2wlk7b1hld0c6pn6";
+       version = "2.3.1.1";
+       sha256 = "1ybbf281kpmdwggjvmhpilip0pficsqqg1m1nizgwwlgg76kwnj3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -124940,12 +125232,12 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "mainland-pretty_0_6" = callPackage
+  "mainland-pretty_0_6_1" = callPackage
     ({ mkDerivation, base, containers, srcloc, text, transformers }:
      mkDerivation {
        pname = "mainland-pretty";
-       version = "0.6";
-       sha256 = "0cbhw3nnp16hc9mhgj7jmszyir4pi5zl0wgsrh279q4x2235wp3g";
+       version = "0.6.1";
+       sha256 = "1q25vn93jlxbrlprh5vv1mb4z0qjjl58snc7mv5a5lnjgj3j8ip3";
        libraryHaskellDepends = [
          base containers srcloc text transformers
        ];
@@ -126336,6 +126628,26 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "matrix-market-attoparsec_0_1_0_8" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, directory
+     , exceptions, hspec, QuickCheck, scientific
+     }:
+     mkDerivation {
+       pname = "matrix-market-attoparsec";
+       version = "0.1.0.8";
+       sha256 = "0xqa4q4wyjjh55lggsyjhsi0kb5rhk3afzk0qhnhdmnzmf0slhay";
+       libraryHaskellDepends = [
+         attoparsec base bytestring exceptions scientific
+       ];
+       testHaskellDepends = [
+         base directory exceptions hspec QuickCheck
+       ];
+       homepage = "https://github.com/ocramz/matrix-market-attoparsec";
+       description = "Parsing and serialization functions for the NIST Matrix Market format";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "matrix-market-pure" = callPackage
     ({ mkDerivation, array, base, containers }:
      mkDerivation {
@@ -127227,6 +127539,8 @@ self: {
        pname = "megaparsec";
        version = "5.2.0";
        sha256 = "0204x5bklgvfydap1a2y76aicnjfs33jh786y7w6vsb54fpafl62";
+       revision = "1";
+       editedCabalFile = "1ah5r6jjz187l5g1mnzajsyiac5wdc8ijqwkapl0wa35mj3ybakg";
        libraryHaskellDepends = [
          base bytestring containers deepseq exceptions mtl QuickCheck
          scientific text transformers
@@ -127250,8 +127564,8 @@ self: {
        pname = "megaparsec";
        version = "5.3.0";
        sha256 = "0lpf3f24lyid1chb2hrxiw97kciww844wzkp910zj811b6pbm6rs";
-       revision = "1";
-       editedCabalFile = "185fy44b3ivblh7hw2d18r494g0b4m9wp02m5ms85f8b57r90jws";
+       revision = "2";
+       editedCabalFile = "1gwvrg5vmxhlycav33g9r9157vq0f6j701bar0p7ck4mszs0v6zk";
        libraryHaskellDepends = [
          base bytestring containers deepseq exceptions mtl QuickCheck
          scientific text transformers
@@ -127934,18 +128248,20 @@ self: {
      }) {};
 
   "mezzo" = callPackage
-    ({ mkDerivation, base, boxes, ghc-typelits-natnormalise, HCodecs
-     , hspec, QuickCheck, should-not-typecheck, template-haskell
+    ({ mkDerivation, base, boxes, deepseq, ghc-prim
+     , ghc-typelits-natnormalise, HCodecs, hspec, HUnit, QuickCheck
+     , should-not-typecheck, template-haskell
      }:
      mkDerivation {
        pname = "mezzo";
-       version = "0.2.0.2";
-       sha256 = "1b50ccbvg65j55cpg7ps8x4j52lw4v7gp1bgrxdqgy6k6ccrq34w";
+       version = "0.3.0.0";
+       sha256 = "10i0n03wmrds8gg0p14nvqi00ziqh2lhynbq6gynizgqs5nfh481";
        libraryHaskellDepends = [
-         base boxes ghc-typelits-natnormalise HCodecs template-haskell
+         base boxes ghc-prim ghc-typelits-natnormalise HCodecs
+         template-haskell
        ];
        testHaskellDepends = [
-         base hspec QuickCheck should-not-typecheck
+         base deepseq hspec HUnit QuickCheck should-not-typecheck
        ];
        homepage = "https://github.com/DimaSamoz/mezzo";
        description = "Typesafe music composition";
@@ -128171,6 +128487,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "microlens-mtl_0_1_11_0" = callPackage
+    ({ mkDerivation, base, microlens, mtl, transformers
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "microlens-mtl";
+       version = "0.1.11.0";
+       sha256 = "1885kc8sgcrv05q2sya4q562gph7hgp1hd66mgy7r1vnnz43zfjf";
+       libraryHaskellDepends = [
+         base microlens mtl transformers transformers-compat
+       ];
+       homepage = "http://github.com/aelve/microlens";
+       description = "microlens support for Reader/Writer/State from mtl";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "microlens-platform" = callPackage
     ({ mkDerivation, base, hashable, microlens, microlens-ghc
      , microlens-mtl, microlens-th, text, unordered-containers, vector
@@ -128188,6 +128521,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "microlens-platform_0_3_9_0" = callPackage
+    ({ mkDerivation, base, hashable, microlens, microlens-ghc
+     , microlens-mtl, microlens-th, text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "microlens-platform";
+       version = "0.3.9.0";
+       sha256 = "0f9m6yd4pf839flw3w4g1irplrlmncj0kxfci7dnbkp52x66y1wk";
+       libraryHaskellDepends = [
+         base hashable microlens microlens-ghc microlens-mtl microlens-th
+         text unordered-containers vector
+       ];
+       homepage = "http://github.com/aelve/microlens";
+       description = "Feature-complete microlens";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "microlens-th" = callPackage
     ({ mkDerivation, base, containers, microlens, template-haskell }:
      mkDerivation {
@@ -129215,6 +129566,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "mixed-types-num_0_2_0_1" = callPackage
+    ({ mkDerivation, base, convertible, hspec, hspec-smallcheck
+     , QuickCheck, smallcheck, template-haskell
+     }:
+     mkDerivation {
+       pname = "mixed-types-num";
+       version = "0.2.0.1";
+       sha256 = "05jy5rym4a2y80pg00csyrfpd3bdv98s1kdv3s18nqfrhsyz84wa";
+       libraryHaskellDepends = [
+         base convertible hspec hspec-smallcheck QuickCheck smallcheck
+         template-haskell
+       ];
+       testHaskellDepends = [ base hspec hspec-smallcheck QuickCheck ];
+       homepage = "https://github.com/michalkonecny/mixed-types-num";
+       description = "Alternative Prelude with numeric and logic expressions typed bottom-up";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mkbndl" = callPackage
     ({ mkDerivation, base, directory, filepath, haskell98 }:
      mkDerivation {
@@ -131383,6 +131753,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "monoid-subclasses_0_4_3_2" = callPackage
+    ({ mkDerivation, base, bytestring, containers, primes, QuickCheck
+     , quickcheck-instances, tasty, tasty-quickcheck, text, vector
+     }:
+     mkDerivation {
+       pname = "monoid-subclasses";
+       version = "0.4.3.2";
+       sha256 = "1n13a3nj1hzlbpanl6d1ak3j2vnjy8mb5p5gp7y5hfhrpiymhbgi";
+       libraryHaskellDepends = [
+         base bytestring containers primes text vector
+       ];
+       testHaskellDepends = [
+         base bytestring containers primes QuickCheck quickcheck-instances
+         tasty tasty-quickcheck text vector
+       ];
+       homepage = "https://github.com/blamario/monoid-subclasses/";
+       description = "Subclasses of Monoid";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "monoid-transformer" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -139032,6 +139423,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "one-liner_0_9_1" = callPackage
+    ({ mkDerivation, base, bifunctors, contravariant, ghc-prim, HUnit
+     , profunctors, tagged, transformers
+     }:
+     mkDerivation {
+       pname = "one-liner";
+       version = "0.9.1";
+       sha256 = "18jys0qvywd7il4yzyf2yb22md7apzhxvnzr067d90srqdva7cpf";
+       libraryHaskellDepends = [
+         base bifunctors contravariant ghc-prim profunctors tagged
+         transformers
+       ];
+       testHaskellDepends = [ base contravariant HUnit ];
+       homepage = "https://github.com/sjoerdvisscher/one-liner";
+       description = "Constraint-based generics";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "one-time-password" = callPackage
     ({ mkDerivation, base, bytestring, cereal, cryptonite, memory
      , tasty, tasty-hunit, time
@@ -139368,7 +139778,7 @@ self: {
     ({ mkDerivation, aeson, base, base64-bytestring, bindings-DSL
      , bytestring, Cabal, containers, criterion, data-default, deepseq
      , directory, Glob, haskell-src-exts, inline-c, inline-c-cpp
-     , JuicyPixels, lens, linear, opencv, primitive, QuickCheck, repa
+     , JuicyPixels, lens, linear, opencv3, primitive, QuickCheck, repa
      , tasty, tasty-hunit, tasty-quickcheck, template-haskell, text
      , transformers, vector
      }:
@@ -139376,13 +139786,16 @@ self: {
        pname = "opencv";
        version = "0.0.0.0";
        sha256 = "1y2mjb6a6iym6h6m7c214lwrmcjhm9snsqgf1jrbq27fr346mrkb";
+       configureFlags = [
+         "--with-gcc=${stdenv.cc}/bin/c++" "--with-ld=${stdenv.cc}/bin/c++"
+       ];
        setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [
          aeson base base64-bytestring bindings-DSL bytestring containers
          data-default deepseq inline-c inline-c-cpp JuicyPixels linear
          primitive repa template-haskell text transformers vector
        ];
-       libraryPkgconfigDepends = [ opencv ];
+       libraryPkgconfigDepends = [ opencv3 ];
        testHaskellDepends = [
          base bytestring containers data-default directory Glob
          haskell-src-exts JuicyPixels lens linear primitive QuickCheck repa
@@ -139394,7 +139807,7 @@ self: {
        homepage = "https://github.com/LumiGuide/haskell-opencv";
        description = "Haskell binding to OpenCV-3.x";
        license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) opencv;};
+     }) {inherit (pkgs) opencv3;};
 
   "opencv-extra" = callPackage
     ({ mkDerivation, base, bindings-DSL, bytestring, Cabal, containers
@@ -141391,8 +141804,8 @@ self: {
        pname = "pandoc";
        version = "1.19.2.1";
        sha256 = "00bq5h70byfs1fnszkggwws33hp7dpr7lzs0lfdvp5dzfwyjys88";
-       revision = "4";
-       editedCabalFile = "0r5lypd2jxsh221djvb49an7zcn4dlzr563cyf5xchchhnz9mcxp";
+       revision = "5";
+       editedCabalFile = "0rp81lr8ys7bcnjx5hm9fn704zhph313whjc51ns8sbpzlpwvx1f";
        configureFlags = [ "-fhttps" "-f-trypandoc" ];
        isLibrary = true;
        isExecutable = true;
@@ -141717,8 +142130,8 @@ self: {
        pname = "pandoc-types";
        version = "1.17.0.5";
        sha256 = "1csipjdq00iiq77k2wlrg4i7afrzlh8nl585q785xzw7nn45b0n8";
-       revision = "3";
-       editedCabalFile = "0hz6apf01gavsbff2rs70c6zbb7fpai2qd0jmsb928dmpja97d6y";
+       revision = "4";
+       editedCabalFile = "1ljvzl41ikfwwdh253mwpqjr7c4vf1ib01sxvp66ahi7vpxshm7n";
        libraryHaskellDepends = [
          aeson base bytestring containers deepseq ghc-prim QuickCheck syb
        ];
@@ -144805,6 +145218,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "persistent-mysql_2_6_1" = callPackage
+    ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit
+     , containers, monad-control, monad-logger, mysql, mysql-simple
+     , persistent, resource-pool, resourcet, text, transformers
+     }:
+     mkDerivation {
+       pname = "persistent-mysql";
+       version = "2.6.1";
+       sha256 = "0i1a7xmspgxzlwi1z9jyh5ckjx16yba1xs289vh2id9400yh8c57";
+       libraryHaskellDepends = [
+         aeson base blaze-builder bytestring conduit containers
+         monad-control monad-logger mysql mysql-simple persistent
+         resource-pool resourcet text transformers
+       ];
+       homepage = "http://www.yesodweb.com/book/persistent";
+       description = "Backend for the persistent library using MySQL database server";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "persistent-mysql-haskell" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, containers
      , io-streams, monad-control, monad-logger, mysql-haskell, network
@@ -145270,6 +145703,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "pg-transact" = callPackage
+    ({ mkDerivation, base, bytestring, exceptions, hspec
+     , hspec-discover, monad-control, postgresql-simple, tmp-postgres
+     , transformers
+     }:
+     mkDerivation {
+       pname = "pg-transact";
+       version = "0.1.0.1";
+       sha256 = "0zf9mfhpknaa0vggv60gpkfr0ak51n1xbw5lfqx8l8p1kqv3d0jr";
+       libraryHaskellDepends = [
+         base bytestring exceptions monad-control postgresql-simple
+         transformers
+       ];
+       testHaskellDepends = [
+         base bytestring exceptions hspec hspec-discover postgresql-simple
+         tmp-postgres
+       ];
+       homepage = "https://github.com/jfischoff/pg-transact#readme";
+       description = "Another postgresql-simple transaction monad";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "pgdl" = callPackage
     ({ mkDerivation, base, binary, brick, bytestring, Cabal, conduit
      , conduit-extra, configurator, containers, directory
@@ -145399,12 +145854,12 @@ self: {
      }) {};
 
   "phaser" = callPackage
-    ({ mkDerivation, base, bytestring, text }:
+    ({ mkDerivation, base, bytestring, containers, text }:
      mkDerivation {
        pname = "phaser";
-       version = "0.2.0.0";
-       sha256 = "126s1xqb6fm30fhnslqgqrby6v0jhagmbnms144dcnyjphdr69i0";
-       libraryHaskellDepends = [ base bytestring text ];
+       version = "1.0.0.0";
+       sha256 = "06m7a61fs6kmd4pgfj1zp7ijzprkdaximynzjv9wm9ynz3fplkzs";
+       libraryHaskellDepends = [ base bytestring containers text ];
        homepage = "https://github.com/quickdudley/phaser";
        description = "Incremental multiple pass parser library";
        license = stdenv.lib.licenses.bsd3;
@@ -149199,16 +149654,15 @@ self: {
 
   "postgresql-simple-opts" = callPackage
     ({ mkDerivation, base, bytestring, data-default, either, hspec
-     , markdown-unlit, optparse-applicative, optparse-generic
-     , postgresql-simple
+     , optparse-applicative, optparse-generic, postgresql-simple
      }:
      mkDerivation {
        pname = "postgresql-simple-opts";
-       version = "0.2.0.0";
-       sha256 = "07zsykbxcl1rjbcnq21bw99r77jm743py9lcvk8grnqfjqyn43a7";
+       version = "0.2.0.2";
+       sha256 = "0jwhlafbpkg75rc2b4hv8pg1d2q200h70lwn0acilikf55r3vlj1";
        libraryHaskellDepends = [
-         base bytestring data-default either markdown-unlit
-         optparse-applicative optparse-generic postgresql-simple
+         base bytestring data-default either optparse-applicative
+         optparse-generic postgresql-simple
        ];
        testHaskellDepends = [
          base bytestring hspec optparse-applicative postgresql-simple
@@ -149219,6 +149673,39 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "postgresql-simple-queue" = callPackage
+    ({ mkDerivation, aeson, amazonka, amazonka-ses, async, base
+     , bytestring, data-default, exceptions, hspec, hspec-discover
+     , hspec-expectations-lifted, hspec-pg-transact, lens, lifted-async
+     , lifted-base, monad-control, optparse-generic, pg-transact
+     , postgresql-simple, postgresql-simple-opts, random, resource-pool
+     , text, time, transformers, uuid
+     }:
+     mkDerivation {
+       pname = "postgresql-simple-queue";
+       version = "0.1.0.1";
+       sha256 = "1rwfv4ii4bdxq4ikvjrjrwbn9csr5q4qmmi7d5r0656a4qi9syh9";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring data-default exceptions lifted-async
+         lifted-base monad-control optparse-generic pg-transact
+         postgresql-simple postgresql-simple-opts random resource-pool text
+         time transformers uuid
+       ];
+       executableHaskellDepends = [
+         aeson amazonka amazonka-ses base lens lifted-base text
+       ];
+       testHaskellDepends = [
+         aeson async base bytestring hspec hspec-discover
+         hspec-expectations-lifted hspec-pg-transact pg-transact
+         postgresql-simple
+       ];
+       homepage = "https://github.com/jfischoff/postgresql-queue#readme";
+       description = "A PostgreSQL backed queue";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "postgresql-simple-sop" = callPackage
     ({ mkDerivation, base, generics-sop, postgresql-simple }:
      mkDerivation {
@@ -150529,6 +151016,18 @@ self: {
        license = stdenv.lib.licenses.isc;
      }) {};
 
+  "prim-array" = callPackage
+    ({ mkDerivation, base, ghc-prim, primitive }:
+     mkDerivation {
+       pname = "prim-array";
+       version = "0.1";
+       sha256 = "0k4askk73r6pm160lqgrdz787qacd7sv7j04awdwrxbr0mwqn5gk";
+       libraryHaskellDepends = [ base ghc-prim primitive ];
+       homepage = "https://github.com/andrewthad/prim-array#readme";
+       description = "Primitive byte array with type variable";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "prim-spoon" = callPackage
     ({ mkDerivation, base, criterion, ghc-prim, HUnit, QuickCheck
      , spoon
@@ -151673,8 +152172,8 @@ self: {
      }:
      mkDerivation {
        pname = "propellor";
-       version = "4.0.4";
-       sha256 = "0h69g079zrv9rnq0rb6d1j323rb310qmal109ma8ss50m5f4gyiq";
+       version = "4.0.6";
+       sha256 = "0w8n7l4ws3awccqf6g12bk09l10s4scmdvr5vkxhhpm5cmawd0fq";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -151771,20 +152270,20 @@ self: {
      }) {};
 
   "proteaaudio" = callPackage
-    ({ mkDerivation, alsaLib, base, c2hs }:
+    ({ mkDerivation, base, bytestring, c2hs, libpulseaudio }:
      mkDerivation {
        pname = "proteaaudio";
-       version = "0.6.5";
-       sha256 = "0bilgdwzm8gfgfpf66kc3akpi9axr69b3fmx6s3y1bq24lkx9irp";
+       version = "0.7.0.1";
+       sha256 = "1v56qmgwj5cd8xbk19qgjwwkc1nbya1vagai7kypf5aj8c07gjrq";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base ];
-       librarySystemDepends = [ alsaLib ];
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [ libpulseaudio ];
        libraryToolDepends = [ c2hs ];
        description = "Simple audio library for Windows, Linux, OSX";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) alsaLib;};
+     }) {inherit (pkgs) libpulseaudio;};
 
   "proto-lens" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers
@@ -154048,7 +154547,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "quickcheck-instances_0_3_15" = callPackage
+  "quickcheck-instances_0_3_16" = callPackage
     ({ mkDerivation, array, base, base-compat, bytestring
      , case-insensitive, containers, hashable, old-time, QuickCheck
      , scientific, tagged, text, time, transformers, transformers-compat
@@ -154056,8 +154555,8 @@ self: {
      }:
      mkDerivation {
        pname = "quickcheck-instances";
-       version = "0.3.15";
-       sha256 = "02nwas0i2jlvjahlj5mayhpiy8pkb46xicypjw63kzp1xc6zs3ly";
+       version = "0.3.16";
+       sha256 = "07xqbjb3rb5hzhjak3qpvj4hl91gc0z2272n60hv67zmv3w8kcf1";
        libraryHaskellDepends = [
          array base base-compat bytestring case-insensitive containers
          hashable old-time QuickCheck scientific tagged text time
@@ -154815,15 +155314,16 @@ self: {
      }) {};
 
   "radium" = callPackage
-    ({ mkDerivation, base, Cabal, containers, hspec, parsec, QuickCheck
+    ({ mkDerivation, base, Cabal, containers, hspec, lens, parsec
+     , QuickCheck
      }:
      mkDerivation {
        pname = "radium";
-       version = "0.7";
-       sha256 = "08xwy6v1w32lr6i9kkbj3h6zk2llc5lba30piim6a3dgvr1zpfpq";
-       libraryHaskellDepends = [ base containers parsec ];
+       version = "0.8.0";
+       sha256 = "04pc3zy09hg7p9w54ffwvfcby3341vbpzlv2d9ma2q9py0ymx6d5";
+       libraryHaskellDepends = [ base containers lens parsec ];
        testHaskellDepends = [
-         base Cabal containers hspec parsec QuickCheck
+         base Cabal containers hspec lens parsec QuickCheck
        ];
        homepage = "https://github.com/klangner/radium";
        description = "Chemistry";
@@ -161520,18 +162020,23 @@ self: {
      }) {};
 
   "rocksdb-haskell" = callPackage
-    ({ mkDerivation, base, bytestring, data-default, filepath
-     , resourcet, rocksdb, transformers
+    ({ mkDerivation, base, binary, bytestring, data-default, filepath
+     , hspec, hspec-expectations, process, QuickCheck, resourcet
+     , rocksdb, temporary, transformers
      }:
      mkDerivation {
        pname = "rocksdb-haskell";
-       version = "0.1.0";
-       sha256 = "1wi8mc0xzdd47r2vxa1x4gmbm4yikp4pyfj00ycnydvs4b2n3iad";
+       version = "1.0.0";
+       sha256 = "0raipwawmah4h9ryja65b881dcj4yadrhh4c4718fdr0n89wgnzd";
        libraryHaskellDepends = [
-         base bytestring data-default filepath resourcet transformers
+         base binary bytestring data-default filepath resourcet transformers
        ];
        librarySystemDepends = [ rocksdb ];
-       homepage = "http://github.com/agrafix/rocksdb-haskell";
+       testHaskellDepends = [
+         base bytestring data-default hspec hspec-expectations process
+         QuickCheck resourcet temporary transformers
+       ];
+       homepage = "http://github.com/serokell/rocksdb-haskell";
        description = "Haskell bindings to RocksDB";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
@@ -162775,6 +163280,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "safe_0_3_15" = callPackage
+    ({ mkDerivation, base, deepseq, QuickCheck }:
+     mkDerivation {
+       pname = "safe";
+       version = "0.3.15";
+       sha256 = "0bbalr2n92akwcgdyl5ff45h8d4waamj1lp7ly6mdgda17k4lpm3";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base deepseq QuickCheck ];
+       homepage = "https://github.com/ndmitchell/safe#readme";
+       description = "Library of safe (exception free) functions";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "safe-access" = callPackage
     ({ mkDerivation, base, mtl, transformers }:
      mkDerivation {
@@ -165514,10 +166033,8 @@ self: {
      }:
      mkDerivation {
        pname = "selda";
-       version = "0.1.8.0";
-       sha256 = "13ccbpwsd2w6l534a9l6d1mmssfy1q9lh6df14zf2am8ph184av7";
-       revision = "1";
-       editedCabalFile = "1lqq7ik4s1xvbc94knv57h2k08r8rk4nyhxq6nlfy23spb56r0a6";
+       version = "0.1.9.0";
+       sha256 = "0c69aaalxi4b42y6y9y12wcxxyjnb3arc196kj0c1q6xdwh9fpk4";
        libraryHaskellDepends = [
          base bytestring exceptions hashable mtl psqueues text time
          unordered-containers
@@ -165533,8 +166050,8 @@ self: {
      }:
      mkDerivation {
        pname = "selda-postgresql";
-       version = "0.1.5.0";
-       sha256 = "1ziavpl33m82xfv7528nvfgmlamz2rzmdd73gs7zbrvqnizjq4b5";
+       version = "0.1.5.1";
+       sha256 = "1462rcvyf79p80b17hkgkgb2jfzhkdq8vj0y001jy5wzl6gs7b8d";
        libraryHaskellDepends = [
          base bytestring exceptions postgresql-libpq selda text
        ];
@@ -165549,8 +166066,8 @@ self: {
      }:
      mkDerivation {
        pname = "selda-sqlite";
-       version = "0.1.5.0";
-       sha256 = "10r0sqbps515qbcdfgsi9lkjx5axps02hbgrjgkc7djg01i3c6x1";
+       version = "0.1.5.1";
+       sha256 = "1r81qidwqp5smi3h7awrbxhvlclm5dgvrmi56irghvh960h720j3";
        libraryHaskellDepends = [
          base direct-sqlite directory exceptions selda text
        ];
@@ -168372,6 +168889,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "serviette" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, generic-deriving, text }:
+     mkDerivation {
+       pname = "serviette";
+       version = "0.1.0.4";
+       sha256 = "1i5k12y547z3l2hb4h1zafvv9sbfh5x60hajjw78dnk2p4v1gzl4";
+       libraryHaskellDepends = [
+         aeson base bytestring generic-deriving text
+       ];
+       homepage = "https://github.com/v0d1ch/serviette#readme";
+       description = "JSON to raw Sql string";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "servius" = callPackage
     ({ mkDerivation, base, blaze-builder, blaze-html, bytestring
      , http-types, markdown, shakespeare, text, wai, wai-app-static
@@ -174742,6 +175273,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "space" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
+     , bytestring, cryptonite, directory, http-date, http-types, lucid
+     , memory, network, stm, template-haskell, text, unix, wai, warp
+     }:
+     mkDerivation {
+       pname = "space";
+       version = "0.1.0";
+       sha256 = "0462f3sljgzj9l3gd8m8irnv1bsiixh0vzz7skwdfrm92dazbcrb";
+       libraryHaskellDepends = [
+         aeson attoparsec base base64-bytestring bytestring cryptonite
+         directory http-date http-types lucid memory network stm
+         template-haskell text unix wai warp
+       ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/xtendo-org/space#readme";
+       description = "Experimental library";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "spacefill" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -175047,6 +175598,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "spdx_0_2_2_0" = callPackage
+    ({ mkDerivation, base, tasty, tasty-quickcheck, transformers }:
+     mkDerivation {
+       pname = "spdx";
+       version = "0.2.2.0";
+       sha256 = "1jxxivxlhzjx4idy69qhqqv37sspqhk3f3i93mydzn8cyhn87aqp";
+       libraryHaskellDepends = [ base transformers ];
+       testHaskellDepends = [ base tasty tasty-quickcheck ];
+       homepage = "https://github.com/phadej/spdx";
+       description = "SPDX license expression language";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "spe" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -177450,8 +178015,8 @@ self: {
      }:
      mkDerivation {
        pname = "staversion";
-       version = "0.2.0.0";
-       sha256 = "0sx5m62s12pvbgawndpycf38rpik5sdghxpc3prmcv308xavsp7r";
+       version = "0.2.1.0";
+       sha256 = "120w7kpgv2nsp7c36w1w6aglfh8sx72b3gmhrg5g790596f81797";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -179703,15 +180268,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "stylish-haskell_0_8_0_0" = callPackage
+  "stylish-haskell_0_8_1_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, directory
      , filepath, haskell-src-exts, HUnit, mtl, optparse-applicative
      , strict, syb, test-framework, test-framework-hunit, yaml
      }:
      mkDerivation {
        pname = "stylish-haskell";
-       version = "0.8.0.0";
-       sha256 = "157mdq8529dn1lib1q7mmg47as61msda0ix34xb76c6pzfn1dd0w";
+       version = "0.8.1.0";
+       sha256 = "08qzplmzpnfyl8zaskimx91xij723mim11k552a7yl3p0i0cfmw7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -183089,8 +183654,8 @@ self: {
        pname = "tasty-hspec";
        version = "1.1.3.1";
        sha256 = "0i2lv0m8va2kirddgng5laaq9q78y56jg9li93iq8b9062smiila";
-       revision = "1";
-       editedCabalFile = "0gdf742llw1109ai5p6xrcv2a095bip7h5cj9qp14w49rzi5hdza";
+       revision = "2";
+       editedCabalFile = "0d8cwpkqayf7qgg4xvs8aj4wxk3qkilmjfy74s3jkxyrxsg22d73";
        libraryHaskellDepends = [
          base hspec hspec-core QuickCheck random tagged tasty
          tasty-quickcheck tasty-smallcheck
@@ -183724,8 +184289,8 @@ self: {
      }:
      mkDerivation {
        pname = "teardown";
-       version = "0.0.0.2";
-       sha256 = "0d28sxx2krf3p5alj8gn8gs98slfs9fqwbaf6lyimayy2fx9d5jf";
+       version = "0.1.0.0";
+       sha256 = "0sg113khwlb56x0rgb47lm0hf0cfsr9wc31w98nav9zcw5gndm33";
        libraryHaskellDepends = [
          ansi-wl-pprint base protolude text time
        ];
@@ -184804,15 +185369,13 @@ self: {
      }:
      mkDerivation {
        pname = "test-framework-quickcheck2";
-       version = "0.3.0.3";
-       sha256 = "12p1zwrsz35r3j5gzbvixz9z1h5643rhihf5gqznmc991krwd5nc";
-       revision = "2";
-       editedCabalFile = "1h0vv04vgbj9ncla9nssgiis1sq29n865h473pydfmj31j6ri7wq";
+       version = "0.3.0.4";
+       sha256 = "0vj834337r6jzr3258cv68ly2sv5999mklpsrfngyk51kywsyqyp";
        libraryHaskellDepends = [
          base extensible-exceptions QuickCheck random test-framework
        ];
-       homepage = "https://batterseapower.github.io/test-framework/";
-       description = "QuickCheck2 support for the test-framework package";
+       homepage = "http://haskell.github.io/test-framework/";
+       description = "QuickCheck-2 support for the test-framework package";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -185927,25 +186490,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "text-show_3_6" = callPackage
+  "text-show_3_6_2" = callPackage
     ({ mkDerivation, array, base, base-compat, base-orphans, bifunctors
      , bytestring, bytestring-builder, containers, contravariant
      , criterion, deepseq, deriving-compat, generic-deriving
      , ghc-boot-th, ghc-prim, hspec, integer-gmp, nats, QuickCheck
      , quickcheck-instances, semigroups, tagged, template-haskell, text
-     , th-lift, transformers, transformers-compat, void
+     , th-abstraction, th-lift, transformers, transformers-compat, void
      }:
      mkDerivation {
        pname = "text-show";
-       version = "3.6";
-       sha256 = "0gvg1fpgvws75zhvxdkcg03m6sy5rv4m77fynjh8v6rakbiy7gb4";
-       revision = "1";
-       editedCabalFile = "052zp68y3fbwvg9xigngaqfv7afjw9prfns5qlx6s7mv3i8dc2mk";
+       version = "3.6.2";
+       sha256 = "1wqzdpa7wxnqaa62mmw9fqklg12i9gyiaahj6xqy2h3rdw7r5qz2";
        libraryHaskellDepends = [
          array base base-compat bifunctors bytestring bytestring-builder
          containers contravariant generic-deriving ghc-boot-th ghc-prim
-         integer-gmp nats semigroups tagged template-haskell text th-lift
-         transformers transformers-compat void
+         integer-gmp nats semigroups tagged template-haskell text
+         th-abstraction th-lift transformers transformers-compat void
        ];
        testHaskellDepends = [
          array base base-compat base-orphans bifunctors bytestring
@@ -186002,7 +186563,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "text-show-instances_3_6_1" = callPackage
+  "text-show-instances_3_6_2" = callPackage
     ({ mkDerivation, base, base-compat, bifunctors, binary, bytestring
      , containers, directory, generic-deriving, ghc-boot-th, ghc-prim
      , haskeline, hoopl, hpc, hspec, old-locale, old-time, pretty
@@ -186013,10 +186574,8 @@ self: {
      }:
      mkDerivation {
        pname = "text-show-instances";
-       version = "3.6.1";
-       sha256 = "1ws5gkmb7y21aw6lrakjq760lgg7j8r5rfm45sdfalhgasxh54lz";
-       revision = "1";
-       editedCabalFile = "1zkncw3nflhqgs0wmfj4pz2jvbp2hq5xanyv3ggdbjff6zzpcx6m";
+       version = "3.6.2";
+       sha256 = "0c64ibvzpz2h4f54bhrla4yf4mhsl3x2ag2nx2kj81g47pw917r5";
        libraryHaskellDepends = [
          base base-compat bifunctors binary bytestring containers directory
          ghc-boot-th haskeline hoopl hpc old-locale old-time pretty process
@@ -186944,6 +187503,8 @@ self: {
        pname = "these";
        version = "0.7.4";
        sha256 = "0jl8ippnsy5zmy52cvpn252hm2g7xqp1zb1xcrbgr00pmdxpvwyw";
+       revision = "1";
+       editedCabalFile = "15vrym6g4vh4fbji8zxy1kxajnickmg6bq83m4hcy5bfv7rf9y39";
        libraryHaskellDepends = [
          aeson base bifunctors binary containers data-default-class deepseq
          hashable keys mtl profunctors QuickCheck semigroupoids transformers
@@ -187369,18 +187930,21 @@ self: {
 
   "throwable-exceptions" = callPackage
     ({ mkDerivation, base, either, safe-exceptions, tasty
-     , tasty-discover, tasty-hunit, text
+     , tasty-discover, tasty-hunit, template-haskell, text
      }:
      mkDerivation {
        pname = "throwable-exceptions";
-       version = "0.1.0.4";
-       sha256 = "1hpji5db3hg36f4ry3xsgl4cynw0djx3a61i19q4cy9sqbbdlw4c";
-       libraryHaskellDepends = [ base safe-exceptions ];
+       version = "0.1.0.5";
+       sha256 = "1f4aaj37j0wni1qgshf1n72kid74wz4gj6dydzzasrxq4ls51cvn";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base safe-exceptions template-haskell ];
+       executableHaskellDepends = [ base safe-exceptions ];
        testHaskellDepends = [
          base either safe-exceptions tasty tasty-discover tasty-hunit text
        ];
        homepage = "https://github.com/aiya000/hs-throwable-exceptions#README.md";
-       description = "throwable-exceptions gives the exception's value constructors";
+       description = "throwable-exceptions gives the easy way to throw exceptions";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -188942,6 +189506,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tmp-postgres" = callPackage
+    ({ mkDerivation, base, bytestring, directory, hspec, hspec-discover
+     , network, postgresql-simple, process, temporary, unix
+     }:
+     mkDerivation {
+       pname = "tmp-postgres";
+       version = "0.1.0.6";
+       sha256 = "0h3rhli1vm0rq2943fz1z4l26s6nzrx5sccwdx6wc998wbgbdq15";
+       libraryHaskellDepends = [
+         base directory network process temporary unix
+       ];
+       testHaskellDepends = [
+         base bytestring directory hspec hspec-discover postgresql-simple
+         process temporary
+       ];
+       homepage = "https://github.com/jfischoff/tmp-postgres#readme";
+       description = "Start and stop a temporary postgres for testing";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "tmpl" = callPackage
     ({ mkDerivation, base, bytestring, directory, template, text }:
      mkDerivation {
@@ -190025,14 +190609,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "transient_0_5_6" = callPackage
+  "transient_0_5_8" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, mtl
      , random, stm, time, transformers
      }:
      mkDerivation {
        pname = "transient";
-       version = "0.5.6";
-       sha256 = "01r0mw35h3k7yry91gir64gkb6d3x9i5awnacmk8l8anffhvvayc";
+       version = "0.5.8";
+       sha256 = "04n43yddamgk7han7kmhz57v2vrp3cazqkgy4xnkdfgr10z8pppx";
        libraryHaskellDepends = [
          base bytestring containers directory mtl random stm time
          transformers
@@ -190077,7 +190661,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "transient-universe_0_4_5" = callPackage
+  "transient-universe_0_4_6" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
      , directory, filepath, hashable, HTTP, iproute, mtl, network
      , network-info, network-uri, process, random, stm, TCache, text
@@ -190085,8 +190669,8 @@ self: {
      }:
      mkDerivation {
        pname = "transient-universe";
-       version = "0.4.5";
-       sha256 = "0imyapqzdl2rz4gdykkcf3vr3r5d22qdnm9n0rg0gkl63b4lvv60";
+       version = "0.4.6";
+       sha256 = "0as7930b9mwy86rcly957q9yslqd2rflakmxnl1njnqm2cr2dx7m";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -190158,16 +190742,17 @@ self: {
      }) {};
 
   "trasa" = callPackage
-    ({ mkDerivation, base, binary, bytestring, doctest, http-types
-     , tasty, tasty-hunit, tasty-quickcheck, text, unordered-containers
-     , vinyl
+    ({ mkDerivation, base, binary, bytestring, doctest, hashable
+     , http-media, http-types, tasty, tasty-hunit, tasty-quickcheck
+     , text, unordered-containers, vinyl
      }:
      mkDerivation {
        pname = "trasa";
-       version = "0.1";
-       sha256 = "118x1z2hwx5gagiw4fas30jsdn1igqry2gydpjfnn9nvzf639x6y";
+       version = "0.2";
+       sha256 = "1570f4612nfslcxr0mjwf4zzgfninb0mv1d0n6livcks8jd4w4ph";
        libraryHaskellDepends = [
-         base binary bytestring http-types text unordered-containers vinyl
+         base binary bytestring hashable http-media http-types text
+         unordered-containers vinyl
        ];
        testHaskellDepends = [
          base bytestring doctest tasty tasty-hunit tasty-quickcheck text
@@ -190180,14 +190765,14 @@ self: {
 
   "trasa-client" = callPackage
     ({ mkDerivation, aeson, base, binary, bytestring, http-client
-     , http-types, ip, text, trasa, unordered-containers
+     , http-media, http-types, ip, text, trasa, unordered-containers
      }:
      mkDerivation {
        pname = "trasa-client";
-       version = "0.1.0.0";
-       sha256 = "00vhl41al809njjl94j5prrbhihc02627qfsacqy294sdf5pf6kd";
+       version = "0.2";
+       sha256 = "0cgsjaclcqy4nprp7ndr4di1km0fp70zfgv1r4v172mk2q0n06nx";
        libraryHaskellDepends = [
-         base binary bytestring http-client http-types text trasa
+         base binary bytestring http-client http-media http-types text trasa
        ];
        testHaskellDepends = [
          aeson base http-client http-types ip text trasa
@@ -190199,15 +190784,15 @@ self: {
 
   "trasa-reflex" = callPackage
     ({ mkDerivation, base, bytestring, containers, ghcjs-dom
-     , http-types, jsaddle, reflex, reflex-dom, text, trasa
+     , http-media, http-types, jsaddle, reflex, reflex-dom, text, trasa
      }:
      mkDerivation {
        pname = "trasa-reflex";
-       version = "0.1.0.0";
-       sha256 = "10c9ssk5dzvqglhism3g3kpracaf4j913gd6m639ry8nkax0ndyv";
+       version = "0.2";
+       sha256 = "11dwymm1cvxbfhfmsfipzxbigrgi6wybz3qylq8v0022c929cd1n";
        libraryHaskellDepends = [
-         base bytestring containers ghcjs-dom http-types jsaddle reflex
-         reflex-dom text trasa
+         base bytestring containers ghcjs-dom http-media http-types jsaddle
+         reflex reflex-dom text trasa
        ];
        description = "Reactive Type Safe Routing";
        license = stdenv.lib.licenses.mit;
@@ -190216,16 +190801,16 @@ self: {
 
   "trasa-server" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
-     , doctest, http-client, http-types, mtl, tasty, tasty-hunit
-     , tasty-quickcheck, text, trasa, vinyl, wai, warp
+     , doctest, http-client, http-media, http-types, mtl, tasty
+     , tasty-hunit, tasty-quickcheck, text, trasa, vinyl, wai, warp
      }:
      mkDerivation {
        pname = "trasa-server";
-       version = "0.1";
-       sha256 = "1pj0rlpn0625vxm5hzik1vj2yrfkc8dmf04hc6mcjrpb78yyd2ai";
+       version = "0.2";
+       sha256 = "1jiqlsmiz82xh0mxj72bm0daqjvn5h5wb44i50q4pbsijaqgvsyy";
        libraryHaskellDepends = [
-         base bytestring case-insensitive containers http-types mtl text
-         trasa wai
+         base bytestring case-insensitive containers http-media http-types
+         mtl text trasa wai
        ];
        testHaskellDepends = [
          base bytestring doctest http-client tasty tasty-hunit
@@ -196897,6 +197482,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) fftw;};
 
+  "vector-fftw_0_1_3_8" = callPackage
+    ({ mkDerivation, base, fftw, primitive, storable-complex, vector }:
+     mkDerivation {
+       pname = "vector-fftw";
+       version = "0.1.3.8";
+       sha256 = "0xlr4566hh6lnpinzrk623a96jnb8mp8mq6cymlsl8y38qx36jp6";
+       libraryHaskellDepends = [ base primitive storable-complex vector ];
+       librarySystemDepends = [ fftw ];
+       homepage = "http://hackage.haskell.org/package/vector-fftw";
+       description = "A binding to the fftw library for one-dimensional vectors";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) fftw;};
+
   "vector-functorlazy" = callPackage
     ({ mkDerivation, base, ghc-prim, primitive, vector, vector-th-unbox
      }:
@@ -200248,20 +200847,24 @@ self: {
 
   "web-push" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring
-     , cryptonite, exceptions, http-client, http-types, jose, memory
-     , random, text, time, transformers, unordered-containers
+     , cryptonite, exceptions, hspec, http-client, http-types, jose
+     , memory, mtl, random, text, time, transformers
+     , unordered-containers
      }:
      mkDerivation {
        pname = "web-push";
-       version = "0.1.0.0";
-       sha256 = "0wdqpvc4k5bqhfx37yf70rmpxhblhyg8xw2m0yk0fli2jfcljwjp";
+       version = "0.1.2.0";
+       sha256 = "1c9l6fl8fpz4jd9p1m8w42hknnklak8j4gjakcm4qdbw86c4w3kk";
        libraryHaskellDepends = [
          aeson base base64-bytestring binary bytestring cryptonite
-         exceptions http-client http-types jose memory random text time
+         exceptions http-client http-types jose memory mtl random text time
          transformers unordered-containers
        ];
+       testHaskellDepends = [
+         base base64-bytestring binary bytestring hspec
+       ];
        homepage = "https://github.com/sarthakbagaria/web-push#readme";
-       description = "Helper functions to send messages using Web Push protocol";
+       description = "Send messages using Web Push protocol";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -200705,8 +201308,8 @@ self: {
      }:
      mkDerivation {
        pname = "webify";
-       version = "0.1.7.0";
-       sha256 = "16fsk6x875bmnqng5mfkxcxrkp3dcs3lkmsnds5fm416x4iw1sql";
+       version = "0.1.8.0";
+       sha256 = "031gim7g15ssjj3pzc5nk7r8dsfj35pf3kzjzaxfijklwzj0zj9q";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -201069,8 +201672,8 @@ self: {
      }:
      mkDerivation {
        pname = "weeder";
-       version = "0.1.5";
-       sha256 = "0jnfg68828qdk14lpa0ql4x6cj7ap2njrwpgdqwkpm2hkgw21363";
+       version = "0.1.6";
+       sha256 = "1ss78jqiygypr8j4n2nj9b5dhxly6gmnf5qlil4cj8kb0pzr1q7b";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -203300,8 +203903,8 @@ self: {
        pname = "xdcc";
        version = "1.1.4";
        sha256 = "0r344vgkiwc7lkb7x78swnz0rimbgdcb0ki29dilqvdv0k4z9i59";
-       revision = "2";
-       editedCabalFile = "1r9vp01r8pym1skqy6ll632q5j4xbgsf6mf1n26rk296z2rqdvra";
+       revision = "3";
+       editedCabalFile = "11swld2awjp5l1386c1c1lpkrw53g9l77agvz1y43kh00c2a6yaa";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -203526,12 +204129,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "xhtml_3000_2_1" = callPackage
+  "xhtml_3000_2_2" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "xhtml";
-       version = "3000.2.1";
-       sha256 = "1n6wgzxbj8xf0wf1il827qidphnffb5vzhwzqlxhh70c2y10f0ik";
+       version = "3000.2.2";
+       sha256 = "0z34m5jfvjyzqjr81kk6mp2dyf0iay5zl8xlzwl3k5zdfl5hsz74";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/haskell/xhtml";
        description = "An XHTML combinator library";
@@ -203947,6 +204550,29 @@ self: {
        license = "unknown";
      }) {};
 
+  "xml-conduit-parse_0_3_1_1" = callPackage
+    ({ mkDerivation, base, conduit, conduit-parse, containers
+     , data-default, exceptions, hlint, parsers, resourcet, tasty
+     , tasty-hunit, text, xml-conduit, xml-types
+     }:
+     mkDerivation {
+       pname = "xml-conduit-parse";
+       version = "0.3.1.1";
+       sha256 = "1i20smw7cs2bjh7z1606grac779a60fcwpc8qrqavagbmkhx0ba8";
+       libraryHaskellDepends = [
+         base conduit conduit-parse containers exceptions parsers text
+         xml-conduit xml-types
+       ];
+       testHaskellDepends = [
+         base conduit conduit-parse data-default hlint parsers resourcet
+         tasty tasty-hunit
+       ];
+       homepage = "https://github.com/k0ral/xml-conduit-parse";
+       description = "Streaming XML parser based on conduits";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "xml-conduit-writer" = callPackage
     ({ mkDerivation, base, containers, dlist, mtl, text, xml-conduit
      , xml-types
@@ -207309,6 +207935,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yesod-recaptcha2" = callPackage
+    ({ mkDerivation, base, classy-prelude-yesod, http-conduit
+     , yesod-auth
+     }:
+     mkDerivation {
+       pname = "yesod-recaptcha2";
+       version = "0.1.0.0";
+       sha256 = "0cmhw0wlbs8r4wpcyywgsizl86l3y0hrngl711sr2yl51vxhgh2f";
+       libraryHaskellDepends = [
+         base classy-prelude-yesod http-conduit yesod-auth
+       ];
+       homepage = "https://github.com/ncaq/yesod-recaptcha2#readme";
+       description = "yesod recaptcha2";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "yesod-routes" = callPackage
     ({ mkDerivation, base, bytestring, containers, hspec, HUnit
      , path-pieces, template-haskell, text, vector
@@ -207778,8 +208420,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi";
-       version = "0.13.5";
-       sha256 = "17r5lzrrr6fkf72w2lkc0a144v3bqiny91j2siax5qbyjakl28wh";
+       version = "0.14.0";
+       sha256 = "0hdwcsv8yy1dfb2grj1haix1by8lp63mvi4vws733q2q9p9yrali";
        configureFlags = [ "-fpango" "-fvty" ];
        isLibrary = false;
        isExecutable = true;
@@ -207850,6 +208492,67 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "yi-core_0_14_0" = callPackage
+    ({ mkDerivation, array, attoparsec, base, binary, bytestring
+     , containers, criterion, data-default, deepseq, directory, dlist
+     , dynamic-state, dyre, filepath, hashable, ListLike
+     , microlens-platform, mtl, old-locale, oo-prototypes, parsec
+     , pointedlist, process, process-extras, quickcheck-text, semigroups
+     , split, tasty, tasty-hunit, tasty-quickcheck, text, text-icu, time
+     , transformers-base, unix, unix-compat, unordered-containers
+     , xdg-basedir, yi-language, yi-rope
+     }:
+     mkDerivation {
+       pname = "yi-core";
+       version = "0.14.0";
+       sha256 = "176frh7q1bd4sa1fx2dgip70a4vyla09qw5n2v58qwhpfq14zwi0";
+       libraryHaskellDepends = [
+         array attoparsec base binary bytestring containers data-default
+         directory dlist dynamic-state dyre filepath hashable ListLike
+         microlens-platform mtl old-locale oo-prototypes parsec pointedlist
+         process process-extras semigroups split text text-icu time
+         transformers-base unix unix-compat unordered-containers xdg-basedir
+         yi-language yi-rope
+       ];
+       testHaskellDepends = [
+         array attoparsec base binary bytestring containers data-default
+         directory dlist dynamic-state filepath hashable ListLike
+         microlens-platform mtl old-locale oo-prototypes parsec pointedlist
+         process process-extras quickcheck-text split tasty tasty-hunit
+         tasty-quickcheck text text-icu time transformers-base unix
+         unix-compat unordered-containers xdg-basedir yi-language yi-rope
+       ];
+       benchmarkHaskellDepends = [
+         array attoparsec base binary bytestring containers criterion
+         data-default deepseq directory dlist dynamic-state filepath
+         hashable ListLike microlens-platform mtl old-locale oo-prototypes
+         parsec pointedlist process process-extras split text text-icu time
+         transformers-base unix unix-compat unordered-containers xdg-basedir
+         yi-language yi-rope
+       ];
+       homepage = "https://github.com/yi-editor/yi#readme";
+       description = "Yi editor core library";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "yi-dynamic-configuration" = callPackage
+    ({ mkDerivation, base, dyre, microlens-platform, mtl, text
+     , transformers-base, yi-core, yi-rope
+     }:
+     mkDerivation {
+       pname = "yi-dynamic-configuration";
+       version = "0.14.0";
+       sha256 = "06gad5vi55hjbb5ifvkprnbbpd68n2y0sbjm0z0x0zaqg2srjmls";
+       libraryHaskellDepends = [
+         base dyre microlens-platform mtl text transformers-base yi-core
+         yi-rope
+       ];
+       homepage = "https://github.com/yi-editor/yi#readme";
+       description = "Dynamic configuration support for Yi";
+       license = stdenv.lib.licenses.gpl2;
+     }) {};
+
   "yi-emacs-colours" = callPackage
     ({ mkDerivation, base, containers, split, yi-language }:
      mkDerivation {
@@ -207869,8 +208572,8 @@ self: {
      }:
      mkDerivation {
        pname = "yi-frontend-pango";
-       version = "0.13.5";
-       sha256 = "1c3j6ab04bcdd1zwrdp9sxqfrhndbam4v1v4qv8yvmv1w5i5vkzj";
+       version = "0.14.0";
+       sha256 = "0zwpy1lbkw8lkxk4p162xs181n9xsp9x8h6yknklqd79lnxs4zd5";
        libraryHaskellDepends = [
          base containers filepath glib gtk microlens-platform mtl
          oo-prototypes pango pointedlist text transformers-base yi-core
@@ -207899,6 +208602,25 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "yi-frontend-vty_0_14_0" = callPackage
+    ({ mkDerivation, base, containers, data-default, dlist
+     , microlens-platform, pointedlist, stm, text, vty, yi-core
+     , yi-language, yi-rope
+     }:
+     mkDerivation {
+       pname = "yi-frontend-vty";
+       version = "0.14.0";
+       sha256 = "0055npls7dhlx68fwnhfb7kk4nzpy8vvmlpplm3m36rlvk85gyma";
+       libraryHaskellDepends = [
+         base containers data-default dlist microlens-platform pointedlist
+         stm text vty yi-core yi-language yi-rope
+       ];
+       homepage = "https://github.com/yi-editor/yi#readme";
+       description = "Vty frontend for Yi editor";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yi-fuzzy-open" = callPackage
     ({ mkDerivation, base, binary, containers, data-default, directory
      , filepath, mtl, text, transformers-base, vector, yi-core
@@ -207917,6 +208639,25 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "yi-fuzzy-open_0_14_0" = callPackage
+    ({ mkDerivation, base, binary, containers, data-default, directory
+     , filepath, mtl, text, transformers-base, vector, yi-core
+     , yi-language, yi-rope
+     }:
+     mkDerivation {
+       pname = "yi-fuzzy-open";
+       version = "0.14.0";
+       sha256 = "0plpxc4p3wa2ak32j0s8y0z6ha5x8wgnzpgzj71bs7rkaf5bf8dd";
+       libraryHaskellDepends = [
+         base binary containers data-default directory filepath mtl text
+         transformers-base vector yi-core yi-language yi-rope
+       ];
+       homepage = "https://github.com/yi-editor/yi#readme";
+       description = "Fuzzy open plugin for yi";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yi-gtk" = callPackage
     ({ mkDerivation }:
      mkDerivation {
@@ -207946,6 +208687,24 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "yi-ireader_0_14_0" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, data-default
+     , microlens-platform, text, yi-core, yi-language, yi-rope
+     }:
+     mkDerivation {
+       pname = "yi-ireader";
+       version = "0.14.0";
+       sha256 = "0lqxa4m4agha9fd9lwf8xf2cxpj8mh2q93rkjchlksrjav3khz6q";
+       libraryHaskellDepends = [
+         base binary bytestring containers data-default microlens-platform
+         text yi-core yi-language yi-rope
+       ];
+       homepage = "https://github.com/yi-editor/yi#readme";
+       description = "Yi editor incremental reader";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yi-keymap-cua" = callPackage
     ({ mkDerivation, base, microlens-platform, text, yi-core
      , yi-keymap-emacs, yi-rope
@@ -207963,6 +208722,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yi-keymap-cua_0_14_0" = callPackage
+    ({ mkDerivation, base, microlens-platform, text, yi-core
+     , yi-keymap-emacs, yi-rope
+     }:
+     mkDerivation {
+       pname = "yi-keymap-cua";
+       version = "0.14.0";
+       sha256 = "0l7r8vyigmcmp9biskf13qnn8in16s6pliwrc12lxa5ikym7r59r";
+       libraryHaskellDepends = [
+         base microlens-platform text yi-core yi-keymap-emacs yi-rope
+       ];
+       homepage = "https://github.com/yi-editor/yi#readme";
+       description = "Cua keymap for Yi editor";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yi-keymap-emacs" = callPackage
     ({ mkDerivation, base, containers, filepath, Hclip
      , microlens-platform, mtl, oo-prototypes, semigroups, text
@@ -207983,6 +208759,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yi-keymap-emacs_0_14_0" = callPackage
+    ({ mkDerivation, base, containers, filepath, Hclip
+     , microlens-platform, mtl, oo-prototypes, semigroups, text
+     , transformers-base, yi-core, yi-language, yi-misc-modes, yi-rope
+     }:
+     mkDerivation {
+       pname = "yi-keymap-emacs";
+       version = "0.14.0";
+       sha256 = "0mlizcb2aj10kfmcavdzbdli0sxq0id02ihnpr23ix4dk3wgznqn";
+       libraryHaskellDepends = [
+         base containers filepath Hclip microlens-platform mtl oo-prototypes
+         semigroups text transformers-base yi-core yi-language yi-misc-modes
+         yi-rope
+       ];
+       homepage = "https://github.com/yi-editor/yi#readme";
+       description = "Emacs keymap for Yi editor";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yi-keymap-vim" = callPackage
     ({ mkDerivation, attoparsec, base, binary, containers, data-default
      , directory, filepath, Hclip, microlens-platform, mtl
@@ -208012,6 +208808,35 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yi-keymap-vim_0_14_0" = callPackage
+    ({ mkDerivation, attoparsec, base, binary, containers, data-default
+     , directory, filepath, Hclip, microlens-platform, mtl
+     , oo-prototypes, pointedlist, QuickCheck, safe, semigroups, tasty
+     , tasty-hunit, tasty-quickcheck, text, transformers-base
+     , unordered-containers, yi-core, yi-language, yi-rope
+     }:
+     mkDerivation {
+       pname = "yi-keymap-vim";
+       version = "0.14.0";
+       sha256 = "1hy36q69a0yhkg5v0n2f2gkmbf85a9y6k5b38gdg18kdnil974q4";
+       libraryHaskellDepends = [
+         attoparsec base binary containers data-default directory filepath
+         Hclip microlens-platform mtl oo-prototypes pointedlist safe
+         semigroups text transformers-base unordered-containers yi-core
+         yi-language yi-rope
+       ];
+       testHaskellDepends = [
+         attoparsec base binary containers data-default directory filepath
+         Hclip microlens-platform mtl oo-prototypes pointedlist QuickCheck
+         safe semigroups tasty tasty-hunit tasty-quickcheck text
+         transformers-base unordered-containers yi-core yi-language yi-rope
+       ];
+       homepage = "https://github.com/yi-editor/yi#readme";
+       description = "Vim keymap for Yi editor";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yi-language" = callPackage
     ({ mkDerivation, alex, array, base, binary, containers
      , data-default, hashable, microlens-platform, oo-prototypes
@@ -208040,6 +208865,35 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "yi-language_0_14_0" = callPackage
+    ({ mkDerivation, alex, array, base, binary, containers
+     , data-default, hashable, microlens-platform, oo-prototypes
+     , pointedlist, regex-base, regex-tdfa, tasty, tasty-hspec
+     , tasty-quickcheck, template-haskell, transformers-base
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "yi-language";
+       version = "0.14.0";
+       sha256 = "1dpiqh46b2z627ry0smq4a0ynna1m166qf0yqhlh80v67myyg9jr";
+       libraryHaskellDepends = [
+         array base binary containers data-default hashable
+         microlens-platform oo-prototypes pointedlist regex-base regex-tdfa
+         template-haskell transformers-base unordered-containers
+       ];
+       libraryToolDepends = [ alex ];
+       testHaskellDepends = [
+         array base binary containers data-default hashable
+         microlens-platform pointedlist regex-base regex-tdfa tasty
+         tasty-hspec tasty-quickcheck template-haskell transformers-base
+         unordered-containers
+       ];
+       homepage = "https://github.com/yi-editor/yi#readme";
+       description = "Collection of language-related Yi libraries";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yi-misc-modes" = callPackage
     ({ mkDerivation, alex, array, base, binary, data-default, filepath
      , microlens-platform, semigroups, text, yi-core, yi-language
@@ -208060,6 +208914,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yi-misc-modes_0_14_0" = callPackage
+    ({ mkDerivation, alex, array, base, binary, data-default, filepath
+     , microlens-platform, semigroups, text, yi-core, yi-language
+     , yi-rope
+     }:
+     mkDerivation {
+       pname = "yi-misc-modes";
+       version = "0.14.0";
+       sha256 = "0khyy4iacp8fah1lrp6ffvn2vy5xxrgizd4mzdlb6shc7sliaifz";
+       libraryHaskellDepends = [
+         array base binary data-default filepath microlens-platform
+         semigroups text yi-core yi-language yi-rope
+       ];
+       libraryToolDepends = [ alex ];
+       homepage = "https://github.com/yi-editor/yi#readme";
+       description = "Yi editor miscellaneous modes";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yi-mode-haskell" = callPackage
     ({ mkDerivation, alex, array, base, binary, containers
      , data-default, filepath, hashable, hspec, microlens-platform
@@ -208088,6 +208962,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yi-mode-haskell_0_14_0" = callPackage
+    ({ mkDerivation, alex, array, base, binary, data-default, filepath
+     , microlens-platform, text, yi-core, yi-language, yi-rope
+     }:
+     mkDerivation {
+       pname = "yi-mode-haskell";
+       version = "0.14.0";
+       sha256 = "0yqwshj1hms1q2r78fi0hsqyrazy5cyv0znxcjpmx2f6mnifjxd9";
+       libraryHaskellDepends = [
+         array base binary data-default filepath microlens-platform text
+         yi-core yi-language yi-rope
+       ];
+       libraryToolDepends = [ alex ];
+       homepage = "https://github.com/yi-editor/yi#readme";
+       description = "Yi editor haskell mode";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yi-mode-javascript" = callPackage
     ({ mkDerivation, alex, array, base, binary, data-default, dlist
      , filepath, microlens-platform, mtl, text, yi-core, yi-language
@@ -208108,6 +209001,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "yi-mode-javascript_0_14_0" = callPackage
+    ({ mkDerivation, alex, array, base, binary, data-default, dlist
+     , filepath, microlens-platform, mtl, text, yi-core, yi-language
+     , yi-rope
+     }:
+     mkDerivation {
+       pname = "yi-mode-javascript";
+       version = "0.14.0";
+       sha256 = "00ap00h9lz0b2r75m0dn741aasi18455srwq6mcpbbq6j4v3jzfz";
+       libraryHaskellDepends = [
+         array base binary data-default dlist filepath microlens-platform
+         mtl text yi-core yi-language yi-rope
+       ];
+       libraryToolDepends = [ alex ];
+       homepage = "https://github.com/yi-editor/yi#readme";
+       description = "Yi editor javascript mode";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yi-monokai" = callPackage
     ({ mkDerivation, base, yi }:
      mkDerivation {
@@ -208163,6 +209076,28 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "yi-snippet_0_14_0" = callPackage
+    ({ mkDerivation, base, binary, containers, data-default, free
+     , microlens-platform, mtl, tasty-hunit, tasty-th, text, vector
+     , yi-core, yi-rope
+     }:
+     mkDerivation {
+       pname = "yi-snippet";
+       version = "0.14.0";
+       sha256 = "152g3bsy50viydnhhx4b7vyyaq4frw43cbb9r3pm56wmnk4ixn7k";
+       libraryHaskellDepends = [
+         base binary containers data-default free microlens-platform mtl
+         text vector yi-core yi-rope
+       ];
+       testHaskellDepends = [
+         base containers tasty-hunit tasty-th yi-rope
+       ];
+       homepage = "https://github.com/yi-editor/yi#readme";
+       description = "Snippet support for yi";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yi-solarized" = callPackage
     ({ mkDerivation, base, yi }:
      mkDerivation {
@@ -209073,6 +210008,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) zip;};
 
+  "zip-archive_0_3_1_1" = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, containers
+     , digest, directory, filepath, HUnit, mtl, old-time, pretty
+     , process, temporary, text, time, unix, zip, zlib
+     }:
+     mkDerivation {
+       pname = "zip-archive";
+       version = "0.3.1.1";
+       sha256 = "09c3y13r77shyamibr298i4l0rp31i41w3rg1ksnrl3gkrj8x1ly";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base binary bytestring containers digest directory filepath
+         mtl old-time pretty text time unix zlib
+       ];
+       testHaskellDepends = [
+         base bytestring directory HUnit old-time process temporary time
+         unix
+       ];
+       testToolDepends = [ zip ];
+       homepage = "http://github.com/jgm/zip-archive";
+       description = "Library for creating and modifying zip archives";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) zip;};
+
   "zip-conduit" = callPackage
     ({ mkDerivation, base, bytestring, cereal, conduit, conduit-extra
      , criterion, digest, directory, filepath, hpc, HUnit, LibZip, mtl

From 2764961b877bd9a4813d21c5b2f47cf7e00e3b4a Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 19 Jun 2017 21:21:15 -0400
Subject: [PATCH 099/189] linux: 4.12-rc5 -> 4.12-rc6

---
 pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index c56a25c3c26..6bde598c47a 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.12-rc5";
-  modDirVersion = "4.12.0-rc5";
+  version = "4.12-rc6";
+  modDirVersion = "4.12.0-rc6";
   extraMeta.branch = "4.12";
 
   src = fetchurl {
     url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz";
-    sha256 = "0d3lpf429fqrf6i529y0pjdwnpq2v82agn3xhw4jwkriib9i425x";
+    sha256 = "0yqs65kmrksphca8f959g9ca9kpdwbp3ad5v594wvwsdk0q4sqgc";
   };
 
   features.iwlwifi = true;

From 8a00d896187591cabfb38931ca65cc5b0a52dbdf Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 01:03:01 +0200
Subject: [PATCH 100/189] aubio: 0.4.4 -> 0.4.5

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

diff --git a/pkgs/development/libraries/aubio/default.nix b/pkgs/development/libraries/aubio/default.nix
index 3ea86b36a30..e13b102c788 100644
--- a/pkgs/development/libraries/aubio/default.nix
+++ b/pkgs/development/libraries/aubio/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "aubio-0.4.4";
+  name = "aubio-0.4.5";
 
   src = fetchurl {
     url = "http://aubio.org/pub/${name}.tar.bz2";
-    sha256 = "1y5zzwv9xjc649g4xrlqnim4q7pcwgzn0xrq3ijbmm5r4ckbkk9a";
+    sha256 = "1xkshac4wdm7r5sc04c38d6lmvv5sk4qrb5r1yy0xgsgdx781hkh";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Library for audio labelling";
-    homepage = http://aubio.org/;
+    homepage = https://aubio.org/;
     license = licenses.gpl2;
     maintainers = with maintainers; [ goibhniu marcweber fpletz ];
     platforms = platforms.linux;

From aea08dd53e54aead17c8de13eae2b78a754f65d2 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 01:54:40 +0200
Subject: [PATCH 101/189] kanboard: 1.0.40 -> 1.0.44

---
 pkgs/applications/misc/kanboard/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/kanboard/default.nix b/pkgs/applications/misc/kanboard/default.nix
index ba1a266a42f..2a4793bfe09 100644
--- a/pkgs/applications/misc/kanboard/default.nix
+++ b/pkgs/applications/misc/kanboard/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "kanboard-${version}";
-  version = "1.0.40";
+  version = "1.0.44";
 
   src = fetchzip {
-    url = "https://kanboard.net/kanboard-1.0.40.zip";
-    sha256 = "1phn3rvngch636g00rhicl0225qk6gdmxqjflkrdchv299zysswd";
+    url = "https://kanboard.net/${name}.zip";
+    sha256 = "1cwk9gcwddwbbw6hz2iqmkmy90rwddy79b9vi6fj9cl03zswypgn";
   };
 
   dontBuild = true;

From 21b509396654c5f8740300cd74c486016f7c5c96 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 01:55:10 +0200
Subject: [PATCH 102/189] libite: 1.8.2 -> 1.8.3

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

diff --git a/pkgs/development/libraries/libite/default.nix b/pkgs/development/libraries/libite/default.nix
index 39806d7d22c..72b4469058c 100644
--- a/pkgs/development/libraries/libite/default.nix
+++ b/pkgs/development/libraries/libite/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "libite-${version}";
-  version = "1.8.2";
+  version = "1.8.3";
 
   src = fetchFromGitHub {
     owner = "troglobit";
     repo = "libite";
     rev = "v${version}";
-    sha256 = "0cx566rcjq2m24yq7m88ci642x34lxy97kjb12cbi1c174k738hm";
+    sha256 = "040idgbjqr239rkd68rqzwhylryiaa0z3qkwj2l2mlscv0aq8v0j";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From 19a840cb66ef2b3a5cd484b382bc7bd769810229 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 01:55:40 +0200
Subject: [PATCH 103/189] jenkins: 2.65 -> 2.66

---
 .../tools/continuous-integration/jenkins/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix
index 2737329121a..8be5c6ebe85 100644
--- a/pkgs/development/tools/continuous-integration/jenkins/default.nix
+++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "jenkins-${version}";
-  version = "2.65";
+  version = "2.66";
 
   src = fetchurl {
     url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war";
-    sha256 = "0ydg8crv8a4lg2y8dihflxcb3b2fxn6ds70c9l1vwmb8j29wsli6";
+    sha256 = "05n03rm5vjzcz1f36829hwviw7i8l8d728nvr4cnf6mcl3rxciyl";
   };
 
   buildCommand = ''

From 60cddbe3da70b5b677a545966286e1acfd5a7a5e Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 01:56:06 +0200
Subject: [PATCH 104/189] screen-message: 0.24 -> 0.25

---
 pkgs/tools/X11/screen-message/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/X11/screen-message/default.nix b/pkgs/tools/X11/screen-message/default.nix
index 1bb381826a1..fd5cfe03ea3 100644
--- a/pkgs/tools/X11/screen-message/default.nix
+++ b/pkgs/tools/X11/screen-message/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "screen-message-${version}";
-  version = "0.24";
+  version = "0.25";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/s/screen-message/screen-message_${version}.orig.tar.gz";
-    sha256 = "1v03axr7471fmzxccl3ckv73j8gfcj615y5maxvm5phy0sd6rl49";
+    sha256 = "1lw955qq5pq010lzmaf32ylj2iprgsri9ih4hx672c3f794ilab0";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From 7f1fc9f838b3bf12525a5b7007ace86ba614c4a4 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 01:56:37 +0200
Subject: [PATCH 105/189] collectd: 5.7.0 -> 5.7.2

---
 pkgs/tools/system/collectd/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix
index 7d649256f86..4aa5aee4c27 100644
--- a/pkgs/tools/system/collectd/default.nix
+++ b/pkgs/tools/system/collectd/default.nix
@@ -35,12 +35,12 @@
 , libmnl ? null
 }:
 stdenv.mkDerivation rec {
-  version = "5.7.0";
+  version = "5.7.2";
   name = "collectd-${version}";
 
   src = fetchurl {
     url = "http://collectd.org/files/${name}.tar.bz2";
-    sha256 = "1cpjkv4d0iifngihxikzljavya0r2k3blarlahamgbdsqsymz815";
+    sha256 = "14p5cc3ys3qfg71xzxfvmxdmz5l4brpbhlmw1fwdda392lia084x";
   };
 
   buildInputs = [
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Daemon which collects system performance statistics periodically";
-    homepage = http://collectd.org;
+    homepage = https://collectd.org;
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = with maintainers; [ bjornfor fpletz ];

From 42dcabf4140dbaaaee4a69b101ca200c7e7b3048 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 01:57:04 +0200
Subject: [PATCH 106/189] mitmproxy: 2.0.0 -> 2.0.2

---
 pkgs/tools/networking/mitmproxy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/mitmproxy/default.nix b/pkgs/tools/networking/mitmproxy/default.nix
index 83a526a5535..36bb9cb791b 100644
--- a/pkgs/tools/networking/mitmproxy/default.nix
+++ b/pkgs/tools/networking/mitmproxy/default.nix
@@ -3,13 +3,13 @@
 python3Packages.buildPythonPackage rec {
   baseName = "mitmproxy";
   name = "${baseName}-${version}";
-  version = "2.0.0";
+  version = "2.0.2";
 
   src = fetchFromGitHub {
     owner = baseName;
     repo = baseName;
     rev = "v${version}";
-    sha256 = "17gvr642skz4a23966lckdbrkh6mx31shi8hmakkvi91sa869i30";
+    sha256 = "1x1a28al5clpfd69rjcpw26gjjnpsm1vfl4scrwpdd1jhkw044h9";
   };
 
   propagatedBuildInputs = with python3Packages; [

From 99bd99db3d73185214862b0ff6a7704bcfb1e196 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 01:57:23 +0200
Subject: [PATCH 107/189] bzflag: 2.4.8 -> 2.4.10

---
 pkgs/games/bzflag/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/bzflag/default.nix b/pkgs/games/bzflag/default.nix
index d3792843d47..1269b434634 100644
--- a/pkgs/games/bzflag/default.nix
+++ b/pkgs/games/bzflag/default.nix
@@ -4,11 +4,11 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "bzflag";
-  version = "2.4.8";
+  version = "2.4.10";
 
   src = fetchurl {
     url = "https://download.bzflag.org/${pname}/source/${version}/${name}.tar.bz2";
-    sha256 = "08iiw0i0vx68d73hliiylswsm0nvnm849k37xc7iii6sflblvjj3";
+    sha256 = "1ylyd5safpraaym9fvnrqj2506dqrraaaqhrb2aa9zmjwi54aiqa";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "Multiplayer 3D Tank game";
-    homepage = http://bzflag.org/;
+    homepage = https://bzflag.org/;
     license = licenses.lgpl21Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ fpletz ];

From c34d43a4ce6f9eb92bb066de63d56f003b651478 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 01:57:42 +0200
Subject: [PATCH 108/189] openttd: 1.6.1 -> 1.7.1

---
 pkgs/games/openttd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix
index 0c129f8d556..2ecff1c835e 100644
--- a/pkgs/games/openttd/default.nix
+++ b/pkgs/games/openttd/default.nix
@@ -29,11 +29,11 @@ let
 in
 stdenv.mkDerivation rec {
   name = "openttd-${version}";
-  version = "1.6.1";
+  version = "1.7.1";
 
   src = fetchurl {
     url = "http://binaries.openttd.org/releases/${version}/${name}-source.tar.xz";
-    sha256 = "1ak32fj5xkk2fvmm3g8i7wzmk4bh2ijsp8fzvvw5wj6365p9j24v";
+    sha256 = "0dhv5bbbg1dmmq7fi3xss0a9jq2rqgb5sf9fsqzlsjcdm590j6b1";
   };
 
   nativeBuildInputs = [ pkgconfig makeWrapper ];

From 735dcc1a27d471a98acf2e5fcb4d9b5a0e995ca1 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 01:57:55 +0200
Subject: [PATCH 109/189] charybdis: 3.5.3 -> 3.5.5

---
 pkgs/servers/irc/charybdis/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/irc/charybdis/default.nix b/pkgs/servers/irc/charybdis/default.nix
index f63fecb66c8..b2288336d57 100644
--- a/pkgs/servers/irc/charybdis/default.nix
+++ b/pkgs/servers/irc/charybdis/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub, bison, flex, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "charybdis-3.5.3";
+  name = "charybdis-3.5.5";
 
   src = fetchFromGitHub {
     owner = "charybdis-ircd";
     repo = "charybdis";
     rev = name;
-    sha256 = "1s8p26lrc5vm08gi6hc5gqidgyj7v5bzm4d2g81v4xk387f85lnc";
+    sha256 = "16bl516hcj1chgzkfnpg9bf9s6zr314pqzhlz6641lgyzaw1z3w0";
   };
 
   patches = [

From ed71a3a6785a9901e59bda5118e1f9a1fa341acc Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 01:58:15 +0200
Subject: [PATCH 110/189] chrony: 3.0 -> 3.1

---
 pkgs/tools/networking/chrony/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix
index 32a8ca5f99e..b805a4bfcf3 100644
--- a/pkgs/tools/networking/chrony/default.nix
+++ b/pkgs/tools/networking/chrony/default.nix
@@ -6,11 +6,11 @@ assert stdenv.isLinux -> libcap != null;
 stdenv.mkDerivation rec {
   name = "chrony-${version}";
 
-  version = "3.0";
+  version = "3.1";
 
   src = fetchurl {
     url = "http://download.tuxfamily.org/chrony/${name}.tar.gz";
-    sha256 = "0vfdsajz2w6b7c94rxrj7fsr234jryhl2rbdlmb7h10gla8pnf50";
+    sha256 = "0xb03dya1zhcn1gch2v2ynifxw95g8m3plr9q4ys0s3pvgf0g4cx";
   };
 
   buildInputs = [ readline texinfo nss nspr ]
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Sets your computer's clock from time servers on the Net";
-    homepage = http://chrony.tuxfamily.org/;
+    homepage = https://chrony.tuxfamily.org/;
     repositories.git = git://git.tuxfamily.org/gitroot/chrony/chrony.git;
     license = licenses.gpl2;
     platforms = with platforms; linux ++ freebsd ++ openbsd;

From bc3ee6bfd47a3bab4c9491da51c550f4ec49106d Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 01:58:31 +0200
Subject: [PATCH 111/189] dnsmasq: 2.76 -> 2.77

---
 pkgs/tools/networking/dnsmasq/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix
index 4b1717e0902..801d41c852b 100644
--- a/pkgs/tools/networking/dnsmasq/default.nix
+++ b/pkgs/tools/networking/dnsmasq/default.nix
@@ -11,11 +11,11 @@ let
   ]);
 in
 stdenv.mkDerivation rec {
-  name = "dnsmasq-2.76";
+  name = "dnsmasq-2.77";
 
   src = fetchurl {
     url = "http://www.thekelleys.org.uk/dnsmasq/${name}.tar.xz";
-    sha256 = "15lzih6671gh9knzpl8mxchiml7z5lfqzr7jm2r0rjhrxs6nk4jb";
+    sha256 = "12lbbwpy1wxi6n5dngv30x8g8v13apdnvjgq7w71f9dfa0f3pb3f";
   };
 
   preBuild = ''

From e7f5e7fe3b9faa58c4f9b050456a066719c5e693 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 01:58:50 +0200
Subject: [PATCH 112/189] whois: 5.2.15 -> 5.2.16

---
 pkgs/tools/networking/whois/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix
index ec573dadc64..fd1045d03d9 100644
--- a/pkgs/tools/networking/whois/default.nix
+++ b/pkgs/tools/networking/whois/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, perl, gettext }:
 
 stdenv.mkDerivation rec {
-  version = "5.2.15";
+  version = "5.2.16";
   name = "whois-${version}";
 
   src = fetchFromGitHub {
     owner = "rfc1036";
     repo = "whois";
     rev = "v${version}";
-    sha256 = "0via0ls9lqmzvbbfq4zyla7si45nvkhdx0f516739f9b1jmffj04";
+    sha256 = "1axkj3xp8ryw94ml8lkqgpdqkv56aygbyv18kynf2bcglxildyvv";
   };
 
   buildInputs = [ perl gettext ];

From 11bf721290903950a124d3741f34c2665ba52508 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 01:59:14 +0200
Subject: [PATCH 113/189] mbedtls_1_3: 1.3.18 -> 1.3.19

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

diff --git a/pkgs/development/libraries/mbedtls/1.3.nix b/pkgs/development/libraries/mbedtls/1.3.nix
index 41c0e0a9d16..e89fabb9fb3 100644
--- a/pkgs/development/libraries/mbedtls/1.3.nix
+++ b/pkgs/development/libraries/mbedtls/1.3.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
-  name = "mbedtls-1.3.18";
+  name = "mbedtls-1.3.19";
 
   src = fetchurl {
     url = "https://tls.mbed.org/download/${name}-gpl.tgz";
-    sha256 = "188fjm0zzggxrjxnqc7zv7zz8pvys6yp1jx3xdyq8970h9qj2ad2";
+    sha256 = "03mhlh8s2378ph23m1173i7wkhrs5i6d03mk5wa7a1d3qn24jrar";
   };
 
   nativeBuildInputs = [ perl ];

From aa583079736aea10f15cf14c0574c60a8298d48d Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 01:59:37 +0200
Subject: [PATCH 114/189] mbedtls: 2.4.0 -> 2.4.2

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

diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix
index ebab4850be4..c5eab3f74b5 100644
--- a/pkgs/development/libraries/mbedtls/default.nix
+++ b/pkgs/development/libraries/mbedtls/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
-  name = "mbedtls-2.4.0";
+  name = "mbedtls-2.4.2";
 
   src = fetchurl {
     url = "https://tls.mbed.org/download/${name}-gpl.tgz";
-    sha256 = "0gwyxsz7av8fyzrz4zxhcy9jmszlvg9zskz3srar75lg0bhg1vw0";
+    sha256 = "17r9qs585gqghcf5yavb1cnvsigl0f8r0k8rklr5a855hrajs7yh";
   };
 
   nativeBuildInputs = [ perl ];

From 05cb49625d1712a3ee7658a2c59d12a5fc87ebcc Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 01:59:52 +0200
Subject: [PATCH 115/189] powertop: 2.8 -> 2.9

---
 pkgs/os-specific/linux/powertop/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix
index 4d81126af44..5a10f455ea0 100644
--- a/pkgs/os-specific/linux/powertop/default.nix
+++ b/pkgs/os-specific/linux/powertop/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, gettext, libnl, ncurses, pciutils, pkgconfig, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "powertop-2.8";
+  name = "powertop-${version}";
+  version = "2.9";
 
   src = fetchurl {
-    url = "https://01.org/sites/default/files/downloads/powertop/${name}.tar.gz";
-    sha256 = "0nlwazxbnn0k6q5f5b09wdhw0f194lpzkp3l7vxansqhfczmcyx8";
+    url = "https://01.org/sites/default/files/downloads/powertop/powertop-v${version}.tar.gz";
+    sha256 = "0l4jjlf05li2mc6g8nrss3h435wjhmnqd8m7v3kha3x0x7cbfzxa";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From e60c958811186e46d9220cca8ce9700da174d9a1 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 02:00:14 +0200
Subject: [PATCH 116/189] prometheus: 1.5.2 -> 1.7.1

---
 pkgs/servers/monitoring/prometheus/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix
index 5d7a75b2013..63ea093b4bb 100644
--- a/pkgs/servers/monitoring/prometheus/default.nix
+++ b/pkgs/servers/monitoring/prometheus/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "prometheus-${version}";
-  version = "1.5.2";
+  version = "1.7.1";
   rev = "v${version}";
 
   goPackagePath = "github.com/prometheus/prometheus";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "prometheus";
     repo = "prometheus";
-    sha256 = "1b24nx6gmx2c7fj92p2byla3i0zs6xwymxqji00gvgpxr8bsfhn1";
+    sha256 = "11acdwn2fw5qnyns5vdbxw18xnd2v4hb1y2cfjjxw478hhza4ni3";
   };
 
   docheck = true;

From 294a20ea02e58d0ed47379a9f285ab3221d031bd Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 02:00:30 +0200
Subject: [PATCH 117/189] smcroute: 2.1.0 -> 2.3.1

---
 pkgs/servers/smcroute/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/smcroute/default.nix b/pkgs/servers/smcroute/default.nix
index 9a6423652b6..db47dc99468 100644
--- a/pkgs/servers/smcroute/default.nix
+++ b/pkgs/servers/smcroute/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "smcroute-${version}";
-  version = "2.1.0";
+  version = "2.3.1";
 
   src = fetchFromGitHub {
     owner = "troglobit";
     repo = "smcroute";
     rev = version;
-    sha256 = "0mmwvjqbzhzwii4g6rz3ms9fhzppnhbsrhr4jqpih2y95cz039gg";
+    sha256 = "0a1sgf9p39gbfrh7bhfg1hjqa6y18i7cig7bffmv7spqnvb50zx5";
   };
 
   nativeBuildInputs = [ autoreconfHook ];

From fcbf28d6b55aef837db6ab885efb4f915bbcf0e5 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 02:00:48 +0200
Subject: [PATCH 118/189] squid: 3.5.23 -> 3.5.26

---
 pkgs/servers/squid/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/squid/default.nix b/pkgs/servers/squid/default.nix
index b64dfeda667..eeec9048689 100644
--- a/pkgs/servers/squid/default.nix
+++ b/pkgs/servers/squid/default.nix
@@ -2,11 +2,11 @@
 , expat, libxml2, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "squid-3.5.23";
+  name = "squid-3.5.26";
 
   src = fetchurl {
     url = "http://www.squid-cache.org/Versions/v3/3.5/${name}.tar.xz";
-    sha256 = "1nqbljph2mbxjy1jzsis5vplfvvc2y6rdlxy609zx4hyyjchqk7s";
+    sha256 = "10m9g7wcik11gv7xqpv9wbkmmfbwxs00s1jm8hgqh63fgp5yx8ds";
   };
 
   buildInputs = [

From a7210764eb29e0fb5f15d46e1f732a500e9ed832 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 02:01:17 +0200
Subject: [PATCH 119/189] squid4: 4.0.17 -> 4.0.20

---
 pkgs/servers/squid/4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/squid/4.nix b/pkgs/servers/squid/4.nix
index 52fcad7ff95..f8c735d879b 100644
--- a/pkgs/servers/squid/4.nix
+++ b/pkgs/servers/squid/4.nix
@@ -2,11 +2,11 @@
 , expat, libxml2, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "squid-4.0.17";
+  name = "squid-4.0.20";
 
   src = fetchurl {
     url = "http://www.squid-cache.org/Versions/v4/${name}.tar.xz";
-    sha256 = "1713fqw59r3d892p5hpbkhmfcaw6jzfnngfn5f4h46sx963k87wb";
+    sha256 = "1apb496psfv513fad82m52s6x7l74lsdq2dkzifmfgh3zrlc7r9i";
   };
 
   buildInputs = [

From eb8c14751a3532898e7941ee43a271d8739a6a21 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 02:01:38 +0200
Subject: [PATCH 120/189] lxc: 2.0.7 -> 2.0.8

---
 pkgs/os-specific/linux/lxc/default.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix
index bab7038aa47..1d432f9bbd9 100644
--- a/pkgs/os-specific/linux/lxc/default.nix
+++ b/pkgs/os-specific/linux/lxc/default.nix
@@ -12,11 +12,11 @@ in
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "lxc-${version}";
-  version = "2.0.7";
+  version = "2.0.8";
 
   src = fetchurl {
     url = "https://linuxcontainers.org/downloads/lxc/lxc-${version}.tar.gz";
-    sha256 = "0paz0lgb9dzpgahysad1cr6gz54l6xyhqdx6dzw2kh3fy1sw028w";
+    sha256 = "15449r56rqg3487kzsnfvz0w4p5ajrq0krcsdh6c9r6g0ark93hd";
   };
 
   nativeBuildInputs = [
@@ -29,13 +29,12 @@ stdenv.mkDerivation rec {
 
   patches = [
     ./support-db2x.patch
-    (fetchurl {
-      name = "CVE-2017-5985.patch";
-      url = "https://github.com/lxc/lxc/commit/d512bd5efb0e407eba350c4e649c464a65b712a3.patch";
-      sha256 = "0v1rhlfviadsxj2wmbl7nqb64p6y2bxm9y43sc44jg3k6mkr0r5c";
-    })
   ];
 
+  postPatch = ''
+    sed -i '/chmod u+s/d' src/lxc/Makefile.am
+  '';
+
   XML_CATALOG_FILES = "${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml";
 
   # FIXME
@@ -81,7 +80,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = "http://lxc.sourceforge.net";
+    homepage = "https://linuxcontainers.org/";
     description = "Userspace tools for Linux Containers, a lightweight virtualization system";
     license = licenses.lgpl21Plus;
 

From 9da4cb176ad08b1a370e01defcbe36e6ce78d69d Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 02:01:53 +0200
Subject: [PATCH 121/189] lxcfs: 2017-03-02 -> 2.0.7

---
 pkgs/os-specific/linux/lxcfs/default.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/lxcfs/default.nix b/pkgs/os-specific/linux/lxcfs/default.nix
index 2555ce5c6c3..c23457c6b5f 100644
--- a/pkgs/os-specific/linux/lxcfs/default.nix
+++ b/pkgs/os-specific/linux/lxcfs/default.nix
@@ -2,15 +2,13 @@
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  # use unstable because it fixed some serious crashes,
-  # stable should be reconsidered in future
-  name = "lxcfs-unstable-2017-03-02";
+  name = "lxcfs-2.0.7";
 
   src = fetchFromGitHub {
     owner = "lxc";
     repo = "lxcfs";
-    sha256 = "1say5bf6gknzs0aymvrg2xiypc311gcdcfdmvb2vnz058pmianq9";
-    rev = "4a6707e130b4b65a33606ebc18a95ec471f4bf40";
+    rev = name;
+    sha256 = "1z6d52dc12rcplgc9jdgi3lbxm6ahlsjgs1k8v8kvn261xsq1m0a";
   };
 
   nativeBuildInputs = [ pkgconfig help2man autoreconfHook ];
@@ -34,6 +32,6 @@ stdenv.mkDerivation rec {
     description = "FUSE filesystem for LXC";
     license = licenses.asl20;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ mic92 ];
+    maintainers = with maintainers; [ mic92 fpletz ];
   };
 }

From c9268482e0cec8fe7456fefc975ae0d41361ec9a Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 02:02:54 +0200
Subject: [PATCH 122/189] lxd: 2.12 -> 2.14

---
 pkgs/tools/admin/lxd/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix
index cba686f9c4c..1aec4209b4d 100644
--- a/pkgs/tools/admin/lxd/default.nix
+++ b/pkgs/tools/admin/lxd/default.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "lxd-${version}";
-  version = "2.12";
+  version = "2.14";
   rev = "lxd-${version}";
 
   goPackagePath = "github.com/lxc/lxd";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     inherit rev;
     owner = "lxc";
     repo = "lxd";
-    sha256 = "1znqsf6iky21kddvl13bf0lsj65czabwysdbvha24lm16s51mv0p";
+    sha256 = "1jy60lb2m0497bnjj09qvflsj2rb0jjmlb8pm1xn5g4lpzibszjm";
   };
 
   goDeps = ./deps.nix;
@@ -21,7 +21,7 @@ buildGoPackage rec {
 
   meta = with stdenv.lib; {
     description = "Daemon based on liblxc offering a REST API to manage containers";
-    homepage = https://github.com/lxc/lxd;
+    homepage = https://linuxcontainers.org/lxd/;
     license = licenses.asl20;
     maintainers = with maintainers; [ globin fpletz ];
     platforms = platforms.linux;

From 65b3f5e8e7000c2d945e812fdf0f0d2310795f52 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 02:22:20 +0200
Subject: [PATCH 123/189] kea: 1.1.0 -> 1.2.0

---
 pkgs/tools/networking/kea/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/kea/default.nix b/pkgs/tools/networking/kea/default.nix
index ca1846edb04..8a474812e19 100644
--- a/pkgs/tools/networking/kea/default.nix
+++ b/pkgs/tools/networking/kea/default.nix
@@ -4,11 +4,11 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "kea";
-  version = "1.1.0";
+  version = "1.2.0";
 
   src = fetchurl {
     url = "https://ftp.isc.org/isc/${pname}/${version}/${name}.tar.gz";
-    sha256 = "0b9w71d7pfgr0asqpffh9h935xpvwabyfdvdzqzna6da9zp7mnf3";
+    sha256 = "0afiab6c8cw0w3m0l4hrc4g8bs9y3z59fdr16xnba01nn52mkl92";
   };
 
   patches = [ ./dont-create-var.patch ];

From ffb0ddc51607913fdb144863c048eb89d7f1a10e Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 02:31:25 +0200
Subject: [PATCH 124/189] bandwidth: 1.3.1 -> 1.4.2

---
 pkgs/tools/misc/bandwidth/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/bandwidth/default.nix b/pkgs/tools/misc/bandwidth/default.nix
index 8b0e1719196..143918baa9c 100644
--- a/pkgs/tools/misc/bandwidth/default.nix
+++ b/pkgs/tools/misc/bandwidth/default.nix
@@ -11,11 +11,11 @@ let
 in
 stdenv.mkDerivation rec {
   name = "bandwidth-${version}";
-  version = "1.3.1";
+  version = "1.4.2";
 
   src = fetchurl {
     url = "http://zsmith.co/archives/${name}.tar.gz";
-    sha256 = "13a0mxrkybpwiynv4cj8wsy8zl5xir5xi1a03fzam5gw815dj4am";
+    sha256 = "1p1kp5s3fdgy667q7mc9ywnps0sbj4lpr42561yhi59m69n8c3kd";
   };
 
   buildInputs = [ nasm ];

From d7624d667733aac9059fbd190a8dafb61df8bb72 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 02:37:28 +0200
Subject: [PATCH 125/189] icecast: 2.4.1 -> 2.4.3

---
 pkgs/servers/icecast/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/icecast/default.nix b/pkgs/servers/icecast/default.nix
index d241b59c3fe..f1bd1a4c9d8 100644
--- a/pkgs/servers/icecast/default.nix
+++ b/pkgs/servers/icecast/default.nix
@@ -3,11 +3,11 @@
 , libvorbis, libtheora, speex, libkate, libopus }:
 
 stdenv.mkDerivation rec {
-  name = "icecast-2.4.1";
+  name = "icecast-2.4.3";
 
   src = fetchurl {
     url = "http://downloads.xiph.org/releases/icecast/${name}.tar.gz";
-    sha256 = "0js5lylrgklhvvaksx46zc8lc975qb1bns8h1ms545nv071rxy23";
+    sha256 = "14n5vm2xnyn8y7kl46lnnlgv6v5fjykhc57ffdsh0qaxfs6a8p68";
   };
 
   buildInputs = [ libxml2 libxslt curl libvorbis libtheora speex libkate libopus ];

From 1ae0f2a1d4f773e34fba76f329baf237276af422 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 02:43:36 +0200
Subject: [PATCH 126/189] ipmitool: 1.8.17 -> 1.8.18

---
 pkgs/tools/system/ipmitool/default.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/system/ipmitool/default.nix b/pkgs/tools/system/ipmitool/default.nix
index dcbea515677..fe411edfcda 100644
--- a/pkgs/tools/system/ipmitool/default.nix
+++ b/pkgs/tools/system/ipmitool/default.nix
@@ -1,15 +1,15 @@
-{ fetchurl, stdenv, openssl, static ? false }:
+{ stdenv, lib, fetchurl, openssl, static ? false }:
 
 let
   pkgname = "ipmitool";
-  version = "1.8.17";
+  version = "1.8.18";
 in
 stdenv.mkDerivation {
   name = "${pkgname}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/${pkgname}/${pkgname}-${version}.tar.gz";
-    sha256 = "0qcrz1d1dbjg46n3fj6viglzcxlf2q15xa7bx9w1hm2hq1r3jzbi";
+    sha256 = "0kfh8ny35rvwxwah4yv91a05qwpx74b5slq2lhrh71wz572va93m";
   };
 
   patchPhase = stdenv.lib.optionalString stdenv.isDarwin ''
@@ -28,10 +28,11 @@ stdenv.mkDerivation {
   makeFlags = if static then "AM_LDFLAGS=-all-static" else "";
   dontDisableStatic = static;
 
-  meta = {
+  meta = with lib; {
     description = ''Command-line interface to IPMI-enabled devices'';
-    license = stdenv.lib.licenses.bsd3;
-    homepage = http://ipmitool.sourceforge.net;
-    platforms = stdenv.lib.platforms.unix;
+    license = licenses.bsd3;
+    homepage = https://sourceforge.net/projects/ipmitool/;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ fpletz ];
   };
 }

From c8948e9109f37dc8ef8ed0a9739ffb323a2b67a5 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 02:50:03 +0200
Subject: [PATCH 127/189] josm: 11826 -> 12275

---
 pkgs/applications/misc/josm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix
index 753d27b3376..b53a49d584d 100644
--- a/pkgs/applications/misc/josm/default.nix
+++ b/pkgs/applications/misc/josm/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "josm-${version}";
-  version = "11826";
+  version = "12275";
 
   src = fetchurl {
     url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
-    sha256 = "0x59n6klkxkaqcqgbkscdynyp0grfxdil2fxmg710yp8vkzg0zk2";
+    sha256 = "14y8ga1g3s9234zcgan16sw6va19jlwhfq39z0ayqmzna0fxi88a";
   };
 
   phases = [ "installPhase" ];
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "An extensible editor for ​OpenStreetMap";
+    description = "An extensible editor for OpenStreetMap";
     homepage = https://josm.openstreetmap.de/;
     license = licenses.gpl2Plus;
     maintainers = [ maintainers.rycee ];

From 5d851e8be820bb4ec12bafb331426445c1c283ca Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 02:55:48 +0200
Subject: [PATCH 128/189] ipv6calc: 0.99.1 -> 0.99.2

---
 pkgs/tools/networking/ipv6calc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/ipv6calc/default.nix b/pkgs/tools/networking/ipv6calc/default.nix
index e41b65d3d25..aea77f72512 100644
--- a/pkgs/tools/networking/ipv6calc/default.nix
+++ b/pkgs/tools/networking/ipv6calc/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "ipv6calc-${version}";
-  version = "0.99.1";
+  version = "0.99.2";
 
   src = fetchurl {
     url = "ftp://ftp.deepspace6.net/pub/ds6/sources/ipv6calc/${name}.tar.gz";
-    sha256 = "0a0xpai14y969hp6l10r2wcd16sqf3v40fq5h97m4a69hcpmvg5h";
+    sha256 = "1vs64v8v5g9rskg46baqrzyay86vs7ln3i5r5ippa9l6ildyrvpj";
   };
 
   buildInputs = [ geoip geolite-legacy getopt ip2location-c openssl ];

From 726645a94f8f6f276ce3b2c0280571371e3b7535 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 03:01:26 +0200
Subject: [PATCH 129/189] tpacpi-bat: 3.0 -> 3.1

---
 pkgs/os-specific/linux/tpacpi-bat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/tpacpi-bat/default.nix b/pkgs/os-specific/linux/tpacpi-bat/default.nix
index bf60331d8ad..fbc1685c577 100644
--- a/pkgs/os-specific/linux/tpacpi-bat/default.nix
+++ b/pkgs/os-specific/linux/tpacpi-bat/default.nix
@@ -3,13 +3,13 @@
 # Requires the acpi_call kernel module in order to run.
 stdenv.mkDerivation rec {
   name = "tpacpi-bat-${version}";
-  version = "3.0";
+  version = "3.1";
 
   src = fetchFromGitHub {
     owner = "teleshoes";
     repo = "tpacpi-bat";
     rev = "v${version}";
-    sha256 = "0l72qvjk5j7sg9x4by7an0xwx65x10dx82fky8lnwlwfv54vgg8l";
+    sha256 = "0wbaz34z99gqx721alh5vmpxpj2yxg3x9m8jqyivfi1wfpwc2nd5";
   };
 
   buildInputs = [ perl ];

From 83a4180947cd2e774fcbb857c74459ad56076dde Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 03:18:19 +0200
Subject: [PATCH 130/189] thc-hydra: 8.2 -> 8.5

---
 pkgs/tools/security/thc-hydra/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/thc-hydra/default.nix b/pkgs/tools/security/thc-hydra/default.nix
index 7fcde2a0350..e8eb3aacd3e 100644
--- a/pkgs/tools/security/thc-hydra/default.nix
+++ b/pkgs/tools/security/thc-hydra/default.nix
@@ -6,11 +6,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "thc-hydra-${version}";
-  version = "8.2";
+  version = "8.5";
 
   src = fetchurl {
     url = "http://www.thc.org/releases/hydra-${version}.tar.gz";
-    sha256 = "1i2a5glmrxdjr80gfppx6wgakflcpj3ksgng212fjzhxr9m4k24y";
+    sha256 = "0vfx6xwmw0r7nd0s232y7rckcj58fc1iqjgp4s56rakpz22b4yjm";
   };
 
   preConfigure = ''

From 22e0683aa8909b33953cd7d1acd91389897c165d Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 03:19:34 +0200
Subject: [PATCH 131/189] thermald: 1.5.4 -> 1.6

---
 pkgs/tools/system/thermald/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/thermald/default.nix b/pkgs/tools/system/thermald/default.nix
index ddd6740c983..983c881d388 100644
--- a/pkgs/tools/system/thermald/default.nix
+++ b/pkgs/tools/system/thermald/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "thermald-${version}";
-  version = "1.5.4";
+  version = "1.6";
 
   src = fetchFromGitHub {
     owner = "01org";
     repo = "thermal_daemon";
     rev = "v${version}";
-    sha256 = "0yrlnm1blfxi97af4dbx6xm5w1p8r20raiim1ng08gbqbgnjg56g";
+    sha256 = "1qzvmzkzdrmwrzfbxb2rz1i39j5zskjxiiv1w9m0xyg08p2wr7h3";
   };
 
   buildInputs = [ autoconf automake libtool pkgconfig dbus_libs dbus_glib libxml2 ];

From f33708bb7d7e0b7b417afebaf9ce27df17cbff55 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 03:25:43 +0200
Subject: [PATCH 132/189] opusTools: 0.1.9 -> 0.1.10

---
 pkgs/applications/audio/opus-tools/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/opus-tools/default.nix b/pkgs/applications/audio/opus-tools/default.nix
index cee86f45685..658ba1700f2 100644
--- a/pkgs/applications/audio/opus-tools/default.nix
+++ b/pkgs/applications/audio/opus-tools/default.nix
@@ -1,13 +1,14 @@
 {stdenv, fetchurl, libogg, libao, pkgconfig, libopus, flac}:
 
 stdenv.mkDerivation rec {
-  name = "opus-tools-0.1.9";
+  name = "opus-tools-0.1.10";
   src = fetchurl {
     url = "http://downloads.xiph.org/releases/opus/${name}.tar.gz";
-    sha256 = "0fk4nknvl111k89j5yckmyrh6b2wvgyhrqfncp7rig3zikbkv1xi";
+    sha256 = "135jfb9ny3xvd27idsxj7j5ns90lslbyrq70cq3bfwcls4r7add2";
   };
 
-  buildInputs = [ libogg libao pkgconfig libopus flac ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ libogg libao libopus flac ];
 
   meta = {
     description = "Tools to work with opus encoded audio streams";

From 22fbdc90328f93769ce9c7990d3d3f43f7240826 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 03:26:14 +0200
Subject: [PATCH 133/189] uhd: 3.10.1 -> 3.10.1.1

---
 pkgs/development/tools/misc/uhd/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/misc/uhd/default.nix b/pkgs/development/tools/misc/uhd/default.nix
index 8857e1d1e91..e3af8181601 100644
--- a/pkgs/development/tools/misc/uhd/default.nix
+++ b/pkgs/development/tools/misc/uhd/default.nix
@@ -9,7 +9,7 @@
 
 stdenv.mkDerivation rec {
   name = "uhd-${version}";
-  version = "3.10.1";
+  version = "3.10.1.1";
 
   # UHD seems to use three different version number styles: x.y.z, xxx_yyy_zzz
   # and xxx.yyy.zzz. Hrmpf...
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "EttusResearch";
     repo = "uhd";
-    rev = "release_003_010_001_000";
-    sha256 = "1wypn1cspwx331ah7awajjhnpyjykiif0h1l4fb3lahxvsnkwi51";
+    rev = "release_003_010_001_001";
+    sha256 = "009pynjfpwbf3vfyg4w5yhcn4xb93afagqb3p5svjxzswh90j1d2";
   };
 
   enableParallelBuilding = true;
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
       USRP devices are designed and sold by Ettus Research, LLC and its parent
       company, National Instruments.
     '';
-    homepage = http://ettus-apps.sourcerepo.com/redmine/ettus/projects/uhd/wiki;
+    homepage = https://uhd.ettus.com/;
     license = licenses.gpl3Plus;
     platforms = platforms.linux;
     maintainers = with maintainers; [ bjornfor fpletz ];

From 1466bdd98fc6eef0c42d41d1284d5233dc307eef Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 03:39:39 +0200
Subject: [PATCH 134/189] wireshark: 2.2.6 -> 2.2.7

---
 pkgs/applications/networking/sniffers/wireshark/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index 4e5d9893c2c..326529d1e0f 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -12,7 +12,7 @@ assert withQt  -> !withGtk && qt5  != null;
 with stdenv.lib;
 
 let
-  version = "2.2.6";
+  version = "2.2.7";
   variant = if withGtk then "gtk" else if withQt then "qt" else "cli";
 
 in stdenv.mkDerivation {
@@ -20,7 +20,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.bz2";
-    sha256 = "0jd89i9si43lyv3hsl6p1lkjmz4zagvc37wcbigsxxc5v8gda9zn";
+    sha256 = "1dfvhra5v6xhzbp097qsxi0zvirw0srbasl4v1wjf58v49idz7b8";
   };
 
   nativeBuildInputs = [
@@ -54,7 +54,7 @@ in stdenv.mkDerivation {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = http://www.wireshark.org/;
+    homepage = https://www.wireshark.org/;
     description = "Powerful network protocol analyzer";
     license = licenses.gpl2;
 

From b0b918224164e5ae3975892d57bb5ec018eb868c Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 03:39:54 +0200
Subject: [PATCH 135/189] gnuradio: 3.7.10.1 -> 3.7.11

---
 pkgs/applications/misc/gnuradio/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/gnuradio/default.nix b/pkgs/applications/misc/gnuradio/default.nix
index 497ac298d28..8218285c5fb 100644
--- a/pkgs/applications/misc/gnuradio/default.nix
+++ b/pkgs/applications/misc/gnuradio/default.nix
@@ -23,11 +23,11 @@
 
 stdenv.mkDerivation rec {
   name = "gnuradio-${version}";
-  version = "3.7.10.1";
+  version = "3.7.11";
 
   src = fetchurl {
-    url = "http://gnuradio.org/releases/gnuradio/${name}.tar.gz";
-    sha256 = "0ds9mcw8hgm03f82jvp3j4mm02ha6zvsl77lp13jzqmbqifbdmv3";
+    url = "https://gnuradio.org/releases/gnuradio/${name}.tar.gz";
+    sha256 = "1m2jf8lafr6pr2dlm40nbvr6az8gwjfkzpbs4fxzv3l5hcqvmnc7";
   };
 
   buildInputs = [
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
       environments to support both wireless communications research and
       real-world radio systems.
     '';
-    homepage = http://www.gnuradio.org;
+    homepage = https://www.gnuradio.org;
     license = licenses.gpl3;
     platforms = platforms.linux;
     maintainers = with maintainers; [ bjornfor fpletz ];

From 03d1e8a14ec29388f6a50c2900c7d4f48c491214 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 03:42:51 +0200
Subject: [PATCH 136/189] iproute: 4.9.0 -> 4.11.0

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

diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix
index 1ff68fc0408..4ffc99b6ced 100644
--- a/pkgs/os-specific/linux/iproute/default.nix
+++ b/pkgs/os-specific/linux/iproute/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "iproute2-${version}";
-  version = "4.9.0";
+  version = "4.11.0";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/net/iproute2/${name}.tar.xz";
-    sha256 = "1i0n071hiqxw1gisngw2jln3kcp9sh47n6fj5hdwqrvp7w20zwy0";
+    sha256 = "09l0phf09mw17bn3xlzfr80sbhw14mq8xv28iz5x15m6pll10rvj";
   };
 
   patches = lib.optionals enableFan [
@@ -31,6 +31,7 @@ stdenv.mkDerivation rec {
     "MANDIR=$(out)/share/man"
     "BASH_COMPDIR=$(out)/share/bash-completion/completions"
     "DOCDIR=$(TMPDIR)/share/doc/${name}" # Don't install docs
+    "HDRDIR=$(TMPDIR)/include/iproute2" # Don't install headers
   ];
 
   buildFlags = [
@@ -47,10 +48,10 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2;
+    homepage = https://wiki.linuxfoundation.org/networking/iproute2;
     description = "A collection of utilities for controlling TCP/IP networking and traffic control in Linux";
     platforms = platforms.linux;
     license = licenses.gpl2;
-    maintainers = with maintainers; [ eelco wkennington ];
+    maintainers = with maintainers; [ eelco wkennington fpletz ];
   };
 }

From 47f7aa96b0dc3756ed324790c71187ce865ff2a0 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 04:57:40 +0200
Subject: [PATCH 137/189] sudo: 1.8.20p1 -> 1.8.20p2

---
 pkgs/tools/security/sudo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix
index 840d24f6e67..6f662206350 100644
--- a/pkgs/tools/security/sudo/default.nix
+++ b/pkgs/tools/security/sudo/default.nix
@@ -4,14 +4,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "sudo-1.8.20p1";
+  name = "sudo-1.8.20p2";
 
   src = fetchurl {
     urls =
       [ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz"
         "ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz"
       ];
-    sha256 = "07fvh8qy0l1h93lccc625f48d8yp0pkp5rjjykq13pb07ar0x64y";
+    sha256 = "1na5likm1srnd1g5sjx7b0543sczw0yppacyqsazfdg9b48awhmx";
   };
 
   prePatch = ''

From 127937f0b6248d7ed797a36bfa3cca798325e19b Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 05:06:03 +0200
Subject: [PATCH 138/189] aptly: 0.9.7 -> 1.0.1

---
 pkgs/tools/misc/aptly/default.nix |   8 +-
 pkgs/tools/misc/aptly/deps.nix    | 245 ------------------------------
 2 files changed, 3 insertions(+), 250 deletions(-)
 delete mode 100644 pkgs/tools/misc/aptly/deps.nix

diff --git a/pkgs/tools/misc/aptly/default.nix b/pkgs/tools/misc/aptly/default.nix
index ccb13f2e42c..2398d9019dc 100644
--- a/pkgs/tools/misc/aptly/default.nix
+++ b/pkgs/tools/misc/aptly/default.nix
@@ -2,21 +2,21 @@
 
 let
 
-  version = "0.9.7";
+  version = "1.0.1";
   rev = "v${version}";
 
   aptlySrc = fetchFromGitHub {
     inherit rev;
     owner = "smira";
     repo = "aptly";
-    sha256 = "0j1bmqdah4i83r2cf8zcq87aif1qg90yasgf82yygk3hj0gw1h00";
+    sha256 = "0rqxdhy2mlwndxhqb447gz626q92zd09rpvhysr2g1rx9nxa039p";
   };
 
   aptlyCompletionSrc = fetchFromGitHub {
     rev = version;
     owner = "aptly-dev";
     repo = "aptly-bash-completion";
-    sha256 = "1yz3pr2jfczqv81as2q3cizwywj5ksw76vi15xlbx5njkjp4rbm4";
+    sha256 = "0dkc4z687yk912lpv8rirv0nby7iny1zgdvnhdm5b47qmjr1sm5q";
   };
 
 in
@@ -27,12 +27,10 @@ buildGoPackage {
   src = aptlySrc;
 
   goPackagePath = "github.com/smira/aptly";
-  goDeps = ./deps.nix;
 
   nativeBuildInputs = [ makeWrapper ];
 
   postInstall = ''
-    rm $bin/bin/man
     mkdir -p $bin/share/bash-completion/completions
     ln -s ${aptlyCompletionSrc}/aptly $bin/share/bash-completion/completions
     wrapProgram "$bin/bin/aptly" \
diff --git a/pkgs/tools/misc/aptly/deps.nix b/pkgs/tools/misc/aptly/deps.nix
deleted file mode 100644
index f0163f34ae8..00000000000
--- a/pkgs/tools/misc/aptly/deps.nix
+++ /dev/null
@@ -1,245 +0,0 @@
-[
-    {
-      goPackagePath = "github.com/AlekSi/pointer";
-      fetch = {
-        type = "git";
-        url = https://github.com/AlekSi/pointer.git;
-        rev = "5f6d527dae3d678b46fbb20331ddf44e2b841943";
-        sha256 = "127n71d8y1d8hxv9fq9z1midw3vk5xa6aq45gffjvwabx4cgha1l";
-      };
-    }
-    {
-      goPackagePath = "github.com/awalterschulze/gographviz";
-      fetch = {
-        type = "git";
-        url = https://github.com/awalterschulze/gographviz.git;
-        rev = "20d1f693416d9be045340150094aa42035a41c9e";
-        sha256 = "1q4796nzanikqmz77jdc2xrq30n93w6ljcfsbhij3yj3s698bcaf";
-      };
-    }
-    {
-      goPackagePath = "github.com/aws/aws-sdk-go";
-      fetch = {
-        type = "git";
-        url = https://github.com/aws/aws-sdk-go.git;
-        rev = "a170e9cb76475a0da7c0326a13cc2b39e9244b3b";
-        sha256 = "0z7pgb9q0msvdkrvjwi95cbl9k9w8f3n2liwkl6fli0nx9jyamqw";
-      };
-    }
-    {
-      goPackagePath = "github.com/cheggaaa/pb";
-      fetch = {
-        type = "git";
-        url = https://github.com/cheggaaa/pb.git;
-        rev = "2c1b74620cc58a81ac152ee2d322e28c806d81ed";
-        sha256 = "148fv6a0ranzcc1lv4v5lmvgbfx05dhzpwsg8vxi9ggn51n496ny";
-      };
-    }
-    {
-      goPackagePath = "github.com/DisposaBoy/JsonConfigReader";
-      fetch = {
-        type = "git";
-        url = https://github.com/DisposaBoy/JsonConfigReader.git;
-        rev = "33a99fdf1d5ee1f79b5077e9c06f955ad356d5f4";
-        sha256 = "1rq7hp1xk8lzvn9bv9jfkszw8p2qia8prvrx540gb2y93jw9i847";
-      };
-    }
-    {
-      goPackagePath = "github.com/gin-gonic/gin";
-      fetch = {
-        type = "git";
-        url = https://github.com/gin-gonic/gin.git;
-        rev = "b1758d3bfa09e61ddbc1c9a627e936eec6a170de";
-        sha256 = "0y3v5vi68xafcvz9yz6ffww96xs2qalklnaab7vrwpax3brlkipk";
-      };
-    }
-    {
-      goPackagePath = "github.com/go-ini/ini";
-      fetch = {
-        type = "git";
-        url = https://github.com/go-ini/ini.git;
-        rev = "afbd495e5aaea13597b5e14fe514ddeaa4d76fc3";
-        sha256 = "0xi8zr9qw38sdbv95c2ip31yczbm4axdvmj3ljyivn9xh2nbxfia";
-      };
-    }
-    {
-      goPackagePath = "github.com/jlaffaye/ftp";
-      fetch = {
-        type = "git";
-        url = https://github.com/jlaffaye/ftp.git;
-        rev = "fec71e62e457557fbe85cefc847a048d57815d76";
-        sha256 = "08ivzsfswgl4xlr6wmqpbf77jclh8ivhwxlhj59allp27lic1kgm";
-      };
-    }
-    {
-      goPackagePath = "github.com/jmespath/go-jmespath";
-      fetch = {
-        type = "git";
-        url = https://github.com/jmespath/go-jmespath.git;
-        rev = "0b12d6b521d83fc7f755e7cfc1b1fbdd35a01a74";
-        sha256 = "1vv6hph8j6xgv7gwl9vvhlsaaqsm22sxxqmgmldi4v11783pc1ld";
-      };
-    }
-    {
-      goPackagePath = "github.com/julienschmidt/httprouter";
-      fetch = {
-        type = "git";
-        url = https://github.com/julienschmidt/httprouter.git;
-        rev = "46807412fe50aaceb73bb57061c2230fd26a1640";
-        sha256 = "0mvzjpzlb1gkb6lp0nwni3vid6fw33dkzl6s9gj7gp2wsbwzcdhd";
-      };
-    }
-    {
-      goPackagePath = "github.com/mattn/go-shellwords";
-      fetch = {
-        type = "git";
-        url = https://github.com/mattn/go-shellwords.git;
-        rev = "c7ca6f94add751566a61cf2199e1de78d4c3eee4";
-        sha256 = "1714ca0p0mwijck0vxdssizxyjjjki1dpc5bl51ayw5sa7s6d4n2";
-      };
-    }
-    {
-      goPackagePath = "github.com/mkrautz/goar";
-      fetch = {
-        type = "git";
-        url = https://github.com/mkrautz/goar.git;
-        rev = "282caa8bd9daba480b51f1d5a988714913b97aad";
-        sha256 = "0b6nmgyh5lmm8d1psm5yqqmshkqi87di1191c9q95z1gkkfi16b2";
-      };
-    }
-    {
-      goPackagePath = "github.com/mxk/go-flowrate";
-      fetch = {
-        type = "git";
-        url = https://github.com/mxk/go-flowrate.git;
-        rev = "cca7078d478f8520f85629ad7c68962d31ed7682";
-        sha256 = "0zqs39923ja0yypdmiqk6x8pgmfs3ms5x5sl1dqv9z6zyx2xy541";
-      };
-    }
-    {
-      goPackagePath = "github.com/ncw/swift";
-      fetch = {
-        type = "git";
-        url = https://github.com/ncw/swift.git;
-        rev = "384ef27c70645e285f8bb9d02276bf654d06027e";
-        sha256 = "1is9z6pbn55yr5b7iizfyi8y19nc9xprd87cwab4i54bxkqqp5hg";
-      };
-    }
-    {
-      goPackagePath = "github.com/smira/go-aws-auth";
-      fetch = {
-        type = "git";
-        url = https://github.com/smira/go-aws-auth.git;
-        rev = "0070896e9d7f4f9f2d558532b2d896ce2239992a";
-        sha256 = "0ic7fgpgr8n1gvhwab1isbm82azy8kb9bzjxsch5i2dpvnz03rvh";
-      };
-    }
-    {
-      goPackagePath = "github.com/smira/go-xz";
-      fetch = {
-        type = "git";
-        url = https://github.com/smira/go-xz.git;
-        rev = "0c531f070014e218b21f3cfca801cc992d52726d";
-        sha256 = "1wpgw8y6xjyf75dfcirx58cr1c277avdb6hr7xvcddhcfn01qzma";
-      };
-    }
-    {
-      goPackagePath = "github.com/smira/commander";
-      fetch = {
-        type = "git";
-        url = https://github.com/smira/commander.git;
-        rev = "f408b00e68d5d6e21b9f18bd310978dafc604e47";
-        sha256 = "0gzhxjni17qq0z4zhakjrp98qd0qmf6wlyrx5xwwsqgh07nyzssa";
-      };
-    }
-    {
-      goPackagePath = "github.com/smira/flag";
-      fetch = {
-        type = "git";
-        url = https://github.com/smira/flag.git;
-        rev = "357ed3e599ffcbd4aeaa828e1d10da2df3ea5107";
-        sha256 = "0wh77lz7z23rs9mbyi89l28i16gp1zx2312zxs4ngqdvjvinsiri";
-      };
-    }
-    {
-      goPackagePath = "github.com/smira/go-ftp-protocol";
-      fetch = {
-        type = "git";
-        url = https://github.com/smira/go-ftp-protocol.git;
-        rev = "066b75c2b70dca7ae10b1b88b47534a3c31ccfaa";
-        sha256 = "1az9p44fa7bcw92ywcyrqch2j1781b96rpid2qggyp3nhjivx8rx";
-      };
-    }
-    {
-      goPackagePath = "github.com/smira/go-uuid";
-      fetch = {
-        type = "git";
-        url = https://github.com/smira/go-uuid.git;
-        rev = "ed3ca8a15a931b141440a7e98e4f716eec255f7d";
-        sha256 = "1vasidfa2pqrawk4zm5bqsi5q7f3qx3xm159hs36r0h0kj0c7sz4";
-      };
-    }
-    {
-      goPackagePath = "github.com/smira/lzma";
-      fetch = {
-        type = "git";
-        url = https://github.com/smira/lzma.git;
-        rev = "7f0af6269940baa2c938fabe73e0d7ba41205683";
-        sha256 = "0ka8mbyg2dj076aslbi1hiahw5n5gjyn7s4w3x4ws9ak5chw5zif";
-      };
-    }
-    {
-      goPackagePath = "github.com/golang/snappy";
-      fetch = {
-        type = "git";
-        url = https://github.com/golang/snappy.git;
-        rev = "723cc1e459b8eea2dea4583200fd60757d40097a";
-        sha256 = "0bprq0qb46f5511b5scrdqqzskqqi2z8b4yh3216rv0n1crx536h";
-      };
-    }
-    {
-      goPackagePath = "github.com/syndtr/goleveldb";
-      fetch = {
-        type = "git";
-        url = https://github.com/syndtr/goleveldb.git;
-        rev = "917f41c560270110ceb73c5b38be2a9127387071";
-        sha256 = "0ybpcizg2gn3ln9rycqbaqlclci3k2q8mipcwq7927ym113d7q32";
-      };
-    }
-    {
-      goPackagePath = "github.com/ugorji/go";
-      fetch = {
-        type = "git";
-        url = https://github.com/ugorji/go.git;
-        rev = "71c2886f5a673a35f909803f38ece5810165097b";
-        sha256 = "157f24xnkhclrjwwa1b7lmpj112ynlbf7g1cfw0c657iqny5720j";
-      };
-    }
-    {
-      goPackagePath = "github.com/vaughan0/go-ini";
-      fetch = {
-        type = "git";
-        url = https://github.com/vaughan0/go-ini.git;
-        rev = "a98ad7ee00ec53921f08832bc06ecf7fd600e6a1";
-        sha256 = "1l1isi3czis009d9k5awsj4xdxgbxn4n9yqjc1ac7f724x6jacfa";
-      };
-    }
-    {
-      goPackagePath = "github.com/wsxiaoys/terminal";
-      fetch = {
-        type = "git";
-        url = https://github.com/wsxiaoys/terminal.git;
-        rev = "5668e431776a7957528361f90ce828266c69ed08";
-        sha256 = "0dirblp3lwijsrx590qfp8zn5xspkjzq7ihkv05806mpncg5ivxd";
-      };
-    }
-    {
-      goPackagePath = "golang.org/x/crypto";
-      fetch = {
-        type = "git";
-        url = https://go.googlesource.com/crypto.git;
-        rev = "a7ead6ddf06233883deca151dffaef2effbf498f";
-        sha256 = "0gyvja1kh6xkxy7mg5y72zpvmi6hfix34kmzg4sry1x7bycw3dfc";
-      };
-    }
-]

From b6cf652e08bb132a69eb7be16b4f3eb6344bf9d1 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 05:19:31 +0200
Subject: [PATCH 139/189] boinc: 7.4.42 -> 7.8.0

---
 .../science/misc/boinc/default.nix            | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix
index 54be212b86c..716d6d9687c 100644
--- a/pkgs/applications/science/misc/boinc/default.nix
+++ b/pkgs/applications/science/misc/boinc/default.nix
@@ -2,20 +2,28 @@
 mesa, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK, xcbutil,
 sqlite, gtk2, patchelf, libXScrnSaver, libnotify, libX11, libxcb }:
 
+let
+  majorVersion = "7.8";
+  minorVersion = "0";
+in
+
 stdenv.mkDerivation rec {
-  version = "7.4.42";
+  version = "${majorVersion}.${minorVersion}";
   name = "boinc-${version}";
 
   src = fetchFromGitHub {
+    name = "${name}-src";
     owner = "BOINC";
     repo = "boinc";
-    rev = "561fbdae0cac3be996136319828f43cbc62c9";
-    sha256 = "1rlh463yyz88p2g5pc6avndn3x1162vcksgbqich0i3qb90jms29";
+    rev = "client_release/${majorVersion}/${version}";
+    sha256 = "08kv3fai79cc28vmyi0y4xcdd5h9xgkn9yyc6y36c0mglaxsn4pr";
   };
 
-  buildInputs = [ libtool automake autoconf m4 pkgconfig curl mesa libXmu libXi
-    freeglut libjpeg wxGTK sqlite gtk2 libXScrnSaver libnotify patchelf libX11
-    libxcb xcbutil
+  nativeBuildInputs = [ libtool automake autoconf m4 pkgconfig ];
+
+  buildInputs = [
+    curl mesa libXmu libXi freeglut libjpeg wxGTK sqlite gtk2 libXScrnSaver
+    libnotify patchelf libX11 libxcb xcbutil
   ];
 
   NIX_LDFLAGS = "-lX11";
@@ -31,11 +39,8 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Free software for distributed and grid computing";
-
     homepage = http://boinc.berkeley.edu/;
-
     license = stdenv.lib.licenses.lgpl2Plus;
-
     platforms = stdenv.lib.platforms.linux;  # arbitrary choice
   };
 }

From e9840d04827582362f8aa9d5c5f95103948ce366 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 05:27:48 +0200
Subject: [PATCH 140/189] librepo 1.7.18 -> 1.7.20

---
 pkgs/tools/package-management/librepo/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/librepo/default.nix b/pkgs/tools/package-management/librepo/default.nix
index 4b9b593655b..99a5013e217 100644
--- a/pkgs/tools/package-management/librepo/default.nix
+++ b/pkgs/tools/package-management/librepo/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, cmake, python2, pkgconfig, expat, glib, pcre, openssl, curl, check, attr, gpgme }:
 
 stdenv.mkDerivation rec {
-  version = "1.7.18";
+  version = "1.7.20";
   name = "librepo-${version}";
 
   src = fetchFromGitHub {
     owner  = "rpm-software-management";
     repo   = "librepo";
     rev    = name;
-    sha256 = "05iqx2kvfqsskb2r3n5p8f91i4gd4pbw6nh30pn532mgab64cvxk";
+    sha256 = "17fgj2wifn2qxmh1p285fbwys0xbvwbnmxsdfvqyr5njpyl2s99h";
   };
 
   patchPhase = ''
@@ -16,7 +16,9 @@ stdenv.mkDerivation rec {
       --replace ' ''${PYTHON_INSTALL_DIR}' " $out/lib/python2.7/site-packages"
   '';
 
-  buildInputs = [ cmake python2 pkgconfig expat glib pcre openssl curl check attr gpgme ];
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  buildInputs = [ python2 expat glib pcre openssl curl check attr gpgme ];
 
   # librepo/fastestmirror.h includes curl/curl.h, and pkg-config specfile refers to others in here
   propagatedBuildInputs = [ curl gpgme expat ];

From cacc16c39090e2f891053285a6f4f107a1440d56 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 05:30:43 +0200
Subject: [PATCH 141/189] libass: 0.13.4 -> 0.13.7

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

diff --git a/pkgs/development/libraries/libass/default.nix b/pkgs/development/libraries/libass/default.nix
index b3345c47732..058839f70f8 100644
--- a/pkgs/development/libraries/libass/default.nix
+++ b/pkgs/development/libraries/libass/default.nix
@@ -19,11 +19,11 @@ in
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "libass-${version}";
-  version = "0.13.4";
+  version = "0.13.7";
 
   src = fetchurl {
     url = "https://github.com/libass/libass/releases/download/${version}/${name}.tar.xz";
-    sha256 = "1dlzkjybnpl2fkvyjq0qblb7qw12cs893bs7zj3rvf8ij342yjnq";
+    sha256 = "17byv926w1mxn56n896sxvdq4m0yv1l7qbm688h6zr3nzgsyarbh";
   };
 
   configureFlags = [

From 63eb0e9c37270e7d4ca32d46033a7ec39e65ace3 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 05:36:46 +0200
Subject: [PATCH 142/189] libbsd: 0.8.3 -> 0.8.4

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

diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix
index 013fea3e9fc..a1a61e33668 100644
--- a/pkgs/development/libraries/libbsd/default.nix
+++ b/pkgs/development/libraries/libbsd/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libbsd-${version}";
-  version = "0.8.3";
+  version = "0.8.4";
 
   src = fetchurl {
     url = "http://libbsd.freedesktop.org/releases/${name}.tar.xz";
-    sha256 = "1a1l7afchlvvj2zfi7ajcg26bbkh5i98y2v5h9j5p1px9m7n6jwk";
+    sha256 = "1cya8bv976ijv5yy1ix3pzbnmp9k2qqpgw3dx98k2w0m55jg2yi1";
   };
 
   # darwin changes configure.ac which means we need to regenerate

From 45035b74df48c6f0a72dd750fa7d1ebcbabcc3b8 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 05:45:10 +0200
Subject: [PATCH 143/189] libchardet: 1.0.4 -> 1.0.5

---
 pkgs/development/libraries/libchardet/default.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/libchardet/default.nix b/pkgs/development/libraries/libchardet/default.nix
index b12b642668b..410c83953aa 100644
--- a/pkgs/development/libraries/libchardet/default.nix
+++ b/pkgs/development/libraries/libchardet/default.nix
@@ -1,11 +1,14 @@
-{ stdenv, fetchurl, perl }:
+{ stdenv, fetchFromGitHub, perl }:
 
 stdenv.mkDerivation rec {
-  name = "libchardet-1.0.4";
-  
-  src = fetchurl {
-    url = "http://yupmin.net/wp-content/uploads/2014/03/libchardet-1.0.4.tar.bz2";
-    sha256 = "0cvwba4la25qw70ap8jd5r743a9jshqd26nnbh5ph68zj1imlgzl";
+  name = "libchardet-${version}";
+  version = "1.0.5";
+
+  src = fetchFromGitHub {
+    owner = "Joungkyun";
+    repo = "libchardet";
+    rev = version;
+    sha256 = "0c1k5hf3ssh3cm72w2zpy5k73vhy1gyq5s9rqdawqqa4al8syyvn";
   };
 
   nativeBuildInputs = [ perl ];

From 17026869c80882f7ed053fc7c2bdc9d0f5d5c6ef Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 05:52:57 +0200
Subject: [PATCH 144/189] libpwquality: 1.3.0 -> 1.4.0

---
 .../libraries/libpwquality/default.nix        | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/libpwquality/default.nix b/pkgs/development/libraries/libpwquality/default.nix
index 3e4fe99df4c..a5a428010b2 100644
--- a/pkgs/development/libraries/libpwquality/default.nix
+++ b/pkgs/development/libraries/libpwquality/default.nix
@@ -1,17 +1,23 @@
-{ stdenv, fetchurl, cracklib, python }:
+{ stdenv, lib, fetchFromGitHub, autoreconfHook, perl, cracklib, python }:
 
 stdenv.mkDerivation rec {
   name = "libpwquality-${version}";
-  version = "1.3.0";
+  version = "1.4.0";
 
-  src = fetchurl {
-    url = "https://fedorahosted.org/releases/l/i/libpwquality/${name}.tar.bz2";
-    sha256 = "0aidriag6h0syfm33nzdfdsqgrnsgihwjv3a5lgkqch3w68fmlkl";
+  src = fetchFromGitHub {
+    owner = "libpwquality";
+    repo = "libpwquality";
+    rev = name;
+    sha256 = "0k564hj2q13z5ag8cj6rnkzm1na7001k4chz4f736p6aqvspv0bd";
   };
 
+  nativeBuildInputs = [ autoreconfHook perl ];
   buildInputs = [ cracklib python ];
 
-  meta = {
-    platforms = stdenv.lib.platforms.linux;
+  meta = with lib; {
+    description = "Password quality checking and random password generation library";
+    homepage = "https://github.com/libpwquality/libpwquality";
+    license = licenses.bsd3;
+    platforms = platforms.unix;
   };
 }

From baf28b60e47356b54f6b8baf14f039b40191edef Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 05:57:03 +0200
Subject: [PATCH 145/189] libcap_ng: 0.7.7 -> 0.7.8

---
 pkgs/os-specific/linux/libcap-ng/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/libcap-ng/default.nix b/pkgs/os-specific/linux/libcap-ng/default.nix
index ea54f1a39fd..d4625687c47 100644
--- a/pkgs/os-specific/linux/libcap-ng/default.nix
+++ b/pkgs/os-specific/linux/libcap-ng/default.nix
@@ -6,11 +6,11 @@ stdenv.mkDerivation rec {
   name = "libcap-ng-${version}";
   # When updating make sure to test that the version with
   # all of the python bindings still works
-  version = "0.7.7";
+  version = "0.7.8";
 
   src = fetchurl {
     url = "${meta.homepage}/${name}.tar.gz";
-    sha256 = "0syhyrixk7fqvwis3k7iddn75g0qxysc1q5fifvzccxk7774jmb1";
+    sha256 = "0pyhjxgsph3p28ayk4ynxab6wvzaqmazk1nkamx11m2w8jbzj6n2";
   };
 
   nativeBuildInputs = [ swig ];

From 3c33ceadb6c4b60bf7b9886b6473a3c18ebe78d6 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 06:27:25 +0200
Subject: [PATCH 146/189] libpfm: 4.5.0 -> 4.8.0

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

diff --git a/pkgs/development/libraries/libpfm/default.nix b/pkgs/development/libraries/libpfm/default.nix
index c08ff265194..34b09d45044 100644
--- a/pkgs/development/libraries/libpfm/default.nix
+++ b/pkgs/development/libraries/libpfm/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "4.5.0";
+  version = "4.8.0";
   name = "libpfm-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/perfmon2/libpfm4/${name}.tar.gz";
-    sha1 = "857eb066724e2a5b723d6802d217c8eddff79082";
+    sha256 = "0s6gcvrhj2h928cqc8399189annif7yl74k6wda446r0fdx7i4wi";
   };
 
   installFlags = "DESTDIR=\${out} PREFIX= LDCONFIG=true";

From 84a3f1c67257a18d08d5397cc91f259b4a3091bc Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 06:48:21 +0200
Subject: [PATCH 147/189] libnotify: 0.7.6 -> 0.7.7

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

diff --git a/pkgs/development/libraries/libnotify/default.nix b/pkgs/development/libraries/libnotify/default.nix
index c26a64ec804..41a9cf518e4 100644
--- a/pkgs/development/libraries/libnotify/default.nix
+++ b/pkgs/development/libraries/libnotify/default.nix
@@ -1,27 +1,24 @@
-{ stdenv, fetchurl, pkgconfig, automake, autoconf, libtool
-, glib, gdk_pixbuf, gobjectIntrospection, autoreconfHook }:
+{ stdenv, fetchurl, pkgconfig, autoreconfHook
+, glib, gdk_pixbuf, gobjectIntrospection }:
 
 stdenv.mkDerivation rec {
   ver_maj = "0.7";
-  ver_min = "6";
+  ver_min = "7";
   name = "libnotify-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/libnotify/${ver_maj}/${name}.tar.xz";
-    sha256 = "0dyq8zgjnnzcah31axnx6afb21kl7bks1gvrg4hjh3nk02j1rxhf";
+    sha256 = "017wgq9n00hx39n0hm784zn18hl721hbaijda868cm96bcqwxd4w";
   };
 
-  # see Gentoo ebuild - we don't need to depend on gtk+(2/3)
-  preAutoreconf = ''
-    sed -i -e 's:noinst_PROG:check_PROG:' tests/Makefile.am || die
-    sed -i -e '/PKG_CHECK_MODULES(TESTS/d' configure.ac || die
-  '';
+  # disable tests as we don't need to depend on gtk+(2/3)
+  configureFlags = [ "--disable-tests" ];
 
-  buildInputs = [ pkgconfig automake autoconf autoreconfHook
-                  libtool glib gdk_pixbuf gobjectIntrospection ];
+  nativeBuildInputs = [ pkgconfig autoreconfHook ];
+  buildInputs = [ glib gdk_pixbuf gobjectIntrospection ];
 
   meta = {
-    homepage = http://galago-project.org/; # very obsolete but found no better
+    homepage = https://developer.gnome.org/notification-spec/;
     description = "A library that sends desktop notifications to a notification daemon";
     platforms = stdenv.lib.platforms.unix;
   };

From f4734e75db9dc31ac0d16bf9851d752c10676333 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 07:03:53 +0200
Subject: [PATCH 148/189] libnl: 3.2.29 -> 3.3.0

---
 pkgs/os-specific/linux/libnl/default.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/os-specific/linux/libnl/default.nix b/pkgs/os-specific/linux/libnl/default.nix
index dc0dadf92e0..8066eddd4f3 100644
--- a/pkgs/os-specific/linux/libnl/default.nix
+++ b/pkgs/os-specific/linux/libnl/default.nix
@@ -1,25 +1,26 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, bison, flex, pkgconfig }:
+{ stdenv, lib, fetchFromGitHub, autoreconfHook, bison, flex, pkgconfig }:
 
-let version = "3.2.29"; in
+let version = "3.3.0"; in
 stdenv.mkDerivation {
   name = "libnl-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "0y8fcb1bfbdvxgckq5p6l4jzx0kvv3g11svy6d5v3i6zy9kkq8wh";
-    rev = "libnl3_2_29";
     repo = "libnl";
     owner = "thom311";
+    rev = "libnl${lib.replaceStrings ["."] ["_"] version}";
+    sha256 = "1796kyq2lkhz2802v9kp32vlxf8ynlyqgyw9nhmry3qh5d0ahcsv";
   };
 
   outputs = [ "bin" "dev" "out" "man" ];
 
   nativeBuildInputs = [ autoreconfHook bison flex pkgconfig ];
 
-  meta = {
+  meta = with lib; {
     inherit version;
     homepage = "http://www.infradead.org/~tgr/libnl/";
-    description = "Linux NetLink interface library";
-    maintainers = [ ];
-    platforms = stdenv.lib.platforms.linux;
+    description = "Linux Netlink interface library suite";
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ fpletz ];
+    platforms = platforms.linux;
   };
 }

From 12a31293ad046580acc097f3c706c65ed17d7d9b Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 07:04:16 +0200
Subject: [PATCH 149/189] quagga: 1.2.0 -> 1.2.1

---
 pkgs/servers/quagga/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/quagga/default.nix b/pkgs/servers/quagga/default.nix
index b60212dea01..ba3cc6dae76 100644
--- a/pkgs/servers/quagga/default.nix
+++ b/pkgs/servers/quagga/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "quagga-${version}";
-  version = "1.2.0";
+  version = "1.2.1";
 
   src = fetchurl {
     url = "mirror://savannah/quagga/${name}.tar.gz";
-    sha256 = "1qyw675hrs3f67zprdbyw91wldmyihv97ibn1f99ypcp6x6n8hqh";
+    sha256 = "1kgvcr9cfgys5asvb5lh5h95silkr624apqm5x68xva19xfvmpda";
   };
 
   buildInputs =

From 7d1eb8a56349428efddd411b789ad5b48b13cf37 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 07:12:32 +0200
Subject: [PATCH 150/189] libnice: 0.1.13 -> 0.1.14

---
 pkgs/development/libraries/libnice/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/libnice/default.nix b/pkgs/development/libraries/libnice/default.nix
index a9d07701dd9..09be1b41353 100644
--- a/pkgs/development/libraries/libnice/default.nix
+++ b/pkgs/development/libraries/libnice/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchurl, pkgconfig, glib, gupnp_igd, gst_all_1 }:
+{ stdenv, fetchurl, pkgconfig, glib, gupnp_igd, gst_all_1, gnutls }:
 
 stdenv.mkDerivation rec {
-  name = "libnice-0.1.13";
+  name = "libnice-0.1.14";
 
   src = fetchurl {
     url = "http://nice.freedesktop.org/releases/${name}.tar.gz";
-    sha256 = "1q8rhklbz1zla67r4mw0f7v3m5b32maj0prnr0kshcz97fgjs4b1";
+    sha256 = "17404z0fr6z3k7s2pkyyh9xp5gv7yylgyxx01mpl7424bnlhn4my";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base ];
+  buildInputs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base gnutls ];
   propagatedBuildInputs = [ glib gupnp_igd ];
 
   meta = {

From c2a271e825f18ee45354153efbc1ff84b9f332ff Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 07:19:41 +0200
Subject: [PATCH 151/189] libmtp: 1.1.11 -> 1.1.13

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

diff --git a/pkgs/development/libraries/libmtp/default.nix b/pkgs/development/libraries/libmtp/default.nix
index b187c213bee..8892b016fe8 100644
--- a/pkgs/development/libraries/libmtp/default.nix
+++ b/pkgs/development/libraries/libmtp/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libusb1 }:
 
 stdenv.mkDerivation rec {
-  name = "libmtp-1.1.11";
+  name = "libmtp-1.1.13";
 
   src = fetchurl {
     url = "mirror://sourceforge/libmtp/${name}.tar.gz";
-    sha256 = "1sc768q2cixwanlwrz95mp389iaadl4s95486caavxx4g7znvn8m";
+    sha256 = "0h3dv9py5mmvxhfxmkr8ky4s80hgq3d66cmrfnnnlcdwpwpy0kj9";
   };
 
   outputs = [ "bin" "dev" "out" ];

From 7bddc281760fd61f43ff7f468ba8bd33ad85613f Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 07:20:41 +0200
Subject: [PATCH 152/189] libmikmod: 3.3.10 -> 3.3.11

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

diff --git a/pkgs/development/libraries/libmikmod/default.nix b/pkgs/development/libraries/libmikmod/default.nix
index f6dc4b86292..8071d386db0 100644
--- a/pkgs/development/libraries/libmikmod/default.nix
+++ b/pkgs/development/libraries/libmikmod/default.nix
@@ -4,10 +4,10 @@ let
   inherit (stdenv.lib) optional optionals optionalString;
 
 in stdenv.mkDerivation rec {
-  name = "libmikmod-3.3.10";
+  name = "libmikmod-3.3.11";
   src = fetchurl {
     url = "mirror://sourceforge/mikmod/${name}.tar.gz";
-    sha256 = "0j7g4jpa2zgzw7x6s3rldypa7zlwjvn97rwx0sylx1iihhlzbcq0";
+    sha256 = "1smb291jr4qm2cdk3gfpmh0pr23rx3jw3fw0j1zr3b4ih7727fni";
   };
 
   buildInputs = [ texinfo ]

From 57a889bcfa0096643bf999a9118350955466924b Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 07:24:20 +0200
Subject: [PATCH 153/189] liblockfile: 1.09 -> 1.14

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

diff --git a/pkgs/development/libraries/liblockfile/default.nix b/pkgs/development/libraries/liblockfile/default.nix
index e7e4cd6c75d..46ea9fe6ee5 100644
--- a/pkgs/development/libraries/liblockfile/default.nix
+++ b/pkgs/development/libraries/liblockfile/default.nix
@@ -2,23 +2,22 @@
 
 stdenv.mkDerivation rec {
   _name   = "liblockfile";
-  version = "1.09";
+  version = "1.14";
   name    = "${_name}-${version}";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/libl/${_name}/${_name}_${version}.orig.tar.gz";
-    sha256 = "0zqvbxls1632wqfhv4v3q2djzlz9391h0wdgsvhnaqrr0nx9x5qn";
+    sha256 = "0q6hn78fnzr6lhisg85a948rmpsd9rx67skzx3vh9hnbx2ix8h5b";
   };
 
   preConfigure = ''
-    sed -i -e 's/install -g [^ ]* /install /' Makefile.in
+    sed -i -e 's/ -g [^ ]* / /' Makefile.in
   '';
 
   preInstall = ''
     mkdir -p $out/{bin,lib,include,man} $out/man/man{1,3}
   '';
 
-
   meta = {
     description = "Shared library with NFS-safe locking functions";
     homepage = http://packages.debian.org/unstable/libs/liblockfile1;

From 1f2a47c70fea16723b4f367272dd69f1939a085c Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 07:28:34 +0200
Subject: [PATCH 154/189] libhttpseverywhere: 0.4.2 -> 0.4.5

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

diff --git a/pkgs/development/libraries/libhttpseverywhere/default.nix b/pkgs/development/libraries/libhttpseverywhere/default.nix
index 961b8a77670..239536140ec 100644
--- a/pkgs/development/libraries/libhttpseverywhere/default.nix
+++ b/pkgs/development/libraries/libhttpseverywhere/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   major = "0.4";
-  minor = "2";
+  minor = "5";
   version = "${major}.${minor}";
 
   name = "libhttpseverywhere-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/libhttpseverywhere/${major}/libhttpseverywhere-${version}.tar.xz";
-    sha256 = "0n850a4adsla6di8dylnadg07wblkdl28abrjvk6fzy8a1kjlx02";
+    sha256 = "07sgcw285rl9wqr5k7srs3fj7fhgrrw6w780jx8wy8jw2bfwlvj2";
   };
 
   nativeBuildInputs = [ gnome3.vala valadoc  gobjectIntrospection meson ninja pkgconfig ];

From a01f1c0a4224509d1b071e2241ddaed8a09a1d8b Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 07:43:14 +0200
Subject: [PATCH 155/189] sniproxy: 0.4.0 -> 0.5.0

---
 pkgs/applications/networking/sniproxy/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/sniproxy/default.nix b/pkgs/applications/networking/sniproxy/default.nix
index 6c3c33007c8..1751106cd68 100644
--- a/pkgs/applications/networking/sniproxy/default.nix
+++ b/pkgs/applications/networking/sniproxy/default.nix
@@ -1,17 +1,18 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, autoreconfHook, gettext, libev, pcre, pkgconfig, udns }:
+{ stdenv, fetchFromGitHub, autoreconfHook, gettext, libev, pcre, pkgconfig, udns }:
 
 stdenv.mkDerivation rec {
   name = "sniproxy-${version}";
-  version = "0.4.0";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "dlundquist";
     repo = "sniproxy";
     rev = version;
-    sha256 = "1r6hv55k2z8l5q57l2q2x3nsspc2yjvi56l760yrz2c1hgh6r0a2";
+    sha256 = "0nspisqdl0si5zpiiwkh9hhdy6h7lxw8l09rasflyawlmm680z1i";
   };
 
-  buildInputs = [ autoconf automake autoreconfHook gettext libev pcre pkgconfig udns ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+  buildInputs = [ gettext libev pcre udns ];
 
   meta = with stdenv.lib; {
     inherit (src.meta) homepage;

From 2ddcdac01c9f57536064be3b38be2d45cf7ba7bd Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 07:43:38 +0200
Subject: [PATCH 156/189] libftdi1: 1.2 -> 1.3

---
 pkgs/development/libraries/libftdi/1.x.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libftdi/1.x.nix b/pkgs/development/libraries/libftdi/1.x.nix
index cd0a2a3c473..180aab09188 100644
--- a/pkgs/development/libraries/libftdi/1.x.nix
+++ b/pkgs/development/libraries/libftdi/1.x.nix
@@ -9,11 +9,11 @@ assert pythonSupport -> python != null && swig != null;
 assert docSupport -> doxygen != null;
 
 stdenv.mkDerivation rec {
-  name = "libftdi1-1.2";
-  
+  name = "libftdi1-1.3";
+
   src = fetchurl {
     url = "http://www.intra2net.com/en/developer/libftdi/download/${name}.tar.bz2";
-    sha256 = "1ml8hiahnqm4z0xzyjv8kyrkzvhw6l431c3jndg026cjh9f7ksm6";
+    sha256 = "1x41mbzh4qy7mrv2n86r2cr176rx03iacn0a99c3dkzv9g4rb34s";
   };
 
   buildInputs = with stdenv.lib; [ cmake pkgconfig confuse ]

From 2d5ede04fcb3fd0f33a6a78b6d3a8a96d623ce60 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 07:43:59 +0200
Subject: [PATCH 157/189] libinput: 1.7.2 -> 1.7.3

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

diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix
index 17950b383bb..1cc275b3048 100644
--- a/pkgs/development/libraries/libinput/default.nix
+++ b/pkgs/development/libraries/libinput/default.nix
@@ -17,11 +17,11 @@ in
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "libinput-${version}";
-  version = "1.7.2";
+  version = "1.7.3";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz";
-    sha256 = "0b1e5a6c106ccc609ccececd9e33e6b27c8b01fc7457ddb4c1dd266e780d6bc2";
+    sha256 = "07fbzxddvhjcch43hdxb24sj7ri96zzpcjalvsicmw0i4wnn2v89";
   };
 
   outputs = [ "out" "dev" ];

From 76de6e4f39a4aeef570f2f2b002fc01c336487e4 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 07:47:52 +0200
Subject: [PATCH 158/189] libcroco: 0.6.11 -> 0.6.12

---
 pkgs/desktops/gnome-3/3.22/core/libcroco/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.22/core/libcroco/default.nix b/pkgs/desktops/gnome-3/3.22/core/libcroco/default.nix
index a4c46ef85d4..05344a33025 100644
--- a/pkgs/desktops/gnome-3/3.22/core/libcroco/default.nix
+++ b/pkgs/desktops/gnome-3/3.22/core/libcroco/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libxml2, glib }:
 
 stdenv.mkDerivation rec {
-  name = "libcroco-0.6.11";
+  name = "libcroco-0.6.12";
 
   src = fetchurl {
     url = "mirror://gnome/sources/libcroco/0.6/${name}.tar.xz";
-    sha256 = "0mm0wldbi40am5qn0nv7psisbg01k42rwzjxl3gv11l5jj554aqk";
+    sha256 = "0q7qhi7z64i26zabg9dbs5706fa8pmzp1qhpa052id4zdiabbi6x";
   };
 
   outputs = [ "out" "dev" ];
@@ -13,9 +13,13 @@ stdenv.mkDerivation rec {
 
   configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic";
 
-  buildInputs = [ pkgconfig libxml2 glib ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ libxml2 glib ];
 
   meta = with stdenv.lib; {
+    description = "GNOME CSS2 parsing and manipulation toolkit";
+    homepage = "https://git.gnome.org/browse/libcroco";
+    license = licenses.lgpl2;
     platforms = platforms.unix;
   };
 }

From 0227471cc91cc26f3ced4e7c3a0a9bd18e9e10c0 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 07:48:14 +0200
Subject: [PATCH 159/189] librsvg: 2.40.16 -> 2.40.17

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

diff --git a/pkgs/development/libraries/librsvg/default.nix b/pkgs/development/libraries/librsvg/default.nix
index ebd0f79cd47..447712fc7db 100644
--- a/pkgs/development/libraries/librsvg/default.nix
+++ b/pkgs/development/libraries/librsvg/default.nix
@@ -6,11 +6,11 @@
 # no introspection by default, it's too big
 
 stdenv.mkDerivation rec {
-  name = "librsvg-2.40.16";
+  name = "librsvg-2.40.17";
 
   src = fetchurl {
     url    = "mirror://gnome/sources/librsvg/2.40/${name}.tar.xz";
-    sha256 = "0bpz6gsq8xi1pb5k9ax6vinph460v14znch3y5yz167s0dmwz2yl";
+    sha256 = "1k39gyf7f5m9x0jvpcxvfcqswdb04xhm1lbwbjabn1f4xk5wbxp6";
   };
 
   NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null;

From fe9c7ad83f1ea97a3642e147b16f2ec69caa0ae6 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 20 Jun 2017 07:51:34 +0200
Subject: [PATCH 160/189] libcpuid: 0.2.2 -> 0.4.0

---
 pkgs/tools/misc/libcpuid/default.nix | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/misc/libcpuid/default.nix b/pkgs/tools/misc/libcpuid/default.nix
index e26533d4642..410ab454312 100644
--- a/pkgs/tools/misc/libcpuid/default.nix
+++ b/pkgs/tools/misc/libcpuid/default.nix
@@ -1,5 +1,5 @@
 { stdenv
-, fetchgit
+, fetchFromGitHub
 , libtool
 , automake
 , autoconf
@@ -7,18 +7,19 @@
 }:
 stdenv.mkDerivation rec {
   name = "libcpuid-${version}";
-  version = "0.2.2";
+  version = "0.4.0";
 
-  src = fetchgit {
-    url = https://github.com/anrieff/libcpuid.git;
-    rev = "535ec64dd9d8df4c5a8d34b985280b58a5396fcf";
-    sha256 = "1j9pg7fyvqhr859k5yh8ccl9jjx65c7rrsddji83qmqyg0vp1k1a";
+  src = fetchFromGitHub {
+    owner = "anrieff";
+    repo = "libcpuid";
+    rev = "v${version}";
+    sha256 = "136kv6m666f7s18mim0vdbzqvs4s0wvixa12brj9p3kmfbx48bw7";
   };
 
   patchPhase = ''
     libtoolize
     autoreconf --install
- '';
+  '';
 
   configurePhase = ''
     mkdir -p Install
@@ -45,12 +46,12 @@ stdenv.mkDerivation rec {
 
     mkdir -p $out
     sed -i -re "s#(prefix=).*Install#\1$out#g" Install/lib/pkgconfig/libcpuid.pc
- 
+
     cp -r Install/* $out
     cp -r tests $out
   '';
 
-  buildInputs = [
+  nativeBuildInputs = [
     libtool
     automake
     autoconf

From b6bacc4bb2e9cc1e8ee7c810e697e93439b83529 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 16 Jun 2017 16:52:58 +0100
Subject: [PATCH 161/189] llvmPackage_{3.4,3.5,3.7,3.8,3.9}: fix output of
 llvm-config

llvm-config is a tool to output compile and linker flags, when compiling against llvm.

The tool however outputs static library names despite libllvm is build
as shared library on nixos. This was fixed for llvm 3.4, 3.5 and 3.7.

For llvm 3.8 and 3.9 it printed the library extension twice (.so.so).
This was fixed in 4.0 and the patch is backported to 3.8 and 3.9 in
this pull request.

```
$ for i in 34 35 37 38 39; do echo "\nllvm-$i"; nix-shell -p llvmPackages_$i.llvm --run 'llvm-config --libnames'; done

llvm-34
libLLVMInstrumentation.so libLLVMIRReader.so libLLVMAsmParser.so
...

llvm-35
libLLVMLTO.so libLLVMObjCARCOpts.so libLLVMLinker.so libLLVMipo.so
...

llvm-37
libLLVMLTO.so libLLVMObjCARCOpts.so libLLVMLinker.so libLLVMBitWriter.so
...

llvm-38
libLLVM-3.8.1.so

llvm-39
libLLVM-3.9.so
```

fixes #26713
---
 pkgs/development/compilers/llvm/3.4/llvm.nix        |  2 +-
 pkgs/development/compilers/llvm/3.5/llvm.nix        |  3 ++-
 .../compilers/llvm/3.7/fix-llvm-config.patch        | 13 -------------
 pkgs/development/compilers/llvm/3.7/llvm.nix        |  2 +-
 .../compilers/llvm/3.8/fix-llvm-config.patch        | 11 +++++++++++
 pkgs/development/compilers/llvm/3.8/llvm.nix        |  3 ++-
 pkgs/development/compilers/llvm/3.9/llvm.nix        |  8 ++++++++
 .../compilers/llvm/{3.4 => }/fix-llvm-config.patch  |  0
 8 files changed, 25 insertions(+), 17 deletions(-)
 delete mode 100644 pkgs/development/compilers/llvm/3.7/fix-llvm-config.patch
 create mode 100644 pkgs/development/compilers/llvm/3.8/fix-llvm-config.patch
 rename pkgs/development/compilers/llvm/{3.4 => }/fix-llvm-config.patch (100%)

diff --git a/pkgs/development/compilers/llvm/3.4/llvm.nix b/pkgs/development/compilers/llvm/3.4/llvm.nix
index 73469fa122a..79b0c9ff898 100644
--- a/pkgs/development/compilers/llvm/3.4/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.4/llvm.nix
@@ -36,7 +36,7 @@ in stdenv.mkDerivation rec {
 
   patches = stdenv.lib.optionals (!stdenv.isDarwin) [
     # llvm-config --libfiles returns (non-existing) static libs
-    ./fix-llvm-config.patch
+    ../fix-llvm-config.patch
   ];
 
   # hacky fix: created binaries need to be run before installation
diff --git a/pkgs/development/compilers/llvm/3.5/llvm.nix b/pkgs/development/compilers/llvm/3.5/llvm.nix
index 8bb5a6c684b..c5503da9b83 100644
--- a/pkgs/development/compilers/llvm/3.5/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.5/llvm.nix
@@ -53,7 +53,8 @@ in stdenv.mkDerivation rec {
     "-DCAN_TARGET_i386=false"
   ];
 
-  patches = [ ./fix-15974.patch ];
+  patches = [ ./fix-15974.patch ] ++
+    stdenv.lib.optionals (!stdenv.isDarwin) [../fix-llvm-config.patch ];
 
   postBuild = ''
     rm -fR $out
diff --git a/pkgs/development/compilers/llvm/3.7/fix-llvm-config.patch b/pkgs/development/compilers/llvm/3.7/fix-llvm-config.patch
deleted file mode 100644
index 772c4960927..00000000000
--- a/pkgs/development/compilers/llvm/3.7/fix-llvm-config.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/utils/llvm-build/llvmbuild/main.py b/utils/llvm-build/llvmbuild/main.py
-index eacefdf60bf..40d25f5cef8 100644
---- a/utils/llvm-build/llvmbuild/main.py
-+++ b/utils/llvm-build/llvmbuild/main.py
-@@ -412,7 +412,7 @@ subdirectories = %s
-             if library_name is None:
-                 library_name_as_cstr = '0'
-             else:
--                library_name_as_cstr = '"lib%s.a"' % library_name
-+                library_name_as_cstr = '"lib%s.so"' % library_name
-             f.write('  { "%s", %s, %d, { %s } },\n' % (
-                 name, library_name_as_cstr, is_installed,
-                 ', '.join('"%s"' % dep
diff --git a/pkgs/development/compilers/llvm/3.7/llvm.nix b/pkgs/development/compilers/llvm/3.7/llvm.nix
index 1bdefd214f9..81aaa7cd65c 100644
--- a/pkgs/development/compilers/llvm/3.7/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.7/llvm.nix
@@ -55,7 +55,7 @@ in stdenv.mkDerivation rec {
 
   patches = stdenv.lib.optionals (!stdenv.isDarwin) [
     # llvm-config --libfiles returns (non-existing) static libs
-    ./fix-llvm-config.patch
+    ../fix-llvm-config.patch
   ];
 
   cmakeFlags = with stdenv; [
diff --git a/pkgs/development/compilers/llvm/3.8/fix-llvm-config.patch b/pkgs/development/compilers/llvm/3.8/fix-llvm-config.patch
new file mode 100644
index 00000000000..6e56c67c897
--- /dev/null
+++ b/pkgs/development/compilers/llvm/3.8/fix-llvm-config.patch
@@ -0,0 +1,11 @@
+--- llvm.org/utils/llvm-build/llvmbuild/main.py	2015-10-07 00:24:35.000000000 +0100
++++ llvm/utils/llvm-build/llvmbuild/main.py	2017-06-16 17:08:39.866586578 +0100
+@@ -413,7 +413,7 @@
+             if library_name is None:
+                 library_name_as_cstr = 'nullptr'
+             else:
+-                library_name_as_cstr = '"lib%s.a"' % library_name
++                library_name_as_cstr = '"lib%s.so"' % library_name
+             if is_installed:
+                 is_installed_as_cstr = 'true'
+             else:
diff --git a/pkgs/development/compilers/llvm/3.8/llvm.nix b/pkgs/development/compilers/llvm/3.8/llvm.nix
index 9394179a8f9..ee0a50c9397 100644
--- a/pkgs/development/compilers/llvm/3.8/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.8/llvm.nix
@@ -37,7 +37,8 @@ in stdenv.mkDerivation rec {
 
   # Fix a segfault in llc
   # See http://lists.llvm.org/pipermail/llvm-dev/2016-October/106500.html
-  patches = [ ./D17533-1.patch ];
+  patches = [ ./D17533-1.patch ] ++
+    stdenv.lib.optionals (!stdenv.isDarwin) [./fix-llvm-config.patch];
 
   # hacky fix: New LLVM releases require a newer OS X SDK than
   # 10.9. This is a temporary measure until nixpkgs darwin support is
diff --git a/pkgs/development/compilers/llvm/3.9/llvm.nix b/pkgs/development/compilers/llvm/3.9/llvm.nix
index 964b6232fb5..654e1ce0023 100644
--- a/pkgs/development/compilers/llvm/3.9/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.9/llvm.nix
@@ -58,6 +58,14 @@ in stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ ncurses zlib ];
 
+  patches = [
+    # fix output of llvm-config (fixed in llvm 4.0)
+    (fetchpatch {
+      url = https://github.com/llvm-mirror/llvm/commit/5340b5b3d970069aebf3dde49d8964583742e01a.patch;
+      sha256 = "095f8knplwqbc2p7rad1kq8633i34qynni9jna93an7kyc80wdxl";
+   })
+  ];
+
   postPatch = ""
   + ''
     patch -p1 --reverse < ${fetchpatch {
diff --git a/pkgs/development/compilers/llvm/3.4/fix-llvm-config.patch b/pkgs/development/compilers/llvm/fix-llvm-config.patch
similarity index 100%
rename from pkgs/development/compilers/llvm/3.4/fix-llvm-config.patch
rename to pkgs/development/compilers/llvm/fix-llvm-config.patch

From 908157c6c5517b6404c7ab13b9953a02f0f76229 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 20 Jun 2017 12:04:21 +0200
Subject: [PATCH 162/189] prometheus-blackbox-exporter: 0.4.0 -> 0.5.0

---
 pkgs/servers/monitoring/prometheus/blackbox-exporter.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix
index 1eaef1010d3..ccbcce26033 100644
--- a/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/blackbox-exporter.nix
@@ -2,7 +2,7 @@
 
 buildGoPackage rec {
   name = "blackbox_exporter-${version}";
-  version = "0.4.0";
+  version = "0.5.0";
   rev = version;
 
   goPackagePath = "github.com/prometheus/blackbox_exporter";
@@ -11,7 +11,7 @@ buildGoPackage rec {
     rev = "v${version}";
     owner = "prometheus";
     repo = "blackbox_exporter";
-    sha256 = "1wx3lbhg8ljq6ryl1yji0fkrl6hcsda9i5cw042nhqy29q0ymqsh";
+    sha256 = "1q719q7xslksj9m5c5d8jmap9380nsrdc71yjyn70rimv8xmzfj1";
   };
 
   meta = with stdenv.lib; {

From c02e26f8a0de163de12c03fea88becdcfdb681e0 Mon Sep 17 00:00:00 2001
From: schneefux <schneefux+commit@schneefux.xyz>
Date: Tue, 20 Jun 2017 13:30:38 +0200
Subject: [PATCH 163/189] wallabag: 2.2.2 -> 2.2.3

---
 pkgs/servers/web-apps/wallabag/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/web-apps/wallabag/default.nix b/pkgs/servers/web-apps/wallabag/default.nix
index c7067ffbd53..d330dd2d1ab 100644
--- a/pkgs/servers/web-apps/wallabag/default.nix
+++ b/pkgs/servers/web-apps/wallabag/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "wallabag-${version}";
-  version = "2.2.2";
+  version = "2.2.3";
 
   # remember to rm -r var/cache/* after a rebuild or unexpected errors will occur
 
   src = fetchurl {
     url = "https://static.wallabag.org/releases/wallabag-release-${version}.tar.gz";
-    sha256 = "0l8zba2risi8lsmff0fbgplfqdiqp7jz0f93z4lbqv8iavaqpna0";
+    sha256 = "0myqarwny9p53g2gmwmg1mcn17jlx5ah0bri13panhf7ryvmrzhk";
   };
 
   outputs = [ "out" "doc" ];

From 14a320ace869a5f1eba3b2e26441e8b62802267e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 20 Jun 2017 16:42:40 +0200
Subject: [PATCH 164/189] moreutils: fix build on darwin

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

diff --git a/pkgs/tools/misc/moreutils/default.nix b/pkgs/tools/misc/moreutils/default.nix
index 51ac3249fed..da8e22bbce3 100644
--- a/pkgs/tools/misc/moreutils/default.nix
+++ b/pkgs/tools/misc/moreutils/default.nix
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ perl IPCRun TimeDate TimeDuration ];
 
+  buildFlags = optionalString stdenv.isDarwin "CC=clang";
   installFlags = "PREFIX=$(out)";
 
   postInstall = "wrapProgram $out/bin/chronic --prefix PERL5LIB : $PERL5LIB";

From 922d706e819f4363eae602c18c8a46f1011ef997 Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Tue, 20 Jun 2017 11:23:37 -0700
Subject: [PATCH 165/189] wineStaging: 2.7 -> 2.10

wineUnstable: 2.7 -> 2.10
---
 pkgs/misc/emulators/wine/sources.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index e0db6285df8..7cb45b08a98 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -32,15 +32,15 @@ in rec {
 
   unstable = fetchurl rec {
     # NOTE: Don't forget to change the SHA256 for staging as well.
-    version = "2.7";
+    version = "2.10";
     url = "https://dl.winehq.org/wine/source/2.x/wine-${version}.tar.xz";
-    sha256 = "0k711vdn1h2x6ar20hpvb5b6zh21niy2n9s9mgvlag1iiq446np5";
+    sha256 = "0ygiaayi2mv6jl450d03i4x2gd2bg3mwk3s2pxas87g8sbzzg3a8";
     inherit (stable) mono gecko32 gecko64;
   };
 
   staging = fetchFromGitHub rec {
     inherit (unstable) version;
-    sha256 = "0ipz160mpg9di47xin9whcq986nrbadmcvpdbwgrpwlxf63x4k63";
+    sha256 = "1i7lzr8w9w9hfa5djclp5n19plfgff6p1yhrs94a62jspf6c10sw";
     owner = "wine-compholio";
     repo = "wine-staging";
     rev = "v${version}";

From 6fd606bdf3a1718577b37d08c39b7c90b7dbbfb3 Mon Sep 17 00:00:00 2001
From: Isaac Shapira <fresheyeball@gmail.com>
Date: Tue, 20 Jun 2017 14:00:14 -0600
Subject: [PATCH 166/189] awscli: 1.11.95 -> 1.11.105

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d93a3a012c1..d4f6bf2693d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1500,12 +1500,12 @@ in {
   in buildPythonPackage rec {
     name = "${pname}-${version}";
     pname = "awscli";
-    version = "1.11.95";
+    version = "1.11.108";
     namePrefix = "";
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "1f99cg5x5kw1p1awny64adp07rvva57srdfrbi81yl2kpw33ybjc";
+      sha256 = "1wz76hkljc25zzfa2l5jv0mbr5vx6d9ixq4sq0p3zf3l45ql6mdf";
     };
 
     # No tests included
@@ -3039,11 +3039,11 @@ in {
   botocore = buildPythonPackage rec {
     name = "${pname}-${version}";
     pname = "botocore";
-    version = "1.5.58";
+    version = "1.5.71";
 
     src = fetchPypi {
       inherit pname version;
-      sha256 = "1kd9hngdqvpjm01amizsmsnc08h2a0dxiasdk0f4kg1pibpqdni5";
+      sha256 = "1fgg28halsy4g43wjpkbd6l0wqiwyzkd4zjrzbbyzw4dxbsf3xfm";
     };
 
     propagatedBuildInputs =

From a21ddfb1586c38cc37fccaab27af345777798115 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Tue, 20 Jun 2017 16:08:47 -0400
Subject: [PATCH 167/189] pythonPackages.bcdoc: Disable tests

---
 pkgs/top-level/python-packages.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d4f6bf2693d..ec89d81479d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1971,6 +1971,9 @@ in {
 
     buildInputs = with self; [ docutils six ];
 
+    # Tests fail due to nix file timestamp normalization.
+    doCheck = false;
+
     meta = {
       homepage = https://github.com/botocore/bcdoc;
       license = licenses.asl20;

From 8fe525b6c77ca5fdd2d1922d2e863fbb9198781c Mon Sep 17 00:00:00 2001
From: Volth <volth@webmaster.ms>
Date: Tue, 20 Jun 2017 20:15:20 +0000
Subject: [PATCH 168/189] mtr: do not do 'setcap' on installPhase, it would
 fail anyway

---
 pkgs/tools/networking/mtr/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/networking/mtr/default.nix b/pkgs/tools/networking/mtr/default.nix
index 666bb4942a9..03a0c99c421 100644
--- a/pkgs/tools/networking/mtr/default.nix
+++ b/pkgs/tools/networking/mtr/default.nix
@@ -14,6 +14,8 @@ stdenv.mkDerivation rec {
     sha256 = "17zi99n8bdqrwrnbfyjn327jz4gxx287wrq3vk459c933p34ff8r";
   };
 
+  preConfigure = "substituteInPlace Makefile.in --replace ' install-exec-hook' ''";
+
   configureFlags = optionalString (!withGtk) "--without-gtk";
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From 065bb61330ba73025980e724242f8b5af13310bf Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 20 Jun 2017 20:42:10 +0200
Subject: [PATCH 169/189] moreutils: fix darwin build

---
 pkgs/tools/misc/moreutils/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/moreutils/default.nix b/pkgs/tools/misc/moreutils/default.nix
index da8e22bbce3..622923e048c 100644
--- a/pkgs/tools/misc/moreutils/default.nix
+++ b/pkgs/tools/misc/moreutils/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, libxml2, libxslt, docbook-xsl, docbook_xml_dtd_44, perl, IPCRun, TimeDate, TimeDuration, makeWrapper }:
+{ stdenv, fetchgit, libxml2, libxslt, docbook-xsl, docbook_xml_dtd_44, perl, IPCRun, TimeDate, TimeDuration, makeWrapper, darwin }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
@@ -15,7 +15,8 @@ stdenv.mkDerivation rec {
     substituteInPlace Makefile --replace /usr/share/xml/docbook/stylesheet/docbook-xsl ${docbook-xsl}/xml/xsl/docbook
   '';
 
-  buildInputs = [ libxml2 libxslt docbook-xsl docbook_xml_dtd_44 makeWrapper ];
+  buildInputs = [ libxml2 libxslt docbook-xsl docbook_xml_dtd_44 makeWrapper ]
+    ++ optional stdenv.isDarwin darwin.cctools;
 
   propagatedBuildInputs = [ perl IPCRun TimeDate TimeDuration ];
 

From d04286be345c653a5b0f5ba377cabef76dec2afd Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Tue, 20 Jun 2017 23:30:58 +0200
Subject: [PATCH 170/189] quiterss: 0.18.5 -> 0.18.6

---
 pkgs/applications/networking/newsreaders/quiterss/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/newsreaders/quiterss/default.nix b/pkgs/applications/networking/newsreaders/quiterss/default.nix
index 4bf571a93d8..e95963c695c 100644
--- a/pkgs/applications/networking/newsreaders/quiterss/default.nix
+++ b/pkgs/applications/networking/newsreaders/quiterss/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "quiterss-${version}";
-  version = "0.18.5";
+  version = "0.18.6";
 
   src = fetchFromGitHub {
     owner = "QuiteRSS";
     repo = "quiterss";
     rev = "${version}";
-    sha256 = "1y0n5ps1z4wgf9hkfjrw7dfyncrw22bf9mi3052vmf3s7xzz6vbb";
+    sha256 = "0qklgdv6b3zg4xil9yglja33vaa25d4i7vipv5aafhlavjz16mh6";
   };
 
   nativeBuildInputs = [ pkgconfig qmake ];

From fdc7cf8238ee955a118ce890f080e4cb7397ffef Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 20 Jun 2017 19:32:29 -0400
Subject: [PATCH 171/189] minikube: 0.19.0 -> 0.19.1

---
 pkgs/applications/networking/cluster/minikube/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix
index 8779fbf2028..36e9db7323d 100644
--- a/pkgs/applications/networking/cluster/minikube/default.nix
+++ b/pkgs/applications/networking/cluster/minikube/default.nix
@@ -22,7 +22,7 @@ let
 in buildGoPackage rec {
   pname   = "minikube";
   name    = "${pname}-${version}";
-  version = "0.19.0";
+  version = "0.19.1";
 
   goPackagePath = "k8s.io/minikube";
 
@@ -30,7 +30,7 @@ in buildGoPackage rec {
     owner  = "kubernetes";
     repo   = "minikube";
     rev    = "v${version}";
-    sha256 = "060zl5wx9karl0j1w3b1jnr6wkr56p3wgs75r6d5aiz36i8fkg8m";
+    sha256 = "19kw2xhpcbyh32im0lnvajcjf1f8p357vhggk0jl342a23vr3rxl";
   };
 
   # kubernetes is here only to shut up a loud warning when generating the completions below. minikube checks very eagerly

From 56435c140413ae43530d03ae1db3c8cdd43d3838 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Tue, 20 Jun 2017 19:53:25 -0400
Subject: [PATCH 172/189] nixos tests: retry: Count down to 0, and pass
 remaining attempts to the sub

Allows test functions to output diagnostic information on failure.
---
 nixos/lib/test-driver/Machine.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm
index 6be119bbf33..c88f9f2bbbe 100644
--- a/nixos/lib/test-driver/Machine.pm
+++ b/nixos/lib/test-driver/Machine.pm
@@ -219,8 +219,8 @@ sub waitForMonitorPrompt {
 sub retry {
     my ($coderef) = @_;
     my $n;
-    for ($n = 0; $n < 900; $n++) {
-        return if &$coderef;
+    for ($n = 899; $n >=0; $n--) {
+        return if &$coderef($n);
         sleep 1;
     }
     die "action timed out after $n seconds";

From 348785eec0c499dc4f79943cedcd78be279ca41d Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Tue, 20 Jun 2017 20:55:52 -0400
Subject: [PATCH 173/189] nixos tests: waitUntilTTYMatches: Log TTY contents on
 last try

If the test has not passed yet, on the last attempt it now outputs:

    machine: Last chance to match /logine: / on TTY2, which currently contains:
    machine: running command: fold -w$(stty -F /dev/tty2 size | awk '{print $2}') /dev/vcs2
    machine: exit status 0
    machine:

    <<< Welcome to NixOS 17.09.git.a804ef4 (x86_64) - tty2 >>>

    machine login:

to help debug the problem. Notice the "logine" typo in my check.
---
 nixos/lib/test-driver/Machine.pm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm
index c88f9f2bbbe..973e05542d5 100644
--- a/nixos/lib/test-driver/Machine.pm
+++ b/nixos/lib/test-driver/Machine.pm
@@ -518,6 +518,12 @@ sub waitUntilTTYMatches {
 
     $self->nest("waiting for $regexp to appear on tty $tty", sub {
         retry sub {
+            my ($retries_remaining) = @_;
+            if ($retries_remaining == 0) {
+                $self->log("Last chance to match /$regexp/ on TTY$tty, which currently contains:");
+                $self->log($self->getTTYText($tty));
+            }
+
             return 1 if $self->getTTYText($tty) =~ /$regexp/;
         }
     });

From 1b833015b72fa6ccf379c46706d1d645cd216f07 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Tue, 20 Jun 2017 21:10:34 -0400
Subject: [PATCH 174/189] nixos tests: waitForText: output the detected screen
 content prior to the last attempt

    machine: Last chance to match /(?^:BALICE)/ on the screen, which currently contains:
    machine: performing optical character recognition
    machine: sending monitor command: screendump /tmp/nix-build-vm-test-run-sddm.drv-0/ocrin.ppm
    machine: Session Layout

    O O

    0 1 : 0 9

    Wednesday, June 21, 2017

    |_ I

    Select your user and enter password
---
 nixos/lib/test-driver/Machine.pm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm
index 973e05542d5..4a68e0cd9dc 100644
--- a/nixos/lib/test-driver/Machine.pm
+++ b/nixos/lib/test-driver/Machine.pm
@@ -572,6 +572,12 @@ sub waitForText {
     my ($self, $regexp) = @_;
     $self->nest("waiting for $regexp to appear on the screen", sub {
         retry sub {
+            my ($retries_remaining) = @_;
+            if ($retries_remaining == 0) {
+                $self->log("Last chance to match /$regexp/ on the screen, which currently contains:");
+                $self->log($self->getScreenText);
+            }
+
             return 1 if $self->getScreenText =~ /$regexp/;
         }
     });

From 3f40fcabbf692ac08cee390ac9b56650ca075630 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Tue, 20 Jun 2017 21:16:35 -0400
Subject: [PATCH 175/189] nixos tests: waitForWindow: output a list of windows
 we see prior to the final check

    machine: must succeed: xwininfo -root -tree | sed 's/.*0x[0-9a-f]* \"\([^\"]*\)\".*/\1/; t; d'
    machine: exit status 0
    machine: Last chance to match /(?^:dfiirst configuration)/ on the the window list, which currently contains:
    machine: [i3 con] container around 0xf8a5f0, i3: first configuration, [i3 con] floatingcon around 0xf8c260, [i3 con] container around 0xf8a380, i3bar for output Virtual-1, [i3 con] bottom dockarea Virtual-1, [i3 con] workspace 1, [i3 con] content Virtual-1, [i3 con] top dockarea Virtual-1, [i3 con] output Virtual-1, [i3 con] workspace __i3_scratch, [i3 con] content __i3, [i3 con] pseudo-output __i3, i3
---
 nixos/lib/test-driver/Machine.pm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm
index 4a68e0cd9dc..cd375352c4c 100644
--- a/nixos/lib/test-driver/Machine.pm
+++ b/nixos/lib/test-driver/Machine.pm
@@ -612,6 +612,13 @@ sub waitForWindow {
     $self->nest("waiting for a window to appear", sub {
         retry sub {
             my @names = $self->getWindowNames;
+
+            my ($retries_remaining) = @_;
+            if ($retries_remaining == 0) {
+                $self->log("Last chance to match /$regexp/ on the the window list, which currently contains:");
+                $self->log(join(", ", @names));
+            }
+
             foreach my $n (@names) {
                 return 1 if $n =~ /$regexp/;
             }

From 0d20c7e2f56cfd961d1bbb31f97fbb396a78426e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 21 Jun 2017 09:03:40 +0200
Subject: [PATCH 176/189] python.pkgs: several maintenance bumps

---
 pkgs/development/python-modules/Nikola/default.nix        | 4 ++--
 pkgs/development/python-modules/asgi_redis/default.nix    | 4 ++--
 pkgs/development/python-modules/libnacl/default.nix       | 4 ++--
 pkgs/development/python-modules/sqlalchemy/default.nix    | 4 ++--
 pkgs/development/python-modules/zxcvbn-python/default.nix | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/Nikola/default.nix b/pkgs/development/python-modules/Nikola/default.nix
index a4127806853..520a9c3a30b 100644
--- a/pkgs/development/python-modules/Nikola/default.nix
+++ b/pkgs/development/python-modules/Nikola/default.nix
@@ -30,7 +30,7 @@
 buildPythonPackage rec {
   name = "${pname}-${version}";
   pname = "Nikola";
-  version = "7.8.8";
+  version = "7.8.9";
 
   # Nix contains only Python 3 supported version of doit, which is a dependency
   # of Nikola. Python 2 support would require older doit 0.29.0 (which on the
@@ -47,7 +47,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "a45272e96ea8311e79ab6ea5523d792207d549cba418d623f03bf80d5e5e3e5a";
+    sha256 = "c85bf293a245a34057fb55236fc2f2c5d28e9ef1c375889f443bca1d86924df4";
   };
 
   meta = {
diff --git a/pkgs/development/python-modules/asgi_redis/default.nix b/pkgs/development/python-modules/asgi_redis/default.nix
index c289a096d83..440f15cbd3a 100644
--- a/pkgs/development/python-modules/asgi_redis/default.nix
+++ b/pkgs/development/python-modules/asgi_redis/default.nix
@@ -2,13 +2,13 @@
   asgiref, asgi_ipc, msgpack, six, redis, cryptography
 }:
 buildPythonPackage rec {
-  version = "1.4.1";
+  version = "1.4.2";
   pname = "asgi_redis";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://pypi/a/asgi_redis/${name}.tar.gz";
-    sha256 = "71a6147c8b08833815993f16e2b665a0e5483fae392f03decb8da54ed0882904";
+    sha256 = "aa8e9342a3e66c4e7f9035b074f6f66b92e5f1cf8022f1446106ed6dd004a274";
   };
 
   # Requires a redis server available
diff --git a/pkgs/development/python-modules/libnacl/default.nix b/pkgs/development/python-modules/libnacl/default.nix
index 0aa3ed29f20..7a96530912b 100644
--- a/pkgs/development/python-modules/libnacl/default.nix
+++ b/pkgs/development/python-modules/libnacl/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "libnacl";
-  version = "1.5.0";
+  version = "1.5.1";
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1ph042x0cfysj16mmjif40pxn505rg5c9n94s972dgc0mfgvrwhs";
+    sha256 = "e44e9436e7245b0d8b7322bef67750cb7757834d7ccdb7eb7b723b4813df84fb";
   };
 
   buildInputs = [ pytest ];
diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix
index 3fdb7cf9a6e..4cd522fe195 100644
--- a/pkgs/development/python-modules/sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy/default.nix
@@ -11,11 +11,11 @@
 buildPythonPackage rec {
   pname = "SQLAlchemy";
   name = "${pname}-${version}";
-  version = "1.1.10";
+  version = "1.1.11";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "dbd92b8af2306d600efa98ed36262d73aad227440a758c8dc3a067ca30096bd3";
+    sha256 = "76f76965e9a968ba3aecd2a8bc0d991cea04fd9a182e6c95c81f1551487b0211";
   };
 
   checkInputs = [ pytest mock pytest_xdist ]
diff --git a/pkgs/development/python-modules/zxcvbn-python/default.nix b/pkgs/development/python-modules/zxcvbn-python/default.nix
index 65d343cbec9..66a0f8d77aa 100644
--- a/pkgs/development/python-modules/zxcvbn-python/default.nix
+++ b/pkgs/development/python-modules/zxcvbn-python/default.nix
@@ -5,13 +5,13 @@
 
 buildPythonPackage rec {
   pname = "zxcvbn-python";
-  version = "4.4.14";
+  version = "4.4.15";
 
   name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "fd3a46536035851571e3f4142b64d6e7bcf0ade3cd40d8fecae7a1243945e327";
+    sha256 = "ef982a382518d217d353a42093aa8bb8608a50bc2df559c08885bba166782cd0";
   };
 
   # No tests in archive

From b8297ff08ac8651a427e06b5d07e9b3386e828cc Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Wed, 21 Jun 2017 15:17:01 +0800
Subject: [PATCH 177/189] bundler: 1.15.0 -> 1.15.1

---
 pkgs/development/ruby-modules/bundler/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ruby-modules/bundler/default.nix b/pkgs/development/ruby-modules/bundler/default.nix
index fc6a4bab75c..53e47630fbb 100644
--- a/pkgs/development/ruby-modules/bundler/default.nix
+++ b/pkgs/development/ruby-modules/bundler/default.nix
@@ -4,8 +4,8 @@ buildRubyGem rec {
   inherit ruby;
   name = "${gemName}-${version}";
   gemName = "bundler";
-  version = "1.15.0";
-  sha256 = "1k84zjr49ri7dj0mbjm7wkqdmknwdid817y2kyhn42mh4vxa68id";
+  version = "1.15.1";
+  sha256 = "1mq0n8g08vf2rnd7fvylx3f4sspx15abid49gycf9zzsjj7w8vps";
   dontPatchShebangs = true;
 
   postFixup = ''

From a3f054d8ada887dcaf46eef90e76ce2adcb3c5fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 21 Jun 2017 09:38:56 +0100
Subject: [PATCH 178/189] dino: 2017-06-13 -> 2017-06-21

---
 .../networking/instant-messengers/dino/default.nix          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/applications/networking/instant-messengers/dino/default.nix
index 611146080bd..eff9b71daa6 100644
--- a/pkgs/applications/networking/instant-messengers/dino/default.nix
+++ b/pkgs/applications/networking/instant-messengers/dino/default.nix
@@ -13,13 +13,13 @@
  }:
 
 stdenv.mkDerivation rec {
-  name = "dino-unstable-2017-06-13";
+  name = "dino-unstable-2017-06-21";
 
   src = fetchFromGitHub {
     owner = "dino";
     repo = "dino";
-    rev = "7bbbb738fdb233f4ad91ffdd7d9247b28849d715";
-    sha256 = "09w26c6b5rkrrz7wvm629cncpdmd5n0d0805h8hw69bbzirpjjh2";
+    rev = "3f0089db86e2057293a33453361678989919147f";
+    sha256 = "011wd6qi8nagig8418hibgnsmznd76dvp3p2dzzr4wyrb7d6cgcb";
     fetchSubmodules = true;
   };
 

From d3ceaccb42cb1b02c035ba1edc7e09e74bfbe004 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 16 Jun 2017 10:55:06 +0100
Subject: [PATCH 179/189] nerdtree-git-plugin: init at 2017-03-12

---
 pkgs/misc/vim-plugins/default.nix      | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index dbba9597ce7..0077185ded4 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -462,6 +462,17 @@ rec {
 
   };
 
+  nerdtree-git-plugin = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "nerdtree-git-plugin-2017-03-12";
+    src = fetchgit {
+      url = "https://github.com/albfan/nerdtree-git-plugin";
+      rev = "d79a5d5a1b3bc5fab3ba94db44a8b2e5a211d61d";
+      sha256 = "0i77wijbr021zfv096ja15f5l52phvsd5gziqn1m3k60qkmb9gkj";
+    };
+    dependencies = [];
+
+  };
+
   vim-closetag = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-closetag-2017-05-13";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index b83660b220b..cda3865d3de 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -27,6 +27,7 @@
 "github:LnL7/vim-nix"
 "github:Quramy/tsuquyomi"
 "github:Shougo/deoplete.nvim"
+"github:albfan/nerdtree-git-plugin"
 "github:ajh17/Spacegray.vim"
 "github:alvan/vim-closetag"
 "github:ap/vim-css-color"

From 5521b542a24d3945924acb9130c0a8d7e5d3a861 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 21 Jun 2017 13:35:10 +0200
Subject: [PATCH 180/189] openvpn: 2.4.2 -> 2.4.3

See https://community.openvpn.net/openvpn/wiki/VulnerabilitiesFixedInOpenVPN243

Fixed:

  * CVE-2017-7508
  * CVE-2017-7520
  * CVE-2017-7521
  * CVE-2017-7512
  * CVE-2017-7522
---
 pkgs/tools/networking/openvpn/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/openvpn/default.nix b/pkgs/tools/networking/openvpn/default.nix
index f2741e2b724..78f21e78277 100644
--- a/pkgs/tools/networking/openvpn/default.nix
+++ b/pkgs/tools/networking/openvpn/default.nix
@@ -8,14 +8,15 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "openvpn-${version}";
-  version = "2.4.2";
+  version = "2.4.3";
 
   src = fetchurl {
     url = "http://swupdate.openvpn.net/community/releases/${name}.tar.xz";
-    sha256 = "1ydzy5i7yaifz0v1ivrckksvm0nkkx5sia3g5y5b1xkx9cw4yp6z";
+    sha256 = "0w85915nvdws1n1zsn8zcy9wg23jsx782nvrx1a3x4mqlmkn3a3s";
   };
 
-  buildInputs = [ lzo openssl pkgconfig ]
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ lzo openssl ]
                   ++ optionals stdenv.isLinux [ pam systemd iproute ]
                   ++ optional pkcs11Support pkcs11helper;
 

From f237eeb6a895656b0829aac850bce34c62237ed9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 21 Jun 2017 13:44:17 +0200
Subject: [PATCH 181/189] moreutils: address comment on
 14a320ace869a5f1eba3b2e26441e8b62802267e

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

diff --git a/pkgs/tools/misc/moreutils/default.nix b/pkgs/tools/misc/moreutils/default.nix
index 622923e048c..dbb80067e6d 100644
--- a/pkgs/tools/misc/moreutils/default.nix
+++ b/pkgs/tools/misc/moreutils/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ perl IPCRun TimeDate TimeDuration ];
 
-  buildFlags = optionalString stdenv.isDarwin "CC=clang";
+  buildFlags = "CC=cc";
   installFlags = "PREFIX=$(out)";
 
   postInstall = "wrapProgram $out/bin/chronic --prefix PERL5LIB : $PERL5LIB";

From cfdb9769ce200035c1f287e2f91d0fe19f62f4fb Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 21 Jun 2017 14:37:22 +0200
Subject: [PATCH 182/189] unrar: 5.4.5 -> 5.5.5 (security)

Fixes arbitrary memory write.

See https://bugs.chromium.org/p/project-zero/issues/detail?id=1286
---
 pkgs/tools/archivers/unrar/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix
index 0086891da29..a1454229a1c 100644
--- a/pkgs/tools/archivers/unrar/default.nix
+++ b/pkgs/tools/archivers/unrar/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "unrar-${version}";
-  version = "5.4.5";
+  version = "5.5.5";
 
   src = fetchurl {
     url = "http://www.rarlab.com/rar/unrarsrc-${version}.tar.gz";
-    sha256 = "0v3rz2245bp2nh4115ysqv34vqlrpln9y11fnlzqj8i46f2caw74";
+    sha256 = "1vv1s1pa0pf1r0h7dw89ha9y68x7hdm82csnkh6ms0igrcwkhmd4";
   };
 
   postPatch = ''

From be4a4ef70126d5f69816ebcfd075b1c08fc004df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 21 Jun 2017 15:30:02 +0200
Subject: [PATCH 183/189] hydra: 2017-04-26 -> 2017-06-21

---
 pkgs/development/tools/misc/hydra/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix
index ba2c62ce8ea..42b0094c2cc 100644
--- a/pkgs/development/tools/misc/hydra/default.nix
+++ b/pkgs/development/tools/misc/hydra/default.nix
@@ -62,15 +62,15 @@ let
   };
 in releaseTools.nixBuild rec {
   name = "hydra-${version}";
-  version = "2017-04-26";
+  version = "2017-06-21";
 
   inherit stdenv;
 
   src = fetchFromGitHub {
     owner = "NixOS";
     repo = "hydra";
-    rev = "1f94f0369937c9187b158f53a4a361507a62c5e9";
-    sha256 = "0h013690pwm20vykccr6l4k0q1jdb065127pblfhs23a287ayqlm";
+    rev = "6e4a7a30f731c42e64e24ccbf8f25110c02776ab";
+    sha256 = "0j7s4slmwrmwywvfkxdpg4wgxnfqjzv9dzwvni2n21sbbwjyqgij";
   };
 
   buildInputs =

From 7bd918b3641ce30f4766dffadd779bc7f4614195 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 21 Jun 2017 15:35:07 +0200
Subject: [PATCH 184/189] hydra-evaluator: depend on jq

---
 nixos/modules/services/continuous-integration/hydra/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix
index c515622d11a..6d39affee48 100644
--- a/nixos/modules/services/continuous-integration/hydra/default.nix
+++ b/nixos/modules/services/continuous-integration/hydra/default.nix
@@ -344,7 +344,7 @@ in
       { wantedBy = [ "multi-user.target" ];
         requires = [ "hydra-init.service" ];
         after = [ "hydra-init.service" "network.target" ];
-        path = [ cfg.package pkgs.nettools ];
+        path = with pkgs; [ cfg.package nettools jq ];
         environment = env;
         serviceConfig =
           { ExecStart = "@${cfg.package}/bin/hydra-evaluator hydra-evaluator";

From e89e96a7551e4213f50e0f44467546a26d42ea5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 21 Jun 2017 17:14:04 +0100
Subject: [PATCH 185/189] linux_4_11: renable CONFIG_UPROBE_EVENTS

CONFIG_UPROBE_EVENT was renamed to CONFIG_UPROBE_EVENTS.
---
 pkgs/os-specific/linux/kernel/common-config.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index b23d52b39e3..ec90620fce1 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -472,8 +472,10 @@ with stdenv.lib;
   SCHED_TRACER y
   STACK_TRACER y
 
-  ${optionalString (versionOlder version "4.11") ''
+  ${if versionOlder version "4.11" then ''
     UPROBE_EVENT? y
+  '' else ''
+    UPROBE_EVENTS? y
   ''}
 
   ${optionalString (versionAtLeast version "4.4") ''

From bc47794ab580a28d9c995e4b0f01ef4bee77af28 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 21 Jun 2017 22:15:07 +0200
Subject: [PATCH 186/189] quicklispPackages: update

Escape things by default in derivation names (i.e. digit cannot be the
first character etc.)

Update Quicklisp (tracking upstream); list new missing dependencies

Add some minimal README about ql-to-nix
---
 pkgs/development/lisp-modules/README.txt      |  16 +
 .../lisp-modules/define-package.nix           |   3 +-
 .../{3bmd.nix => _3bmd.nix}                   |   9 +-
 .../quicklisp-to-nix-output/abnf.nix          |  35 ++
 .../quicklisp-to-nix-output/alexandria.nix    |  14 +-
 .../quicklisp-to-nix-output/anaphora.nix      |   2 +
 .../quicklisp-to-nix-output/array-utils.nix   |  14 +-
 .../asdf-system-connections.nix               |  36 ++
 .../quicklisp-to-nix-output/babel-streams.nix |  17 +-
 .../quicklisp-to-nix-output/babel.nix         |  16 +-
 .../quicklisp-to-nix-output/blackbird.nix     |   4 +-
 .../bordeaux-threads.nix                      |   6 +-
 .../quicklisp-to-nix-output/caveman.nix       |   7 +-
 .../quicklisp-to-nix-output/cffi-grovel.nix   |   5 +-
 .../quicklisp-to-nix-output/cffi.nix          |   5 +-
 .../quicklisp-to-nix-output/chipz.nix         |   2 +
 .../quicklisp-to-nix-output/chunga.nix        |   4 +-
 .../circular-streams.nix                      |   6 +-
 .../quicklisp-to-nix-output/cl+ssl.nix        |   8 +-
 .../quicklisp-to-nix-output/cl-aa.nix         |  14 +-
 .../quicklisp-to-nix-output/cl-annot.nix      |   4 +-
 .../quicklisp-to-nix-output/cl-anonfun.nix    |   2 +
 .../quicklisp-to-nix-output/cl-ansi-text.nix  |   5 +-
 .../quicklisp-to-nix-output/cl-async-base.nix |   6 +-
 .../quicklisp-to-nix-output/cl-async-repl.nix |   4 +-
 .../quicklisp-to-nix-output/cl-async-ssl.nix  |   5 +-
 .../quicklisp-to-nix-output/cl-async-util.nix |   8 +-
 .../quicklisp-to-nix-output/cl-async.nix      |   7 +-
 .../quicklisp-to-nix-output/cl-base64.nix     |   2 +
 .../quicklisp-to-nix-output/cl-colors.nix     |   5 +-
 .../quicklisp-to-nix-output/cl-containers.nix |  36 ++
 .../quicklisp-to-nix-output/cl-cookie.nix     |   8 +-
 .../quicklisp-to-nix-output/cl-csv.nix        |  36 ++
 .../quicklisp-to-nix-output/cl-dbi.nix        |   2 +
 .../quicklisp-to-nix-output/cl-emb.nix        |   2 +
 .../quicklisp-to-nix-output/cl-fad.nix        |   5 +-
 .../cl-fuse-meta-fs.nix                       |   7 +-
 .../quicklisp-to-nix-output/cl-fuse.nix       |   7 +-
 .../quicklisp-to-nix-output/cl-interpol.nix   |  35 ++
 .../quicklisp-to-nix-output/cl-json.nix       |   2 +
 .../quicklisp-to-nix-output/cl-l10n-cldr.nix  |   2 +
 .../quicklisp-to-nix-output/cl-l10n.nix       |   7 +-
 .../quicklisp-to-nix-output/cl-libuv.nix      |   5 +-
 .../quicklisp-to-nix-output/cl-log.nix        |  35 ++
 .../quicklisp-to-nix-output/cl-markdown.nix   |  39 ++
 .../quicklisp-to-nix-output/cl-markup.nix     |   2 +
 .../quicklisp-to-nix-output/cl-mysql.nix      |   4 +-
 .../quicklisp-to-nix-output/cl-paths-ttf.nix  |  16 +-
 .../quicklisp-to-nix-output/cl-postgres.nix   |   4 +-
 .../cl-ppcre-template.nix                     |  16 +-
 .../cl-ppcre-unicode.nix                      |   4 +-
 .../quicklisp-to-nix-output/cl-ppcre.nix      |   2 +
 .../quicklisp-to-nix-output/cl-project.nix    |   8 +-
 .../quicklisp-to-nix-output/cl-reexport.nix   |   4 +-
 .../quicklisp-to-nix-output/cl-smtp.nix       |   8 +-
 .../quicklisp-to-nix-output/cl-store.nix      |   2 +
 .../cl-syntax-annot.nix                       |   4 +-
 .../cl-syntax-anonfun.nix                     |   4 +-
 .../cl-syntax-markup.nix                      |   4 +-
 .../quicklisp-to-nix-output/cl-syntax.nix     |   5 +-
 .../quicklisp-to-nix-output/cl-test-more.nix  |   2 +
 .../quicklisp-to-nix-output/cl-unicode.nix    |   2 +
 .../cl-unification.nix                        |  12 +-
 .../quicklisp-to-nix-output/cl-utilities.nix  |   2 +
 .../quicklisp-to-nix-output/cl-vectors.nix    |  14 +-
 .../quicklisp-to-nix-output/cl-who.nix        |   2 +
 .../clack-v1-compat.nix                       |  23 +-
 .../quicklisp-to-nix-output/clack.nix         |  17 +-
 .../quicklisp-to-nix-output/closer-mop.nix    |  12 +-
 .../closure-common.nix                        |   6 +-
 .../quicklisp-to-nix-output/clsql.nix         |   4 +-
 .../quicklisp-to-nix-output/clss.nix          |  16 +-
 .../quicklisp-to-nix-output/clx-truetype.nix  |   7 +-
 .../quicklisp-to-nix-output/clx.nix           |  14 +-
 .../command-line-arguments.nix                |   2 +
 .../quicklisp-to-nix-output/css-lite.nix      |   2 +
 .../quicklisp-to-nix-output/cxml-dom.nix      |   4 +-
 .../quicklisp-to-nix-output/cxml-klacks.nix   |   4 +-
 .../quicklisp-to-nix-output/cxml-test.nix     |   5 +-
 .../quicklisp-to-nix-output/cxml-xml.nix      |   6 +-
 .../quicklisp-to-nix-output/cxml.nix          |   5 +-
 .../quicklisp-to-nix-output/db3.nix           |  35 ++
 .../quicklisp-to-nix-output/dbd-mysql.nix     |   6 +-
 .../quicklisp-to-nix-output/dbd-postgres.nix  |   8 +-
 .../quicklisp-to-nix-output/dbd-sqlite3.nix   |   7 +-
 .../quicklisp-to-nix-output/dexador.nix       |  22 +-
 .../quicklisp-to-nix-output/do-urlencode.nix  |   5 +-
 .../documentation-utils.nix                   |  16 +-
 .../quicklisp-to-nix-output/drakma.nix        |   7 +-
 .../dynamic-classes.nix                       |  36 ++
 .../quicklisp-to-nix-output/esrap.nix         |  16 +-
 .../external-program.nix                      |   5 +-
 .../quicklisp-to-nix-output/fast-http.nix     |   2 +
 .../quicklisp-to-nix-output/fast-io.nix       |  17 +-
 .../quicklisp-to-nix-output/flexi-streams.nix |   4 +-
 .../quicklisp-to-nix-output/form-fiddle.nix   |  16 +-
 .../quicklisp-to-nix-output/garbage-pools.nix |  35 ++
 .../quicklisp-to-nix-output/http-body.nix     |   6 +-
 .../quicklisp-to-nix-output/hu.dwim.asdf.nix  |  16 +-
 .../quicklisp-to-nix-output/hu.dwim.def.nix   |  17 +-
 .../hu_dot_dwim_dot_asdf.nix                  |  36 ++
 .../hu_dot_dwim_dot_def.nix                   |  37 ++
 .../quicklisp-to-nix-output/hunchentoot.nix   |   7 +-
 .../quicklisp-to-nix-output/idna.nix          |   4 +-
 .../quicklisp-to-nix-output/ieee-floats.nix   |  35 ++
 .../quicklisp-to-nix-output/iolib.nix         |  18 +-
 .../quicklisp-to-nix-output/ironclad.nix      |  16 +-
 .../quicklisp-to-nix-output/iterate.nix       |   2 +
 .../quicklisp-to-nix-output/ixf.nix           |  35 ++
 .../quicklisp-to-nix-output/jonathan.nix      |  16 +-
 .../lack-middleware-backtrace.nix             |  37 --
 .../quicklisp-to-nix-output/lack-util.nix     |  38 --
 .../quicklisp-to-nix-output/lack.nix          |   2 +
 .../quicklisp-to-nix-output/let-plus.nix      |   5 +-
 .../quicklisp-to-nix-output/lev.nix           |   4 +-
 .../quicklisp-to-nix-output/list-of.nix       |  35 ++
 .../quicklisp-to-nix-output/local-time.nix    |  14 +-
 .../quicklisp-to-nix-output/lparallel.nix     |  36 ++
 .../quicklisp-to-nix-output/lquery.nix        |  17 +-
 .../quicklisp-to-nix-output/map-set.nix       |   2 +
 .../quicklisp-to-nix-output/marshal.nix       |   2 +
 .../quicklisp-to-nix-output/md5.nix           |  14 +-
 .../quicklisp-to-nix-output/metabang-bind.nix |   2 +
 .../metatilities-base.nix                     |  35 ++
 .../quicklisp-to-nix-output/mssql.nix         |  36 ++
 .../quicklisp-to-nix-output/myway.nix         |   7 +-
 .../named-readtables.nix                      |   2 +
 .../quicklisp-to-nix-output/nibbles.nix       |   2 +
 .../quicklisp-to-nix-output/optima.nix        |   5 +-
 .../quicklisp-to-nix-output/parenscript.nix   |   6 +-
 .../quicklisp-to-nix-output/parse-number.nix  |  35 ++
 .../quicklisp-to-nix-output/pcall.nix         |   4 +-
 .../quicklisp-to-nix-output/pgloader.nix      |  47 ++
 .../quicklisp-to-nix-output/plump.nix         |  14 +-
 .../quicklisp-to-nix-output/postmodern.nix    |  36 ++
 .../quicklisp-to-nix-output/proc-parse.nix    |   5 +-
 .../quicklisp-to-nix-output/prove.nix         |   7 +-
 .../quicklisp-to-nix-output/puri.nix          |   2 +
 .../py-configparser.nix                       |  35 ++
 .../quicklisp-to-nix-output/qmynd.nix         |  38 ++
 .../quicklisp-to-nix-output/query-fs.nix      |   6 +-
 .../quicklisp-to-nix-output/quri.nix          |   6 +-
 .../quicklisp-to-nix-output/rfc2388.nix       |   2 +
 .../quicklisp-to-nix-output/salza2.nix        |   2 +
 .../quicklisp-to-nix-output/simple-date.nix   |  35 ++
 .../quicklisp-to-nix-output/smart-buffer.nix  |   6 +-
 .../split-sequence.nix                        |   2 +
 .../quicklisp-to-nix-output/sqlite.nix        |   4 +-
 .../static-vectors.nix                        |   5 +-
 .../quicklisp-to-nix-output/stumpwm.nix       |  16 +-
 .../quicklisp-to-nix-output/swap-bytes.nix    |   4 +-
 .../trivial-backtrace.nix                     |   2 +
 .../trivial-features.nix                      |   2 +
 .../trivial-garbage.nix                       |   2 +
 .../trivial-gray-streams.nix                  |   2 +
 .../trivial-indent.nix                        |  14 +-
 .../quicklisp-to-nix-output/trivial-mimes.nix |  14 +-
 .../quicklisp-to-nix-output/trivial-types.nix |   2 +
 .../quicklisp-to-nix-output/trivial-utf-8.nix |   2 +
 .../quicklisp-to-nix-output/uffi.nix          |   2 +
 .../quicklisp-to-nix-output/uiop.nix          |  14 +-
 .../quicklisp-to-nix-output/usocket.nix       |   4 +-
 .../quicklisp-to-nix-output/uuid.nix          |  35 ++
 .../quicklisp-to-nix-output/vom.nix           |   2 +
 .../quicklisp-to-nix-output/woo.nix           |   2 +
 .../quicklisp-to-nix-output/wookie.nix        |   2 +
 .../quicklisp-to-nix-output/xmls.nix          |   2 +
 .../quicklisp-to-nix-output/xsubseq.nix       |   2 +
 .../quicklisp-to-nix-output/yason.nix         |   5 +-
 .../quicklisp-to-nix-output/zpb-ttf.nix       |   2 +
 .../quicklisp-to-nix-overrides.nix            |  52 +-
 .../lisp-modules/quicklisp-to-nix-systems.txt |  11 +
 .../lisp-modules/quicklisp-to-nix.nix         | 523 +++++++++++-------
 .../quicklisp-to-nix/invocation.emb           |   9 +-
 .../quicklisp-to-nix/nix-package.emb          |   4 +-
 .../quicklisp-to-nix/ql-to-nix.lisp           |  31 +-
 176 files changed, 1969 insertions(+), 614 deletions(-)
 create mode 100644 pkgs/development/lisp-modules/README.txt
 rename pkgs/development/lisp-modules/quicklisp-to-nix-output/{3bmd.nix => _3bmd.nix} (83%)
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/abnf.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-log.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markdown.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/dynamic-classes.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/garbage-pools.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_def.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/ixf.nix
 delete mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
 delete mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/list-of.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/mssql.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/py-configparser.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix
 create mode 100644 pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix

diff --git a/pkgs/development/lisp-modules/README.txt b/pkgs/development/lisp-modules/README.txt
new file mode 100644
index 00000000000..2a2fc9cb4f3
--- /dev/null
+++ b/pkgs/development/lisp-modules/README.txt
@@ -0,0 +1,16 @@
+Prerequisite: have Quicklisp installed somehow.
+
+Add to LD_LIBRARY_PATH all the things listed in quicklisp-to-nix-overrides.nix
+for library propagatedBuildInputs (a lot of these are done via addNativeLibs).
+
+Current list is:
+openssl fuse libuv mariadb libfixposix libev sqlite
+
+Add the needed system names to quicklisp-to-nix-systems.txt and load
+quicklisp-to-nix/ql-to-nix.lisp and call
+(ql-to-nix "/path/to/nixpkgs/pkgs/development/lisp-modules/") which is often
+just (ql-to-nix ".")
+
+Add native libraries and whatever else is needed to overrides.
+
+The lispPackages set is supposed to be buildable in its entirety.
diff --git a/pkgs/development/lisp-modules/define-package.nix b/pkgs/development/lisp-modules/define-package.nix
index 1acedf4b704..83bbdf3b8f9 100644
--- a/pkgs/development/lisp-modules/define-package.nix
+++ b/pkgs/development/lisp-modules/define-package.nix
@@ -1,4 +1,5 @@
-args @ {stdenv, clwrapper, baseName, testSystems ? [baseName], version ? "latest"
+args @ {stdenv, clwrapper, baseName, packageName ? baseName, testSystems ? [packageName]
+  , version ? "latest"
   , src, description, deps, buildInputs ? [], meta ? {}, overrides?(x: {})
   , propagatedBuildInputs ? []}:
 let
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/3bmd.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix
similarity index 83%
rename from pkgs/development/lisp-modules/quicklisp-to-nix-output/3bmd.nix
rename to pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix
index e04b3032091..4bc7545d966 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/3bmd.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/_3bmd.nix
@@ -1,6 +1,6 @@
 args @ { fetchurl, ... }:
 rec {
-  baseName = ''3bmd'';
+  baseName = ''_3bmd'';
   version = ''20161204-git'';
 
   description = ''markdown processor in CL using esrap parser.'';
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/3bmd/2016-12-04/3bmd-20161204-git.tgz'';
     sha256 = ''158rymq6ra9ipmkqrqmgr4ay5m46cdxxha03622svllhyf7xzypx'';
   };
+    
+  packageName = "3bmd";
 
   overrides = x: {
     postInstall = ''
@@ -29,6 +31,7 @@ rec {
   };
 }
 /* (SYSTEM 3bmd DESCRIPTION markdown processor in CL using esrap parser. SHA256 158rymq6ra9ipmkqrqmgr4ay5m46cdxxha03622svllhyf7xzypx URL
-    http://beta.quicklisp.org/archive/3bmd/2016-12-04/3bmd-20161204-git.tgz MD5 b80864c74437e0cfb66663e9bbf08fed NAME 3bmd TESTNAME NIL FILENAME 3bmd DEPS
-    ((NAME split-sequence) (NAME esrap) (NAME alexandria)) DEPENDENCIES (split-sequence esrap alexandria) VERSION 20161204-git SIBLINGS
+    http://beta.quicklisp.org/archive/3bmd/2016-12-04/3bmd-20161204-git.tgz MD5 b80864c74437e0cfb66663e9bbf08fed NAME 3bmd TESTNAME NIL FILENAME _3bmd DEPS
+    ((NAME split-sequence FILENAME split-sequence) (NAME esrap FILENAME esrap) (NAME alexandria FILENAME alexandria)) DEPENDENCIES
+    (split-sequence esrap alexandria) VERSION 20161204-git SIBLINGS
     (3bmd-ext-code-blocks 3bmd-ext-definition-lists 3bmd-ext-tables 3bmd-ext-wiki-links 3bmd-youtube-tests 3bmd-youtube)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/abnf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/abnf.nix
new file mode 100644
index 00000000000..1f605fcc795
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/abnf.nix
@@ -0,0 +1,35 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''abnf'';
+  version = ''cl-20150608-git'';
+
+  description = ''ABNF Parser Generator, per RFC2234'';
+
+  deps = [ args."cl-ppcre" args."esrap" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-abnf/2015-06-08/cl-abnf-20150608-git.tgz'';
+    sha256 = ''00x95h7v5q7azvr9wrpcfcwsq3sdipjr1hgq9a9lbimp8gfbz687'';
+  };
+    
+  packageName = "abnf";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/abnf[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM abnf DESCRIPTION ABNF Parser Generator, per RFC2234 SHA256 00x95h7v5q7azvr9wrpcfcwsq3sdipjr1hgq9a9lbimp8gfbz687 URL
+    http://beta.quicklisp.org/archive/cl-abnf/2015-06-08/cl-abnf-20150608-git.tgz MD5 311c2b17e49666dac1c2bb45256be708 NAME abnf TESTNAME NIL FILENAME abnf
+    DEPS ((NAME cl-ppcre FILENAME cl-ppcre) (NAME esrap FILENAME esrap)) DEPENDENCIES (cl-ppcre esrap) VERSION cl-20150608-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
index d72835e88c6..7f60d2dde20 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/alexandria.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''alexandria'';
-  version = ''20170227-git'';
+  version = ''20170516-git'';
 
   description = ''Alexandria is a collection of portable public domain utilities.'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/alexandria/2017-02-27/alexandria-20170227-git.tgz'';
-    sha256 = ''0gnn4ysyvqf8wfi94kh6x23iwx3czaicam1lz9pnwsv40ws5fwwh'';
+    url = ''http://beta.quicklisp.org/archive/alexandria/2017-05-16/alexandria-20170516-git.tgz'';
+    sha256 = ''0yi2lxy9w7pmw4k7yzp82m6cpambclji7c7km3lx0hazv838rw82'';
   };
+    
+  packageName = "alexandria";
 
   overrides = x: {
     postInstall = ''
@@ -28,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM alexandria DESCRIPTION Alexandria is a collection of portable public domain utilities. SHA256 0gnn4ysyvqf8wfi94kh6x23iwx3czaicam1lz9pnwsv40ws5fwwh
-    URL http://beta.quicklisp.org/archive/alexandria/2017-02-27/alexandria-20170227-git.tgz MD5 b0cbf86723fa3a1fe5c544e8079a3be3 NAME alexandria TESTNAME NIL
-    FILENAME alexandria DEPS NIL DEPENDENCIES NIL VERSION 20170227-git SIBLINGS (alexandria-tests)) */
+/* (SYSTEM alexandria DESCRIPTION Alexandria is a collection of portable public domain utilities. SHA256 0yi2lxy9w7pmw4k7yzp82m6cpambclji7c7km3lx0hazv838rw82
+    URL http://beta.quicklisp.org/archive/alexandria/2017-05-16/alexandria-20170516-git.tgz MD5 9234737872493dd82d2da9cadf6a1484 NAME alexandria TESTNAME NIL
+    FILENAME alexandria DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS (alexandria-tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix
index fde774a9b24..cc1eb196202 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/anaphora.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/anaphora/2017-02-27/anaphora-20170227-git.tgz'';
     sha256 = ''1inv6bcly6r7yixj1pp0i4h0y7lxyv68mk9wsi5iwi9gx6000yd9'';
   };
+    
+  packageName = "anaphora";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
index 0f51b69e200..80030739535 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/array-utils.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''array-utils'';
-  version = ''20160929-git'';
+  version = ''20170516-git'';
 
   description = ''A few utilities for working with arrays.'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/array-utils/2016-09-29/array-utils-20160929-git.tgz'';
-    sha256 = ''1nlrf7b81qq7l85kkdh3fxcs6ngnvh5zk7mb5mwf8vjm5kpfbbcx'';
+    url = ''http://beta.quicklisp.org/archive/array-utils/2017-05-16/array-utils-20170516-git.tgz'';
+    sha256 = ''0mbzv2w0jkd175bl2flrkg1108f32hir5fl1n4x6cn8kc14af13q'';
   };
+    
+  packageName = "array-utils";
 
   overrides = x: {
     postInstall = ''
@@ -28,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM array-utils DESCRIPTION A few utilities for working with arrays. SHA256 1nlrf7b81qq7l85kkdh3fxcs6ngnvh5zk7mb5mwf8vjm5kpfbbcx URL
-    http://beta.quicklisp.org/archive/array-utils/2016-09-29/array-utils-20160929-git.tgz MD5 8b3880c7b73625cf8ed599d91a3836b4 NAME array-utils TESTNAME NIL
-    FILENAME array-utils DEPS NIL DEPENDENCIES NIL VERSION 20160929-git SIBLINGS (array-utils-test)) */
+/* (SYSTEM array-utils DESCRIPTION A few utilities for working with arrays. SHA256 0mbzv2w0jkd175bl2flrkg1108f32hir5fl1n4x6cn8kc14af13q URL
+    http://beta.quicklisp.org/archive/array-utils/2017-05-16/array-utils-20170516-git.tgz MD5 c6e4ccbee8f5d72fb86493b419cd0f59 NAME array-utils TESTNAME NIL
+    FILENAME array-utils DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS (array-utils-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix
new file mode 100644
index 00000000000..f694e4746ac
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/asdf-system-connections.nix
@@ -0,0 +1,36 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''asdf-system-connections'';
+  version = ''20170124-git'';
+
+  description = ''Allows for ASDF system to be connected so that auto-loading may occur.'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/asdf-system-connections/2017-01-24/asdf-system-connections-20170124-git.tgz'';
+    sha256 = ''0h8237bq3niw6glcsps77n1ykcmc5bjkcrbjyxjgkmcb1c5kwwpq'';
+  };
+    
+  packageName = "asdf-system-connections";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/asdf-system-connections[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM asdf-system-connections DESCRIPTION Allows for ASDF system to be connected so that auto-loading may occur. SHA256
+    0h8237bq3niw6glcsps77n1ykcmc5bjkcrbjyxjgkmcb1c5kwwpq URL
+    http://beta.quicklisp.org/archive/asdf-system-connections/2017-01-24/asdf-system-connections-20170124-git.tgz MD5 23bdbb69c433568e3e15ed705b803992 NAME
+    asdf-system-connections TESTNAME NIL FILENAME asdf-system-connections DEPS NIL DEPENDENCIES NIL VERSION 20170124-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix
index 4ad9f00b150..adc5571a337 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel-streams.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''babel-streams'';
-  version = ''babel-20150608-git'';
+  version = ''babel-20170516-git'';
 
   description = ''Some useful streams based on Babel's encoding code'';
 
-  deps = [ args."trivial-gray-streams" args."alexandria" ];
+  deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/babel/2015-06-08/babel-20150608-git.tgz'';
-    sha256 = ''0nv2w7k33rwc4dwi33ay2rkmvnj4vsz9ar27z8fiar34895vndk5'';
+    url = ''http://beta.quicklisp.org/archive/babel/2017-05-16/babel-20170516-git.tgz'';
+    sha256 = ''0igl7vgbbpil8ksfsmj1055m6jcpmvf149zmmzsxr9h608siy7fk'';
   };
+    
+  packageName = "babel-streams";
 
   overrides = x: {
     postInstall = ''
@@ -28,7 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM babel-streams DESCRIPTION Some useful streams based on Babel's encoding code SHA256 0nv2w7k33rwc4dwi33ay2rkmvnj4vsz9ar27z8fiar34895vndk5 URL
-    http://beta.quicklisp.org/archive/babel/2015-06-08/babel-20150608-git.tgz MD5 308e6c9132994cf09db7766569ee23fd NAME babel-streams TESTNAME NIL FILENAME
-    babel-streams DEPS ((NAME trivial-gray-streams) (NAME alexandria)) DEPENDENCIES (trivial-gray-streams alexandria) VERSION babel-20150608-git SIBLINGS
-    (babel-tests babel)) */
+/* (SYSTEM babel-streams DESCRIPTION Some useful streams based on Babel's encoding code SHA256 0igl7vgbbpil8ksfsmj1055m6jcpmvf149zmmzsxr9h608siy7fk URL
+    http://beta.quicklisp.org/archive/babel/2017-05-16/babel-20170516-git.tgz MD5 d2ab5a273a436375ba40a8ec7f38d0a9 NAME babel-streams TESTNAME NIL FILENAME
+    babel-streams DEPS NIL DEPENDENCIES NIL VERSION babel-20170516-git SIBLINGS (babel-tests babel)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix
index a88e60824d1..c9b98838862 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/babel.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''babel'';
-  version = ''20150608-git'';
+  version = ''20170516-git'';
 
   description = ''Babel, a charset conversion library.'';
 
-  deps = [ args."trivial-features" args."alexandria" ];
+  deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/babel/2015-06-08/babel-20150608-git.tgz'';
-    sha256 = ''0nv2w7k33rwc4dwi33ay2rkmvnj4vsz9ar27z8fiar34895vndk5'';
+    url = ''http://beta.quicklisp.org/archive/babel/2017-05-16/babel-20170516-git.tgz'';
+    sha256 = ''0igl7vgbbpil8ksfsmj1055m6jcpmvf149zmmzsxr9h608siy7fk'';
   };
+    
+  packageName = "babel";
 
   overrides = x: {
     postInstall = ''
@@ -28,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM babel DESCRIPTION Babel, a charset conversion library. SHA256 0nv2w7k33rwc4dwi33ay2rkmvnj4vsz9ar27z8fiar34895vndk5 URL
-    http://beta.quicklisp.org/archive/babel/2015-06-08/babel-20150608-git.tgz MD5 308e6c9132994cf09db7766569ee23fd NAME babel TESTNAME NIL FILENAME babel DEPS
-    ((NAME trivial-features) (NAME alexandria)) DEPENDENCIES (trivial-features alexandria) VERSION 20150608-git SIBLINGS (babel-streams babel-tests)) */
+/* (SYSTEM babel DESCRIPTION Babel, a charset conversion library. SHA256 0igl7vgbbpil8ksfsmj1055m6jcpmvf149zmmzsxr9h608siy7fk URL
+    http://beta.quicklisp.org/archive/babel/2017-05-16/babel-20170516-git.tgz MD5 d2ab5a273a436375ba40a8ec7f38d0a9 NAME babel TESTNAME NIL FILENAME babel DEPS
+    NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS (babel-streams babel-tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix
index 352538cd353..edeadade715 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/blackbird.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/blackbird/2016-05-31/blackbird-20160531-git.tgz'';
     sha256 = ''0l053fb5fdz1q6dyfgys6nmbairc3aig4wjl5abpf8b1paf7gzq9'';
   };
+    
+  packageName = "blackbird";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,4 @@ rec {
 }
 /* (SYSTEM blackbird DESCRIPTION A promise implementation for Common Lisp. SHA256 0l053fb5fdz1q6dyfgys6nmbairc3aig4wjl5abpf8b1paf7gzq9 URL
     http://beta.quicklisp.org/archive/blackbird/2016-05-31/blackbird-20160531-git.tgz MD5 5cb13dc06a0eae8dcba14714d2b5365d NAME blackbird TESTNAME NIL FILENAME
-    blackbird DEPS ((NAME vom)) DEPENDENCIES (vom) VERSION 20160531-git SIBLINGS (blackbird-test)) */
+    blackbird DEPS ((NAME vom FILENAME vom)) DEPENDENCIES (vom) VERSION 20160531-git SIBLINGS (blackbird-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix
index adcf9fa5a72..002b2ad0e37 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/bordeaux-threads.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/bordeaux-threads/2016-03-18/bordeaux-threads-v0.8.5.tgz'';
     sha256 = ''09q1xd3fca6ln6mh45cx24xzkrcnvhgl5nn9g2jv0rwj1m2xvbpd'';
   };
+    
+  packageName = "bordeaux-threads";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,5 @@ rec {
 }
 /* (SYSTEM bordeaux-threads DESCRIPTION Bordeaux Threads makes writing portable multi-threaded apps simple. SHA256
     09q1xd3fca6ln6mh45cx24xzkrcnvhgl5nn9g2jv0rwj1m2xvbpd URL http://beta.quicklisp.org/archive/bordeaux-threads/2016-03-18/bordeaux-threads-v0.8.5.tgz MD5
-    67e363a363e164b6f61a047957b8554e NAME bordeaux-threads TESTNAME NIL FILENAME bordeaux-threads DEPS ((NAME alexandria)) DEPENDENCIES (alexandria) VERSION
-    v0.8.5 SIBLINGS NIL) */
+    67e363a363e164b6f61a047957b8554e NAME bordeaux-threads TESTNAME NIL FILENAME bordeaux-threads DEPS ((NAME alexandria FILENAME alexandria)) DEPENDENCIES
+    (alexandria) VERSION v0.8.5 SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix
index e5d895adb63..5b5d13bcec1 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/caveman.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/caveman/2016-10-31/caveman-20161031-git.tgz'';
     sha256 = ''111zxnlsn99sybmwgyxh0x29avq898nxssysvaf8v4mbb6fva2hi'';
   };
+    
+  packageName = "caveman";
 
   overrides = x: {
     postInstall = ''
@@ -31,7 +33,8 @@ rec {
 /* (SYSTEM caveman DESCRIPTION Web Application Framework for Common Lisp SHA256 111zxnlsn99sybmwgyxh0x29avq898nxssysvaf8v4mbb6fva2hi URL
     http://beta.quicklisp.org/archive/caveman/2016-10-31/caveman-20161031-git.tgz MD5 a6700f14fd7c4bf8fdc573473ff5fab6 NAME caveman TESTNAME NIL FILENAME
     caveman DEPS
-    ((NAME myway) (NAME local-time) (NAME do-urlencode) (NAME clack-v1-compat) (NAME cl-syntax-annot) (NAME cl-syntax) (NAME cl-project) (NAME cl-ppcre)
-     (NAME cl-emb) (NAME anaphora))
+    ((NAME myway FILENAME myway) (NAME local-time FILENAME local-time) (NAME do-urlencode FILENAME do-urlencode)
+     (NAME clack-v1-compat FILENAME clack-v1-compat) (NAME cl-syntax-annot FILENAME cl-syntax-annot) (NAME cl-syntax FILENAME cl-syntax)
+     (NAME cl-project FILENAME cl-project) (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-emb FILENAME cl-emb) (NAME anaphora FILENAME anaphora))
     DEPENDENCIES (myway local-time do-urlencode clack-v1-compat cl-syntax-annot cl-syntax cl-project cl-ppcre cl-emb anaphora) VERSION 20161031-git SIBLINGS
     (caveman-middleware-dbimanager caveman-test caveman2-db caveman2-test caveman2)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix
index fdb2ab5b869..dba9bfcbc76 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi-grovel.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cffi/2016-10-31/cffi_0.18.0.tgz'';
     sha256 = ''0g4clx9l9c7iw9hiv94ihzp4zb80yq3i5j6lr3vkz9z2dndzcpzz'';
   };
+    
+  packageName = "cffi-grovel";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,5 @@ rec {
 }
 /* (SYSTEM cffi-grovel DESCRIPTION The CFFI Groveller SHA256 0g4clx9l9c7iw9hiv94ihzp4zb80yq3i5j6lr3vkz9z2dndzcpzz URL
     http://beta.quicklisp.org/archive/cffi/2016-10-31/cffi_0.18.0.tgz MD5 5be207fca26205c7550d7b6307871f4e NAME cffi-grovel TESTNAME NIL FILENAME cffi-grovel
-    DEPS ((NAME alexandria)) DEPENDENCIES (alexandria) VERSION cffi_0.18.0 SIBLINGS (cffi-examples cffi-libffi cffi-tests cffi-toolchain cffi-uffi-compat cffi)) */
+    DEPS ((NAME alexandria FILENAME alexandria)) DEPENDENCIES (alexandria) VERSION cffi_0.18.0 SIBLINGS
+    (cffi-examples cffi-libffi cffi-tests cffi-toolchain cffi-uffi-compat cffi)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix
index 81f3dfad8aa..9f92871b712 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cffi.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cffi/2016-10-31/cffi_0.18.0.tgz'';
     sha256 = ''0g4clx9l9c7iw9hiv94ihzp4zb80yq3i5j6lr3vkz9z2dndzcpzz'';
   };
+    
+  packageName = "cffi";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,6 @@ rec {
 }
 /* (SYSTEM cffi DESCRIPTION The Common Foreign Function Interface SHA256 0g4clx9l9c7iw9hiv94ihzp4zb80yq3i5j6lr3vkz9z2dndzcpzz URL
     http://beta.quicklisp.org/archive/cffi/2016-10-31/cffi_0.18.0.tgz MD5 5be207fca26205c7550d7b6307871f4e NAME cffi TESTNAME NIL FILENAME cffi DEPS
-    ((NAME uiop) (NAME trivial-features) (NAME babel) (NAME alexandria)) DEPENDENCIES (uiop trivial-features babel alexandria) VERSION cffi_0.18.0 SIBLINGS
+    ((NAME uiop FILENAME uiop) (NAME trivial-features FILENAME trivial-features) (NAME babel FILENAME babel) (NAME alexandria FILENAME alexandria))
+    DEPENDENCIES (uiop trivial-features babel alexandria) VERSION cffi_0.18.0 SIBLINGS
     (cffi-examples cffi-grovel cffi-libffi cffi-tests cffi-toolchain cffi-uffi-compat)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
index 0a1d054b05e..e2a9da13b45 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chipz.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/chipz/2016-03-18/chipz-20160318-git.tgz'';
     sha256 = ''1dpsg8kd43k075xihb0szcq1f7iq8ryg5r77x5wi6hy9jhpq8826'';
   };
+    
+  packageName = "chipz";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix
index 6f38719781e..d6361d4392d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/chunga.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/chunga/2014-12-17/chunga-1.1.6.tgz'';
     sha256 = ''1ivdfi9hjkzp2anhpjm58gzrjpn6mdsp35km115c1j1c4yhs9lzg'';
   };
+    
+  packageName = "chunga";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,4 @@ rec {
 }
 /* (SYSTEM chunga DESCRIPTION NIL SHA256 1ivdfi9hjkzp2anhpjm58gzrjpn6mdsp35km115c1j1c4yhs9lzg URL
     http://beta.quicklisp.org/archive/chunga/2014-12-17/chunga-1.1.6.tgz MD5 75f5c4f9dec3a8a181ed5ef7e5d700b5 NAME chunga TESTNAME NIL FILENAME chunga DEPS
-    ((NAME trivial-gray-streams)) DEPENDENCIES (trivial-gray-streams) VERSION 1.1.6 SIBLINGS NIL) */
+    ((NAME trivial-gray-streams FILENAME trivial-gray-streams)) DEPENDENCIES (trivial-gray-streams) VERSION 1.1.6 SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix
index ff69c56e8a6..39cf82831a9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/circular-streams.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/circular-streams/2016-12-04/circular-streams-20161204-git.tgz'';
     sha256 = ''1i29b9sciqs5x59hlkdj2r4siyqgrwj5hb4lnc80jgfqvzbq4128'';
   };
+    
+  packageName = "circular-streams";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,5 @@ rec {
 }
 /* (SYSTEM circular-streams DESCRIPTION Circularly readable streams for Common Lisp SHA256 1i29b9sciqs5x59hlkdj2r4siyqgrwj5hb4lnc80jgfqvzbq4128 URL
     http://beta.quicklisp.org/archive/circular-streams/2016-12-04/circular-streams-20161204-git.tgz MD5 2383f3b82fa3335d9106e1354a678db8 NAME circular-streams
-    TESTNAME NIL FILENAME circular-streams DEPS ((NAME trivial-gray-streams) (NAME fast-io)) DEPENDENCIES (trivial-gray-streams fast-io) VERSION 20161204-git
-    SIBLINGS (circular-streams-test)) */
+    TESTNAME NIL FILENAME circular-streams DEPS ((NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME fast-io FILENAME fast-io)) DEPENDENCIES
+    (trivial-gray-streams fast-io) VERSION 20161204-git SIBLINGS (circular-streams-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix
index 9b19aa51678..bfe44d109d5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl+ssl.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl+ssl/2017-04-03/cl+ssl-20170403-git.tgz'';
     sha256 = ''1f1nr1wy6nk0l2n249djcvygl0379ch3x4ndc243jcahcp44x18s'';
   };
+    
+  packageName = "cl+ssl";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,7 @@ rec {
 }
 /* (SYSTEM cl+ssl DESCRIPTION Common Lisp interface to OpenSSL. SHA256 1f1nr1wy6nk0l2n249djcvygl0379ch3x4ndc243jcahcp44x18s URL
     http://beta.quicklisp.org/archive/cl+ssl/2017-04-03/cl+ssl-20170403-git.tgz MD5 e6d22f98947384d0e0bb2eb18230f72d NAME cl+ssl TESTNAME NIL FILENAME cl+ssl
-    DEPS ((NAME uiop) (NAME trivial-gray-streams) (NAME trivial-garbage) (NAME flexi-streams) (NAME cffi) (NAME bordeaux-threads)) DEPENDENCIES
-    (uiop trivial-gray-streams trivial-garbage flexi-streams cffi bordeaux-threads) VERSION cl+ssl-20170403-git SIBLINGS (cl+ssl.test)) */
+    DEPS
+    ((NAME uiop FILENAME uiop) (NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME trivial-garbage FILENAME trivial-garbage)
+     (NAME flexi-streams FILENAME flexi-streams) (NAME cffi FILENAME cffi) (NAME bordeaux-threads FILENAME bordeaux-threads))
+    DEPENDENCIES (uiop trivial-gray-streams trivial-garbage flexi-streams cffi bordeaux-threads) VERSION cl+ssl-20170403-git SIBLINGS (cl+ssl.test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix
index 2988906735a..5057ddbd9d1 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-aa.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-aa'';
-  version = ''cl-vectors-20150407-git'';
+  version = ''cl-vectors-20170516-git'';
 
   description = ''cl-aa: polygon rasterizer'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-vectors/2015-04-07/cl-vectors-20150407-git.tgz'';
-    sha256 = ''1qd7ywc2ayiyd5nw7shnjgh0nc14h328h0cw921g5b2n8j6y959w'';
+    url = ''http://beta.quicklisp.org/archive/cl-vectors/2017-05-16/cl-vectors-20170516-git.tgz'';
+    sha256 = ''0j7cdg6akq5giv8rgbxdv8rwpzkv98r5bv78p5nnrixpprvjhvzx'';
   };
+    
+  packageName = "cl-aa";
 
   overrides = x: {
     postInstall = ''
@@ -28,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM cl-aa DESCRIPTION cl-aa: polygon rasterizer SHA256 1qd7ywc2ayiyd5nw7shnjgh0nc14h328h0cw921g5b2n8j6y959w URL
-    http://beta.quicklisp.org/archive/cl-vectors/2015-04-07/cl-vectors-20150407-git.tgz MD5 9e255503bf4559912ea1511c919c474a NAME cl-aa TESTNAME NIL FILENAME
-    cl-aa DEPS NIL DEPENDENCIES NIL VERSION cl-vectors-20150407-git SIBLINGS (cl-aa-misc cl-paths-ttf cl-paths cl-vectors)) */
+/* (SYSTEM cl-aa DESCRIPTION cl-aa: polygon rasterizer SHA256 0j7cdg6akq5giv8rgbxdv8rwpzkv98r5bv78p5nnrixpprvjhvzx URL
+    http://beta.quicklisp.org/archive/cl-vectors/2017-05-16/cl-vectors-20170516-git.tgz MD5 0258ae7face22f2035c1a85379ee0aae NAME cl-aa TESTNAME NIL FILENAME
+    cl-aa DEPS NIL DEPENDENCIES NIL VERSION cl-vectors-20170516-git SIBLINGS (cl-aa-misc cl-paths-ttf cl-paths cl-vectors)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix
index bdf0dbdf48a..591df96c84e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-annot.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-annot/2015-06-08/cl-annot-20150608-git.tgz'';
     sha256 = ''0ixsp20rk498phv3iivipn3qbw7a7x260x63hc6kpv2s746lpdg3'';
   };
+    
+  packageName = "cl-annot";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,4 @@ rec {
 }
 /* (SYSTEM cl-annot DESCRIPTION Python-like Annotation Syntax for Common Lisp SHA256 0ixsp20rk498phv3iivipn3qbw7a7x260x63hc6kpv2s746lpdg3 URL
     http://beta.quicklisp.org/archive/cl-annot/2015-06-08/cl-annot-20150608-git.tgz MD5 35d8f79311bda4dd86002d11edcd0a21 NAME cl-annot TESTNAME NIL FILENAME
-    cl-annot DEPS ((NAME alexandria)) DEPENDENCIES (alexandria) VERSION 20150608-git SIBLINGS NIL) */
+    cl-annot DEPS ((NAME alexandria FILENAME alexandria)) DEPENDENCIES (alexandria) VERSION 20150608-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix
index dae0666a727..51b5b5cf543 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-anonfun.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-anonfun/2011-12-03/cl-anonfun-20111203-git.tgz'';
     sha256 = ''16r3v3yba41smkqpz0qvzabkxashl39klfb6vxhzbly696x87p1m'';
   };
+    
+  packageName = "cl-anonfun";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix
index 2530203e3b7..0dce1f78944 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ansi-text.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-ansi-text/2015-08-04/cl-ansi-text-20150804-git.tgz'';
     sha256 = ''112w7qg8yp28qyc2b5c7km457krr3xksxyps1icmgdpqf9ccpn2i'';
   };
+    
+  packageName = "cl-ansi-text";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,5 @@ rec {
 }
 /* (SYSTEM cl-ansi-text DESCRIPTION ANSI control string characters, focused on color SHA256 112w7qg8yp28qyc2b5c7km457krr3xksxyps1icmgdpqf9ccpn2i URL
     http://beta.quicklisp.org/archive/cl-ansi-text/2015-08-04/cl-ansi-text-20150804-git.tgz MD5 70aa38b40377a5e89a7f22bb68b3f796 NAME cl-ansi-text TESTNAME NIL
-    FILENAME cl-ansi-text DEPS ((NAME cl-colors) (NAME alexandria)) DEPENDENCIES (cl-colors alexandria) VERSION 20150804-git SIBLINGS (cl-ansi-text-test)) */
+    FILENAME cl-ansi-text DEPS ((NAME cl-colors FILENAME cl-colors) (NAME alexandria FILENAME alexandria)) DEPENDENCIES (cl-colors alexandria) VERSION
+    20150804-git SIBLINGS (cl-ansi-text-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-base.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-base.nix
index ea9c89dffb7..210e914aeee 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-base.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-base.nix
@@ -13,6 +13,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz'';
     sha256 = ''104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa'';
   };
+    
+  packageName = "cl-async-base";
 
   overrides = x: {
     postInstall = ''
@@ -32,5 +34,5 @@ rec {
 }
 /* (SYSTEM cl-async-base DESCRIPTION Base system for cl-async. SHA256 104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa URL
     http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz MD5 18e1d6c54a27c8ba721ebaa3d8c6e112 NAME cl-async-base TESTNAME cl-async
-    FILENAME cl-async-base DEPS ((NAME cl-libuv) (NAME cffi) (NAME bordeaux-threads)) DEPENDENCIES (cl-libuv cffi bordeaux-threads) VERSION
-    cl-async-20160825-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test cl-async)) */
+    FILENAME cl-async-base DEPS ((NAME cl-libuv FILENAME cl-libuv) (NAME cffi FILENAME cffi) (NAME bordeaux-threads FILENAME bordeaux-threads)) DEPENDENCIES
+    (cl-libuv cffi bordeaux-threads) VERSION cl-async-20160825-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test cl-async)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix
index ccc138a9b5e..21dd26e4a83 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-repl.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz'';
     sha256 = ''104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa'';
   };
+    
+  packageName = "cl-async-repl";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,5 @@ rec {
 }
 /* (SYSTEM cl-async-repl DESCRIPTION REPL integration for CL-ASYNC. SHA256 104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa URL
     http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz MD5 18e1d6c54a27c8ba721ebaa3d8c6e112 NAME cl-async-repl TESTNAME NIL
-    FILENAME cl-async-repl DEPS ((NAME bordeaux-threads)) DEPENDENCIES (bordeaux-threads) VERSION cl-async-20160825-git SIBLINGS
+    FILENAME cl-async-repl DEPS ((NAME bordeaux-threads FILENAME bordeaux-threads)) DEPENDENCIES (bordeaux-threads) VERSION cl-async-20160825-git SIBLINGS
     (cl-async-ssl cl-async-test cl-async)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix
index dbd056059f7..438a85700e7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-ssl.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz'';
     sha256 = ''104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa'';
   };
+    
+  packageName = "cl-async-ssl";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,5 @@ rec {
 }
 /* (SYSTEM cl-async-ssl DESCRIPTION SSL Wrapper around cl-async socket implementation. SHA256 104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa URL
     http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz MD5 18e1d6c54a27c8ba721ebaa3d8c6e112 NAME cl-async-ssl TESTNAME NIL
-    FILENAME cl-async-ssl DEPS ((NAME vom) (NAME cffi)) DEPENDENCIES (vom cffi) VERSION cl-async-20160825-git SIBLINGS (cl-async-repl cl-async-test cl-async)) */
+    FILENAME cl-async-ssl DEPS ((NAME vom FILENAME vom) (NAME cffi FILENAME cffi)) DEPENDENCIES (vom cffi) VERSION cl-async-20160825-git SIBLINGS
+    (cl-async-repl cl-async-test cl-async)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-util.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-util.nix
index b72be6f88bf..8bc2b61128f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-util.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async-util.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz'';
     sha256 = ''104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa'';
   };
+    
+  packageName = "cl-async-util";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,7 @@ rec {
 }
 /* (SYSTEM cl-async-util DESCRIPTION Internal utilities for cl-async. SHA256 104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa URL
     http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz MD5 18e1d6c54a27c8ba721ebaa3d8c6e112 NAME cl-async-util TESTNAME NIL
-    FILENAME cl-async-util DEPS ((NAME vom) (NAME fast-io) (NAME cl-ppcre) (NAME cl-libuv) (NAME cl-async-base) (NAME cffi)) DEPENDENCIES
-    (vom fast-io cl-ppcre cl-libuv cl-async-base cffi) VERSION cl-async-20160825-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test cl-async)) */
+    FILENAME cl-async-util DEPS
+    ((NAME vom FILENAME vom) (NAME fast-io FILENAME fast-io) (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-libuv FILENAME cl-libuv)
+     (NAME cl-async-base FILENAME cl-async-base) (NAME cffi FILENAME cffi))
+    DEPENDENCIES (vom fast-io cl-ppcre cl-libuv cl-async-base cffi) VERSION cl-async-20160825-git SIBLINGS (cl-async-repl cl-async-ssl cl-async-test cl-async)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
index e484e1d991a..2e8a5ce83de 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-async.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz'';
     sha256 = ''104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa'';
   };
+    
+  packageName = "cl-async";
 
   overrides = x: {
     postInstall = ''
@@ -31,7 +33,8 @@ rec {
 /* (SYSTEM cl-async DESCRIPTION Asynchronous operations for Common Lisp. SHA256 104x6vw9zrmzz3sipmzn0ygil6ccyy8gpvvjxak2bfxbmxcl09pa URL
     http://beta.quicklisp.org/archive/cl-async/2016-08-25/cl-async-20160825-git.tgz MD5 18e1d6c54a27c8ba721ebaa3d8c6e112 NAME cl-async TESTNAME NIL FILENAME
     cl-async DEPS
-    ((NAME uiop) (NAME trivial-gray-streams) (NAME trivial-features) (NAME static-vectors) (NAME cl-ppcre) (NAME cl-libuv) (NAME cl-async-util)
-     (NAME cl-async-base) (NAME cffi) (NAME babel))
+    ((NAME uiop FILENAME uiop) (NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME trivial-features FILENAME trivial-features)
+     (NAME static-vectors FILENAME static-vectors) (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-libuv FILENAME cl-libuv)
+     (NAME cl-async-util FILENAME cl-async-util) (NAME cl-async-base FILENAME cl-async-base) (NAME cffi FILENAME cffi) (NAME babel FILENAME babel))
     DEPENDENCIES (uiop trivial-gray-streams trivial-features static-vectors cl-ppcre cl-libuv cl-async-util cl-async-base cffi babel) VERSION 20160825-git
     SIBLINGS (cl-async-repl cl-async-ssl cl-async-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix
index 0ca5f7149f2..86cc31f5642 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-base64.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-base64/2015-09-23/cl-base64-20150923-git.tgz'';
     sha256 = ''0haip5x0091r9xa8gdzr21s0rk432998nbxxfys35lhnyc1vgyhp'';
   };
+    
+  packageName = "cl-base64";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix
index 237fbfaea38..5abdac589dd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-colors.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-colors/2015-12-18/cl-colors-20151218-git.tgz'';
     sha256 = ''032kswn6h2ib7v8v1dg0lmgfks7zk52wrv31q6p2zj2a156ccqp4'';
   };
+    
+  packageName = "cl-colors";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,5 @@ rec {
 }
 /* (SYSTEM cl-colors DESCRIPTION Simple color library for Common Lisp SHA256 032kswn6h2ib7v8v1dg0lmgfks7zk52wrv31q6p2zj2a156ccqp4 URL
     http://beta.quicklisp.org/archive/cl-colors/2015-12-18/cl-colors-20151218-git.tgz MD5 2963c3e7aca2c5db2132394f83716515 NAME cl-colors TESTNAME NIL FILENAME
-    cl-colors DEPS ((NAME alexandria) (NAME let-plus)) DEPENDENCIES (alexandria let-plus) VERSION 20151218-git SIBLINGS NIL) */
+    cl-colors DEPS ((NAME alexandria FILENAME alexandria) (NAME let-plus FILENAME let-plus)) DEPENDENCIES (alexandria let-plus) VERSION 20151218-git SIBLINGS
+    NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix
new file mode 100644
index 00000000000..89627b22fbc
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-containers.nix
@@ -0,0 +1,36 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-containers'';
+  version = ''20170403-git'';
+
+  description = ''A generic container library for Common Lisp'';
+
+  deps = [ args."metatilities-base" args."asdf-system-connections" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-containers/2017-04-03/cl-containers-20170403-git.tgz'';
+    sha256 = ''0wlwbz5xv3468iszvmfxnj924mdwx0lyzmhsggiq7iq7ip8wbbxg'';
+  };
+    
+  packageName = "cl-containers";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-containers[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM cl-containers DESCRIPTION A generic container library for Common Lisp SHA256 0wlwbz5xv3468iszvmfxnj924mdwx0lyzmhsggiq7iq7ip8wbbxg URL
+    http://beta.quicklisp.org/archive/cl-containers/2017-04-03/cl-containers-20170403-git.tgz MD5 17123cd2b018cd3eb048eceef78be3f8 NAME cl-containers TESTNAME
+    NIL FILENAME cl-containers DEPS ((NAME metatilities-base FILENAME metatilities-base) (NAME asdf-system-connections FILENAME asdf-system-connections))
+    DEPENDENCIES (metatilities-base asdf-system-connections) VERSION 20170403-git SIBLINGS (cl-containers-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix
index 4d2b56ac775..5aa6ad1c9c0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-cookie.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-cookie/2015-08-04/cl-cookie-20150804-git.tgz'';
     sha256 = ''0llh5d2p7wi5amzpckng1bzmf2bdfdwkfapcdq0znqlzd5bvbby8'';
   };
+    
+  packageName = "cl-cookie";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,7 @@ rec {
 }
 /* (SYSTEM cl-cookie DESCRIPTION HTTP cookie manager SHA256 0llh5d2p7wi5amzpckng1bzmf2bdfdwkfapcdq0znqlzd5bvbby8 URL
     http://beta.quicklisp.org/archive/cl-cookie/2015-08-04/cl-cookie-20150804-git.tgz MD5 d2c08a71afd47b3ad42e1234ec1a3083 NAME cl-cookie TESTNAME NIL FILENAME
-    cl-cookie DEPS ((NAME quri) (NAME proc-parse) (NAME local-time) (NAME cl-ppcre) (NAME alexandria)) DEPENDENCIES
-    (quri proc-parse local-time cl-ppcre alexandria) VERSION 20150804-git SIBLINGS (cl-cookie-test)) */
+    cl-cookie DEPS
+    ((NAME quri FILENAME quri) (NAME proc-parse FILENAME proc-parse) (NAME local-time FILENAME local-time) (NAME cl-ppcre FILENAME cl-ppcre)
+     (NAME alexandria FILENAME alexandria))
+    DEPENDENCIES (quri proc-parse local-time cl-ppcre alexandria) VERSION 20150804-git SIBLINGS (cl-cookie-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix
new file mode 100644
index 00000000000..3436e5a75a6
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-csv.nix
@@ -0,0 +1,36 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-csv'';
+  version = ''20170403-git'';
+
+  description = ''Facilities for reading and writing CSV format files'';
+
+  deps = [ args."iterate" args."cl-interpol" args."alexandria" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-csv/2017-04-03/cl-csv-20170403-git.tgz'';
+    sha256 = ''1mz0hr0r7yxw1dzdbaqzxabmipp286zc6aglni9f46isjwmqpy6h'';
+  };
+    
+  packageName = "cl-csv";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-csv[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM cl-csv DESCRIPTION Facilities for reading and writing CSV format files SHA256 1mz0hr0r7yxw1dzdbaqzxabmipp286zc6aglni9f46isjwmqpy6h URL
+    http://beta.quicklisp.org/archive/cl-csv/2017-04-03/cl-csv-20170403-git.tgz MD5 1e71a90c5057371fab044d440c39f0a3 NAME cl-csv TESTNAME NIL FILENAME cl-csv
+    DEPS ((NAME iterate FILENAME iterate) (NAME cl-interpol FILENAME cl-interpol) (NAME alexandria FILENAME alexandria)) DEPENDENCIES
+    (iterate cl-interpol alexandria) VERSION 20170403-git SIBLINGS (cl-csv-clsql cl-csv-data-table)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
index 781ae6c1d33..489147c881b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-dbi.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-01-24/cl-dbi-20170124-git.tgz'';
     sha256 = ''0aqfcxbxmc9q3lagaarx0bqncbwjjv0wrskm6lkzy1fp94sik0qj'';
   };
+    
+  packageName = "cl-dbi";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix
index 7b4c40632a5..067e09ab0e1 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-emb.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-emb/2017-02-27/cl-emb-20170227-git.tgz'';
     sha256 = ''03n97xvh3v8bz1p75v1vhryfkjm74v0cr5jwg4rakq9zkchhfk80'';
   };
+    
+  packageName = "cl-emb";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix
index 2063f2f4be3..43651428bd0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fad.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-fad/2016-08-25/cl-fad-0.7.4.tgz'';
     sha256 = ''1avp5j66vrpv5symgw4n4szlc2cyqz4haa0cxzy1pl8p0a8k0v9x'';
   };
+    
+  packageName = "cl-fad";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,5 @@ rec {
 }
 /* (SYSTEM cl-fad DESCRIPTION Portable pathname library SHA256 1avp5j66vrpv5symgw4n4szlc2cyqz4haa0cxzy1pl8p0a8k0v9x URL
     http://beta.quicklisp.org/archive/cl-fad/2016-08-25/cl-fad-0.7.4.tgz MD5 8ee53f2249eca9d7d54e268662b41845 NAME cl-fad TESTNAME NIL FILENAME cl-fad DEPS
-    ((NAME alexandria) (NAME bordeaux-threads)) DEPENDENCIES (alexandria bordeaux-threads) VERSION 0.7.4 SIBLINGS NIL) */
+    ((NAME alexandria FILENAME alexandria) (NAME bordeaux-threads FILENAME bordeaux-threads)) DEPENDENCIES (alexandria bordeaux-threads) VERSION 0.7.4 SIBLINGS
+    NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix
index 9d3d779ab48..681b9205e9b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse-meta-fs.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-fuse-meta-fs/2015-06-08/cl-fuse-meta-fs-20150608-git.tgz'';
     sha256 = ''1i3yw237ygwlkhbcbm9q54ad9g4fi63fw4mg508hr7bz9gzg36q2'';
   };
+    
+  packageName = "cl-fuse-meta-fs";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,6 @@ rec {
 }
 /* (SYSTEM cl-fuse-meta-fs DESCRIPTION CFFI bindings to FUSE (Filesystem in user space) SHA256 1i3yw237ygwlkhbcbm9q54ad9g4fi63fw4mg508hr7bz9gzg36q2 URL
     http://beta.quicklisp.org/archive/cl-fuse-meta-fs/2015-06-08/cl-fuse-meta-fs-20150608-git.tgz MD5 eb80b959dd6494cd787cff4f8c2f214b NAME cl-fuse-meta-fs
-    TESTNAME NIL FILENAME cl-fuse-meta-fs DEPS ((NAME bordeaux-threads) (NAME cl-fuse) (NAME iterate) (NAME pcall)) DEPENDENCIES
-    (bordeaux-threads cl-fuse iterate pcall) VERSION 20150608-git SIBLINGS NIL) */
+    TESTNAME NIL FILENAME cl-fuse-meta-fs DEPS
+    ((NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cl-fuse FILENAME cl-fuse) (NAME iterate FILENAME iterate) (NAME pcall FILENAME pcall))
+    DEPENDENCIES (bordeaux-threads cl-fuse iterate pcall) VERSION 20150608-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix
index 576edbfdbf2..8681110c22e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-fuse.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-fuse/2016-03-18/cl-fuse-20160318-git.tgz'';
     sha256 = ''1yllmnnhqp42s37a2y7h7vph854xgna62l1pidvlyskc90bl5jf6'';
   };
+    
+  packageName = "cl-fuse";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,8 @@ rec {
 }
 /* (SYSTEM cl-fuse DESCRIPTION CFFI bindings to FUSE (Filesystem in user space) SHA256 1yllmnnhqp42s37a2y7h7vph854xgna62l1pidvlyskc90bl5jf6 URL
     http://beta.quicklisp.org/archive/cl-fuse/2016-03-18/cl-fuse-20160318-git.tgz MD5 ce2e907e5ae2cece72fa314be1ced44c NAME cl-fuse TESTNAME NIL FILENAME
-    cl-fuse DEPS ((NAME bordeaux-threads) (NAME cffi) (NAME cffi-grovel) (NAME cl-utilities) (NAME iterate) (NAME trivial-backtrace) (NAME trivial-utf-8))
+    cl-fuse DEPS
+    ((NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)
+     (NAME cl-utilities FILENAME cl-utilities) (NAME iterate FILENAME iterate) (NAME trivial-backtrace FILENAME trivial-backtrace)
+     (NAME trivial-utf-8 FILENAME trivial-utf-8))
     DEPENDENCIES (bordeaux-threads cffi cffi-grovel cl-utilities iterate trivial-backtrace trivial-utf-8) VERSION 20160318-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix
new file mode 100644
index 00000000000..5dae43b6e59
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-interpol.nix
@@ -0,0 +1,35 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-interpol'';
+  version = ''0.2.6'';
+
+  description = '''';
+
+  deps = [ args."cl-unicode" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-interpol/2016-09-29/cl-interpol-0.2.6.tgz'';
+    sha256 = ''172iy4bp4fxyfhz7n6jbqz4j8xqnzpvmh981bbi5waflg58x9h8b'';
+  };
+    
+  packageName = "cl-interpol";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-interpol[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM cl-interpol DESCRIPTION NIL SHA256 172iy4bp4fxyfhz7n6jbqz4j8xqnzpvmh981bbi5waflg58x9h8b URL
+    http://beta.quicklisp.org/archive/cl-interpol/2016-09-29/cl-interpol-0.2.6.tgz MD5 1adc92924670601ebb92546ef8bdc6a7 NAME cl-interpol TESTNAME NIL FILENAME
+    cl-interpol DEPS ((NAME cl-unicode FILENAME cl-unicode)) DEPENDENCIES (cl-unicode) VERSION 0.2.6 SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix
index 7babd1a459f..20afe70c796 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-json.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-json/2014-12-17/cl-json-20141217-git.tgz'';
     sha256 = ''00cfppyi6njsbpv1x03jcv4zwplg0q1138174l3wjkvi3gsql17g'';
   };
+    
+  packageName = "cl-json";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix
index f782c99a68a..74d40aa8e79 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n-cldr.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-l10n-cldr/2012-09-09/cl-l10n-cldr-20120909-darcs.tgz'';
     sha256 = ''03l81bx8izvzwzw0qah34l4k47l4gmhr917phhhl81qp55x7zbiv'';
   };
+    
+  packageName = "cl-l10n-cldr";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix
index 6c465f14858..eabcda82eab 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-l10n.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-l10n/2016-12-04/cl-l10n-20161204-darcs.tgz'';
     sha256 = ''1r8jgwks21az78c5kdxgw5llk9ml423vjkv1f93qg1vx3zma6vzl'';
   };
+    
+  packageName = "cl-l10n";
 
   overrides = x: {
     postInstall = ''
@@ -31,6 +33,7 @@ rec {
 /* (SYSTEM cl-l10n DESCRIPTION Portable CL Locale Support SHA256 1r8jgwks21az78c5kdxgw5llk9ml423vjkv1f93qg1vx3zma6vzl URL
     http://beta.quicklisp.org/archive/cl-l10n/2016-12-04/cl-l10n-20161204-darcs.tgz MD5 c7cb0bb584b061799abaaaf2bd65c9c5 NAME cl-l10n TESTNAME NIL FILENAME
     cl-l10n DEPS
-    ((NAME alexandria) (NAME cl-fad) (NAME cl-l10n-cldr) (NAME cl-ppcre) (NAME closer-mop) (NAME cxml) (NAME flexi-streams) (NAME iterate) (NAME local-time)
-     (NAME metabang-bind))
+    ((NAME alexandria FILENAME alexandria) (NAME cl-fad FILENAME cl-fad) (NAME cl-l10n-cldr FILENAME cl-l10n-cldr) (NAME cl-ppcre FILENAME cl-ppcre)
+     (NAME closer-mop FILENAME closer-mop) (NAME cxml FILENAME cxml) (NAME flexi-streams FILENAME flexi-streams) (NAME iterate FILENAME iterate)
+     (NAME local-time FILENAME local-time) (NAME metabang-bind FILENAME metabang-bind))
     DEPENDENCIES (alexandria cl-fad cl-l10n-cldr cl-ppcre closer-mop cxml flexi-streams iterate local-time metabang-bind) VERSION 20161204-darcs SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix
index cca51585e5d..c08467fdd20 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-libuv.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-libuv/2016-08-25/cl-libuv-20160825-git.tgz'';
     sha256 = ''02vi9ph9pxbxgp9jsbgzb9nijsv0vyk3f1jyhhm88i0y1kb3595r'';
   };
+    
+  packageName = "cl-libuv";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,5 @@ rec {
 }
 /* (SYSTEM cl-libuv DESCRIPTION Low-level libuv bindings for Common Lisp. SHA256 02vi9ph9pxbxgp9jsbgzb9nijsv0vyk3f1jyhhm88i0y1kb3595r URL
     http://beta.quicklisp.org/archive/cl-libuv/2016-08-25/cl-libuv-20160825-git.tgz MD5 ba5e3cfaadcf710eaee67cc9e716e45a NAME cl-libuv TESTNAME NIL FILENAME
-    cl-libuv DEPS ((NAME alexandria) (NAME cffi) (NAME cffi-grovel)) DEPENDENCIES (alexandria cffi cffi-grovel) VERSION 20160825-git SIBLINGS NIL) */
+    cl-libuv DEPS ((NAME alexandria FILENAME alexandria) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)) DEPENDENCIES
+    (alexandria cffi cffi-grovel) VERSION 20160825-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-log.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-log.nix
new file mode 100644
index 00000000000..cc0a45b6e38
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-log.nix
@@ -0,0 +1,35 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-log'';
+  version = ''cl-log.1.0.1'';
+
+  description = ''CL-LOG - a general purpose logging utility'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-log/2013-01-28/cl-log.1.0.1.tgz'';
+    sha256 = ''0wdbq0x6xn21qp3zd49giss3viv8wbs3ga8bg2grfnmzwfwl0y2d'';
+  };
+    
+  packageName = "cl-log";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-log[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM cl-log DESCRIPTION CL-LOG - a general purpose logging utility SHA256 0wdbq0x6xn21qp3zd49giss3viv8wbs3ga8bg2grfnmzwfwl0y2d URL
+    http://beta.quicklisp.org/archive/cl-log/2013-01-28/cl-log.1.0.1.tgz MD5 fb960933eb748c14adc3ccb376ac8066 NAME cl-log TESTNAME NIL FILENAME cl-log DEPS NIL
+    DEPENDENCIES NIL VERSION cl-log.1.0.1 SIBLINGS (cl-log-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markdown.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markdown.nix
new file mode 100644
index 00000000000..791b1e55827
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markdown.nix
@@ -0,0 +1,39 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''cl-markdown'';
+  version = ''20101006-darcs'';
+
+  description = '''';
+
+  deps = [ args."metatilities-base" args."metabang-bind" args."dynamic-classes" args."cl-ppcre" args."cl-containers" args."anaphora" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-markdown/2010-10-06/cl-markdown-20101006-darcs.tgz'';
+    sha256 = ''1hrv7szhmhxgbadwrmf6wx4kwkbg3dnabbsz4hfffzjgprwac79w'';
+  };
+    
+  packageName = "cl-markdown";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/cl-markdown[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM cl-markdown DESCRIPTION NIL SHA256 1hrv7szhmhxgbadwrmf6wx4kwkbg3dnabbsz4hfffzjgprwac79w URL
+    http://beta.quicklisp.org/archive/cl-markdown/2010-10-06/cl-markdown-20101006-darcs.tgz MD5 3e748529531ad1dcbee5443fe24b6300 NAME cl-markdown TESTNAME NIL
+    FILENAME cl-markdown DEPS
+    ((NAME metatilities-base FILENAME metatilities-base) (NAME metabang-bind FILENAME metabang-bind) (NAME dynamic-classes FILENAME dynamic-classes)
+     (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-containers FILENAME cl-containers) (NAME anaphora FILENAME anaphora))
+    DEPENDENCIES (metatilities-base metabang-bind dynamic-classes cl-ppcre cl-containers anaphora) VERSION 20101006-darcs SIBLINGS
+    (cl-markdown-comparisons cl-markdown-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix
index 282b05fefd8..a8f218d3756 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-markup.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-markup/2013-10-03/cl-markup-20131003-git.tgz'';
     sha256 = ''1ik3a5k6axq941zbf6zyig553i5gnypbcxdq9l7bfxp8w18vbj0r'';
   };
+    
+  packageName = "cl-markup";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix
index f54fc00950a..90983764cda 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-mysql.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-mysql/2016-06-28/cl-mysql-20160628-git.tgz'';
     sha256 = ''1zkijanw34nc91dn9jv30590ir6jw7bbcwjsqbvli69fh4b03319'';
   };
+    
+  packageName = "cl-mysql";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,4 @@ rec {
 }
 /* (SYSTEM cl-mysql DESCRIPTION Common Lisp MySQL library bindings SHA256 1zkijanw34nc91dn9jv30590ir6jw7bbcwjsqbvli69fh4b03319 URL
     http://beta.quicklisp.org/archive/cl-mysql/2016-06-28/cl-mysql-20160628-git.tgz MD5 349615d041c2f2177b678088f9c22409 NAME cl-mysql TESTNAME NIL FILENAME
-    cl-mysql DEPS ((NAME cffi)) DEPENDENCIES (cffi) VERSION 20160628-git SIBLINGS (cl-mysql-test)) */
+    cl-mysql DEPS ((NAME cffi FILENAME cffi)) DEPENDENCIES (cffi) VERSION 20160628-git SIBLINGS (cl-mysql-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix
index 38f57fc61b1..964c94c95d5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-paths-ttf.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-paths-ttf'';
-  version = ''cl-vectors-20150407-git'';
+  version = ''cl-vectors-20170516-git'';
 
   description = ''cl-paths-ttf: vectorial paths manipulation'';
 
-  deps = [ args."zpb-ttf" ];
+  deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-vectors/2015-04-07/cl-vectors-20150407-git.tgz'';
-    sha256 = ''1qd7ywc2ayiyd5nw7shnjgh0nc14h328h0cw921g5b2n8j6y959w'';
+    url = ''http://beta.quicklisp.org/archive/cl-vectors/2017-05-16/cl-vectors-20170516-git.tgz'';
+    sha256 = ''0j7cdg6akq5giv8rgbxdv8rwpzkv98r5bv78p5nnrixpprvjhvzx'';
   };
+    
+  packageName = "cl-paths-ttf";
 
   overrides = x: {
     postInstall = ''
@@ -28,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM cl-paths-ttf DESCRIPTION cl-paths-ttf: vectorial paths manipulation SHA256 1qd7ywc2ayiyd5nw7shnjgh0nc14h328h0cw921g5b2n8j6y959w URL
-    http://beta.quicklisp.org/archive/cl-vectors/2015-04-07/cl-vectors-20150407-git.tgz MD5 9e255503bf4559912ea1511c919c474a NAME cl-paths-ttf TESTNAME NIL
-    FILENAME cl-paths-ttf DEPS ((NAME zpb-ttf)) DEPENDENCIES (zpb-ttf) VERSION cl-vectors-20150407-git SIBLINGS (cl-aa-misc cl-aa cl-paths cl-vectors)) */
+/* (SYSTEM cl-paths-ttf DESCRIPTION cl-paths-ttf: vectorial paths manipulation SHA256 0j7cdg6akq5giv8rgbxdv8rwpzkv98r5bv78p5nnrixpprvjhvzx URL
+    http://beta.quicklisp.org/archive/cl-vectors/2017-05-16/cl-vectors-20170516-git.tgz MD5 0258ae7face22f2035c1a85379ee0aae NAME cl-paths-ttf TESTNAME NIL
+    FILENAME cl-paths-ttf DEPS NIL DEPENDENCIES NIL VERSION cl-vectors-20170516-git SIBLINGS (cl-aa-misc cl-aa cl-paths cl-vectors)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix
index 66b42fec175..7766454c193 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-postgres.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/postmodern/2017-04-03/postmodern-20170403-git.tgz'';
     sha256 = ''1pklmp0y0falrmbxll79drrcrlgslasavdym5r45m8kkzi1zpv9p'';
   };
+    
+  packageName = "cl-postgres";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,4 @@ rec {
 }
 /* (SYSTEM cl-postgres DESCRIPTION Low-level client library for PostgreSQL SHA256 1pklmp0y0falrmbxll79drrcrlgslasavdym5r45m8kkzi1zpv9p URL
     http://beta.quicklisp.org/archive/postmodern/2017-04-03/postmodern-20170403-git.tgz MD5 7a4145a0a5ff5bcb7a4bf29b5c2915d2 NAME cl-postgres TESTNAME NIL
-    FILENAME cl-postgres DEPS ((NAME md5)) DEPENDENCIES (md5) VERSION postmodern-20170403-git SIBLINGS (postmodern s-sql simple-date)) */
+    FILENAME cl-postgres DEPS ((NAME md5 FILENAME md5)) DEPENDENCIES (md5) VERSION postmodern-20170403-git SIBLINGS (postmodern s-sql simple-date)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix
index 8e687ce64a8..cf46246063f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-template.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-ppcre-template'';
-  version = ''cl-unification-20170124-git'';
+  version = ''cl-unification-20170516-git'';
 
   description = ''A system used to conditionally load the CL-PPCRE Template.
 
@@ -9,12 +9,14 @@ This system is not required and it is handled only if CL-PPCRE is
 available.  If it is, then the library provides the
 REGULAR-EXPRESSION-TEMPLATE.'';
 
-  deps = [ args."cl-ppcre" ];
+  deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-unification/2017-01-24/cl-unification-20170124-git.tgz'';
-    sha256 = ''0gwk40y5byg6q0hhd41rqf8g8i1my0h4lshc63xfnh3mfgcc8bx9'';
+    url = ''http://beta.quicklisp.org/archive/cl-unification/2017-05-16/cl-unification-20170516-git.tgz'';
+    sha256 = ''0yg2i0vn11skfz0b1zc8wnsqr24gf7fc4hzmwrwj15iz3xzqy9b0'';
   };
+    
+  packageName = "cl-ppcre-template";
 
   overrides = x: {
     postInstall = ''
@@ -37,6 +39,6 @@ REGULAR-EXPRESSION-TEMPLATE.'';
 This system is not required and it is handled only if CL-PPCRE is
 available.  If it is, then the library provides the
 REGULAR-EXPRESSION-TEMPLATE.
-    SHA256 0gwk40y5byg6q0hhd41rqf8g8i1my0h4lshc63xfnh3mfgcc8bx9 URL http://beta.quicklisp.org/archive/cl-unification/2017-01-24/cl-unification-20170124-git.tgz
-    MD5 dd277adaf3a0ee41fd0731f78519b1b1 NAME cl-ppcre-template TESTNAME NIL FILENAME cl-ppcre-template DEPS ((NAME cl-ppcre)) DEPENDENCIES (cl-ppcre) VERSION
-    cl-unification-20170124-git SIBLINGS (cl-unification-lib cl-unification-test cl-unification)) */
+    SHA256 0yg2i0vn11skfz0b1zc8wnsqr24gf7fc4hzmwrwj15iz3xzqy9b0 URL http://beta.quicklisp.org/archive/cl-unification/2017-05-16/cl-unification-20170516-git.tgz
+    MD5 70bcdd486f3444ddd41b5c2c3add119c NAME cl-ppcre-template TESTNAME NIL FILENAME cl-ppcre-template DEPS NIL DEPENDENCIES NIL VERSION
+    cl-unification-20170516-git SIBLINGS (cl-unification-lib cl-unification-test cl-unification)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix
index 3872bfd5f93..b79a00f672f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre-unicode.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-ppcre/2015-09-23/cl-ppcre-2.0.11.tgz'';
     sha256 = ''1djciws9n0jg3qdrck3j4wj607zvkbir8p379mp0p7b5g0glwvb2'';
   };
+    
+  packageName = "cl-ppcre-unicode";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,4 @@ rec {
 }
 /* (SYSTEM cl-ppcre-unicode DESCRIPTION Perl-compatible regular expression library (Unicode) SHA256 1djciws9n0jg3qdrck3j4wj607zvkbir8p379mp0p7b5g0glwvb2 URL
     http://beta.quicklisp.org/archive/cl-ppcre/2015-09-23/cl-ppcre-2.0.11.tgz MD5 6d5250467c05eb661a76d395186a1da0 NAME cl-ppcre-unicode TESTNAME NIL FILENAME
-    cl-ppcre-unicode DEPS ((NAME cl-unicode)) DEPENDENCIES (cl-unicode) VERSION cl-ppcre-2.0.11 SIBLINGS (cl-ppcre)) */
+    cl-ppcre-unicode DEPS ((NAME cl-unicode FILENAME cl-unicode)) DEPENDENCIES (cl-unicode) VERSION cl-ppcre-2.0.11 SIBLINGS (cl-ppcre)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix
index ecf4a5de399..b7c60a16696 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-ppcre.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-ppcre/2015-09-23/cl-ppcre-2.0.11.tgz'';
     sha256 = ''1djciws9n0jg3qdrck3j4wj607zvkbir8p379mp0p7b5g0glwvb2'';
   };
+    
+  packageName = "cl-ppcre";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix
index 3a933d2b11d..74c1213cc6d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-project.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-project/2016-05-31/cl-project-20160531-git.tgz'';
     sha256 = ''1xwjgs5pzkdnd9i5lcic9z41d1c4yf7pvarrvawfxcicg6rrfw81'';
   };
+    
+  packageName = "cl-project";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,7 @@ rec {
 }
 /* (SYSTEM cl-project DESCRIPTION Generate a skeleton for modern project SHA256 1xwjgs5pzkdnd9i5lcic9z41d1c4yf7pvarrvawfxcicg6rrfw81 URL
     http://beta.quicklisp.org/archive/cl-project/2016-05-31/cl-project-20160531-git.tgz MD5 63de5ce6f0f3e5f60094a86d32c2f1a9 NAME cl-project TESTNAME NIL
-    FILENAME cl-project DEPS ((NAME uiop) (NAME prove) (NAME local-time) (NAME cl-ppcre) (NAME cl-emb)) DEPENDENCIES (uiop prove local-time cl-ppcre cl-emb)
-    VERSION 20160531-git SIBLINGS (cl-project-test)) */
+    FILENAME cl-project DEPS
+    ((NAME uiop FILENAME uiop) (NAME prove FILENAME prove) (NAME local-time FILENAME local-time) (NAME cl-ppcre FILENAME cl-ppcre)
+     (NAME cl-emb FILENAME cl-emb))
+    DEPENDENCIES (uiop prove local-time cl-ppcre cl-emb) VERSION 20160531-git SIBLINGS (cl-project-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix
index cad670acab1..03d863f2122 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-reexport.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-reexport/2015-07-09/cl-reexport-20150709-git.tgz'';
     sha256 = ''1y6qlyps7g0wl4rbmzvw6s1kjdwwmh33layyjclsjp9j5nm8mdmi'';
   };
+    
+  packageName = "cl-reexport";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,4 @@ rec {
 }
 /* (SYSTEM cl-reexport DESCRIPTION Reexport external symbols in other packages. SHA256 1y6qlyps7g0wl4rbmzvw6s1kjdwwmh33layyjclsjp9j5nm8mdmi URL
     http://beta.quicklisp.org/archive/cl-reexport/2015-07-09/cl-reexport-20150709-git.tgz MD5 207d02771cbd906d033ff704ca5c3a3d NAME cl-reexport TESTNAME NIL
-    FILENAME cl-reexport DEPS ((NAME alexandria)) DEPENDENCIES (alexandria) VERSION 20150709-git SIBLINGS (cl-reexport-test)) */
+    FILENAME cl-reexport DEPS ((NAME alexandria FILENAME alexandria)) DEPENDENCIES (alexandria) VERSION 20150709-git SIBLINGS (cl-reexport-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix
index 0098abf59d3..1d525c7a675 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-smtp.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-smtp/2016-08-25/cl-smtp-20160825-git.tgz'';
     sha256 = ''0svkvy6x458a7rgvp3wki0lmhdxpaa1j0brwsw2mlpl2jqkx5dxh'';
   };
+    
+  packageName = "cl-smtp";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,7 @@ rec {
 }
 /* (SYSTEM cl-smtp DESCRIPTION Common Lisp smtp client. SHA256 0svkvy6x458a7rgvp3wki0lmhdxpaa1j0brwsw2mlpl2jqkx5dxh URL
     http://beta.quicklisp.org/archive/cl-smtp/2016-08-25/cl-smtp-20160825-git.tgz MD5 e6bb60e66b0f7d9cc5e4f98aba56998a NAME cl-smtp TESTNAME NIL FILENAME
-    cl-smtp DEPS ((NAME cl+ssl) (NAME cl-base64) (NAME flexi-streams) (NAME trivial-gray-streams) (NAME usocket)) DEPENDENCIES
-    (cl+ssl cl-base64 flexi-streams trivial-gray-streams usocket) VERSION 20160825-git SIBLINGS NIL) */
+    cl-smtp DEPS
+    ((NAME cl+ssl FILENAME cl+ssl) (NAME cl-base64 FILENAME cl-base64) (NAME flexi-streams FILENAME flexi-streams)
+     (NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME usocket FILENAME usocket))
+    DEPENDENCIES (cl+ssl cl-base64 flexi-streams trivial-gray-streams usocket) VERSION 20160825-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix
index ba16a64a9f6..9a49e468ce1 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-store.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-store/2016-05-31/cl-store-20160531-git.tgz'';
     sha256 = ''0j1pfgvzy6l7hb68xsz2dghsa94lip7caq6f6608jsqadmdswljz'';
   };
+    
+  packageName = "cl-store";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix
index abdfc65ec1f..e82cb4d501f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-annot.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz'';
     sha256 = ''1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n'';
   };
+    
+  packageName = "cl-syntax-annot";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,5 @@ rec {
 }
 /* (SYSTEM cl-syntax-annot DESCRIPTION CL-Syntax Reader Syntax for cl-annot SHA256 1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n URL
     http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz MD5 602b84143aafe59d65f4e08ac20a124a NAME cl-syntax-annot TESTNAME NIL
-    FILENAME cl-syntax-annot DEPS ((NAME cl-annot)) DEPENDENCIES (cl-annot) VERSION cl-syntax-20150407-git SIBLINGS
+    FILENAME cl-syntax-annot DEPS ((NAME cl-annot FILENAME cl-annot)) DEPENDENCIES (cl-annot) VERSION cl-syntax-20150407-git SIBLINGS
     (cl-syntax-anonfun cl-syntax-clsql cl-syntax-fare-quasiquote cl-syntax-interpol cl-syntax-markup cl-syntax)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix
index 32c1a0c0ccc..6680fc51cbc 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-anonfun.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz'';
     sha256 = ''1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n'';
   };
+    
+  packageName = "cl-syntax-anonfun";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,5 @@ rec {
 }
 /* (SYSTEM cl-syntax-anonfun DESCRIPTION CL-Syntax Reader Syntax for cl-anonfun SHA256 1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n URL
     http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz MD5 602b84143aafe59d65f4e08ac20a124a NAME cl-syntax-anonfun TESTNAME NIL
-    FILENAME cl-syntax-anonfun DEPS ((NAME cl-anonfun)) DEPENDENCIES (cl-anonfun) VERSION cl-syntax-20150407-git SIBLINGS
+    FILENAME cl-syntax-anonfun DEPS ((NAME cl-anonfun FILENAME cl-anonfun)) DEPENDENCIES (cl-anonfun) VERSION cl-syntax-20150407-git SIBLINGS
     (cl-syntax-annot cl-syntax-clsql cl-syntax-fare-quasiquote cl-syntax-interpol cl-syntax-markup cl-syntax)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix
index 34c5a2e6628..2150b64cb6f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax-markup.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz'';
     sha256 = ''1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n'';
   };
+    
+  packageName = "cl-syntax-markup";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,5 @@ rec {
 }
 /* (SYSTEM cl-syntax-markup DESCRIPTION CL-Syntax Reader Syntax for CL-Markup SHA256 1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n URL
     http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz MD5 602b84143aafe59d65f4e08ac20a124a NAME cl-syntax-markup TESTNAME NIL
-    FILENAME cl-syntax-markup DEPS ((NAME cl-markup)) DEPENDENCIES (cl-markup) VERSION cl-syntax-20150407-git SIBLINGS
+    FILENAME cl-syntax-markup DEPS ((NAME cl-markup FILENAME cl-markup)) DEPENDENCIES (cl-markup) VERSION cl-syntax-20150407-git SIBLINGS
     (cl-syntax-annot cl-syntax-anonfun cl-syntax-clsql cl-syntax-fare-quasiquote cl-syntax-interpol cl-syntax)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix
index bccba7ca8ea..264d74e2db4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-syntax.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz'';
     sha256 = ''1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n'';
   };
+    
+  packageName = "cl-syntax";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,6 @@ rec {
 }
 /* (SYSTEM cl-syntax DESCRIPTION Reader Syntax Coventions for Common Lisp and SLIME SHA256 1pz9a7hiql493ax5qgs9zb3bmvf0nnmmgdx14s4j2apdy2m34v8n URL
     http://beta.quicklisp.org/archive/cl-syntax/2015-04-07/cl-syntax-20150407-git.tgz MD5 602b84143aafe59d65f4e08ac20a124a NAME cl-syntax TESTNAME NIL FILENAME
-    cl-syntax DEPS ((NAME trivial-types) (NAME named-readtables)) DEPENDENCIES (trivial-types named-readtables) VERSION 20150407-git SIBLINGS
+    cl-syntax DEPS ((NAME trivial-types FILENAME trivial-types) (NAME named-readtables FILENAME named-readtables)) DEPENDENCIES
+    (trivial-types named-readtables) VERSION 20150407-git SIBLINGS
     (cl-syntax-annot cl-syntax-anonfun cl-syntax-clsql cl-syntax-fare-quasiquote cl-syntax-interpol cl-syntax-markup)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix
index c0d004c4009..2e7f97cf66a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-test-more.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/prove/2017-04-03/prove-20170403-git.tgz'';
     sha256 = ''091xxkn9zj22c4gmm8x714k29bs4j0j7akppwh55zjsmrxdhqcpl'';
   };
+    
+  packageName = "cl-test-more";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix
index d514c1f26a4..8b0d35253f4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unicode.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-unicode/2014-12-17/cl-unicode-0.1.5.tgz'';
     sha256 = ''1jd5qq5ji6l749c4x415z22y9r0k9z18pdi9p9fqvamzh854i46n'';
   };
+    
+  packageName = "cl-unicode";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix
index 4c0b0c5c762..7c5e16973ef 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-unification.nix
@@ -1,7 +1,7 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-unification'';
-  version = ''20170124-git'';
+  version = ''20170516-git'';
 
   description = ''The CL-UNIFICATION system.
 
@@ -10,9 +10,11 @@ The system contains the definitions for the 'unification' machinery.'';
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-unification/2017-01-24/cl-unification-20170124-git.tgz'';
-    sha256 = ''0gwk40y5byg6q0hhd41rqf8g8i1my0h4lshc63xfnh3mfgcc8bx9'';
+    url = ''http://beta.quicklisp.org/archive/cl-unification/2017-05-16/cl-unification-20170516-git.tgz'';
+    sha256 = ''0yg2i0vn11skfz0b1zc8wnsqr24gf7fc4hzmwrwj15iz3xzqy9b0'';
   };
+    
+  packageName = "cl-unification";
 
   overrides = x: {
     postInstall = ''
@@ -33,6 +35,6 @@ The system contains the definitions for the 'unification' machinery.'';
 /* (SYSTEM cl-unification DESCRIPTION The CL-UNIFICATION system.
 
 The system contains the definitions for the 'unification' machinery.
-    SHA256 0gwk40y5byg6q0hhd41rqf8g8i1my0h4lshc63xfnh3mfgcc8bx9 URL http://beta.quicklisp.org/archive/cl-unification/2017-01-24/cl-unification-20170124-git.tgz
-    MD5 dd277adaf3a0ee41fd0731f78519b1b1 NAME cl-unification TESTNAME NIL FILENAME cl-unification DEPS NIL DEPENDENCIES NIL VERSION 20170124-git SIBLINGS
+    SHA256 0yg2i0vn11skfz0b1zc8wnsqr24gf7fc4hzmwrwj15iz3xzqy9b0 URL http://beta.quicklisp.org/archive/cl-unification/2017-05-16/cl-unification-20170516-git.tgz
+    MD5 70bcdd486f3444ddd41b5c2c3add119c NAME cl-unification TESTNAME NIL FILENAME cl-unification DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS
     (cl-unification-lib cl-unification-test cl-ppcre-template)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
index 099c63daf28..da23cbc9499 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-utilities.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-utilities/2010-10-06/cl-utilities-1.2.4.tgz'';
     sha256 = ''1z2ippnv2wgyxpz15zpif7j7sp1r20fkjhm4n6am2fyp6a3k3a87'';
   };
+    
+  packageName = "cl-utilities";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix
index e2e2c956e7d..fef996a845b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-vectors.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''cl-vectors'';
-  version = ''20150407-git'';
+  version = ''20170516-git'';
 
   description = ''cl-paths: vectorial paths manipulation'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/cl-vectors/2015-04-07/cl-vectors-20150407-git.tgz'';
-    sha256 = ''1qd7ywc2ayiyd5nw7shnjgh0nc14h328h0cw921g5b2n8j6y959w'';
+    url = ''http://beta.quicklisp.org/archive/cl-vectors/2017-05-16/cl-vectors-20170516-git.tgz'';
+    sha256 = ''0j7cdg6akq5giv8rgbxdv8rwpzkv98r5bv78p5nnrixpprvjhvzx'';
   };
+    
+  packageName = "cl-vectors";
 
   overrides = x: {
     postInstall = ''
@@ -28,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM cl-vectors DESCRIPTION cl-paths: vectorial paths manipulation SHA256 1qd7ywc2ayiyd5nw7shnjgh0nc14h328h0cw921g5b2n8j6y959w URL
-    http://beta.quicklisp.org/archive/cl-vectors/2015-04-07/cl-vectors-20150407-git.tgz MD5 9e255503bf4559912ea1511c919c474a NAME cl-vectors TESTNAME NIL
-    FILENAME cl-vectors DEPS NIL DEPENDENCIES NIL VERSION 20150407-git SIBLINGS (cl-aa-misc cl-aa cl-paths-ttf cl-paths)) */
+/* (SYSTEM cl-vectors DESCRIPTION cl-paths: vectorial paths manipulation SHA256 0j7cdg6akq5giv8rgbxdv8rwpzkv98r5bv78p5nnrixpprvjhvzx URL
+    http://beta.quicklisp.org/archive/cl-vectors/2017-05-16/cl-vectors-20170516-git.tgz MD5 0258ae7face22f2035c1a85379ee0aae NAME cl-vectors TESTNAME NIL
+    FILENAME cl-vectors DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS (cl-aa-misc cl-aa cl-paths-ttf cl-paths)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix
index ca1303e9d1d..e5888844c82 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cl-who.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-who/2014-12-17/cl-who-1.1.4.tgz'';
     sha256 = ''0r9wc92njz1cc7nghgbhdmd7jy216ylhlabfj0vc45bmfa4w44rq'';
   };
+    
+  packageName = "cl-who";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
index b9d894e3f47..e00c430581f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack-v1-compat.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''clack-v1-compat'';
-  version = ''clack-20170403-git'';
+  version = ''clack-20170516-git'';
 
   description = '''';
 
-  deps = [ args."uiop" args."trivial-types" args."trivial-mimes" args."trivial-backtrace" args."split-sequence" args."quri" args."marshal" args."local-time" args."lack-util" args."lack" args."ironclad" args."http-body" args."flexi-streams" args."cl-syntax-annot" args."cl-ppcre" args."cl-base64" args."circular-streams" args."alexandria" ];
+  deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clack/2017-04-03/clack-20170403-git.tgz'';
-    sha256 = ''1n6rbiz5ybwr1fbzynlmqmx2di5kqxrsniqx9mzy7034hqpk54ss'';
+    url = ''http://beta.quicklisp.org/archive/clack/2017-05-16/clack-20170516-git.tgz'';
+    sha256 = ''1161lsv739z02ijp0p95cb3vbybqhffp03sipb7l1vmmj24d8wgw'';
   };
+    
+  packageName = "clack-v1-compat";
 
   overrides = x: {
     postInstall = ''
@@ -28,16 +30,9 @@ rec {
     '';
   };
 }
-/* (SYSTEM clack-v1-compat DESCRIPTION NIL SHA256 1n6rbiz5ybwr1fbzynlmqmx2di5kqxrsniqx9mzy7034hqpk54ss URL
-    http://beta.quicklisp.org/archive/clack/2017-04-03/clack-20170403-git.tgz MD5 98643f671285c11e91d2c81d4c8fc52a NAME clack-v1-compat TESTNAME NIL FILENAME
-    clack-v1-compat DEPS
-    ((NAME uiop) (NAME trivial-types) (NAME trivial-mimes) (NAME trivial-backtrace) (NAME split-sequence) (NAME quri) (NAME marshal) (NAME local-time)
-     (NAME lack-util) (NAME lack) (NAME ironclad) (NAME http-body) (NAME flexi-streams) (NAME cl-syntax-annot) (NAME cl-ppcre) (NAME cl-base64)
-     (NAME circular-streams) (NAME alexandria))
-    DEPENDENCIES
-    (uiop trivial-types trivial-mimes trivial-backtrace split-sequence quri marshal local-time lack-util lack ironclad http-body flexi-streams cl-syntax-annot
-     cl-ppcre cl-base64 circular-streams alexandria)
-    VERSION clack-20170403-git SIBLINGS
+/* (SYSTEM clack-v1-compat DESCRIPTION NIL SHA256 1161lsv739z02ijp0p95cb3vbybqhffp03sipb7l1vmmj24d8wgw URL
+    http://beta.quicklisp.org/archive/clack/2017-05-16/clack-20170516-git.tgz MD5 ecda950881158c3bf209b29f4717fb0a NAME clack-v1-compat TESTNAME NIL FILENAME
+    clack-v1-compat DEPS NIL DEPENDENCIES NIL VERSION clack-20170516-git SIBLINGS
     (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot clack-handler-wookie clack-socket clack-test clack t-clack-handler-fcgi
      t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie t-clack-v1-compat clack-middleware-auth-basic clack-middleware-clsql
      clack-middleware-csrf clack-middleware-dbi clack-middleware-oauth clack-middleware-postmodern clack-middleware-rucksack clack-session-store-dbi
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
index 2d0d3b3d0bc..43c75bdd6e8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clack.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''clack'';
-  version = ''20170403-git'';
+  version = ''20170516-git'';
 
   description = ''Web application environment for Common Lisp'';
 
-  deps = [ args."uiop" args."lack-util" args."lack-middleware-backtrace" args."lack" args."bordeaux-threads" args."alexandria" ];
+  deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clack/2017-04-03/clack-20170403-git.tgz'';
-    sha256 = ''1n6rbiz5ybwr1fbzynlmqmx2di5kqxrsniqx9mzy7034hqpk54ss'';
+    url = ''http://beta.quicklisp.org/archive/clack/2017-05-16/clack-20170516-git.tgz'';
+    sha256 = ''1161lsv739z02ijp0p95cb3vbybqhffp03sipb7l1vmmj24d8wgw'';
   };
+    
+  packageName = "clack";
 
   overrides = x: {
     postInstall = ''
@@ -28,10 +30,9 @@ rec {
     '';
   };
 }
-/* (SYSTEM clack DESCRIPTION Web application environment for Common Lisp SHA256 1n6rbiz5ybwr1fbzynlmqmx2di5kqxrsniqx9mzy7034hqpk54ss URL
-    http://beta.quicklisp.org/archive/clack/2017-04-03/clack-20170403-git.tgz MD5 98643f671285c11e91d2c81d4c8fc52a NAME clack TESTNAME NIL FILENAME clack DEPS
-    ((NAME uiop) (NAME lack-util) (NAME lack-middleware-backtrace) (NAME lack) (NAME bordeaux-threads) (NAME alexandria)) DEPENDENCIES
-    (uiop lack-util lack-middleware-backtrace lack bordeaux-threads alexandria) VERSION 20170403-git SIBLINGS
+/* (SYSTEM clack DESCRIPTION Web application environment for Common Lisp SHA256 1161lsv739z02ijp0p95cb3vbybqhffp03sipb7l1vmmj24d8wgw URL
+    http://beta.quicklisp.org/archive/clack/2017-05-16/clack-20170516-git.tgz MD5 ecda950881158c3bf209b29f4717fb0a NAME clack TESTNAME NIL FILENAME clack DEPS
+    NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS
     (clack-handler-fcgi clack-handler-hunchentoot clack-handler-toot clack-handler-wookie clack-socket clack-test clack-v1-compat t-clack-handler-fcgi
      t-clack-handler-hunchentoot t-clack-handler-toot t-clack-handler-wookie t-clack-v1-compat clack-middleware-auth-basic clack-middleware-clsql
      clack-middleware-csrf clack-middleware-dbi clack-middleware-oauth clack-middleware-postmodern clack-middleware-rucksack clack-session-store-dbi
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
index 432da3069d2..d73de2e941c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closer-mop.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''closer-mop'';
-  version = ''20170403-git'';
+  version = ''20170516-git'';
 
   description = ''Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations.'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/closer-mop/2017-04-03/closer-mop-20170403-git.tgz'';
-    sha256 = ''166k9r55zf0lyvdacvih5y63xv2kp0kqmx9z6jmkyb3snrdghijf'';
+    url = ''http://beta.quicklisp.org/archive/closer-mop/2017-05-16/closer-mop-20170516-git.tgz'';
+    sha256 = ''072nf6d0gg76vkb1wkkzlfcck5ksril4anmjbmylbrwm3mn61p5w'';
   };
+    
+  packageName = "closer-mop";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,5 @@ rec {
 }
 /* (SYSTEM closer-mop DESCRIPTION
     Closer to MOP is a compatibility layer that rectifies many of the absent or incorrect CLOS MOP features across a broad range of Common Lisp implementations.
-    SHA256 166k9r55zf0lyvdacvih5y63xv2kp0kqmx9z6jmkyb3snrdghijf URL http://beta.quicklisp.org/archive/closer-mop/2017-04-03/closer-mop-20170403-git.tgz MD5
-    806918d9975d0c82fc471f95f40972a1 NAME closer-mop TESTNAME NIL FILENAME closer-mop DEPS NIL DEPENDENCIES NIL VERSION 20170403-git SIBLINGS NIL) */
+    SHA256 072nf6d0gg76vkb1wkkzlfcck5ksril4anmjbmylbrwm3mn61p5w URL http://beta.quicklisp.org/archive/closer-mop/2017-05-16/closer-mop-20170516-git.tgz MD5
+    169ba62f7f8f436e45f182cbe7dd8614 NAME closer-mop TESTNAME NIL FILENAME closer-mop DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix
index 4e7579dba88..8dca87dc182 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/closure-common.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/closure-common/2010-11-07/closure-common-20101107-git.tgz'';
     sha256 = ''1982dpn2z7rlznn74gxy9biqybh2d4r1n688h9pn1s2bssgv3hk4'';
   };
+    
+  packageName = "closure-common";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,5 @@ rec {
 }
 /* (SYSTEM closure-common DESCRIPTION NIL SHA256 1982dpn2z7rlznn74gxy9biqybh2d4r1n688h9pn1s2bssgv3hk4 URL
     http://beta.quicklisp.org/archive/closure-common/2010-11-07/closure-common-20101107-git.tgz MD5 12c45a2f0420b2e86fa06cb6575b150a NAME closure-common
-    TESTNAME NIL FILENAME closure-common DEPS ((NAME babel) (NAME trivial-gray-streams)) DEPENDENCIES (babel trivial-gray-streams) VERSION 20101107-git
-    SIBLINGS NIL) */
+    TESTNAME NIL FILENAME closure-common DEPS ((NAME babel FILENAME babel) (NAME trivial-gray-streams FILENAME trivial-gray-streams)) DEPENDENCIES
+    (babel trivial-gray-streams) VERSION 20101107-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix
index f5dba03d08e..76eae519de9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clsql.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/clsql/2016-02-08/clsql-20160208-git.tgz'';
     sha256 = ''0hc97rlfpanp6c1ziis47mrq2fgxbk0h51bhczn8k9xin2qbhhgn'';
   };
+    
+  packageName = "clsql";
 
   overrides = x: {
     postInstall = ''
@@ -30,6 +32,6 @@ rec {
 }
 /* (SYSTEM clsql DESCRIPTION Common Lisp SQL Interface library SHA256 0hc97rlfpanp6c1ziis47mrq2fgxbk0h51bhczn8k9xin2qbhhgn URL
     http://beta.quicklisp.org/archive/clsql/2016-02-08/clsql-20160208-git.tgz MD5 d1da7688361337a7de4fe7452c225a06 NAME clsql TESTNAME NIL FILENAME clsql DEPS
-    ((NAME uffi)) DEPENDENCIES (uffi) VERSION 20160208-git SIBLINGS
+    ((NAME uffi FILENAME uffi)) DEPENDENCIES (uffi) VERSION 20160208-git SIBLINGS
     (clsql-aodbc clsql-cffi clsql-mysql clsql-odbc clsql-postgresql-socket clsql-postgresql-socket3 clsql-postgresql clsql-sqlite clsql-sqlite3 clsql-tests
      clsql-uffi)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix
index e8af9d041e0..81e50db852b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clss.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''clss'';
-  version = ''20170124-git'';
+  version = ''20170516-git'';
 
   description = ''A DOM tree searching engine based on CSS selectors.'';
 
-  deps = [ args."array-utils" args."plump" ];
+  deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clss/2017-01-24/clss-20170124-git.tgz'';
-    sha256 = ''0rrg3brzash1b14n686xjx6d5glm2vg32g0i8hyvaffqd82493pb'';
+    url = ''http://beta.quicklisp.org/archive/clss/2017-05-16/clss-20170516-git.tgz'';
+    sha256 = ''1c3fizlf4509hj4l6m9gjc64ijvlwnavwvvw3198cvvn6lp49r5f'';
   };
+    
+  packageName = "clss";
 
   overrides = x: {
     postInstall = ''
@@ -28,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM clss DESCRIPTION A DOM tree searching engine based on CSS selectors. SHA256 0rrg3brzash1b14n686xjx6d5glm2vg32g0i8hyvaffqd82493pb URL
-    http://beta.quicklisp.org/archive/clss/2017-01-24/clss-20170124-git.tgz MD5 f05606cab3a75e01c57fd264d1c71863 NAME clss TESTNAME NIL FILENAME clss DEPS
-    ((NAME array-utils) (NAME plump)) DEPENDENCIES (array-utils plump) VERSION 20170124-git SIBLINGS NIL) */
+/* (SYSTEM clss DESCRIPTION A DOM tree searching engine based on CSS selectors. SHA256 1c3fizlf4509hj4l6m9gjc64ijvlwnavwvvw3198cvvn6lp49r5f URL
+    http://beta.quicklisp.org/archive/clss/2017-05-16/clss-20170516-git.tgz MD5 2e69a5197694a9654c0e9c5fced4152f NAME clss TESTNAME NIL FILENAME clss DEPS NIL
+    DEPENDENCIES NIL VERSION 20170516-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix
index bf1b1a5e00c..dfd8669b59f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx-truetype.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/clx-truetype/2016-08-25/clx-truetype-20160825-git.tgz'';
     sha256 = ''0ndy067rg9w6636gxwlpnw7f3ck9nrnjb03444pprik9r3c9in67'';
   };
+    
+  packageName = "clx-truetype";
 
   overrides = x: {
     postInstall = ''
@@ -31,5 +33,6 @@ rec {
 /* (SYSTEM clx-truetype DESCRIPTION clx-truetype is pure common lisp solution for antialiased TrueType font rendering using CLX and XRender extension. SHA256
     0ndy067rg9w6636gxwlpnw7f3ck9nrnjb03444pprik9r3c9in67 URL http://beta.quicklisp.org/archive/clx-truetype/2016-08-25/clx-truetype-20160825-git.tgz MD5
     7c9dedb21d52dedf727de741ac6d9c60 NAME clx-truetype TESTNAME NIL FILENAME clx-truetype DEPS
-    ((NAME cl-aa) (NAME cl-fad) (NAME cl-paths-ttf) (NAME cl-store) (NAME cl-vectors) (NAME clx) (NAME trivial-features) (NAME zpb-ttf)) DEPENDENCIES
-    (cl-aa cl-fad cl-paths-ttf cl-store cl-vectors clx trivial-features zpb-ttf) VERSION 20160825-git SIBLINGS NIL) */
+    ((NAME cl-aa FILENAME cl-aa) (NAME cl-fad FILENAME cl-fad) (NAME cl-paths-ttf FILENAME cl-paths-ttf) (NAME cl-store FILENAME cl-store)
+     (NAME cl-vectors FILENAME cl-vectors) (NAME clx FILENAME clx) (NAME trivial-features FILENAME trivial-features) (NAME zpb-ttf FILENAME zpb-ttf))
+    DEPENDENCIES (cl-aa cl-fad cl-paths-ttf cl-store cl-vectors clx trivial-features zpb-ttf) VERSION 20160825-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
index e9e1acfcefc..b47a7cbd7d4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/clx.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''clx'';
-  version = ''20170227-git'';
+  version = ''20170516-git'';
 
   description = ''An implementation of the X Window System protocol in Lisp.'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/clx/2017-02-27/clx-20170227-git.tgz'';
-    sha256 = ''0zgp1yqy0lm528bhil93ap7df01qdyfhnbxhckjv87xk8rs0g5nx'';
+    url = ''http://beta.quicklisp.org/archive/clx/2017-05-16/clx-20170516-git.tgz'';
+    sha256 = ''00lzm4m74bm5gvy6nss8ab735ddnijbsvimlrkx37sp9v3zln5gs'';
   };
+    
+  packageName = "clx";
 
   overrides = x: {
     postInstall = ''
@@ -28,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM clx DESCRIPTION An implementation of the X Window System protocol in Lisp. SHA256 0zgp1yqy0lm528bhil93ap7df01qdyfhnbxhckjv87xk8rs0g5nx URL
-    http://beta.quicklisp.org/archive/clx/2017-02-27/clx-20170227-git.tgz MD5 fe5fc4bd65ced7a0164abc0ed34afffd NAME clx TESTNAME NIL FILENAME clx DEPS NIL
-    DEPENDENCIES NIL VERSION 20170227-git SIBLINGS NIL) */
+/* (SYSTEM clx DESCRIPTION An implementation of the X Window System protocol in Lisp. SHA256 00lzm4m74bm5gvy6nss8ab735ddnijbsvimlrkx37sp9v3zln5gs URL
+    http://beta.quicklisp.org/archive/clx/2017-05-16/clx-20170516-git.tgz MD5 1f5d7963802a503d7f7fcf73e1f42dd8 NAME clx TESTNAME NIL FILENAME clx DEPS NIL
+    DEPENDENCIES NIL VERSION 20170516-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix
index 62010efd047..276b13e1bd0 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/command-line-arguments.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/command-line-arguments/2015-12-18/command-line-arguments-20151218-git.tgz'';
     sha256 = ''07yv3vj9kjd84q09d6kvgryqxb71bsa7jl22fd1an6inmk0a3yyh'';
   };
+    
+  packageName = "command-line-arguments";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix
index 3f8886915a0..695164566ba 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/css-lite.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/css-lite/2012-04-07/css-lite-20120407-git.tgz'';
     sha256 = ''1gf1qqaxhly6ixh9ykqhg9b52s8p5wlwi46vp2k29qy7gmx4f1qg'';
   };
+    
+  packageName = "css-lite";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-dom.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-dom.nix
index 041cc5b8481..924b61cae6e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-dom.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-dom.nix
@@ -13,6 +13,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz'';
     sha256 = ''04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk'';
   };
+    
+  packageName = "cxml-dom";
 
   overrides = x: {
     postInstall = ''
@@ -32,4 +34,4 @@ rec {
 }
 /* (SYSTEM cxml-dom DESCRIPTION NIL SHA256 04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk URL
     http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz MD5 587755dff60416d4f716f4e785cf747e NAME cxml-dom TESTNAME cxml FILENAME cxml-dom
-    DEPS ((NAME cxml-xml)) DEPENDENCIES (cxml-xml) VERSION cxml-20110619-git SIBLINGS (cxml)) */
+    DEPS ((NAME cxml-xml FILENAME cxml-xml)) DEPENDENCIES (cxml-xml) VERSION cxml-20110619-git SIBLINGS (cxml)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-klacks.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-klacks.nix
index 15dd75fbfa6..f8418ccf27f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-klacks.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-klacks.nix
@@ -13,6 +13,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz'';
     sha256 = ''04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk'';
   };
+    
+  packageName = "cxml-klacks";
 
   overrides = x: {
     postInstall = ''
@@ -32,4 +34,4 @@ rec {
 }
 /* (SYSTEM cxml-klacks DESCRIPTION NIL SHA256 04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk URL
     http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz MD5 587755dff60416d4f716f4e785cf747e NAME cxml-klacks TESTNAME cxml FILENAME
-    cxml-klacks DEPS ((NAME cxml-xml)) DEPENDENCIES (cxml-xml) VERSION cxml-20110619-git SIBLINGS (cxml)) */
+    cxml-klacks DEPS ((NAME cxml-xml FILENAME cxml-xml)) DEPENDENCIES (cxml-xml) VERSION cxml-20110619-git SIBLINGS (cxml)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-test.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-test.nix
index 4a872802ecb..e8856352dcd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-test.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-test.nix
@@ -13,6 +13,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz'';
     sha256 = ''04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk'';
   };
+    
+  packageName = "cxml-test";
 
   overrides = x: {
     postInstall = ''
@@ -32,4 +34,5 @@ rec {
 }
 /* (SYSTEM cxml-test DESCRIPTION NIL SHA256 04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk URL
     http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz MD5 587755dff60416d4f716f4e785cf747e NAME cxml-test TESTNAME cxml FILENAME
-    cxml-test DEPS ((NAME cxml-xml) (NAME cxml-klacks) (NAME cxml-dom)) DEPENDENCIES (cxml-xml cxml-klacks cxml-dom) VERSION cxml-20110619-git SIBLINGS (cxml)) */
+    cxml-test DEPS ((NAME cxml-xml FILENAME cxml-xml) (NAME cxml-klacks FILENAME cxml-klacks) (NAME cxml-dom FILENAME cxml-dom)) DEPENDENCIES
+    (cxml-xml cxml-klacks cxml-dom) VERSION cxml-20110619-git SIBLINGS (cxml)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-xml.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-xml.nix
index 9674eca3d1a..5d8ef158772 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-xml.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml-xml.nix
@@ -13,6 +13,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz'';
     sha256 = ''04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk'';
   };
+    
+  packageName = "cxml-xml";
 
   overrides = x: {
     postInstall = ''
@@ -32,5 +34,5 @@ rec {
 }
 /* (SYSTEM cxml-xml DESCRIPTION NIL SHA256 04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk URL
     http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz MD5 587755dff60416d4f716f4e785cf747e NAME cxml-xml TESTNAME cxml FILENAME cxml-xml
-    DEPS ((NAME trivial-gray-streams) (NAME puri) (NAME closure-common)) DEPENDENCIES (trivial-gray-streams puri closure-common) VERSION cxml-20110619-git
-    SIBLINGS (cxml)) */
+    DEPS ((NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME puri FILENAME puri) (NAME closure-common FILENAME closure-common)) DEPENDENCIES
+    (trivial-gray-streams puri closure-common) VERSION cxml-20110619-git SIBLINGS (cxml)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix
index 3c17f72b42a..baab538ca38 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/cxml.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz'';
     sha256 = ''04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk'';
   };
+    
+  packageName = "cxml";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,5 @@ rec {
 }
 /* (SYSTEM cxml DESCRIPTION NIL SHA256 04k6syn9p7qsazi84kab9n9ki2pb5hrcs0ilw7wikxfqnbabm2yk URL
     http://beta.quicklisp.org/archive/cxml/2011-06-19/cxml-20110619-git.tgz MD5 587755dff60416d4f716f4e785cf747e NAME cxml TESTNAME NIL FILENAME cxml DEPS
-    ((NAME cxml-dom) (NAME cxml-klacks) (NAME cxml-test)) DEPENDENCIES (cxml-dom cxml-klacks cxml-test) VERSION 20110619-git SIBLINGS NIL) */
+    ((NAME cxml-dom FILENAME cxml-dom) (NAME cxml-klacks FILENAME cxml-klacks) (NAME cxml-test FILENAME cxml-test)) DEPENDENCIES
+    (cxml-dom cxml-klacks cxml-test) VERSION 20110619-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix
new file mode 100644
index 00000000000..06ffeb9ad69
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/db3.nix
@@ -0,0 +1,35 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''db3'';
+  version = ''cl-20150302-git'';
+
+  description = ''DB3 file reader'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-db3/2015-03-02/cl-db3-20150302-git.tgz'';
+    sha256 = ''0mwdpb7cdvxdcbyg3ags6xzwhblai170q3p20njs3v73s30dbzxi'';
+  };
+    
+  packageName = "db3";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/db3[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM db3 DESCRIPTION DB3 file reader SHA256 0mwdpb7cdvxdcbyg3ags6xzwhblai170q3p20njs3v73s30dbzxi URL
+    http://beta.quicklisp.org/archive/cl-db3/2015-03-02/cl-db3-20150302-git.tgz MD5 578896a3f60f474742f240b703f8c5f5 NAME db3 TESTNAME NIL FILENAME db3 DEPS
+    NIL DEPENDENCIES NIL VERSION cl-20150302-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix
index 4ba68b6c545..93d0e3d599b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-mysql.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-01-24/cl-dbi-20170124-git.tgz'';
     sha256 = ''0aqfcxbxmc9q3lagaarx0bqncbwjjv0wrskm6lkzy1fp94sik0qj'';
   };
+    
+  packageName = "dbd-mysql";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,5 @@ rec {
 }
 /* (SYSTEM dbd-mysql DESCRIPTION Database driver for MySQL. SHA256 0aqfcxbxmc9q3lagaarx0bqncbwjjv0wrskm6lkzy1fp94sik0qj URL
     http://beta.quicklisp.org/archive/cl-dbi/2017-01-24/cl-dbi-20170124-git.tgz MD5 c48d284eda4aac1ff9a10891884f52e5 NAME dbd-mysql TESTNAME NIL FILENAME
-    dbd-mysql DEPS ((NAME cl-syntax-annot) (NAME cl-syntax) (NAME cl-mysql)) DEPENDENCIES (cl-syntax-annot cl-syntax cl-mysql) VERSION cl-dbi-20170124-git
-    SIBLINGS (cl-dbi dbd-postgres dbd-sqlite3 dbi-test dbi)) */
+    dbd-mysql DEPS ((NAME cl-syntax-annot FILENAME cl-syntax-annot) (NAME cl-syntax FILENAME cl-syntax) (NAME cl-mysql FILENAME cl-mysql)) DEPENDENCIES
+    (cl-syntax-annot cl-syntax cl-mysql) VERSION cl-dbi-20170124-git SIBLINGS (cl-dbi dbd-postgres dbd-sqlite3 dbi-test dbi)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix
index 0d0c3f153ef..3c963b5141e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-postgres.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-01-24/cl-dbi-20170124-git.tgz'';
     sha256 = ''0aqfcxbxmc9q3lagaarx0bqncbwjjv0wrskm6lkzy1fp94sik0qj'';
   };
+    
+  packageName = "dbd-postgres";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,7 @@ rec {
 }
 /* (SYSTEM dbd-postgres DESCRIPTION Database driver for PostgreSQL. SHA256 0aqfcxbxmc9q3lagaarx0bqncbwjjv0wrskm6lkzy1fp94sik0qj URL
     http://beta.quicklisp.org/archive/cl-dbi/2017-01-24/cl-dbi-20170124-git.tgz MD5 c48d284eda4aac1ff9a10891884f52e5 NAME dbd-postgres TESTNAME NIL FILENAME
-    dbd-postgres DEPS ((NAME trivial-garbage) (NAME cl-syntax-annot) (NAME cl-syntax) (NAME cl-postgres)) DEPENDENCIES
-    (trivial-garbage cl-syntax-annot cl-syntax cl-postgres) VERSION cl-dbi-20170124-git SIBLINGS (cl-dbi dbd-mysql dbd-sqlite3 dbi-test dbi)) */
+    dbd-postgres DEPS
+    ((NAME trivial-garbage FILENAME trivial-garbage) (NAME cl-syntax-annot FILENAME cl-syntax-annot) (NAME cl-syntax FILENAME cl-syntax)
+     (NAME cl-postgres FILENAME cl-postgres))
+    DEPENDENCIES (trivial-garbage cl-syntax-annot cl-syntax cl-postgres) VERSION cl-dbi-20170124-git SIBLINGS (cl-dbi dbd-mysql dbd-sqlite3 dbi-test dbi)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix
index f4c38e485f9..e19565fc277 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dbd-sqlite3.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-dbi/2017-01-24/cl-dbi-20170124-git.tgz'';
     sha256 = ''0aqfcxbxmc9q3lagaarx0bqncbwjjv0wrskm6lkzy1fp94sik0qj'';
   };
+    
+  packageName = "dbd-sqlite3";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,6 @@ rec {
 }
 /* (SYSTEM dbd-sqlite3 DESCRIPTION Database driver for SQLite3. SHA256 0aqfcxbxmc9q3lagaarx0bqncbwjjv0wrskm6lkzy1fp94sik0qj URL
     http://beta.quicklisp.org/archive/cl-dbi/2017-01-24/cl-dbi-20170124-git.tgz MD5 c48d284eda4aac1ff9a10891884f52e5 NAME dbd-sqlite3 TESTNAME NIL FILENAME
-    dbd-sqlite3 DEPS ((NAME uiop) (NAME sqlite) (NAME cl-syntax-annot) (NAME cl-syntax)) DEPENDENCIES (uiop sqlite cl-syntax-annot cl-syntax) VERSION
-    cl-dbi-20170124-git SIBLINGS (cl-dbi dbd-mysql dbd-postgres dbi-test dbi)) */
+    dbd-sqlite3 DEPS
+    ((NAME uiop FILENAME uiop) (NAME sqlite FILENAME sqlite) (NAME cl-syntax-annot FILENAME cl-syntax-annot) (NAME cl-syntax FILENAME cl-syntax)) DEPENDENCIES
+    (uiop sqlite cl-syntax-annot cl-syntax) VERSION cl-dbi-20170124-git SIBLINGS (cl-dbi dbd-mysql dbd-postgres dbi-test dbi)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
index 95672b7296f..54f1cf78e40 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dexador.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''dexador'';
-  version = ''20170403-git'';
+  version = ''20170516-git'';
 
   description = ''Yet another HTTP client for Common Lisp'';
 
-  deps = [ args."usocket" args."trivial-mimes" args."trivial-gray-streams" args."quri" args."fast-io" args."fast-http" args."cl-reexport" args."cl-ppcre" args."cl-cookie" args."cl-base64" args."cl+ssl" args."chunga" args."chipz" args."bordeaux-threads" args."babel" args."alexandria" ];
+  deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/dexador/2017-04-03/dexador-20170403-git.tgz'';
-    sha256 = ''0lnz36215wccpjgvrv9r7fa1i94jcdyw6q3hlgx9h8b7pwdlcfbn'';
+    url = ''http://beta.quicklisp.org/archive/dexador/2017-05-16/dexador-20170516-git.tgz'';
+    sha256 = ''129ar4z972wl3prhzsfy0mb4r41b0j179zs3mglq6gl7awafq8r6'';
   };
+    
+  packageName = "dexador";
 
   overrides = x: {
     postInstall = ''
@@ -28,12 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM dexador DESCRIPTION Yet another HTTP client for Common Lisp SHA256 0lnz36215wccpjgvrv9r7fa1i94jcdyw6q3hlgx9h8b7pwdlcfbn URL
-    http://beta.quicklisp.org/archive/dexador/2017-04-03/dexador-20170403-git.tgz MD5 0330a50a117313dbe0ba3f136b0fa416 NAME dexador TESTNAME NIL FILENAME
-    dexador DEPS
-    ((NAME usocket) (NAME trivial-mimes) (NAME trivial-gray-streams) (NAME quri) (NAME fast-io) (NAME fast-http) (NAME cl-reexport) (NAME cl-ppcre)
-     (NAME cl-cookie) (NAME cl-base64) (NAME cl+ssl) (NAME chunga) (NAME chipz) (NAME bordeaux-threads) (NAME babel) (NAME alexandria))
-    DEPENDENCIES
-    (usocket trivial-mimes trivial-gray-streams quri fast-io fast-http cl-reexport cl-ppcre cl-cookie cl-base64 cl+ssl chunga chipz bordeaux-threads babel
-     alexandria)
-    VERSION 20170403-git SIBLINGS (dexador-test)) */
+/* (SYSTEM dexador DESCRIPTION Yet another HTTP client for Common Lisp SHA256 129ar4z972wl3prhzsfy0mb4r41b0j179zs3mglq6gl7awafq8r6 URL
+    http://beta.quicklisp.org/archive/dexador/2017-05-16/dexador-20170516-git.tgz MD5 463972f0b98fd2a641ce2bfab4400dc7 NAME dexador TESTNAME NIL FILENAME
+    dexador DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS (dexador-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix
index 608cd6b3896..993a49bc9f9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/do-urlencode.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/do-urlencode/2013-07-20/do-urlencode-20130720-git.tgz'';
     sha256 = ''19l4rwqc52w7nrpy994b3n2dcv8pjgc530yn2xmgqlqabpxpz3xa'';
   };
+    
+  packageName = "do-urlencode";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,5 @@ rec {
 }
 /* (SYSTEM do-urlencode DESCRIPTION Percent Encoding (aka URL Encoding) library SHA256 19l4rwqc52w7nrpy994b3n2dcv8pjgc530yn2xmgqlqabpxpz3xa URL
     http://beta.quicklisp.org/archive/do-urlencode/2013-07-20/do-urlencode-20130720-git.tgz MD5 c8085e138711c225042acf83b4bf0507 NAME do-urlencode TESTNAME NIL
-    FILENAME do-urlencode DEPS ((NAME babel) (NAME babel-streams)) DEPENDENCIES (babel babel-streams) VERSION 20130720-git SIBLINGS NIL) */
+    FILENAME do-urlencode DEPS ((NAME babel FILENAME babel) (NAME babel-streams FILENAME babel-streams)) DEPENDENCIES (babel babel-streams) VERSION
+    20130720-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix
index 43f6343b7eb..d9bacd96af8 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/documentation-utils.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''documentation-utils'';
-  version = ''20161204-git'';
+  version = ''20170516-git'';
 
   description = ''A few simple tools to help you with documenting your library.'';
 
-  deps = [ args."trivial-indent" ];
+  deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/documentation-utils/2016-12-04/documentation-utils-20161204-git.tgz'';
-    sha256 = ''0vyj5nvy697w2fvp2rb42jxgqah85ivz1hg84amqfi4bvik2npvq'';
+    url = ''http://beta.quicklisp.org/archive/documentation-utils/2017-05-16/documentation-utils-20170516-git.tgz'';
+    sha256 = ''0jb6sv85xx0vl8p9qrhfsvz130d4gw6hpgnvw1mx7skhi6zs82s1'';
   };
+    
+  packageName = "documentation-utils";
 
   overrides = x: {
     postInstall = ''
@@ -29,6 +31,6 @@ rec {
   };
 }
 /* (SYSTEM documentation-utils DESCRIPTION A few simple tools to help you with documenting your library. SHA256
-    0vyj5nvy697w2fvp2rb42jxgqah85ivz1hg84amqfi4bvik2npvq URL
-    http://beta.quicklisp.org/archive/documentation-utils/2016-12-04/documentation-utils-20161204-git.tgz MD5 36a233bf438bfc067b074b6a05865c33 NAME
-    documentation-utils TESTNAME NIL FILENAME documentation-utils DEPS ((NAME trivial-indent)) DEPENDENCIES (trivial-indent) VERSION 20161204-git SIBLINGS NIL) */
+    0jb6sv85xx0vl8p9qrhfsvz130d4gw6hpgnvw1mx7skhi6zs82s1 URL
+    http://beta.quicklisp.org/archive/documentation-utils/2017-05-16/documentation-utils-20170516-git.tgz MD5 5e04421eb7fd48d8abe1757b5211e310 NAME
+    documentation-utils TESTNAME NIL FILENAME documentation-utils DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix
index 82695e74bfe..16bbac4d03a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/drakma.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/drakma/2015-10-31/drakma-2.0.2.tgz'';
     sha256 = ''1bpwh19fxd1ncvwai2ab2363bk6qkpwch5sa4csbiawcihyawh2z'';
   };
+    
+  packageName = "drakma";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,6 @@ rec {
 }
 /* (SYSTEM drakma DESCRIPTION Full-featured http/https client based on usocket SHA256 1bpwh19fxd1ncvwai2ab2363bk6qkpwch5sa4csbiawcihyawh2z URL
     http://beta.quicklisp.org/archive/drakma/2015-10-31/drakma-2.0.2.tgz MD5 eb51e1417c02c912c2b43bd9605dfb50 NAME drakma TESTNAME NIL FILENAME drakma DEPS
-    ((NAME usocket) (NAME puri) (NAME flexi-streams) (NAME cl-ppcre) (NAME cl-base64) (NAME cl+ssl) (NAME chunga) (NAME chipz)) DEPENDENCIES
-    (usocket puri flexi-streams cl-ppcre cl-base64 cl+ssl chunga chipz) VERSION 2.0.2 SIBLINGS (drakma-test)) */
+    ((NAME usocket FILENAME usocket) (NAME puri FILENAME puri) (NAME flexi-streams FILENAME flexi-streams) (NAME cl-ppcre FILENAME cl-ppcre)
+     (NAME cl-base64 FILENAME cl-base64) (NAME cl+ssl FILENAME cl+ssl) (NAME chunga FILENAME chunga) (NAME chipz FILENAME chipz))
+    DEPENDENCIES (usocket puri flexi-streams cl-ppcre cl-base64 cl+ssl chunga chipz) VERSION 2.0.2 SIBLINGS (drakma-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/dynamic-classes.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dynamic-classes.nix
new file mode 100644
index 00000000000..283dfe813ac
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/dynamic-classes.nix
@@ -0,0 +1,36 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''dynamic-classes'';
+  version = ''20130128-git'';
+
+  description = '''';
+
+  deps = [ args."metatilities-base" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/dynamic-classes/2013-01-28/dynamic-classes-20130128-git.tgz'';
+    sha256 = ''0i2b9k8f8jgn86kz503z267w0zv4gdqajzw755xwhqfaknix74sa'';
+  };
+    
+  packageName = "dynamic-classes";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/dynamic-classes[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM dynamic-classes DESCRIPTION NIL SHA256 0i2b9k8f8jgn86kz503z267w0zv4gdqajzw755xwhqfaknix74sa URL
+    http://beta.quicklisp.org/archive/dynamic-classes/2013-01-28/dynamic-classes-20130128-git.tgz MD5 a6ed01c4f21df2b6a142328b24ac7ba3 NAME dynamic-classes
+    TESTNAME NIL FILENAME dynamic-classes DEPS ((NAME metatilities-base FILENAME metatilities-base)) DEPENDENCIES (metatilities-base) VERSION 20130128-git
+    SIBLINGS (dynamic-classes-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix
index 60db24e57d0..49c0ff6c8ce 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/esrap.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''esrap'';
-  version = ''20170124-git'';
+  version = ''20170516-git'';
 
   description = ''A Packrat / Parsing Grammar / TDPL parser for Common Lisp.'';
 
-  deps = [ args."alexandria" ];
+  deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/esrap/2017-01-24/esrap-20170124-git.tgz'';
-    sha256 = ''1182011bbhvkw2qsdqrccl879vf5k7bcda318n0xskk35hzircp8'';
+    url = ''http://beta.quicklisp.org/archive/esrap/2017-05-16/esrap-20170516-git.tgz'';
+    sha256 = ''06vksigkiprhmxkms2xfwq8ff09z4i4287k87n0m4id0nfl8rfq8'';
   };
+    
+  packageName = "esrap";
 
   overrides = x: {
     postInstall = ''
@@ -28,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM esrap DESCRIPTION A Packrat / Parsing Grammar / TDPL parser for Common Lisp. SHA256 1182011bbhvkw2qsdqrccl879vf5k7bcda318n0xskk35hzircp8 URL
-    http://beta.quicklisp.org/archive/esrap/2017-01-24/esrap-20170124-git.tgz MD5 72f7a7d8e5808586dfd3ab1698e3d11f NAME esrap TESTNAME NIL FILENAME esrap DEPS
-    ((NAME alexandria)) DEPENDENCIES (alexandria) VERSION 20170124-git SIBLINGS NIL) */
+/* (SYSTEM esrap DESCRIPTION A Packrat / Parsing Grammar / TDPL parser for Common Lisp. SHA256 06vksigkiprhmxkms2xfwq8ff09z4i4287k87n0m4id0nfl8rfq8 URL
+    http://beta.quicklisp.org/archive/esrap/2017-05-16/esrap-20170516-git.tgz MD5 6116df281050ee58e6ba195727154ac0 NAME esrap TESTNAME NIL FILENAME esrap DEPS
+    NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix
index aa7963f3243..698189fc911 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/external-program.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/external-program/2016-08-25/external-program-20160825-git.tgz'';
     sha256 = ''0avnnhxxa1wfri9i3m1339nszyp1w2cilycc948nf5awz4mckq13'';
   };
+    
+  packageName = "external-program";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,5 @@ rec {
 }
 /* (SYSTEM external-program DESCRIPTION NIL SHA256 0avnnhxxa1wfri9i3m1339nszyp1w2cilycc948nf5awz4mckq13 URL
     http://beta.quicklisp.org/archive/external-program/2016-08-25/external-program-20160825-git.tgz MD5 6902724c4f762a17645c46b0a1d8efde NAME external-program
-    TESTNAME NIL FILENAME external-program DEPS ((NAME trivial-features)) DEPENDENCIES (trivial-features) VERSION 20160825-git SIBLINGS NIL) */
+    TESTNAME NIL FILENAME external-program DEPS ((NAME trivial-features FILENAME trivial-features)) DEPENDENCIES (trivial-features) VERSION 20160825-git
+    SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix
index 1f83d562967..7b100d891b9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-http.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/fast-http/2017-02-27/fast-http-20170227-git.tgz'';
     sha256 = ''0kpfn4i5r12hfnb3j00cl9wq5dcl32n3q67lr2qsb6y3giz335hx'';
   };
+    
+  packageName = "fast-http";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix
index 52cbc8ddcdb..0e819493109 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/fast-io.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''fast-io'';
-  version = ''20170124-git'';
+  version = ''20170516-git'';
 
   description = ''Alternative I/O mechanism to a stream or vector'';
 
-  deps = [ args."trivial-gray-streams" args."static-vectors" args."alexandria" ];
+  deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/fast-io/2017-01-24/fast-io-20170124-git.tgz'';
-    sha256 = ''0w57iddbpdcchnv3zg7agd3ydm36aw2mni4iasi8wd628gq9a6i2'';
+    url = ''http://beta.quicklisp.org/archive/fast-io/2017-05-16/fast-io-20170516-git.tgz'';
+    sha256 = ''1aw7fjvd7bpq2fh99r48f81vhmqczn8f4jk33i9cgpx217gxigm1'';
   };
+    
+  packageName = "fast-io";
 
   overrides = x: {
     postInstall = ''
@@ -28,7 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM fast-io DESCRIPTION Alternative I/O mechanism to a stream or vector SHA256 0w57iddbpdcchnv3zg7agd3ydm36aw2mni4iasi8wd628gq9a6i2 URL
-    http://beta.quicklisp.org/archive/fast-io/2017-01-24/fast-io-20170124-git.tgz MD5 e9fa77c0e75a9f32e56c27ef6861bce2 NAME fast-io TESTNAME NIL FILENAME
-    fast-io DEPS ((NAME trivial-gray-streams) (NAME static-vectors) (NAME alexandria)) DEPENDENCIES (trivial-gray-streams static-vectors alexandria) VERSION
-    20170124-git SIBLINGS (fast-io-test)) */
+/* (SYSTEM fast-io DESCRIPTION Alternative I/O mechanism to a stream or vector SHA256 1aw7fjvd7bpq2fh99r48f81vhmqczn8f4jk33i9cgpx217gxigm1 URL
+    http://beta.quicklisp.org/archive/fast-io/2017-05-16/fast-io-20170516-git.tgz MD5 a9a96c0f6260271446fd43bf2e51e90f NAME fast-io TESTNAME NIL FILENAME
+    fast-io DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS (fast-io-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix
index 2348167ba65..1bb2b6b9c18 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/flexi-streams.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/flexi-streams/2015-07-09/flexi-streams-1.0.15.tgz'';
     sha256 = ''0zkx335winqs7xigbmxhhkhcsfa9hjhf1q6r4q710y29fbhpc37p'';
   };
+    
+  packageName = "flexi-streams";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,4 @@ rec {
 }
 /* (SYSTEM flexi-streams DESCRIPTION Flexible bivalent streams for Common Lisp SHA256 0zkx335winqs7xigbmxhhkhcsfa9hjhf1q6r4q710y29fbhpc37p URL
     http://beta.quicklisp.org/archive/flexi-streams/2015-07-09/flexi-streams-1.0.15.tgz MD5 02dbb5a0c5f982e0c7a88aad9a25004e NAME flexi-streams TESTNAME NIL
-    FILENAME flexi-streams DEPS ((NAME trivial-gray-streams)) DEPENDENCIES (trivial-gray-streams) VERSION 1.0.15 SIBLINGS NIL) */
+    FILENAME flexi-streams DEPS ((NAME trivial-gray-streams FILENAME trivial-gray-streams)) DEPENDENCIES (trivial-gray-streams) VERSION 1.0.15 SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix
index e12f3efb59a..754d2f8c869 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/form-fiddle.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''form-fiddle'';
-  version = ''20160929-git'';
+  version = ''20170516-git'';
 
   description = ''A collection of utilities to destructure lambda forms.'';
 
-  deps = [ args."documentation-utils" ];
+  deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/form-fiddle/2016-09-29/form-fiddle-20160929-git.tgz'';
-    sha256 = ''1lmdxvwh0d81jlkc9qq2cw0bizjbmk7f5fjcb8ps65andfyj9bd7'';
+    url = ''http://beta.quicklisp.org/archive/form-fiddle/2017-05-16/form-fiddle-20170516-git.tgz'';
+    sha256 = ''00h38gh8absx9pclwlxgknbmbnj20sngkzaj2qa6whg5kgbgj4fh'';
   };
+    
+  packageName = "form-fiddle";
 
   overrides = x: {
     postInstall = ''
@@ -28,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM form-fiddle DESCRIPTION A collection of utilities to destructure lambda forms. SHA256 1lmdxvwh0d81jlkc9qq2cw0bizjbmk7f5fjcb8ps65andfyj9bd7 URL
-    http://beta.quicklisp.org/archive/form-fiddle/2016-09-29/form-fiddle-20160929-git.tgz MD5 d7c363b70125a65d909419b78fa7dc24 NAME form-fiddle TESTNAME NIL
-    FILENAME form-fiddle DEPS ((NAME documentation-utils)) DEPENDENCIES (documentation-utils) VERSION 20160929-git SIBLINGS NIL) */
+/* (SYSTEM form-fiddle DESCRIPTION A collection of utilities to destructure lambda forms. SHA256 00h38gh8absx9pclwlxgknbmbnj20sngkzaj2qa6whg5kgbgj4fh URL
+    http://beta.quicklisp.org/archive/form-fiddle/2017-05-16/form-fiddle-20170516-git.tgz MD5 8f0d8b920f6da0c7fd939b7096c30235 NAME form-fiddle TESTNAME NIL
+    FILENAME form-fiddle DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/garbage-pools.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/garbage-pools.nix
new file mode 100644
index 00000000000..72403e8598a
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/garbage-pools.nix
@@ -0,0 +1,35 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''garbage-pools'';
+  version = ''20130720-git'';
+
+  description = '''';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/garbage-pools/2013-07-20/garbage-pools-20130720-git.tgz'';
+    sha256 = ''1idnba1pxayn0k5yzqp9lswg7ywjhavi59lrdnphfqajjpyi9w05'';
+  };
+    
+  packageName = "garbage-pools";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/garbage-pools[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM garbage-pools DESCRIPTION NIL SHA256 1idnba1pxayn0k5yzqp9lswg7ywjhavi59lrdnphfqajjpyi9w05 URL
+    http://beta.quicklisp.org/archive/garbage-pools/2013-07-20/garbage-pools-20130720-git.tgz MD5 f691e2ddf6ba22b3451c24b61d4ee8b6 NAME garbage-pools TESTNAME
+    NIL FILENAME garbage-pools DEPS NIL DEPENDENCIES NIL VERSION 20130720-git SIBLINGS (garbage-pools-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix
index ed38c44b0c1..e6510c59c30 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/http-body.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/http-body/2016-12-04/http-body-20161204-git.tgz'';
     sha256 = ''1y50yipsbl4j99igmfi83pr7p56hb31dcplpy05fp5alkb5rv0gi'';
   };
+    
+  packageName = "http-body";
 
   overrides = x: {
     postInstall = ''
@@ -31,5 +33,7 @@ rec {
 /* (SYSTEM http-body DESCRIPTION HTTP POST data parser for Common Lisp SHA256 1y50yipsbl4j99igmfi83pr7p56hb31dcplpy05fp5alkb5rv0gi URL
     http://beta.quicklisp.org/archive/http-body/2016-12-04/http-body-20161204-git.tgz MD5 6eda50cf89aa3b6a8e9ccaf324734a0e NAME http-body TESTNAME NIL FILENAME
     http-body DEPS
-    ((NAME trivial-gray-streams) (NAME quri) (NAME jonathan) (NAME flexi-streams) (NAME fast-http) (NAME cl-utilities) (NAME cl-ppcre) (NAME babel))
+    ((NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME quri FILENAME quri) (NAME jonathan FILENAME jonathan)
+     (NAME flexi-streams FILENAME flexi-streams) (NAME fast-http FILENAME fast-http) (NAME cl-utilities FILENAME cl-utilities)
+     (NAME cl-ppcre FILENAME cl-ppcre) (NAME babel FILENAME babel))
     DEPENDENCIES (trivial-gray-streams quri jonathan flexi-streams fast-http cl-utilities cl-ppcre babel) VERSION 20161204-git SIBLINGS (http-body-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.asdf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.asdf.nix
index c37de8f6f8d..f36b4e931ec 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.asdf.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.asdf.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''hu.dwim.asdf'';
-  version = ''20170403-darcs'';
+  version = ''20170516-darcs'';
 
   description = ''Various ASDF extensions such as attached test and documentation system, explicit development support, etc.'';
 
-  deps = [ args."uiop" ];
+  deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/hu.dwim.asdf/2017-04-03/hu.dwim.asdf-20170403-darcs.tgz'';
-    sha256 = ''0avhfdg2ypv0cnwzihq64zwd562c4ls4bx6014mwgdfggp4b00ll'';
+    url = ''http://beta.quicklisp.org/archive/hu.dwim.asdf/2017-05-16/hu.dwim.asdf-20170516-darcs.tgz'';
+    sha256 = ''0ky8xby4zkqslgcb4glns8g4v8fzijx4v1888kil3ncxbvz0aqpw'';
   };
+    
+  packageName = "hu.dwim.asdf";
 
   overrides = x: {
     postInstall = ''
@@ -29,6 +31,6 @@ rec {
   };
 }
 /* (SYSTEM hu.dwim.asdf DESCRIPTION Various ASDF extensions such as attached test and documentation system, explicit development support, etc. SHA256
-    0avhfdg2ypv0cnwzihq64zwd562c4ls4bx6014mwgdfggp4b00ll URL http://beta.quicklisp.org/archive/hu.dwim.asdf/2017-04-03/hu.dwim.asdf-20170403-darcs.tgz MD5
-    53cbeb56a8ee066116069d80c7fc3f65 NAME hu.dwim.asdf TESTNAME NIL FILENAME hu.dwim.asdf DEPS ((NAME uiop)) DEPENDENCIES (uiop) VERSION 20170403-darcs
-    SIBLINGS (hu.dwim.asdf.documentation)) */
+    0ky8xby4zkqslgcb4glns8g4v8fzijx4v1888kil3ncxbvz0aqpw URL http://beta.quicklisp.org/archive/hu.dwim.asdf/2017-05-16/hu.dwim.asdf-20170516-darcs.tgz MD5
+    041447371d36ceb17f58854671c052f1 NAME hu.dwim.asdf TESTNAME NIL FILENAME hu.dwim.asdf DEPS NIL DEPENDENCIES NIL VERSION 20170516-darcs SIBLINGS
+    (hu.dwim.asdf.documentation)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.def.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.def.nix
index 0649edb6fd3..2aedd0f6704 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.def.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu.dwim.def.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''hu.dwim.def'';
-  version = ''20161204-darcs'';
+  version = ''20170516-darcs'';
 
   description = ''General purpose, homogenous, extensible definer macro.'';
 
-  deps = [ args."metabang-bind" args."iterate" args."hu.dwim.asdf" args."anaphora" args."alexandria" ];
+  deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/hu.dwim.def/2016-12-04/hu.dwim.def-20161204-darcs.tgz'';
-    sha256 = ''0znvcm4zi8rivyk0s840v8jaa52hzdiql88pk8hnaj8abxkvl3lj'';
+    url = ''http://beta.quicklisp.org/archive/hu.dwim.def/2017-05-16/hu.dwim.def-20170516-darcs.tgz'';
+    sha256 = ''1x333jiihgqydv234q8wjsy5n8nfr6n4mpwq08f1b497if4fc7by'';
   };
+    
+  packageName = "hu.dwim.def";
 
   overrides = x: {
     postInstall = ''
@@ -28,9 +30,8 @@ rec {
     '';
   };
 }
-/* (SYSTEM hu.dwim.def DESCRIPTION General purpose, homogenous, extensible definer macro. SHA256 0znvcm4zi8rivyk0s840v8jaa52hzdiql88pk8hnaj8abxkvl3lj URL
-    http://beta.quicklisp.org/archive/hu.dwim.def/2016-12-04/hu.dwim.def-20161204-darcs.tgz MD5 c4a85c220873a9edd1c2c49a6498baca NAME hu.dwim.def TESTNAME NIL
-    FILENAME hu.dwim.def DEPS ((NAME metabang-bind) (NAME iterate) (NAME hu.dwim.asdf) (NAME anaphora) (NAME alexandria)) DEPENDENCIES
-    (metabang-bind iterate hu.dwim.asdf anaphora alexandria) VERSION 20161204-darcs SIBLINGS
+/* (SYSTEM hu.dwim.def DESCRIPTION General purpose, homogenous, extensible definer macro. SHA256 1x333jiihgqydv234q8wjsy5n8nfr6n4mpwq08f1b497if4fc7by URL
+    http://beta.quicklisp.org/archive/hu.dwim.def/2017-05-16/hu.dwim.def-20170516-darcs.tgz MD5 bd13311ab8da2a67f9247e825369b294 NAME hu.dwim.def TESTNAME NIL
+    FILENAME hu.dwim.def DEPS NIL DEPENDENCIES NIL VERSION 20170516-darcs SIBLINGS
     (hu.dwim.def+cl-l10n hu.dwim.def+contextl hu.dwim.def+hu.dwim.common hu.dwim.def+hu.dwim.delico hu.dwim.def+swank hu.dwim.def.documentation
      hu.dwim.def.namespace hu.dwim.def.test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix
new file mode 100644
index 00000000000..b358ff0562d
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix
@@ -0,0 +1,36 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''hu_dot_dwim_dot_asdf'';
+  version = ''20170516-darcs'';
+
+  description = ''Various ASDF extensions such as attached test and documentation system, explicit development support, etc.'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/hu.dwim.asdf/2017-05-16/hu.dwim.asdf-20170516-darcs.tgz'';
+    sha256 = ''0ky8xby4zkqslgcb4glns8g4v8fzijx4v1888kil3ncxbvz0aqpw'';
+  };
+    
+  packageName = "hu.dwim.asdf";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/hu.dwim.asdf[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM hu.dwim.asdf DESCRIPTION Various ASDF extensions such as attached test and documentation system, explicit development support, etc. SHA256
+    0ky8xby4zkqslgcb4glns8g4v8fzijx4v1888kil3ncxbvz0aqpw URL http://beta.quicklisp.org/archive/hu.dwim.asdf/2017-05-16/hu.dwim.asdf-20170516-darcs.tgz MD5
+    041447371d36ceb17f58854671c052f1 NAME hu.dwim.asdf TESTNAME NIL FILENAME hu_dot_dwim_dot_asdf DEPS NIL DEPENDENCIES NIL VERSION 20170516-darcs SIBLINGS
+    (hu.dwim.asdf.documentation)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_def.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_def.nix
new file mode 100644
index 00000000000..5e5e56be2e5
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hu_dot_dwim_dot_def.nix
@@ -0,0 +1,37 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''hu_dot_dwim_dot_def'';
+  version = ''20170516-darcs'';
+
+  description = ''General purpose, homogenous, extensible definer macro.'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/hu.dwim.def/2017-05-16/hu.dwim.def-20170516-darcs.tgz'';
+    sha256 = ''1x333jiihgqydv234q8wjsy5n8nfr6n4mpwq08f1b497if4fc7by'';
+  };
+    
+  packageName = "hu.dwim.def";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/hu.dwim.def[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM hu.dwim.def DESCRIPTION General purpose, homogenous, extensible definer macro. SHA256 1x333jiihgqydv234q8wjsy5n8nfr6n4mpwq08f1b497if4fc7by URL
+    http://beta.quicklisp.org/archive/hu.dwim.def/2017-05-16/hu.dwim.def-20170516-darcs.tgz MD5 bd13311ab8da2a67f9247e825369b294 NAME hu.dwim.def TESTNAME NIL
+    FILENAME hu_dot_dwim_dot_def DEPS NIL DEPENDENCIES NIL VERSION 20170516-darcs SIBLINGS
+    (hu.dwim.def+cl-l10n hu.dwim.def+contextl hu.dwim.def+hu.dwim.common hu.dwim.def+hu.dwim.delico hu.dwim.def+swank hu.dwim.def.documentation
+     hu.dwim.def.namespace hu.dwim.def.test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix
index e77e977ea3f..e0a2d194f9e 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/hunchentoot.nix
@@ -14,6 +14,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/hunchentoot/2016-03-18/hunchentoot-1.2.35.tgz'';
     sha256 = ''0gp2rgndkijjydb1x3p8414ii1z372gzdy945jy0491bcbhygj74'';
   };
+    
+  packageName = "hunchentoot";
 
   overrides = x: {
     postInstall = ''
@@ -37,6 +39,7 @@ rec {
   through subclassing.
     SHA256 0gp2rgndkijjydb1x3p8414ii1z372gzdy945jy0491bcbhygj74 URL http://beta.quicklisp.org/archive/hunchentoot/2016-03-18/hunchentoot-1.2.35.tgz MD5
     d1ce17dec454cab119c0f263e8a176d1 NAME hunchentoot TESTNAME NIL FILENAME hunchentoot DEPS
-    ((NAME bordeaux-threads) (NAME chunga) (NAME cl+ssl) (NAME cl-base64) (NAME cl-fad) (NAME cl-ppcre) (NAME flexi-streams) (NAME md5) (NAME rfc2388)
-     (NAME trivial-backtrace) (NAME usocket))
+    ((NAME bordeaux-threads FILENAME bordeaux-threads) (NAME chunga FILENAME chunga) (NAME cl+ssl FILENAME cl+ssl) (NAME cl-base64 FILENAME cl-base64)
+     (NAME cl-fad FILENAME cl-fad) (NAME cl-ppcre FILENAME cl-ppcre) (NAME flexi-streams FILENAME flexi-streams) (NAME md5 FILENAME md5)
+     (NAME rfc2388 FILENAME rfc2388) (NAME trivial-backtrace FILENAME trivial-backtrace) (NAME usocket FILENAME usocket))
     DEPENDENCIES (bordeaux-threads chunga cl+ssl cl-base64 cl-fad cl-ppcre flexi-streams md5 rfc2388 trivial-backtrace usocket) VERSION 1.2.35 SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix
index ea7dd30df0b..d849cf15272 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/idna.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/idna/2012-01-07/idna-20120107-git.tgz'';
     sha256 = ''0q9hja9v5q7z89p0bzm2whchn05hymn3255fr5zj3fkja8akma5c'';
   };
+    
+  packageName = "idna";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,4 @@ rec {
 }
 /* (SYSTEM idna DESCRIPTION IDNA (international domain names) string encoding and decoding routines SHA256 0q9hja9v5q7z89p0bzm2whchn05hymn3255fr5zj3fkja8akma5c
     URL http://beta.quicklisp.org/archive/idna/2012-01-07/idna-20120107-git.tgz MD5 85b91a66efe4381bf116cdb5d2b756b6 NAME idna TESTNAME NIL FILENAME idna DEPS
-    ((NAME split-sequence)) DEPENDENCIES (split-sequence) VERSION 20120107-git SIBLINGS NIL) */
+    ((NAME split-sequence FILENAME split-sequence)) DEPENDENCIES (split-sequence) VERSION 20120107-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix
new file mode 100644
index 00000000000..fb106aa54c5
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ieee-floats.nix
@@ -0,0 +1,35 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''ieee-floats'';
+  version = ''20160318-git'';
+
+  description = '''';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/ieee-floats/2016-03-18/ieee-floats-20160318-git.tgz'';
+    sha256 = ''0vw4q6q5yygfxfwx5bki4kl9lqszmhnplcl55qh8raxmb03alyx4'';
+  };
+    
+  packageName = "ieee-floats";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/ieee-floats[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM ieee-floats DESCRIPTION NIL SHA256 0vw4q6q5yygfxfwx5bki4kl9lqszmhnplcl55qh8raxmb03alyx4 URL
+    http://beta.quicklisp.org/archive/ieee-floats/2016-03-18/ieee-floats-20160318-git.tgz MD5 84d679a4dffddc3b0cff944adde623c5 NAME ieee-floats TESTNAME NIL
+    FILENAME ieee-floats DEPS NIL DEPENDENCIES NIL VERSION 20160318-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix
index 55dd6b2a373..404c7a5dee9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iolib.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''iolib'';
-  version = ''v0.8.1'';
+  version = ''v0.8.2'';
 
   description = ''I/O library.'';
 
-  deps = [ args."alexandria" args."babel" args."bordeaux-threads" args."cffi" args."idna" args."split-sequence" args."swap-bytes" args."trivial-features" args."uiop" ];
+  deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/iolib/2016-03-18/iolib-v0.8.1.tgz'';
-    sha256 = ''090xmjzyx5d7arpk9g0fsyblwh6myq2d1cb7w52r3zy1394c9481'';
+    url = ''http://beta.quicklisp.org/archive/iolib/2017-05-16/iolib-v0.8.2.tgz'';
+    sha256 = ''1k0wkkgzy6fmq28dw6xbx86l1j9x3nrmrzpv6jcmcdb078h820pr'';
   };
+    
+  packageName = "iolib";
 
   overrides = x: {
     postInstall = ''
@@ -28,8 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM iolib DESCRIPTION I/O library. SHA256 090xmjzyx5d7arpk9g0fsyblwh6myq2d1cb7w52r3zy1394c9481 URL
-    http://beta.quicklisp.org/archive/iolib/2016-03-18/iolib-v0.8.1.tgz MD5 cd34c4f7db4af7391757ebc3f4f61422 NAME iolib TESTNAME NIL FILENAME iolib DEPS
-    ((NAME alexandria) (NAME babel) (NAME bordeaux-threads) (NAME cffi) (NAME idna) (NAME split-sequence) (NAME swap-bytes) (NAME trivial-features)
-     (NAME uiop))
-    DEPENDENCIES (alexandria babel bordeaux-threads cffi idna split-sequence swap-bytes trivial-features uiop) VERSION v0.8.1 SIBLINGS NIL) */
+/* (SYSTEM iolib DESCRIPTION I/O library. SHA256 1k0wkkgzy6fmq28dw6xbx86l1j9x3nrmrzpv6jcmcdb078h820pr URL
+    http://beta.quicklisp.org/archive/iolib/2017-05-16/iolib-v0.8.2.tgz MD5 cd2d4d2893b7e6d0502d9a16e717a2e9 NAME iolib TESTNAME NIL FILENAME iolib DEPS NIL
+    DEPENDENCIES NIL VERSION v0.8.2 SIBLINGS (iolib.asdf iolib.base iolib.common-lisp iolib.conf iolib.examples iolib.grovel iolib.tests)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
index de5528bca5e..944781947fa 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ironclad.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''ironclad'';
-  version = ''ironclad_0.33.0'';
+  version = ''v0.34'';
 
   description = ''A cryptographic toolkit written in pure Common Lisp'';
 
-  deps = [ args."nibbles" ];
+  deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/ironclad/2014-11-06/ironclad_0.33.0.tgz'';
-    sha256 = ''1ld0xz8gmi566zxl1cva5yi86aw1wb6i6446gxxdw1lisxx3xwz7'';
+    url = ''http://beta.quicklisp.org/archive/ironclad/2017-05-16/ironclad-v0.34.tgz'';
+    sha256 = ''08xlnzs7hzbr0sa4aff4xb0b60dxcpad7fb5xsnjn3qjs7yydxk0'';
   };
+    
+  packageName = "ironclad";
 
   overrides = x: {
     postInstall = ''
@@ -28,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM ironclad DESCRIPTION A cryptographic toolkit written in pure Common Lisp SHA256 1ld0xz8gmi566zxl1cva5yi86aw1wb6i6446gxxdw1lisxx3xwz7 URL
-    http://beta.quicklisp.org/archive/ironclad/2014-11-06/ironclad_0.33.0.tgz MD5 2b7befe607e2fedffbdd45b2443db718 NAME ironclad TESTNAME NIL FILENAME ironclad
-    DEPS ((NAME nibbles)) DEPENDENCIES (nibbles) VERSION ironclad_0.33.0 SIBLINGS (ironclad-text)) */
+/* (SYSTEM ironclad DESCRIPTION A cryptographic toolkit written in pure Common Lisp SHA256 08xlnzs7hzbr0sa4aff4xb0b60dxcpad7fb5xsnjn3qjs7yydxk0 URL
+    http://beta.quicklisp.org/archive/ironclad/2017-05-16/ironclad-v0.34.tgz MD5 82db632975aa83b0dce3412c1aff4a80 NAME ironclad TESTNAME NIL FILENAME ironclad
+    DEPS NIL DEPENDENCIES NIL VERSION v0.34 SIBLINGS (ironclad-text)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix
index 446b54a455a..5e02dceb84c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/iterate.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/iterate/2016-08-25/iterate-20160825-darcs.tgz'';
     sha256 = ''0kvz16gnxnkdz0fy1x8y5yr28nfm7i2qpvix7mgwccdpjmsb4pgm'';
   };
+    
+  packageName = "iterate";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/ixf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ixf.nix
new file mode 100644
index 00000000000..3d2da3fa6bc
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/ixf.nix
@@ -0,0 +1,35 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''ixf'';
+  version = ''cl-20170516-git'';
+
+  description = ''Tools to handle IBM PC version of IXF file format'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-ixf/2017-05-16/cl-ixf-20170516-git.tgz'';
+    sha256 = ''0x32zlayynfj6g676afl0zna63jcgf333n3izapa84y5zgqp3nwf'';
+  };
+    
+  packageName = "ixf";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/ixf[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM ixf DESCRIPTION Tools to handle IBM PC version of IXF file format SHA256 0x32zlayynfj6g676afl0zna63jcgf333n3izapa84y5zgqp3nwf URL
+    http://beta.quicklisp.org/archive/cl-ixf/2017-05-16/cl-ixf-20170516-git.tgz MD5 1c4c5ff76bb6fa9c19fe47d064c512b9 NAME ixf TESTNAME NIL FILENAME ixf DEPS
+    NIL DEPENDENCIES NIL VERSION cl-20170516-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix
index 905a14b785c..841c210a5ae 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/jonathan.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''jonathan'';
-  version = ''20170124-git'';
+  version = ''20170516-git'';
 
   description = ''High performance JSON encoder and decoder. Currently support: SBCL, CCL.'';
 
-  deps = [ args."trivial-types" args."proc-parse" args."fast-io" args."cl-syntax-annot" args."cl-syntax" args."cl-ppcre" args."cl-annot" args."babel" ];
+  deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/jonathan/2017-01-24/jonathan-20170124-git.tgz'';
-    sha256 = ''1r54w7i1fxaqz6q7idamcy3bvsg0pvfjcs2qq4dag519zwcpln5l'';
+    url = ''http://beta.quicklisp.org/archive/jonathan/2017-05-16/jonathan-20170516-git.tgz'';
+    sha256 = ''00bpmarfhcms2nnghyhh02ci9rjpjvzlmy2fdvlybfmv9d48lq3q'';
   };
+    
+  packageName = "jonathan";
 
   overrides = x: {
     postInstall = ''
@@ -29,7 +31,5 @@ rec {
   };
 }
 /* (SYSTEM jonathan DESCRIPTION High performance JSON encoder and decoder. Currently support: SBCL, CCL. SHA256
-    1r54w7i1fxaqz6q7idamcy3bvsg0pvfjcs2qq4dag519zwcpln5l URL http://beta.quicklisp.org/archive/jonathan/2017-01-24/jonathan-20170124-git.tgz MD5
-    f33377a22a3b1d948f294985acec20ad NAME jonathan TESTNAME NIL FILENAME jonathan DEPS
-    ((NAME trivial-types) (NAME proc-parse) (NAME fast-io) (NAME cl-syntax-annot) (NAME cl-syntax) (NAME cl-ppcre) (NAME cl-annot) (NAME babel)) DEPENDENCIES
-    (trivial-types proc-parse fast-io cl-syntax-annot cl-syntax cl-ppcre cl-annot babel) VERSION 20170124-git SIBLINGS (jonathan-test)) */
+    00bpmarfhcms2nnghyhh02ci9rjpjvzlmy2fdvlybfmv9d48lq3q URL http://beta.quicklisp.org/archive/jonathan/2017-05-16/jonathan-20170516-git.tgz MD5
+    b05ccc0140e70636240f216fdc14e4d3 NAME jonathan TESTNAME NIL FILENAME jonathan DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS (jonathan-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
deleted file mode 100644
index ba24d7dd78c..00000000000
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-middleware-backtrace.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-args @ { fetchurl, ... }:
-rec {
-  baseName = ''lack-middleware-backtrace'';
-  version = ''lack-20161204-git'';
-
-  description = '''';
-
-  deps = [ args."uiop" ];
-
-  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/lack/2016-12-04/lack-20161204-git.tgz'';
-    sha256 = ''10bnpgbh5nk9lw1xywmvh5661rq91v8sp43ds53x98865ni7flnv'';
-  };
-
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/lack-middleware-backtrace[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
-}
-/* (SYSTEM lack-middleware-backtrace DESCRIPTION NIL SHA256 10bnpgbh5nk9lw1xywmvh5661rq91v8sp43ds53x98865ni7flnv URL
-    http://beta.quicklisp.org/archive/lack/2016-12-04/lack-20161204-git.tgz MD5 bef444eeadf759226539318bee9f0ab5 NAME lack-middleware-backtrace TESTNAME NIL
-    FILENAME lack-middleware-backtrace DEPS ((NAME uiop)) DEPENDENCIES (uiop) VERSION lack-20161204-git SIBLINGS
-    (lack-component lack-middleware-accesslog lack-middleware-auth-basic lack-middleware-csrf lack-middleware-mount lack-middleware-session
-     lack-middleware-static lack-request lack-response lack-session-store-dbi lack-session-store-redis lack-test lack-util-writer-stream lack-util lack
-     t-lack-component t-lack-middleware-accesslog t-lack-middleware-auth-basic t-lack-middleware-backtrace t-lack-middleware-csrf t-lack-middleware-mount
-     t-lack-middleware-session t-lack-middleware-static t-lack-request t-lack-session-store-dbi t-lack-session-store-redis t-lack-util t-lack)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
deleted file mode 100644
index 9b60f52c87f..00000000000
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack-util.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-args @ { fetchurl, ... }:
-rec {
-  baseName = ''lack-util'';
-  version = ''lack-20161204-git'';
-
-  description = '''';
-
-  deps = [ args."ironclad" ];
-
-  src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/lack/2016-12-04/lack-20161204-git.tgz'';
-    sha256 = ''10bnpgbh5nk9lw1xywmvh5661rq91v8sp43ds53x98865ni7flnv'';
-  };
-
-  overrides = x: {
-    postInstall = ''
-      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/lack-util[.]asd${"$"}' |
-        while read f; do
-          env -i \
-          NIX_LISP="$NIX_LISP" \
-          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
-            (asdf:load-system :$(basename "$f" .asd))
-            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
-            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
-            )'" \
-            "$out"/bin/*-lisp-launcher.sh ||
-          mv "$f"{,.sibling}; done || true
-    '';
-  };
-}
-/* (SYSTEM lack-util DESCRIPTION NIL SHA256 10bnpgbh5nk9lw1xywmvh5661rq91v8sp43ds53x98865ni7flnv URL
-    http://beta.quicklisp.org/archive/lack/2016-12-04/lack-20161204-git.tgz MD5 bef444eeadf759226539318bee9f0ab5 NAME lack-util TESTNAME NIL FILENAME lack-util
-    DEPS ((NAME ironclad)) DEPENDENCIES (ironclad) VERSION lack-20161204-git SIBLINGS
-    (lack-component lack-middleware-accesslog lack-middleware-auth-basic lack-middleware-backtrace lack-middleware-csrf lack-middleware-mount
-     lack-middleware-session lack-middleware-static lack-request lack-response lack-session-store-dbi lack-session-store-redis lack-test
-     lack-util-writer-stream lack t-lack-component t-lack-middleware-accesslog t-lack-middleware-auth-basic t-lack-middleware-backtrace t-lack-middleware-csrf
-     t-lack-middleware-mount t-lack-middleware-session t-lack-middleware-static t-lack-request t-lack-session-store-dbi t-lack-session-store-redis t-lack-util
-     t-lack)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
index ceed4365966..2e8c2fe291f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lack.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/lack/2016-12-04/lack-20161204-git.tgz'';
     sha256 = ''10bnpgbh5nk9lw1xywmvh5661rq91v8sp43ds53x98865ni7flnv'';
   };
+    
+  packageName = "lack";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix
index c01500f0c3d..4082abbe656 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/let-plus.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/let-plus/2017-01-24/let-plus-20170124-git.tgz'';
     sha256 = ''1hfsw4g36vccz2lx6gk375arjj6y85yh9ch3pq7yiybjlxx68xi8'';
   };
+    
+  packageName = "let-plus";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,5 @@ rec {
 }
 /* (SYSTEM let-plus DESCRIPTION Destructuring extension of LET*. SHA256 1hfsw4g36vccz2lx6gk375arjj6y85yh9ch3pq7yiybjlxx68xi8 URL
     http://beta.quicklisp.org/archive/let-plus/2017-01-24/let-plus-20170124-git.tgz MD5 1180608e4da53f3866a99d4cca72e3b1 NAME let-plus TESTNAME NIL FILENAME
-    let-plus DEPS ((NAME alexandria) (NAME anaphora)) DEPENDENCIES (alexandria anaphora) VERSION 20170124-git SIBLINGS NIL) */
+    let-plus DEPS ((NAME alexandria FILENAME alexandria) (NAME anaphora FILENAME anaphora)) DEPENDENCIES (alexandria anaphora) VERSION 20170124-git SIBLINGS
+    NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix
index 9d4aa874d4c..f35ba345d1b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lev.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/lev/2015-05-05/lev-20150505-git.tgz'';
     sha256 = ''0lkkzb221ks4f0qjgh6pr5lyvb4884a87p96ir4m36x411pyk5xl'';
   };
+    
+  packageName = "lev";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,4 @@ rec {
 }
 /* (SYSTEM lev DESCRIPTION libev bindings for Common Lisp SHA256 0lkkzb221ks4f0qjgh6pr5lyvb4884a87p96ir4m36x411pyk5xl URL
     http://beta.quicklisp.org/archive/lev/2015-05-05/lev-20150505-git.tgz MD5 10f340f7500beb98b5c0d4a9876131fb NAME lev TESTNAME NIL FILENAME lev DEPS
-    ((NAME cffi)) DEPENDENCIES (cffi) VERSION 20150505-git SIBLINGS NIL) */
+    ((NAME cffi FILENAME cffi)) DEPENDENCIES (cffi) VERSION 20150505-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/list-of.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/list-of.nix
new file mode 100644
index 00000000000..720afedb815
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/list-of.nix
@@ -0,0 +1,35 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''list-of'';
+  version = ''asdf-finalizers-20170403-git'';
+
+  description = ''magic list-of deftype'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/asdf-finalizers/2017-04-03/asdf-finalizers-20170403-git.tgz'';
+    sha256 = ''1w2ka0123icbjba7ngdd6h93j72g236h6jw4bsmvsak69fj0ybxj'';
+  };
+    
+  packageName = "list-of";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/list-of[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM list-of DESCRIPTION magic list-of deftype SHA256 1w2ka0123icbjba7ngdd6h93j72g236h6jw4bsmvsak69fj0ybxj URL
+    http://beta.quicklisp.org/archive/asdf-finalizers/2017-04-03/asdf-finalizers-20170403-git.tgz MD5 a9e3c960e6b6fdbd69640b520ef8044b NAME list-of TESTNAME
+    NIL FILENAME list-of DEPS NIL DEPENDENCIES NIL VERSION asdf-finalizers-20170403-git SIBLINGS (asdf-finalizers-test asdf-finalizers)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix
index e2e7e71aadd..0740ec0779f 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/local-time.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''local-time'';
-  version = ''20170124-git'';
+  version = ''20170516-git'';
 
   description = ''A library for manipulating dates and times, based on a paper by Erik Naggum'';
 
-  deps = [ args."cl-fad" ];
+  deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/local-time/2017-01-24/local-time-20170124-git.tgz'';
-    sha256 = ''0nf21bhclr2cwpflf733wn6hr6mcz94dr796jk91f0ck28nf7ab1'';
+    url = ''http://beta.quicklisp.org/archive/local-time/2017-05-16/local-time-20170516-git.tgz'';
+    sha256 = ''0qqy13pc3mqy4vkrvyfvg66n80kzxga5iax2ps0150ir61hwz35p'';
   };
+    
+  packageName = "local-time";
 
   overrides = x: {
     postInstall = ''
@@ -29,6 +31,6 @@ rec {
   };
 }
 /* (SYSTEM local-time DESCRIPTION A library for manipulating dates and times, based on a paper by Erik Naggum SHA256
-    0nf21bhclr2cwpflf733wn6hr6mcz94dr796jk91f0ck28nf7ab1 URL http://beta.quicklisp.org/archive/local-time/2017-01-24/local-time-20170124-git.tgz MD5
-    b345e5e74186eeddb85233df91d0dfe9 NAME local-time TESTNAME NIL FILENAME local-time DEPS ((NAME cl-fad)) DEPENDENCIES (cl-fad) VERSION 20170124-git SIBLINGS
+    0qqy13pc3mqy4vkrvyfvg66n80kzxga5iax2ps0150ir61hwz35p URL http://beta.quicklisp.org/archive/local-time/2017-05-16/local-time-20170516-git.tgz MD5
+    b2f5b94458f34f4b73cdd614e1304a9a NAME local-time TESTNAME NIL FILENAME local-time DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS
     (cl-postgres+local-time local-time.test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix
new file mode 100644
index 00000000000..a8d9d94c664
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lparallel.nix
@@ -0,0 +1,36 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''lparallel'';
+  version = ''20160825-git'';
+
+  description = ''Parallelism for Common Lisp'';
+
+  deps = [ args."bordeaux-threads" args."alexandria" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/lparallel/2016-08-25/lparallel-20160825-git.tgz'';
+    sha256 = ''0wwwwszbj6m0b2rsp8mpn4m6y7xk448bw8fb7gy0ggmsdfgchfr1'';
+  };
+    
+  packageName = "lparallel";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/lparallel[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM lparallel DESCRIPTION Parallelism for Common Lisp SHA256 0wwwwszbj6m0b2rsp8mpn4m6y7xk448bw8fb7gy0ggmsdfgchfr1 URL
+    http://beta.quicklisp.org/archive/lparallel/2016-08-25/lparallel-20160825-git.tgz MD5 6393e8d0c0cc9ed1c88b6e7cca8de5df NAME lparallel TESTNAME NIL FILENAME
+    lparallel DEPS ((NAME bordeaux-threads FILENAME bordeaux-threads) (NAME alexandria FILENAME alexandria)) DEPENDENCIES (bordeaux-threads alexandria) VERSION
+    20160825-git SIBLINGS (lparallel-bench lparallel-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix
index 473581c3184..51c8af197fc 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/lquery.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''lquery'';
-  version = ''20160929-git'';
+  version = ''20170516-git'';
 
   description = ''A library to allow jQuery-like HTML/DOM manipulation.'';
 
-  deps = [ args."plump" args."form-fiddle" args."clss" args."array-utils" ];
+  deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/lquery/2016-09-29/lquery-20160929-git.tgz'';
-    sha256 = ''1kqc0n4zh44yay9vbv6wirk3122q7if2999146lrgada5fy17r7x'';
+    url = ''http://beta.quicklisp.org/archive/lquery/2017-05-16/lquery-20170516-git.tgz'';
+    sha256 = ''11i6kwz4d8918a32z826v85qs2alpsfkvlcha4j7mnbfnzgy7gy7'';
   };
+    
+  packageName = "lquery";
 
   overrides = x: {
     postInstall = ''
@@ -28,7 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM lquery DESCRIPTION A library to allow jQuery-like HTML/DOM manipulation. SHA256 1kqc0n4zh44yay9vbv6wirk3122q7if2999146lrgada5fy17r7x URL
-    http://beta.quicklisp.org/archive/lquery/2016-09-29/lquery-20160929-git.tgz MD5 072a796075862c96dcd6f227d79dc2b7 NAME lquery TESTNAME NIL FILENAME lquery
-    DEPS ((NAME plump) (NAME form-fiddle) (NAME clss) (NAME array-utils)) DEPENDENCIES (plump form-fiddle clss array-utils) VERSION 20160929-git SIBLINGS
-    (lquery-test)) */
+/* (SYSTEM lquery DESCRIPTION A library to allow jQuery-like HTML/DOM manipulation. SHA256 11i6kwz4d8918a32z826v85qs2alpsfkvlcha4j7mnbfnzgy7gy7 URL
+    http://beta.quicklisp.org/archive/lquery/2017-05-16/lquery-20170516-git.tgz MD5 2190045b167685bfffdd01f5af9aa9a1 NAME lquery TESTNAME NIL FILENAME lquery
+    DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS (lquery-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix
index ad159edc5c9..b5c242530fe 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/map-set.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/map-set/2016-06-28/map-set-20160628-hg.tgz'';
     sha256 = ''15fbha43a5153ah836djp9dbg41728adjrzwryv68gcqs31rjk9v'';
   };
+    
+  packageName = "map-set";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix
index cb5041b6029..5729c898fdc 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/marshal.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-marshal/2017-01-24/cl-marshal-20170124-git.tgz'';
     sha256 = ''0z43m3jspl4c4fcbbxm58hxd9k69308pyijgj7grmq6mirkq664d'';
   };
+    
+  packageName = "marshal";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
index a24e9d99a2c..1384799d242 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/md5.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''md5'';
-  version = ''20150804-git'';
+  version = ''20170516-git'';
 
   description = ''The MD5 Message-Digest Algorithm RFC 1321'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/md5/2015-08-04/md5-20150804-git.tgz'';
-    sha256 = ''1sf79pjip19sx7zmznz1wm4563qc208lq49m0jnhxbv09wmm4vc5'';
+    url = ''http://beta.quicklisp.org/archive/md5/2017-05-16/md5-20170516-git.tgz'';
+    sha256 = ''1jmhww8wvd66ky5vppr0g8hi52w6z3q7svsqcmdrgzifr01r0pcv'';
   };
+    
+  packageName = "md5";
 
   overrides = x: {
     postInstall = ''
@@ -28,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM md5 DESCRIPTION The MD5 Message-Digest Algorithm RFC 1321 SHA256 1sf79pjip19sx7zmznz1wm4563qc208lq49m0jnhxbv09wmm4vc5 URL
-    http://beta.quicklisp.org/archive/md5/2015-08-04/md5-20150804-git.tgz MD5 69331e0d326cbc3286ac447e2868e7fd NAME md5 TESTNAME NIL FILENAME md5 DEPS NIL
-    DEPENDENCIES NIL VERSION 20150804-git SIBLINGS NIL) */
+/* (SYSTEM md5 DESCRIPTION The MD5 Message-Digest Algorithm RFC 1321 SHA256 1jmhww8wvd66ky5vppr0g8hi52w6z3q7svsqcmdrgzifr01r0pcv URL
+    http://beta.quicklisp.org/archive/md5/2017-05-16/md5-20170516-git.tgz MD5 1c90df8ab2c6d57b7abaac84cae30ab3 NAME md5 TESTNAME NIL FILENAME md5 DEPS NIL
+    DEPENDENCIES NIL VERSION 20170516-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix
index 708fa41ca51..0bfbbbe14b2 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metabang-bind.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/metabang-bind/2017-01-24/metabang-bind-20170124-git.tgz'';
     sha256 = ''1xyiyrc9c02ylg6b749h2ihn6922kb179x7k338dmglf4mpyqxwc'';
   };
+    
+  packageName = "metabang-bind";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix
new file mode 100644
index 00000000000..1e35369a9d0
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/metatilities-base.nix
@@ -0,0 +1,35 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''metatilities-base'';
+  version = ''20170403-git'';
+
+  description = ''These are metabang.com's Common Lisp basic utilities.'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/metatilities-base/2017-04-03/metatilities-base-20170403-git.tgz'';
+    sha256 = ''14c1kzpg6ydnqca95rprzmhr09kk1jp2m8hpyn5vj2v68cvqm7br'';
+  };
+    
+  packageName = "metatilities-base";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/metatilities-base[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM metatilities-base DESCRIPTION These are metabang.com's Common Lisp basic utilities. SHA256 14c1kzpg6ydnqca95rprzmhr09kk1jp2m8hpyn5vj2v68cvqm7br URL
+    http://beta.quicklisp.org/archive/metatilities-base/2017-04-03/metatilities-base-20170403-git.tgz MD5 8a3f429862a368e63b8fde731e9ab28a NAME
+    metatilities-base TESTNAME NIL FILENAME metatilities-base DEPS NIL DEPENDENCIES NIL VERSION 20170403-git SIBLINGS (metatilities-base-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/mssql.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mssql.nix
new file mode 100644
index 00000000000..3586d5cc21b
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/mssql.nix
@@ -0,0 +1,36 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''mssql'';
+  version = ''cl-20131003-git'';
+
+  description = '''';
+
+  deps = [ args."cffi" args."garbage-pools" args."iterate" args."parse-number" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/cl-mssql/2013-10-03/cl-mssql-20131003-git.tgz'';
+    sha256 = ''1ykk8g4h3n21ich60l495v6h5pplx9hfs0kasz8myc5xv8ndljnk'';
+  };
+    
+  packageName = "mssql";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/mssql[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM mssql DESCRIPTION NIL SHA256 1ykk8g4h3n21ich60l495v6h5pplx9hfs0kasz8myc5xv8ndljnk URL
+    http://beta.quicklisp.org/archive/cl-mssql/2013-10-03/cl-mssql-20131003-git.tgz MD5 3e9d85a3b0ae7e000723a857ce7c2d44 NAME mssql TESTNAME NIL FILENAME mssql
+    DEPS ((NAME cffi FILENAME cffi) (NAME garbage-pools FILENAME garbage-pools) (NAME iterate FILENAME iterate) (NAME parse-number FILENAME parse-number))
+    DEPENDENCIES (cffi garbage-pools iterate parse-number) VERSION cl-20131003-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix
index 186550a15df..6580c322b04 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/myway.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/myway/2015-03-02/myway-20150302-git.tgz'';
     sha256 = ''1spab9zzhwjg3r5xncr5ncha7phw72wp49cxxncgphh1lfaiyblh'';
   };
+    
+  packageName = "myway";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,6 @@ rec {
 }
 /* (SYSTEM myway DESCRIPTION Sinatra-compatible routing library. SHA256 1spab9zzhwjg3r5xncr5ncha7phw72wp49cxxncgphh1lfaiyblh URL
     http://beta.quicklisp.org/archive/myway/2015-03-02/myway-20150302-git.tgz MD5 6a16b41eb3216c469bfc8783cce08b01 NAME myway TESTNAME NIL FILENAME myway DEPS
-    ((NAME quri) (NAME map-set) (NAME cl-utilities) (NAME cl-ppcre) (NAME alexandria)) DEPENDENCIES (quri map-set cl-utilities cl-ppcre alexandria) VERSION
-    20150302-git SIBLINGS (myway-test)) */
+    ((NAME quri FILENAME quri) (NAME map-set FILENAME map-set) (NAME cl-utilities FILENAME cl-utilities) (NAME cl-ppcre FILENAME cl-ppcre)
+     (NAME alexandria FILENAME alexandria))
+    DEPENDENCIES (quri map-set cl-utilities cl-ppcre alexandria) VERSION 20150302-git SIBLINGS (myway-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix
index c952ab5a1f7..53834f82431 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/named-readtables.nix
@@ -12,6 +12,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/named-readtables/2017-01-24/named-readtables-20170124-git.tgz'';
     sha256 = ''1j0drddahdjab40dd9v9qy92xbvzwgbk6y3hv990sdp9f8ac1q45'';
   };
+    
+  packageName = "named-readtables";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix
index c5300698e54..622fd506b15 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/nibbles.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/nibbles/2017-04-03/nibbles-20170403-git.tgz'';
     sha256 = ''0bg7jwhqhm3qmpzk21gjv50sl0grdn68d770cqfs7in62ny35lk4'';
   };
+    
+  packageName = "nibbles";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix
index 48bd3b7e542..74cb02155eb 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/optima.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/optima/2015-07-09/optima-20150709-git.tgz'';
     sha256 = ''0vqyqrnx2d8qwa2jlg9l2wn6vrykraj8a1ysz0gxxxnwpqc29hdc'';
   };
+    
+  packageName = "optima";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,5 @@ rec {
 }
 /* (SYSTEM optima DESCRIPTION Optimized Pattern Matching Library SHA256 0vqyqrnx2d8qwa2jlg9l2wn6vrykraj8a1ysz0gxxxnwpqc29hdc URL
     http://beta.quicklisp.org/archive/optima/2015-07-09/optima-20150709-git.tgz MD5 20523dc3dfc04bb2526008dff0842caa NAME optima TESTNAME NIL FILENAME optima
-    DEPS ((NAME closer-mop) (NAME alexandria)) DEPENDENCIES (closer-mop alexandria) VERSION 20150709-git SIBLINGS (optima.ppcre optima.test)) */
+    DEPS ((NAME closer-mop FILENAME closer-mop) (NAME alexandria FILENAME alexandria)) DEPENDENCIES (closer-mop alexandria) VERSION 20150709-git SIBLINGS
+    (optima.ppcre optima.test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix
index 56ae3473e2c..b7398d3973d 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parenscript.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/parenscript/2016-03-18/Parenscript-2.6.tgz'';
     sha256 = ''1hvr407fz7gzaxqbnki4k3l44qvl7vk6p5pn7811nrv6lk3kp5li'';
   };
+    
+  packageName = "parenscript";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,5 @@ rec {
 }
 /* (SYSTEM parenscript DESCRIPTION Lisp to JavaScript transpiler SHA256 1hvr407fz7gzaxqbnki4k3l44qvl7vk6p5pn7811nrv6lk3kp5li URL
     http://beta.quicklisp.org/archive/parenscript/2016-03-18/Parenscript-2.6.tgz MD5 dadecc13f2918bc618fb143e893deb99 NAME parenscript TESTNAME NIL FILENAME
-    parenscript DEPS ((NAME named-readtables) (NAME cl-ppcre) (NAME anaphora)) DEPENDENCIES (named-readtables cl-ppcre anaphora) VERSION Parenscript-2.6
-    SIBLINGS (parenscript.test)) */
+    parenscript DEPS ((NAME named-readtables FILENAME named-readtables) (NAME cl-ppcre FILENAME cl-ppcre) (NAME anaphora FILENAME anaphora)) DEPENDENCIES
+    (named-readtables cl-ppcre anaphora) VERSION Parenscript-2.6 SIBLINGS (parenscript.test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix
new file mode 100644
index 00000000000..726209f9617
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/parse-number.nix
@@ -0,0 +1,35 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''parse-number'';
+  version = ''1.4'';
+
+  description = ''Number parsing library'';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/parse-number/2014-08-26/parse-number-1.4.tgz'';
+    sha256 = ''0y8jh7ss47z3asdxknad2g8h12nclvx0by750xniizj33b6h9blh'';
+  };
+    
+  packageName = "parse-number";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/parse-number[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM parse-number DESCRIPTION Number parsing library SHA256 0y8jh7ss47z3asdxknad2g8h12nclvx0by750xniizj33b6h9blh URL
+    http://beta.quicklisp.org/archive/parse-number/2014-08-26/parse-number-1.4.tgz MD5 f189d474a2cd063f9743b452241e59a9 NAME parse-number TESTNAME NIL FILENAME
+    parse-number DEPS NIL DEPENDENCIES NIL VERSION 1.4 SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix
index dae0d011e75..f12f7b68d00 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pcall.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz'';
     sha256 = ''02idx1wnv9770fl2nh179sb8njw801g70b5mf8jqhqm2gwsb731y'';
   };
+    
+  packageName = "pcall";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,4 @@ rec {
 }
 /* (SYSTEM pcall DESCRIPTION NIL SHA256 02idx1wnv9770fl2nh179sb8njw801g70b5mf8jqhqm2gwsb731y URL
     http://beta.quicklisp.org/archive/pcall/2010-10-06/pcall-0.3.tgz MD5 019d85dfd1d5d0ee8d4ee475411caf6b NAME pcall TESTNAME NIL FILENAME pcall DEPS
-    ((NAME bordeaux-threads)) DEPENDENCIES (bordeaux-threads) VERSION 0.3 SIBLINGS (pcall-queue)) */
+    ((NAME bordeaux-threads FILENAME bordeaux-threads)) DEPENDENCIES (bordeaux-threads) VERSION 0.3 SIBLINGS (pcall-queue)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix
new file mode 100644
index 00000000000..d5ef8606f49
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/pgloader.nix
@@ -0,0 +1,47 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''pgloader'';
+  version = ''3.3.2'';
+
+  description = ''Load data into PostgreSQL'';
+
+  deps = [ args."abnf" args."alexandria" args."cl-base64" args."cl-csv" args."cl-fad" args."cl-log" args."cl-markdown" args."cl-postgres" args."cl-ppcre" args."command-line-arguments" args."db3" args."drakma" args."esrap" args."flexi-streams" args."ixf" args."local-time" args."lparallel" args."metabang-bind" args."mssql" args."postmodern" args."py-configparser" args."qmynd" args."quri" args."simple-date" args."split-sequence" args."sqlite" args."trivial-backtrace" args."uiop" args."usocket" args."uuid" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/pgloader/2016-12-04/pgloader-3.3.2.tgz'';
+    sha256 = ''1riz76jvjlszic48lndwfxjn9i72251frivaqi10k61gjfbx03qv'';
+  };
+    
+  packageName = "pgloader";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/pgloader[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM pgloader DESCRIPTION Load data into PostgreSQL SHA256 1riz76jvjlszic48lndwfxjn9i72251frivaqi10k61gjfbx03qv URL
+    http://beta.quicklisp.org/archive/pgloader/2016-12-04/pgloader-3.3.2.tgz MD5 fb72ca0db46b80a74b7b31dc5b27e1b8 NAME pgloader TESTNAME NIL FILENAME pgloader
+    DEPS
+    ((NAME abnf FILENAME abnf) (NAME alexandria FILENAME alexandria) (NAME cl-base64 FILENAME cl-base64) (NAME cl-csv FILENAME cl-csv)
+     (NAME cl-fad FILENAME cl-fad) (NAME cl-log FILENAME cl-log) (NAME cl-markdown FILENAME cl-markdown) (NAME cl-postgres FILENAME cl-postgres)
+     (NAME cl-ppcre FILENAME cl-ppcre) (NAME command-line-arguments FILENAME command-line-arguments) (NAME db3 FILENAME db3) (NAME drakma FILENAME drakma)
+     (NAME esrap FILENAME esrap) (NAME flexi-streams FILENAME flexi-streams) (NAME ixf FILENAME ixf) (NAME local-time FILENAME local-time)
+     (NAME lparallel FILENAME lparallel) (NAME metabang-bind FILENAME metabang-bind) (NAME mssql FILENAME mssql) (NAME postmodern FILENAME postmodern)
+     (NAME py-configparser FILENAME py-configparser) (NAME qmynd FILENAME qmynd) (NAME quri FILENAME quri) (NAME simple-date FILENAME simple-date)
+     (NAME split-sequence FILENAME split-sequence) (NAME sqlite FILENAME sqlite) (NAME trivial-backtrace FILENAME trivial-backtrace) (NAME uiop FILENAME uiop)
+     (NAME usocket FILENAME usocket) (NAME uuid FILENAME uuid))
+    DEPENDENCIES
+    (abnf alexandria cl-base64 cl-csv cl-fad cl-log cl-markdown cl-postgres cl-ppcre command-line-arguments db3 drakma esrap flexi-streams ixf local-time
+     lparallel metabang-bind mssql postmodern py-configparser qmynd quri simple-date split-sequence sqlite trivial-backtrace uiop usocket uuid)
+    VERSION 3.3.2 SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix
index 17795e3a92a..d89e25f8819 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/plump.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''plump'';
-  version = ''20170124-git'';
+  version = ''20170516-git'';
 
   description = ''An XML / XHTML / HTML parser that aims to be as lenient as possible.'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/plump/2017-01-24/plump-20170124-git.tgz'';
-    sha256 = ''1swl5kr6hgl7hkybixsx7h4ddc7c0a7pisgmmiz2bs2rv4inz69x'';
+    url = ''http://beta.quicklisp.org/archive/plump/2017-05-16/plump-20170516-git.tgz'';
+    sha256 = ''0i7fb1y4dfd7i97w33xf8d1ykza4irl89xkipainydigkk66xaz8'';
   };
+    
+  packageName = "plump";
 
   overrides = x: {
     postInstall = ''
@@ -28,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM plump DESCRIPTION An XML / XHTML / HTML parser that aims to be as lenient as possible. SHA256 1swl5kr6hgl7hkybixsx7h4ddc7c0a7pisgmmiz2bs2rv4inz69x
-    URL http://beta.quicklisp.org/archive/plump/2017-01-24/plump-20170124-git.tgz MD5 c49aeb37173aca79ee6ff5c89b0c4b1a NAME plump TESTNAME NIL FILENAME plump
-    DEPS NIL DEPENDENCIES NIL VERSION 20170124-git SIBLINGS (plump-dom plump-lexer plump-parser)) */
+/* (SYSTEM plump DESCRIPTION An XML / XHTML / HTML parser that aims to be as lenient as possible. SHA256 0i7fb1y4dfd7i97w33xf8d1ykza4irl89xkipainydigkk66xaz8
+    URL http://beta.quicklisp.org/archive/plump/2017-05-16/plump-20170516-git.tgz MD5 917a4f25691b3087ce24fd52ee42b4be NAME plump TESTNAME NIL FILENAME plump
+    DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS (plump-dom plump-lexer plump-parser)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix
new file mode 100644
index 00000000000..18dc40ff51a
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/postmodern.nix
@@ -0,0 +1,36 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''postmodern'';
+  version = ''20170403-git'';
+
+  description = ''PostgreSQL programming API'';
+
+  deps = [ args."closer-mop" args."bordeaux-threads" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/postmodern/2017-04-03/postmodern-20170403-git.tgz'';
+    sha256 = ''1pklmp0y0falrmbxll79drrcrlgslasavdym5r45m8kkzi1zpv9p'';
+  };
+    
+  packageName = "postmodern";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/postmodern[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM postmodern DESCRIPTION PostgreSQL programming API SHA256 1pklmp0y0falrmbxll79drrcrlgslasavdym5r45m8kkzi1zpv9p URL
+    http://beta.quicklisp.org/archive/postmodern/2017-04-03/postmodern-20170403-git.tgz MD5 7a4145a0a5ff5bcb7a4bf29b5c2915d2 NAME postmodern TESTNAME NIL
+    FILENAME postmodern DEPS ((NAME closer-mop FILENAME closer-mop) (NAME bordeaux-threads FILENAME bordeaux-threads)) DEPENDENCIES
+    (closer-mop bordeaux-threads) VERSION 20170403-git SIBLINGS (cl-postgres s-sql simple-date)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix
index 9e4e2effbd3..142d24f5e48 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/proc-parse.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/proc-parse/2016-03-18/proc-parse-20160318-git.tgz'';
     sha256 = ''00261w269w9chg6r3sh8hg8994njbsai1g3zni0whm2dzxxq6rnl'';
   };
+    
+  packageName = "proc-parse";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,5 @@ rec {
 }
 /* (SYSTEM proc-parse DESCRIPTION Procedural vector parser SHA256 00261w269w9chg6r3sh8hg8994njbsai1g3zni0whm2dzxxq6rnl URL
     http://beta.quicklisp.org/archive/proc-parse/2016-03-18/proc-parse-20160318-git.tgz MD5 5e43f50284fa70c448a3df12d1eea2ea NAME proc-parse TESTNAME NIL
-    FILENAME proc-parse DEPS ((NAME babel) (NAME alexandria)) DEPENDENCIES (babel alexandria) VERSION 20160318-git SIBLINGS (proc-parse-test)) */
+    FILENAME proc-parse DEPS ((NAME babel FILENAME babel) (NAME alexandria FILENAME alexandria)) DEPENDENCIES (babel alexandria) VERSION 20160318-git SIBLINGS
+    (proc-parse-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix
index cf6fd03ba12..ae823959fdc 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/prove.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/prove/2017-04-03/prove-20170403-git.tgz'';
     sha256 = ''091xxkn9zj22c4gmm8x714k29bs4j0j7akppwh55zjsmrxdhqcpl'';
   };
+    
+  packageName = "prove";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,6 @@ rec {
 }
 /* (SYSTEM prove DESCRIPTION NIL SHA256 091xxkn9zj22c4gmm8x714k29bs4j0j7akppwh55zjsmrxdhqcpl URL
     http://beta.quicklisp.org/archive/prove/2017-04-03/prove-20170403-git.tgz MD5 063b615692c8711d2392204ecf1b37b7 NAME prove TESTNAME NIL FILENAME prove DEPS
-    ((NAME uiop) (NAME cl-ppcre) (NAME cl-colors) (NAME cl-ansi-text) (NAME alexandria)) DEPENDENCIES (uiop cl-ppcre cl-colors cl-ansi-text alexandria) VERSION
-    20170403-git SIBLINGS (cl-test-more prove-asdf prove-test)) */
+    ((NAME uiop FILENAME uiop) (NAME cl-ppcre FILENAME cl-ppcre) (NAME cl-colors FILENAME cl-colors) (NAME cl-ansi-text FILENAME cl-ansi-text)
+     (NAME alexandria FILENAME alexandria))
+    DEPENDENCIES (uiop cl-ppcre cl-colors cl-ansi-text alexandria) VERSION 20170403-git SIBLINGS (cl-test-more prove-asdf prove-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix
index fe48a580ee9..9a7e24cebdc 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/puri.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/puri/2015-09-23/puri-20150923-git.tgz'';
     sha256 = ''099ay2zji5ablj2jj56sb49hk2l9x5s11vpx6893qwwjsp2881qa'';
   };
+    
+  packageName = "puri";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/py-configparser.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/py-configparser.nix
new file mode 100644
index 00000000000..868aae61f6b
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/py-configparser.nix
@@ -0,0 +1,35 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''py-configparser'';
+  version = ''20131003-svn'';
+
+  description = ''Common Lisp implementation of the Python ConfigParser module'';
+
+  deps = [ args."parse-number" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/py-configparser/2013-10-03/py-configparser-20131003-svn.tgz'';
+    sha256 = ''10csqvl2acsha70igy75np2lf3bx7rrlrgryslsqay2xdzk6alwx'';
+  };
+    
+  packageName = "py-configparser";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/py-configparser[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM py-configparser DESCRIPTION Common Lisp implementation of the Python ConfigParser module SHA256 10csqvl2acsha70igy75np2lf3bx7rrlrgryslsqay2xdzk6alwx
+    URL http://beta.quicklisp.org/archive/py-configparser/2013-10-03/py-configparser-20131003-svn.tgz MD5 da697259b68f536bcb6b77933b55a5d9 NAME py-configparser
+    TESTNAME NIL FILENAME py-configparser DEPS ((NAME parse-number FILENAME parse-number)) DEPENDENCIES (parse-number) VERSION 20131003-svn SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix
new file mode 100644
index 00000000000..b9871752e58
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/qmynd.nix
@@ -0,0 +1,38 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''qmynd'';
+  version = ''20160208-git'';
+
+  description = ''MySQL Native Driver'';
+
+  deps = [ args."usocket" args."trivial-gray-streams" args."salza2" args."list-of" args."ironclad" args."flexi-streams" args."cl+ssl" args."chipz" args."babel" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/qmynd/2016-02-08/qmynd-20160208-git.tgz'';
+    sha256 = ''0x9ml8id3s8l0rsa108bcs5lmyhb2y5a5p7s9ppvmqd4cgxnramq'';
+  };
+    
+  packageName = "qmynd";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/qmynd[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM qmynd DESCRIPTION MySQL Native Driver SHA256 0x9ml8id3s8l0rsa108bcs5lmyhb2y5a5p7s9ppvmqd4cgxnramq URL
+    http://beta.quicklisp.org/archive/qmynd/2016-02-08/qmynd-20160208-git.tgz MD5 9483ba5330a4240a9d5a8016c16a0084 NAME qmynd TESTNAME NIL FILENAME qmynd DEPS
+    ((NAME usocket FILENAME usocket) (NAME trivial-gray-streams FILENAME trivial-gray-streams) (NAME salza2 FILENAME salza2) (NAME list-of FILENAME list-of)
+     (NAME ironclad FILENAME ironclad) (NAME flexi-streams FILENAME flexi-streams) (NAME cl+ssl FILENAME cl+ssl) (NAME chipz FILENAME chipz)
+     (NAME babel FILENAME babel))
+    DEPENDENCIES (usocket trivial-gray-streams salza2 list-of ironclad flexi-streams cl+ssl chipz babel) VERSION 20160208-git SIBLINGS (qmynd-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix
index 2a1219e48e7..1cfd62686c4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/query-fs.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/query-fs/2016-05-31/query-fs-20160531-git.tgz'';
     sha256 = ''0wknr3rffihg1my8ihmpwssxpxj4bfmqcly0s37q51fllxkr1v5a'';
   };
+    
+  packageName = "query-fs";
 
   overrides = x: {
     postInstall = ''
@@ -31,5 +33,7 @@ rec {
 /* (SYSTEM query-fs DESCRIPTION High-level virtual FS using CL-Fuse-Meta-FS to represent results of queries SHA256
     0wknr3rffihg1my8ihmpwssxpxj4bfmqcly0s37q51fllxkr1v5a URL http://beta.quicklisp.org/archive/query-fs/2016-05-31/query-fs-20160531-git.tgz MD5
     dfbb3d0e7b5d990488a17b184771d049 NAME query-fs TESTNAME NIL FILENAME query-fs DEPS
-    ((NAME bordeaux-threads) (NAME cl-fuse) (NAME cl-fuse-meta-fs) (NAME cl-ppcre) (NAME command-line-arguments) (NAME iterate) (NAME trivial-backtrace))
+    ((NAME bordeaux-threads FILENAME bordeaux-threads) (NAME cl-fuse FILENAME cl-fuse) (NAME cl-fuse-meta-fs FILENAME cl-fuse-meta-fs)
+     (NAME cl-ppcre FILENAME cl-ppcre) (NAME command-line-arguments FILENAME command-line-arguments) (NAME iterate FILENAME iterate)
+     (NAME trivial-backtrace FILENAME trivial-backtrace))
     DEPENDENCIES (bordeaux-threads cl-fuse cl-fuse-meta-fs cl-ppcre command-line-arguments iterate trivial-backtrace) VERSION 20160531-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix
index 1c351669c9a..26fab0612e9 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/quri.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/quri/2016-12-04/quri-20161204-git.tgz'';
     sha256 = ''14if83kd2mv68p4g4ch2w796w3micpzv40z7xrcwzwj64wngwabv'';
   };
+    
+  packageName = "quri";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,5 @@ rec {
 }
 /* (SYSTEM quri DESCRIPTION Yet another URI library for Common Lisp SHA256 14if83kd2mv68p4g4ch2w796w3micpzv40z7xrcwzwj64wngwabv URL
     http://beta.quicklisp.org/archive/quri/2016-12-04/quri-20161204-git.tgz MD5 8c87e99d4f7308d83aab361a6e36508a NAME quri TESTNAME NIL FILENAME quri DEPS
-    ((NAME split-sequence) (NAME cl-utilities) (NAME babel) (NAME alexandria)) DEPENDENCIES (split-sequence cl-utilities babel alexandria) VERSION 20161204-git
-    SIBLINGS (quri-test)) */
+    ((NAME split-sequence FILENAME split-sequence) (NAME cl-utilities FILENAME cl-utilities) (NAME babel FILENAME babel) (NAME alexandria FILENAME alexandria))
+    DEPENDENCIES (split-sequence cl-utilities babel alexandria) VERSION 20161204-git SIBLINGS (quri-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix
index 572cd29c75b..e74c2c51b79 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/rfc2388.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/rfc2388/2013-07-20/rfc2388-20130720-git.tgz'';
     sha256 = ''1ky99cr4bgfyh0pfpl5f6fsmq1qdbgi4b8v0cfs4y73f78p1f8b6'';
   };
+    
+  packageName = "rfc2388";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix
index 38e9e4ecabd..9654a86b74b 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/salza2.nix
@@ -12,6 +12,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/salza2/2013-07-20/salza2-2.0.9.tgz'';
     sha256 = ''1m0hksgvq3njd9xa2nxlm161vgzw77djxmisq08v9pz2bz16v8va'';
   };
+    
+  packageName = "salza2";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix
new file mode 100644
index 00000000000..00e2b3dbd0f
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/simple-date.nix
@@ -0,0 +1,35 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''simple-date'';
+  version = ''postmodern-20170403-git'';
+
+  description = '''';
+
+  deps = [ ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/postmodern/2017-04-03/postmodern-20170403-git.tgz'';
+    sha256 = ''1pklmp0y0falrmbxll79drrcrlgslasavdym5r45m8kkzi1zpv9p'';
+  };
+    
+  packageName = "simple-date";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/simple-date[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM simple-date DESCRIPTION NIL SHA256 1pklmp0y0falrmbxll79drrcrlgslasavdym5r45m8kkzi1zpv9p URL
+    http://beta.quicklisp.org/archive/postmodern/2017-04-03/postmodern-20170403-git.tgz MD5 7a4145a0a5ff5bcb7a4bf29b5c2915d2 NAME simple-date TESTNAME NIL
+    FILENAME simple-date DEPS NIL DEPENDENCIES NIL VERSION postmodern-20170403-git SIBLINGS (cl-postgres postmodern s-sql)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix
index 597f8fcfe3a..9a04f3c64db 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/smart-buffer.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/smart-buffer/2016-06-28/smart-buffer-20160628-git.tgz'';
     sha256 = ''1wp50snkc8739n91xlnfnq1dzz3kfp0awgp92m7xbpcw3hbaib1s'';
   };
+    
+  packageName = "smart-buffer";
 
   overrides = x: {
     postInstall = ''
@@ -30,5 +32,5 @@ rec {
 }
 /* (SYSTEM smart-buffer DESCRIPTION Smart octets buffer SHA256 1wp50snkc8739n91xlnfnq1dzz3kfp0awgp92m7xbpcw3hbaib1s URL
     http://beta.quicklisp.org/archive/smart-buffer/2016-06-28/smart-buffer-20160628-git.tgz MD5 454d8510618da8111c7ca687549b7035 NAME smart-buffer TESTNAME NIL
-    FILENAME smart-buffer DEPS ((NAME xsubseq) (NAME uiop) (NAME flexi-streams)) DEPENDENCIES (xsubseq uiop flexi-streams) VERSION 20160628-git SIBLINGS
-    (smart-buffer-test)) */
+    FILENAME smart-buffer DEPS ((NAME xsubseq FILENAME xsubseq) (NAME uiop FILENAME uiop) (NAME flexi-streams FILENAME flexi-streams)) DEPENDENCIES
+    (xsubseq uiop flexi-streams) VERSION 20160628-git SIBLINGS (smart-buffer-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix
index 2712a1b8e1d..03331578764 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/split-sequence.nix
@@ -12,6 +12,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/split-sequence/2015-08-04/split-sequence-1.2.tgz'';
     sha256 = ''12x5yfvinqz9jzxwlsg226103a9sdf67zpzn5izggvdlw0v5qp0l'';
   };
+    
+  packageName = "split-sequence";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix
index 1d2f8fd0122..73144329206 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/sqlite.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/cl-sqlite/2013-06-15/cl-sqlite-20130615-git.tgz'';
     sha256 = ''0db1fvvnsrnxmp272ycnl2kwhymjwrimr8z4djvjlg6cvjxk6lqh'';
   };
+    
+  packageName = "sqlite";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,4 @@ rec {
 }
 /* (SYSTEM sqlite DESCRIPTION NIL SHA256 0db1fvvnsrnxmp272ycnl2kwhymjwrimr8z4djvjlg6cvjxk6lqh URL
     http://beta.quicklisp.org/archive/cl-sqlite/2013-06-15/cl-sqlite-20130615-git.tgz MD5 93be7c68f587d830941be55f2c2f1c8b NAME sqlite TESTNAME NIL FILENAME
-    sqlite DEPS ((NAME cffi) (NAME iterate)) DEPENDENCIES (cffi iterate) VERSION cl-20130615-git SIBLINGS NIL) */
+    sqlite DEPS ((NAME cffi FILENAME cffi) (NAME iterate FILENAME iterate)) DEPENDENCIES (cffi iterate) VERSION cl-20130615-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix
index 1a7056e3fa2..e06fe790f76 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/static-vectors.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/static-vectors/2017-01-24/static-vectors-v1.8.2.tgz'';
     sha256 = ''0p35f0wrnv46bmmxlviwpsbxnlnkmxwd3xp858lhf0dy52cyra1g'';
   };
+    
+  packageName = "static-vectors";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,5 @@ rec {
 }
 /* (SYSTEM static-vectors DESCRIPTION Create vectors allocated in static memory. SHA256 0p35f0wrnv46bmmxlviwpsbxnlnkmxwd3xp858lhf0dy52cyra1g URL
     http://beta.quicklisp.org/archive/static-vectors/2017-01-24/static-vectors-v1.8.2.tgz MD5 fd3ebe4e79a71c49e32ac87d6a1bcaf4 NAME static-vectors TESTNAME NIL
-    FILENAME static-vectors DEPS ((NAME alexandria) (NAME cffi) (NAME cffi-grovel)) DEPENDENCIES (alexandria cffi cffi-grovel) VERSION v1.8.2 SIBLINGS NIL) */
+    FILENAME static-vectors DEPS ((NAME alexandria FILENAME alexandria) (NAME cffi FILENAME cffi) (NAME cffi-grovel FILENAME cffi-grovel)) DEPENDENCIES
+    (alexandria cffi cffi-grovel) VERSION v1.8.2 SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
index aaef5095dbb..6aa42000e73 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/stumpwm.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''stumpwm'';
-  version = ''20170403-git'';
+  version = ''20170516-git'';
 
   description = ''A tiling, keyboard driven window manager'';
 
-  deps = [ args."alexandria" args."cl-ppcre" args."clx" ];
+  deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/stumpwm/2017-04-03/stumpwm-20170403-git.tgz'';
-    sha256 = ''1aca1nvdzp957mvwxz6x0plkg915l24mjf89h8rgkgclkn6xk4rf'';
+    url = ''http://beta.quicklisp.org/archive/stumpwm/2017-05-16/stumpwm-20170516-git.tgz'';
+    sha256 = ''0x3x0w1akarp0rjmig9x6d729z6lv6ywfg00b6xszm5kqfbx1659'';
   };
+    
+  packageName = "stumpwm";
 
   overrides = x: {
     postInstall = ''
@@ -28,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM stumpwm DESCRIPTION A tiling, keyboard driven window manager SHA256 1aca1nvdzp957mvwxz6x0plkg915l24mjf89h8rgkgclkn6xk4rf URL
-    http://beta.quicklisp.org/archive/stumpwm/2017-04-03/stumpwm-20170403-git.tgz MD5 1081021518c5b6c36d39f12c47305ea1 NAME stumpwm TESTNAME NIL FILENAME
-    stumpwm DEPS ((NAME alexandria) (NAME cl-ppcre) (NAME clx)) DEPENDENCIES (alexandria cl-ppcre clx) VERSION 20170403-git SIBLINGS NIL) */
+/* (SYSTEM stumpwm DESCRIPTION A tiling, keyboard driven window manager SHA256 0x3x0w1akarp0rjmig9x6d729z6lv6ywfg00b6xszm5kqfbx1659 URL
+    http://beta.quicklisp.org/archive/stumpwm/2017-05-16/stumpwm-20170516-git.tgz MD5 ed076f733ef138aca3b04b3c3ff748f0 NAME stumpwm TESTNAME NIL FILENAME
+    stumpwm DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix
index 8ae38c45686..45d7a7800d5 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/swap-bytes.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/swap-bytes/2016-09-29/swap-bytes-v1.1.tgz'';
     sha256 = ''0snwbfplqhg1y4y4m7lgvksg1hs0sygfikz3rlbkfl4gwg8pq8ky'';
   };
+    
+  packageName = "swap-bytes";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,4 @@ rec {
 }
 /* (SYSTEM swap-bytes DESCRIPTION Optimized byte-swapping primitives. SHA256 0snwbfplqhg1y4y4m7lgvksg1hs0sygfikz3rlbkfl4gwg8pq8ky URL
     http://beta.quicklisp.org/archive/swap-bytes/2016-09-29/swap-bytes-v1.1.tgz MD5 dda8b3b0a4e345879e80a3cc398667bb NAME swap-bytes TESTNAME NIL FILENAME
-    swap-bytes DEPS ((NAME trivial-features)) DEPENDENCIES (trivial-features) VERSION v1.1 SIBLINGS NIL) */
+    swap-bytes DEPS ((NAME trivial-features FILENAME trivial-features)) DEPENDENCIES (trivial-features) VERSION v1.1 SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix
index e28637849af..0ed2e288760 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-backtrace.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/trivial-backtrace/2016-05-31/trivial-backtrace-20160531-git.tgz'';
     sha256 = ''1vcvalcv2ljiv2gyh8xjcg62cjsripjwmnhc8zji35ja1xyqvxhx'';
   };
+    
+  packageName = "trivial-backtrace";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix
index 7b44cb90337..ea531d722d4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-features.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/trivial-features/2016-12-04/trivial-features-20161204-git.tgz'';
     sha256 = ''0i2zyc9c7jigljxll29sh9gv1fawdsf0kq7s86pwba5zi99q2ij2'';
   };
+    
+  packageName = "trivial-features";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix
index 3c439aae2e4..43bcd571304 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-garbage.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/trivial-garbage/2015-01-13/trivial-garbage-20150113-git.tgz'';
     sha256 = ''1yy1jyx7wz5rr7lr0jyyfxgzfddmrxrmkp46a21pcdc4jlss1h08'';
   };
+    
+  packageName = "trivial-garbage";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix
index 120f384a7a5..22011917022 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-gray-streams.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/trivial-gray-streams/2014-08-26/trivial-gray-streams-20140826-git.tgz'';
     sha256 = ''1nhbp0qizvqvy2mfl3i99hlwiy27h3gq0jglwzsj2fmnwqvpfx92'';
   };
+    
+  packageName = "trivial-gray-streams";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
index d091ad3250f..05631ab2b93 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-indent.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''trivial-indent'';
-  version = ''20160929-git'';
+  version = ''20170516-git'';
 
   description = ''A very simple library to allow indentation hints for SWANK.'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivial-indent/2016-09-29/trivial-indent-20160929-git.tgz'';
-    sha256 = ''0nc7d5xdx4h8jvvqif7f721z8296kl6jk5hqmgr0mj3g7svgfrir'';
+    url = ''http://beta.quicklisp.org/archive/trivial-indent/2017-05-16/trivial-indent-20170516-git.tgz'';
+    sha256 = ''0jvwmsn4z5sd2r1g3yml8mzra8pah5ly8n00p0sqqww61l9w06ma'';
   };
+    
+  packageName = "trivial-indent";
 
   overrides = x: {
     postInstall = ''
@@ -28,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM trivial-indent DESCRIPTION A very simple library to allow indentation hints for SWANK. SHA256 0nc7d5xdx4h8jvvqif7f721z8296kl6jk5hqmgr0mj3g7svgfrir
-    URL http://beta.quicklisp.org/archive/trivial-indent/2016-09-29/trivial-indent-20160929-git.tgz MD5 d93c0fa8e29d7d37170efd58b84ac188 NAME trivial-indent
-    TESTNAME NIL FILENAME trivial-indent DEPS NIL DEPENDENCIES NIL VERSION 20160929-git SIBLINGS NIL) */
+/* (SYSTEM trivial-indent DESCRIPTION A very simple library to allow indentation hints for SWANK. SHA256 0jvwmsn4z5sd2r1g3yml8mzra8pah5ly8n00p0sqqww61l9w06ma
+    URL http://beta.quicklisp.org/archive/trivial-indent/2017-05-16/trivial-indent-20170516-git.tgz MD5 6c8bde35ec010645c8d585c272ae01e8 NAME trivial-indent
+    TESTNAME NIL FILENAME trivial-indent DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix
index e9d090a84aa..f4a84b5ceef 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-mimes.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''trivial-mimes'';
-  version = ''20160929-git'';
+  version = ''20170516-git'';
 
   description = ''Tiny library to detect mime types in files.'';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/trivial-mimes/2016-09-29/trivial-mimes-20160929-git.tgz'';
-    sha256 = ''1sdsplngi3civv9wjd9rxxj3ynqc3260cfykpid5lpy8rhbyiw0w'';
+    url = ''http://beta.quicklisp.org/archive/trivial-mimes/2017-05-16/trivial-mimes-20170516-git.tgz'';
+    sha256 = ''1prv15krlcwwb9jwqvskm588y2yh7r2n6c4c80fh0f2r73ysfnj2'';
   };
+    
+  packageName = "trivial-mimes";
 
   overrides = x: {
     postInstall = ''
@@ -28,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM trivial-mimes DESCRIPTION Tiny library to detect mime types in files. SHA256 1sdsplngi3civv9wjd9rxxj3ynqc3260cfykpid5lpy8rhbyiw0w URL
-    http://beta.quicklisp.org/archive/trivial-mimes/2016-09-29/trivial-mimes-20160929-git.tgz MD5 1075218aae1940bb3413b0edb6b73ac2 NAME trivial-mimes TESTNAME
-    NIL FILENAME trivial-mimes DEPS NIL DEPENDENCIES NIL VERSION 20160929-git SIBLINGS NIL) */
+/* (SYSTEM trivial-mimes DESCRIPTION Tiny library to detect mime types in files. SHA256 1prv15krlcwwb9jwqvskm588y2yh7r2n6c4c80fh0f2r73ysfnj2 URL
+    http://beta.quicklisp.org/archive/trivial-mimes/2017-05-16/trivial-mimes-20170516-git.tgz MD5 b9cbba4147647ded4042949db3c00f1e NAME trivial-mimes TESTNAME
+    NIL FILENAME trivial-mimes DEPS NIL DEPENDENCIES NIL VERSION 20170516-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix
index 064e67fef50..8aed5e9681c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-types.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/trivial-types/2012-04-07/trivial-types-20120407-git.tgz'';
     sha256 = ''0y3lfbbvi2qp2cwswzmk1awzqrsrrcfkcm1qn744bgm1fiqhxbxx'';
   };
+    
+  packageName = "trivial-types";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix
index d7a8721f298..efbdca21465 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/trivial-utf-8.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/trivial-utf-8/2011-10-01/trivial-utf-8-20111001-darcs.tgz'';
     sha256 = ''1lmg185s6w3rzsz3xa41k5w9xw32bi288ifhrxincy8iv92w65wb'';
   };
+    
+  packageName = "trivial-utf-8";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
index f3528d60524..78085ff1762 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uffi.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/uffi/2015-09-23/uffi-20150923-git.tgz'';
     sha256 = ''1b3mb1ac5hqpn941pmgwkiy241rnin308haxbs2f4rwp2la7wzyy'';
   };
+    
+  packageName = "uffi";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
index 3b340be7c1d..579ad469cda 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uiop.nix
@@ -1,16 +1,18 @@
 args @ { fetchurl, ... }:
 rec {
   baseName = ''uiop'';
-  version = ''3.2.0'';
+  version = ''3.2.1'';
 
   description = '''';
 
   deps = [ ];
 
   src = fetchurl {
-    url = ''http://beta.quicklisp.org/archive/uiop/2017-01-24/uiop-3.2.0.tgz'';
-    sha256 = ''1rrn1mdcb4dmb517vrp3nzwpp1w8hfvpzarj36c7kkpjq23czdig'';
+    url = ''http://beta.quicklisp.org/archive/uiop/2017-05-16/uiop-3.2.1.tgz'';
+    sha256 = ''1zl661dkbg5clyl5fjj9466krk59xfdmmfzci5mj7n137m0zmf5v'';
   };
+    
+  packageName = "uiop";
 
   overrides = x: {
     postInstall = ''
@@ -28,6 +30,6 @@ rec {
     '';
   };
 }
-/* (SYSTEM uiop DESCRIPTION NIL SHA256 1rrn1mdcb4dmb517vrp3nzwpp1w8hfvpzarj36c7kkpjq23czdig URL
-    http://beta.quicklisp.org/archive/uiop/2017-01-24/uiop-3.2.0.tgz MD5 3c304efce790959b14a241db2e669fce NAME uiop TESTNAME NIL FILENAME uiop DEPS NIL
-    DEPENDENCIES NIL VERSION 3.2.0 SIBLINGS (asdf-driver)) */
+/* (SYSTEM uiop DESCRIPTION NIL SHA256 1zl661dkbg5clyl5fjj9466krk59xfdmmfzci5mj7n137m0zmf5v URL
+    http://beta.quicklisp.org/archive/uiop/2017-05-16/uiop-3.2.1.tgz MD5 3e9ef02ecf9005240b66552d85719700 NAME uiop TESTNAME NIL FILENAME uiop DEPS NIL
+    DEPENDENCIES NIL VERSION 3.2.1 SIBLINGS (asdf-driver)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
index 5b6a7fafd01..c071b2f3bbd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/usocket.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/usocket/2016-10-31/usocket-0.7.0.1.tgz'';
     sha256 = ''1mpcfawbzd72cd841bb0hmgx4kinnvcnazc7vym83gv5iy6lwif2'';
   };
+    
+  packageName = "usocket";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,4 @@ rec {
 }
 /* (SYSTEM usocket DESCRIPTION Universal socket library for Common Lisp SHA256 1mpcfawbzd72cd841bb0hmgx4kinnvcnazc7vym83gv5iy6lwif2 URL
     http://beta.quicklisp.org/archive/usocket/2016-10-31/usocket-0.7.0.1.tgz MD5 1dcb027187679211f9d277ce99ca2a5a NAME usocket TESTNAME NIL FILENAME usocket
-    DEPS ((NAME split-sequence)) DEPENDENCIES (split-sequence) VERSION 0.7.0.1 SIBLINGS (usocket-server usocket-test)) */
+    DEPS ((NAME split-sequence FILENAME split-sequence)) DEPENDENCIES (split-sequence) VERSION 0.7.0.1 SIBLINGS (usocket-server usocket-test)) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix
new file mode 100644
index 00000000000..1f415f7142a
--- /dev/null
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/uuid.nix
@@ -0,0 +1,35 @@
+args @ { fetchurl, ... }:
+rec {
+  baseName = ''uuid'';
+  version = ''20130813-git'';
+
+  description = ''UUID Generation'';
+
+  deps = [ args."ironclad" args."trivial-utf-8" ];
+
+  src = fetchurl {
+    url = ''http://beta.quicklisp.org/archive/uuid/2013-08-13/uuid-20130813-git.tgz'';
+    sha256 = ''1ph88gizpkxqigfrkgmq0vd3qkgpxd9zjy6qyr0ic4xdyyymg1hf'';
+  };
+    
+  packageName = "uuid";
+
+  overrides = x: {
+    postInstall = ''
+      find "$out/lib/common-lisp/" -name '*.asd' | grep -iv '/uuid[.]asd${"$"}' |
+        while read f; do
+          env -i \
+          NIX_LISP="$NIX_LISP" \
+          NIX_LISP_PRELAUNCH_HOOK="nix_lisp_run_single_form '(progn
+            (asdf:load-system :$(basename "$f" .asd))
+            (asdf:perform (quote asdf:compile-bundle-op) :$(basename "$f" .asd))
+            (ignore-errors (asdf:perform (quote asdf:deliver-asd-op) :$(basename "$f" .asd)))
+            )'" \
+            "$out"/bin/*-lisp-launcher.sh ||
+          mv "$f"{,.sibling}; done || true
+    '';
+  };
+}
+/* (SYSTEM uuid DESCRIPTION UUID Generation SHA256 1ph88gizpkxqigfrkgmq0vd3qkgpxd9zjy6qyr0ic4xdyyymg1hf URL
+    http://beta.quicklisp.org/archive/uuid/2013-08-13/uuid-20130813-git.tgz MD5 e9029d9437573ec2ffa2b474adf95daf NAME uuid TESTNAME NIL FILENAME uuid DEPS
+    ((NAME ironclad FILENAME ironclad) (NAME trivial-utf-8 FILENAME trivial-utf-8)) DEPENDENCIES (ironclad trivial-utf-8) VERSION 20130813-git SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix
index ca9680ebd00..7be98029ca2 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/vom.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/vom/2016-08-25/vom-20160825-git.tgz'';
     sha256 = ''0mvln0xx8qnrsmaj7c0f2ilgahvf078qvhqag7qs3j26xmamjm93'';
   };
+    
+  packageName = "vom";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
index a225b323f36..086a374d6e7 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/woo.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/woo/2017-02-27/woo-20170227-git.tgz'';
     sha256 = ''0myydz817mpkgs97p9y9n4z0kq00xxr2b65klsdkxasvvfyjw0d1'';
   };
+    
+  packageName = "woo";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix
index 3744526b25a..46262fb78f4 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/wookie.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/wookie/2017-02-27/wookie-20170227-git.tgz'';
     sha256 = ''0i1wrgr5grg387ldv1zfswws1g3xvrkxxvp1m58m9hj0c1vmm6v0'';
   };
+    
+  packageName = "wookie";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix
index 11fa1931f0b..4d1d902cf5c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xmls.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/xmls/2015-04-07/xmls-1.7.tgz'';
     sha256 = ''1pch221g5jv02rb21ly9ik4cmbzv8ca6bnyrs4s0yfrrq0ji406b'';
   };
+    
+  packageName = "xmls";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix
index da2611d1f39..c1c699bd362 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/xsubseq.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/xsubseq/2015-01-13/xsubseq-20150113-git.tgz'';
     sha256 = ''0ykjhi7pkqcwm00yzhqvngnx07hsvwbj0c72b08rj4dkngg8is5q'';
   };
+    
+  packageName = "xsubseq";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix
index 32c7198b99f..d581891c7cc 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/yason.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/yason/2016-02-08/yason-v0.7.6.tgz'';
     sha256 = ''00gfn14bvnw0in03y5m2ssgvhy3ppf5a3s0rf7mf4rq00c5ifchk'';
   };
+    
+  packageName = "yason";
 
   overrides = x: {
     postInstall = ''
@@ -30,4 +32,5 @@ rec {
 }
 /* (SYSTEM yason DESCRIPTION JSON parser/encoder SHA256 00gfn14bvnw0in03y5m2ssgvhy3ppf5a3s0rf7mf4rq00c5ifchk URL
     http://beta.quicklisp.org/archive/yason/2016-02-08/yason-v0.7.6.tgz MD5 79de5d242c5e9ce49dfda153d5f442ec NAME yason TESTNAME NIL FILENAME yason DEPS
-    ((NAME alexandria) (NAME trivial-gray-streams)) DEPENDENCIES (alexandria trivial-gray-streams) VERSION v0.7.6 SIBLINGS NIL) */
+    ((NAME alexandria FILENAME alexandria) (NAME trivial-gray-streams FILENAME trivial-gray-streams)) DEPENDENCIES (alexandria trivial-gray-streams) VERSION
+    v0.7.6 SIBLINGS NIL) */
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix
index 06fc8502d6c..0a1a9ee2f81 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-output/zpb-ttf.nix
@@ -11,6 +11,8 @@ rec {
     url = ''http://beta.quicklisp.org/archive/zpb-ttf/2013-07-20/zpb-ttf-1.0.3.tgz'';
     sha256 = ''1irv0d0pcbwi2wx6hhjjyxzw12lnw8pvyg6ljsljh8xmhppbg5j6'';
   };
+    
+  packageName = "zpb-ttf";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
index 2725c354d35..7065555cedd 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-overrides.nix
@@ -16,6 +16,9 @@ in
         export configureFlags="$configureFlags --with-$NIX_LISP=common-lisp.sh";
       '';
     };
+    propagatedBuildInputs = (x.propagatedBuildInputs or []) ++ (with qlnp; [
+      alexandria cl-ppcre clx
+    ]);
   };
   iterate = skipBuildPhase;
   cl-fuse = x: {
@@ -33,13 +36,12 @@ in
   };
   hunchentoot = addNativeLibs [pkgs.openssl];
   iolib = x: {
-    propagatedBuildInputs = (x.propagatedBuildInputs or []) ++
-     [pkgs.libfixposix pkgs.gcc];
-    testSystems = (x.testSystems or ["iolib"]) ++ [
-      "iolib/os" "iolib/zstreams" "iolib/common-lisp" "iolib/base" "iolib/asdf"
-      "iolib/conf" "iolib/grovel" "iolib/syscalls" "iolib/sockets"
-      "iolib/multiplex" "iolib/streams" "iolib/pathnames"
-    ];
+    propagatedBuildInputs = (x.propagatedBuildInputs or [])
+     ++ (with pkgs; [libfixposix gcc])
+     ++ (with qlnp; [
+       alexandria split-sequence cffi bordeaux-threads idna swap-bytes
+     ])
+     ;
   };
   cl-unicode = addDeps (with qlnp; [cl-ppcre flexi-streams]);
   clack =  addDeps (with qlnp;[lack bordeaux-threads prove]);
@@ -110,6 +112,7 @@ in
   cffi = multiOverride [(addNativeLibs [pkgs.libffi])
     (addDeps (with qlnp; [uffi uiop trivial-features]))];
   cl-vectors = addDeps (with qlnp; [zpb-ttf]);
+  cl-paths-ttf = addDeps (with qlnp; [zpb-ttf]);
   "3bmd" = addDeps (with qlnp; [esrap split-sequence]);
   cl-dbi = addDeps (with qlnp; [
     cl-syntax cl-syntax-annot split-sequence closer-mop bordeaux-threads
@@ -124,13 +127,17 @@ in
         ln -s lib-dependent/*.asd .
       '';
     };
+    propagatedBuildInputs = (x.propagatedBuildInputs or []) ++ (with qlnp; [
+      cl-ppcre
+    ]);
   };
   cl-unification = addDeps (with qlnp; [cl-ppcre]);
   cl-syntax-annot = addDeps (with qlnp; [cl-syntax]);
   cl-syntax-anonfun = addDeps (with qlnp; [cl-syntax]);
   cl-syntax-markup = addDeps (with qlnp; [cl-syntax]);
   cl-test-more = addDeps (with qlnp; [prove]);
-  babel-streams = addDeps (with qlnp; [babel]);
+  babel-streams = addDeps (with qlnp; [babel trivial-gray-streams]);
+  babel = addDeps (with qlnp; [trivial-features alexandria]);
   plump = addDeps (with qlnp; [array-utils trivial-indent]);
   sqlite = addNativeLibs [pkgs.sqlite];
   uiop = x: {
@@ -143,4 +150,33 @@ in
       '';
     };
   };
+  cl-containers = x: {
+    overrides = y: (x.overrides y) // {
+      postConfigure = "rm GNUmakefile";
+    };
+  };
+  esrap = addDeps (with qlnp; [alexandria]);
+  fast-io = addDeps (with qlnp; [
+    alexandria trivial-gray-streams static-vectors
+  ]);
+  hu_dot_dwim_dot_def = addDeps (with qlnp; [
+    hu_dot_dwim_dot_asdf alexandria anaphora iterate metabang-bind
+  ]);
+  ironclad = addDeps (with qlnp; [nibbles flexi-streams]);
+  ixf = addDeps (with qlnp; [
+    split-sequence md5 alexandria babel local-time cl-ppcre ieee-floats
+  ]);
+  jonathan = addDeps (with qlnp; [
+    cl-syntax cl-syntax-annot fast-io proc-parse cl-ppcre
+  ]);
+  local-time = addDeps (with qlnp; [cl-fad]);
+  lquery = addDeps (with qlnp; [array-utils form-fiddle plump clss]);
+  clss = addDeps (with qlnp; [array-utils plump]);
+  form-fiddle = addDeps (with qlnp; [documentation-utils]);
+  documentation-utils = addDeps (with qlnp; [trivial-indent]);
+  mssql = x: {
+    testSystems = [];
+  };
+  cl-postgres = addDeps (with qlnp; [cl-ppcre md5]);
+  postmodern = addDeps (with qlnp; [md5]);
 }
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
index 3d15319ad06..74946f07f07 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix-systems.txt
@@ -1,5 +1,6 @@
 3bmd
 alexandria
+array-utils
 babel
 blackbird
 bordeaux-threads
@@ -31,6 +32,7 @@ cl-ppcre-unicode
 cl-reexport
 cl-smtp
 clsql
+clss
 cl+ssl
 cl-syntax-annot
 cl-syntax-anonfun
@@ -50,15 +52,20 @@ dbd-mysql
 dbd-postgres
 dbd-sqlite3
 dexador
+documentation-utils
 drakma
 esrap
 external-program
 fast-http
 fast-io
 flexi-streams
+form-fiddle
 http-body
+hu.dwim.asdf
 hu.dwim.def
 hunchentoot
+idna
+ieee-floats
 iolib
 ironclad
 iterate
@@ -67,9 +74,11 @@ lev
 local-time
 lquery
 marshal
+nibbles
 optima
 parenscript
 pcall
+pgloader
 plump
 proc-parse
 prove
@@ -80,7 +89,9 @@ smart-buffer
 split-sequence
 static-vectors
 stumpwm
+swap-bytes
 trivial-backtrace
+trivial-indent
 trivial-mimes
 trivial-types
 trivial-utf-8
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix.nix b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
index 118045015e2..c87b827112c 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix.nix
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix.nix
@@ -6,10 +6,10 @@ let quicklisp-to-nix-packages = rec {
   buildLispPackage = callPackage ./define-package.nix;
   qlOverrides = callPackage ./quicklisp-to-nix-overrides.nix {};
 
-  "trivial-indent" = buildLispPackage
+  "asdf-system-connections" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."trivial-indent" or (x: {}))
-       (import ./quicklisp-to-nix-output/trivial-indent.nix {
+       (qlOverrides."asdf-system-connections" or (x: {}))
+       (import ./quicklisp-to-nix-output/asdf-system-connections.nix {
          inherit fetchurl;
        }));
 
@@ -24,12 +24,63 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "documentation-utils" = buildLispPackage
+  "list-of" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."documentation-utils" or (x: {}))
-       (import ./quicklisp-to-nix-output/documentation-utils.nix {
+       (qlOverrides."list-of" or (x: {}))
+       (import ./quicklisp-to-nix-output/list-of.nix {
          inherit fetchurl;
-           "trivial-indent" = quicklisp-to-nix-packages."trivial-indent";
+       }));
+
+
+  "parse-number" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."parse-number" or (x: {}))
+       (import ./quicklisp-to-nix-output/parse-number.nix {
+         inherit fetchurl;
+       }));
+
+
+  "garbage-pools" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."garbage-pools" or (x: {}))
+       (import ./quicklisp-to-nix-output/garbage-pools.nix {
+         inherit fetchurl;
+       }));
+
+
+  "cl-containers" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-containers" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-containers.nix {
+         inherit fetchurl;
+           "metatilities-base" = quicklisp-to-nix-packages."metatilities-base";
+           "asdf-system-connections" = quicklisp-to-nix-packages."asdf-system-connections";
+       }));
+
+
+  "dynamic-classes" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."dynamic-classes" or (x: {}))
+       (import ./quicklisp-to-nix-output/dynamic-classes.nix {
+         inherit fetchurl;
+           "metatilities-base" = quicklisp-to-nix-packages."metatilities-base";
+       }));
+
+
+  "metatilities-base" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."metatilities-base" or (x: {}))
+       (import ./quicklisp-to-nix-output/metatilities-base.nix {
+         inherit fetchurl;
+       }));
+
+
+  "cl-interpol" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-interpol" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-interpol.nix {
+         inherit fetchurl;
+           "cl-unicode" = quicklisp-to-nix-packages."cl-unicode";
        }));
 
 
@@ -49,8 +100,6 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."babel-streams" or (x: {}))
        (import ./quicklisp-to-nix-output/babel-streams.nix {
          inherit fetchurl;
-           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
        }));
 
 
@@ -72,6 +121,141 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "uuid" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."uuid" or (x: {}))
+       (import ./quicklisp-to-nix-output/uuid.nix {
+         inherit fetchurl;
+           "ironclad" = quicklisp-to-nix-packages."ironclad";
+           "trivial-utf-8" = quicklisp-to-nix-packages."trivial-utf-8";
+       }));
+
+
+  "simple-date" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."simple-date" or (x: {}))
+       (import ./quicklisp-to-nix-output/simple-date.nix {
+         inherit fetchurl;
+       }));
+
+
+  "qmynd" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."qmynd" or (x: {}))
+       (import ./quicklisp-to-nix-output/qmynd.nix {
+         inherit fetchurl;
+           "usocket" = quicklisp-to-nix-packages."usocket";
+           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
+           "salza2" = quicklisp-to-nix-packages."salza2";
+           "list-of" = quicklisp-to-nix-packages."list-of";
+           "ironclad" = quicklisp-to-nix-packages."ironclad";
+           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+           "cl+ssl" = quicklisp-to-nix-packages."cl+ssl";
+           "chipz" = quicklisp-to-nix-packages."chipz";
+           "babel" = quicklisp-to-nix-packages."babel";
+       }));
+
+
+  "py-configparser" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."py-configparser" or (x: {}))
+       (import ./quicklisp-to-nix-output/py-configparser.nix {
+         inherit fetchurl;
+           "parse-number" = quicklisp-to-nix-packages."parse-number";
+       }));
+
+
+  "postmodern" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."postmodern" or (x: {}))
+       (import ./quicklisp-to-nix-output/postmodern.nix {
+         inherit fetchurl;
+           "closer-mop" = quicklisp-to-nix-packages."closer-mop";
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+       }));
+
+
+  "mssql" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."mssql" or (x: {}))
+       (import ./quicklisp-to-nix-output/mssql.nix {
+         inherit fetchurl;
+           "cffi" = quicklisp-to-nix-packages."cffi";
+           "garbage-pools" = quicklisp-to-nix-packages."garbage-pools";
+           "iterate" = quicklisp-to-nix-packages."iterate";
+           "parse-number" = quicklisp-to-nix-packages."parse-number";
+       }));
+
+
+  "lparallel" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."lparallel" or (x: {}))
+       (import ./quicklisp-to-nix-output/lparallel.nix {
+         inherit fetchurl;
+           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+       }));
+
+
+  "ixf" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."ixf" or (x: {}))
+       (import ./quicklisp-to-nix-output/ixf.nix {
+         inherit fetchurl;
+       }));
+
+
+  "db3" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."db3" or (x: {}))
+       (import ./quicklisp-to-nix-output/db3.nix {
+         inherit fetchurl;
+       }));
+
+
+  "cl-markdown" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-markdown" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-markdown.nix {
+         inherit fetchurl;
+           "metatilities-base" = quicklisp-to-nix-packages."metatilities-base";
+           "metabang-bind" = quicklisp-to-nix-packages."metabang-bind";
+           "dynamic-classes" = quicklisp-to-nix-packages."dynamic-classes";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "cl-containers" = quicklisp-to-nix-packages."cl-containers";
+           "anaphora" = quicklisp-to-nix-packages."anaphora";
+       }));
+
+
+  "cl-log" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-log" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-log.nix {
+         inherit fetchurl;
+       }));
+
+
+  "cl-csv" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."cl-csv" or (x: {}))
+       (import ./quicklisp-to-nix-output/cl-csv.nix {
+         inherit fetchurl;
+           "iterate" = quicklisp-to-nix-packages."iterate";
+           "cl-interpol" = quicklisp-to-nix-packages."cl-interpol";
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+       }));
+
+
+  "abnf" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."abnf" or (x: {}))
+       (import ./quicklisp-to-nix-output/abnf.nix {
+         inherit fetchurl;
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "esrap" = quicklisp-to-nix-packages."esrap";
+       }));
+
+
   "named-readtables" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."named-readtables" or (x: {}))
@@ -80,59 +264,6 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "array-utils" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."array-utils" or (x: {}))
-       (import ./quicklisp-to-nix-output/array-utils.nix {
-         inherit fetchurl;
-       }));
-
-
-  "clss" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."clss" or (x: {}))
-       (import ./quicklisp-to-nix-output/clss.nix {
-         inherit fetchurl;
-           "array-utils" = quicklisp-to-nix-packages."array-utils";
-           "plump" = quicklisp-to-nix-packages."plump";
-       }));
-
-
-  "form-fiddle" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."form-fiddle" or (x: {}))
-       (import ./quicklisp-to-nix-output/form-fiddle.nix {
-         inherit fetchurl;
-           "documentation-utils" = quicklisp-to-nix-packages."documentation-utils";
-       }));
-
-
-  "nibbles" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."nibbles" or (x: {}))
-       (import ./quicklisp-to-nix-output/nibbles.nix {
-         inherit fetchurl;
-       }));
-
-
-  "swap-bytes" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."swap-bytes" or (x: {}))
-       (import ./quicklisp-to-nix-output/swap-bytes.nix {
-         inherit fetchurl;
-           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
-       }));
-
-
-  "idna" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."idna" or (x: {}))
-       (import ./quicklisp-to-nix-output/idna.nix {
-         inherit fetchurl;
-           "split-sequence" = quicklisp-to-nix-packages."split-sequence";
-       }));
-
-
   "rfc2388" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."rfc2388" or (x: {}))
@@ -149,35 +280,10 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "hu.dwim.asdf" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."hu.dwim.asdf" or (x: {}))
-       (import ./quicklisp-to-nix-output/hu.dwim.asdf.nix {
-         inherit fetchurl;
-           "uiop" = quicklisp-to-nix-packages."uiop";
-       }));
-
-
   "jonathan" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."jonathan" or (x: {}))
        (import ./quicklisp-to-nix-output/jonathan.nix {
-         inherit fetchurl;
-           "trivial-types" = quicklisp-to-nix-packages."trivial-types";
-           "proc-parse" = quicklisp-to-nix-packages."proc-parse";
-           "fast-io" = quicklisp-to-nix-packages."fast-io";
-           "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot";
-           "cl-syntax" = quicklisp-to-nix-packages."cl-syntax";
-           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
-           "cl-annot" = quicklisp-to-nix-packages."cl-annot";
-           "babel" = quicklisp-to-nix-packages."babel";
-       }));
-
-
-  "puri" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."puri" or (x: {}))
-       (import ./quicklisp-to-nix-output/puri.nix {
          inherit fetchurl;
        }));
 
@@ -191,6 +297,14 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "puri" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."puri" or (x: {}))
+       (import ./quicklisp-to-nix-output/puri.nix {
+         inherit fetchurl;
+       }));
+
+
   "sqlite" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."sqlite" or (x: {}))
@@ -260,7 +374,6 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."cl-paths-ttf" or (x: {}))
        (import ./quicklisp-to-nix-output/cl-paths-ttf.nix {
          inherit fetchurl;
-           "zpb-ttf" = quicklisp-to-nix-packages."zpb-ttf";
        }));
 
 
@@ -372,24 +485,6 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "lack-middleware-backtrace" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."lack-middleware-backtrace" or (x: {}))
-       (import ./quicklisp-to-nix-output/lack-middleware-backtrace.nix {
-         inherit fetchurl;
-           "uiop" = quicklisp-to-nix-packages."uiop";
-       }));
-
-
-  "lack-util" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."lack-util" or (x: {}))
-       (import ./quicklisp-to-nix-output/lack-util.nix {
-         inherit fetchurl;
-           "ironclad" = quicklisp-to-nix-packages."ironclad";
-       }));
-
-
   "trivial-gray-streams" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."trivial-gray-streams" or (x: {}))
@@ -398,6 +493,14 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "trivial-features" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."trivial-features" or (x: {}))
+       (import ./quicklisp-to-nix-output/trivial-features.nix {
+         inherit fetchurl;
+       }));
+
+
   "uiop" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."uiop" or (x: {}))
@@ -468,14 +571,6 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "trivial-features" = buildLispPackage
-    ((f: x: (x // (f x)))
-       (qlOverrides."trivial-features" or (x: {}))
-       (import ./quicklisp-to-nix-output/trivial-features.nix {
-         inherit fetchurl;
-       }));
-
-
   "yason" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."yason" or (x: {}))
@@ -551,6 +646,14 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "trivial-indent" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."trivial-indent" or (x: {}))
+       (import ./quicklisp-to-nix-output/trivial-indent.nix {
+         inherit fetchurl;
+       }));
+
+
   "trivial-backtrace" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."trivial-backtrace" or (x: {}))
@@ -559,14 +662,20 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "swap-bytes" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."swap-bytes" or (x: {}))
+       (import ./quicklisp-to-nix-output/swap-bytes.nix {
+         inherit fetchurl;
+           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
+       }));
+
+
   "stumpwm" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."stumpwm" or (x: {}))
        (import ./quicklisp-to-nix-output/stumpwm.nix {
          inherit fetchurl;
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
-           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
-           "clx" = quicklisp-to-nix-packages."clx";
        }));
 
 
@@ -666,6 +775,44 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "pgloader" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."pgloader" or (x: {}))
+       (import ./quicklisp-to-nix-output/pgloader.nix {
+         inherit fetchurl;
+           "abnf" = quicklisp-to-nix-packages."abnf";
+           "alexandria" = quicklisp-to-nix-packages."alexandria";
+           "cl-base64" = quicklisp-to-nix-packages."cl-base64";
+           "cl-csv" = quicklisp-to-nix-packages."cl-csv";
+           "cl-fad" = quicklisp-to-nix-packages."cl-fad";
+           "cl-log" = quicklisp-to-nix-packages."cl-log";
+           "cl-markdown" = quicklisp-to-nix-packages."cl-markdown";
+           "cl-postgres" = quicklisp-to-nix-packages."cl-postgres";
+           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
+           "command-line-arguments" = quicklisp-to-nix-packages."command-line-arguments";
+           "db3" = quicklisp-to-nix-packages."db3";
+           "drakma" = quicklisp-to-nix-packages."drakma";
+           "esrap" = quicklisp-to-nix-packages."esrap";
+           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
+           "ixf" = quicklisp-to-nix-packages."ixf";
+           "local-time" = quicklisp-to-nix-packages."local-time";
+           "lparallel" = quicklisp-to-nix-packages."lparallel";
+           "metabang-bind" = quicklisp-to-nix-packages."metabang-bind";
+           "mssql" = quicklisp-to-nix-packages."mssql";
+           "postmodern" = quicklisp-to-nix-packages."postmodern";
+           "py-configparser" = quicklisp-to-nix-packages."py-configparser";
+           "qmynd" = quicklisp-to-nix-packages."qmynd";
+           "quri" = quicklisp-to-nix-packages."quri";
+           "simple-date" = quicklisp-to-nix-packages."simple-date";
+           "split-sequence" = quicklisp-to-nix-packages."split-sequence";
+           "sqlite" = quicklisp-to-nix-packages."sqlite";
+           "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace";
+           "uiop" = quicklisp-to-nix-packages."uiop";
+           "usocket" = quicklisp-to-nix-packages."usocket";
+           "uuid" = quicklisp-to-nix-packages."uuid";
+       }));
+
+
   "pcall" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."pcall" or (x: {}))
@@ -696,6 +843,14 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "nibbles" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."nibbles" or (x: {}))
+       (import ./quicklisp-to-nix-output/nibbles.nix {
+         inherit fetchurl;
+       }));
+
+
   "marshal" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."marshal" or (x: {}))
@@ -709,10 +864,6 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."lquery" or (x: {}))
        (import ./quicklisp-to-nix-output/lquery.nix {
          inherit fetchurl;
-           "plump" = quicklisp-to-nix-packages."plump";
-           "form-fiddle" = quicklisp-to-nix-packages."form-fiddle";
-           "clss" = quicklisp-to-nix-packages."clss";
-           "array-utils" = quicklisp-to-nix-packages."array-utils";
        }));
 
 
@@ -721,7 +872,6 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."local-time" or (x: {}))
        (import ./quicklisp-to-nix-output/local-time.nix {
          inherit fetchurl;
-           "cl-fad" = quicklisp-to-nix-packages."cl-fad";
        }));
 
 
@@ -755,7 +905,6 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."ironclad" or (x: {}))
        (import ./quicklisp-to-nix-output/ironclad.nix {
          inherit fetchurl;
-           "nibbles" = quicklisp-to-nix-packages."nibbles";
        }));
 
 
@@ -764,15 +913,23 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."iolib" or (x: {}))
        (import ./quicklisp-to-nix-output/iolib.nix {
          inherit fetchurl;
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
-           "babel" = quicklisp-to-nix-packages."babel";
-           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
-           "cffi" = quicklisp-to-nix-packages."cffi";
-           "idna" = quicklisp-to-nix-packages."idna";
+       }));
+
+
+  "ieee-floats" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."ieee-floats" or (x: {}))
+       (import ./quicklisp-to-nix-output/ieee-floats.nix {
+         inherit fetchurl;
+       }));
+
+
+  "idna" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."idna" or (x: {}))
+       (import ./quicklisp-to-nix-output/idna.nix {
+         inherit fetchurl;
            "split-sequence" = quicklisp-to-nix-packages."split-sequence";
-           "swap-bytes" = quicklisp-to-nix-packages."swap-bytes";
-           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
-           "uiop" = quicklisp-to-nix-packages."uiop";
        }));
 
 
@@ -795,16 +952,19 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "hu.dwim.def" = buildLispPackage
+  "hu_dot_dwim_dot_def" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."hu.dwim.def" or (x: {}))
-       (import ./quicklisp-to-nix-output/hu.dwim.def.nix {
+       (qlOverrides."hu_dot_dwim_dot_def" or (x: {}))
+       (import ./quicklisp-to-nix-output/hu_dot_dwim_dot_def.nix {
+         inherit fetchurl;
+       }));
+
+
+  "hu_dot_dwim_dot_asdf" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."hu_dot_dwim_dot_asdf" or (x: {}))
+       (import ./quicklisp-to-nix-output/hu_dot_dwim_dot_asdf.nix {
          inherit fetchurl;
-           "metabang-bind" = quicklisp-to-nix-packages."metabang-bind";
-           "iterate" = quicklisp-to-nix-packages."iterate";
-           "hu.dwim.asdf" = quicklisp-to-nix-packages."hu.dwim.asdf";
-           "anaphora" = quicklisp-to-nix-packages."anaphora";
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
        }));
 
 
@@ -824,6 +984,14 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "form-fiddle" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."form-fiddle" or (x: {}))
+       (import ./quicklisp-to-nix-output/form-fiddle.nix {
+         inherit fetchurl;
+       }));
+
+
   "flexi-streams" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."flexi-streams" or (x: {}))
@@ -838,9 +1006,6 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."fast-io" or (x: {}))
        (import ./quicklisp-to-nix-output/fast-io.nix {
          inherit fetchurl;
-           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
-           "static-vectors" = quicklisp-to-nix-packages."static-vectors";
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
        }));
 
 
@@ -866,7 +1031,6 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."esrap" or (x: {}))
        (import ./quicklisp-to-nix-output/esrap.nix {
          inherit fetchurl;
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
        }));
 
 
@@ -886,27 +1050,19 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "documentation-utils" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."documentation-utils" or (x: {}))
+       (import ./quicklisp-to-nix-output/documentation-utils.nix {
+         inherit fetchurl;
+       }));
+
+
   "dexador" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."dexador" or (x: {}))
        (import ./quicklisp-to-nix-output/dexador.nix {
          inherit fetchurl;
-           "usocket" = quicklisp-to-nix-packages."usocket";
-           "trivial-mimes" = quicklisp-to-nix-packages."trivial-mimes";
-           "trivial-gray-streams" = quicklisp-to-nix-packages."trivial-gray-streams";
-           "quri" = quicklisp-to-nix-packages."quri";
-           "fast-io" = quicklisp-to-nix-packages."fast-io";
-           "fast-http" = quicklisp-to-nix-packages."fast-http";
-           "cl-reexport" = quicklisp-to-nix-packages."cl-reexport";
-           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
-           "cl-cookie" = quicklisp-to-nix-packages."cl-cookie";
-           "cl-base64" = quicklisp-to-nix-packages."cl-base64";
-           "cl+ssl" = quicklisp-to-nix-packages."cl+ssl";
-           "chunga" = quicklisp-to-nix-packages."chunga";
-           "chipz" = quicklisp-to-nix-packages."chipz";
-           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
-           "babel" = quicklisp-to-nix-packages."babel";
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
        }));
 
 
@@ -1085,6 +1241,14 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
+  "clss" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."clss" or (x: {}))
+       (import ./quicklisp-to-nix-output/clss.nix {
+         inherit fetchurl;
+       }));
+
+
   "clsql" = buildLispPackage
     ((f: x: (x // (f x)))
        (qlOverrides."clsql" or (x: {}))
@@ -1130,7 +1294,6 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."cl-ppcre-template" or (x: {}))
        (import ./quicklisp-to-nix-output/cl-ppcre-template.nix {
          inherit fetchurl;
-           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
        }));
 
 
@@ -1323,24 +1486,6 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."clack-v1-compat" or (x: {}))
        (import ./quicklisp-to-nix-output/clack-v1-compat.nix {
          inherit fetchurl;
-           "uiop" = quicklisp-to-nix-packages."uiop";
-           "trivial-types" = quicklisp-to-nix-packages."trivial-types";
-           "trivial-mimes" = quicklisp-to-nix-packages."trivial-mimes";
-           "trivial-backtrace" = quicklisp-to-nix-packages."trivial-backtrace";
-           "split-sequence" = quicklisp-to-nix-packages."split-sequence";
-           "quri" = quicklisp-to-nix-packages."quri";
-           "marshal" = quicklisp-to-nix-packages."marshal";
-           "local-time" = quicklisp-to-nix-packages."local-time";
-           "lack-util" = quicklisp-to-nix-packages."lack-util";
-           "lack" = quicklisp-to-nix-packages."lack";
-           "ironclad" = quicklisp-to-nix-packages."ironclad";
-           "http-body" = quicklisp-to-nix-packages."http-body";
-           "flexi-streams" = quicklisp-to-nix-packages."flexi-streams";
-           "cl-syntax-annot" = quicklisp-to-nix-packages."cl-syntax-annot";
-           "cl-ppcre" = quicklisp-to-nix-packages."cl-ppcre";
-           "cl-base64" = quicklisp-to-nix-packages."cl-base64";
-           "circular-streams" = quicklisp-to-nix-packages."circular-streams";
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
        }));
 
 
@@ -1349,12 +1494,6 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."clack" or (x: {}))
        (import ./quicklisp-to-nix-output/clack.nix {
          inherit fetchurl;
-           "uiop" = quicklisp-to-nix-packages."uiop";
-           "lack-util" = quicklisp-to-nix-packages."lack-util";
-           "lack-middleware-backtrace" = quicklisp-to-nix-packages."lack-middleware-backtrace";
-           "lack" = quicklisp-to-nix-packages."lack";
-           "bordeaux-threads" = quicklisp-to-nix-packages."bordeaux-threads";
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
        }));
 
 
@@ -1429,8 +1568,14 @@ let quicklisp-to-nix-packages = rec {
        (qlOverrides."babel" or (x: {}))
        (import ./quicklisp-to-nix-output/babel.nix {
          inherit fetchurl;
-           "trivial-features" = quicklisp-to-nix-packages."trivial-features";
-           "alexandria" = quicklisp-to-nix-packages."alexandria";
+       }));
+
+
+  "array-utils" = buildLispPackage
+    ((f: x: (x // (f x)))
+       (qlOverrides."array-utils" or (x: {}))
+       (import ./quicklisp-to-nix-output/array-utils.nix {
+         inherit fetchurl;
        }));
 
 
@@ -1442,10 +1587,10 @@ let quicklisp-to-nix-packages = rec {
        }));
 
 
-  "3bmd" = buildLispPackage
+  "_3bmd" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."3bmd" or (x: {}))
-       (import ./quicklisp-to-nix-output/3bmd.nix {
+       (qlOverrides."_3bmd" or (x: {}))
+       (import ./quicklisp-to-nix-output/_3bmd.nix {
          inherit fetchurl;
            "split-sequence" = quicklisp-to-nix-packages."split-sequence";
            "esrap" = quicklisp-to-nix-packages."esrap";
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/invocation.emb b/pkgs/development/lisp-modules/quicklisp-to-nix/invocation.emb
index a13cedf3dfe..3a0c5cb5fc2 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix/invocation.emb
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix/invocation.emb
@@ -1,8 +1,7 @@
-  "<% @var name %>" = buildLispPackage
+  "<% @var filename %>" = buildLispPackage
     ((f: x: (x // (f x)))
-       (qlOverrides."<% @var name %>" or (x: {}))
+       (qlOverrides."<% @var filename %>" or (x: {}))
        (import ./quicklisp-to-nix-output/<% @var filename %>.nix {
          inherit fetchurl;<% @loop deps %>
-           "<% @var name %>" = quicklisp-to-nix-packages."<% @var name %>";<% @endloop %>
-       }));<% @ifequal name filename %><% @else %>
-  "<% @var filename %>" = quicklisp-to-nix-packages."<% @var name %>";<% @endif %>
+           "<% @var filename %>" = quicklisp-to-nix-packages."<% @var filename %>";<% @endloop %>
+       }));
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/nix-package.emb b/pkgs/development/lisp-modules/quicklisp-to-nix/nix-package.emb
index 3b71ade03f7..baedbd1553a 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix/nix-package.emb
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix/nix-package.emb
@@ -7,12 +7,14 @@ rec {
 
   description = ''<% @var description %>'';
 
-  deps = [ <% @loop deps %>args."<% @var name %>" <% @endloop %>];
+  deps = [ <% @loop deps %>args."<% @var filename %>" <% @endloop %>];
 
   src = fetchurl {
     url = ''<% @var url %>'';
     sha256 = ''<% @var sha256 %>'';
   };
+    
+  packageName = "<% @var name %>";
 
   overrides = x: {
     postInstall = ''
diff --git a/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp b/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp
index 18cf6d097a2..141fb0f34eb 100644
--- a/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp
+++ b/pkgs/development/lisp-modules/quicklisp-to-nix/ql-to-nix.lisp
@@ -36,19 +36,27 @@
                        (map 'list 'identity (md5:md5sum-file path))))))))
 
 (defun escape-filename (s)
-  (format nil "~{~a~}"
-       (loop
-         for x in (map 'list 'identity s)
-         collect
-         (case x
-           (#\/ "_slash_")
-           (#\\ "_backslash_")
-           (#\_ "__")
-           (t x)))))
+  (format 
+    nil "~a~{~a~}"
+    (if (cl-ppcre:scan "^[a-zA-Z_]" s) "" "_")
+    (loop
+      for x in (map 'list 'identity s)
+      collect
+      (case x
+        (#\/ "_slash_")
+        (#\\ "_backslash_")
+        (#\_ "__")
+        (#\. "_dot_")
+        (t x)))))
 
 (defun system-data (system)
   (let*
-    ((asdf-system (asdf:find-system system))
+    ((asdf-system
+       (or
+         (ignore-errors (asdf:find-system system))
+         (progn
+           (ql:quickload system)
+           (asdf:find-system system))))
      (ql-system (ql-dist:find-system system))
      (ql-release (ql-dist:release ql-system))
      (ql-sibling-systems (ql-dist:provided-systems ql-release))
@@ -73,7 +81,8 @@
            :test 'equal)
          ql-sibling-names
          :test 'equal))
-     (deps (mapcar (lambda (x) (list :name x)) dependencies))
+     (deps (mapcar (lambda (x) (list :name x :filename (escape-filename x)))
+                   dependencies))
      (description (asdf:system-description asdf-system))
      (release-name (ql-dist:short-description ql-release))
      (version (cl-ppcre:regex-replace-all

From 7469eb9fed930d57a1ff8bb8c0666985d9ed0c46 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 21 Jun 2017 23:25:35 +0200
Subject: [PATCH 187/189] stress: enable on darwin

---
 pkgs/tools/system/stress/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/system/stress/default.nix b/pkgs/tools/system/stress/default.nix
index 52cfd4dde74..5a4734328ff 100644
--- a/pkgs/tools/system/stress/default.nix
+++ b/pkgs/tools/system/stress/default.nix
@@ -11,6 +11,6 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Simple workload generator for POSIX systems. It imposes a configurable amount of CPU, memory, I/O, and disk stress on the system";
     license = licenses.gpl2;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }

From febe37a24a72574245dc907bc191221a957215e2 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 21 Jun 2017 22:15:24 +0200
Subject: [PATCH 188/189] webkitgtk: 2.16.3 -> 2.16.4 for multiple CVEs

Fixes:

  * CVE-2017-2538
  * CVE-2017-2424

See https://webkitgtk.org/security/WSA-2017-0005.html
---
 pkgs/development/libraries/webkitgtk/2.16.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/webkitgtk/2.16.nix b/pkgs/development/libraries/webkitgtk/2.16.nix
index 4431972b5dd..b50d94b90a5 100644
--- a/pkgs/development/libraries/webkitgtk/2.16.nix
+++ b/pkgs/development/libraries/webkitgtk/2.16.nix
@@ -12,7 +12,7 @@ assert enableGeoLocation -> geoclue2 != null;
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "webkitgtk-${version}";
-  version = "2.16.3";
+  version = "2.16.4";
 
   meta = {
     description = "Web content rendering engine, GTK+ port";
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://webkitgtk.org/releases/${name}.tar.xz";
-    sha256 = "04mmfxm8284zrlkrhkcn9gq1l4lpm1q6wwb5hyybj081v8qr2ki0";
+    sha256 = "0a2ikwiw1wn8w11y9ci6nn6dq9w0iki48l9lhnbm7g8rhcrs9azr";
   };
 
   # see if we can clean this up....

From dd3f2e648a6ee5dc7ba88bf2e3d13b6b47686350 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 21 Jun 2017 23:46:12 +0200
Subject: [PATCH 189/189] linux_hardened_copperhead: init at 4.11.6.c

---
 .../kernel/linux-hardened-copperhead.nix      | 27 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               | 12 +++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix

diff --git a/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
new file mode 100644
index 00000000000..ae47a3842f7
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/linux-hardened-copperhead.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, perl, buildLinux, ... } @ args:
+
+let
+  version = "4.11.6";
+  revision = "c";
+  sha256 = "1n1j1y5g5fcvgpqjfq14fbg4cm32k420kbazipqbi84h9zwifa69";
+in
+
+import ./generic.nix (args // {
+  version = "${version}-${revision}";
+  extraMeta.branch = "4.11";
+  modDirVersion = version;
+
+  src = fetchFromGitHub {
+    inherit sha256;
+    owner = "copperhead";
+    repo = "linux-hardened";
+    rev = "${version}.${revision}";
+  };
+
+  kernelPatches = args.kernelPatches;
+
+  features.iwlwifi = true;
+  features.efiBootStub = true;
+  features.needsCifsUtils = true;
+  features.netfilterRPFilter = true;
+} // (args.argsOverride or {}))
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f2fc65da558..2973e2d9b0f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11841,6 +11841,17 @@ with pkgs;
 
   klibcShrunk = lowPrio (callPackage ../os-specific/linux/klibc/shrunk.nix { });
 
+  linux_hardened_copperhead = callPackage ../os-specific/linux/kernel/linux-hardened-copperhead.nix {
+    kernelPatches = with kernelPatches; [
+      kernelPatches.bridge_stp_helper
+      kernelPatches.p9_fixes
+    ];
+    extraConfig = import ../os-specific/linux/kernel/hardened-config.nix {
+      inherit stdenv;
+      inherit (linux) version;
+    };
+  };
+
   linux_mptcp = callPackage ../os-specific/linux/kernel/linux-mptcp.nix {
     kernelPatches =
       [ kernelPatches.bridge_stp_helper
@@ -12092,6 +12103,7 @@ with pkgs;
   linux_latest = linuxPackages_latest.kernel;
 
   # Build the kernel modules for the some of the kernels.
+  linuxPackages_hardened_copperhead = linuxPackagesFor pkgs.linux_hardened_copperhead;
   linuxPackages_mptcp = linuxPackagesFor pkgs.linux_mptcp;
   linuxPackages_rpi = linuxPackagesFor pkgs.linux_rpi;
   linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10);