From 924c38214da8d2d190eab1d3736348f0e9c07f27 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Mon, 19 Oct 2015 12:57:24 +0000
Subject: [PATCH 01/73] pkgs.hdf5: Add c++ and fortran variants

---
 pkgs/tools/misc/hdf5/default.nix | 5 +++++
 pkgs/top-level/all-packages.nix  | 9 +++++++++
 2 files changed, 14 insertions(+)

diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix
index bcfca5fddb5d..5981cdc3a5c3 100644
--- a/pkgs/tools/misc/hdf5/default.nix
+++ b/pkgs/tools/misc/hdf5/default.nix
@@ -1,6 +1,8 @@
 
 { stdenv
 , fetchurl
+, cpp ? false
+, gfortran ? null
 , zlib ? null
 , szip ? null
 , mpi ? null
@@ -20,6 +22,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = []
+    ++ stdenv.lib.optional (gfortran != null) gfortran
     ++ stdenv.lib.optional (zlib != null) zlib
     ++ stdenv.lib.optional (szip != null) szip;
 
@@ -27,6 +30,8 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional (mpi != null) mpi;
 
   configureFlags = "
+    ${if cpp then "--enable-cxx" else ""}
+    ${if gfortran != null then "--enable-fortran" else ""}
     ${if szip != null then "--with-szlib=${szip}" else ""}
     ${if mpi != null then "--enable-parallel" else ""}
     ${if enableShared then "--enable-shared" else ""}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 634ec4fdbd16..3916505c7f88 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1814,6 +1814,7 @@ let
   hddtemp = callPackage ../tools/misc/hddtemp { };
 
   hdf5 = callPackage ../tools/misc/hdf5 {
+    gfortran = null;
     szip = null;
     mpi = null;
   };
@@ -1823,6 +1824,14 @@ let
     mpi = pkgs.openmpi;
   };
 
+  hdf5-cpp = hdf5.override {
+    cpp = true;
+  };
+
+  hdf5-fortran = hdf5.override {
+    inherit gfortran;
+  };
+
   heimdall = callPackage ../tools/misc/heimdall { };
 
   hevea = callPackage ../tools/typesetting/hevea { };

From 27eeb48cd86369594868e97cda7ad3c25fd6dd9a Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Mon, 19 Oct 2015 13:07:53 +0000
Subject: [PATCH 02/73] pkgs.hdf5: 1.8.14 -> 1.8.15-patch1

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

diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix
index 5981cdc3a5c3..f8e316d93776 100644
--- a/pkgs/tools/misc/hdf5/default.nix
+++ b/pkgs/tools/misc/hdf5/default.nix
@@ -9,11 +9,11 @@
 , enableShared ? true
 }:
 stdenv.mkDerivation rec {
-  version = "1.8.14";
+  version = "1.8.15-patch1";
   name = "hdf5-${version}";
   src = fetchurl {
     url = "http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-${version}/src/hdf5-${version}.tar.gz";
-    sha256 = "0f86gv32pjrrphvamgims1dd7f3bp46hjarbcdy8k4gmyzpgxghx";
+    sha256 = "19k39da6zzxyr0fnffn4iqlls9v1fsih877rznq8ypqy8mzf5dci";
  };
 
   passthru = {

From 9c3c4d8b2dc5ba3aa998ba5b03d00b83324cd1ed Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Mon, 19 Oct 2015 13:36:57 +0000
Subject: [PATCH 03/73] pkgs.hdf5-*: use appendToName for specialized
 derivations

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3916505c7f88..0ce306769636 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1819,18 +1819,18 @@ let
     mpi = null;
   };
 
-  hdf5-mpi = hdf5.override {
+  hdf5-mpi = appendToName "mpi" (hdf5.override {
     szip = null;
     mpi = pkgs.openmpi;
-  };
+  });
 
-  hdf5-cpp = hdf5.override {
+  hdf5-cpp = appendToName "cpp" (hdf5.override {
     cpp = true;
-  };
+  });
 
-  hdf5-fortran = hdf5.override {
+  hdf5-fortran = appendToName "fortran" (hdf5.override {
     inherit gfortran;
-  };
+  });
 
   heimdall = callPackage ../tools/misc/heimdall { };
 

From 09cdafcb5b27497b14114b343c14474841db050d Mon Sep 17 00:00:00 2001
From: Florent Becker <florent.becker@ens-lyon.org>
Date: Fri, 23 Oct 2015 11:36:19 +0200
Subject: [PATCH 04/73] python-joblib: init at 0.9.0b4

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8d2b85b5ad67..010a1706d1a4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4912,6 +4912,21 @@ let
   };
 
 
+  joblib = buildPythonPackage rec {
+    name = "joblib-${version}";
+    version = "0.9.0b4";
+    src = pkgs.fetchurl {
+      url = https://pypi.python.org/packages/source/j/joblib/joblib-0.9.0b4.tar.gz;
+      md5 = "e0d79a085d4773c7a61cd38b4fb6dad5";
+    };
+
+    buildInputs = with self; with pkgs;  [ ];
+
+    propagatedBuildInputs = with self; [ ];
+
+  };
+
+
   hypatia = buildPythonPackage rec {
     name = "hypatia-0.3";
 

From 130ad71f76a285bcf49a3e114e8d62c627a4f279 Mon Sep 17 00:00:00 2001
From: Florent Becker <florent.becker@ens-lyon.org>
Date: Fri, 23 Oct 2015 11:43:39 +0200
Subject: [PATCH 05/73] python-samplerate: init at 0.3.3

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 010a1706d1a4..617230302c99 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4926,6 +4926,31 @@ let
 
   };
 
+  samplerate = buildPythonPackage rec {
+    name = "scikits.samplerate-${version}";
+    version = "0.3.3";
+    src = pkgs.fetchgit {
+      url = https://github.com/ThomasLecocq/samplerate;
+      rev = "7edb22b23f5aa8e7342aea0b538bdd0434988510";
+      sha256 = "ec2a09819c38028283505090ee9839963d3557e73f6e8eb3348ff8884d0d67ed";
+      };
+    buildInputs = with self;  [ pkgs.libsamplerate ];
+
+    propagatedBuildInputs = with self; [ numpy ];
+
+
+    preConfigure = ''
+       cat > site.cfg << END
+       [samplerate]
+       library_dirs=${pkgs.libsamplerate}/lib
+       include_dirs=${pkgs.libsamplerate}/include
+       END
+    '';
+
+    doCheck = false;
+
+  };
+
 
   hypatia = buildPythonPackage rec {
     name = "hypatia-0.3";

From cb6cf34431945129818c55526de2701f864cde5c Mon Sep 17 00:00:00 2001
From: Florent Becker <florent.becker@ens-lyon.org>
Date: Sat, 24 Oct 2015 16:14:24 +0200
Subject: [PATCH 06/73] python-librosa: init at 0.4.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 617230302c99..a3f60c1c00ad 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4912,6 +4912,24 @@ let
   };
 
 
+
+  librosa = buildPythonPackage rec {
+    name = "librosa-${version}";
+    version = "0.4.0";
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/l/librosa/librosa-0.4.0.tar.gz";
+      md5 = "8149a70a5a5783c3cceeb69de3e07458";
+    };
+
+    buildInputs = with self; with pkgs;
+      [ ];
+
+    propagatedBuildInputs = with self;
+      [ joblib matplotlib six scikitlearn decorator audioread samplerate ];
+
+  };
+
+
   joblib = buildPythonPackage rec {
     name = "joblib-${version}";
     version = "0.9.0b4";

From b03023679923bfd452938d1249644cc1c328419c Mon Sep 17 00:00:00 2001
From: Demin Dmitriy <demindf@gmail.com>
Date: Sun, 1 Nov 2015 06:59:23 +0300
Subject: [PATCH 07/73] libxfce4ui xfce4panel: add gtk3 support

---
 pkgs/desktops/xfce/core/libxfce4ui.nix  | 15 +++++++++------
 pkgs/desktops/xfce/core/xfce4-panel.nix | 16 ++++++++++++----
 pkgs/desktops/xfce/default.nix          |  3 ++-
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/pkgs/desktops/xfce/core/libxfce4ui.nix b/pkgs/desktops/xfce/core/libxfce4ui.nix
index be4ca5d17c09..2cb20febcb94 100644
--- a/pkgs/desktops/xfce/core/libxfce4ui.nix
+++ b/pkgs/desktops/xfce/core/libxfce4ui.nix
@@ -1,5 +1,9 @@
 { stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, xfconf
-, libglade, libstartup_notification }:
+, libglade, libstartup_notification
+, withGtk3 ? false, gtk3
+}:
+
+with { inherit (stdenv.lib) optional; };
 
 stdenv.mkDerivation rec {
   p_name  = "libxfce4ui";
@@ -14,15 +18,14 @@ stdenv.mkDerivation rec {
 
   #TODO: gladeui
   # Install into our own prefix instead.
-  preConfigure =
-    ''
-      configureFlags="--with-libglade-module-path=$out/lib/libglade/2.0"
-    '';
+  configureFlags = [
+    "--with-libglade-module-path=$out/lib/libglade/2.0"
+  ] ++ optional withGtk3 "--enable-gtk3";
 
   buildInputs =
     [ pkgconfig intltool gtk libxfce4util xfconf libglade
       libstartup_notification
-    ];
+    ] ++ optional withGtk3 gtk3;
 
   preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
 
diff --git a/pkgs/desktops/xfce/core/xfce4-panel.nix b/pkgs/desktops/xfce/core/xfce4-panel.nix
index 5a8cc9dc0e52..0f9066876c66 100644
--- a/pkgs/desktops/xfce/core/xfce4-panel.nix
+++ b/pkgs/desktops/xfce/core/xfce4-panel.nix
@@ -1,6 +1,10 @@
 { stdenv, fetchurl, pkgconfig, intltool, gtk, libxfce4util, libxfce4ui
-, libwnck, exo, garcon, xfconf, libstartup_notification
-, makeWrapper, xfce4mixer }:
+, libxfce4ui_gtk3, libwnck, exo, garcon, xfconf, libstartup_notification
+, makeWrapper, xfce4mixer
+, withGtk3 ? false, gtk3
+}:
+
+with { inherit (stdenv.lib) optional; };
 
 stdenv.mkDerivation rec {
   p_name  = "xfce4-panel";
@@ -16,11 +20,15 @@ stdenv.mkDerivation rec {
   patches = [ ./xfce4-panel-datadir.patch ];
   patchFlags = "-p1";
 
+  configureFlags = optional withGtk3 "--enable-gtk3";
+
   buildInputs =
     [ pkgconfig intltool gtk libxfce4util exo libwnck
       garcon xfconf libstartup_notification makeWrapper
-    ] ++ xfce4mixer.gst_plugins;
-  propagatedBuildInputs = [ libxfce4ui ];
+    ] ++ xfce4mixer.gst_plugins
+      ++ optional withGtk3 gtk3;
+
+  propagatedBuildInputs = [ (if withGtk3 then libxfce4ui_gtk3 else libxfce4ui) ];
 
   postInstall = ''
     wrapProgram "$out/bin/xfce4-panel" \
diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index 2f563dbbf5ca..1ff585843e5b 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -22,6 +22,7 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od
   garcon          = callPackage ./core/garcon.nix { };
   gtk_xfce_engine = callPackage ./core/gtk-xfce-engine.nix { }; # ToDo: when should be used?
   libxfce4ui      = callPackage ./core/libxfce4ui.nix { };
+  libxfce4ui_gtk3 = libxfce4ui.override { withGtk3 = true; };
   libxfce4util    = callPackage ./core/libxfce4util.nix { };
   libxfcegui4     = callPackage ./core/libxfcegui4.nix { };
   thunar          = callPackage ./core/thunar.nix { };
@@ -32,6 +33,7 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od
                   = callPackage ./thunar-plugins/dropbox { };
   tumbler         = callPackage ./core/tumbler.nix { };
   xfce4panel      = callPackage ./core/xfce4-panel.nix { }; # ToDo: impure plugins from /run/current-system/sw/lib/xfce4
+  xfce4panel_gtk3 = xfce4panel.override { withGtk3 = true; };
   xfce4session    = callPackage ./core/xfce4-session.nix { };
   xfce4settings   = callPackage ./core/xfce4-settings.nix { };
   xfce4_power_manager = callPackage ./core/xfce4-power-manager.nix { };
@@ -67,7 +69,6 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od
 
   #### PANEL PLUGINS        from "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.{bz2,gz}"
 
-
   xfce4_battery_plugin     = callPackage ./panel-plugins/xfce4-battery-plugin.nix     { };
   xfce4_clipman_plugin     = callPackage ./panel-plugins/xfce4-clipman-plugin.nix     { };
   xfce4_cpufreq_plugin     = callPackage ./panel-plugins/xfce4-cpufreq-plugin.nix     { };

From 1736cedc202bd22d5c9bbf5208c287faa45aed1f Mon Sep 17 00:00:00 2001
From: Demin Dmitriy <demindf@gmail.com>
Date: Sun, 1 Nov 2015 07:01:08 +0300
Subject: [PATCH 08/73] xfce4-pulseaudio-plugin: init at 0.2.3

---
 pkgs/desktops/xfce/default.nix                |  4 +--
 .../panel-plugins/xfce4-pulseaudio-plugin.nix | 36 +++++++++++++++++++
 2 files changed, 37 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin.nix

diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index 1ff585843e5b..45c10e0a44c2 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -79,15 +79,13 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od
   xfce4_eyes_plugin        = callPackage ./panel-plugins/xfce4-eyes-plugin.nix        { };
   xfce4_fsguard_plugin     = callPackage ./panel-plugins/xfce4-fsguard-plugin.nix     { };
   xfce4_genmon_plugin      = callPackage ./panel-plugins/xfce4-genmon-plugin.nix      { };
-
   xfce4_netload_plugin     = callPackage ./panel-plugins/xfce4-netload-plugin.nix     { };
   xfce4_notes_plugin       = callPackage ./panel-plugins/xfce4-notes-plugin.nix       { };
   xfce4_systemload_plugin  = callPackage ./panel-plugins/xfce4-systemload-plugin.nix  { };
   xfce4_verve_plugin       = callPackage ./panel-plugins/xfce4-verve-plugin.nix       { };
   xfce4_xkb_plugin         = callPackage ./panel-plugins/xfce4-xkb-plugin.nix         { };
-
   xfce4_whiskermenu_plugin = callPackage ./panel-plugins/xfce4-whiskermenu-plugin.nix { };
-
+  xfce4_pulseaudio_plugin  = callPackage ./panel-plugins/xfce4-pulseaudio-plugin.nix  { };
 
 }; # xfce_self
 
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin.nix
new file mode 100644
index 000000000000..1b963237c02c
--- /dev/null
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, pkgconfig, intltool, libxfce4util, xfce4panel_gtk3, xfconf
+, gtk3, libpulseaudio
+, withKeybinder ? true, keybinder3
+, withLibnotify ? true, libnotify
+}:
+
+assert withKeybinder -> keybinder3 != null;
+assert withLibnotify -> libnotify != null;
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  p_name  = "xfce4-pulseaudio-plugin";
+  ver_maj = "0.2";
+  ver_min = "3";
+
+  src = fetchurl {
+    url = "mirror://xfce/src/panel-plugins/${p_name}/${ver_maj}/${name}.tar.bz2";
+    sha256 = "e82836bc8cf7d905b4e60d43dc630ba8e32dea785989700c71d4aeee9f583b33";
+  };
+  name = "${p_name}-${ver_maj}.${ver_min}";
+
+  nativeBuildInputs = [ pkgconfig intltool ];
+  buildInputs = [ libxfce4util xfce4panel_gtk3 xfconf gtk3 libpulseaudio ]
+    ++ optional withKeybinder keybinder3
+    ++ optional withLibnotify libnotify;
+
+  preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
+
+  meta = {
+    homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
+    description = "Adjust the audio volume of the PulseAudio sound system";
+    platforms = platforms.linux;
+    maintainers = [ ];
+  };
+}

From 2456dd0246cc762345984c73eab76a480c1e2d9f Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Tue, 3 Nov 2015 15:19:10 +0100
Subject: [PATCH 09/73] hyperdex: blindly fix hashes of local dependencies

This patch blindly fixes the source archive checksums for the local dependencies
of hyperdex. I have not looked into why those hashes changed, but I have
verified that the hyperdex package now builds successfully.
---
 pkgs/servers/nosql/hyperdex/busybee.nix      | 2 +-
 pkgs/servers/nosql/hyperdex/default.nix      | 2 +-
 pkgs/servers/nosql/hyperdex/hyperleveldb.nix | 2 +-
 pkgs/servers/nosql/hyperdex/libe.nix         | 4 ++--
 pkgs/servers/nosql/hyperdex/libmacaroons.nix | 6 +++---
 pkgs/servers/nosql/hyperdex/libpo6.nix       | 2 +-
 pkgs/servers/nosql/hyperdex/replicant.nix    | 6 +++---
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/servers/nosql/hyperdex/busybee.nix b/pkgs/servers/nosql/hyperdex/busybee.nix
index 9fdbbf064b05..653c74bdabe4 100644
--- a/pkgs/servers/nosql/hyperdex/busybee.nix
+++ b/pkgs/servers/nosql/hyperdex/busybee.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/rescrv/busybee/archive/releases/${version}.zip";
-    sha256 = "0gr5h2j9rzwarblgcgddnxj39i282rvgn9vqlrcd60dx8c4dkm29";
+    sha256 = "0b51h1kmkf0s3d9y7wjqgp1pk1rk9i7n8bcgyj01kflzdgafbl0b";
   };
   buildInputs = [
     autoconf
diff --git a/pkgs/servers/nosql/hyperdex/default.nix b/pkgs/servers/nosql/hyperdex/default.nix
index 659081281ef0..3986e49c4bcf 100644
--- a/pkgs/servers/nosql/hyperdex/default.nix
+++ b/pkgs/servers/nosql/hyperdex/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/rescrv/HyperDex/archive/releases/${version}.zip";
-    sha256 = "0s1capy2hj45f5rmdb4fk0wxy7vz69krplhba57f6wrkpcz1zb57";
+    sha256 = "0l7w3x6c4nslz5ijmj8xys0k1slwi3s4crxmi16ml1x32bqgzhj7";
   };
 
   buildInputs = [
diff --git a/pkgs/servers/nosql/hyperdex/hyperleveldb.nix b/pkgs/servers/nosql/hyperdex/hyperleveldb.nix
index c39f618f6cb1..f57bbe4f4d24 100644
--- a/pkgs/servers/nosql/hyperdex/hyperleveldb.nix
+++ b/pkgs/servers/nosql/hyperdex/hyperleveldb.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/rescrv/HyperLevelDB/archive/releases/${version}.zip";
-    sha256 = "0xrzhwkrm7f2wz3jn4iqn1dim2pmgjhmpb1fy23fwa06v0q18hw8";
+    sha256 = "0m5fwl9sc7c6m2zm3zjlxxg7f602gnaryikxgflahhdccdvvr56y";
   };
   buildInputs = [ unzip autoconf automake libtool ];
   preConfigure = "autoreconf -i";
diff --git a/pkgs/servers/nosql/hyperdex/libe.nix b/pkgs/servers/nosql/hyperdex/libe.nix
index cc5232e13f22..f7e0d834bb44 100644
--- a/pkgs/servers/nosql/hyperdex/libe.nix
+++ b/pkgs/servers/nosql/hyperdex/libe.nix
@@ -5,8 +5,8 @@ stdenv.mkDerivation rec {
   version = "0.8.1";
 
   src = fetchurl {
-    url = "https://github.com/rescrv/e/archive/releases/0.8.1.zip";
-    sha256 = "1l13axsi52j2qaxbdnszdvfxksi7rwm2j1rrf0nlh990m6a3yg3s";
+    url = "https://github.com/rescrv/e/archive/releases/${version}.zip";
+    sha256 = "18xm0hcnqdf0ipfn19jrgzqsxij5xjbbnihhzc57n4v7yfdca1w3";
   };
   buildInputs = [ unzip autoconf automake libtool libpo6 pkgconfig ];
   preConfigure = "autoreconf -i";
diff --git a/pkgs/servers/nosql/hyperdex/libmacaroons.nix b/pkgs/servers/nosql/hyperdex/libmacaroons.nix
index 5d91a82a8ec6..719b18db8681 100644
--- a/pkgs/servers/nosql/hyperdex/libmacaroons.nix
+++ b/pkgs/servers/nosql/hyperdex/libmacaroons.nix
@@ -2,11 +2,11 @@
   pkgconfig, libsodium, python }:
 stdenv.mkDerivation rec {
   name = "libmacaroons-${version}";
-  version = "HEAD";
+  version = "0.3.0";
 
   src = fetchurl {
-    url = "https://github.com/rescrv/libmacaroons/archive/6febf3ce6c4c77a46d24b40ed29b03ffbfb175a7.zip";
-    sha256 = "0b4qgim87398chvc3qhxfqv2l1cyl65rhyknln8lk0gq9y00p1ik";
+    url = "https://github.com/rescrv/libmacaroons/archive/releases/${version}.zip";
+    sha256 = "18c44424jri0p5la6jgrnlz5p937hk7ws2mldhzjwisqyf5qld43";
   };
   buildInputs = [ unzip autoconf automake libtool python libsodium pkgconfig ];
   preConfigure = "autoreconf -i";
diff --git a/pkgs/servers/nosql/hyperdex/libpo6.nix b/pkgs/servers/nosql/hyperdex/libpo6.nix
index 166a5e21c6b9..fa68020b539c 100644
--- a/pkgs/servers/nosql/hyperdex/libpo6.nix
+++ b/pkgs/servers/nosql/hyperdex/libpo6.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/rescrv/po6/archive/releases/${version}.zip";
-    sha256 = "14g3ichshnc4wd0iq3q3ymgaq84gjsbqcyn6lri7c7djgkhqijjx";
+    sha256 = "17grzkh6aw1f68qvkhivbb6vwbm6jd41ysbfn88pypf5lczxrxly";
   };
   buildInputs = [ unzip autoconf automake libtool ];
   preConfigure = "autoreconf -i";
diff --git a/pkgs/servers/nosql/hyperdex/replicant.nix b/pkgs/servers/nosql/hyperdex/replicant.nix
index 69146b586723..f2df744e35f1 100644
--- a/pkgs/servers/nosql/hyperdex/replicant.nix
+++ b/pkgs/servers/nosql/hyperdex/replicant.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "replicant-${version}";
-  version = "0.5.2";
+  version = "0.6.3";
 
   src = fetchurl {
-    url = "https://github.com/rescrv/Replicant/archive/releases/0.6.3.zip";
-    sha256 = "1fbagz0nbvinkqr5iw5y187dm4klkswrxnl5ysq8waglg2nj8zzi";
+    url = "https://github.com/rescrv/Replicant/archive/releases/${version}.zip";
+    sha256 = "1q3pdq2ndpj70yd1578bn4grlrp77gl8hv2fz34jpx34qmlalda4";
   };
   buildInputs = [
     autoconf

From 7106bfd0f3497ef7657df72c797fb4bc9e026cb9 Mon Sep 17 00:00:00 2001
From: Allen Nelson <anelson@narrativescience.com>
Date: Tue, 3 Nov 2015 19:23:02 -0600
Subject: [PATCH 10/73] skip broken pandas test when on python 3.5

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f6ad5d2a8974..5b0d91ae9c95 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1261,7 +1261,7 @@ let
   cycler = buildPythonPackage rec {
     name = "cycler-${version}";
     version = "0.9.0";
-    
+
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/C/Cycler/${name}.tar.gz";
       sha256 = "96dc4ddf27ef62c09990c6196ac1167685e89168042ec0ae4db586de023355bc";
@@ -11826,7 +11826,8 @@ let
       bottleneck
       sqlalchemy9
       lxml
-      html5lib
+      # Disabling this because an upstream dependency, pep8, is broken on v3.5.
+      (if isPy35 then null else html5lib)
       modules.sqlite3
       beautifulsoup4
     ] ++ optional isDarwin pkgs.darwin.adv_cmds; # provides the locale command
@@ -11850,12 +11851,19 @@ let
     # The `-e` flag disables a few problematic tests.
     # https://github.com/pydata/pandas/issues/11169
     # https://github.com/pydata/pandas/issues/11287
-    checkPhase = ''
+    # The test_sql checks fail specifically on python 3.5; see here:
+    # https://github.com/pydata/pandas/issues/11112
+    checkPhase = let
+      testsToSkip = ["test_data" "test_excel" "test_html" "test_json"
+                     "test_frequencies" "test_frame"
+                     "test_read_clipboard_infer_excel"] ++
+                    optional isPy35 "test_sql";
+    in ''
       runHook preCheck
       # The flag `-A 'not network'` will disable tests that use internet.
       # The `-e` flag disables a few problematic tests.
       ${python.executable} setup.py nosetests -A 'not network' --stop \
-        -e 'test_data|test_excel|test_html|test_json|test_frequencies|test_frame|test_read_clipboard_infer_excel' --verbosity=3
+        -e '${concatStringsSep "|" testsToSkip}' --verbosity=3
 
       runHook postCheck
     '';

From 2c296db845eef13a687ea8aae8f349592d56e45e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 10 Nov 2015 15:32:22 +0100
Subject: [PATCH 11/73] Drop obsolete "haskell-ng" and "haskellngPackages"
 aliases.

Haskell NG became the default implementation in Nixpkgs over half a year ago in
commit c0c82ea2ebbcf0632260a931cf832cac1c8a014e. This means the "ng" names are
obsolete and should no longer be used. They'll continue to function in the
release-15.09 branch for the sake of backwards compatibility, but the master
branch no longer supports them.
---
 pkgs/top-level/all-packages.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index da80a4ee8cb4..b29244e7a2bb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15448,8 +15448,6 @@ aliases = with self; rec {
   exfat-utils = exfat;                  # 2015-09-11
   firefoxWrapper = firefox-wrapper;
   fuse_exfat = exfat;                   # 2015-09-11
-  haskell-ng = haskell;                 # 2015-04-19
-  haskellngPackages = haskellPackages;  # 2015-04-19
   htmlTidy = html-tidy;  # added 2014-12-06
   inherit (haskell.compiler) jhc uhc;   # 2015-05-15
   inotifyTools = inotify-tools;

From 358e2f7a95b4d354e2afefd51ba3c999e7b93aa6 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 10 Nov 2015 19:14:39 -0600
Subject: [PATCH 12/73] plasma54: 5.4.2 -> 5.4.3

---
 pkgs/desktops/plasma-5.4/fetchsrcs.sh |   2 +-
 pkgs/desktops/plasma-5.4/srcs.nix     | 296 +++++++++++++-------------
 2 files changed, 149 insertions(+), 149 deletions(-)

diff --git a/pkgs/desktops/plasma-5.4/fetchsrcs.sh b/pkgs/desktops/plasma-5.4/fetchsrcs.sh
index a9256c5014eb..db2db8f8e56d 100755
--- a/pkgs/desktops/plasma-5.4/fetchsrcs.sh
+++ b/pkgs/desktops/plasma-5.4/fetchsrcs.sh
@@ -4,7 +4,7 @@
 set -x
 
 # The trailing slash at the end is necessary!
-RELEASE_URL="http://download.kde.org/stable/plasma/5.4.2/"
+RELEASE_URL="http://download.kde.org/stable/plasma/5.4.3/"
 EXTRA_WGET_ARGS='-A *.tar.xz'
 
 mkdir tmp; cd tmp
diff --git a/pkgs/desktops/plasma-5.4/srcs.nix b/pkgs/desktops/plasma-5.4/srcs.nix
index 6bc3916f2c02..b60a1b2ccd84 100644
--- a/pkgs/desktops/plasma-5.4/srcs.nix
+++ b/pkgs/desktops/plasma-5.4/srcs.nix
@@ -3,299 +3,299 @@
 
 {
   bluedevil = {
-    version = "5.4.2";
+    version = "5.4.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.2/bluedevil-5.4.2.tar.xz";
-      sha256 = "1axx5bf7sdi81jccfa8r5pqz2figr0zkww4inpr9zsgs9xpv9dd0";
-      name = "bluedevil-5.4.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.3/bluedevil-5.4.3.tar.xz";
+      sha256 = "04zl8sl59imxfmph8igy2xw5qbdqhqbf1f3s92zhrcqghnawyr3k";
+      name = "bluedevil-5.4.3.tar.xz";
     };
   };
   breeze = {
-    version = "5.4.2";
+    version = "5.4.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.2/breeze-5.4.2.tar.xz";
-      sha256 = "17l55qv1lc2xas7qj4m9kgvwvy506awwji0ngsn0cc0kgy362a4x";
-      name = "breeze-5.4.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.3/breeze-5.4.3.tar.xz";
+      sha256 = "1ylkrza65m4irvyfl3nzfsfaf3j0z3q5j5qv7lk16g4crknxb2gw";
+      name = "breeze-5.4.3.tar.xz";
     };
   };
   kde-cli-tools = {
-    version = "5.4.2";
+    version = "5.4.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.2/kde-cli-tools-5.4.2.tar.xz";
-      sha256 = "0hcc1cjshwvqxqpac7ybc58s96ar9h6d9ga4vrxrly0ci6wp8r32";
-      name = "kde-cli-tools-5.4.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.3/kde-cli-tools-5.4.3.tar.xz";
+      sha256 = "16d7fkxvbr60h96g7faq6c7gzssb43ynac7yhpfp4i2gwx1w9q8r";
+      name = "kde-cli-tools-5.4.3.tar.xz";
     };
   };
   kdecoration = {
-    version = "5.4.2";
+    version = "5.4.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.2/kdecoration-5.4.2.tar.xz";
-      sha256 = "0l500c0xzlszgn70fxa3qix40v18dcqw3989xjviqxq9wzjaww3x";
-      name = "kdecoration-5.4.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.3/kdecoration-5.4.3.tar.xz";
+      sha256 = "1m92spmq0gadcwgwhnf163kh3kzccgw2b62px1v5krk8hlw6q19q";
+      name = "kdecoration-5.4.3.tar.xz";
     };
   };
   kde-gtk-config = {
-    version = "5.4.2";
+    version = "5.4.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.2/kde-gtk-config-5.4.2.tar.xz";
-      sha256 = "0h23nnyhgvrvhs30g0cysf0z7mfgcz1d1gqzbmhzqa5an2k7h70x";
-      name = "kde-gtk-config-5.4.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.3/kde-gtk-config-5.4.3.tar.xz";
+      sha256 = "0apfvcmwzp5g02kx0dvkywrfb7v9gbmlnmyga2jra027zf61jf98";
+      name = "kde-gtk-config-5.4.3.tar.xz";
     };
   };
   kdeplasma-addons = {
-    version = "5.4.2";
+    version = "5.4.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.2/kdeplasma-addons-5.4.2.tar.xz";
-      sha256 = "0i634ch5xy3b12lr850v8q0ip6648i6jz6zskrr55pndgfazrkfk";
-      name = "kdeplasma-addons-5.4.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.3/kdeplasma-addons-5.4.3.tar.xz";
+      sha256 = "0wyqwrlhm9k2wscbw372mk2v7207jappq59jhzxx223glvz2qrxp";
+      name = "kdeplasma-addons-5.4.3.tar.xz";
     };
   };
   kgamma5 = {
-    version = "5.4.2";
+    version = "5.4.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.2/kgamma5-5.4.2.tar.xz";
-      sha256 = "02z6llrxrh8z92z4xq1p94sxg0slmy24x7c6m9g110grgq724x3y";
-      name = "kgamma5-5.4.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.3/kgamma5-5.4.3.tar.xz";
+      sha256 = "0l6bk008w8m3wiqvk4pdw9s7iln9fbkbi5xl3b8rf846knr478gr";
+      name = "kgamma5-5.4.3.tar.xz";
     };
   };
   khelpcenter = {
-    version = "5.4.2";
+    version = "5.4.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.2/khelpcenter-5.4.2.tar.xz";
-      sha256 = "0v25297ahnxa443jf182pfyp0wcjybdn820sagrs3w8238i3y5v6";
-      name = "khelpcenter-5.4.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.3/khelpcenter-5.4.3.tar.xz";
+      sha256 = "0kf68maqcm2ym62d6r7v6sw9v91qxzdg53l0hk9h6p7sycs0jqq2";
+      name = "khelpcenter-5.4.3.tar.xz";
     };
   };
   khotkeys = {
-    version = "5.4.2";
+    version = "5.4.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.2/khotkeys-5.4.2.tar.xz";
-      sha256 = "1hs4r94fz3zj2p76f46cyi8bqwznpcz0k7cjhbrkr8a94ld31v33";
-      name = "khotkeys-5.4.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.3/khotkeys-5.4.3.tar.xz";
+      sha256 = "094nsrmnja83rim1cxa5p4rfxx4bdwwsv6b04rvg0l55jvw9wp29";
+      name = "khotkeys-5.4.3.tar.xz";
     };
   };
   kinfocenter = {
-    version = "5.4.2";
+    version = "5.4.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.2/kinfocenter-5.4.2.tar.xz";
-      sha256 = "1p9bvsshz1z1w016inxk8f0da7p336192gjv5lw4x9kksh6bazhq";
-      name = "kinfocenter-5.4.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.3/kinfocenter-5.4.3.tar.xz";
+      sha256 = "1v6y1div8fhyn93ypnz3a7q6d1mzyabav2bq4rn5rg5hldizjns7";
+      name = "kinfocenter-5.4.3.tar.xz";
     };
   };
   kmenuedit = {
-    version = "5.4.2";
+    version = "5.4.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.2/kmenuedit-5.4.2.tar.xz";
-      sha256 = "0jv2yf2i17h1q2dhd88wj1ywr7hfnzpfpjhmab15wq1aan7rw9v5";
-      name = "kmenuedit-5.4.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.3/kmenuedit-5.4.3.tar.xz";
+      sha256 = "0zpwvg0xw04jg5kxv9kdmlf6pg1yp6ibzafl8q3ah8ca5n92gb9n";
+      name = "kmenuedit-5.4.3.tar.xz";
     };
   };
   kscreen = {
-    version = "5.4.2";
+    version = "5.4.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.2/kscreen-5.4.2.tar.xz";
-      sha256 = "0liiiaqpnbi49viqxf0ds5j187f3r11aw1kf4y961y9nkzqidwlp";
-      name = "kscreen-5.4.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.3/kscreen-5.4.3.tar.xz";
+      sha256 = "01ba4qqf5vlmsgpf3raq7dgwxvdcm4inc7v03b3z4l7980wa6nxr";
+      name = "kscreen-5.4.3.tar.xz";
     };
   };
   ksshaskpass = {
-    version = "5.4.2";
+    version = "5.4.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.2/ksshaskpass-5.4.2.tar.xz";
-      sha256 = "13ma9dx5l7bzv9yq6bcq7x17pizrgyc6sh1bki56dj8g3xfsvmrb";
-      name = "ksshaskpass-5.4.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.3/ksshaskpass-5.4.3.tar.xz";
+      sha256 = "18r7a49i0rlijjz02h2k2wri3bkhjvzl5as0nv55gkg8b1g05dky";
+      name = "ksshaskpass-5.4.3.tar.xz";
     };
   };
   ksysguard = {
-    version = "5.4.2";
+    version = "5.4.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.2/ksysguard-5.4.2.tar.xz";
-      sha256 = "1cy7z5723w0757184lq8bjv7i5l54ykmq12r6ydlh104fmpzq3fm";
-      name = "ksysguard-5.4.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.3/ksysguard-5.4.3.tar.xz";
+      sha256 = "1lgbvabxfzyl9x1nsmr6nifh24jxnvlknigfrzfcnryibbvk6mlk";
+      name = "ksysguard-5.4.3.tar.xz";
     };
   };
   kwallet-pam = {
-    version = "5.4.2";
+    version = "5.4.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.2/kwallet-pam-5.4.2.tar.xz";
-      sha256 = "0sc9ld5n2j1icfzjni9xcn9v8ix8iszkg3qf1mp6lqw4rnx3z00l";
-      name = "kwallet-pam-5.4.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.3/kwallet-pam-5.4.3.tar.xz";
+      sha256 = "0m5yz8c6alaw0rkc0dd9cp7jijqmpdmqg4qbc3i3pp5rz3hiyp51";
+      name = "kwallet-pam-5.4.3.tar.xz";
     };
   };
   kwayland = {
-    version = "5.4.2";
+    version = "5.4.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.2/kwayland-5.4.2.tar.xz";
-      sha256 = "1h8jy7zdx0hxfjzxgw0ahfr80375wjlqiyiglx2zc8r9q34axswp";
-      name = "kwayland-5.4.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.3/kwayland-5.4.3.tar.xz";
+      sha256 = "026jgwyvkfb3zdrama2fi046zxg7v3khvb6sxl1krj4idiiyz1c0";
+      name = "kwayland-5.4.3.tar.xz";
     };
   };
   kwayland-integration = {
-    version = "5.4.2";
+    version = "5.4.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.2/kwayland-integration-5.4.2.tar.xz";
-      sha256 = "088hvd665rnf0xlav202jjyqmnipfgan6pbi1mkfpdawwm47vif9";
-      name = "kwayland-integration-5.4.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.3/kwayland-integration-5.4.3.tar.xz";
+      sha256 = "10acnrv7m12gwd0mccp9j9a47sjl29xrrfwlpqiqh9hcw4vn7mqp";
+      name = "kwayland-integration-5.4.3.tar.xz";
     };
   };
   kwin = {
-    version = "5.4.2";
+    version = "5.4.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.2/kwin-5.4.2.tar.xz";
-      sha256 = "14a11l63mz0n2sgnjpbphbaqszafsk37ydm0dz36184m194jcj90";
-      name = "kwin-5.4.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.3/kwin-5.4.3.tar.xz";
+      sha256 = "0rn359b31hpwqarsw3018r1j7vaavwwxpnnhy29ixsdybmrl4j5b";
+      name = "kwin-5.4.3.tar.xz";
     };
   };
   kwrited = {
-    version = "5.4.2";
+    version = "5.4.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.2/kwrited-5.4.2.tar.xz";
-      sha256 = "0hl8v28wh223w2disbc9qhfpqb85wq2mzv49yi6fimlwkx1318s7";
-      name = "kwrited-5.4.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.3/kwrited-5.4.3.tar.xz";
+      sha256 = "0irnhvsz6zssq3yb7lf0qy0qimydg78y1ghakpmry8632xgmr0yk";
+      name = "kwrited-5.4.3.tar.xz";
     };
   };
   libkscreen = {
-    version = "5.4.2";
+    version = "5.4.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.2/libkscreen-5.4.2.tar.xz";
-      sha256 = "0p2z22j7xflzk4v6ilyz3970pn6p9q4bcwjkakv29b2arpli28ys";
-      name = "libkscreen-5.4.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.3/libkscreen-5.4.3.tar.xz";
+      sha256 = "0xa9g6kvvxn2q3fv0217dk3j4dgbd0mhy8hgrvblpp0fw721faqx";
+      name = "libkscreen-5.4.3.tar.xz";
     };
   };
   libksysguard = {
-    version = "5.4.2";
+    version = "5.4.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.2/libksysguard-5.4.2.tar.xz";
-      sha256 = "02m99j8ziskrdf1l323wzkn99bi6vg5yz9bpgcih9jz7d70pc8vi";
-      name = "libksysguard-5.4.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.3/libksysguard-5.4.3.tar.xz";
+      sha256 = "18fndkj2bzbwrbixrsq27x4ar379vlsplr3nw766maw31nv5in6i";
+      name = "libksysguard-5.4.3.tar.xz";
     };
   };
   milou = {
-    version = "5.4.2";
+    version = "5.4.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.2/milou-5.4.2.tar.xz";
-      sha256 = "05jk76pbgfvgj1jdq6afg0a6b1axp1h3minrxkgly0qc42rwlc9z";
-      name = "milou-5.4.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.3/milou-5.4.3.tar.xz";
+      sha256 = "0xy6h1h1ws47rqx5hcn3916xwf49nywwmq32161jap233347yj71";
+      name = "milou-5.4.3.tar.xz";
     };
   };
   muon = {
-    version = "5.4.2";
+    version = "5.4.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.2/muon-5.4.2.tar.xz";
-      sha256 = "0cnkp9bifiga0h2z01fkiivf137b2sq8wjfv8jh00avfqhr9p6z4";
-      name = "muon-5.4.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.3/muon-5.4.3.tar.xz";
+      sha256 = "011l36ayl0xhap5d7cmkbf4vki8516r594dhxdpfm0ma0rnz4xrl";
+      name = "muon-5.4.3.tar.xz";
     };
   };
   oxygen = {
-    version = "5.4.2";
+    version = "5.4.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.2/oxygen-5.4.2.tar.xz";
-      sha256 = "0fi2wh6vngsh66j7sk43bvrci06ddj88f1plsh9by96617s1sr36";
-      name = "oxygen-5.4.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.3/oxygen-5.4.3.tar.xz";
+      sha256 = "1av665s2gq84y925qqfhc5bi7wm17vm7p4n10kigsnn5ywylh405";
+      name = "oxygen-5.4.3.tar.xz";
     };
   };
   oxygen-fonts = {
-    version = "5.4.2";
+    version = "5.4.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.2/oxygen-fonts-5.4.2.tar.xz";
-      sha256 = "1dvxlgsznxfa1wk4qcanfi9s58c85i1ja651lh1pjp423d1j1kkl";
-      name = "oxygen-fonts-5.4.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.3/oxygen-fonts-5.4.3.tar.xz";
+      sha256 = "13430yajk1i2l9lz95ry9xc1fvzpvfvdp6m9jikb2g55x606abx0";
+      name = "oxygen-fonts-5.4.3.tar.xz";
     };
   };
   plasma-desktop = {
-    version = "5.4.2";
+    version = "5.4.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.2/plasma-desktop-5.4.2.tar.xz";
-      sha256 = "19ys6ymk82ash13cyq89y8yqx5lylvw9l84d3qpj4z0pmjmzp0qg";
-      name = "plasma-desktop-5.4.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.3/plasma-desktop-5.4.3.tar.xz";
+      sha256 = "0hy08ip6cvcz2s3w1wkqjxdydmmfj5mcqv85qbawsrkix0d79694";
+      name = "plasma-desktop-5.4.3.tar.xz";
     };
   };
   plasma-mediacenter = {
-    version = "5.4.2";
+    version = "5.4.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.2/plasma-mediacenter-5.4.2.tar.xz";
-      sha256 = "0ni3a0f9f7df9nhqz035j5vj3bzhsq9zxb19p281pww4slh7y0if";
-      name = "plasma-mediacenter-5.4.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.3/plasma-mediacenter-5.4.3.tar.xz";
+      sha256 = "0k85h93yxqf9ccw620r8wk38gzd8nmpmaxsvwx2rssgnn35f04va";
+      name = "plasma-mediacenter-5.4.3.tar.xz";
     };
   };
   plasma-nm = {
-    version = "5.4.2";
+    version = "5.4.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.2/plasma-nm-5.4.2.tar.xz";
-      sha256 = "1lny7sjxr7mi77gb3dy6afmbvfdgfq4rlffaxzffx5bq62gaws68";
-      name = "plasma-nm-5.4.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.3/plasma-nm-5.4.3.tar.xz";
+      sha256 = "1wlhzhn7sz26b0ibvwrxbp4pwajvnpj6m37md9bdls3872yhql5r";
+      name = "plasma-nm-5.4.3.tar.xz";
     };
   };
   plasma-pa = {
-    version = "5.4.2";
+    version = "5.4.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.2/plasma-pa-5.4.2.tar.xz";
-      sha256 = "09irn20ikgi58hq5bwg6kmaqqy7h9hkbkadnyv478qxff81wis4i";
-      name = "plasma-pa-5.4.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.3/plasma-pa-5.4.3.tar.xz";
+      sha256 = "16ydbvvpwrnh0ik005gdpvmbn38a1k0bn8zvas1gwjz86rkayxr6";
+      name = "plasma-pa-5.4.3.tar.xz";
     };
   };
   plasma-sdk = {
-    version = "5.4.2";
+    version = "5.4.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.2/plasma-sdk-5.4.2.tar.xz";
-      sha256 = "1q4kjml04mdkzcdqi8mbr3c7037339v0knzc38km8szpf995w750";
-      name = "plasma-sdk-5.4.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.3/plasma-sdk-5.4.3.tar.xz";
+      sha256 = "08d31g0364ifc5yix0617zhjyv1skrc9m6x38mx0jjk1z2ng9db8";
+      name = "plasma-sdk-5.4.3.tar.xz";
     };
   };
   plasma-workspace = {
-    version = "5.4.2";
+    version = "5.4.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.2/plasma-workspace-5.4.2.tar.xz";
-      sha256 = "0byj4fljiyag781jz3zs5chz48h22gqqc4hb8ha9nfsk615v1irn";
-      name = "plasma-workspace-5.4.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.3/plasma-workspace-5.4.3.tar.xz";
+      sha256 = "030xqy1s8j3h03arjc39xhw2xs9h2c328id6qgaqxk8v9qimkr5z";
+      name = "plasma-workspace-5.4.3.tar.xz";
     };
   };
   plasma-workspace-wallpapers = {
-    version = "5.4.2";
+    version = "5.4.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.2/plasma-workspace-wallpapers-5.4.2.tar.xz";
-      sha256 = "18ggsdjmdcgbpamjynv068rzx5cqpm00b3a2a1ygkc04d5y430js";
-      name = "plasma-workspace-wallpapers-5.4.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.3/plasma-workspace-wallpapers-5.4.3.tar.xz";
+      sha256 = "12yb9d2b7ynfkmmcc4ciz8cnx482vn9545qrijaa403ba0jfbrhx";
+      name = "plasma-workspace-wallpapers-5.4.3.tar.xz";
     };
   };
   polkit-kde-agent = {
-    version = "1-5.4.2";
+    version = "1-5.4.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.2/polkit-kde-agent-1-5.4.2.tar.xz";
-      sha256 = "0s0z0xkfps0vk6rr013n2vww7s1a77z5jzqk500xl692g8dc2cdh";
-      name = "polkit-kde-agent-1-5.4.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.3/polkit-kde-agent-1-5.4.3.tar.xz";
+      sha256 = "1309wmdrxfqlv621kagwycn2s41n9zsyb56ysqmyilhnb7wq59yn";
+      name = "polkit-kde-agent-1-5.4.3.tar.xz";
     };
   };
   powerdevil = {
-    version = "5.4.2";
+    version = "5.4.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.2/powerdevil-5.4.2.tar.xz";
-      sha256 = "01qsm0byvjy6slbhz6k6bikbzn35jhchcaxcis1x3c1gczhvzajw";
-      name = "powerdevil-5.4.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.3/powerdevil-5.4.3.tar.xz";
+      sha256 = "1j20xgca41hqacgsridsigw7s275ad3j0khb59875722qz1y91a0";
+      name = "powerdevil-5.4.3.tar.xz";
     };
   };
   sddm-kcm = {
-    version = "5.4.2";
+    version = "5.4.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.2/sddm-kcm-5.4.2.tar.xz";
-      sha256 = "0x662plyyf3krfpp4ifsd9ddwwvrfds63v6cclzir5cs9db0rs0j";
-      name = "sddm-kcm-5.4.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.3/sddm-kcm-5.4.3.tar.xz";
+      sha256 = "1ppryl541pjwxi73q1qdcd23kmhga3ajj0j6fws6y8ag4mpg2b6k";
+      name = "sddm-kcm-5.4.3.tar.xz";
     };
   };
   systemsettings = {
-    version = "5.4.2";
+    version = "5.4.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.2/systemsettings-5.4.2.tar.xz";
-      sha256 = "0cq7b3kas7qky199x54770dh4yd2xkbvs9j0cja90vgy4f2vacbs";
-      name = "systemsettings-5.4.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.3/systemsettings-5.4.3.tar.xz";
+      sha256 = "04p455rfxlsp817dqgg907szyfsd0f6ym5kaqaj2g7ys5v8id1vb";
+      name = "systemsettings-5.4.3.tar.xz";
     };
   };
   user-manager = {
-    version = "5.4.2";
+    version = "5.4.3";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.4.2/user-manager-5.4.2.tar.xz";
-      sha256 = "1ikx55yflf8j4f88mdybzk9yfhk24j48h3f6brx6ic2f2dcl7lzm";
-      name = "user-manager-5.4.2.tar.xz";
+      url = "${mirror}/stable/plasma/5.4.3/user-manager-5.4.3.tar.xz";
+      sha256 = "0vnfh5q8fgjs40frsb709r7d0py1xgr40air3zysasw25g4bjca8";
+      name = "user-manager-5.4.3.tar.xz";
     };
   };
 }

From 6cc033b99e607a753d274ce084095a2a7bfb82e8 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 11 Nov 2015 12:24:42 +0100
Subject: [PATCH 13/73] menhir: refactor to generic; init at 20151110 for OCaml
 >= 4.02

---
 .../ocaml-modules/menhir/default.nix          | 55 +++----------------
 .../ocaml-modules/menhir/generic.nix          | 47 ++++++++++++++++
 2 files changed, 55 insertions(+), 47 deletions(-)
 create mode 100644 pkgs/development/ocaml-modules/menhir/generic.nix

diff --git a/pkgs/development/ocaml-modules/menhir/default.nix b/pkgs/development/ocaml-modules/menhir/default.nix
index 5cf2f97e4b74..c8243f326715 100644
--- a/pkgs/development/ocaml-modules/menhir/default.nix
+++ b/pkgs/development/ocaml-modules/menhir/default.nix
@@ -1,51 +1,12 @@
-{stdenv, fetchurl, ocaml, findlib}:
+{ stdenv, fetchurl, ocaml, findlib
+, version ? if stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02" then "20151110" else "20140422"
+}@args:
 
 let
-  ocaml_version = (builtins.parseDrvName ocaml.name).version;
+  sha256 =
+  if version == "20140422" then "1ki1f2id6a14h9xpv2k8yb6px7dyw8cvwh39csyzj4qpzx7wia0d"
+  else if version == "20151110" then "12ijr1gd808f79d7k7ji9zg23xr4szayfgvm6njqamh0jnspq70r"
+  else throw ("menhir: unknown version " ++ version);
 in
 
-stdenv.mkDerivation {
-  name = "menhir-20140422";
-
-  src = fetchurl {
-    url = http://pauillac.inria.fr/~fpottier/menhir/menhir-20140422.tar.gz;
-    sha256 = "1ki1f2id6a14h9xpv2k8yb6px7dyw8cvwh39csyzj4qpzx7wia0d";
-  };
-
-  buildInputs = [ocaml findlib];
-
-  createFindlibDestdir = true;
-
-  preBuild = ''
-    #Fix makefiles.
-    RM=$(type -p rm)
-    CHMOD=$(type -p chmod)
-    ENV=$(type -p env)
-    for f in src/Makefile demos/OMakefile* demos/Makefile* demos/ocamldep.wrapper
-    do
-      substituteInPlace $f \
-        --replace /bin/rm $RM \
-	--replace /bin/chmod $CHMOD \
-	--replace /usr/bin/env $ENV
-    done
-
-    export PREFIX=$out
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = http://pauillac.inria.fr/~fpottier/menhir/;
-    description = "A LR(1) parser generator for OCaml";
-    longDescription = ''
-      Menhir is a LR(1) parser generator for the Objective Caml programming
-      language.  That is, Menhir compiles LR(1) grammar specifications down
-      to OCaml code.  Menhir was designed and implemented by François Pottier
-      and Yann Régis-Gianas.
-    '';
-    license = with licenses; [
-      qpl /* generator */
-      lgpl2 /* library */
-    ];
-    platforms = ocaml.meta.platforms;
-    maintainers = with maintainers; [ z77z ];
-  };
-}
+import ./generic.nix (args // { inherit version sha256; })
diff --git a/pkgs/development/ocaml-modules/menhir/generic.nix b/pkgs/development/ocaml-modules/menhir/generic.nix
new file mode 100644
index 000000000000..8758ff3cffbc
--- /dev/null
+++ b/pkgs/development/ocaml-modules/menhir/generic.nix
@@ -0,0 +1,47 @@
+{ version, sha256, stdenv, fetchurl, ocaml, findlib }:
+
+stdenv.mkDerivation {
+  name = "menhir-${version}";
+
+  src = fetchurl {
+    url = "http://pauillac.inria.fr/~fpottier/menhir/menhir-${version}.tar.gz";
+    inherit sha256;
+  };
+
+  buildInputs = [ ocaml findlib ];
+
+  createFindlibDestdir = true;
+
+  preBuild = ''
+    #Fix makefiles.
+    RM=$(type -p rm)
+    CHMOD=$(type -p chmod)
+    ENV=$(type -p env)
+    for f in src/Makefile demos/OMakefile* demos/Makefile* demos/ocamldep.wrapper
+    do
+      substituteInPlace $f \
+        --replace /bin/rm $RM \
+	--replace /bin/chmod $CHMOD \
+	--replace /usr/bin/env $ENV
+    done
+
+    export PREFIX=$out
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://pauillac.inria.fr/~fpottier/menhir/;
+    description = "A LR(1) parser generator for OCaml";
+    longDescription = ''
+      Menhir is a LR(1) parser generator for the Objective Caml programming
+      language.  That is, Menhir compiles LR(1) grammar specifications down
+      to OCaml code.  Menhir was designed and implemented by François Pottier
+      and Yann Régis-Gianas.
+    '';
+    license = with licenses; [
+      qpl /* generator */
+      lgpl2 /* library */
+    ];
+    platforms = ocaml.meta.platforms;
+    maintainers = with maintainers; [ z77z ];
+  };
+}

From 48cd7177b2fb95b234ee84ddb52620608f1adf50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Jourdois?= <sjourdois@gmail.com>
Date: Wed, 11 Nov 2015 13:09:26 +0100
Subject: [PATCH 14/73] cgal: 4.6.1 -> 4.7

Also enable darwin support
---
 pkgs/development/libraries/CGAL/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix
index a903d5e46782..1f964388cbda 100644
--- a/pkgs/development/libraries/CGAL/default.nix
+++ b/pkgs/development/libraries/CGAL/default.nix
@@ -1,13 +1,12 @@
 { stdenv, fetchurl, cmake, boost, gmp, mpfr }:
 
 stdenv.mkDerivation rec {
-  version = "4.6.1";
-
-  name = "cgal-${version}";
+  version = "4.7";
+  name = "cgal-" + version;
 
   src = fetchurl {
     url = "https://github.com/CGAL/releases/archive/CGAL-${version}.tar.gz";
-    sha256 = "05vk4l62d7g6cz19q36h1an5krxdbgq1fbs5hi0x2l7blsja1z6g";
+    sha256 = "1hbp4qpfqvpggvv79yxr6z3w7y0nwd31zavb1s57y55yl9z3zfxy";
   };
 
   # note: optional component libCGAL_ImageIO would need zlib and opengl;
@@ -18,9 +17,9 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Computational Geometry Algorithms Library";
-    homepage = "http://cgal.org/";
+    homepage = http://cgal.org;
     license = licenses.gpl3Plus; # some parts are GPLv3+, some are LGPLv3+
-    platforms = platforms.linux;
+    platforms = platforms.all;
     maintainers = [ maintainers.raskin ];
   };
 }

From 420487325468cee931ffbc65806ac7dccd9e8fe6 Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Thu, 22 Oct 2015 11:38:44 +0200
Subject: [PATCH 15/73] googleplaydownloader: init at 1.8 (close #10636)

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d137024e9148..9ee2bf80edf3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4200,6 +4200,37 @@ let
     propagatedBuildInputs = with self; [ gdata ];
   };
 
+  googleplaydownloader = buildPythonPackage rec {
+    version = "1.8";
+    name = "googleplaydownloader-${version}";
+
+    src = pkgs.fetchurl {
+       url = "https://codingteam.net/project/googleplaydownloader/download/file/googleplaydownloader_${version}.orig.tar.gz";
+       sha256 = "1hxl4wdbiyq8ay6vnf3m7789jg0kc63kycjj01x1wm4gcm4qvbkx";
+     };
+
+    disabled = ! isPy27;
+
+    propagatedBuildInputs = with self; [ configparser pyasn1 ndg-httpsclient requests protobuf wxPython];
+
+    preBuild = ''
+      substituteInPlace googleplaydownloader/__init__.py --replace \
+        'open(os.path.join(HERE, "googleplaydownloader"' \
+        'open(os.path.join(HERE'
+    '';
+
+    postInstall = ''
+      cp -R googleplaydownloader/ext_libs $out/${python.sitePackages}/
+    '';
+
+    meta = {
+      homepage = https://codingteam.net/project/googleplaydownloader;
+      description = "Graphical software to download APKs from the Google Play store";
+      license = licenses.agpl3;
+      maintainers = with maintainers; [ DamienCassou ];
+    };
+  };
+
   gplaycli = buildPythonPackage rec {
     version = "0.1.2";
     name = "gplaycli-${version}";

From 11aa24c0344d8948530c9494aac6282735d71188 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 11 Nov 2015 13:35:37 +0100
Subject: [PATCH 16/73] librosa and related: remove empty input lists

---
 pkgs/top-level/python-packages.nix | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a3f60c1c00ad..56b5d0a8ed55 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4921,15 +4921,10 @@ let
       md5 = "8149a70a5a5783c3cceeb69de3e07458";
     };
 
-    buildInputs = with self; with pkgs;
-      [ ];
-
     propagatedBuildInputs = with self;
       [ joblib matplotlib six scikitlearn decorator audioread samplerate ];
-
   };
 
-
   joblib = buildPythonPackage rec {
     name = "joblib-${version}";
     version = "0.9.0b4";
@@ -4937,11 +4932,6 @@ let
       url = https://pypi.python.org/packages/source/j/joblib/joblib-0.9.0b4.tar.gz;
       md5 = "e0d79a085d4773c7a61cd38b4fb6dad5";
     };
-
-    buildInputs = with self; with pkgs;  [ ];
-
-    propagatedBuildInputs = with self; [ ];
-
   };
 
   samplerate = buildPythonPackage rec {
@@ -4966,7 +4956,6 @@ let
     '';
 
     doCheck = false;
-
   };
 
 

From 98008623976f676dc28f9aa1af424979312ed635 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 11 Nov 2015 16:18:38 +0300
Subject: [PATCH 17/73] nixos/autofs: revive and update to systemd

---
 nixos/modules/module-list.nix          |  2 +-
 nixos/modules/services/misc/autofs.nix | 45 ++++----------------------
 2 files changed, 8 insertions(+), 39 deletions(-)

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 0db7ee916baa..034ea933a7db 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -188,7 +188,7 @@
   ./services/mail/postfix.nix
   ./services/mail/spamassassin.nix
   ./services/misc/apache-kafka.nix
-  #./services/misc/autofs.nix
+  ./services/misc/autofs.nix
   ./services/misc/canto-daemon.nix
   ./services/misc/calibre-server.nix
   ./services/misc/cpuminer-cryptonight.nix
diff --git a/nixos/modules/services/misc/autofs.nix b/nixos/modules/services/misc/autofs.nix
index f4a1059d09f0..b4dae79cf8a9 100644
--- a/nixos/modules/services/misc/autofs.nix
+++ b/nixos/modules/services/misc/autofs.nix
@@ -71,48 +71,17 @@ in
 
   config = mkIf cfg.enable {
 
-    environment.etc = singleton
-      { target = "auto.master";
-        source = pkgs.writeText "auto.master" cfg.autoMaster;
-      };
-
     boot.kernelModules = [ "autofs4" ];
 
-    jobs.autofs =
+    systemd.services.autofs =
       { description = "Filesystem automounter";
+        wantedBy = [ "multi-user.target" ];
+        after = [ "network.target" ];
 
-        startOn = "started network-interfaces";
-        stopOn = "stopping network-interfaces";
-
-        path = [ pkgs.nfs-utils pkgs.sshfsFuse ];
-
-        preStop =
-          ''
-            set -e; while :; do pkill -TERM automount; sleep 1; done
-          '';
-
-        # automount doesn't clean up when receiving SIGKILL.
-        # umount -l should unmount the directories recursively when they are no longer used
-        # It does, but traces are left in /etc/mtab. So unmount recursively..
-        postStop =
-          ''
-          PATH=${pkgs.gnused}/bin:${pkgs.coreutils}/bin
-          exec &> /tmp/logss
-          # double quote for sed:
-          escapeSpaces(){ sed 's/ /\\\\040/g'; }
-          unescapeSpaces(){ sed 's/\\040/ /g'; }
-          sed -n 's@^\s*\(\([^\\ ]\|\\ \)*\)\s.*@\1@p' ${autoMaster} | sed 's/[\\]//' | while read mountPoint; do
-            sed -n "s@[^ ]\+\s\+\($(echo "$mountPoint"| escapeSpaces)[^ ]*\).*@\1@p" /proc/mounts | sort -r | unescapeSpaces| while read smountP; do
-              ${pkgs.utillinux}/bin/umount -l "$smountP" || true
-            done
-          done
-          '';
-
-        script =
-          ''
-            ${if cfg.debug then "exec &> /var/log/autofs" else ""}
-            exec ${pkgs.autofs5}/sbin/automount ${if cfg.debug then "-d" else ""} -f -t ${builtins.toString cfg.timeout} "${autoMaster}" ${if cfg.debug then "-l7" else ""}
-          '';
+        serviceConfig = {
+          ExecStart = "${pkgs.autofs5}/sbin/automount ${if cfg.debug then "-d" else ""} -f -t ${builtins.toString cfg.timeout} ${autoMaster} ${if cfg.debug then "-l7" else ""}";
+          ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+        };
       };
 
   };

From f47103e015303141bdbf820bab52ab27e475a672 Mon Sep 17 00:00:00 2001
From: Demin Dmitriy <demindf@gmail.com>
Date: Wed, 21 Oct 2015 21:10:04 +0000
Subject: [PATCH 18/73] libgksu: fix sudo references (close #10524)

gksudo wasn't working because libgksu used wrong sudo file which doesn't have setuid bit

Committer: it isn't optimal, as it won't work on non-NixOS. I've got a
patch for it to use relative paths, but apparently something's wrong
with it and I don't want to kill much more time with it ATM.
---
 pkgs/development/libraries/libgksu/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libgksu/default.nix b/pkgs/development/libraries/libgksu/default.nix
index e3d64994fe2f..7bf1d7cdc713 100644
--- a/pkgs/development/libraries/libgksu/default.nix
+++ b/pkgs/development/libraries/libgksu/default.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
 
     # Fix some binary paths
     sed -i -e 's|/usr/bin/xauth|${xauth}/bin/xauth|g' libgksu/gksu-run-helper.c libgksu/libgksu.c
-    sed -i -e 's|/usr/bin/sudo|${sudo}/bin/sudo|g' libgksu/libgksu.c
+    sed -i -e 's|/usr/bin/sudo|/var/setuid-wrappers/sudo|g' libgksu/libgksu.c
     sed -i -e 's|/bin/su\([^d]\)|/var/setuid-wrappers/su\1|g' libgksu/libgksu.c
 
     touch NEWS README

From 87d9f25110f37bcfb5cafdbc58e3e81b72d31ae2 Mon Sep 17 00:00:00 2001
From: Asko Soukka <asko.soukka@iki.fi>
Date: Fri, 21 Aug 2015 19:48:04 +0300
Subject: [PATCH 19/73] hg-git: 0.8.1 -> 0.8.2 (close #10528)

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f363cbdb7586..1fae6fdf4c63 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6475,11 +6475,11 @@ let
 
   hg-git = buildPythonPackage rec {
     name = "hg-git-${version}";
-    version = "0.8.1";
+    version = "0.8.2";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/h/hg-git/${name}.tar.gz";
-      sha256 = "07a5p5wfs60hmzv3h64fysvm91ablhiaf5ccpv3f8q61insdzvff";
+      sha256 = "0hz0i6qgcn3ic292sny86mdl1psj1bnczcai1b1kzvwcla6z99py";
     };
 
     propagatedBuildInputs = with self; [ dulwich ];

From c51e3308248babd28172f545641d226dd7f119f0 Mon Sep 17 00:00:00 2001
From: Kosyrev Serge <_deepfire@feelingofgreen.ru>
Date: Tue, 20 Oct 2015 13:30:21 +0300
Subject: [PATCH 20/73] bootchart:  0.9 -> 0.14.7; make pybootchartgui
 available

Close #10497.
---
 pkgs/tools/system/bootchart/default.nix | 30 +++++++++----------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/pkgs/tools/system/bootchart/default.nix b/pkgs/tools/system/bootchart/default.nix
index ef0a6d251a39..dacb143a480b 100644
--- a/pkgs/tools/system/bootchart/default.nix
+++ b/pkgs/tools/system/bootchart/default.nix
@@ -1,31 +1,21 @@
-{stdenv, fetchurl, gnutar, gzip, coreutils, utillinux, gnugrep, gnused, psmisc, nettools}:
+{stdenv, fetchurl, lib, pkgconfig, glib, gtk, python27, pythonPackages }:
 
 stdenv.mkDerivation rec {
-  name = "bootchart-0.9";
+  version = "0.14.7";
+  name = "bootchart-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/bootchart/${name}.tar.bz2";
-    sha256 = "0z9jvi7cyp3hpx6hf1fyaa8fhnaz7aqid8wrkwp29cngryg3jf3p";
+    url = "https://github.com/mmeeks/bootchart/archive/${version}.tar.gz";
+    sha256 = "1abn4amsyys6vwn7csxsxny94n24ycca3xhqxqcmdc4j0dzn3kmb";
   };
 
-  buildInputs = [ gnutar gzip coreutils utillinux gnugrep gnused psmisc nettools ];
-
-  patchPhase = ''
-    export MYPATH=
-    for i in $buildInputs; do
-       export MYPATH=''${MYPATH}''${MYPATH:+:}$i/bin:$i/sbin
-    done
-
-    sed -i -e 's,PATH.*,PATH='$MYPATH, \
-       -e 's,^CONF.*,CONF='$out/etc/bootchartd.conf, \
-      script/bootchartd
-  '';
+  buildInputs = [ pkgconfig glib gtk python27 pythonPackages.wrapPython pythonPackages.pygtk ];
+  pythonPath = with pythonPackages; [ pygtk pycairo ];
 
   installPhase = ''
-    mkdir -p $out/sbin $out/etc
-    cp script/bootchartd $out/sbin
-    cp script/bootchartd.conf $out/etc
-    chmod +x $out/sbin/bootchartd
+    make install DESTDIR=$out BINDIR=/bin PY_LIBDIR=/lib/python2.7
+    wrapProgram $out/bin/pybootchartgui \
+      --prefix PYTHONPATH : "$PYTHONPATH:$(toPythonPath $out)"
   '';
 
   meta = with stdenv.lib; {

From 1e6097f00aeb7095301e8825fa0ef466d2e3ab4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 11 Nov 2015 14:58:52 +0100
Subject: [PATCH 21/73] stace: add libunwind support (fixes #10515)

I think it's not worth making such a small library optional as in the PR.
---
 pkgs/development/tools/misc/strace/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix
index 07e67b558d2f..461e3c25a36a 100644
--- a/pkgs/development/tools/misc/strace/default.nix
+++ b/pkgs/development/tools/misc/strace/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl }:
+{ stdenv, fetchurl, perl, libunwind }:
 
 stdenv.mkDerivation rec {
   name = "strace-4.10";
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ perl ];
 
+  buildInputs = [ libunwind ]; # support -k
+
   meta = with stdenv.lib; {
     homepage = http://strace.sourceforge.net/;
     description = "A system call tracer for Linux";

From 6a2a2f4ad5c5e09e736931b4e831ac14725e923b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 11 Nov 2015 15:14:28 +0100
Subject: [PATCH 22/73] hdf5: refactor the expression

It's possible enableShared has little impact,
as we pass --disable-static to all packages by default.
---
 pkgs/tools/misc/hdf5/default.nix | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix
index f8e316d93776..0655fddeb87a 100644
--- a/pkgs/tools/misc/hdf5/default.nix
+++ b/pkgs/tools/misc/hdf5/default.nix
@@ -1,4 +1,3 @@
-
 { stdenv
 , fetchurl
 , cpp ? false
@@ -8,6 +7,9 @@
 , mpi ? null
 , enableShared ? true
 }:
+
+with { inherit (stdenv.lib) optional; };
+
 stdenv.mkDerivation rec {
   version = "1.8.15-patch1";
   name = "hdf5-${version}";
@@ -22,23 +24,22 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = []
-    ++ stdenv.lib.optional (gfortran != null) gfortran
-    ++ stdenv.lib.optional (zlib != null) zlib
-    ++ stdenv.lib.optional (szip != null) szip;
+    ++ optional (gfortran != null) gfortran
+    ++ optional (zlib != null) zlib
+    ++ optional (szip != null) szip;
 
   propagatedBuildInputs = []
-    ++ stdenv.lib.optional (mpi != null) mpi;
+    ++ optional (mpi != null) mpi;
+
+  configureFlags = []
+    ++ optional cpp "--enable-cxx"
+    ++ optional (gfortran != null) "--enable-fortran"
+    ++ optional (szip != null) "--with-szlib=${szip}"
+    ++ optional (mpi != null) "--enable-parallel"
+    ++ optional enableShared "--enable-shared";
 
-  configureFlags = "
-    ${if cpp then "--enable-cxx" else ""}
-    ${if gfortran != null then "--enable-fortran" else ""}
-    ${if szip != null then "--with-szlib=${szip}" else ""}
-    ${if mpi != null then "--enable-parallel" else ""}
-    ${if enableShared then "--enable-shared" else ""}
-  ";
-  
   patches = [./bin-mv.patch];
-  
+
   meta = {
     description = "Data model, library, and file format for storing and managing data";
     longDescription = ''

From 03959d46165f49e6c3629cf1bf2a9ce0f6933de3 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 25 May 2015 00:53:10 +0200
Subject: [PATCH 23/73] whois: init at 5.2.10 and share with mkpasswd

Close #7979.
This commit adds a much more usable whois tool compared to the ones in
busybox and inetutils.

The sources for whois and mkpasswd from Debian are both located in the whois
git repository for historical reasons.
---
 pkgs/tools/networking/whois/default.nix  | 40 ++++++++++++++++++++++++
 pkgs/tools/security/mkpasswd/default.nix | 23 +++++---------
 pkgs/top-level/all-packages.nix          |  2 ++
 3 files changed, 49 insertions(+), 16 deletions(-)
 create mode 100644 pkgs/tools/networking/whois/default.nix

diff --git a/pkgs/tools/networking/whois/default.nix b/pkgs/tools/networking/whois/default.nix
new file mode 100644
index 000000000000..bab487f5fab8
--- /dev/null
+++ b/pkgs/tools/networking/whois/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchFromGitHub, perl, gettext }:
+
+stdenv.mkDerivation rec {
+  version = "5.2.10";
+  name = "whois-${version}";
+
+  src = fetchFromGitHub {
+    owner = "rfc1036";
+    repo = "whois";
+    rev = "v${version}";
+    sha256 = "0fqxbys3ssyplh70wjs83jsljqhmrnjic02ayaznw9m9l6fzhkkr";
+  };
+
+  buildInputs = [ perl gettext ];
+
+  preConfigure = ''
+    for i in Makefile po/Makefile; do
+      substituteInPlace $i --replace "prefix = /usr" "prefix = $out"
+    done
+  '';
+
+  buildPhase = "make whois";
+
+  installPhase = "make install-whois";
+
+  meta = with stdenv.lib; {
+    description = "Intelligent WHOIS client from Debian";
+    longDescription = ''
+      This package provides a commandline client for the WHOIS (RFC 3912)
+      protocol, which queries online servers for information such as contact
+      details for domains and IP address assignments. It can intelligently
+      select the appropriate WHOIS server for most queries.
+    '';
+
+    homepage = http://packages.qa.debian.org/w/whois.html;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ fpletz ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/tools/security/mkpasswd/default.nix b/pkgs/tools/security/mkpasswd/default.nix
index 8975ca4324d1..88aa71810dcf 100644
--- a/pkgs/tools/security/mkpasswd/default.nix
+++ b/pkgs/tools/security/mkpasswd/default.nix
@@ -1,30 +1,21 @@
-{ stdenv, fetchFromGitHub }:
+{ stdenv, whois, perl }:
 
-stdenv.mkDerivation rec {
-  name = "mkpasswd-${version}";
+stdenv.mkDerivation {
+  name = "mkpasswd-${whois.version}";
 
-  version = "5.1.1";
+  src = whois.src;
 
-  src = fetchFromGitHub {
-    owner = "rfc1036";
-    repo = "whois";
-    rev = "v${version}";
-    sha256 = "026x8byx8pcpkdxca64368p0nlspk4phw18jg4p04di6cg6nc1m5";
-  };
-
-  preConfigure = ''
-    substituteInPlace Makefile --replace "prefix = /usr" "prefix = $out"
-  '';
+  buildInputs = [ perl ];
 
+  preConfigure = whois.preConfigure;
   buildPhase = "make mkpasswd";
-
   installPhase = "make install-mkpasswd";
 
   meta = with stdenv.lib; {
     homepage = http://packages.qa.debian.org/w/whois.html;
     description = "Overfeatured front-end to crypt, from the Debian whois package";
     license = licenses.gpl2;
-    maintainers = [ maintainers.cstrahan ];
+    maintainers = with maintainers; [ cstrahan fpletz ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 82157ba09ef2..a9b6d6c1a819 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3349,6 +3349,8 @@ let
 
   welkin = callPackage ../tools/graphics/welkin {};
 
+  whois = callPackage ../tools/networking/whois { };
+
   wsmancli = callPackage ../tools/system/wsmancli {};
 
   wolfebin = callPackage ../tools/networking/wolfebin {

From 6668058a6246350382c896262e49b58843529c09 Mon Sep 17 00:00:00 2001
From: Brian McKenna <brian@brianmckenna.org>
Date: Fri, 16 Oct 2015 21:36:18 +1100
Subject: [PATCH 24/73] linux: add config options needed for a Bay Trail
 Chromebook

Close #10416.
Got /dev/mmcblk0 on a live CD with these options:

    X86_INTEL_LPSS y
    PINCTRL_BAYTRAIL y
---
 pkgs/os-specific/linux/kernel/common-config.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 105d7e7f9f38..19731eccc90b 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -41,6 +41,9 @@ with stdenv.lib;
     PM_RUNTIME y
   ''}
   PM_ADVANCED_DEBUG y
+  ${optionalString (versionAtLeast version "3.11") ''
+    X86_INTEL_LPSS y
+  ''}
   ${optionalString (versionAtLeast version "3.10") ''
     X86_INTEL_PSTATE y
   ''}
@@ -316,6 +319,9 @@ with stdenv.lib;
   MOUSE_PS2_ELANTECH y # Elantech PS/2 protocol extension
   MTRR_SANITIZER y
   NET_FC y # Fibre Channel driver support
+  ${optionalString (versionAtLeast version "3.11") ''
+    PINCTRL_BAYTRAIL y # GPIO on Intel Bay Trail, for some Chromebook internal eMMC disks
+  ''}
   PPP_MULTILINK y # PPP multilink support
   PPP_FILTER y
   REGULATOR y # Voltage and Current Regulator Support

From 20336987f91fcc5e04a75a3ecddfa865f06cd5aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 11 Nov 2015 15:45:52 +0100
Subject: [PATCH 25/73] fuse-7z-ng: take longDescription from #8207

---
 pkgs/tools/filesystems/fuse-7z-ng/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/tools/filesystems/fuse-7z-ng/default.nix b/pkgs/tools/filesystems/fuse-7z-ng/default.nix
index 4e8df9cacbe2..8b3df52bcb74 100644
--- a/pkgs/tools/filesystems/fuse-7z-ng/default.nix
+++ b/pkgs/tools/filesystems/fuse-7z-ng/default.nix
@@ -28,6 +28,12 @@ stdenv.mkDerivation rec {
     inherit version;
     inherit (src.homepage);
     description = "A FUSE-based filesystem that uses the p7zip library";
+    longDescription = ''
+      fuse-7z-ng is a FUSE file system that uses the p7zip
+      library to access all archive formats supported by 7-zip.
+
+      This project is a fork of fuse-7z ( https://gitorious.org/fuse-7z/fuse-7z ).
+    '';
     platforms = platforms.linux;
     license = licenses.gpl3Plus;
   };

From 0e1094f2d7da49f79dbf9fc17edf8222b070513c Mon Sep 17 00:00:00 2001
From: Asko Soukka <asko.soukka@iki.fi>
Date: Wed, 11 Nov 2015 20:36:54 +0200
Subject: [PATCH 26/73] darwin: numba: fix build

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 25b48b73bf33..21cf8882b0d6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10226,6 +10226,8 @@ let
       sha256 = "1806d2f6ad49ad891e9ac6fed0cc0b0489cbfcd9ba2dc81081c1c30091e77604";
     };
 
+    NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${pkgs.libcxx}/include/c++/v1";
+
     propagatedBuildInputs = with self; [numpy llvmlite argparse] ++ optional (!isPy3k) funcsigs ++ optional (isPy27 || isPy33) singledispatch;
     # Future work: add Cuda support.
     #propagatedBuildInputs = with self; [numpy llvmlite argparse pkgs.cudatoolkit6];

From ecee19cff34a3800184a3655fc53cbf8bd7b390b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 11 Nov 2015 12:40:13 -0600
Subject: [PATCH 27/73] kdeApps_15_08: 15.08.2 -> 15.08.3

---
 pkgs/applications/kde-apps-15.08/fetchsrcs.sh |    2 +-
 pkgs/applications/kde-apps-15.08/srcs.nix     | 1976 ++++++++---------
 2 files changed, 985 insertions(+), 993 deletions(-)

diff --git a/pkgs/applications/kde-apps-15.08/fetchsrcs.sh b/pkgs/applications/kde-apps-15.08/fetchsrcs.sh
index 8a4bf33f0196..126753e3ccc0 100755
--- a/pkgs/applications/kde-apps-15.08/fetchsrcs.sh
+++ b/pkgs/applications/kde-apps-15.08/fetchsrcs.sh
@@ -4,7 +4,7 @@
 set -x
 
 # The trailing slash at the end is necessary!
-WGET_ARGS='http://download.kde.org/stable/applications/15.08.2/ http://download.kde.org/stable/applications/15.04.3/src/oxygen-icons-15.04.3.tar.xz -A *.tar.xz'
+WGET_ARGS='http://download.kde.org/stable/applications/15.08.3/ http://download.kde.org/stable/applications/15.04.3/src/oxygen-icons-15.04.3.tar.xz -A *.tar.xz'
 
 mkdir tmp; cd tmp
 
diff --git a/pkgs/applications/kde-apps-15.08/srcs.nix b/pkgs/applications/kde-apps-15.08/srcs.nix
index d87fbb6b9787..d01874957298 100644
--- a/pkgs/applications/kde-apps-15.08/srcs.nix
+++ b/pkgs/applications/kde-apps-15.08/srcs.nix
@@ -3,1867 +3,1859 @@
 
 {
   akonadi = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/akonadi-15.08.2.tar.xz";
-      sha256 = "1fqv767396ymm57yaqzhvxxcv2rr07m14h41vh7y3xq8n880wx90";
-      name = "akonadi-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/akonadi-15.08.3.tar.xz";
+      sha256 = "0v7zwvixfpf5fskxlamvmyaagb2vxqkw81fzsb4yiyq8493lm0mf";
+      name = "akonadi-15.08.3.tar.xz";
     };
   };
   akonadi-calendar = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/akonadi-calendar-15.08.2.tar.xz";
-      sha256 = "0gl2i7qd16ibfg4m8vcvn6lkja1jn5ba7d0mpxmv3rx41i7ppcfi";
-      name = "akonadi-calendar-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/akonadi-calendar-15.08.3.tar.xz";
+      sha256 = "11mp32k71pa9f6gkqmm1dkia1ljcr9wdx4iyb9ys8fm580xxk5gv";
+      name = "akonadi-calendar-15.08.3.tar.xz";
     };
   };
   akonadi-search = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/akonadi-search-15.08.2.tar.xz";
-      sha256 = "1a0lzbiz2f2i35q6safmqkgi2pplmf9x20p8xvd6crfwgd1af2f8";
-      name = "akonadi-search-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/akonadi-search-15.08.3.tar.xz";
+      sha256 = "10iwmb76yijqpagvsjgwyksq1j3j61ihv2hmi09z44zz4w171vzb";
+      name = "akonadi-search-15.08.3.tar.xz";
     };
   };
   amor = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/amor-15.08.2.tar.xz";
-      sha256 = "0ddv5b9an4hlgwbacga7xds1kdlbf9n9l7abxvz3nl2vhxnpfic6";
-      name = "amor-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/amor-15.08.3.tar.xz";
+      sha256 = "0jci7yvxc1z7kcs1sw85dvsvz2c2ak2szxlf5bz09msgpxgb0xxc";
+      name = "amor-15.08.3.tar.xz";
     };
   };
   analitza = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/analitza-15.08.2.tar.xz";
-      sha256 = "11rcqaxynqrngzqb079901m0kkx90ixlabijf1yqwjwjwjm5dv70";
-      name = "analitza-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/analitza-15.08.3.tar.xz";
+      sha256 = "174s4qd0j6yx4r8vn7ak598d5kiyhqzy2cc4l7iynpyqs28ybpwi";
+      name = "analitza-15.08.3.tar.xz";
     };
   };
   ark = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/ark-15.08.2.tar.xz";
-      sha256 = "0569m5yldp5mgwixjg4l7vxgkm4q3n4skyf1ixb59zg40xxvmalv";
-      name = "ark-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/ark-15.08.3.tar.xz";
+      sha256 = "0w61ifdwhv6prnxryqsz4ka7508jj4w3zj4c2x34lv2g9q05fw21";
+      name = "ark-15.08.3.tar.xz";
     };
   };
   artikulate = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/artikulate-15.08.2.tar.xz";
-      sha256 = "1bqzqbj6qfacdqm4g7agv3zxdjd213yvbvk1p32726qif5fxd0qv";
-      name = "artikulate-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/artikulate-15.08.3.tar.xz";
+      sha256 = "0bsdjjr5zyl57iagxd1vb1g5zz1w6k85788pwp1rkvwwv7qmdcng";
+      name = "artikulate-15.08.3.tar.xz";
     };
   };
   audiocd-kio = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/audiocd-kio-15.08.2.tar.xz";
-      sha256 = "1w8227sircqz61k6xgy9ccr387zra4plq2zx97l68ia4ynnwyrwh";
-      name = "audiocd-kio-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/audiocd-kio-15.08.3.tar.xz";
+      sha256 = "09v5a6r8ks5zaxd1p35wqngnaprfww0wvzkjlxs0j2wf7v4in0kb";
+      name = "audiocd-kio-15.08.3.tar.xz";
     };
   };
   baloo-widgets = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/baloo-widgets-15.08.2.tar.xz";
-      sha256 = "1r9np98cf9mvmih0ixxzq8sv6c41lrw0mxca49k9g0gxcxgfk4zj";
-      name = "baloo-widgets-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/baloo-widgets-15.08.3.tar.xz";
+      sha256 = "0lavpqv798cfnfpdxn7ypwh77550kky2ar7l3nsi5jczkk2n0kza";
+      name = "baloo-widgets-15.08.3.tar.xz";
     };
   };
   blinken = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/blinken-15.08.2.tar.xz";
-      sha256 = "0b80kdkh1373z1qrcf18yp92w256jv2mlzchvv5smhhcwpl1ddrk";
-      name = "blinken-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/blinken-15.08.3.tar.xz";
+      sha256 = "00r2yjvj3g1lj0lzvwf0xjgras8fmqllgdy5d8ij5ihg7bb9l3rq";
+      name = "blinken-15.08.3.tar.xz";
     };
   };
   bomber = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/bomber-15.08.2.tar.xz";
-      sha256 = "1x005q258v8p7d31prh2jy32qrxnw2yy14cn0dffbcnkk1vz1v9q";
-      name = "bomber-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/bomber-15.08.3.tar.xz";
+      sha256 = "084prrbpc5wscbh4w04r4452fs7zkklmfc1mga1ba2wp1fpf24yc";
+      name = "bomber-15.08.3.tar.xz";
     };
   };
   bovo = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/bovo-15.08.2.tar.xz";
-      sha256 = "06cmfdha4cwc0kiy5spn7kq58mykwal9n21ak4pp2rqcv93zp5hk";
-      name = "bovo-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/bovo-15.08.3.tar.xz";
+      sha256 = "0fzwp9n0fn16z3r60ry9zn1acs76dyzrkrl45jv927zk4x7pk5vi";
+      name = "bovo-15.08.3.tar.xz";
     };
   };
   cantor = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/cantor-15.08.2.tar.xz";
-      sha256 = "08faiysviy0c1pr50001wpgz0xkkjjim9cl5ix81kvsqnnv2d1v5";
-      name = "cantor-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/cantor-15.08.3.tar.xz";
+      sha256 = "0fyy7wda6cd1vnw8whnadfa4hlw5yjw3npv0wdnxql426ig33dd1";
+      name = "cantor-15.08.3.tar.xz";
     };
   };
   cervisia = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/cervisia-15.08.2.tar.xz";
-      sha256 = "0fgc6fvipbmaiza5vd0h7mihiwg2vyh3lb4k1ngxkl2p1vryyg25";
-      name = "cervisia-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/cervisia-15.08.3.tar.xz";
+      sha256 = "083cw5yh63lkkgv68hynnkx9b8y9myz5h92vbh17vrza07w94zmi";
+      name = "cervisia-15.08.3.tar.xz";
     };
   };
   dolphin = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/dolphin-15.08.2.tar.xz";
-      sha256 = "1zd127k56zx80jqkr5j1rafnfccahj1wvggaia0l281d1jw6572d";
-      name = "dolphin-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/dolphin-15.08.3.tar.xz";
+      sha256 = "188a7yhk93rw8hhab852357jgygji5g45irs063hg47k1kms5vgm";
+      name = "dolphin-15.08.3.tar.xz";
     };
   };
   dolphin-plugins = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/dolphin-plugins-15.08.2.tar.xz";
-      sha256 = "16n9xnfj7kmhmj0xpggr64bvgqvz0ggprj9raxdyx0ijg7alsiy2";
-      name = "dolphin-plugins-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/dolphin-plugins-15.08.3.tar.xz";
+      sha256 = "1jgq418p72g804kkw10n3rawdky750fpq3wbwbdckxwjybanqd7y";
+      name = "dolphin-plugins-15.08.3.tar.xz";
     };
   };
   dragon = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/dragon-15.08.2.tar.xz";
-      sha256 = "071pq9rysqm1n2cgkb1mrnpl4w6mpq5vrkbprh192qgjwl5yzbzf";
-      name = "dragon-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/dragon-15.08.3.tar.xz";
+      sha256 = "0agncn4c0dbrrnz1rjmnrz9hxlqpavb9nb6zxzcyn30ssmy553qg";
+      name = "dragon-15.08.3.tar.xz";
     };
   };
   ffmpegthumbs = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/ffmpegthumbs-15.08.2.tar.xz";
-      sha256 = "1cszm4fszg8574xap2f8kp0ibarx65y7nc6grpba55y2yylq83ma";
-      name = "ffmpegthumbs-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/ffmpegthumbs-15.08.3.tar.xz";
+      sha256 = "15sbfhirys5qj25ns768agq2nanr6q1zyvmm4mbjqasl5rckxkmk";
+      name = "ffmpegthumbs-15.08.3.tar.xz";
     };
   };
   filelight = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/filelight-15.08.2.tar.xz";
-      sha256 = "10chmx0kl0vhxwc84yghk3wb8sb8n623fwn0yayk4im3cnr50lan";
-      name = "filelight-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/filelight-15.08.3.tar.xz";
+      sha256 = "0l6bvpxybcf1y2w12q8c9ixa5hgvs6sxa99hmyjxybj2icylr322";
+      name = "filelight-15.08.3.tar.xz";
     };
   };
   gpgmepp = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/gpgmepp-15.08.2.tar.xz";
-      sha256 = "1d93vlkqzjyj2xmiq9l46qd6lbyhkl08y7gl1sq63n2dd1ix5209";
-      name = "gpgmepp-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/gpgmepp-15.08.3.tar.xz";
+      sha256 = "03nl1zs9lsba0a9ba4qi5kn7l76g3135g7lbf9vfm9pvgl38bdfs";
+      name = "gpgmepp-15.08.3.tar.xz";
     };
   };
   granatier = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/granatier-15.08.2.tar.xz";
-      sha256 = "12ckzd8yhxxz3jknz4xzhgw7ml40pqax3bkibqhw3clhwgbr5874";
-      name = "granatier-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/granatier-15.08.3.tar.xz";
+      sha256 = "1k0pvvygzw5mzakpnrlwqc4rrdqkdbk5y5bw2r44m4594r5vkyfg";
+      name = "granatier-15.08.3.tar.xz";
     };
   };
   gwenview = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/gwenview-15.08.2.tar.xz";
-      sha256 = "0han5gz4rlv33wd6r3hjirjgigr6xlwwqfcpr98v906d09ra4mf3";
-      name = "gwenview-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/gwenview-15.08.3.tar.xz";
+      sha256 = "1fdwh2ksivvliz46hzmha36kx1308ixz7zbmxiwfl0z4g49x28k6";
+      name = "gwenview-15.08.3.tar.xz";
     };
   };
   jovie = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/jovie-15.08.2.tar.xz";
-      sha256 = "0mza97q8d34g9lr9z6d6hbwp5p3rd1v1hnlcgqcql9p6jiwkapm8";
-      name = "jovie-15.08.2.tar.xz";
-    };
-  };
-  juk = {
-    version = "15.08.2";
-    src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/juk-15.08.2.tar.xz";
-      sha256 = "100wpi39jp243551ihfi062lpvskwczwbazjwpak6x7bgdy1dzac";
-      name = "juk-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/jovie-15.08.3.tar.xz";
+      sha256 = "1cxkgxkzj8g75jwbfzfc09fb9y3100yk56951vihifgbhilclh5r";
+      name = "jovie-15.08.3.tar.xz";
     };
   };
   kaccessible = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kaccessible-15.08.2.tar.xz";
-      sha256 = "0b3mk7xc1kmp9jczl669zrq1qr5bkmyylxaw5h46i49r0pkjy9m8";
-      name = "kaccessible-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kaccessible-15.08.3.tar.xz";
+      sha256 = "16a9jvziq4xlc88ypd7qaqnx4dz5cr61l5gqkl3fhlrfc98aqnsm";
+      name = "kaccessible-15.08.3.tar.xz";
     };
   };
   kaccounts-integration = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kaccounts-integration-15.08.2.tar.xz";
-      sha256 = "1i09w5xsnv6gny036d45nyh478550yh8h2ykz1gf9j8wddampnvm";
-      name = "kaccounts-integration-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kaccounts-integration-15.08.3.tar.xz";
+      sha256 = "146z5lgfy5gpwmyl7gx0qzv3za84g34rq5fqfj8xkw2ww65ncwgs";
+      name = "kaccounts-integration-15.08.3.tar.xz";
     };
   };
   kaccounts-providers = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kaccounts-providers-15.08.2.tar.xz";
-      sha256 = "1h7a4mvp6419rfvjkx0kpsv7iqvv0l4wq1w51jzf3xxa52hims25";
-      name = "kaccounts-providers-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kaccounts-providers-15.08.3.tar.xz";
+      sha256 = "1nmdfb630k6bs0qzmzl1cl6xsz60nsk6w5kz5qildwgk6ll36dgx";
+      name = "kaccounts-providers-15.08.3.tar.xz";
     };
   };
   kajongg = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kajongg-15.08.2.tar.xz";
-      sha256 = "0p311pqp84lr0k9iy38a942f53yp60yxpxi616v689d8m9v5f88w";
-      name = "kajongg-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kajongg-15.08.3.tar.xz";
+      sha256 = "1xxqxwri5havnmdncqqpi8q0r69mnkf9qbpjzggxq4ciqc99hg8k";
+      name = "kajongg-15.08.3.tar.xz";
     };
   };
   kalarmcal = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kalarmcal-15.08.2.tar.xz";
-      sha256 = "1qiws5l2wl31mf51zhmxlf4h7gljwcbxbii53v8j8cmafi6v2jsy";
-      name = "kalarmcal-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kalarmcal-15.08.3.tar.xz";
+      sha256 = "0vaz3b8wp02qbx4xjj5wqx9vsy7jibhiwr60gl8nimjnyczxnr01";
+      name = "kalarmcal-15.08.3.tar.xz";
     };
   };
   kalgebra = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kalgebra-15.08.2.tar.xz";
-      sha256 = "1sna3bb6vp069k1d4a3z27bqz1j5akabwl34q8q3rfw8p2j57bjy";
-      name = "kalgebra-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kalgebra-15.08.3.tar.xz";
+      sha256 = "1p1zq9lfwakawgnv99n17qxj7bx390pglk6v3j56l2p3zlsqjil1";
+      name = "kalgebra-15.08.3.tar.xz";
     };
   };
   kalzium = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kalzium-15.08.2.tar.xz";
-      sha256 = "1a1vfz6bg7qcc9k7lgkr9768n2lrwava9hb7md8qlyn2gmigp43v";
-      name = "kalzium-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kalzium-15.08.3.tar.xz";
+      sha256 = "0bz8qv0nmf7ysh47zmwhvwwi7vnb3kd190ci1sg7xdm342xdzdi1";
+      name = "kalzium-15.08.3.tar.xz";
     };
   };
   kamera = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kamera-15.08.2.tar.xz";
-      sha256 = "04c1r0aadnrjiadd57qg2xz42xy08wi14nbnpqpx3npcdlg7fvw4";
-      name = "kamera-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kamera-15.08.3.tar.xz";
+      sha256 = "1jlywxbsa52rqlzm0lmq2xbz18r56s0jgwylmwja5rjcm0wp58hz";
+      name = "kamera-15.08.3.tar.xz";
     };
   };
   kanagram = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kanagram-15.08.2.tar.xz";
-      sha256 = "0blrill882l4spl4abgvs6b4jbqcjk9dq0lz7x4li34d9yik6n34";
-      name = "kanagram-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kanagram-15.08.3.tar.xz";
+      sha256 = "1nlz18ih95ppc7csqzbiix4my7xin8plf5wn55x7pp8jj6q44l2d";
+      name = "kanagram-15.08.3.tar.xz";
     };
   };
   kapman = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kapman-15.08.2.tar.xz";
-      sha256 = "19a36hicxndhra5vczv4p38dv30nyjr6c6v8kp64hm57wdw2r8y1";
-      name = "kapman-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kapman-15.08.3.tar.xz";
+      sha256 = "1i125fkk9lj2azlhcvjxdli53lay0073f81n9vv3fkjyfkmdch2d";
+      name = "kapman-15.08.3.tar.xz";
     };
   };
   kapptemplate = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kapptemplate-15.08.2.tar.xz";
-      sha256 = "1rl87ikk7qbscfzfk613ky5nz3sjv519laj1xkz4nww14m3j9d98";
-      name = "kapptemplate-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kapptemplate-15.08.3.tar.xz";
+      sha256 = "05hh09h58s4b32njf83viplmafbg4lw8zqp0qsyacdn37cid51a8";
+      name = "kapptemplate-15.08.3.tar.xz";
     };
   };
   kate = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kate-15.08.2.tar.xz";
-      sha256 = "03s3j5f1clgiq2hl97s751pd6rixwbnx9sdwm9whg5k76rqfw168";
-      name = "kate-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kate-15.08.3.tar.xz";
+      sha256 = "0d31ph43d83mn806yfpj7w630r7rwsj0js6qp9738865il5c4428";
+      name = "kate-15.08.3.tar.xz";
     };
   };
   katomic = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/katomic-15.08.2.tar.xz";
-      sha256 = "0p6f28bs61pnabgyc6nnpqfcbr38akcv0gzbd2f2d196vnfrjk98";
-      name = "katomic-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/katomic-15.08.3.tar.xz";
+      sha256 = "144vchhis0ngg49h1znabx2kp02jfqyh04lq9sdndaawa729d2f6";
+      name = "katomic-15.08.3.tar.xz";
     };
   };
   kblackbox = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kblackbox-15.08.2.tar.xz";
-      sha256 = "05kx9k5bikqb81z4x2rp6lxm3iklw5b7zlsk8w4g166pp7fxmjwd";
-      name = "kblackbox-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kblackbox-15.08.3.tar.xz";
+      sha256 = "16h4z8aagx8f161fyzzli0hdyqipsc9bl3pnicnkm9fcxlkrs1hj";
+      name = "kblackbox-15.08.3.tar.xz";
     };
   };
   kblocks = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kblocks-15.08.2.tar.xz";
-      sha256 = "1yaqwsjr4jy673vpkl574h95mzqbwjxi7mch74r2xxjz3mbwzi7s";
-      name = "kblocks-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kblocks-15.08.3.tar.xz";
+      sha256 = "025zharfv24vvvq0jy7kzmxkif4nix7ck40if5x0hxbkn902mmjf";
+      name = "kblocks-15.08.3.tar.xz";
     };
   };
   kblog = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kblog-15.08.2.tar.xz";
-      sha256 = "0dpdkyks7q3fr1gwxz4q300n1k0asfa470rbh6j2fz50rnrc6fxp";
-      name = "kblog-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kblog-15.08.3.tar.xz";
+      sha256 = "1bbkjg43dflqc3yxg96mphsmqzxrphp43m314cdrpka5pb39kdc9";
+      name = "kblog-15.08.3.tar.xz";
     };
   };
   kbounce = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kbounce-15.08.2.tar.xz";
-      sha256 = "0g9g7m0wizs3kpil6j13v4ixfyjnfdniwhv1bjdwyinarmq4dq47";
-      name = "kbounce-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kbounce-15.08.3.tar.xz";
+      sha256 = "1rn0irm4by01k6k61iam2m27m5dc8i0fi025h4rwmyfqx9hn6f9i";
+      name = "kbounce-15.08.3.tar.xz";
     };
   };
   kbreakout = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kbreakout-15.08.2.tar.xz";
-      sha256 = "1sazg6qs0lr3z4b9mmw033wlpbzcgsm3451dy77c6wfmg0a3w2hs";
-      name = "kbreakout-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kbreakout-15.08.3.tar.xz";
+      sha256 = "069y45gyi92zm3hyil7ggm6gnimz7wj4g543lix4fx28kd7m044v";
+      name = "kbreakout-15.08.3.tar.xz";
     };
   };
   kbruch = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kbruch-15.08.2.tar.xz";
-      sha256 = "112dlaxp80m0hhsdjkh7514fhf24q805mxnilj3wv01w2z12i20k";
-      name = "kbruch-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kbruch-15.08.3.tar.xz";
+      sha256 = "0panrkmaid998i276wn3jsvmrhq1f7nj20yh9vva3mrc7y0bvhg3";
+      name = "kbruch-15.08.3.tar.xz";
     };
   };
   kcachegrind = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kcachegrind-15.08.2.tar.xz";
-      sha256 = "04kvm1ylsjj8s8d740zz30csz18acw5pag9zvq72q844gshqzx4d";
-      name = "kcachegrind-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kcachegrind-15.08.3.tar.xz";
+      sha256 = "0hjv28j5lcdxcmdihnyal03gqjfi8lfwxhdlxbzar9dr7r8azg4p";
+      name = "kcachegrind-15.08.3.tar.xz";
     };
   };
   kcalc = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kcalc-15.08.2.tar.xz";
-      sha256 = "0qv55yp3bn88r6d3yhgalwzcfsnzp7glnb7qc7yf8qay4vj8mrc6";
-      name = "kcalc-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kcalc-15.08.3.tar.xz";
+      sha256 = "1in0b2i58s6sv6fz9z3bqaxby0d33arwmq4gazvc2kzhfxylq501";
+      name = "kcalc-15.08.3.tar.xz";
     };
   };
   kcalcore = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kcalcore-15.08.2.tar.xz";
-      sha256 = "1d7c7gprqszrdl9k1zy7ibk9bjafqrn612y72j78v8jpfasglz43";
-      name = "kcalcore-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kcalcore-15.08.3.tar.xz";
+      sha256 = "07wpls28xw3pis9l3fmmn64af3n21nv53b9ip6ycflxn3xcqmap8";
+      name = "kcalcore-15.08.3.tar.xz";
     };
   };
   kcalutils = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kcalutils-15.08.2.tar.xz";
-      sha256 = "008srl4y53mzq178nzn7k6jlfng6pafvhcbsfpijq6gax3dwx1gw";
-      name = "kcalutils-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kcalutils-15.08.3.tar.xz";
+      sha256 = "12h41bnp6vvqcfy8pm2nhqypaggaj7sgh22by8w75qvimb94ddiz";
+      name = "kcalutils-15.08.3.tar.xz";
     };
   };
   kcharselect = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kcharselect-15.08.2.tar.xz";
-      sha256 = "0sqnr8h3kq4hg1dd3jd5ri53p1yqsmx2xp5d052pybn4fg40aaz7";
-      name = "kcharselect-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kcharselect-15.08.3.tar.xz";
+      sha256 = "0iy3n8pb5xa6aj1zhbxqpk278c5k4vs9bw0i8jww3id0cwggardn";
+      name = "kcharselect-15.08.3.tar.xz";
     };
   };
   kcolorchooser = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kcolorchooser-15.08.2.tar.xz";
-      sha256 = "1mp0774jdpn647fkmlpds4379ac1pdwwp3anid5rbwg9vxzajbpa";
-      name = "kcolorchooser-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kcolorchooser-15.08.3.tar.xz";
+      sha256 = "1wyjm4d47xm5lflrd63xgwll6xjpxgnc0h8xjk4rrc6nf43w6bn1";
+      name = "kcolorchooser-15.08.3.tar.xz";
     };
   };
   kcontacts = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kcontacts-15.08.2.tar.xz";
-      sha256 = "1bf60w2w360wbvmn3mhdmabfhixsrd8lrwy4djy6slssa5h312i1";
-      name = "kcontacts-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kcontacts-15.08.3.tar.xz";
+      sha256 = "0j6ag6knz4z76md7bnizx5fwzsqavxbfz33hdpdw6606m5d66j5p";
+      name = "kcontacts-15.08.3.tar.xz";
     };
   };
   kcron = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kcron-15.08.2.tar.xz";
-      sha256 = "0b3ryp3g6x449p31awh4w42w1np3x7b1bl3i7acgnyflid1l723x";
-      name = "kcron-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kcron-15.08.3.tar.xz";
+      sha256 = "04z8pq5mc1kjvhnkmzgymzs9inynxdkiddq70hs7y94fbfsq2rf0";
+      name = "kcron-15.08.3.tar.xz";
     };
   };
   kdeartwork = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kdeartwork-15.08.2.tar.xz";
-      sha256 = "0053mv2209rdmgb3vs4wfp1mfc3wgas3g5pm2aa5yghf4cwjjlsm";
-      name = "kdeartwork-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kdeartwork-15.08.3.tar.xz";
+      sha256 = "031v00f4b1jg5z7qlgycjsjiz1hyn6svm9n4mkiybrida2hf6gzv";
+      name = "kdeartwork-15.08.3.tar.xz";
     };
   };
   kde-baseapps = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kde-baseapps-15.08.2.tar.xz";
-      sha256 = "00zrki5q9mkszv58vk0mj3wqrhxnsbmdy76px1gqlmrpchdlln2c";
-      name = "kde-baseapps-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-baseapps-15.08.3.tar.xz";
+      sha256 = "0n010z1b0hdj5rdw8p9y28vkai5knfwkgasrw8knvildcfifp913";
+      name = "kde-baseapps-15.08.3.tar.xz";
     };
   };
   kde-base-artwork = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kde-base-artwork-15.08.2.tar.xz";
-      sha256 = "13dxl0fjf8zkwp1zv0dlsrvy659fmdgvgdjjcyahzcll6z8zlwaq";
-      name = "kde-base-artwork-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-base-artwork-15.08.3.tar.xz";
+      sha256 = "054rc5llv2cxkc0yss8i7rnp6dp10srl0g6sxvwm4w9hvicxp1gg";
+      name = "kde-base-artwork-15.08.3.tar.xz";
     };
   };
   kdebugsettings = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kdebugsettings-15.08.2.tar.xz";
-      sha256 = "1rf4p593nqg8w5ax39hqciv4fhn6mrj2ycx4krfnc703fz18sxgg";
-      name = "kdebugsettings-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kdebugsettings-15.08.3.tar.xz";
+      sha256 = "0jy8gpydkis8jpb0vax6w41rj2hwwp8jvbiif438bvvfwyakx7dk";
+      name = "kdebugsettings-15.08.3.tar.xz";
     };
   };
   kde-dev-scripts = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kde-dev-scripts-15.08.2.tar.xz";
-      sha256 = "06rjhix56nb36sx91nfgbahjym2s62zl9jiqi5hsmfkh4p3ijr7l";
-      name = "kde-dev-scripts-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-dev-scripts-15.08.3.tar.xz";
+      sha256 = "1zc75alr7ap8i5njfn00d7rzvzmazyxq44zi7fs1p9zcv3lz3gli";
+      name = "kde-dev-scripts-15.08.3.tar.xz";
     };
   };
   kde-dev-utils = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kde-dev-utils-15.08.2.tar.xz";
-      sha256 = "1vz6w2ypgl20yqglnvzgir9q8c16day52xzd33hq2f9asbhjjvm2";
-      name = "kde-dev-utils-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-dev-utils-15.08.3.tar.xz";
+      sha256 = "06k6iwgaimryhm0lma5m2nmrj1gf9y0fbxnzswxl3cygsvabffyf";
+      name = "kde-dev-utils-15.08.3.tar.xz";
     };
   };
   kdeedu-data = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kdeedu-data-15.08.2.tar.xz";
-      sha256 = "08w0n6apm2rqcwph74lpfsdmfzfxhks01z3wp982vgj4dl47nk5x";
-      name = "kdeedu-data-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kdeedu-data-15.08.3.tar.xz";
+      sha256 = "1x91cqjjxaxdvh5fl3jlhnpj344r0j1qgmyw7x1cq05r3spdk47w";
+      name = "kdeedu-data-15.08.3.tar.xz";
     };
   };
   kdegraphics-mobipocket = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kdegraphics-mobipocket-15.08.2.tar.xz";
-      sha256 = "1i2d4m1vci78wnwrn1pxfp30pzlm72isjxb9lz0l7gk6fwzhf25f";
-      name = "kdegraphics-mobipocket-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kdegraphics-mobipocket-15.08.3.tar.xz";
+      sha256 = "0p1i57m86r21y8zd9lz6rr28ir0jqwy7nmlxkrkpllgd4r3xalhp";
+      name = "kdegraphics-mobipocket-15.08.3.tar.xz";
     };
   };
   kdegraphics-strigi-analyzer = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kdegraphics-strigi-analyzer-15.08.2.tar.xz";
-      sha256 = "192iprh66cp6dc9y14sk8022phdxcclliwv07i5hzby08c7p2llm";
-      name = "kdegraphics-strigi-analyzer-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kdegraphics-strigi-analyzer-15.08.3.tar.xz";
+      sha256 = "1nsi48i2qpa3gddwy3ib7a59i8a96p49nm48xisn2sym34mi31cq";
+      name = "kdegraphics-strigi-analyzer-15.08.3.tar.xz";
     };
   };
   kdegraphics-thumbnailers = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kdegraphics-thumbnailers-15.08.2.tar.xz";
-      sha256 = "1126xlh064djl50i4sb4bgdv34ypijlf4hbdcsyq1jh2i4c1h0zq";
-      name = "kdegraphics-thumbnailers-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kdegraphics-thumbnailers-15.08.3.tar.xz";
+      sha256 = "1ffs3ck1zl4795w73gjiwc146a6f2iqqiy4grmgnmg89irbqcnv7";
+      name = "kdegraphics-thumbnailers-15.08.3.tar.xz";
     };
   };
   kde-l10n-ar = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-ar-15.08.2.tar.xz";
-      sha256 = "0dyylzwvnssg0nh0pk6ll7zilnn6543a29fcfrr0spfsr0z8b08w";
-      name = "kde-l10n-ar-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-ar-15.08.3.tar.xz";
+      sha256 = "0kp82s1h3rmlizm7kb4f5iyr8ljlysic7vqawzv8qnga00w0r90f";
+      name = "kde-l10n-ar-15.08.3.tar.xz";
     };
   };
   kde-l10n-bg = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-bg-15.08.2.tar.xz";
-      sha256 = "081y0v23apsgbhfi2n4lfqa5868j8yl246z551crcmskwpdyhzd5";
-      name = "kde-l10n-bg-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-bg-15.08.3.tar.xz";
+      sha256 = "1769sr2qh3qblz28m104a3jgc0fg4bwy4annfyr2n48sizyan3qd";
+      name = "kde-l10n-bg-15.08.3.tar.xz";
     };
   };
   kde-l10n-bs = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-bs-15.08.2.tar.xz";
-      sha256 = "1ybnayqkb543sm8ql7m6hj8d8jzxggsghw46q2zxajgcg2p7mlsl";
-      name = "kde-l10n-bs-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-bs-15.08.3.tar.xz";
+      sha256 = "16lgja0cnf8v4szyb2nhlwzpnrzxhhbvjd7w6j0ryfrnrxfd6x7n";
+      name = "kde-l10n-bs-15.08.3.tar.xz";
     };
   };
   kde-l10n-ca = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-ca-15.08.2.tar.xz";
-      sha256 = "13akidgwm90754i085r7nxm27fq7wyw6h2rzfz13wh9azqlv9xrr";
-      name = "kde-l10n-ca-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-ca-15.08.3.tar.xz";
+      sha256 = "03hy9qi1lnwv73vn9phrcwr8m0jcj65d18jci01pvbpaj483pmxk";
+      name = "kde-l10n-ca-15.08.3.tar.xz";
     };
   };
   kde-l10n-ca_valencia = {
-    version = "ca_valencia-15.08.2";
+    version = "ca_valencia-15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-ca@valencia-15.08.2.tar.xz";
-      sha256 = "1fxxfsa857y689qxvv3bry8djah70wp3iympq4ki84sgs4sj1fr3";
-      name = "kde-l10n-ca_valencia-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-ca@valencia-15.08.3.tar.xz";
+      sha256 = "0h47xlgmlk527mafs834fswplpb8mrma4li247n1lyabyz6m6vhd";
+      name = "kde-l10n-ca_valencia-15.08.3.tar.xz";
     };
   };
   kde-l10n-cs = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-cs-15.08.2.tar.xz";
-      sha256 = "031p9wdx762ysb0w29gbkhm2c4axdlk1kflhd0fzff9s5sxjlykh";
-      name = "kde-l10n-cs-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-cs-15.08.3.tar.xz";
+      sha256 = "0w403x63nj27iv0lag691a88q15sf5jq0hqylgijcsl6djf1jd66";
+      name = "kde-l10n-cs-15.08.3.tar.xz";
     };
   };
   kde-l10n-da = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-da-15.08.2.tar.xz";
-      sha256 = "1mvb3jdp2vi3plq2c5cpqydbfzhahwvfpw7rh0ysii1c9hj9gva7";
-      name = "kde-l10n-da-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-da-15.08.3.tar.xz";
+      sha256 = "0v3rqc9mzg748qj0g1qm5g2qzjwlhrspkq4dryj792nj5d81xlmx";
+      name = "kde-l10n-da-15.08.3.tar.xz";
     };
   };
   kde-l10n-de = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-de-15.08.2.tar.xz";
-      sha256 = "0pc2653wfmf3znfbqzgzzi9k7rwwv6hm3q2chhd6mc29y5q8ay4s";
-      name = "kde-l10n-de-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-de-15.08.3.tar.xz";
+      sha256 = "0mvdf3ixc5nfrbv5j84pb668wkckcliswcdgd2laasv3s7a57mrg";
+      name = "kde-l10n-de-15.08.3.tar.xz";
     };
   };
   kde-l10n-el = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-el-15.08.2.tar.xz";
-      sha256 = "1k9wsrcw73dvnwj2kwg1aqcvvac4gbw7a6zb9cygkngrawl6llf7";
-      name = "kde-l10n-el-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-el-15.08.3.tar.xz";
+      sha256 = "0ywgk884l4kvqgaags7k87pm00241pygx630mc4ssrsw3nplv5lh";
+      name = "kde-l10n-el-15.08.3.tar.xz";
     };
   };
   kde-l10n-en_GB = {
-    version = "en_GB-15.08.2";
+    version = "en_GB-15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-en_GB-15.08.2.tar.xz";
-      sha256 = "0vgpl1kky8zbxq93sgrkwkky06s8ad0v5m2yvp72blkg04maja0q";
-      name = "kde-l10n-en_GB-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-en_GB-15.08.3.tar.xz";
+      sha256 = "002apvwkmmjqk0z5zrbbrri2wndg439xiwgkdr110a0hvak5v0nl";
+      name = "kde-l10n-en_GB-15.08.3.tar.xz";
     };
   };
   kde-l10n-eo = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-eo-15.08.2.tar.xz";
-      sha256 = "0bfrqgmzxasfsh0n3rb5bbjlzv54hygk3vc796zlm89rygxf9lr5";
-      name = "kde-l10n-eo-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-eo-15.08.3.tar.xz";
+      sha256 = "144lrkjchx4gxzj7isfyrcmbbmpgy4a1v1v9cc4a8hf9c1kxzglk";
+      name = "kde-l10n-eo-15.08.3.tar.xz";
     };
   };
   kde-l10n-es = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-es-15.08.2.tar.xz";
-      sha256 = "172m68cbhg1nln99nzg5srzaf2givfdjhkbhkwv83l1gya9r0p1j";
-      name = "kde-l10n-es-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-es-15.08.3.tar.xz";
+      sha256 = "160zsf6gss1ngz7pj4gykba83mwdi2id406plab5xznkqyanmp1v";
+      name = "kde-l10n-es-15.08.3.tar.xz";
     };
   };
   kde-l10n-et = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-et-15.08.2.tar.xz";
-      sha256 = "1zwfs1vz75k980256x6kjxydhf3cvbhq9gyz1af20xmm11pmmzpl";
-      name = "kde-l10n-et-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-et-15.08.3.tar.xz";
+      sha256 = "19gaswa1l5rlbh2k0b2bvbwafp6rnq3l6h5dv8q4yqhz1wsxcssr";
+      name = "kde-l10n-et-15.08.3.tar.xz";
     };
   };
   kde-l10n-eu = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-eu-15.08.2.tar.xz";
-      sha256 = "13ml8mja8fnrvamlrglg9gpv8afji91ayjk11w3iiknr4ml4ra38";
-      name = "kde-l10n-eu-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-eu-15.08.3.tar.xz";
+      sha256 = "1mrq2psh5n8gp1iqz41ilqwalpcyznjjqwmv2grf4ay9ss3ljbq0";
+      name = "kde-l10n-eu-15.08.3.tar.xz";
     };
   };
   kde-l10n-fa = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-fa-15.08.2.tar.xz";
-      sha256 = "11xgyk0jnv36vk4jd6l2dx9q5dydr9ldaq8fcmdgcwlcyi2ngbwd";
-      name = "kde-l10n-fa-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-fa-15.08.3.tar.xz";
+      sha256 = "0axhz589y8zwl45hgi6wfy7ns50d1d3837j5mbl6ghvgs2bayfrj";
+      name = "kde-l10n-fa-15.08.3.tar.xz";
     };
   };
   kde-l10n-fi = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-fi-15.08.2.tar.xz";
-      sha256 = "12v92y0sgw77l15vg61vmzdh4gx3455awaai8ywffvsxgl2plsbg";
-      name = "kde-l10n-fi-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-fi-15.08.3.tar.xz";
+      sha256 = "1xk5isp34xmv6rj2xsfjsjfwzbnc3db7jx2kp0a046n1ysv9g6q5";
+      name = "kde-l10n-fi-15.08.3.tar.xz";
     };
   };
   kde-l10n-fr = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-fr-15.08.2.tar.xz";
-      sha256 = "1dqrd8vr3i1kdkckd6i6vai40i61l6pahg2rrjgxdxgq2vbd0hzm";
-      name = "kde-l10n-fr-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-fr-15.08.3.tar.xz";
+      sha256 = "1bwp3d0c9654f7m8670gasba67zrhwggvzz3rrcl2x188a10483x";
+      name = "kde-l10n-fr-15.08.3.tar.xz";
     };
   };
   kde-l10n-ga = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-ga-15.08.2.tar.xz";
-      sha256 = "1jfbshfrqlsw6ai1iajkf3qy5cgw8glk928slw8j7mlnqpl0adjf";
-      name = "kde-l10n-ga-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-ga-15.08.3.tar.xz";
+      sha256 = "1zgk73ykybjxpl9zh7g5i86ygfvqiaimhg2nxxnb82maq2ba8p7y";
+      name = "kde-l10n-ga-15.08.3.tar.xz";
     };
   };
   kde-l10n-gl = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-gl-15.08.2.tar.xz";
-      sha256 = "198zb8v1bl2syypnk21hcdfk4a26rx3hc8clv01llyjh1x69ardb";
-      name = "kde-l10n-gl-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-gl-15.08.3.tar.xz";
+      sha256 = "0czfkcki0qd48rhn7nxww8961gn7lw06ydnd7d7a4isq9aw6649q";
+      name = "kde-l10n-gl-15.08.3.tar.xz";
     };
   };
   kde-l10n-he = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-he-15.08.2.tar.xz";
-      sha256 = "0vv8hl400vsn0vdag4ya20gxdzj15lfg2jbmp7yphna0l54ac6cv";
-      name = "kde-l10n-he-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-he-15.08.3.tar.xz";
+      sha256 = "0p89y331kbkkl8pbdsqjpf30qqdgpzrchnmpl3wvkv6zgq0m58i7";
+      name = "kde-l10n-he-15.08.3.tar.xz";
     };
   };
   kde-l10n-hi = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-hi-15.08.2.tar.xz";
-      sha256 = "07p4f98p68cjmni5abvzks1jm7y00s392ysbjpfg9x5nbfswza08";
-      name = "kde-l10n-hi-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-hi-15.08.3.tar.xz";
+      sha256 = "0n7p1vndyfmddcgm182nmbxppjiqpq2agm8dziddxvqsmb2pmrfg";
+      name = "kde-l10n-hi-15.08.3.tar.xz";
     };
   };
   kde-l10n-hr = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-hr-15.08.2.tar.xz";
-      sha256 = "04rq8m4cipnn9a88h8mfr0sphdqd7vrd1iywsrg2dcbimbjnq9jr";
-      name = "kde-l10n-hr-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-hr-15.08.3.tar.xz";
+      sha256 = "0nz0jj90zky4r5zphcy7pyblx00xh2i90fklddz1519afzxjzvc6";
+      name = "kde-l10n-hr-15.08.3.tar.xz";
     };
   };
   kde-l10n-hu = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-hu-15.08.2.tar.xz";
-      sha256 = "12g79klwjn5vfv1hyb0ly2576cp79zhp68rxansy3mk1sdwywdcl";
-      name = "kde-l10n-hu-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-hu-15.08.3.tar.xz";
+      sha256 = "0v4273knbz9q0jqwgljhxwwryfp4y5nd791qf4nnci8zngyrkwi4";
+      name = "kde-l10n-hu-15.08.3.tar.xz";
     };
   };
   kde-l10n-ia = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-ia-15.08.2.tar.xz";
-      sha256 = "0b5hxrhp292hg0lhq9fqzhcdc045j7qzjg7j715b9r26c89n8g56";
-      name = "kde-l10n-ia-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-ia-15.08.3.tar.xz";
+      sha256 = "1h4y8b0pn4a19cnvbgsr6ypcy77b3wfh0jn34rnbnvzmwgbbsdgq";
+      name = "kde-l10n-ia-15.08.3.tar.xz";
     };
   };
   kde-l10n-id = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-id-15.08.2.tar.xz";
-      sha256 = "1azmhrk42j1kk88v9i7343qpah39cfpqa9ikpzbnj7jzc269i951";
-      name = "kde-l10n-id-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-id-15.08.3.tar.xz";
+      sha256 = "1rcrpm05lwn4caaxg9zshvn7wvyjx2a580axyxfaldqbgzr4s4nl";
+      name = "kde-l10n-id-15.08.3.tar.xz";
     };
   };
   kde-l10n-is = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-is-15.08.2.tar.xz";
-      sha256 = "1l8nwzjqiqqa7l5w1d62simhrcgdvf0qg93wzsgp5ph8ycldkggh";
-      name = "kde-l10n-is-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-is-15.08.3.tar.xz";
+      sha256 = "1g40y3y9v88zi2ikzldi818khh4v1sgwfxajx7g37b8f713d5mk3";
+      name = "kde-l10n-is-15.08.3.tar.xz";
     };
   };
   kde-l10n-it = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-it-15.08.2.tar.xz";
-      sha256 = "0al6mv1kx2shpg7052p51kcccvpyzi8252k5c4hbab4jxhvbhcxm";
-      name = "kde-l10n-it-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-it-15.08.3.tar.xz";
+      sha256 = "1qb42pkj0b4nl6bf5dq5aiirm58divgz1xacrnrlgmis10rm04w6";
+      name = "kde-l10n-it-15.08.3.tar.xz";
     };
   };
   kde-l10n-ja = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-ja-15.08.2.tar.xz";
-      sha256 = "0z3lv3pv0mz9dgii3hv6fl4m22mc29qjrr6nann0y3yalsqhps01";
-      name = "kde-l10n-ja-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-ja-15.08.3.tar.xz";
+      sha256 = "0d4yd9x6gsabfhz22vbab7m30m31c92azhkchnxf4yhwa7x50aay";
+      name = "kde-l10n-ja-15.08.3.tar.xz";
     };
   };
   kde-l10n-kk = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-kk-15.08.2.tar.xz";
-      sha256 = "1x8j2a2cxck7shsr2l4yz8d4lanhl6y4x4xdv7c7l2pwchnki9by";
-      name = "kde-l10n-kk-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-kk-15.08.3.tar.xz";
+      sha256 = "00gwacqv00mqm262iard2jbfdwz7m5cap08k0iyw931kccdlg5k4";
+      name = "kde-l10n-kk-15.08.3.tar.xz";
     };
   };
   kde-l10n-km = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-km-15.08.2.tar.xz";
-      sha256 = "0c450yfiavm7wy3yr01idczg6svhsrjsi1jnd10nnc79w5iw8k13";
-      name = "kde-l10n-km-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-km-15.08.3.tar.xz";
+      sha256 = "0mc0w39262n00q1l8qkjgfwh7w3kwpfzq1y5qsldg948lppk8i5l";
+      name = "kde-l10n-km-15.08.3.tar.xz";
     };
   };
   kde-l10n-ko = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-ko-15.08.2.tar.xz";
-      sha256 = "0wkq67baydd17gn1zb7mi27grddgpxf9rfx6kcrkj50b610680wm";
-      name = "kde-l10n-ko-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-ko-15.08.3.tar.xz";
+      sha256 = "1bzkx74ymbwazpwm0pdjgq1pqi3x7wlq9v0h63q53wx89ald7lzj";
+      name = "kde-l10n-ko-15.08.3.tar.xz";
     };
   };
   kde-l10n-lt = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-lt-15.08.2.tar.xz";
-      sha256 = "1zvsh03vmpyp63fg00gm46d4rpmi7lm6i2b3xl3i8k1zr8s1c99v";
-      name = "kde-l10n-lt-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-lt-15.08.3.tar.xz";
+      sha256 = "0xkrxp815pbssb1myfchzjyxxgswznvimxdi29kckprsfhrycss9";
+      name = "kde-l10n-lt-15.08.3.tar.xz";
     };
   };
   kde-l10n-lv = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-lv-15.08.2.tar.xz";
-      sha256 = "0d84ljb9c2na1zfdq5qxk6bmdqfi0r6vqbsy8jz9qrnizqac3zg2";
-      name = "kde-l10n-lv-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-lv-15.08.3.tar.xz";
+      sha256 = "0rrnydq93rwg1j19vyw2g8d1zmql8yrdiqar6qsck5jljdhwzynv";
+      name = "kde-l10n-lv-15.08.3.tar.xz";
     };
   };
   kde-l10n-mr = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-mr-15.08.2.tar.xz";
-      sha256 = "0w1lx06ncbvyvwl9mq33hafy0n94aahym80dcapbgb1mhvscac8v";
-      name = "kde-l10n-mr-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-mr-15.08.3.tar.xz";
+      sha256 = "1kwypcdd3myw53gd0cwz8v43cfdfqhnnq5qrwcfyv6myv2sf1xg4";
+      name = "kde-l10n-mr-15.08.3.tar.xz";
     };
   };
   kde-l10n-nb = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-nb-15.08.2.tar.xz";
-      sha256 = "1faynqp07nvz8q5m4pcvbh01xys9zfrxbrqj3l45ihjq04461zwi";
-      name = "kde-l10n-nb-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-nb-15.08.3.tar.xz";
+      sha256 = "0blhr196gi1f3m8big82gf01qghj5f3nd8nzxx7i96lmvdc3k8na";
+      name = "kde-l10n-nb-15.08.3.tar.xz";
     };
   };
   kde-l10n-nds = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-nds-15.08.2.tar.xz";
-      sha256 = "1azap1ixrngri98my4ln9zva4xy6bhs9ybj6mwadwa8x97cpzawr";
-      name = "kde-l10n-nds-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-nds-15.08.3.tar.xz";
+      sha256 = "117xh1vh3fb23v7i6n9ljn4va3jvqy55mbz3zc997df79mkq0c02";
+      name = "kde-l10n-nds-15.08.3.tar.xz";
     };
   };
   kde-l10n-nl = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-nl-15.08.2.tar.xz";
-      sha256 = "1gcgncmg6m0vc672sy9034cwd9mpgy9q0pxhc4wfgbf0r4phiy7c";
-      name = "kde-l10n-nl-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-nl-15.08.3.tar.xz";
+      sha256 = "1zjjsq8p5ipj5rn9wl9jsixx1pj0ffdnq2myhb727z5lw07nafy9";
+      name = "kde-l10n-nl-15.08.3.tar.xz";
     };
   };
   kde-l10n-nn = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-nn-15.08.2.tar.xz";
-      sha256 = "0fdd83a6xmxx2vixs1l4fcrndyhwjpjxvk3v6zcp0yih464d1dl9";
-      name = "kde-l10n-nn-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-nn-15.08.3.tar.xz";
+      sha256 = "198x0kdj7w7iqx43llnwb01wshfzjkv2vdazyh7ip86r8whxrika";
+      name = "kde-l10n-nn-15.08.3.tar.xz";
     };
   };
   kde-l10n-pa = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-pa-15.08.2.tar.xz";
-      sha256 = "0dnni5k1gv7r7nd7pxd4dbhajw160z4g0wsjihijyxdg5j07lk3x";
-      name = "kde-l10n-pa-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-pa-15.08.3.tar.xz";
+      sha256 = "0i69lf888p4sahms347r1wadni5zg7d9w9a9vv02g7lk193n3r07";
+      name = "kde-l10n-pa-15.08.3.tar.xz";
     };
   };
   kde-l10n-pl = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-pl-15.08.2.tar.xz";
-      sha256 = "0b4x81pfk6448jirwj81nd4dh1kxj1k77xj566s6cwv2wym2wqhb";
-      name = "kde-l10n-pl-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-pl-15.08.3.tar.xz";
+      sha256 = "13b28slaqgwnqi2vw7mclyrbgrfhbpv5w4wb6l1mk6kv6ksh48a2";
+      name = "kde-l10n-pl-15.08.3.tar.xz";
     };
   };
   kde-l10n-pt = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-pt-15.08.2.tar.xz";
-      sha256 = "0r5qw93lnghn69zji26dncpa0mc631jr67sk9hp5fnxjaayxll20";
-      name = "kde-l10n-pt-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-pt-15.08.3.tar.xz";
+      sha256 = "046v644pqvg6nfc767mpgzn8bsrgakmqs94x55cg1y76q5v7fncs";
+      name = "kde-l10n-pt-15.08.3.tar.xz";
     };
   };
   kde-l10n-pt_BR = {
-    version = "pt_BR-15.08.2";
+    version = "pt_BR-15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-pt_BR-15.08.2.tar.xz";
-      sha256 = "1svx6576dkn4md2vmvif7zngn32jqc5zk857qbfm7asz1dil80gi";
-      name = "kde-l10n-pt_BR-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-pt_BR-15.08.3.tar.xz";
+      sha256 = "0kp71wgyrvbvrrlj46fnbjc7bh04wvqdnrv8grxc7zbn037m1kax";
+      name = "kde-l10n-pt_BR-15.08.3.tar.xz";
     };
   };
   kde-l10n-ro = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-ro-15.08.2.tar.xz";
-      sha256 = "0swxxl92djdac9afr3yxn0y47jyljaaqqixd70krlx4fijzkrzg8";
-      name = "kde-l10n-ro-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-ro-15.08.3.tar.xz";
+      sha256 = "0h3l3yb72v8lg6jzsczm37zilsidihjlfpaxbmjvyka440m3rhgz";
+      name = "kde-l10n-ro-15.08.3.tar.xz";
     };
   };
   kde-l10n-ru = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-ru-15.08.2.tar.xz";
-      sha256 = "1nawl89fygbyd6fyrja6syzc6i63sd29ixsyalm2n995m6vp73d6";
-      name = "kde-l10n-ru-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-ru-15.08.3.tar.xz";
+      sha256 = "0drxf6jpd6gd7wnqz3pa2f3x9ay1bsfycyahsbqny6vkqbas18rn";
+      name = "kde-l10n-ru-15.08.3.tar.xz";
     };
   };
   kde-l10n-sk = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-sk-15.08.2.tar.xz";
-      sha256 = "1bcbj359spx705zsc33mqzkj70r3afbp9inwslnz6irizif5bbd8";
-      name = "kde-l10n-sk-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-sk-15.08.3.tar.xz";
+      sha256 = "0jv5blx2biwpvazr6cc8kmvgqjp3ixmf547q453wkyrss9sg6n7y";
+      name = "kde-l10n-sk-15.08.3.tar.xz";
     };
   };
   kde-l10n-sl = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-sl-15.08.2.tar.xz";
-      sha256 = "16c9z7y54fm1w1r8x74wnamp1c1yxq6nkf9rjm4hqdi0nzk21l0c";
-      name = "kde-l10n-sl-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-sl-15.08.3.tar.xz";
+      sha256 = "1nnjxwhidfw5iyp1rl5sdqpkk3jn1p4csa7v05qssydplqz86plp";
+      name = "kde-l10n-sl-15.08.3.tar.xz";
     };
   };
   kde-l10n-sr = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-sr-15.08.2.tar.xz";
-      sha256 = "0xq91qc979h0cp94hjkkn8r45da5z33c4isrxk0y70i068rxakq7";
-      name = "kde-l10n-sr-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-sr-15.08.3.tar.xz";
+      sha256 = "0dqca94al2x68jyb7zq52vf2zirqlh6bqcgrnvd2h3gkz8yifgkf";
+      name = "kde-l10n-sr-15.08.3.tar.xz";
     };
   };
   kde-l10n-sv = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-sv-15.08.2.tar.xz";
-      sha256 = "0vh2kmw87likz3r4p7wjgg1yjpwm4c3qy4g45fbds028d7hlsjs5";
-      name = "kde-l10n-sv-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-sv-15.08.3.tar.xz";
+      sha256 = "1xa31mdcmlw955ybzfpas7fq38ffh9s00v1jvzpys008hhs5y4mr";
+      name = "kde-l10n-sv-15.08.3.tar.xz";
     };
   };
   kde-l10n-tr = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-tr-15.08.2.tar.xz";
-      sha256 = "08na2a7a4j74i15yayds21a53qbkkdq0jksam59ls6ckxnmqdpxn";
-      name = "kde-l10n-tr-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-tr-15.08.3.tar.xz";
+      sha256 = "0hfl5jbwkfhwpv1kbbcvinzbp6vks7kfn0s8n6c989icnr4y6p18";
+      name = "kde-l10n-tr-15.08.3.tar.xz";
     };
   };
   kde-l10n-ug = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-ug-15.08.2.tar.xz";
-      sha256 = "1d0jzfm7y8abfxikls8v7pw50pzxyil23p3bacyi1v10mgzpl27g";
-      name = "kde-l10n-ug-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-ug-15.08.3.tar.xz";
+      sha256 = "0aznwrbzvw4zh20zgrmbyvwg0f639vibsq7vf38z3bn1acw22cyh";
+      name = "kde-l10n-ug-15.08.3.tar.xz";
     };
   };
   kde-l10n-uk = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-uk-15.08.2.tar.xz";
-      sha256 = "1c8vdj2m2j3zphvhxxv0w72p67iq56krisi172j92ryixpy8d9rp";
-      name = "kde-l10n-uk-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-uk-15.08.3.tar.xz";
+      sha256 = "01h65ysizlcfbn3iim3pgs17y8l8q7qnsf1skqwh6ryib3z20l7d";
+      name = "kde-l10n-uk-15.08.3.tar.xz";
     };
   };
   kde-l10n-wa = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-wa-15.08.2.tar.xz";
-      sha256 = "0q0a9lnbq30arpwzdn2qn294x660fcdjnh7mlya99bvmdlqgxqbk";
-      name = "kde-l10n-wa-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-wa-15.08.3.tar.xz";
+      sha256 = "0pm4fcziv3jci6vdggxk1mlhfpppm1pgk035rzg8004yhj84mds1";
+      name = "kde-l10n-wa-15.08.3.tar.xz";
     };
   };
   kde-l10n-zh_CN = {
-    version = "zh_CN-15.08.2";
+    version = "zh_CN-15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-zh_CN-15.08.2.tar.xz";
-      sha256 = "0dkh2lw60ykc9p1dj2iqww9bhz90c3jichbfhsskk6gxzlvxnfsm";
-      name = "kde-l10n-zh_CN-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-zh_CN-15.08.3.tar.xz";
+      sha256 = "0cnahayw2nf23r7gks34y3llqsiljxv0v20v26nwarj7dcj4r7zv";
+      name = "kde-l10n-zh_CN-15.08.3.tar.xz";
     };
   };
   kde-l10n-zh_TW = {
-    version = "zh_TW-15.08.2";
+    version = "zh_TW-15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kde-l10n/kde-l10n-zh_TW-15.08.2.tar.xz";
-      sha256 = "0lg0cx5h6jqa6rscp891chvazngf83y6q2chzb97ywgbz8w7qmx5";
-      name = "kde-l10n-zh_TW-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-l10n/kde-l10n-zh_TW-15.08.3.tar.xz";
+      sha256 = "1sbfwwvqr6arckzdhs77ar9yz66f4bv1xndw05lpj899k3vd6mp4";
+      name = "kde-l10n-zh_TW-15.08.3.tar.xz";
     };
   };
   kdelibs = {
-    version = "4.14.13";
+    version = "4.14.14";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kdelibs-4.14.13.tar.xz";
-      sha256 = "1ba0nbhqf5yin8n2fwf3cj5yvln72g5yprfgfrgdqd7ybk21l4v1";
-      name = "kdelibs-4.14.13.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kdelibs-4.14.14.tar.xz";
+      sha256 = "055nq12rgilcb3m8gwjxwpalrj7bv2hjvf2h0axba4bjjl99n6b3";
+      name = "kdelibs-4.14.14.tar.xz";
     };
   };
   kdenetwork-filesharing = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kdenetwork-filesharing-15.08.2.tar.xz";
-      sha256 = "1rqihra8ssajqb6m596gf4dnvdm8p0wfdrj9krvslsijx58pm7wv";
-      name = "kdenetwork-filesharing-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kdenetwork-filesharing-15.08.3.tar.xz";
+      sha256 = "0fh11nrlmariyy1rn1ncsjzydidpfwqhr6r73mi8mqbry7vm1kp5";
+      name = "kdenetwork-filesharing-15.08.3.tar.xz";
     };
   };
   kdenetwork-strigi-analyzers = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kdenetwork-strigi-analyzers-15.08.2.tar.xz";
-      sha256 = "1a2hnpsm5842y2kra7lqc6v9hh0d6wn7kgnmahnb5sjw9n0xrry3";
-      name = "kdenetwork-strigi-analyzers-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kdenetwork-strigi-analyzers-15.08.3.tar.xz";
+      sha256 = "0adrr6clw75rqjcw1611xwzxb2ma6c4jcawrl5k3xa46qg37g4gk";
+      name = "kdenetwork-strigi-analyzers-15.08.3.tar.xz";
     };
   };
   kdenlive = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kdenlive-15.08.2.tar.xz";
-      sha256 = "1ykv8w0zhfbx3f3hcjc8qajv95bgjpr9965fjnzbmix8r7r76bwa";
-      name = "kdenlive-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kdenlive-15.08.3.tar.xz";
+      sha256 = "0k8x3wipndrg2d424i16bbnnjfv3b43v48jrid28r9vas4b7xghk";
+      name = "kdenlive-15.08.3.tar.xz";
     };
   };
   kdepim = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kdepim-15.08.2.tar.xz";
-      sha256 = "1i9f6q0a7si0wv9hdxfni07kvqvm587af5b1fcc100vwlambhqhl";
-      name = "kdepim-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kdepim-15.08.3.tar.xz";
+      sha256 = "1rpscplpawlqcya17p27gf25rqrv819xrp6vdk44c9p9jw31q4hz";
+      name = "kdepim-15.08.3.tar.xz";
     };
   };
   kdepimlibs = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kdepimlibs-15.08.2.tar.xz";
-      sha256 = "1lg8l7a6lfphrlygvpq6cr13zw6gq6nf7hrdlx1qps54wksf5ak2";
-      name = "kdepimlibs-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kdepimlibs-15.08.3.tar.xz";
+      sha256 = "0ad20g2wngf265zflaq8h2s25p911llaknf0ni3r63nb4px4jhlw";
+      name = "kdepimlibs-15.08.3.tar.xz";
     };
   };
   kdepim-runtime = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kdepim-runtime-15.08.2.tar.xz";
-      sha256 = "15za5ggfha20ibiihjsh0qq51jgps65lw34a1bv2gwyhh8nw6n8x";
-      name = "kdepim-runtime-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kdepim-runtime-15.08.3.tar.xz";
+      sha256 = "0lrwkkjgw8w5r5wgl5d006ainy5dnkpz8kdvbmbgb4hpvj79zba1";
+      name = "kdepim-runtime-15.08.3.tar.xz";
     };
   };
   kde-runtime = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kde-runtime-15.08.2.tar.xz";
-      sha256 = "0inwb29y5r2641g4qgahizk9znf1bgvbbvv8j43wif894a7xcddv";
-      name = "kde-runtime-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-runtime-15.08.3.tar.xz";
+      sha256 = "0n9nkbmdyf49aw1d85y8g9mx3rs3xnsy34izrbnwa35q9sjg3bsr";
+      name = "kde-runtime-15.08.3.tar.xz";
     };
   };
   kdesdk-kioslaves = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kdesdk-kioslaves-15.08.2.tar.xz";
-      sha256 = "1pmkfkqpd61y8ydgbb0f12xqgz63z7pnxjrc11iig1hkm5qfggkq";
-      name = "kdesdk-kioslaves-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kdesdk-kioslaves-15.08.3.tar.xz";
+      sha256 = "04kyfham56hzwyqydgplqkmn3888wfxsr4hl1690w61qx8m60x3a";
+      name = "kdesdk-kioslaves-15.08.3.tar.xz";
     };
   };
   kdesdk-strigi-analyzers = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kdesdk-strigi-analyzers-15.08.2.tar.xz";
-      sha256 = "02ndnm19p71v678kb8357l3i8dmwy121pw6b7vxj35ymg9knbzil";
-      name = "kdesdk-strigi-analyzers-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kdesdk-strigi-analyzers-15.08.3.tar.xz";
+      sha256 = "0dy60s6idbhy3anxqkk8cjrsnb5p1gizhzrxlq9kv2sk3rld1pxc";
+      name = "kdesdk-strigi-analyzers-15.08.3.tar.xz";
     };
   };
   kdesdk-thumbnailers = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kdesdk-thumbnailers-15.08.2.tar.xz";
-      sha256 = "07cqfk0f64n2dk2rnfc6zmsvg29m7s1zvj4vhxa0w3di65zlcjlj";
-      name = "kdesdk-thumbnailers-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kdesdk-thumbnailers-15.08.3.tar.xz";
+      sha256 = "077p0alajih4pq3g6k24a3cmsz61kb32iq1mzlkrbq8myadrkz86";
+      name = "kdesdk-thumbnailers-15.08.3.tar.xz";
     };
   };
   kde-wallpapers = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kde-wallpapers-15.08.2.tar.xz";
-      sha256 = "0iz5j0xhwnyab8l6384mnd3a6v6mfcg84161aszi1qsvr4qlv3zl";
-      name = "kde-wallpapers-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kde-wallpapers-15.08.3.tar.xz";
+      sha256 = "14wm02ywncd4n0ppwgzag467vp5h0005csnl6na2bb2qrcplpbjd";
+      name = "kde-wallpapers-15.08.3.tar.xz";
     };
   };
   kdewebdev = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kdewebdev-15.08.2.tar.xz";
-      sha256 = "0p7pwdzr0gjhjaabh4202r334xwmz0gxpncbgffydriwl9sckv88";
-      name = "kdewebdev-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kdewebdev-15.08.3.tar.xz";
+      sha256 = "1nsfmff34wpb9cmrmlj32yqihx4aha0bkn7h0j2jvkhqqnwxr802";
+      name = "kdewebdev-15.08.3.tar.xz";
     };
   };
   kdf = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kdf-15.08.2.tar.xz";
-      sha256 = "124zsl1w93d5f4b5g01cv38ykj4k5w73lb464a65dk3v2sb1fm82";
-      name = "kdf-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kdf-15.08.3.tar.xz";
+      sha256 = "05lfhivnj332m7br03pm0jflsdsv2kvzxadiic8gmm05yvx6k442";
+      name = "kdf-15.08.3.tar.xz";
     };
   };
   kdiamond = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kdiamond-15.08.2.tar.xz";
-      sha256 = "05waxcpri7qaik69fwbcmqqzskvic2jms8ja4s9x3a6s1fpzdgi8";
-      name = "kdiamond-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kdiamond-15.08.3.tar.xz";
+      sha256 = "1i2wr0fcqi8sji82m6frknvjd8dyvx9p0a8m2b75a5bl4ww95k0b";
+      name = "kdiamond-15.08.3.tar.xz";
     };
   };
   kfloppy = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kfloppy-15.08.2.tar.xz";
-      sha256 = "1vakzrky94j8z54b1m337m389s7ykm1vsqbfbqad1j2zajn2wms8";
-      name = "kfloppy-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kfloppy-15.08.3.tar.xz";
+      sha256 = "0gbagm6jkjj4gmpq0asjgngn3np5b77hry733krzglawdf4dh7jh";
+      name = "kfloppy-15.08.3.tar.xz";
     };
   };
   kfourinline = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kfourinline-15.08.2.tar.xz";
-      sha256 = "0xwgnnydbmcskqi289knnaq31l8bhw6r3h1dkfjfwhdmbwdfpmdc";
-      name = "kfourinline-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kfourinline-15.08.3.tar.xz";
+      sha256 = "01d94irpyq3z01yvcffw3h5qm8mbcipb855wi3na2ply8jm1kj1s";
+      name = "kfourinline-15.08.3.tar.xz";
     };
   };
   kgeography = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kgeography-15.08.2.tar.xz";
-      sha256 = "0p3i97qpny1gv0h97vh9n0cl2gr6q95wa7krpc99mk1dnvw7fsxm";
-      name = "kgeography-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kgeography-15.08.3.tar.xz";
+      sha256 = "1wfq98dhs2g1k8gw1p98slgyf3f1amwrkqf4ja4hsm4lcxqhmrh5";
+      name = "kgeography-15.08.3.tar.xz";
     };
   };
   kget = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kget-15.08.2.tar.xz";
-      sha256 = "11z7vxfx1f11k8izrmwnqfiqm3kbq3x009yv4klsga7fn73gbfzz";
-      name = "kget-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kget-15.08.3.tar.xz";
+      sha256 = "1wrpjm2hjhl7bz70ga71xmys7jnwq9xyvdr7glb3032z2w52sld5";
+      name = "kget-15.08.3.tar.xz";
     };
   };
   kgoldrunner = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kgoldrunner-15.08.2.tar.xz";
-      sha256 = "1al9fv62aj07mnv041g1dg1q46mkf996037g6xyxvnssbgqp5pn7";
-      name = "kgoldrunner-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kgoldrunner-15.08.3.tar.xz";
+      sha256 = "1xxgj46l3b7a8wmas7wsx8h9bg4hgcgiasx3dz27v870i01wzh7i";
+      name = "kgoldrunner-15.08.3.tar.xz";
     };
   };
   kgpg = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kgpg-15.08.2.tar.xz";
-      sha256 = "0q32s1yk1z5cf0zn5wvc8js1ms4dbzbmmc1ykjfqc1wy5bl0rybk";
-      name = "kgpg-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kgpg-15.08.3.tar.xz";
+      sha256 = "09am74pb3hs24z3npml98rsbsxzincn85wgvpym02f4gnc5abd42";
+      name = "kgpg-15.08.3.tar.xz";
     };
   };
   khangman = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/khangman-15.08.2.tar.xz";
-      sha256 = "14yrxs7wrlyi74da88mzlrxnnq7b4psk4y5q525f5rns3r46hjzc";
-      name = "khangman-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/khangman-15.08.3.tar.xz";
+      sha256 = "0fyy37v0ljv1mvxfd4p6x6lflqfmsh703p9j0mb0bd2f6wswwa1l";
+      name = "khangman-15.08.3.tar.xz";
     };
   };
   kholidays = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kholidays-15.08.2.tar.xz";
-      sha256 = "0wgvrcic43ml8cdwsniqsx2f3livzc01zfwi14jnfmqrjq1l02w0";
-      name = "kholidays-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kholidays-15.08.3.tar.xz";
+      sha256 = "0vf7pz6i2raw94mcxfzlk9s5hxnampx5lq5b5iyfad5d5vc24215";
+      name = "kholidays-15.08.3.tar.xz";
     };
   };
   kidentitymanagement = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kidentitymanagement-15.08.2.tar.xz";
-      sha256 = "0sq6sjrk4rlyyzd7shyjx8w34mpiag01gnqg6966jh8qflm0ll6g";
-      name = "kidentitymanagement-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kidentitymanagement-15.08.3.tar.xz";
+      sha256 = "0napyckxdv4vnj7n063qgiwa7xgwjab5qnz8rl1g60kidvvz7vw0";
+      name = "kidentitymanagement-15.08.3.tar.xz";
     };
   };
   kig = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kig-15.08.2.tar.xz";
-      sha256 = "0wnnn4d1lam2fzqa5g791c86nmdkww60alqgq0qb1njnn53d4hrl";
-      name = "kig-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kig-15.08.3.tar.xz";
+      sha256 = "15fws8yrdyz68qik1gf3fchrdfyk0mml9p923dzirb6faaz1sfpx";
+      name = "kig-15.08.3.tar.xz";
     };
   };
   kigo = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kigo-15.08.2.tar.xz";
-      sha256 = "08l5585sgyq6z8mwv7djfgijfzfz8v5jr7f8qd4l7915s51522g1";
-      name = "kigo-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kigo-15.08.3.tar.xz";
+      sha256 = "0h48kqadfhlm2jppld9ima4bbzgxnwcfg0y6zbhsvflavi6cpckn";
+      name = "kigo-15.08.3.tar.xz";
     };
   };
   killbots = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/killbots-15.08.2.tar.xz";
-      sha256 = "01bv5vfiq6cnbb856akrikfg5fpaq4yvnafjj2j0g8wdq7pblghs";
-      name = "killbots-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/killbots-15.08.3.tar.xz";
+      sha256 = "1zp68p83adi1qggs8j3pa5rgfdjqy5c4pmc9kp0ndcpk7hi7nwvz";
+      name = "killbots-15.08.3.tar.xz";
     };
   };
   kimap = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kimap-15.08.2.tar.xz";
-      sha256 = "1dh90acl2ib6jyyg23nd2swp0mdbm32mfm7a7320r9v0nyx74m0h";
-      name = "kimap-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kimap-15.08.3.tar.xz";
+      sha256 = "1wymg2s8yjckzc6zrb56fslbfbvzg41mi5fvnrf54d92lh4s90p0";
+      name = "kimap-15.08.3.tar.xz";
     };
   };
   kio-extras = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kio-extras-15.08.2.tar.xz";
-      sha256 = "0r90lb6823nrbq5mzdjxs53sgnj98bnz1fy80q5py3wwckmq715s";
-      name = "kio-extras-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kio-extras-15.08.3.tar.xz";
+      sha256 = "0psi8hj9s961l9xga92g9amv95h0im3nm12fc6vh184h2by2gddf";
+      name = "kio-extras-15.08.3.tar.xz";
     };
   };
   kiriki = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kiriki-15.08.2.tar.xz";
-      sha256 = "04524q3pnvasnvdfq0zn4aysliwwcq06kdd6233ql5pqr2fnzxgr";
-      name = "kiriki-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kiriki-15.08.3.tar.xz";
+      sha256 = "1w9yb38wwi45f8dfsi7wvaq6l9crjb6v0kp74cmaljgvirs3mmjk";
+      name = "kiriki-15.08.3.tar.xz";
     };
   };
   kiten = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kiten-15.08.2.tar.xz";
-      sha256 = "0d3jskqgjffsr3mkpviyhkp5wqfg44nf9scscl2d3hixda32bjf1";
-      name = "kiten-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kiten-15.08.3.tar.xz";
+      sha256 = "0rj4rka4wk3zh0s04ry8r4hqhajsi53qv1ns6ra1mbl1v32bw20g";
+      name = "kiten-15.08.3.tar.xz";
     };
   };
   kjumpingcube = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kjumpingcube-15.08.2.tar.xz";
-      sha256 = "1hp4xmdi6swsygqrpxchrkmj2q7xdykcp4maqkjpkwsb7iimldqc";
-      name = "kjumpingcube-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kjumpingcube-15.08.3.tar.xz";
+      sha256 = "0ccf3zcc31n78ing87h16rjk5kylz7k36lvgp4c9w6w8ahmgzp8g";
+      name = "kjumpingcube-15.08.3.tar.xz";
     };
   };
   kldap = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kldap-15.08.2.tar.xz";
-      sha256 = "1pq3wcixnmizfk5zakn5dzc4nzyvqv7ixlj8mixp0aa3d06pcmg4";
-      name = "kldap-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kldap-15.08.3.tar.xz";
+      sha256 = "1rnl40367fxq4cgqrrm27a93k3b6gns47gxv2afvjpq7dn142dc2";
+      name = "kldap-15.08.3.tar.xz";
     };
   };
   klettres = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/klettres-15.08.2.tar.xz";
-      sha256 = "1lqhyifrdwfymw69aj8pbimmw3qc6zly326gwrsg05xyk3qw2x6y";
-      name = "klettres-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/klettres-15.08.3.tar.xz";
+      sha256 = "14bbjx20zn5gmxhkgarh7y75j5806rpzbbh0rj2w2lpav8ggma90";
+      name = "klettres-15.08.3.tar.xz";
     };
   };
   klickety = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/klickety-15.08.2.tar.xz";
-      sha256 = "0dwzddygnhynib2qp8csbacdi2h0l3jsgscax2k0c4q67jlld59c";
-      name = "klickety-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/klickety-15.08.3.tar.xz";
+      sha256 = "1vqflsi4k21qj91z7h6hprswpzr7zpdnpkvwwiw2v2zwi4p8m967";
+      name = "klickety-15.08.3.tar.xz";
     };
   };
   klines = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/klines-15.08.2.tar.xz";
-      sha256 = "15gaz611vanz8jpp5hi57rg06q7l9hashs7izh5ffbixw1h8cnyv";
-      name = "klines-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/klines-15.08.3.tar.xz";
+      sha256 = "103wws54y0sal9w3ikbmksq0d2ndw34xpr972zjcmw06py4kx4kn";
+      name = "klines-15.08.3.tar.xz";
     };
   };
   kmag = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kmag-15.08.2.tar.xz";
-      sha256 = "1zc8kjldvry96gm1334w27s0g579sfgxmxc1nxra56b1c6gvslgs";
-      name = "kmag-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kmag-15.08.3.tar.xz";
+      sha256 = "1hmyc2n8gspd46k4g3k6jh0cfy7r0v5x17l7xrvj45nmhhhnivc0";
+      name = "kmag-15.08.3.tar.xz";
     };
   };
   kmahjongg = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kmahjongg-15.08.2.tar.xz";
-      sha256 = "1v21zs6hb3r4ms8lfxxmfl0yhwkb8xks2813711gqs9fkff326sl";
-      name = "kmahjongg-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kmahjongg-15.08.3.tar.xz";
+      sha256 = "07xsmd0zh9n01cy0fra2njz2qcgp1y7y5w9v4s2bkj3a4gd35ag8";
+      name = "kmahjongg-15.08.3.tar.xz";
     };
   };
   kmailtransport = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kmailtransport-15.08.2.tar.xz";
-      sha256 = "1g235pv3lrwl2smwg4f3f4sbc6ail31b5f98kbipqlpcxg3rdx9d";
-      name = "kmailtransport-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kmailtransport-15.08.3.tar.xz";
+      sha256 = "0g8983wq7x4w19k0fxypsk69hi5nrxldvq0a49jna2g2yfxi8w5l";
+      name = "kmailtransport-15.08.3.tar.xz";
     };
   };
   kmbox = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kmbox-15.08.2.tar.xz";
-      sha256 = "0csnbzi4xwrdzar060qgzl2w2rysil09asv5z4njh1rwhk8l8s4w";
-      name = "kmbox-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kmbox-15.08.3.tar.xz";
+      sha256 = "11fsvjmidb9s309wlcchgmb4viambqmw1njy6g5c2zpyfw9ryq8b";
+      name = "kmbox-15.08.3.tar.xz";
     };
   };
   kmime = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kmime-15.08.2.tar.xz";
-      sha256 = "1skq9csf08bc7g0s145ga5z8amiaimvff8rnwg2f8mafh59hbdmk";
-      name = "kmime-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kmime-15.08.3.tar.xz";
+      sha256 = "16pfzjdiaa9z2nq564bcrb82f50zh1cd8zyx7jzwzzw6cspv5n0q";
+      name = "kmime-15.08.3.tar.xz";
     };
   };
   kmines = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kmines-15.08.2.tar.xz";
-      sha256 = "1jbgr0nmh3bw0qi29z5lff1n25rdnyi50kfxk542ld1wqp97nmij";
-      name = "kmines-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kmines-15.08.3.tar.xz";
+      sha256 = "18ld9y50axz77cspm1rccm0w21h01zihbh0880gf2vjqwcv1ifxc";
+      name = "kmines-15.08.3.tar.xz";
     };
   };
   kmix = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kmix-15.08.2.tar.xz";
-      sha256 = "0vaja9yw12gwif53vj6hsm11k2p7rj0ndkk6sfv5nlhrid3h541q";
-      name = "kmix-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kmix-15.08.3.tar.xz";
+      sha256 = "0mkh7jvn26d6i38zzinx2gh9bl50scis17maj56c9m67i4m0hlk9";
+      name = "kmix-15.08.3.tar.xz";
     };
   };
   kmousetool = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kmousetool-15.08.2.tar.xz";
-      sha256 = "0j1hlp7fk1j3g2p408wm3biy4ac6jfk7f107pyxspwqkcd0d2pb1";
-      name = "kmousetool-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kmousetool-15.08.3.tar.xz";
+      sha256 = "07ddvl9nmigqq12mz27x0gw3lhb8a6ilfmqlx5sm810cp7b4claq";
+      name = "kmousetool-15.08.3.tar.xz";
     };
   };
   kmouth = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kmouth-15.08.2.tar.xz";
-      sha256 = "0vrpv1r88wqm66bakssnirn8c7pi0lndkp9lvv9wpxw1g3rkw652";
-      name = "kmouth-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kmouth-15.08.3.tar.xz";
+      sha256 = "1m0y8fdyh1glh27azi700zzvdpki0chjphnq5gx9339hbf97bdi4";
+      name = "kmouth-15.08.3.tar.xz";
     };
   };
   kmplot = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kmplot-15.08.2.tar.xz";
-      sha256 = "03q0691060a8x9kxwb33b44cac6difxs435r349jf1mcj34dz157";
-      name = "kmplot-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kmplot-15.08.3.tar.xz";
+      sha256 = "1zk8ccl2yhxgi18qkabjzm4ffcyg6flvvh3fy3hz7l1cikb6dza1";
+      name = "kmplot-15.08.3.tar.xz";
     };
   };
   knavalbattle = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/knavalbattle-15.08.2.tar.xz";
-      sha256 = "1m8y094fymiiqninv7nvgibq96kpfa1srzqfka8j64a4zp0zw7m3";
-      name = "knavalbattle-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/knavalbattle-15.08.3.tar.xz";
+      sha256 = "1g1dy0a0rvil31rj4s0z8gic9nb9xpx6xl7b91a36wj6cab57434";
+      name = "knavalbattle-15.08.3.tar.xz";
     };
   };
   knetwalk = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/knetwalk-15.08.2.tar.xz";
-      sha256 = "0hz98w0animdcmrzwsv5qiajwm9i1agz3qmalispq7hxnsss36wm";
-      name = "knetwalk-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/knetwalk-15.08.3.tar.xz";
+      sha256 = "0iapwmdy7i9dps3jf7ski75xdjg4bkp0fhz9njng11yx1g3a64qi";
+      name = "knetwalk-15.08.3.tar.xz";
     };
   };
   kolf = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kolf-15.08.2.tar.xz";
-      sha256 = "0afqdsymsgp5gkhghlmdxvk4z2mxpcfyhlxcj92070w1idm537jd";
-      name = "kolf-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kolf-15.08.3.tar.xz";
+      sha256 = "1akvicna1wzjcjdz2nz2mydmv9f39rff6jwcbj6blgdr1q56p4q7";
+      name = "kolf-15.08.3.tar.xz";
     };
   };
   kollision = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kollision-15.08.2.tar.xz";
-      sha256 = "13zxmjhj8wf4qjp9nzgrc4i5hfdyh23y8hq29v2pycls9m5crv79";
-      name = "kollision-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kollision-15.08.3.tar.xz";
+      sha256 = "1r9ijp1bgl20rv76if09695bkc5yrr99sn1s0193fjjh34fpd0w8";
+      name = "kollision-15.08.3.tar.xz";
     };
   };
   kolourpaint = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kolourpaint-15.08.2.tar.xz";
-      sha256 = "0m4vcjkaprlkv5lhvin88m3yfnnkd3vp839fz0m7f8nsrgr1lxsz";
-      name = "kolourpaint-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kolourpaint-15.08.3.tar.xz";
+      sha256 = "1miq2jvmqkgcwpzh2vzzb2dvmb8ziwr767ss5daqv540gpc8crjr";
+      name = "kolourpaint-15.08.3.tar.xz";
     };
   };
   kompare = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kompare-15.08.2.tar.xz";
-      sha256 = "0s7w2x4j420vs7sqpm6i52c30wxwvmrz8skhlk8fnypz5mldbqda";
-      name = "kompare-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kompare-15.08.3.tar.xz";
+      sha256 = "067m9xrnx6smscsk7wq9d8j2sv0g7ayfrdjwf4xsfa5jz8fh32s5";
+      name = "kompare-15.08.3.tar.xz";
     };
   };
   konquest = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/konquest-15.08.2.tar.xz";
-      sha256 = "1m6zd1a4s8593rsqk4six664ajlfn5izgc3n04xiyqsxyjq73gsr";
-      name = "konquest-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/konquest-15.08.3.tar.xz";
+      sha256 = "1v760lh6wx8kqyyrw2vb48n5x0ccl12dr3gy5dxyrs9sn0jpwz4r";
+      name = "konquest-15.08.3.tar.xz";
     };
   };
   konsole = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/konsole-15.08.2.tar.xz";
-      sha256 = "195m7is6lwhdh644isqcyfq57q78nslwb572jpyp77wp1vhvyl78";
-      name = "konsole-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/konsole-15.08.3.tar.xz";
+      sha256 = "0kpizwk3vwp25sincqnjrmvrhwv2a7vgacnw4yp2bxvdqqrb4zhr";
+      name = "konsole-15.08.3.tar.xz";
     };
   };
   kontactinterface = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kontactinterface-15.08.2.tar.xz";
-      sha256 = "0rdpncmb1jrsh3s4zc94b5sml6a1xj0pxfpb06zcvrn1cz90laap";
-      name = "kontactinterface-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kontactinterface-15.08.3.tar.xz";
+      sha256 = "1www2daa48r43dii2fb9s0x2ll3bsvhxnllypcs2fy5gzaj6wrff";
+      name = "kontactinterface-15.08.3.tar.xz";
     };
   };
   kopete = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kopete-15.08.2.tar.xz";
-      sha256 = "0c4h2g22wiyw2qdpdr2d3wchcbd0n289v2jlw8qfblzr0xcb6wzk";
-      name = "kopete-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kopete-15.08.3.tar.xz";
+      sha256 = "1x05w7ls0298shwr10f0vcbxcd0rvfvgfcwz2c5jrgb1zf968k8c";
+      name = "kopete-15.08.3.tar.xz";
     };
   };
   kpat = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kpat-15.08.2.tar.xz";
-      sha256 = "0jsvljvx8qf85gibxc8yb1p54z26yfixh04gx02sfkr66mz4jbrg";
-      name = "kpat-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kpat-15.08.3.tar.xz";
+      sha256 = "16lmrlxxl3kibzflw3lvcbp7xmklr4jqwh1aqqxw5lbybkz2vnah";
+      name = "kpat-15.08.3.tar.xz";
     };
   };
   kpimtextedit = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kpimtextedit-15.08.2.tar.xz";
-      sha256 = "1yq8fg1fasfw7nsndav6yhd6ig885z6pm1l6yimlfig1z114047i";
-      name = "kpimtextedit-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kpimtextedit-15.08.3.tar.xz";
+      sha256 = "1q1a77wnwny7j777vrhbqlz6z1z7jmil8raii4nbrwjqpdw8fc92";
+      name = "kpimtextedit-15.08.3.tar.xz";
     };
   };
   kppp = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kppp-15.08.2.tar.xz";
-      sha256 = "14svvk3nkxmj6rl6gz0204blh0m5j05glklan2ph179sd4x84sv0";
-      name = "kppp-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kppp-15.08.3.tar.xz";
+      sha256 = "0q5542f9aa98w94krib84yrjsk3ialaq43vd9bbdvf0j5wfzb276";
+      name = "kppp-15.08.3.tar.xz";
     };
   };
   kqtquickcharts = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kqtquickcharts-15.08.2.tar.xz";
-      sha256 = "0x946bc0zczxvc56ichbwb4ib2s7b222cmxq77f1dzyjpwi22jz1";
-      name = "kqtquickcharts-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kqtquickcharts-15.08.3.tar.xz";
+      sha256 = "0ppifqc9bz8hljniw6h5a31k38qbij9ydpwjzpg11m0s8a4havmm";
+      name = "kqtquickcharts-15.08.3.tar.xz";
     };
   };
   krdc = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/krdc-15.08.2.tar.xz";
-      sha256 = "0ldjf77svdl8qfr9nm4g34jfzpg7nzsc3pc960q4c2k1jwzywh76";
-      name = "krdc-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/krdc-15.08.3.tar.xz";
+      sha256 = "1vcfx703bniac9l7g6cg031nb18blypxb1i84dwfjavr4ib2im8l";
+      name = "krdc-15.08.3.tar.xz";
     };
   };
   kremotecontrol = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kremotecontrol-15.08.2.tar.xz";
-      sha256 = "08n63nj35x5vswaa61vdnlss27bqr3n979r79rrrmvnksjzpw1kx";
-      name = "kremotecontrol-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kremotecontrol-15.08.3.tar.xz";
+      sha256 = "0nxbw1zl8lcc9nvj5damz7m5q6bijm8mjx7isccf7j6mjazdxcin";
+      name = "kremotecontrol-15.08.3.tar.xz";
     };
   };
   kreversi = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kreversi-15.08.2.tar.xz";
-      sha256 = "180qh06cjxf0nilhism9lkl1qk24hxpva8ikk68yzm3fajskaiy4";
-      name = "kreversi-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kreversi-15.08.3.tar.xz";
+      sha256 = "1806m071wgnjg01lrjii9nh7spiwxm9cf0jl0gib7fk2cw9kw2fa";
+      name = "kreversi-15.08.3.tar.xz";
     };
   };
   krfb = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/krfb-15.08.2.tar.xz";
-      sha256 = "0p8h6b5rz2mh38y8gfx70c2ga7hpz5dxs86fm8jk696g1g4knq7l";
-      name = "krfb-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/krfb-15.08.3.tar.xz";
+      sha256 = "0dil3qpkf8m9449aqawjrilwvickb3nl3msj2g3svdnfvak7cv61";
+      name = "krfb-15.08.3.tar.xz";
     };
   };
   kross-interpreters = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kross-interpreters-15.08.2.tar.xz";
-      sha256 = "19jnh25kzfi2bf85pm0wdy1wv6csgk55gm97ccc80306frncyman";
-      name = "kross-interpreters-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kross-interpreters-15.08.3.tar.xz";
+      sha256 = "1msy3xg5n5g2ax074g23j889dadqn4mbqa3r5mlmdaz9bnny1n9r";
+      name = "kross-interpreters-15.08.3.tar.xz";
     };
   };
   kruler = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kruler-15.08.2.tar.xz";
-      sha256 = "1amn9h7fz3ywrw7xazrdxh0apsgn2gpql35wih8zpq4pznmcxs7j";
-      name = "kruler-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kruler-15.08.3.tar.xz";
+      sha256 = "1mr1pzn776a7xgq0rwqdn635s9y2bl0bh53i1c99h32jbxhn6fhb";
+      name = "kruler-15.08.3.tar.xz";
     };
   };
   ksaneplugin = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/ksaneplugin-15.08.2.tar.xz";
-      sha256 = "1b0hcv3w2h7pqdi3liwvahfn2y853b74xnx6rq92scrsk4grlri2";
-      name = "ksaneplugin-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/ksaneplugin-15.08.3.tar.xz";
+      sha256 = "18mpjl21rmbw95zc2b8f9sgi2sh922p0qj8d3jfhs3gggjy5hjfb";
+      name = "ksaneplugin-15.08.3.tar.xz";
     };
   };
   kscd = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kscd-15.08.2.tar.xz";
-      sha256 = "1n1l25a74kdrdz426gn3mk7kdwflg5xq1rjf9c0mfh7h6jqic4vx";
-      name = "kscd-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kscd-15.08.3.tar.xz";
+      sha256 = "0pqr342swpbwkqq7qwn7zs97kmbqpmwrlkkk0amaadgsfd9c9j40";
+      name = "kscd-15.08.3.tar.xz";
     };
   };
   kshisen = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kshisen-15.08.2.tar.xz";
-      sha256 = "0fnjjaf6q04snd0la89hgvijcm3kckh3c47w9a7ih0524331jlkb";
-      name = "kshisen-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kshisen-15.08.3.tar.xz";
+      sha256 = "0xx8lwxw4zfzwzaqdi1v7g00vzy74arfbfhvkxgs6k1gvhja0ckk";
+      name = "kshisen-15.08.3.tar.xz";
     };
   };
   ksirk = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/ksirk-15.08.2.tar.xz";
-      sha256 = "1934qwcbcmghz7iwjc2nimbyl0wv1lvpc8r45c8xwwdbsz0mvkwc";
-      name = "ksirk-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/ksirk-15.08.3.tar.xz";
+      sha256 = "1y6y0dcgvrpflfmircbf3nj7mjgvkbnddlmbxsws4h0737lqkg21";
+      name = "ksirk-15.08.3.tar.xz";
     };
   };
   ksnakeduel = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/ksnakeduel-15.08.2.tar.xz";
-      sha256 = "1nx3ac1vjfck7nhnyx5rf42rhjlq4gp3sairxm9ad3lrm885wg3v";
-      name = "ksnakeduel-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/ksnakeduel-15.08.3.tar.xz";
+      sha256 = "1zpz3fa9lp44iv5kxdwy1sk93bpkin9h64n6qj0lcpjj3f8a5cy5";
+      name = "ksnakeduel-15.08.3.tar.xz";
     };
   };
   ksnapshot = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/ksnapshot-15.08.2.tar.xz";
-      sha256 = "1sf9sshqnpnszvzix76k7swxiwgik9gw7rkpahwgq9vyczyjq3v8";
-      name = "ksnapshot-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/ksnapshot-15.08.3.tar.xz";
+      sha256 = "1xnbf73dr8z95kwq047zwjl0yml25nbnw5gnc319q2nlcnxk5gc3";
+      name = "ksnapshot-15.08.3.tar.xz";
     };
   };
   kspaceduel = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kspaceduel-15.08.2.tar.xz";
-      sha256 = "1k2nvlvm1s5hs4568h7f10mlc2yj3zdnnlzb8zff93j9ydh4rng8";
-      name = "kspaceduel-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kspaceduel-15.08.3.tar.xz";
+      sha256 = "12dbdybqfd5klfg427q48rbv2s63ybanay8c5d44znwk5qi9wwf7";
+      name = "kspaceduel-15.08.3.tar.xz";
     };
   };
   ksquares = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/ksquares-15.08.2.tar.xz";
-      sha256 = "0ba95qjkv2wh3g74384lgvk5vq4xc8q59cdiv8vcxllgpgh6hk4p";
-      name = "ksquares-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/ksquares-15.08.3.tar.xz";
+      sha256 = "1jr7slw9ml01zffj5kjv56fmwq8snz0jxdkczr2crr15cljrsmwj";
+      name = "ksquares-15.08.3.tar.xz";
     };
   };
   kstars = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kstars-15.08.2.tar.xz";
-      sha256 = "0x39djm78bafxxk1n36w7kp0a7jmwsxhbpap6k44awb9mdnd0410";
-      name = "kstars-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kstars-15.08.3.tar.xz";
+      sha256 = "17n2g1a53ps0cx1s62qz1s7yn8nn0sgq0p4ifdyq9rk5iwaq5yp8";
+      name = "kstars-15.08.3.tar.xz";
     };
   };
   ksudoku = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/ksudoku-15.08.2.tar.xz";
-      sha256 = "1v0c1dflz8sj1fqkqca1dhs4cb4ijy4nyg9i7ngqqw4pp9pdb2ks";
-      name = "ksudoku-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/ksudoku-15.08.3.tar.xz";
+      sha256 = "0rw02qdvv132i6gf2n1v37b7rmahzmmz5jx174j1syda4wwpyhgr";
+      name = "ksudoku-15.08.3.tar.xz";
     };
   };
   ksystemlog = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/ksystemlog-15.08.2.tar.xz";
-      sha256 = "1p5xlsll68jb02mg16fyy3jvfk20pf4nw6gn9ar0s7hvmk11p8zv";
-      name = "ksystemlog-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/ksystemlog-15.08.3.tar.xz";
+      sha256 = "12gacxya366rln3q9m2vzv28irrwnsj4lb1pqymxvsfyijfsjd7x";
+      name = "ksystemlog-15.08.3.tar.xz";
     };
   };
   kteatime = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kteatime-15.08.2.tar.xz";
-      sha256 = "1bgliai4y4b6ci8rr53yfdaw09am4db2zydf7v60qvc0lqaas8gx";
-      name = "kteatime-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kteatime-15.08.3.tar.xz";
+      sha256 = "1yij4230wc7qc9wzj5kam6jjv97xdcnz57j0kpa54iw1c3camwlx";
+      name = "kteatime-15.08.3.tar.xz";
     };
   };
   ktimer = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/ktimer-15.08.2.tar.xz";
-      sha256 = "05l46bbn7m67ncsm8bi283pdwixwqm85r51hi7fvqih6dwkc0143";
-      name = "ktimer-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/ktimer-15.08.3.tar.xz";
+      sha256 = "06p2dar8ry4xrkn21npxsnfkxq92sg66lmrnhqpkzv3dcvz98n50";
+      name = "ktimer-15.08.3.tar.xz";
     };
   };
   ktnef = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/ktnef-15.08.2.tar.xz";
-      sha256 = "0wqhj8a496zf0nns7jsncm9d21pd4qibrmqi5lsnvc3dj20ijrxm";
-      name = "ktnef-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/ktnef-15.08.3.tar.xz";
+      sha256 = "1r68cms5hv8drrdl2zhz8q9hsiln63c1rylbv68dxjz44w5jsw84";
+      name = "ktnef-15.08.3.tar.xz";
     };
   };
   ktouch = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/ktouch-15.08.2.tar.xz";
-      sha256 = "1wwqq52mwc1bnia05zf5pmrqd1ii537n8z72f99jgbvgnq6xyph1";
-      name = "ktouch-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/ktouch-15.08.3.tar.xz";
+      sha256 = "07piq43fngk7i5568vqpsd0xhfmfbwm4gwbdgvg0qx5cm2np00pp";
+      name = "ktouch-15.08.3.tar.xz";
     };
   };
   ktp-accounts-kcm = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/ktp-accounts-kcm-15.08.2.tar.xz";
-      sha256 = "1ikbaqgavah175s936n69j0na09jgmfk8vr0kb5g41zwabza58g8";
-      name = "ktp-accounts-kcm-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/ktp-accounts-kcm-15.08.3.tar.xz";
+      sha256 = "04q89vay1936rr94g9n54japqml7b40p8qh2nh8wc13vbiiffbq0";
+      name = "ktp-accounts-kcm-15.08.3.tar.xz";
     };
   };
   ktp-approver = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/ktp-approver-15.08.2.tar.xz";
-      sha256 = "0nib7c95aq2ij9sbpkf7rxynnqcdfk5ib9yrxqrh640cqb4ifbx6";
-      name = "ktp-approver-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/ktp-approver-15.08.3.tar.xz";
+      sha256 = "131gb9h8pqa2ac4kv8by5wa5f9cdv32413d2039ggkc0zfhyqlbb";
+      name = "ktp-approver-15.08.3.tar.xz";
     };
   };
   ktp-auth-handler = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/ktp-auth-handler-15.08.2.tar.xz";
-      sha256 = "0b4vnvhxj2j8lmd7lglbhzibwqag0pf2clhv50mvyc3mrp5l80r4";
-      name = "ktp-auth-handler-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/ktp-auth-handler-15.08.3.tar.xz";
+      sha256 = "1k9y83miwy77c2pjm8frm6zbkddm463bkdr08lrl3cf9y0azj6xl";
+      name = "ktp-auth-handler-15.08.3.tar.xz";
     };
   };
   ktp-common-internals = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/ktp-common-internals-15.08.2.tar.xz";
-      sha256 = "0ny9z1xwprkn7ckx809i2zi4n1bjrniigif0wbyfdmbyp7dz7sgi";
-      name = "ktp-common-internals-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/ktp-common-internals-15.08.3.tar.xz";
+      sha256 = "1p1qg4nkjmly7iilx6nra0qwn7g6kdwn4hw6bs2ikdvsg36kkr72";
+      name = "ktp-common-internals-15.08.3.tar.xz";
     };
   };
   ktp-contact-list = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/ktp-contact-list-15.08.2.tar.xz";
-      sha256 = "03c0h801zwjqkb9d58v5nk5nmkkhq3517d170pppx9cxza87nzm9";
-      name = "ktp-contact-list-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/ktp-contact-list-15.08.3.tar.xz";
+      sha256 = "15g7nnz8bggscpba74vk6riizv9xn5ndar1lkay77ikfbbyhb0x6";
+      name = "ktp-contact-list-15.08.3.tar.xz";
     };
   };
   ktp-contact-runner = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/ktp-contact-runner-15.08.2.tar.xz";
-      sha256 = "1pjc7sjiq4s96x0dyyc5kv7r00jmy1gi67y7y71vlxf9mccgi1fv";
-      name = "ktp-contact-runner-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/ktp-contact-runner-15.08.3.tar.xz";
+      sha256 = "09angbgm877x81wqsbn7cpg75skiv7x4war1lq1yma6nirs7369p";
+      name = "ktp-contact-runner-15.08.3.tar.xz";
     };
   };
   ktp-desktop-applets = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/ktp-desktop-applets-15.08.2.tar.xz";
-      sha256 = "0y1zm57smjr6ww89797bgwbrpm16yksscl3p5vhm0fapr0pw2g76";
-      name = "ktp-desktop-applets-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/ktp-desktop-applets-15.08.3.tar.xz";
+      sha256 = "18x08b38s46pz6crd1qg1b6qy7xxfhhp0pk2hsc5v4s7j931q8v9";
+      name = "ktp-desktop-applets-15.08.3.tar.xz";
     };
   };
   ktp-filetransfer-handler = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/ktp-filetransfer-handler-15.08.2.tar.xz";
-      sha256 = "06s1ibbgplafca6kwn44fyf36w8ygn17hg6c8wighg3603m72n0z";
-      name = "ktp-filetransfer-handler-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/ktp-filetransfer-handler-15.08.3.tar.xz";
+      sha256 = "1w7hnhbjmnl7ba1357b6q440266fgh7kyim9cn919i89aah2d11y";
+      name = "ktp-filetransfer-handler-15.08.3.tar.xz";
     };
   };
   ktp-kded-module = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/ktp-kded-module-15.08.2.tar.xz";
-      sha256 = "1hqrlb82fgsrdna1sinxl1dnx22dfb7j98bmrfvn6cxxkay866sq";
-      name = "ktp-kded-module-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/ktp-kded-module-15.08.3.tar.xz";
+      sha256 = "0s86d0yad758hgzbd9nb9hpq8iglq8bcmy7wdn0ji2nyppprf0jc";
+      name = "ktp-kded-module-15.08.3.tar.xz";
     };
   };
   ktp-send-file = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/ktp-send-file-15.08.2.tar.xz";
-      sha256 = "0kwamr99aj78v816gxiyr3bxivl6sy6dc29q59x03bkpdqdnn87n";
-      name = "ktp-send-file-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/ktp-send-file-15.08.3.tar.xz";
+      sha256 = "15pc0p6f87hwh19kwf6wzd04rf96r2z7xj8h89y86xwirn02spgv";
+      name = "ktp-send-file-15.08.3.tar.xz";
     };
   };
   ktp-text-ui = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/ktp-text-ui-15.08.2.tar.xz";
-      sha256 = "074cj52h2admwl8xpjj36jjjlpf199fpasylpga0xval6362vrln";
-      name = "ktp-text-ui-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/ktp-text-ui-15.08.3.tar.xz";
+      sha256 = "04lxwq5cm7rg7xras47lngzn0pwfy6yp41lrybl2ywg9rvbdfv4s";
+      name = "ktp-text-ui-15.08.3.tar.xz";
     };
   };
   ktuberling = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/ktuberling-15.08.2.tar.xz";
-      sha256 = "136wnpn04zahmk4q8yymjqix5q6h4w5ibfgp19kr1b2qm721g0p4";
-      name = "ktuberling-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/ktuberling-15.08.3.tar.xz";
+      sha256 = "0bs41wlriak2087r1q3zlkblcjl504g1dvhrxx3fymmxgxkir6k6";
+      name = "ktuberling-15.08.3.tar.xz";
     };
   };
   kturtle = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kturtle-15.08.2.tar.xz";
-      sha256 = "00wknl5z38jpvsh5zji4v4hf0077c6sl9fvwj5zyb0l033l3sqd4";
-      name = "kturtle-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kturtle-15.08.3.tar.xz";
+      sha256 = "0i4n3k2rji85y0x5aacrpab4jxx5skh3c96yfb9190s6ick3s4jg";
+      name = "kturtle-15.08.3.tar.xz";
     };
   };
   ktux = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/ktux-15.08.2.tar.xz";
-      sha256 = "0y6brihalwm6v96lin3fbakljgbk5ns2wcwr2bliy3y3g322b5p0";
-      name = "ktux-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/ktux-15.08.3.tar.xz";
+      sha256 = "0dcida7qjwglra7b17hb15dn240nnbsryps49d9k0fmv7y8cdicd";
+      name = "ktux-15.08.3.tar.xz";
     };
   };
   kubrick = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kubrick-15.08.2.tar.xz";
-      sha256 = "1h7idvf3dn68cfzlsgjbrn8yn1ykdyh9hp9400slb4m4d0qhhlk4";
-      name = "kubrick-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kubrick-15.08.3.tar.xz";
+      sha256 = "07bq203ds77v41nqjrydlls25whhpmaqq4wvqqnafz6j3122972m";
+      name = "kubrick-15.08.3.tar.xz";
     };
   };
   kuser = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kuser-15.08.2.tar.xz";
-      sha256 = "0cj60nhsvxqng6q32dzqb9ybns942wvqsa11r52f537v1z5csn6m";
-      name = "kuser-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kuser-15.08.3.tar.xz";
+      sha256 = "1lhrrrfg0zfkxv87kclfz7lw57knhalfclik9g2g84mjd2mrp23c";
+      name = "kuser-15.08.3.tar.xz";
     };
   };
   kwalletmanager = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kwalletmanager-15.08.2.tar.xz";
-      sha256 = "0b7krm8g7r4wmm792rshmxpp2jx6ln323cnk1iqxy3dnfs0wb7zc";
-      name = "kwalletmanager-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kwalletmanager-15.08.3.tar.xz";
+      sha256 = "1wh4gkqyz003qx50q4m35987rabjh80npg1hiqmybz60syq1bash";
+      name = "kwalletmanager-15.08.3.tar.xz";
     };
   };
   kwordquiz = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/kwordquiz-15.08.2.tar.xz";
-      sha256 = "032lrfxq6izhxmlg9d1jwz6sakvy2nidgjhaznlzaspag96jhgzv";
-      name = "kwordquiz-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/kwordquiz-15.08.3.tar.xz";
+      sha256 = "1fr68aq6f1ilfvfvcxvjg90dpwsig36nxb5v35rbpg1kjz8lxdl3";
+      name = "kwordquiz-15.08.3.tar.xz";
     };
   };
   libkcddb = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/libkcddb-15.08.2.tar.xz";
-      sha256 = "0kmxxcbjvd2iw0vhypm686pw3whnw14hc3xz224md76cr6wwmizm";
-      name = "libkcddb-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/libkcddb-15.08.3.tar.xz";
+      sha256 = "0yspqyj11q4l5b0hmy9068hg7kkbqwy5zq72clbf30lys6h9mqb6";
+      name = "libkcddb-15.08.3.tar.xz";
     };
   };
   libkcompactdisc = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/libkcompactdisc-15.08.2.tar.xz";
-      sha256 = "10ikmqjj9yjmd1knr7nq51fi3khp38p819qarszwlqj43kfbl61d";
-      name = "libkcompactdisc-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/libkcompactdisc-15.08.3.tar.xz";
+      sha256 = "1fvf219dj1dbl69nmdyzvyds9c1f77zqzqwv2l87brk5syshsywp";
+      name = "libkcompactdisc-15.08.3.tar.xz";
     };
   };
   libkdcraw = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/libkdcraw-15.08.2.tar.xz";
-      sha256 = "1msfcafj6dj4j2sxrwnlbs1lb4987cffpsqiiwg9imzfgq3c2nwy";
-      name = "libkdcraw-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/libkdcraw-15.08.3.tar.xz";
+      sha256 = "0m1zc23k68gm0hrdl18sizw5qnpa216m03lzik92m50msndz34bc";
+      name = "libkdcraw-15.08.3.tar.xz";
     };
   };
   libkdeedu = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/libkdeedu-15.08.2.tar.xz";
-      sha256 = "1s1jn80i5jrdz1rpl6m5y3kq1hb51wynxh67garlfch056dlcyfp";
-      name = "libkdeedu-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/libkdeedu-15.08.3.tar.xz";
+      sha256 = "1z8dp47900ybppnkpbfvckjkiib9q0ggqm0m83vbmgwzanx7k7sn";
+      name = "libkdeedu-15.08.3.tar.xz";
     };
   };
   libkdegames = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/libkdegames-15.08.2.tar.xz";
-      sha256 = "020m58lbjnh8h87jp3vdcd3w410d2sl1spc0j9amgjhaq6p5bpmr";
-      name = "libkdegames-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/libkdegames-15.08.3.tar.xz";
+      sha256 = "1jg6z4qfagijkr1b2hd05sr0jdb0qvfn1dphd43ma6gi7bl5khn4";
+      name = "libkdegames-15.08.3.tar.xz";
     };
   };
   libkeduvocdocument = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/libkeduvocdocument-15.08.2.tar.xz";
-      sha256 = "0yql1yg550q6jcjjsywrg5a0wdd7cwaaci87az75jq6b9mxf5il2";
-      name = "libkeduvocdocument-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/libkeduvocdocument-15.08.3.tar.xz";
+      sha256 = "1b16p9m14v8w0qg1v9jwiiljvpc2samlrcp6bszrld02ghii5649";
+      name = "libkeduvocdocument-15.08.3.tar.xz";
     };
   };
   libkexiv2 = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/libkexiv2-15.08.2.tar.xz";
-      sha256 = "03fcd7fk4jxnbadm0v59swvfm5cvsylvf4fgz8m6v1rqk5z5sw10";
-      name = "libkexiv2-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/libkexiv2-15.08.3.tar.xz";
+      sha256 = "0q44gjhdjiy74q5a40kmmcry0m0pnzw454j5ynrimd3nk8r2l6nl";
+      name = "libkexiv2-15.08.3.tar.xz";
     };
   };
   libkface = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/libkface-15.08.2.tar.xz";
-      sha256 = "1jnfg77nvppzvkas9bik5ciq57qdvjzqwxpk773zzx870bp6n3mi";
-      name = "libkface-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/libkface-15.08.3.tar.xz";
+      sha256 = "0jiv41f1mqf4813m882v84vczkyxmbmjf8bf7d5iq13i9xr190wg";
+      name = "libkface-15.08.3.tar.xz";
     };
   };
   libkgeomap = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/libkgeomap-15.08.2.tar.xz";
-      sha256 = "1qpkffs8hyz2ax7xhxy6r5mvm2kndzlis2vwwm2mca5ac5gi10hj";
-      name = "libkgeomap-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/libkgeomap-15.08.3.tar.xz";
+      sha256 = "1jscbp31q91viv2ym09zal4c0vx8xx3lqd4vg78mr9591y1bgr7l";
+      name = "libkgeomap-15.08.3.tar.xz";
     };
   };
   libkipi = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/libkipi-15.08.2.tar.xz";
-      sha256 = "1ryck2mzzy5v50sbs3xzw5g8kxpcj444fizq2bjnn1ffijkrific";
-      name = "libkipi-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/libkipi-15.08.3.tar.xz";
+      sha256 = "1v70k9xx8va0xk3439sqllh9sl9sx56bayl0b24gkdc3ddj8l0rk";
+      name = "libkipi-15.08.3.tar.xz";
     };
   };
   libkmahjongg = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/libkmahjongg-15.08.2.tar.xz";
-      sha256 = "0hj9qk9pwqvmrrrs0qq053vz4xw3m9fszvlz9289mqla93xm9kx7";
-      name = "libkmahjongg-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/libkmahjongg-15.08.3.tar.xz";
+      sha256 = "05zff791i1jih5abx6ywfagxh1rwc38nblfcfci66pqvknmya2x1";
+      name = "libkmahjongg-15.08.3.tar.xz";
     };
   };
   libkomparediff2 = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/libkomparediff2-15.08.2.tar.xz";
-      sha256 = "1myc4fa9nrrszjfl9mg5yxa26pmc0fk2bygbjmsm0glxbvj3yn32";
-      name = "libkomparediff2-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/libkomparediff2-15.08.3.tar.xz";
+      sha256 = "03aaz64s6f3xc6kv188p301qivnjh27xd8jpmj6yq98laj3v2xrl";
+      name = "libkomparediff2-15.08.3.tar.xz";
     };
   };
   libksane = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/libksane-15.08.2.tar.xz";
-      sha256 = "05c71hkivr14z1gmd2967d3d0r2cccgh7krqra209pyk83xnax7a";
-      name = "libksane-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/libksane-15.08.3.tar.xz";
+      sha256 = "01x24gxk0xj6j9zwyyavklphykgjb3w0wra61ivyrsim1za8y0qa";
+      name = "libksane-15.08.3.tar.xz";
     };
   };
   lokalize = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/lokalize-15.08.2.tar.xz";
-      sha256 = "15jilc5z3rd6ivaaw1hibsdv367n9zy163xi0b0m9szij5yzbcwd";
-      name = "lokalize-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/lokalize-15.08.3.tar.xz";
+      sha256 = "1xzxbgiq5q1v578d9w9pir279n05z2dyqlgq98213zhama6df18z";
+      name = "lokalize-15.08.3.tar.xz";
     };
   };
   lskat = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/lskat-15.08.2.tar.xz";
-      sha256 = "178yl7iwfv8j2kr89m3j4h9advr6sw4kb902hn62gdabp6p695s6";
-      name = "lskat-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/lskat-15.08.3.tar.xz";
+      sha256 = "1kag1wqr5m1r7s3i29h8ls2zrva2whmaxjj400zgn9j404dyjmmd";
+      name = "lskat-15.08.3.tar.xz";
     };
   };
   marble = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/marble-15.08.2.tar.xz";
-      sha256 = "00hv6vvwhw8d2z5zy19iqp2jniknjh75013wxraaz32rpw7n7i53";
-      name = "marble-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/marble-15.08.3.tar.xz";
+      sha256 = "0i18wss2zq3nfaxr9h7bnj3nb4ib07d3rylphhbjpi766z6k2cbl";
+      name = "marble-15.08.3.tar.xz";
     };
   };
   mplayerthumbs = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/mplayerthumbs-15.08.2.tar.xz";
-      sha256 = "1i3aqfn8y8nwlwpyg0bi640p6ig4y9fk42m4x62cv8zw3gfq4fyc";
-      name = "mplayerthumbs-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/mplayerthumbs-15.08.3.tar.xz";
+      sha256 = "03zda3iy20zq42kn51894yzsbmyq92gvrlzs2hm7fyp5lv199ybm";
+      name = "mplayerthumbs-15.08.3.tar.xz";
     };
   };
   okteta = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/okteta-15.08.2.tar.xz";
-      sha256 = "0c29linn7i8dx0cf1cr3l69h3galys50hh4fqyskr19c1c1l1nlb";
-      name = "okteta-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/okteta-15.08.3.tar.xz";
+      sha256 = "11540qlv95iwzmwi17ncbgklakywwdj4r4iylnkpw7fv4sx6fhrd";
+      name = "okteta-15.08.3.tar.xz";
     };
   };
   okular = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/okular-15.08.2.tar.xz";
-      sha256 = "15qn7wsqnc4b8klj1ld7j1xczdrhq66f1xwhcb87v3bccqn4b7zf";
-      name = "okular-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/okular-15.08.3.tar.xz";
+      sha256 = "1inbvcyafa8dfy7kignb2ksc984kriax7n2qrz3rxydw9n0r6bi5";
+      name = "okular-15.08.3.tar.xz";
     };
   };
   oxygen-icons = {
@@ -1875,115 +1867,115 @@
     };
   };
   palapeli = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/palapeli-15.08.2.tar.xz";
-      sha256 = "1izpy143zrzc19gsyl1bgvhxhy83b2cl38qqkrf1jxcynjwy7j33";
-      name = "palapeli-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/palapeli-15.08.3.tar.xz";
+      sha256 = "167svcjz7a8x032585jx63m94jy3xza5zb1b61rchn2xxbar7fx9";
+      name = "palapeli-15.08.3.tar.xz";
     };
   };
   parley = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/parley-15.08.2.tar.xz";
-      sha256 = "18jmls6il3j7kxhd7zv02r6zk834m4avjq28k0z4j6z9k8paf2a4";
-      name = "parley-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/parley-15.08.3.tar.xz";
+      sha256 = "07gshvn8c3ifyzfkscakc1x7kgbzgxcxx12f05n56nm60rbq89w5";
+      name = "parley-15.08.3.tar.xz";
     };
   };
   picmi = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/picmi-15.08.2.tar.xz";
-      sha256 = "168vn7yjkg1cngqb7crfrqz1mjciz0zznd60w38gws0rfdrk2dkr";
-      name = "picmi-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/picmi-15.08.3.tar.xz";
+      sha256 = "0cjj6xrdacvwpc6v6xb88j31m60k4gimc7k4hlmyv102vvagmv8y";
+      name = "picmi-15.08.3.tar.xz";
     };
   };
   poxml = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/poxml-15.08.2.tar.xz";
-      sha256 = "0ar61p52qikdv403nbfj0bpvzv17zbfskii25bxs3mq46basi6hx";
-      name = "poxml-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/poxml-15.08.3.tar.xz";
+      sha256 = "0vls7kdqswwx9cnn8iw1iwq9jl861cmzjk2avrdllpsa4vbjfxal";
+      name = "poxml-15.08.3.tar.xz";
     };
   };
   print-manager = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/print-manager-15.08.2.tar.xz";
-      sha256 = "02fr7h4nym7h6j6kvhcxl51g08fgbda678irx0i81a00i0qzqpph";
-      name = "print-manager-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/print-manager-15.08.3.tar.xz";
+      sha256 = "19jw5xpwhblxfdh1kf6dniwy3pqmqaq7cimdn8zrzliclfjdfq2m";
+      name = "print-manager-15.08.3.tar.xz";
     };
   };
   rocs = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/rocs-15.08.2.tar.xz";
-      sha256 = "03h07f2c20gl9yyiqz1mf285dxmc74ifrvg60pp601xwavg4khcv";
-      name = "rocs-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/rocs-15.08.3.tar.xz";
+      sha256 = "0qb0krn9cw5jn9djf3drg7c28lxnb6ih2a6q9a6wdl7snc4cxp5r";
+      name = "rocs-15.08.3.tar.xz";
     };
   };
   signon-kwallet-extension = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/signon-kwallet-extension-15.08.2.tar.xz";
-      sha256 = "1p22vqr5bgjvwjjc2n8xdw71ksvgw6cbykigh3i0cnz3l8sj6xf0";
-      name = "signon-kwallet-extension-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/signon-kwallet-extension-15.08.3.tar.xz";
+      sha256 = "0h7ixsxd2d9x4lqxilrajaxw260gdpj6lp68qgkq2vfv4v2hnfpv";
+      name = "signon-kwallet-extension-15.08.3.tar.xz";
     };
   };
   step = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/step-15.08.2.tar.xz";
-      sha256 = "1j9kb9mc7byqy3qq4bbcd7cx98dppvpq8k8j1gi4fm71q5jmdhdj";
-      name = "step-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/step-15.08.3.tar.xz";
+      sha256 = "092byp3y91ljp91n1qp3clsgi5bvfp9c8q90y14llkk3693nq6qa";
+      name = "step-15.08.3.tar.xz";
     };
   };
   superkaramba = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/superkaramba-15.08.2.tar.xz";
-      sha256 = "0xwf040xw0hnd4ky07xi59597mrwh10fkfcpygrb52ai1hjqm8yn";
-      name = "superkaramba-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/superkaramba-15.08.3.tar.xz";
+      sha256 = "1z9pz9syqlz180hb0imvabag3cmwfix89811vbz9lqwa91a4i199";
+      name = "superkaramba-15.08.3.tar.xz";
     };
   };
   svgpart = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/svgpart-15.08.2.tar.xz";
-      sha256 = "10kqh2i74a7hyx2vj1bb0zk13sp0hn1jb95bp71gwszyfrg207ky";
-      name = "svgpart-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/svgpart-15.08.3.tar.xz";
+      sha256 = "0pdj8dlxdws7ccafj4nldi3xwdzsmbyi2c079ddq3pbrglm2r16h";
+      name = "svgpart-15.08.3.tar.xz";
     };
   };
   sweeper = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/sweeper-15.08.2.tar.xz";
-      sha256 = "1hzscn0d317a41z30qb04xpkgx6iramj2zinrjga53cdsmgjgpq7";
-      name = "sweeper-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/sweeper-15.08.3.tar.xz";
+      sha256 = "0mmhw0d63b3m88x9wv2dynp1xm04f0kkhp6iqnm69y91wdgy7kq5";
+      name = "sweeper-15.08.3.tar.xz";
     };
   };
   syndication = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/syndication-15.08.2.tar.xz";
-      sha256 = "07ivknrhc253pcngwqjv6rjixcxc2b3kgwp9nzyiylxd7yp2qlf8";
-      name = "syndication-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/syndication-15.08.3.tar.xz";
+      sha256 = "05hjxpfyqd8z4q0142n5f97qcwpfwr131xxpvsj1pzrqrx52im27";
+      name = "syndication-15.08.3.tar.xz";
     };
   };
   umbrello = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/umbrello-15.08.2.tar.xz";
-      sha256 = "15nqd5b340dn6lv1l6whr0bn5hjfw4bh77y7zvji3sgmlzim4vll";
-      name = "umbrello-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/umbrello-15.08.3.tar.xz";
+      sha256 = "0pk4xc7sn1b1i1waxngrna33lhs2p03ny0vqm159qfhqawb3fpyg";
+      name = "umbrello-15.08.3.tar.xz";
     };
   };
   zeroconf-ioslave = {
-    version = "15.08.2";
+    version = "15.08.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/15.08.2/src/zeroconf-ioslave-15.08.2.tar.xz";
-      sha256 = "1q16xd6k8ps7zjpsjygpfkx0nqzfplfmn58363598fbvmiq7wq79";
-      name = "zeroconf-ioslave-15.08.2.tar.xz";
+      url = "${mirror}/stable/applications/15.08.3/src/zeroconf-ioslave-15.08.3.tar.xz";
+      sha256 = "1vbag0ajhr1b3psg4232j7y0nnff6gdn32r4212ybfzaxnh51479";
+      name = "zeroconf-ioslave-15.08.3.tar.xz";
     };
   };
 }

From bc9ec42958a6fd2143e06722e5d958ac6d64d7cc Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 11 Nov 2015 20:05:03 +0100
Subject: [PATCH 28/73] mkcast: init at 2015-03-13

newcast does not work due to
https://github.com/KeyboardFire/mkcast/issues/30

closes #6333
---
 pkgs/applications/video/mkcast/default.nix | 37 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/applications/video/mkcast/default.nix

diff --git a/pkgs/applications/video/mkcast/default.nix b/pkgs/applications/video/mkcast/default.nix
new file mode 100644
index 000000000000..c029e90f49cf
--- /dev/null
+++ b/pkgs/applications/video/mkcast/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchFromGitHub, wmctrl, pythonPackages, byzanz
+, xdpyinfo, makeWrapper, gtk, xorg, gnome3 }:
+
+stdenv.mkDerivation rec {
+  name = "mkcast-2015-03-13";
+
+  src = fetchFromGitHub {
+    owner = "KeyboardFire";
+    repo = "mkcast";
+    rev = "cac22cb6c6f8ec2006339698af5e9199331759e0";
+    sha256 = "15wp3n3z8gw7kjdxs4ahda17n844awhxsqbql5ipsdhqfxah2d8p";
+  };
+
+  buildInputs = with pythonPackages; [ makeWrapper pygtk gtk xlib ];
+
+  makeFlags = [ "PREFIX=$(out)" ];
+
+  postInstall = ''
+    for f in $out/bin/*; do #*/
+      wrapProgram $f --prefix PATH : "${xdpyinfo}/bin:${wmctrl}/bin/:${byzanz}/bin/:${gnome3.gnome_terminal}/bin/:$out/bin"
+    done
+
+    rm -r screenkey/.bzr
+    cp -R screenkey $out/bin
+
+    wrapProgram $out/bin/screenkey/screenkey \
+      --prefix PATH : "${xorg.xmodmap}/bin"\
+      --prefix PYTHONPATH : "$PYTHONPATH"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A tool for creating GIF screencasts of a terminal, with key presses overlaid";
+    homepage = https://github.com/KeyboardFire/mkcast;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ iElectric pSub ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6cce50022612..62e4dfc1edd1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2025,6 +2025,8 @@ let
 
   most = callPackage ../tools/misc/most { };
 
+  mkcast = callPackage ../applications/video/mkcast { };
+
   multitail = callPackage ../tools/misc/multitail { };
 
   netperf = callPackage ../applications/networking/netperf { };

From f3bd5e1bd5ba7b980c4b85c3d6695e595269968d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 11 Nov 2015 20:06:32 +0100
Subject: [PATCH 29/73] fio: 2.2.10 -> 2.2.11

---
 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 8589cbe92363..dccfbbcf747f 100644
--- a/pkgs/tools/system/fio/default.nix
+++ b/pkgs/tools/system/fio/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, libaio, python, zlib }:
 
-let version = "2.2.10"; in
+let version = "2.2.11"; in
 
 stdenv.mkDerivation rec {
   name = "fio-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     owner = "axboe";
     repo = "fio";
     rev = "fio-${version}";
-    sha256 = "0hg72k8cifw6lc46kyiic7ai4gqn2819d6g998vmx01jnlcixp8q";
+    sha256 = "0g26xvbb60f96ks8q7jpap0xc2grb5j5w4m4glz910ndgf0s45wm";
   };
 
   buildInputs = [ libaio python zlib ];

From 972381b66a9071bbd9e7623a3abea983dd589520 Mon Sep 17 00:00:00 2001
From: obadz <dav-github@odav.org>
Date: Sun, 8 Nov 2015 19:39:57 +0000
Subject: [PATCH 30/73] citrix-receiver: init at 13.2.1, fixes #8458

---
 .../remote/citrix-receiver/default.nix        | 157 ++++++++++++++++++
 pkgs/build-support/libredirect/libredirect.c  |   7 +
 pkgs/top-level/all-packages.nix               |   2 +
 3 files changed, 166 insertions(+)
 create mode 100644 pkgs/applications/networking/remote/citrix-receiver/default.nix

diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix
new file mode 100644
index 000000000000..2523c4459ece
--- /dev/null
+++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix
@@ -0,0 +1,157 @@
+{ stdenv
+, requireFile
+, makeWrapper
+, libredirect
+, busybox
+, file
+, makeDesktopItem
+, tzdata
+, cacert
+, glib
+, gtk
+, atk
+, gdk_pixbuf
+, cairo
+, pango
+, gnome3
+, xlibs
+, libpng12
+, freetype
+, fontconfig
+, gtk_engines
+, alsaLib
+}:
+
+stdenv.mkDerivation rec {
+  name = "citrix-receiver-${version}";
+  version = "13.2.1";
+  homepage = https://www.citrix.com/downloads/citrix-receiver/linux/receiver-for-linux-1321.html;
+
+  prefixWithBitness = if stdenv.is64bit then "linuxx64" else "linuxx86";
+
+  src = requireFile rec {
+    name = "${prefixWithBitness}-${version}.328635.tar.gz";
+    sha256 =
+      if stdenv.is64bit
+      then "3a11d663b1a11cc4ebb3e3595405d520ec279e1330462645c53edd5cc79d9ca0"
+      else "0yjw8q8mh4adns2i04m4p273vb4ifakixal7yi3hnbg43b36wfaw";
+    message = ''
+      In order to use Citrix Receiver, you need to comply with the Citrix EULA and download
+      the ${if stdenv.is64bit then "64-bit" else "32-bit"} binaries, .tar.gz from:
+
+      ${homepage}#ctx-dl-eula
+
+      Once you have downloaded the file, please use the following command and re-run the
+      installation:
+
+      nix-prefetch-url file://${name}
+    '';
+  };
+
+  phases = [ "unpackPhase" "installPhase" ];
+
+  sourceRoot = ".";
+
+  buildInputs = [
+    makeWrapper
+    busybox
+    file
+    gtk
+    gdk_pixbuf
+  ];
+
+  libPath = stdenv.lib.makeLibraryPath [
+    glib
+    gtk
+    atk
+    gdk_pixbuf
+    cairo
+    pango
+    gnome3.dconf
+    xlibs.libX11
+    xlibs.libXext
+    xlibs.libXrender
+    xlibs.libXinerama
+    xlibs.libXfixes
+    libpng12
+    gtk_engines
+    freetype
+    fontconfig
+    alsaLib
+    stdenv.cc.cc # Fixes: Can not load [..]/opt/citrix-icaclient/lib/ctxh264_fb.so:(null)
+  ];
+
+  desktopItem = makeDesktopItem {
+    name = "wfica";
+    desktopName = "Citrix Receiver";
+    genericName = "Citrix Receiver";
+    exec = "wfica";
+    icon = "wfica";
+    comment = "Connect to remote Citrix server";
+    categories = "GTK;GNOME;X-GNOME-NetworkSettings;Network;";
+    mimeType = "application/x-ica";
+  };
+
+  installPhase = ''
+    export ICAInstDir="$out/opt/citrix-icaclient"
+
+    sed -i \
+      -e 's,^main_install_menu$,install_ICA_client,g' \
+      -e 's,^integrate_ICA_client(),alias integrate_ICA_client=true\nintegrate_ICA_client_old(),g' \
+      -e 's,^ANSWER=""$,ANSWER="$INSTALLER_YES",' \
+      -e 's,/bin/true,true,g' \
+      ./${prefixWithBitness}/hinst
+
+    # Run the installer...
+    ./${prefixWithBitness}/hinst CDROM "`pwd`"
+
+    echo "Deleting broken links..."
+    for link in `find $ICAInstDir -type l `
+    do
+      [ -f "$link" ] || rm -v "$link"
+    done
+
+    echo "Expanding certificates..."
+    # As explained in https://wiki.archlinux.org/index.php/Citrix#Security_Certificates
+    pushd "$ICAInstDir/keystore/cacerts"
+    awk 'BEGIN {c=0;} /BEGIN CERT/{c++} { print > "cert." c ".pem"}' < ${cacert}/etc/ssl/certs/ca-bundle.crt
+    popd
+
+    echo "Patching executables..."
+    find $ICAInstDir -type f -exec file {} \; |
+      grep 'ELF.*executable' |
+      cut -f 1 -d : |
+      xargs -t -n 1 patchelf \
+        --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+        --set-rpath "$ICAInstDir:$libPath"
+
+    echo "Wrapping wfica..."
+    mkdir "$out/bin"
+
+    makeWrapper "$ICAInstDir/wfica -icaroot $ICAInstDir" "$out/bin/wfica" \
+      --set ICAROOT "$ICAInstDir" \
+      --set GTK_PATH "${gtk}/lib/gtk-2.0:${gnome3.gnome_themes_standard}/lib/gtk-2.0" \
+      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+      --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
+      --set LD_LIBRARY_PATH "$libPath" \
+      --set NIX_REDIRECTS "/usr/share/zoneinfo=${tzdata}/share/zoneinfo:/etc/zoneinfo=${tzdata}/share/zoneinfo:/etc/timezone=$ICAInstDir/timezone"
+
+    echo "We arbitrarily set the timezone to UTC. No known consequences at this point."
+    echo UTC > "$ICAInstDir/timezone"
+
+    echo "Installing desktop item..."
+    mkdir -p $out/share/applications
+    cp ${desktopItem}/share/applications/* $out/share/applications
+
+    # We introduce a dependency on the source file so that it need not be redownloaded everytime
+    echo $src >> "$out/share/nix_dependencies.pin"
+  '';
+
+  meta = with stdenv.lib; {
+    license = stdenv.lib.licenses.unfree;
+    homepage = homepage;
+    description = "Citrix Receiver";
+    maintainers = with maintainers; [ obadz a1russell ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/build-support/libredirect/libredirect.c b/pkgs/build-support/libredirect/libredirect.c
index c24560a1a493..e60319d09717 100644
--- a/pkgs/build-support/libredirect/libredirect.c
+++ b/pkgs/build-support/libredirect/libredirect.c
@@ -97,6 +97,13 @@ FILE * fopen(const char * path, const char * mode)
     return fopen_real(rewrite(path, buf), mode);
 }
 
+FILE * fopen64(const char * path, const char * mode)
+{
+    FILE * (*fopen64_real) (const char *, const char *) = dlsym(RTLD_NEXT, "fopen64");
+    char buf[PATH_MAX];
+    return fopen64_real(rewrite(path, buf), mode);
+}
+
 int __xstat(int ver, const char * path, struct stat * st)
 {
     int (*__xstat_real) (int ver, const char *, struct stat *) = dlsym(RTLD_NEXT, "__xstat");
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a9b6d6c1a819..dd12387c1cc6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1059,6 +1059,8 @@ let
 
   ciopfs = callPackage ../tools/filesystems/ciopfs { };
 
+  citrix_receiver = callPackage ../applications/networking/remote/citrix-receiver { };
+
   cmst = callPackage ../tools/networking/cmst { };
 
   colord = callPackage ../tools/misc/colord { };

From 00da78070eb55a494f70395151415362686d4a24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Jourdois?= <sjourdois@gmail.com>
Date: Wed, 11 Nov 2015 22:53:41 +0100
Subject: [PATCH 31/73] darwin: libdc1394: add missing darwin deps

---
 pkgs/development/libraries/libdc1394/default.nix | 7 +++++--
 pkgs/top-level/all-packages.nix                  | 4 +++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libdc1394/default.nix b/pkgs/development/libraries/libdc1394/default.nix
index 1d6b00abe539..c96a2b7f051a 100644
--- a/pkgs/development/libraries/libdc1394/default.nix
+++ b/pkgs/development/libraries/libdc1394/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, libraw1394, libusb1 }:
+{ stdenv, fetchurl, libraw1394, libusb1
+, CoreServices
+}:
 
 stdenv.mkDerivation rec {
   name = "libdc1394-2.2.3";
@@ -9,7 +11,8 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ libusb1 ]
-    ++ stdenv.lib.optional stdenv.isLinux [ libraw1394 ];
+    ++ stdenv.lib.optional stdenv.isLinux libraw1394
+    ++ stdenv.lib.optional stdenv.isDarwin CoreServices;
 
   meta = {
     homepage = http://sourceforge.net/projects/libdc1394/;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dd12387c1cc6..eee8e528fbbd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6959,7 +6959,9 @@ let
 
   libdbusmenu_qt5 = callPackage ../development/libraries/libdbusmenu-qt/qt-5.4.nix { };
 
-  libdc1394 = callPackage ../development/libraries/libdc1394 { };
+  libdc1394 = callPackage ../development/libraries/libdc1394 {
+    inherit (darwin.apple_sdk.frameworks) CoreServices;
+  };
 
   libdc1394avt = callPackage ../development/libraries/libdc1394avt { };
 

From eed349522f7d6440da04da4996d407f06c019fb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Jourdois?= <sjourdois@gmail.com>
Date: Wed, 11 Nov 2015 22:55:44 +0100
Subject: [PATCH 32/73] darwin: libsndfile: add missing darwin deps

---
 pkgs/development/libraries/libsndfile/default.nix | 7 +++++--
 pkgs/top-level/all-packages.nix                   | 4 +++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libsndfile/default.nix b/pkgs/development/libraries/libsndfile/default.nix
index 1fac43fa2a97..48a2999e7af9 100644
--- a/pkgs/development/libraries/libsndfile/default.nix
+++ b/pkgs/development/libraries/libsndfile/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, flac, libogg, libvorbis, pkgconfig }:
+{ stdenv, fetchurl, flac, libogg, libvorbis, pkgconfig
+, Carbon
+}:
 
 stdenv.mkDerivation rec {
   name = "libsndfile-1.0.25";
@@ -8,7 +10,8 @@ stdenv.mkDerivation rec {
     sha256 = "10j8mbb65xkyl0kfy0hpzpmrp0jkr12c7mfycqipxgka6ayns0ar";
   };
 
-  buildInputs = [ pkgconfig flac libogg libvorbis ];
+  buildInputs = [ pkgconfig flac libogg libvorbis ]
+    ++ stdenv.lib.optional stdenv.isDarwin Carbon;
 
   # need headers from the Carbon.framework in /System/Library/Frameworks to
   # compile this on darwin -- not sure how to handle
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eee8e528fbbd..4fa3bfeb29ef 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7433,7 +7433,9 @@ let
   # To bootstrap SBCL, I need CLisp 2.44.1; it needs libsigsegv 2.5
   libsigsegv_25 = callPackage ../development/libraries/libsigsegv/2.5.nix { };
 
-  libsndfile = callPackage ../development/libraries/libsndfile { };
+  libsndfile = callPackage ../development/libraries/libsndfile {
+    inherit (darwin.apple_sdk.frameworks) Carbon;
+  };
 
   libsodium = callPackage ../development/libraries/libsodium { };
 

From b096a863a906abd8db2ec0ba1ee390c9fbaee2f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Jourdois?= <sjourdois@gmail.com>
Date: Wed, 11 Nov 2015 22:56:16 +0100
Subject: [PATCH 33/73] darwin: wavpack: add missing darwin deps

---
 pkgs/development/libraries/wavpack/default.nix | 4 +++-
 pkgs/top-level/all-packages.nix                | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/wavpack/default.nix b/pkgs/development/libraries/wavpack/default.nix
index 074b26e3f3a5..3bdb1392bd97 100644
--- a/pkgs/development/libraries/wavpack/default.nix
+++ b/pkgs/development/libraries/wavpack/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl }:
+{ lib, stdenv, fetchurl, libiconv }:
 
 stdenv.mkDerivation rec {
   name = "wavpack-${version}";
@@ -6,6 +6,8 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  buildInputs = stdenv.lib.optional stdenv.isDarwin libiconv;
+
   patches = [
     # backported from
     # https://github.com/dbry/WavPack/commit/12867b33e2de3e95b88d7cb6f449ce0c5c87cdd5
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4fa3bfeb29ef..1545405af9f0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8525,7 +8525,9 @@ let
     libpng = libpng12;
   };
 
-  wavpack = callPackage ../development/libraries/wavpack { };
+  wavpack = callPackage ../development/libraries/wavpack {
+    inherit (darwin) libiconv;
+  };
 
   wayland = callPackage ../development/libraries/wayland {
     graphviz = graphviz-nox;

From a2bf64a3810a2624c125b95153fea429f898cf4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?St=C3=A9phane=20Jourdois?= <sjourdois@gmail.com>
Date: Wed, 11 Nov 2015 22:56:38 +0100
Subject: [PATCH 34/73] darwin: ffmpeg-full: add some missing darwin deps

---
 pkgs/development/libraries/ffmpeg-full/default.nix | 7 ++++++-
 pkgs/top-level/all-packages.nix                    | 4 +---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix
index 654741283f95..a7d081c565dd 100644
--- a/pkgs/development/libraries/ffmpeg-full/default.nix
+++ b/pkgs/development/libraries/ffmpeg-full/default.nix
@@ -138,6 +138,10 @@
 , optimizationsDeveloper ? true
 , extraWarningsDeveloper ? false
 , strippingDeveloper ? false
+/*
+ *  Darwin frameworks
+ */
+, Cocoa, CoreServices
 }:
 
 /* Maintainer notes:
@@ -405,7 +409,8 @@ stdenv.mkDerivation rec {
     ++ optionals x11grabExtlib [ libXext libXfixes ]
     ++ optionals nonfreeLicensing [ faac fdk_aac openssl ]
     ++ optional ((isLinux || isFreeBSD) && libva != null) libva
-    ++ optionals isLinux [ alsaLib libraw1394 libv4l ];
+    ++ optionals isLinux [ alsaLib libraw1394 libv4l ]
+    ++ optionals stdenv.isDarwin [ Cocoa CoreServices ];
 
   # Build qt-faststart executable
   buildPhase = optional qtFaststartProgram ''make tools/qt-faststart'';
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1545405af9f0..3005bca8844f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6256,18 +6256,16 @@ let
     # The following need to be fixed on Darwin
     frei0r = if stdenv.isDarwin then null else frei0r;
     game-music-emu = if stdenv.isDarwin then null else game-music-emu;
-    gsm = if stdenv.isDarwin then null else gsm;
     libjack2 = if stdenv.isDarwin then null else libjack2;
     libmodplug = if stdenv.isDarwin then null else libmodplug;
-    libssh = if stdenv.isDarwin then null else libssh;
     libvpx = if stdenv.isDarwin then null else libvpx;
     openal = if stdenv.isDarwin then null else openal;
-    openjpeg_1 = if stdenv.isDarwin then null else openjpeg_1;
     libpulseaudio = if stdenv.isDarwin then null else libpulseaudio;
     samba = if stdenv.isDarwin then null else samba;
     vid-stab = if stdenv.isDarwin then null else vid-stab;
     x265 = if stdenv.isDarwin then null else x265;
     xavs = if stdenv.isDarwin then null else xavs;
+    inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices;
   };
 
   ffmpegthumbnailer = callPackage ../development/libraries/ffmpegthumbnailer { };

From 6de80cb21bc5d3011876be9236aadf625b86af6a Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Wed, 11 Nov 2015 15:46:39 -0800
Subject: [PATCH 35/73] libevdev: 1.4.4 -> 1.4.5

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

diff --git a/pkgs/development/libraries/libevdev/default.nix b/pkgs/development/libraries/libevdev/default.nix
index cfc2c2f931ba..c1587cedd169 100644
--- a/pkgs/development/libraries/libevdev/default.nix
+++ b/pkgs/development/libraries/libevdev/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, python }:
 
 stdenv.mkDerivation rec {
-  name = "libevdev-1.4.4";
+  name = "libevdev-1.4.5";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/libevdev/${name}.tar.xz";
-    sha256 = "1aa5pj2ivhvpxcbvgh80ghmzpkwyahw9a2bxi7sjhvkakcv7k6gd";
+    sha256 = "07faqb47c7sjl25rc788cbslyiv5ijky0jc4g6312qz0hv55h779";
   };
 
   buildInputs = [ python ];

From fc620ae093592def95fead25de4bd7b2c2638bfb Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 11 Nov 2015 18:16:39 +0300
Subject: [PATCH 36/73] winetricks: 20150706 -> 20151110

---
 pkgs/misc/emulators/wine/versions.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/emulators/wine/versions.nix b/pkgs/misc/emulators/wine/versions.nix
index f3f1e3bff15b..697183db3b73 100644
--- a/pkgs/misc/emulators/wine/versions.nix
+++ b/pkgs/misc/emulators/wine/versions.nix
@@ -24,7 +24,7 @@
     sha256 = "12r100gv34k44kia14wrfa42q0cjd8ir8vi8cx1b6hgnzw3x0gzk";
   };
   winetricks = {
-    version = "20150706";
-    sha256 = "1n9xbav4q0dpfdmmjcahi4izyhvy2f7ddrq7gyhrm6pxs2zli888";
+    version = "20151110";
+    sha256 = "1aq8rkqq8mdksb5c4gc3k9plh3zc28gffi7y29v9vyk4f25j64sz";
   };
 }

From 160d38711e43c47f9e38082df269bec41244f8ee Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 12 Nov 2015 03:03:21 +0300
Subject: [PATCH 37/73] unnethack: move to games section

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dd12387c1cc6..ec7133d33c0b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14129,6 +14129,8 @@ let
 
   ue4demos = recurseIntoAttrs (callPackage ../games/ue4demos { });
 
+  unnethack = callPackage ../games/unnethack { };
+
   ut2004demo = callPackage ../games/ut2004demo { };
 
   vdrift = callPackage ../games/vdrift { };

From 7aeb535eb19f5e7481b8476fa022c37c5e931a01 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 12 Nov 2015 03:03:43 +0300
Subject: [PATCH 38/73] innoextract: 1.4 -> 1.5

---
 pkgs/tools/archivers/innoextract/default.nix | 31 +++++++++++++-------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/archivers/innoextract/default.nix b/pkgs/tools/archivers/innoextract/default.nix
index d8c88b6ee657..6b442e7bf660 100644
--- a/pkgs/tools/archivers/innoextract/default.nix
+++ b/pkgs/tools/archivers/innoextract/default.nix
@@ -1,10 +1,21 @@
-{stdenv, fetchurl, cmake, python, doxygen, lzma, boost}:
-stdenv.mkDerivation rec {
-  name = "innoextract-1.4";
-  src = fetchurl {
-    url = "http://constexpr.org/innoextract/files/${name}.tar.gz";
-    sha256 = "1j8wj0ijdnfh0r9qjr7ykp9v3n2yd4qisxln81bl6474w5d4njas";
-  };
-  buildInputs = [ python doxygen lzma boost ];
-  nativeBuildInputs = [ cmake ];
-}
\ No newline at end of file
+{stdenv, fetchurl, cmake, python, doxygen, lzma, boost}:
+
+stdenv.mkDerivation rec {
+  name = "innoextract-1.5";
+
+  src = fetchurl {
+    url = "http://constexpr.org/innoextract/files/${name}.tar.gz";
+    sha256 = "1ks8z8glak63xvqlv7dnmlzkjrwsn81lhybmai2mja6g5jclwngj";
+  };
+
+  buildInputs = [ python doxygen lzma boost ];
+  nativeBuildInputs = [ cmake ];
+
+  meta = with stdenv.lib; {
+    description = "A tool to unpack installers created by Inno Setup";
+    homepage = "http://constexpr.org/innoextract/";
+    platforms = platforms.linux;
+    license = licenses.zlib;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}

From 16790fe2f37c4f6a2173ff8c77859540dfe1e280 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 12 Nov 2015 03:45:51 +0300
Subject: [PATCH 39/73] Revert "unnethack: move to games section"

This reverts commit 160d38711e43c47f9e38082df269bec41244f8ee.
Never again do "trivial patches" late in the night.
---
 pkgs/top-level/all-packages.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ec7133d33c0b..dd12387c1cc6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14129,8 +14129,6 @@ let
 
   ue4demos = recurseIntoAttrs (callPackage ../games/ue4demos { });
 
-  unnethack = callPackage ../games/unnethack { };
-
   ut2004demo = callPackage ../games/ut2004demo { };
 
   vdrift = callPackage ../games/vdrift { };

From e41923bb7c3fb2e46f9ff9041dfa596e84feb42c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 12 Nov 2015 12:00:41 +0100
Subject: [PATCH 40/73] python blaze: 0.8.2 -> 0.8.3

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f9c9a6698f1d..af91ce094837 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1462,22 +1462,26 @@ let
 
   blaze = buildPythonPackage rec {
     name = "blaze-${version}";
-    version = "0.8.2";
+    version = "0.8.3";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/b/blaze/${name}.tar.gz";
-      sha256 = "1abedabf2a1e62dd059e0942d60f27337763de26f5e3f61ed55baaf97723b624";
+      sha256 = "4f8ceb1248ba44f833f5a46a18b6ea44130a5999d5234324d0456b5f9ffe716b";
     };
 
+    buildInputs = with self; [ pytest ];
     propagatedBuildInputs = with self; [
       numpy
       pandas
       datashape
       odo
       toolz
+      cytoolz
       multipledispatch
       sqlalchemy9 # sqlalchemy8 should also work
       psutil
+      numba
+      h5py
     ];
 
     meta = {

From 8f4bd8799392df9bae49f49f52010523efdd3021 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 12 Nov 2015 12:01:01 +0100
Subject: [PATCH 41/73] python llvmlite: 0.7.0 -> 0.8.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index af91ce094837..0397c0508f4b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8514,13 +8514,13 @@ let
 
   llvmlite = buildPythonPackage rec {
     name = "llvmlite-${version}";
-    version = "0.7.0";
+    version = "0.8.0";
 
     disabled = isPyPy;
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/l/llvmlite/${name}.tar.gz";
-      sha256 = "6d780980da05d2d82465991bce42c1b4625018d67feae17c672c6a9d5ad0bb1a";
+      sha256 = "a10d8d5e597c6a54ec418baddd31a51a0b7937a895d75b240d890aead946081c";
     };
 
     llvm = pkgs.llvm;

From fef06f6875ef4641871b74ae3ba8e4d8d21a9682 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 12 Nov 2015 12:01:50 +0100
Subject: [PATCH 42/73] python munch: init at 2.0.4

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0397c0508f4b..8ef726a5838a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8954,6 +8954,22 @@ let
     };
   };
 
+  munch = buildPythonPackage rec {
+    name = "munch-${version}";
+    version = "2.0.4";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/m/munch/${name}.tar.gz";
+      sha256 = "1420683a94f3a2ffc77935ddd28aa9ccb540dd02b75e02ed7ea863db437ab8b2";
+    };
+
+    meta = {
+      description = "A dot-accessible dictionary (a la JavaScript objects)";
+      license = licenses.mit;
+      homepage = http://github.com/Infinidat/munch;
+    };
+  };
+
   nototools = buildPythonPackage rec {
     version = "git-2015-09-16";
     name = "nototools-${version}";

From 00a1c28c4583029b59894181147eeca65091af69 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 12 Nov 2015 12:02:07 +0100
Subject: [PATCH 43/73] python numba: 0.21.0 -> 0.22.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8ef726a5838a..2fac3a4ea335 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10067,12 +10067,12 @@ let
   };
 
   numba = buildPythonPackage rec {
-    version = "0.21.0";
+    version = "0.22.1";
     name = "numba-${version}";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/n/numba/${name}.tar.gz";
-      sha256 = "1806d2f6ad49ad891e9ac6fed0cc0b0489cbfcd9ba2dc81081c1c30091e77604";
+      sha256 = "8194c41cdf96c16e3b3d246c0381daf4e587d1ada761f410efecb8315c2cdda3";
     };
 
     propagatedBuildInputs = with self; [numpy llvmlite argparse] ++ optional (!isPy3k) funcsigs ++ optional (isPy27 || isPy33) singledispatch;

From 050b462b3b084adfd35bd0283ccde2e4c0958d20 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Wed, 11 Nov 2015 17:09:45 +0100
Subject: [PATCH 44/73] dwm: 6.0 -> 6.1

---
 pkgs/applications/window-managers/dwm/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/window-managers/dwm/default.nix b/pkgs/applications/window-managers/dwm/default.nix
index 626a0926a676..c11a9a539896 100644
--- a/pkgs/applications/window-managers/dwm/default.nix
+++ b/pkgs/applications/window-managers/dwm/default.nix
@@ -1,17 +1,17 @@
-{stdenv, fetchurl, libX11, libXinerama, patches ? []}:
+{stdenv, fetchurl, libX11, libXinerama, libXft, patches ? []}:
 
 let
-  name = "dwm-6.0";
+  name = "dwm-6.1";
 in
 stdenv.mkDerivation {
   inherit name;
  
   src = fetchurl {
     url = "http://dl.suckless.org/dwm/${name}.tar.gz";
-    sha256 = "0mpbivy9j80l1jqq4bd4g4z8s5c54fxrjj44avmfwncjwqylifdj";
+    sha256 = "1zkmwb6df6m254shx06ly90c0q4jl70skk1pvkixpb7hcxhwbxn2";
   };
  
-  buildInputs = [ libX11 libXinerama ];
+  buildInputs = [ libX11 libXinerama libXft ];
  
   prePatch = ''sed -i "s@/usr/local@$out@" config.mk'';
 

From 7a1c4ab324f5812eb1fc173dd2540a596b54baae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 12 Nov 2015 13:33:41 +0100
Subject: [PATCH 45/73] jenkins: 1.636 -> 1.637 (security fixes)

https://wiki.jenkins-ci.org/display/SECURITY/Jenkins+Security+Advisory+2015-11-11
---
 .../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 a2abe048f1ba..dc4eaaa8b3e9 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 = "1.636";
+  version = "1.637";
 
   src = fetchurl {
     url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war";
-    sha256 = "1j6wz5npgsgnkg5xyf3ylrziasxwx5plqr72zwx41a83yvncyx3k";
+    sha256 = "12d231gbr56gwnq34h8jzchln01gq3mx37s9f91ri0k6damsaafb";
   };
   meta = with stdenv.lib; {
     description = "An extendable open source continuous integration server";

From 30313d5c6ea1e850860fd968ff7dcb2b9e37064f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 12 Nov 2015 13:40:01 +0100
Subject: [PATCH 46/73] jenkins: 1.637 -> 1.638 (important security fixes)

I fat fingered the previous update, *this* is the real important
security updates:

https://wiki.jenkins-ci.org/display/SECURITY/Jenkins+Security+Advisory+2015-11-11
---
 .../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 dc4eaaa8b3e9..edc551a70541 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 = "1.637";
+  version = "1.638";
 
   src = fetchurl {
     url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war";
-    sha256 = "12d231gbr56gwnq34h8jzchln01gq3mx37s9f91ri0k6damsaafb";
+    sha256 = "1kbx9n2hj8znw0ykvgvrlf2v472f1nkdwix6a2v4rjxkgmghxmh8";
   };
   meta = with stdenv.lib; {
     description = "An extendable open source continuous integration server";

From a4ea5e4e4b1571fe95c34ad3f36930765a510527 Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Thu, 12 Nov 2015 14:51:47 +0100
Subject: [PATCH 47/73] nsd: 4.13 -> 4.16

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

diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix
index 218c7dc73f18..2bd755d03246 100644
--- a/pkgs/servers/dns/nsd/default.nix
+++ b/pkgs/servers/dns/nsd/default.nix
@@ -13,11 +13,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nsd-4.1.3";
+  name = "nsd-4.1.6";
 
   src = fetchurl {
     url = "http://www.nlnetlabs.nl/downloads/nsd/${name}.tar.gz";
-    sha256 = "1r8p5lqj7i6xi4k04jr1n9r1p8gwy3547hzsi8xags6krnav4z09";
+    sha256 = "0pvpsxhil60m21h3pqlzs0l5m8qd3l6j8fkjyfg8plwmbh2j5xl8";
   };
 
   buildInputs = [ libevent openssl ];

From c461162e2aa98623eeb5c891ab71fc7b2c4b1a98 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 12 Nov 2015 16:32:09 +0300
Subject: [PATCH 48/73] steam: fix license agreement dialog

---
 pkgs/games/steam/chrootenv.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix
index 1152d48bdd85..2a5795be93c4 100644
--- a/pkgs/games/steam/chrootenv.nix
+++ b/pkgs/games/steam/chrootenv.nix
@@ -9,6 +9,8 @@ buildFHSUserEnv {
   targetPkgs = pkgs: with pkgs; [
       steamPackages.steam
       steamPackages.steam-fonts
+      # License agreement
+      gnome3.zenity
       # Errors in output without those
       pciutils
       python2

From d9274215e7291b793242ca754d5e78280845ad9d Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Thu, 12 Nov 2015 19:25:15 +0100
Subject: [PATCH 49/73] add myself as a maintainer

---
 lib/maintainers.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 8a0e4042ecd1..ed1f9c2d9429 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -233,6 +233,7 @@
   renzo = "Renzo Carbonara <renzocarbonara@gmail.com>";
   rick68 = "Wei-Ming Yang <rick68@gmail.com>";
   rickynils = "Rickard Nilsson <rickynils@gmail.com>";
+  rnhmjoj = "Michele Guerini Rocco <micheleguerinirocco@me.com>";
   rob = "Rob Vermaas <rob.vermaas@gmail.com>";
   robberer = "Longrin Wischnewski <robberer@freakmail.de>";
   robbinch = "Robbin C. <robbinch33@gmail.com>";

From 03121cd5aca1ad06abb918d2344b68f5f491deed Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Thu, 12 Nov 2015 19:40:00 +0100
Subject: [PATCH 50/73] imv: init at 1.0.0

---
 pkgs/applications/graphics/imv/default.nix | 28 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/applications/graphics/imv/default.nix

diff --git a/pkgs/applications/graphics/imv/default.nix b/pkgs/applications/graphics/imv/default.nix
new file mode 100644
index 000000000000..b5d44eb4ccef
--- /dev/null
+++ b/pkgs/applications/graphics/imv/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub,
+  SDL2, freeimage
+}:
+
+stdenv.mkDerivation rec {
+  name = "imv";
+  version = "1.0.0";
+
+  src = fetchFromGitHub {
+    owner = "eXeC64";
+    repo  = "imv";
+    rev = "f2ce793d628e88825eff3364b293104cb0bdb582";
+    sha256 = "1xqaqbfjgksbjmy1yy7q4sv5bak7w8va60xa426jzscy9cib2sgh";
+  };
+
+  buildInputs = [ SDL2 freeimage ];
+
+  configurePhase = "substituteInPlace Makefile --replace /usr $out";
+
+  meta = with stdenv.lib; {
+    description = "A command line image viewer for tiling window managers";
+    homepage    = https://github.com/eXeC64/imv; 
+    license     = licenses.mit;
+    maintainers = with maintainers; [ rnhmjoj ];
+    platforms   = platforms.unix;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b83861392faa..18acf4f8ac9d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6589,6 +6589,8 @@ let
     libpng = libpng12;
   };
 
+  imv = callPackage ../applications/graphics/imv/default.nix { };
+
   imlib2 = callPackage ../development/libraries/imlib2 { };
 
   ijs = callPackage ../development/libraries/ijs { };

From 394d5176c23c10a67fd3f0b5cdc141da29547651 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Tue, 29 Sep 2015 02:49:07 +0000
Subject: [PATCH 51/73] macopix: init at 1.7.4

---
 pkgs/games/macopix/default.nix  | 18 ++++++++++++++++++
 pkgs/top-level/all-packages.nix |  4 ++++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/games/macopix/default.nix

diff --git a/pkgs/games/macopix/default.nix b/pkgs/games/macopix/default.nix
new file mode 100644
index 000000000000..ce0691dae1b4
--- /dev/null
+++ b/pkgs/games/macopix/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, pkgconfig, gtk, openssl }:
+
+stdenv.mkDerivation rec {
+  name = "macopix-1.7.4";
+
+  src = fetchurl {
+    url = "http://rosegray.sakura.ne.jp/macopix/${name}.tar.bz2";
+    sha256 = "0sgnr0wrw3hglcnsyvipll7icfv69ssmyw584zfhk1rgramlkzyb";
+  };
+
+  buildInputs = [ pkgconfig gtk openssl ];
+
+  meta = {
+    description = "Mascot Constructive Pilot for X";
+    homepage = http://rosegray.sakura.ne.jp/macopix/index-e.html;
+    license = stdenv.lib.licenses.gpl2Plus;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 747932298b85..312c2c1d4659 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13906,6 +13906,10 @@ let
     guile = guile_1_8;
   };
 
+  macopix = callPackage ../games/macopix {
+    gtk = gtk2;
+  };
+
   mars = callPackage ../games/mars { };
 
   megaglest = callPackage ../games/megaglest {};

From 95a723d516f2a2cf28bf7b754e83dc5aacf8e792 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sat, 24 Oct 2015 10:30:10 +0000
Subject: [PATCH 52/73] nixos: add actkbd package to environment in actkbd
 module

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

diff --git a/nixos/modules/services/hardware/actkbd.nix b/nixos/modules/services/hardware/actkbd.nix
index 82de362c371b..b16a8f50a3d8 100644
--- a/nixos/modules/services/hardware/actkbd.nix
+++ b/nixos/modules/services/hardware/actkbd.nix
@@ -125,6 +125,9 @@ in
       };
     };
 
+    # For testing
+    environment.systemPackages = [ pkgs.actkbd ];
+
   };
 
 }

From 05f6e0fdaa0f992027912bd62b57b23b47814581 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Thu, 1 Oct 2015 20:14:52 +0000
Subject: [PATCH 53/73] SDL: better pulseaudioSupport logic

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 747932298b85..ae80c4cee1b6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8215,7 +8215,9 @@ let
     openglSupport = mesaSupported;
     alsaSupport = stdenv.isLinux;
     x11Support = !stdenv.isCygwin;
-    pulseaudioSupport = stdenv.isLinux;
+    pulseaudioSupport = if (config ? pulseaudio)
+                        then config.pulseaudio
+                        else stdenv.isLinux;
     inherit (darwin.apple_sdk.frameworks) OpenGL CoreAudio CoreServices AudioUnit Kernel Cocoa;
   };
 
@@ -8237,7 +8239,7 @@ let
     openglSupport = mesaSupported;
     alsaSupport = stdenv.isLinux;
     x11Support = !stdenv.isCygwin;
-    pulseaudioSupport = false; # better go through ALSA
+    pulseaudioSupport = config.pulseaudio or false; # better go through ALSA
     inherit (darwin.apple_sdk.frameworks) AudioUnit Cocoa CoreAudio CoreServices ForceFeedback OpenGL;
   };
 

From 2d14b2d540dcc50d840f34a1c3dbc0d0e351b560 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Sat, 19 Sep 2015 22:09:21 +0000
Subject: [PATCH 54/73] emacs-packages: fix metas, add descriptions, deprecate
 git-commit-mode

---
 pkgs/top-level/emacs-packages.nix | 311 +++++++++++++++++++++++-------
 1 file changed, 246 insertions(+), 65 deletions(-)

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index b89cabd4d311..caa0d07ead6d 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -240,7 +240,10 @@ let self = _self // overrides;
       sha256 = "14pjsb026mgjf6l3dggy255knr7c1vfmgb6kgafmkzvr96aglcdc";
     };
     files = [ "autotetris-mode.el" ];
-    meta =  { license = unlicense; };
+    meta = {
+      description = "For those who are too busy to play Emacs tetris";
+      license = unlicense;
+    };
   };
 
   avy = melpaBuild rec {
@@ -252,7 +255,10 @@ let self = _self // overrides;
       rev    = version;
       sha256 = "15xfgmsy4sqs3cmk7dwmj21g3r9dqb3fra7n7ly306bwgzh4vm8k";
     };
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "Advanced cursor movement for Emacs that uses decision-trees for navigation";
+      license = gpl3Plus;
+    };
   };
 
   bind-key = melpaBuild {
@@ -392,7 +398,7 @@ let self = _self // overrides;
       sha256 = "1njv5adcm96kdch0jb941l8pm51yfdx7mlz83y0pq6jlzjs9mwaa";
     };
     meta = {
-      description = "A modern list library for Emacs";
+      description = "A modern list library for Emacs (think Haskell's Prelude in elisp)";
       license = gpl3Plus;
     };
   };
@@ -499,7 +505,6 @@ let self = _self // overrides;
       rev    = "v${version}";
       sha256 = "1dsa3r39ip20ddbw0m9vq8z3r4ahrxvb37adyqi4mbdgyr6fq6sw";
     };
-
     meta = {
       description = "Minor mode for defining and querying search engines through Emacs";
       license = gpl3Plus;
@@ -515,7 +520,14 @@ let self = _self // overrides;
       rev    = "63c78c08e345455f3d4daa844fdc551a2c18024e";
       sha256 = "04a2aq8dj2cmy77vw142wcmnjvqdbdsp6z0psrzz2qw0b0am03li";
     };
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "Emacs Package Library";
+      longDescription = ''
+        The purpose of this library is to wrap all the quirks and hassle of
+        package.el into a sane API.
+      '';
+      license = gpl3Plus;
+    };
   };
 
   evil-god-state = melpaBuild rec {
@@ -528,7 +540,10 @@ let self = _self // overrides;
       sha256 = "16v6dpw1hibrkf9hga88gv5axvp1pajd67brnh5h4wpdy9qvwgyy";
     };
     packageRequires = [ evil god-mode ];
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "An evil-mode state for using Emacs god-mode";
+      license = gpl3Plus;
+    };
   };
 
   evil-indent-textobject = melpaBuild rec {
@@ -603,7 +618,10 @@ let self = _self // overrides;
       rev    = "e4af0e9b44738e7474c89ed895200b42e6541515";
       sha256 = "0lxikiqf1jik88lf889q4f4f8kdgg3npciz298x605nhbfd5snbd";
     };
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "Slurp environment variables from shell to Emacs";
+      license = gpl3Plus;
+    };
   };
 
   expand-region = melpaBuild rec {
@@ -667,7 +685,10 @@ let self = _self // overrides;
       sha256 = "1ydk1wa7h7z9qw7prfvszxrmy2dyzsdij3xdy10rq197xnrw94wz";
     };
     packageRequires = [ dash let-alist pkg-info ];
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "On-the-fly syntax checking, intended as replacement for the older Flymake which is part of Emacs";
+      license = gpl3Plus;
+    };
   };
 
   flycheck-haskell = melpaBuild rec {
@@ -680,7 +701,10 @@ let self = _self // overrides;
       sha256 = "0143lcn6g46g7skm4r6lqq09s8mr3268rikbzlh65qg80rpg9frj";
     };
     packageRequires = [ dash flycheck haskell-mode let-alist pkg-info ];
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "Improved Haskell support for Flycheck";
+      license = gpl3Plus;
+    };
   };
 
   flycheck-pos-tip = melpaBuild rec {
@@ -693,7 +717,10 @@ let self = _self // overrides;
       sha256 = "0b4x24aq0jh4j4bjv0fqyaz6hzh3gqf57k9763jj9rl32cc3dpnp";
     };
     packageRequires = [ flycheck popup ];
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "Flycheck errors display in tooltip";
+      license = gpl3Plus;
+    };
   };
 
   ghc-mod = melpaBuild rec {
@@ -703,7 +730,10 @@ let self = _self // overrides;
     packageRequires = [ haskell-mode ];
     propagatedUserEnvPkgs = [ external.ghc-mod ];
     fileSpecs = [ "elisp/*.el" ];
-    meta = { license = bsd3; };
+    meta = {
+      description = "An extension of haskell-mode that provides completion of symbols and documentation browsing";
+      license = bsd3;
+    };
   };
 
   rtags = melpaBuild rec {
@@ -725,11 +755,12 @@ let self = _self // overrides;
       sha256 = "0psmr7749nzxln4b500sl3vrf24x3qijp12ir0i5z4x25k72hrlh";
     };
     meta = {
-      description = "Automatically commit to git after each save";
+      description = "Automatically commit to Git after each save";
       license = gpl3Plus;
     };
   };
 
+  # Deprecated in favor of git-commit
   git-commit-mode = melpaBuild rec {
     pname = "git-commit-mode";
     version = "1.0.0";
@@ -740,7 +771,7 @@ let self = _self // overrides;
       sha256 = "12a1xs3w2dp1a55qhc01dwjkavklgfqnn3yw85dhi4jdz8r8j7m0";
     };
     files = [ "git-commit-mode.el" ];
-    meta = { license = gpl3Plus; };
+    meta = git-commit.meta;
   };
 
   git-gutter = melpaBuild rec {
@@ -753,9 +784,14 @@ let self = _self // overrides;
       sha256 = "1xwdyjh13lp06yy9477013nj6idpsjr4ifg7hmyk5ai80axkgly7";
     };
     files = [ "git-gutter.el" ];
-    meta.license = gpl3Plus;
+    meta = {
+      description = "Show diff status of lines in a buffer relative to Git, mercurial, svn or bazaar repo's HEAD";
+      license = gpl3Plus;
+    };
   };
 
+  #TODO git-gutter-fringe
+
   git-rebase-mode = melpaBuild rec {
     pname = "git-rebase-mode";
     version = "1.0.0";
@@ -779,7 +815,7 @@ let self = _self // overrides;
       sha256 = "1lm6rgbzbxnwfn48xr6bg05lb716grfr4nqm8lvjm64nabh5y9bh";
     };
     meta = {
-      description = "Step through historic revisions of git controlled files";
+      description = "Step through historic revisions of Git controlled files";
       license = gpl3Plus;
     };
   };
@@ -794,7 +830,10 @@ let self = _self // overrides;
       sha256 = "12a1xs3w2dp1a55qhc01dwjkavklgfqnn3yw85dhi4jdz8r8j7m0";
     };
     files = [ "gitattributes-mode.el" ];
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "Emacs major-mode for editing gitattributes files";
+      license = gpl3Plus;
+    };
   };
 
   gitconfig-mode = melpaBuild rec {
@@ -807,7 +846,10 @@ let self = _self // overrides;
       sha256 = "12a1xs3w2dp1a55qhc01dwjkavklgfqnn3yw85dhi4jdz8r8j7m0";
     };
     files = [ "gitconfig-mode.el" ];
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "Emacs major-mode for editing gitconfig files";
+      license = gpl3Plus;
+    };
   };
 
   gitignore-mode = melpaBuild rec {
@@ -820,7 +862,10 @@ let self = _self // overrides;
       sha256 = "12a1xs3w2dp1a55qhc01dwjkavklgfqnn3yw85dhi4jdz8r8j7m0";
     };
     files = [ "gitignore-mode.el" ];
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "Emacs major-mode for editing gitignore files";
+      license = gpl3Plus;
+    };
   };
 
   gntp = melpaBuild rec {
@@ -832,7 +877,10 @@ let self = _self // overrides;
       rev   = "v${version}";
       sha256 = "1nvyjjjydrimpxy4cpg90si7sr8lmldbhlcm2mx8npklp9pn5y3a";
     };
-    meta = { license = gpl2Plus; };
+    meta = {
+      description = "GNTP protocol implementation for Emacs";
+      license = gpl2Plus;
+    };
   };
 
   gnus = melpaBuild rec {
@@ -847,7 +895,10 @@ let self = _self // overrides;
     preBuild = ''
       (cd lisp && make gnus-load.el)
     '';
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "News and mail reader for Emacs";
+      license = gpl3Plus;
+    };
   };
 
   god-mode = melpaBuild rec {
@@ -859,7 +910,10 @@ let self = _self // overrides;
       rev    = "6b7ae259a58ca1d7776aa4eca9f1092e4c0033e6";
       sha256 = "1amr98nq82g2d3f3f5wlqm9g38j64avygnsi9rrlbfqz4f71vq7x";
     };
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "A global minor mode for entering Emacs commands without modifier keys";
+      license = gpl3Plus;
+    };
   };
 
   goto-chg = melpaBuild rec {
@@ -871,7 +925,10 @@ let self = _self // overrides;
       sha256 = "0185vrzfdz6iwhmc22rjy0n7ppfppp2ddc8xl0vvbda79q6w3bp8";
     };
     files = [ "lib/goto-chg.el" ];
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "Goto last change in current buffer using Emacs undo information";
+      license = gpl3Plus;
+    };
   };
 
   haskell-mode = melpaBuild rec {
@@ -883,7 +940,10 @@ let self = _self // overrides;
       rev    = "v${version}";
       sha256 = "1mxr2cflgafcr8wkvgbq8l3wmc9qhhb7bn9zl1bkf10zspw9m58z";
     };
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "Haskell language support for Emacs";
+      license = gpl3Plus;
+    };
   };
 
   helm-swoop = melpaBuild rec {
@@ -896,7 +956,10 @@ let self = _self // overrides;
       sha256 = "0nq33ldhbvfbm6jnsxqdf3vwaqrsr2gprkzll081gcyl2s1x0l2m";
     };
     packageRequires = [ helm ];
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "An Emacs mode which constructs an editable grep for a buffer";
+      license = gpl3Plus;
+    };
   };
 
   helm = melpaBuild rec {
@@ -909,7 +972,10 @@ let self = _self // overrides;
       sha256 = "0n2kr6pyzcsi8pq6faxz2y8kicz1gmvj98fzzlq3a107dqqp25ay";
     };
     packageRequires = [ async ];
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "An incremental completion and selection narrowing framework for Emacs";
+      license = gpl3Plus;
+    };
   };
 
   hi2 = melpaBuild rec {
@@ -921,7 +987,10 @@ let self = _self // overrides;
       rev    = version;
       sha256 = "1s08sgbh5v59lqskd0s1dscs6dy7z5mkqqkabs3gd35agbfvbmlf";
     };
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "Minor haskell-indentation mode for haskell-mode, 2nd try";
+      license = gpl3Plus;
+    };
   };
 
   highlight-indentation = melpaBuild rec {
@@ -957,7 +1026,10 @@ let self = _self // overrides;
       rev    = version;
       sha256 = "08iw95lyizcyf6cjl37fm8wvay0vsk9758pk9gq9f2xiafcchl7f";
     };
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "Tie related Emacs commands into a family of short bindings with a common prefix";
+      license = gpl3Plus;
+    };
   };
 
   ibuffer-vc = melpaBuild rec {
@@ -969,7 +1041,10 @@ let self = _self // overrides;
       rev    = version;
       sha256 = "0bqdi5w120256g74k0j4jj81x804x1gcg4dxa74w3mb6fl5xlvs8";
     };
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "Version control aware Emacs ibuffer mode";
+      license = gpl3Plus;
+    };
   };
 
   ido-ubiquitous = melpaBuild rec {
@@ -982,7 +1057,7 @@ let self = _self // overrides;
       sha256 = "0wdjz3cqzrxhrk68g5gyvc9j2rb6f4yw00xbjgw9ldwlhmkwy5ja";
     };
     meta = {
-      description = "Does what you expected ido-everywhere to do in Emacs";
+      description = "Does what you expected ido-everywhere should do in Emacs";
       license = gpl3Plus;
     };
   };
@@ -997,7 +1072,10 @@ let self = _self // overrides;
       sha256 = "0iwgbaq2797k1f7ql86i2pjfa67cha4s2v0mgmrd0qcgqkxsdq92";
     };
     packageRequires = [ prop-menu ];
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "Idris language support for Emacs";
+      license = gpl3Plus;
+    };
   };
 
   lcs = melpaBuild rec {
@@ -1010,7 +1088,10 @@ let self = _self // overrides;
       sha256 = "08dsv1dzgb9jx076ia7xbpyjpaxn1w87h6rzlb349spaydq7ih24";
     };
     fileSpecs = [ "lisp/lcs*.el" ];
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "Longest Common Sequence (LCS) library for Emacs";
+      license = gpl3Plus;
+    };
   };
 
   let-alist = melpaBuild rec {
@@ -1024,7 +1105,10 @@ let self = _self // overrides;
     buildPhase = ''
       cp $src ${pname}-${version}.el
     '';
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "Easily let-bind values of an assoc-list by their names";
+      license = gpl3Plus;
+    };
   };
 
   log4e = melpaBuild rec {
@@ -1036,7 +1120,10 @@ let self = _self // overrides;
       rev   = "v${version}";
       sha256 = "1l28n7a0v2zkknc70i1wn6qb5i21dkhfizzk8wcj28v44cgzk022";
     };
-    meta = { license = gpl2Plus; };
+    meta = {
+      description = "Logging for elisp";
+      license = gpl2Plus;
+    };
   };
 
   lui = melpaBuild rec {
@@ -1050,7 +1137,10 @@ let self = _self // overrides;
     };
     packageRequires = [ tracking ];
     fileSpecs = [ "lisp/lui*.el" ];
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "User interface library for Emacs";
+      license = gpl3Plus;
+    };
   };
 
   magit = melpaBuild rec {
@@ -1087,7 +1177,10 @@ let self = _self // overrides;
                   "Documentation/AUTHORS.md"
                   "COPYING"
                 ];
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "Emacs interface for Git that aspires to be a complete Git porcelain";
+      license = gpl3Plus;
+    };
   };
   git-commit = melpaBuild rec {
     pname = "git-commit";
@@ -1095,7 +1188,9 @@ let self = _self // overrides;
     src = magit.src;
     packageRequires = [ dash with-editor ];
     fileSpecs = [ "lisp/git-commit.el" ];
-    meta = { license = gpl3Plus; };
+    meta = magit.meta // {
+      description = "Emacs mode for editig Git commit messages";
+    };
   };
   magit-popup = melpaBuild rec {
     pname = "magit-popup";
@@ -1103,7 +1198,9 @@ let self = _self // overrides;
     src = magit.src;
     packageRequires = [ dash with-editor ];
     fileSpecs = [ "Documentation/magit-popup.texi" "lisp/magit-popup.el" ];
-    meta = { license = gpl3Plus; };
+    meta = magit.meta // {
+      description = "Infix arguments with feedback in a buffer library for Emacs";
+    };
   };
   with-editor = melpaBuild rec {
     pname = "with-editor";
@@ -1111,7 +1208,9 @@ let self = _self // overrides;
     src = magit.src;
     packageRequires = [ async dash ];
     fileSpecs = [ "Documentation/with-editor.texi" "lisp/with-editor.el" ];
-    meta = { license = gpl3Plus; };
+    meta = magit.meta // {
+      description = "Use the Emacsclient as EDITOR of child processes library for Emacs";
+    };
   };
 
   markdown-mode = melpaBuild rec {
@@ -1123,7 +1222,10 @@ let self = _self // overrides;
       rev    = "v${version}";
       sha256 = "1l2w0j9xl8pipz61426s79jq2yns42vjvysc6yjc29kbsnhalj29";
     };
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "Major mode for editing markdown files in Emacs";
+      license = gpl3Plus;
+    };
   };
 
   markdown-toc = melpaBuild rec {
@@ -1142,7 +1244,6 @@ let self = _self // overrides;
       longDescription = ''
         A simple mode to create TOC in a markdown file.
       '';
-      homepage = https://github.com/ardumont/mardown-toc;
       license = gpl3Plus;
     };
   };
@@ -1156,7 +1257,10 @@ let self = _self // overrides;
       rev    = "39384a7a9e6886f3a3d79efac4009fcd800a4a14";
       sha256 = "0i7m15x9sij5wh0gwbijsis8a4jm8izywj7xprk21644ndskvfiz";
     };
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "A set of Emacs themes optimized for terminals with 256 colors";
+      license = gpl3Plus;
+    };
   };
 
   monokai-theme = melpaBuild rec {
@@ -1168,7 +1272,10 @@ let self = _self // overrides;
       rev    = "v${version}";
       sha256 = "02w7k4s4698p4adjy4a36na28sb1s2zw4xsjs7p2hv9iiw9kmyvz";
     };
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "An Emacs port of TextMate' Monokai theme inspired by Zenburn theme";
+      license = gpl3Plus;
+    };
   };
 
   multiple-cursors = melpaBuild rec {
@@ -1180,6 +1287,10 @@ let self = _self // overrides;
       rev    = "9b53e892e6167f930763a3c5aedf8773110a8ae9";
       sha256 = "0wcrdb137a9aq6dynlqbvypb6m2dj48m899xwy7ilnf2arrmipid";
     };
+    meta = {
+      description = "Edit text in many places simultaneously in Emacs";
+      license = gpl3Plus; # TODO
+    };
   };
 
   nyan-mode = callPackage ../applications/editors/emacs-modes/nyan-mode {
@@ -1213,7 +1324,10 @@ let self = _self // overrides;
     buildPhase = ''
       cp $src ${pname}-${version}.tar
     '';
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "Notes, TODO lists, projects, and authoring in plain-text with Emacs";
+      license = gpl3Plus;
+    };
   };
 
   org-trello = melpaBuild rec {
@@ -1262,7 +1376,10 @@ let self = _self // overrides;
       rev    = version;
       sha256 = "12c2rrhysrcl2arc6hpzv6lxbb1r3bzlvdp23hnp9sci6yc10k3q";
     };
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "Tagged workspaces like in most tiling window managers, but in Emacs";
+      license = gpl3Plus;
+    };
   };
 
   pkg-info = melpaBuild rec {
@@ -1275,7 +1392,10 @@ let self = _self // overrides;
       sha256 = "0x4nz54f2shgcw3gx66d265vxwdpdirn64gzii8dpxhsi7v86n0p";
     };
     packageRequires = [ epl ];
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "Provide information about Emacs packages";
+      license = gpl3Plus;
+    };
   };
 
   popup = melpaBuild rec {
@@ -1287,7 +1407,10 @@ let self = _self // overrides;
       rev    = "v${version}";
       sha256 = "0aazkczrzpp75793bpi0pz0cs7vinhdrpxfdlzi0cr39njird2yj";
     };
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "Popup tooltips and popup menus for Emacs";
+      license = gpl3Plus;
+    };
   };
 
   projectile = melpaBuild rec {
@@ -1301,7 +1424,10 @@ let self = _self // overrides;
     };
     fileSpecs = [ "projectile.el" ];
     packageRequires = [ dash helm pkg-info ];
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "A project interaction library for Emacs";
+      license = gpl3Plus;
+    };
   };
   helm-projectile = melpaBuild rec {
     pname   = "helm-projectile";
@@ -1309,7 +1435,7 @@ let self = _self // overrides;
     src     = projectile.src;
     fileSpecs = [ "helm-projectile.el" ];
     packageRequires = [ helm projectile ];
-    meta = { license = gpl3Plus; };
+    meta = projectile.meta;
   };
   persp-projectile = melpaBuild rec {
     pname   = "persp-projectile";
@@ -1317,7 +1443,7 @@ let self = _self // overrides;
     src     = projectile.src;
     fileSpecs = [ "persp-projectile.el" ];
     packageRequires = [ perspective projectile ];
-    meta = { license = gpl3Plus; };
+    meta = projectile.meta;
   };
 
   prop-menu = melpaBuild rec {
@@ -1329,7 +1455,10 @@ let self = _self // overrides;
       rev    = version;
       sha256 = "18ap2liz5r5a8ja2zz9182fnfm47jnsbyblpq859zks356k37iwc";
     };
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "Library for computing context menus based on text properties and overlays in Emacs";
+      license = gpl3Plus;
+    };
   };
 
   pyvenv = melpaBuild rec {
@@ -1427,7 +1556,10 @@ let self = _self // overrides;
       rev    = "1f85b5112f3f68169ddaa2911fcfa030f979eb4d";
       sha256 = "9d871ea84f98c51099528a03eddf47218cf70f1431d4c35c19c977d9e73d421f";
     };
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "String manipulation library for Emacs";
+      license = gpl3Plus;
+    };
   };
 
   semi = melpaBuild rec {
@@ -1456,7 +1588,10 @@ let self = _self // overrides;
       sha256 = "08dsv1dzgb9jx076ia7xbpyjpaxn1w87h6rzlb349spaydq7ih24";
     };
     fileSpecs = [ "lisp/shorten*.el" ];
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "String shortening to unique prefix library for Emacs";
+      license = gpl3Plus;
+    };
   };
 
   smart-mode-line = melpaBuild rec {
@@ -1469,7 +1604,10 @@ let self = _self // overrides;
       sha256 = "17nav2jbvbd13xzgp29x396mc617n2dh6whjk4wnyvsyv7r0s9f6";
     };
     packageRequires = [ dash rich-minority ];
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "Sexy mode-line for Emacs";
+      license = gpl3Plus;
+    };
   };
 
   smartparens = melpaBuild rec {
@@ -1482,7 +1620,17 @@ let self = _self // overrides;
       sha256 = "16pzd740vd1r3qfmxia2ibiarinm6xpja0mjv3nni5dis5s4r9gc";
     };
     packageRequires = [ dash ];
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "Minor mode for Emacs that deals with parens pairs";
+      longDescription = ''
+        It started as a unification effort to combine functionality of
+        several existing packages in a single, compatible and
+        extensible way to deal with parentheses, delimiters, tags and
+        the like. Some of these packages include autopair, textmate,
+        wrap-region, electric-pair-mode, paredit and others.
+      '';
+      license = gpl3Plus;
+    };
   };
 
   smex = melpaBuild rec {
@@ -1524,8 +1672,14 @@ let self = _self // overrides;
       sha256 = "18madh4hvrk8sxrll84ry13n1l3ad1gnp3prj828sszrbbdp20ly";
     };
     fileSpecs = [ "swiper.el" "ivy.el" "colir.el" "counsel.el" ];
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "Overview as you search for a regex in Emacs";
+      license = gpl3Plus;
+    };
   };
+  ivy = swiper;
+
+  #TODO: swiper-helm
 
   switch-window = melpaBuild rec {
     pname   = "switch-window";
@@ -1536,7 +1690,10 @@ let self = _self // overrides;
       rev    = "3ffbe68e584f811e891f96afa1de15e0d9c1ebb5";
       sha256 = "09221128a0f55a575ed9addb3a435cfe01ab6bdd0cca5d589ccd37de61ceccbd";
     };
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "Visual replacement for C-x o in Emacs";
+      license = gpl3Plus;
+    };
   };
 
   tracking = melpaBuild rec {
@@ -1550,7 +1707,10 @@ let self = _self // overrides;
     };
     packageRequires = [ shorten ];
     fileSpecs = [ "lisp/tracking*.el" ];
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "Register buffers for user review library for Emacs";
+      license = gpl3Plus;
+    };
   };
 
   tuareg = melpaBuild rec {
@@ -1563,7 +1723,10 @@ let self = _self // overrides;
       sha256 = "0jpcjy2a77mywba2vm61knj26pgylsmv5a21cdp80q40bac4i6bb";
     };
     packageRequires = [ caml ];
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "Extension of OCaml mode for Emacs";
+      license = gpl3Plus;
+    };
   };
 
   undo-tree = melpaBuild rec {
@@ -1574,7 +1737,10 @@ let self = _self // overrides;
       rev    = "a3e81b682053a81e082139300ef0a913a7a610a2";
       sha256 = "1qla7njkb7gx5aj87i8x6ni8jfk1k78ivwfiiws3gpbnyiydpx8y";
     };
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "A port of Vim's undo tree functionality to Emacs";
+      license = gpl3Plus;
+    };
   };
 
   use-package = melpaBuild rec {
@@ -1588,7 +1754,10 @@ let self = _self // overrides;
     };
     packageRequires = [ bind-key diminish ];
     files = [ "use-package.el" ];
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "Isolate package configuration in your .emacs file";
+      license = gpl3Plus;
+    };
   };
 
   volatile-highlights = melpaBuild rec {
@@ -1600,7 +1769,10 @@ let self = _self // overrides;
       rev    = "fb2abc2d4d4051a9a6b7c8de2fe7564161f01f24";
       sha256 = "1v0chqj5jir4685jd8ahw86g9zdmi6xd05wmzhyw20rbk924fcqf";
     };
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "Brings visual feedback to some operations in Emacs";
+      license = gpl3Plus;
+    };
   };
 
   wanderlust = melpaBuild rec {
@@ -1635,7 +1807,7 @@ let self = _self // overrides;
     };
 
     meta = {
-      description = "Web template editing mode for emacs";
+      description = "Web template editing mode for Emacs";
       license = gpl2;
     };
   };
@@ -1653,7 +1825,10 @@ let self = _self // overrides;
       rm weechat-sauron.el weechat-secrets.el
     '';
     packageRequires = [ s ];
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "A weechat IRC client frontend for Emacs";
+      license = gpl3Plus;
+    };
   };
 
   wgrep = melpaBuild rec {
@@ -1665,7 +1840,10 @@ let self = _self // overrides;
       rev    = "7ef26c51feaef8a5ec0929737130ab8ba326983c";
       sha256 = "075z0glain0dp56d0cp468y5y88wn82ab26aapsrdzq8hmlshwn4";
     };
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "Writable grep buffer mode for Emacs";
+      license = gpl3Plus;
+    };
   };
 
   yasnippet = melpaBuild rec {
@@ -1700,7 +1878,10 @@ let self = _self // overrides;
       rev    = "v${version}";
       sha256 = "1zspqpwgyv3969irg8p7zj3g4hww4bmnlvx33bvjyvvv5c4mg5wv";
     };
-    meta = { license = gpl3Plus; };
+    meta = {
+      description = "An Emacs port of Vim's low contrast Zerburn theme";
+      license = gpl3Plus;
+    };
   };
 
 }; in self

From 58a8485090aee5a9102a1b17916e9782e29edf50 Mon Sep 17 00:00:00 2001
From: Jan Malakhovski <oxij@oxij.org>
Date: Thu, 12 Nov 2015 20:39:28 +0000
Subject: [PATCH 55/73] emacs-packages: split git-rebase from magit, deprecate
 git-rebase-mode

magit doesn't depend on git-rebase, git-rebase depends on magit
---
 pkgs/top-level/emacs-packages.nix | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index caa0d07ead6d..7fcc5c66ce3a 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -792,6 +792,7 @@ let self = _self // overrides;
 
   #TODO git-gutter-fringe
 
+  # Deprecated in favor of git-rebase
   git-rebase-mode = melpaBuild rec {
     pname = "git-rebase-mode";
     version = "1.0.0";
@@ -802,7 +803,7 @@ let self = _self // overrides;
       sha256 = "12a1xs3w2dp1a55qhc01dwjkavklgfqnn3yw85dhi4jdz8r8j7m0";
     };
     files = [ "git-rebase-mode.el" ];
-    meta = { license = gpl3Plus; };
+    meta = git-rebase.meta;
   };
 
   git-timemachine = melpaBuild rec {
@@ -1172,7 +1173,6 @@ let self = _self // overrides;
                   "lisp/magit-blame.el"
                   "lisp/magit-ediff.el"
                   "lisp/magit-extras.el"
-                  "lisp/git-rebase.el"
                   "Documentation/magit.texi"
                   "Documentation/AUTHORS.md"
                   "COPYING"
@@ -1192,6 +1192,16 @@ let self = _self // overrides;
       description = "Emacs mode for editig Git commit messages";
     };
   };
+  git-rebase = melpaBuild rec {
+    pname = "git-rebase";
+    version = magit.version;
+    src = magit.src;
+    packageRequires = [ dash with-editor magit ];
+    fileSpecs = [ "lisp/git-rebase.el" ];
+    meta = magit.meta // {
+      description = "Emacs major-mode which makes editing rebase scripts more fun";
+    };
+  };
   magit-popup = melpaBuild rec {
     pname = "magit-popup";
     version = magit.version;

From 4856880cab3e507567a025f11a577325a4538566 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 10 Nov 2015 16:37:56 +0100
Subject: [PATCH 56/73] hackage-packages.nix: update Haskell package set

This update was generated by hackage2nix v20150922-36-ge0ee7ef using the following inputs:

  - Nixpkgs: https://github.com/NixOS/nixpkgs/commit/7c001f31b0626f380947c484a308567a2d4397d4
  - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/46f2de463b1405cc9a58aba91ee215bd32894e33
  - LTS Haskell: https://github.com/fpco/lts-haskell/commit/1ae555e197af31e8d2cd56ac766ee2f085fcc6ee
  - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/4113b2e369fb5bff8cee9d5c02a9788d5569abed
---
 .../haskell-modules/configuration-lts-0.0.nix |   3 +
 .../haskell-modules/configuration-lts-0.1.nix |   3 +
 .../haskell-modules/configuration-lts-0.2.nix |   3 +
 .../haskell-modules/configuration-lts-0.3.nix |   3 +
 .../haskell-modules/configuration-lts-0.4.nix |   3 +
 .../haskell-modules/configuration-lts-0.5.nix |   3 +
 .../haskell-modules/configuration-lts-0.6.nix |   3 +
 .../haskell-modules/configuration-lts-0.7.nix |   3 +
 .../haskell-modules/configuration-lts-1.0.nix |   3 +
 .../haskell-modules/configuration-lts-1.1.nix |   3 +
 .../configuration-lts-1.10.nix                |   3 +
 .../configuration-lts-1.11.nix                |   3 +
 .../configuration-lts-1.12.nix                |   3 +
 .../configuration-lts-1.13.nix                |   3 +
 .../configuration-lts-1.14.nix                |   3 +
 .../configuration-lts-1.15.nix                |   3 +
 .../haskell-modules/configuration-lts-1.2.nix |   3 +
 .../haskell-modules/configuration-lts-1.4.nix |   3 +
 .../haskell-modules/configuration-lts-1.5.nix |   3 +
 .../haskell-modules/configuration-lts-1.7.nix |   3 +
 .../haskell-modules/configuration-lts-1.8.nix |   3 +
 .../haskell-modules/configuration-lts-1.9.nix |   3 +
 .../haskell-modules/configuration-lts-2.0.nix |   3 +
 .../haskell-modules/configuration-lts-2.1.nix |   3 +
 .../configuration-lts-2.10.nix                |   3 +
 .../configuration-lts-2.11.nix                |   3 +
 .../configuration-lts-2.12.nix                |   3 +
 .../configuration-lts-2.13.nix                |   3 +
 .../configuration-lts-2.14.nix                |   3 +
 .../configuration-lts-2.15.nix                |   3 +
 .../configuration-lts-2.16.nix                |   3 +
 .../configuration-lts-2.17.nix                |   3 +
 .../configuration-lts-2.18.nix                |   3 +
 .../configuration-lts-2.19.nix                |   3 +
 .../haskell-modules/configuration-lts-2.2.nix |   3 +
 .../configuration-lts-2.20.nix                |   3 +
 .../configuration-lts-2.21.nix                |   3 +
 .../configuration-lts-2.22.nix                |   3 +
 .../haskell-modules/configuration-lts-2.3.nix |   3 +
 .../haskell-modules/configuration-lts-2.4.nix |   3 +
 .../haskell-modules/configuration-lts-2.5.nix |   3 +
 .../haskell-modules/configuration-lts-2.6.nix |   3 +
 .../haskell-modules/configuration-lts-2.7.nix |   3 +
 .../haskell-modules/configuration-lts-2.8.nix |   3 +
 .../haskell-modules/configuration-lts-2.9.nix |   3 +
 .../haskell-modules/configuration-lts-3.0.nix |   7 +
 .../haskell-modules/configuration-lts-3.1.nix |   8 +
 .../configuration-lts-3.10.nix                |  17 +
 .../configuration-lts-3.11.nix                |  17 +
 .../configuration-lts-3.12.nix                |  17 +
 .../configuration-lts-3.13.nix                |  18 +
 .../haskell-modules/configuration-lts-3.2.nix |   8 +
 .../haskell-modules/configuration-lts-3.3.nix |   8 +
 .../haskell-modules/configuration-lts-3.4.nix |   8 +
 .../haskell-modules/configuration-lts-3.5.nix |   8 +
 .../haskell-modules/configuration-lts-3.6.nix |  12 +
 .../haskell-modules/configuration-lts-3.7.nix |  13 +
 .../haskell-modules/configuration-lts-3.8.nix |  16 +
 .../haskell-modules/configuration-lts-3.9.nix |  17 +
 .../haskell-modules/hackage-packages.nix      | 629 +++++++++++++-----
 60 files changed, 785 insertions(+), 153 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-lts-0.0.nix b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
index 9553257305fc..5137b35d2b44 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
@@ -1157,6 +1157,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1509,6 +1510,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "bank-holidays-england" = dontDistribute super."bank-holidays-england";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
@@ -3432,6 +3434,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_0_6";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.1.nix b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
index a12b7dc1733b..d59fab77fde2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
@@ -1157,6 +1157,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1509,6 +1510,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "bank-holidays-england" = dontDistribute super."bank-holidays-england";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
@@ -3431,6 +3433,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_0_6";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.2.nix b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
index 8134823e4661..f2b5997156d7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
@@ -1157,6 +1157,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1509,6 +1510,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "bank-holidays-england" = dontDistribute super."bank-holidays-england";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
@@ -3431,6 +3433,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_0_6";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.3.nix b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
index 517f95efbf66..992030f620c9 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
@@ -1157,6 +1157,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1509,6 +1510,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "bank-holidays-england" = dontDistribute super."bank-holidays-england";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
@@ -3431,6 +3433,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_0_6";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.4.nix b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
index a3e12afb5b25..2adb68442f0e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
@@ -1157,6 +1157,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1509,6 +1510,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "bank-holidays-england" = dontDistribute super."bank-holidays-england";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
@@ -3430,6 +3432,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_0_6";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.5.nix b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
index ac9e00ddd06e..07496b464cc4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
@@ -1157,6 +1157,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1509,6 +1510,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "bank-holidays-england" = dontDistribute super."bank-holidays-england";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
@@ -3430,6 +3432,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_0_6";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.6.nix b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
index d006c1629f85..282cf73f759d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
@@ -1156,6 +1156,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1506,6 +1507,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "bank-holidays-england" = dontDistribute super."bank-holidays-england";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
@@ -3427,6 +3429,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_0_7";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.7.nix b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
index 8b2d933f7562..afce24d2d4f6 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
@@ -1156,6 +1156,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1506,6 +1507,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "bank-holidays-england" = dontDistribute super."bank-holidays-england";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
@@ -3427,6 +3429,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_0_7";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.0.nix b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
index fc5935da11ce..354c2223c5bf 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
@@ -1152,6 +1152,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1502,6 +1503,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "bank-holidays-england" = doDistribute super."bank-holidays-england_0_1_0_2";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
@@ -3416,6 +3418,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_0_7";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.1.nix b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
index 1f2e8174e2bf..ea4847e195ed 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
@@ -1152,6 +1152,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1501,6 +1502,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "bank-holidays-england" = doDistribute super."bank-holidays-england_0_1_0_2";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
@@ -3410,6 +3412,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_0_7";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.10.nix b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
index 9a79fa1358a5..43148f41a5df 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
@@ -1151,6 +1151,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1500,6 +1501,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "bank-holidays-england" = doDistribute super."bank-holidays-england_0_1_0_2";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
@@ -3399,6 +3401,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_1_0";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.11.nix b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
index c1be8c797159..b0ca28c201be 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
@@ -1151,6 +1151,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1500,6 +1501,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "bank-holidays-england" = doDistribute super."bank-holidays-england_0_1_0_2";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
@@ -3398,6 +3400,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_1_0";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.12.nix b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
index 19a80a348d78..397dfdc81e08 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
@@ -1151,6 +1151,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1500,6 +1501,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "bank-holidays-england" = doDistribute super."bank-holidays-england_0_1_0_2";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
@@ -3398,6 +3400,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_1_0";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.13.nix b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
index 75a9ad629797..ce83e19f3ea4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
@@ -1151,6 +1151,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1500,6 +1501,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "bank-holidays-england" = doDistribute super."bank-holidays-england_0_1_0_2";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
@@ -3397,6 +3399,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_1_0";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.14.nix b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
index 502eb7ed6d61..29f8ecc080d4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
@@ -1150,6 +1150,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1499,6 +1500,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "bank-holidays-england" = doDistribute super."bank-holidays-england_0_1_0_2";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
@@ -3394,6 +3396,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_1_0";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.15.nix b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
index cb6415b47a6a..4e57cccbf852 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
@@ -1149,6 +1149,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1498,6 +1499,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "bank-holidays-england" = doDistribute super."bank-holidays-england_0_1_0_2";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
@@ -3389,6 +3391,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_1_0";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.2.nix b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
index c8386d7125d1..35d7d388685f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
@@ -1152,6 +1152,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1501,6 +1502,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "bank-holidays-england" = doDistribute super."bank-holidays-england_0_1_0_2";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
@@ -3407,6 +3409,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_0_7";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.4.nix b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
index be1f171166a3..3e1d09683821 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
@@ -1151,6 +1151,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1500,6 +1501,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "bank-holidays-england" = doDistribute super."bank-holidays-england_0_1_0_2";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
@@ -3405,6 +3407,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_0_7";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.5.nix b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
index 55a955af3f51..cca26bf637b3 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
@@ -1151,6 +1151,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1500,6 +1501,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "bank-holidays-england" = doDistribute super."bank-holidays-england_0_1_0_2";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
@@ -3404,6 +3406,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_0_7";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.7.nix b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
index fb24e81fcc08..9a8879d27844 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
@@ -1151,6 +1151,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1500,6 +1501,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "bank-holidays-england" = doDistribute super."bank-holidays-england_0_1_0_2";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
@@ -3404,6 +3406,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_0_7";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.8.nix b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
index 62958eaddd5d..022edcd992a3 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
@@ -1151,6 +1151,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1500,6 +1501,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "bank-holidays-england" = doDistribute super."bank-holidays-england_0_1_0_2";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
@@ -3402,6 +3404,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_0_7";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.9.nix b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
index 34f55432ce26..a9f4c92bdd0a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
@@ -1151,6 +1151,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1500,6 +1501,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "bank-holidays-england" = doDistribute super."bank-holidays-england_0_1_0_2";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
@@ -3401,6 +3403,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_0_7";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.0.nix b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
index 04ed9f69e250..a3db86cc9935 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
@@ -1140,6 +1140,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1487,6 +1488,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "bank-holidays-england" = doDistribute super."bank-holidays-england_0_1_0_2";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
@@ -3365,6 +3367,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_1_0";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.1.nix b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
index 3c56b4e4fd2e..a1f3c0fe1245 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
@@ -1140,6 +1140,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1487,6 +1488,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "bank-holidays-england" = doDistribute super."bank-holidays-england_0_1_0_2";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
@@ -3364,6 +3366,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_1_0";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.10.nix b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
index d25f94a6bf87..1b8a27b5a960 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
@@ -1135,6 +1135,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1480,6 +1481,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
   "barcodes-code128" = dontDistribute super."barcodes-code128";
@@ -3343,6 +3345,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_1_0";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.11.nix b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
index 60c6c485904a..e95306a1cf17 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
@@ -1135,6 +1135,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1479,6 +1480,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
   "barcodes-code128" = dontDistribute super."barcodes-code128";
@@ -3341,6 +3343,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_1_0";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.12.nix b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
index fa7662b916a8..acebc1a7c78d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
@@ -1135,6 +1135,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1479,6 +1480,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
   "barcodes-code128" = dontDistribute super."barcodes-code128";
@@ -3341,6 +3343,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_1_0";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.13.nix b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
index 54bc0ad45145..1c9f90d24182 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
@@ -1135,6 +1135,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1479,6 +1480,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
   "barcodes-code128" = dontDistribute super."barcodes-code128";
@@ -3341,6 +3343,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_1_0";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.14.nix b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
index 64a7ef0c311d..511ddb8e26a4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
@@ -1135,6 +1135,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1478,6 +1479,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
   "barcodes-code128" = dontDistribute super."barcodes-code128";
@@ -3339,6 +3341,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_1_0";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.15.nix b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
index fe2b59f08a60..2fe29c6ac02a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
@@ -1135,6 +1135,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1478,6 +1479,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
   "barcodes-code128" = dontDistribute super."barcodes-code128";
@@ -3338,6 +3340,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_1_0";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.16.nix b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
index d1f7a7a7f198..06a38db2c0f9 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
@@ -1133,6 +1133,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1476,6 +1477,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
   "barcodes-code128" = dontDistribute super."barcodes-code128";
@@ -3331,6 +3333,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_1_1";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.17.nix b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
index 67c6700b7e71..0cc30d1a6f16 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
@@ -1133,6 +1133,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1474,6 +1475,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
   "barcodes-code128" = dontDistribute super."barcodes-code128";
@@ -3324,6 +3326,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_1_1";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.18.nix b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
index ff8f1e824459..7e29a592c3b2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
@@ -1132,6 +1132,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1473,6 +1474,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
   "barcodes-code128" = dontDistribute super."barcodes-code128";
@@ -3319,6 +3321,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_1_1";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.19.nix b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
index c2130cb00f87..72b01f9fe46b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
@@ -1132,6 +1132,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1473,6 +1474,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
   "barcodes-code128" = dontDistribute super."barcodes-code128";
@@ -3318,6 +3320,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_1_1";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.2.nix b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
index c0c871b8873a..6391877d336f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
@@ -1139,6 +1139,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1486,6 +1487,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "bank-holidays-england" = doDistribute super."bank-holidays-england_0_1_0_2";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
@@ -3360,6 +3362,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_1_0";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.20.nix b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
index 8bc869c7dae8..355ec3be30b0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
@@ -1132,6 +1132,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1473,6 +1474,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
   "barcodes-code128" = dontDistribute super."barcodes-code128";
@@ -3315,6 +3317,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_1_1";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.21.nix b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
index dba8206320e2..cd905ea541f6 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
@@ -1132,6 +1132,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1473,6 +1474,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
   "barcodes-code128" = dontDistribute super."barcodes-code128";
@@ -3314,6 +3316,7 @@ self: super: {
   "glambda" = dontDistribute super."glambda";
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.22.nix b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
index 8d2d25861877..00448fb5d76a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
@@ -1131,6 +1131,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1472,6 +1473,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
   "barcodes-code128" = dontDistribute super."barcodes-code128";
@@ -3313,6 +3315,7 @@ self: super: {
   "glambda" = dontDistribute super."glambda";
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.3.nix b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
index 9b3a7affe7fe..450ab4caeedf 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
@@ -1139,6 +1139,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1486,6 +1487,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "bank-holidays-england" = doDistribute super."bank-holidays-england_0_1_0_2";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
@@ -3359,6 +3361,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_1_0";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.4.nix b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
index 4de304cd6079..b736042e490b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
@@ -1139,6 +1139,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1486,6 +1487,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "bank-holidays-england" = doDistribute super."bank-holidays-england_0_1_0_2";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
@@ -3358,6 +3360,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_1_0";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.5.nix b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
index 45a803ad6308..c9b55a9ce48d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
@@ -1139,6 +1139,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1486,6 +1487,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "bank-holidays-england" = doDistribute super."bank-holidays-england_0_1_0_2";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
@@ -3357,6 +3359,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_1_0";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.6.nix b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
index f1a40360db27..41f68d2f1fec 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
@@ -1137,6 +1137,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1484,6 +1485,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
   "barcodes-code128" = dontDistribute super."barcodes-code128";
@@ -3354,6 +3356,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_1_0";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.7.nix b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
index 6db6aec53d3d..6a1d797b29fa 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
@@ -1136,6 +1136,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1483,6 +1484,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
   "barcodes-code128" = dontDistribute super."barcodes-code128";
@@ -3353,6 +3355,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_1_0";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.8.nix b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
index 8e131b4ca50d..762355a74e9d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
@@ -1135,6 +1135,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1482,6 +1483,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
   "barcodes-code128" = dontDistribute super."barcodes-code128";
@@ -3351,6 +3353,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_1_0";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.9.nix b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
index d7609a9fb852..68effeb13d60 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
@@ -1135,6 +1135,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_7_4";
   "aeson-schema" = dontDistribute super."aeson-schema";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1480,6 +1481,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
   "barcodes-code128" = dontDistribute super."barcodes-code128";
@@ -3345,6 +3347,7 @@ self: super: {
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
   "glib" = doDistribute super."glib_0_13_1_0";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.0.nix b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
index 1a781371a451..d37a6547894c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
@@ -1105,6 +1105,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-qq" = doDistribute super."aeson-qq_0_8_0";
   "aeson-schema" = doDistribute super."aeson-schema_0_3_0_7";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
@@ -1428,6 +1429,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
   "barcodes-code128" = dontDistribute super."barcodes-code128";
@@ -3195,6 +3197,7 @@ self: super: {
   "glambda" = dontDistribute super."glambda";
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
@@ -3865,6 +3868,7 @@ self: super: {
   "himerge" = dontDistribute super."himerge";
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
+  "hindent" = doDistribute super."hindent_4_5_4";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -7121,6 +7125,7 @@ self: super: {
   "tasty-program" = dontDistribute super."tasty-program";
   "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2";
   "tasty-rerun" = doDistribute super."tasty-rerun_1_1_4";
+  "tasty-silver" = doDistribute super."tasty-silver_3_1_7";
   "tasty-tap" = dontDistribute super."tasty-tap";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -7693,6 +7698,7 @@ self: super: {
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_0";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
+  "wai-app-static" = doDistribute super."wai-app-static_3_1_1";
   "wai-cors" = doDistribute super."wai-cors_0_2_3";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -7787,6 +7793,7 @@ self: super: {
   "webkit-javascriptcore" = dontDistribute super."webkit-javascriptcore";
   "webkitgtk3" = dontDistribute super."webkitgtk3";
   "webkitgtk3-javascriptcore" = dontDistribute super."webkitgtk3-javascriptcore";
+  "webpage" = doDistribute super."webpage_0_0_3_1";
   "webrtc-vad" = dontDistribute super."webrtc-vad";
   "webserver" = dontDistribute super."webserver";
   "websnap" = dontDistribute super."websnap";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.1.nix b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
index 40e3108bb7e0..347705d09041 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
@@ -1084,6 +1084,7 @@ self: super: {
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
   "actor" = dontDistribute super."actor";
+  "ad" = doDistribute super."ad_4_2_4";
   "adaptive-containers" = dontDistribute super."adaptive-containers";
   "adaptive-tuple" = dontDistribute super."adaptive-tuple";
   "adb" = dontDistribute super."adb";
@@ -1104,6 +1105,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-schema" = doDistribute super."aeson-schema_0_3_0_7";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
   "aeson-smart" = dontDistribute super."aeson-smart";
@@ -1426,6 +1428,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
   "barcodes-code128" = dontDistribute super."barcodes-code128";
@@ -3189,6 +3192,7 @@ self: super: {
   "glambda" = dontDistribute super."glambda";
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
@@ -3858,6 +3862,7 @@ self: super: {
   "himerge" = dontDistribute super."himerge";
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
+  "hindent" = doDistribute super."hindent_4_5_4";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -7110,6 +7115,7 @@ self: super: {
   "tasty-program" = dontDistribute super."tasty-program";
   "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2";
   "tasty-rerun" = doDistribute super."tasty-rerun_1_1_4";
+  "tasty-silver" = doDistribute super."tasty-silver_3_1_7";
   "tasty-tap" = dontDistribute super."tasty-tap";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -7681,6 +7687,7 @@ self: super: {
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_0";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
+  "wai-app-static" = doDistribute super."wai-app-static_3_1_1";
   "wai-cors" = doDistribute super."wai-cors_0_2_3";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -7775,6 +7782,7 @@ self: super: {
   "webkit-javascriptcore" = dontDistribute super."webkit-javascriptcore";
   "webkitgtk3" = dontDistribute super."webkitgtk3";
   "webkitgtk3-javascriptcore" = dontDistribute super."webkitgtk3-javascriptcore";
+  "webpage" = doDistribute super."webpage_0_0_3_1";
   "webrtc-vad" = dontDistribute super."webrtc-vad";
   "webserver" = dontDistribute super."webserver";
   "websnap" = dontDistribute super."websnap";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.10.nix b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
index 4c6371538f1c..1dc5b3fac905 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
@@ -1070,10 +1070,12 @@ self: super: {
   "acme-timemachine" = dontDistribute super."acme-timemachine";
   "acme-year" = dontDistribute super."acme-year";
   "acme-zero" = dontDistribute super."acme-zero";
+  "active" = doDistribute super."active_0_2_0_6";
   "activehs" = dontDistribute super."activehs";
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
   "actor" = dontDistribute super."actor";
+  "ad" = doDistribute super."ad_4_2_4";
   "adaptive-containers" = dontDistribute super."adaptive-containers";
   "adaptive-tuple" = dontDistribute super."adaptive-tuple";
   "adb" = dontDistribute super."adb";
@@ -1089,9 +1091,11 @@ self: super: {
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
   "aeson-diff" = dontDistribute super."aeson-diff";
+  "aeson-extra" = doDistribute super."aeson-extra_0_2_1_0";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-schema" = doDistribute super."aeson-schema_0_3_0_7";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
   "aeson-smart" = dontDistribute super."aeson-smart";
@@ -1405,6 +1409,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
   "barcodes-code128" = dontDistribute super."barcodes-code128";
@@ -2370,14 +2375,18 @@ self: super: {
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
+  "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_7";
+  "diagrams-core" = doDistribute super."diagrams-core_1_3_0_3";
   "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
   "diagrams-gtk" = dontDistribute super."diagrams-gtk";
   "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
   "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
   "diagrams-pdf" = dontDistribute super."diagrams-pdf";
   "diagrams-pgf" = dontDistribute super."diagrams-pgf";
+  "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_3";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
+  "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_6";
   "diagrams-tikz" = dontDistribute super."diagrams-tikz";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
@@ -2509,6 +2518,7 @@ self: super: {
   "dtd-types" = dontDistribute super."dtd-types";
   "dtrace" = dontDistribute super."dtrace";
   "dtw" = dontDistribute super."dtw";
+  "dual-tree" = doDistribute super."dual-tree_0_2_0_7";
   "dump" = dontDistribute super."dump";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
@@ -3119,6 +3129,7 @@ self: super: {
   "glambda" = dontDistribute super."glambda";
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
@@ -3565,6 +3576,7 @@ self: super: {
   "haskell-reflect" = dontDistribute super."haskell-reflect";
   "haskell-rules" = dontDistribute super."haskell-rules";
   "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq";
+  "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_11";
   "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton";
   "haskell-token-utils" = dontDistribute super."haskell-token-utils";
   "haskell-type-exts" = dontDistribute super."haskell-type-exts";
@@ -3780,6 +3792,7 @@ self: super: {
   "himerge" = dontDistribute super."himerge";
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
+  "hindent" = doDistribute super."hindent_4_5_4";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -5107,6 +5120,7 @@ self: super: {
   "mono-foldable" = dontDistribute super."mono-foldable";
   "mono-traversable" = doDistribute super."mono-traversable_0_9_3";
   "monoid-absorbing" = dontDistribute super."monoid-absorbing";
+  "monoid-extras" = doDistribute super."monoid-extras_0_4_0_2";
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
@@ -6951,6 +6965,7 @@ self: super: {
   "tasty-laws" = dontDistribute super."tasty-laws";
   "tasty-lens" = dontDistribute super."tasty-lens";
   "tasty-program" = dontDistribute super."tasty-program";
+  "tasty-silver" = doDistribute super."tasty-silver_3_1_7";
   "tasty-tap" = dontDistribute super."tasty-tap";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -7513,6 +7528,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
+  "wai-app-static" = doDistribute super."wai-app-static_3_1_1";
   "wai-cors" = doDistribute super."wai-cors_0_2_3";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -7601,6 +7617,7 @@ self: super: {
   "webkit-javascriptcore" = dontDistribute super."webkit-javascriptcore";
   "webkitgtk3" = dontDistribute super."webkitgtk3";
   "webkitgtk3-javascriptcore" = dontDistribute super."webkitgtk3-javascriptcore";
+  "webpage" = doDistribute super."webpage_0_0_3_1";
   "webrtc-vad" = dontDistribute super."webrtc-vad";
   "webserver" = dontDistribute super."webserver";
   "websnap" = dontDistribute super."websnap";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.11.nix b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
index 20f538e28fed..a6a91837f99a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
@@ -1070,10 +1070,12 @@ self: super: {
   "acme-timemachine" = dontDistribute super."acme-timemachine";
   "acme-year" = dontDistribute super."acme-year";
   "acme-zero" = dontDistribute super."acme-zero";
+  "active" = doDistribute super."active_0_2_0_6";
   "activehs" = dontDistribute super."activehs";
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
   "actor" = dontDistribute super."actor";
+  "ad" = doDistribute super."ad_4_2_4";
   "adaptive-containers" = dontDistribute super."adaptive-containers";
   "adaptive-tuple" = dontDistribute super."adaptive-tuple";
   "adb" = dontDistribute super."adb";
@@ -1089,9 +1091,11 @@ self: super: {
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
   "aeson-diff" = dontDistribute super."aeson-diff";
+  "aeson-extra" = doDistribute super."aeson-extra_0_2_1_0";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-schema" = doDistribute super."aeson-schema_0_3_0_7";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
   "aeson-smart" = dontDistribute super."aeson-smart";
@@ -1404,6 +1408,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
   "barcodes-code128" = dontDistribute super."barcodes-code128";
@@ -2366,14 +2371,18 @@ self: super: {
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
+  "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_7";
+  "diagrams-core" = doDistribute super."diagrams-core_1_3_0_3";
   "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
   "diagrams-gtk" = dontDistribute super."diagrams-gtk";
   "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
   "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
   "diagrams-pdf" = dontDistribute super."diagrams-pdf";
   "diagrams-pgf" = dontDistribute super."diagrams-pgf";
+  "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_3";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
+  "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_6";
   "diagrams-tikz" = dontDistribute super."diagrams-tikz";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
@@ -2505,6 +2514,7 @@ self: super: {
   "dtd-types" = dontDistribute super."dtd-types";
   "dtrace" = dontDistribute super."dtrace";
   "dtw" = dontDistribute super."dtw";
+  "dual-tree" = doDistribute super."dual-tree_0_2_0_7";
   "dump" = dontDistribute super."dump";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
@@ -3113,6 +3123,7 @@ self: super: {
   "glambda" = dontDistribute super."glambda";
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
@@ -3558,6 +3569,7 @@ self: super: {
   "haskell-reflect" = dontDistribute super."haskell-reflect";
   "haskell-rules" = dontDistribute super."haskell-rules";
   "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq";
+  "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_11";
   "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton";
   "haskell-token-utils" = dontDistribute super."haskell-token-utils";
   "haskell-type-exts" = dontDistribute super."haskell-type-exts";
@@ -3773,6 +3785,7 @@ self: super: {
   "himerge" = dontDistribute super."himerge";
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
+  "hindent" = doDistribute super."hindent_4_5_4";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -5099,6 +5112,7 @@ self: super: {
   "mono-foldable" = dontDistribute super."mono-foldable";
   "mono-traversable" = doDistribute super."mono-traversable_0_9_3";
   "monoid-absorbing" = dontDistribute super."monoid-absorbing";
+  "monoid-extras" = doDistribute super."monoid-extras_0_4_0_2";
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
@@ -6938,6 +6952,7 @@ self: super: {
   "tasty-laws" = dontDistribute super."tasty-laws";
   "tasty-lens" = dontDistribute super."tasty-lens";
   "tasty-program" = dontDistribute super."tasty-program";
+  "tasty-silver" = doDistribute super."tasty-silver_3_1_7";
   "tasty-tap" = dontDistribute super."tasty-tap";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -7500,6 +7515,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
+  "wai-app-static" = doDistribute super."wai-app-static_3_1_1";
   "wai-cors" = doDistribute super."wai-cors_0_2_3";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -7588,6 +7604,7 @@ self: super: {
   "webkit-javascriptcore" = dontDistribute super."webkit-javascriptcore";
   "webkitgtk3" = dontDistribute super."webkitgtk3";
   "webkitgtk3-javascriptcore" = dontDistribute super."webkitgtk3-javascriptcore";
+  "webpage" = doDistribute super."webpage_0_0_3_1";
   "webrtc-vad" = dontDistribute super."webrtc-vad";
   "webserver" = dontDistribute super."webserver";
   "websnap" = dontDistribute super."websnap";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.12.nix b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
index 2a91b049abd7..5f8ec0341155 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
@@ -1068,10 +1068,12 @@ self: super: {
   "acme-timemachine" = dontDistribute super."acme-timemachine";
   "acme-year" = dontDistribute super."acme-year";
   "acme-zero" = dontDistribute super."acme-zero";
+  "active" = doDistribute super."active_0_2_0_6";
   "activehs" = dontDistribute super."activehs";
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
   "actor" = dontDistribute super."actor";
+  "ad" = doDistribute super."ad_4_2_4";
   "adaptive-containers" = dontDistribute super."adaptive-containers";
   "adaptive-tuple" = dontDistribute super."adaptive-tuple";
   "adb" = dontDistribute super."adb";
@@ -1087,9 +1089,11 @@ self: super: {
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
   "aeson-diff" = dontDistribute super."aeson-diff";
+  "aeson-extra" = doDistribute super."aeson-extra_0_2_1_0";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-schema" = doDistribute super."aeson-schema_0_3_0_7";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
   "aeson-smart" = dontDistribute super."aeson-smart";
@@ -1402,6 +1406,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
   "barcodes-code128" = dontDistribute super."barcodes-code128";
@@ -2360,14 +2365,18 @@ self: super: {
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
+  "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_7";
+  "diagrams-core" = doDistribute super."diagrams-core_1_3_0_3";
   "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
   "diagrams-gtk" = dontDistribute super."diagrams-gtk";
   "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
   "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
   "diagrams-pdf" = dontDistribute super."diagrams-pdf";
   "diagrams-pgf" = dontDistribute super."diagrams-pgf";
+  "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_3";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
+  "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_6";
   "diagrams-tikz" = dontDistribute super."diagrams-tikz";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
@@ -2499,6 +2508,7 @@ self: super: {
   "dtd-types" = dontDistribute super."dtd-types";
   "dtrace" = dontDistribute super."dtrace";
   "dtw" = dontDistribute super."dtw";
+  "dual-tree" = doDistribute super."dual-tree_0_2_0_7";
   "dump" = dontDistribute super."dump";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
@@ -3106,6 +3116,7 @@ self: super: {
   "glambda" = dontDistribute super."glambda";
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
@@ -3550,6 +3561,7 @@ self: super: {
   "haskell-reflect" = dontDistribute super."haskell-reflect";
   "haskell-rules" = dontDistribute super."haskell-rules";
   "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq";
+  "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_11";
   "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton";
   "haskell-token-utils" = dontDistribute super."haskell-token-utils";
   "haskell-type-exts" = dontDistribute super."haskell-type-exts";
@@ -3765,6 +3777,7 @@ self: super: {
   "himerge" = dontDistribute super."himerge";
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
+  "hindent" = doDistribute super."hindent_4_5_4";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -5089,6 +5102,7 @@ self: super: {
   "mono-foldable" = dontDistribute super."mono-foldable";
   "mono-traversable" = doDistribute super."mono-traversable_0_9_3";
   "monoid-absorbing" = dontDistribute super."monoid-absorbing";
+  "monoid-extras" = doDistribute super."monoid-extras_0_4_0_2";
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
@@ -6926,6 +6940,7 @@ self: super: {
   "tasty-laws" = dontDistribute super."tasty-laws";
   "tasty-lens" = dontDistribute super."tasty-lens";
   "tasty-program" = dontDistribute super."tasty-program";
+  "tasty-silver" = doDistribute super."tasty-silver_3_1_7";
   "tasty-tap" = dontDistribute super."tasty-tap";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -7485,6 +7500,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
+  "wai-app-static" = doDistribute super."wai-app-static_3_1_1";
   "wai-cors" = doDistribute super."wai-cors_0_2_3";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -7573,6 +7589,7 @@ self: super: {
   "webkit-javascriptcore" = dontDistribute super."webkit-javascriptcore";
   "webkitgtk3" = dontDistribute super."webkitgtk3";
   "webkitgtk3-javascriptcore" = dontDistribute super."webkitgtk3-javascriptcore";
+  "webpage" = doDistribute super."webpage_0_0_3_1";
   "webrtc-vad" = dontDistribute super."webrtc-vad";
   "webserver" = dontDistribute super."webserver";
   "websnap" = dontDistribute super."websnap";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.13.nix b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
index 0577a3ec7fcb..ec6e8e619586 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
@@ -1068,10 +1068,12 @@ self: super: {
   "acme-timemachine" = dontDistribute super."acme-timemachine";
   "acme-year" = dontDistribute super."acme-year";
   "acme-zero" = dontDistribute super."acme-zero";
+  "active" = doDistribute super."active_0_2_0_6";
   "activehs" = dontDistribute super."activehs";
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
   "actor" = dontDistribute super."actor";
+  "ad" = doDistribute super."ad_4_2_4";
   "adaptive-containers" = dontDistribute super."adaptive-containers";
   "adaptive-tuple" = dontDistribute super."adaptive-tuple";
   "adb" = dontDistribute super."adb";
@@ -1087,9 +1089,11 @@ self: super: {
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
   "aeson-diff" = dontDistribute super."aeson-diff";
+  "aeson-extra" = doDistribute super."aeson-extra_0_2_1_0";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-schema" = doDistribute super."aeson-schema_0_3_0_7";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
   "aeson-smart" = dontDistribute super."aeson-smart";
@@ -1402,6 +1406,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
   "barcodes-code128" = dontDistribute super."barcodes-code128";
@@ -2358,14 +2363,18 @@ self: super: {
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
+  "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_7";
+  "diagrams-core" = doDistribute super."diagrams-core_1_3_0_3";
   "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
   "diagrams-gtk" = dontDistribute super."diagrams-gtk";
   "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
   "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
   "diagrams-pdf" = dontDistribute super."diagrams-pdf";
   "diagrams-pgf" = dontDistribute super."diagrams-pgf";
+  "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_3";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
+  "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_6";
   "diagrams-tikz" = dontDistribute super."diagrams-tikz";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
@@ -2497,6 +2506,7 @@ self: super: {
   "dtd-types" = dontDistribute super."dtd-types";
   "dtrace" = dontDistribute super."dtrace";
   "dtw" = dontDistribute super."dtw";
+  "dual-tree" = doDistribute super."dual-tree_0_2_0_7";
   "dump" = dontDistribute super."dump";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
@@ -3104,6 +3114,7 @@ self: super: {
   "glambda" = dontDistribute super."glambda";
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
@@ -3548,6 +3559,7 @@ self: super: {
   "haskell-reflect" = dontDistribute super."haskell-reflect";
   "haskell-rules" = dontDistribute super."haskell-rules";
   "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq";
+  "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_11";
   "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton";
   "haskell-token-utils" = dontDistribute super."haskell-token-utils";
   "haskell-type-exts" = dontDistribute super."haskell-type-exts";
@@ -3762,6 +3774,7 @@ self: super: {
   "himerge" = dontDistribute super."himerge";
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
+  "hindent" = doDistribute super."hindent_4_5_4";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -4831,6 +4844,7 @@ self: super: {
   "luachunk" = dontDistribute super."luachunk";
   "luautils" = dontDistribute super."luautils";
   "lub" = dontDistribute super."lub";
+  "lucid" = doDistribute super."lucid_2_9_3";
   "lucid-foundation" = dontDistribute super."lucid-foundation";
   "lucienne" = dontDistribute super."lucienne";
   "luhn" = dontDistribute super."luhn";
@@ -5083,6 +5097,7 @@ self: super: {
   "mono-foldable" = dontDistribute super."mono-foldable";
   "mono-traversable" = doDistribute super."mono-traversable_0_9_3";
   "monoid-absorbing" = dontDistribute super."monoid-absorbing";
+  "monoid-extras" = doDistribute super."monoid-extras_0_4_0_2";
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
@@ -6917,6 +6932,7 @@ self: super: {
   "tasty-laws" = dontDistribute super."tasty-laws";
   "tasty-lens" = dontDistribute super."tasty-lens";
   "tasty-program" = dontDistribute super."tasty-program";
+  "tasty-silver" = doDistribute super."tasty-silver_3_1_7";
   "tasty-tap" = dontDistribute super."tasty-tap";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -7476,6 +7492,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
+  "wai-app-static" = doDistribute super."wai-app-static_3_1_1";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
   "wai-dispatch" = dontDistribute super."wai-dispatch";
@@ -7563,6 +7580,7 @@ self: super: {
   "webkit-javascriptcore" = dontDistribute super."webkit-javascriptcore";
   "webkitgtk3" = dontDistribute super."webkitgtk3";
   "webkitgtk3-javascriptcore" = dontDistribute super."webkitgtk3-javascriptcore";
+  "webpage" = doDistribute super."webpage_0_0_3_1";
   "webrtc-vad" = dontDistribute super."webrtc-vad";
   "webserver" = dontDistribute super."webserver";
   "websnap" = dontDistribute super."websnap";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.2.nix b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
index c7b3498c2d89..541793134154 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
@@ -1082,6 +1082,7 @@ self: super: {
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
   "actor" = dontDistribute super."actor";
+  "ad" = doDistribute super."ad_4_2_4";
   "adaptive-containers" = dontDistribute super."adaptive-containers";
   "adaptive-tuple" = dontDistribute super."adaptive-tuple";
   "adb" = dontDistribute super."adb";
@@ -1102,6 +1103,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-schema" = doDistribute super."aeson-schema_0_3_0_7";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
   "aeson-smart" = dontDistribute super."aeson-smart";
@@ -1423,6 +1425,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
   "barcodes-code128" = dontDistribute super."barcodes-code128";
@@ -3184,6 +3187,7 @@ self: super: {
   "glambda" = dontDistribute super."glambda";
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
@@ -3852,6 +3856,7 @@ self: super: {
   "himerge" = dontDistribute super."himerge";
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
+  "hindent" = doDistribute super."hindent_4_5_4";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -7095,6 +7100,7 @@ self: super: {
   "tasty-program" = dontDistribute super."tasty-program";
   "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2";
   "tasty-rerun" = doDistribute super."tasty-rerun_1_1_4";
+  "tasty-silver" = doDistribute super."tasty-silver_3_1_7";
   "tasty-tap" = dontDistribute super."tasty-tap";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -7666,6 +7672,7 @@ self: super: {
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_0";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
+  "wai-app-static" = doDistribute super."wai-app-static_3_1_1";
   "wai-cors" = doDistribute super."wai-cors_0_2_3";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -7759,6 +7766,7 @@ self: super: {
   "webkit-javascriptcore" = dontDistribute super."webkit-javascriptcore";
   "webkitgtk3" = dontDistribute super."webkitgtk3";
   "webkitgtk3-javascriptcore" = dontDistribute super."webkitgtk3-javascriptcore";
+  "webpage" = doDistribute super."webpage_0_0_3_1";
   "webrtc-vad" = dontDistribute super."webrtc-vad";
   "webserver" = dontDistribute super."webserver";
   "websnap" = dontDistribute super."websnap";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.3.nix b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
index e6d2a4c46894..0d9e480c860b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
@@ -1082,6 +1082,7 @@ self: super: {
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
   "actor" = dontDistribute super."actor";
+  "ad" = doDistribute super."ad_4_2_4";
   "adaptive-containers" = dontDistribute super."adaptive-containers";
   "adaptive-tuple" = dontDistribute super."adaptive-tuple";
   "adb" = dontDistribute super."adb";
@@ -1102,6 +1103,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-schema" = doDistribute super."aeson-schema_0_3_0_7";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
   "aeson-smart" = dontDistribute super."aeson-smart";
@@ -1422,6 +1424,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
   "barcodes-code128" = dontDistribute super."barcodes-code128";
@@ -3179,6 +3182,7 @@ self: super: {
   "glambda" = dontDistribute super."glambda";
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
@@ -3847,6 +3851,7 @@ self: super: {
   "himerge" = dontDistribute super."himerge";
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
+  "hindent" = doDistribute super."hindent_4_5_4";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -7084,6 +7089,7 @@ self: super: {
   "tasty-program" = dontDistribute super."tasty-program";
   "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2";
   "tasty-rerun" = doDistribute super."tasty-rerun_1_1_4";
+  "tasty-silver" = doDistribute super."tasty-silver_3_1_7";
   "tasty-tap" = dontDistribute super."tasty-tap";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -7654,6 +7660,7 @@ self: super: {
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_0";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
+  "wai-app-static" = doDistribute super."wai-app-static_3_1_1";
   "wai-cors" = doDistribute super."wai-cors_0_2_3";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -7747,6 +7754,7 @@ self: super: {
   "webkit-javascriptcore" = dontDistribute super."webkit-javascriptcore";
   "webkitgtk3" = dontDistribute super."webkitgtk3";
   "webkitgtk3-javascriptcore" = dontDistribute super."webkitgtk3-javascriptcore";
+  "webpage" = doDistribute super."webpage_0_0_3_1";
   "webrtc-vad" = dontDistribute super."webrtc-vad";
   "webserver" = dontDistribute super."webserver";
   "websnap" = dontDistribute super."websnap";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.4.nix b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
index 27f2a0c4f7f9..787bed1d87b0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
@@ -1082,6 +1082,7 @@ self: super: {
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
   "actor" = dontDistribute super."actor";
+  "ad" = doDistribute super."ad_4_2_4";
   "adaptive-containers" = dontDistribute super."adaptive-containers";
   "adaptive-tuple" = dontDistribute super."adaptive-tuple";
   "adb" = dontDistribute super."adb";
@@ -1102,6 +1103,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-schema" = doDistribute super."aeson-schema_0_3_0_7";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
   "aeson-smart" = dontDistribute super."aeson-smart";
@@ -1422,6 +1424,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
   "barcodes-code128" = dontDistribute super."barcodes-code128";
@@ -3178,6 +3181,7 @@ self: super: {
   "glambda" = dontDistribute super."glambda";
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
@@ -3846,6 +3850,7 @@ self: super: {
   "himerge" = dontDistribute super."himerge";
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
+  "hindent" = doDistribute super."hindent_4_5_4";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -7081,6 +7086,7 @@ self: super: {
   "tasty-program" = dontDistribute super."tasty-program";
   "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2";
   "tasty-rerun" = doDistribute super."tasty-rerun_1_1_4";
+  "tasty-silver" = doDistribute super."tasty-silver_3_1_7";
   "tasty-tap" = dontDistribute super."tasty-tap";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -7651,6 +7657,7 @@ self: super: {
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_0";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
+  "wai-app-static" = doDistribute super."wai-app-static_3_1_1";
   "wai-cors" = doDistribute super."wai-cors_0_2_3";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -7743,6 +7750,7 @@ self: super: {
   "webkit-javascriptcore" = dontDistribute super."webkit-javascriptcore";
   "webkitgtk3" = dontDistribute super."webkitgtk3";
   "webkitgtk3-javascriptcore" = dontDistribute super."webkitgtk3-javascriptcore";
+  "webpage" = doDistribute super."webpage_0_0_3_1";
   "webrtc-vad" = dontDistribute super."webrtc-vad";
   "webserver" = dontDistribute super."webserver";
   "websnap" = dontDistribute super."websnap";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.5.nix b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
index acb5bb915a48..6268d1b4afd1 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
@@ -1082,6 +1082,7 @@ self: super: {
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
   "actor" = dontDistribute super."actor";
+  "ad" = doDistribute super."ad_4_2_4";
   "adaptive-containers" = dontDistribute super."adaptive-containers";
   "adaptive-tuple" = dontDistribute super."adaptive-tuple";
   "adb" = dontDistribute super."adb";
@@ -1102,6 +1103,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-schema" = doDistribute super."aeson-schema_0_3_0_7";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
   "aeson-smart" = dontDistribute super."aeson-smart";
@@ -1421,6 +1423,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
   "barcodes-code128" = dontDistribute super."barcodes-code128";
@@ -3173,6 +3176,7 @@ self: super: {
   "glambda" = dontDistribute super."glambda";
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
@@ -3839,6 +3843,7 @@ self: super: {
   "himerge" = dontDistribute super."himerge";
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
+  "hindent" = doDistribute super."hindent_4_5_4";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -7061,6 +7066,7 @@ self: super: {
   "tasty-lens" = dontDistribute super."tasty-lens";
   "tasty-program" = dontDistribute super."tasty-program";
   "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2";
+  "tasty-silver" = doDistribute super."tasty-silver_3_1_7";
   "tasty-tap" = dontDistribute super."tasty-tap";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -7630,6 +7636,7 @@ self: super: {
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_0";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
+  "wai-app-static" = doDistribute super."wai-app-static_3_1_1";
   "wai-cors" = doDistribute super."wai-cors_0_2_3";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -7722,6 +7729,7 @@ self: super: {
   "webkit-javascriptcore" = dontDistribute super."webkit-javascriptcore";
   "webkitgtk3" = dontDistribute super."webkitgtk3";
   "webkitgtk3-javascriptcore" = dontDistribute super."webkitgtk3-javascriptcore";
+  "webpage" = doDistribute super."webpage_0_0_3_1";
   "webrtc-vad" = dontDistribute super."webrtc-vad";
   "webserver" = dontDistribute super."webserver";
   "websnap" = dontDistribute super."websnap";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.6.nix b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
index 395e92838896..adaa090dcf1a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
@@ -1077,10 +1077,12 @@ self: super: {
   "acme-timemachine" = dontDistribute super."acme-timemachine";
   "acme-year" = dontDistribute super."acme-year";
   "acme-zero" = dontDistribute super."acme-zero";
+  "active" = doDistribute super."active_0_2_0_6";
   "activehs" = dontDistribute super."activehs";
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
   "actor" = dontDistribute super."actor";
+  "ad" = doDistribute super."ad_4_2_4";
   "adaptive-containers" = dontDistribute super."adaptive-containers";
   "adaptive-tuple" = dontDistribute super."adaptive-tuple";
   "adb" = dontDistribute super."adb";
@@ -1100,6 +1102,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-schema" = doDistribute super."aeson-schema_0_3_0_7";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
   "aeson-smart" = dontDistribute super."aeson-smart";
@@ -1419,6 +1422,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
   "barcodes-code128" = dontDistribute super."barcodes-code128";
@@ -2397,6 +2401,7 @@ self: super: {
   "diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_0_4";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
   "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_6";
+  "diagrams-core" = doDistribute super."diagrams-core_1_3_0_3";
   "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
   "diagrams-gtk" = dontDistribute super."diagrams-gtk";
   "diagrams-haddock" = doDistribute super."diagrams-haddock_0_3_0_6";
@@ -2545,6 +2550,7 @@ self: super: {
   "dtd-types" = dontDistribute super."dtd-types";
   "dtrace" = dontDistribute super."dtrace";
   "dtw" = dontDistribute super."dtw";
+  "dual-tree" = doDistribute super."dual-tree_0_2_0_7";
   "dump" = dontDistribute super."dump";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
@@ -3163,6 +3169,7 @@ self: super: {
   "glambda" = dontDistribute super."glambda";
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
@@ -3828,6 +3835,7 @@ self: super: {
   "himerge" = dontDistribute super."himerge";
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
+  "hindent" = doDistribute super."hindent_4_5_4";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -5165,6 +5173,7 @@ self: super: {
   "mono-foldable" = dontDistribute super."mono-foldable";
   "mono-traversable" = doDistribute super."mono-traversable_0_9_3";
   "monoid-absorbing" = dontDistribute super."monoid-absorbing";
+  "monoid-extras" = doDistribute super."monoid-extras_0_4_0_2";
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
@@ -7038,6 +7047,7 @@ self: super: {
   "tasty-lens" = dontDistribute super."tasty-lens";
   "tasty-program" = dontDistribute super."tasty-program";
   "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2";
+  "tasty-silver" = doDistribute super."tasty-silver_3_1_7";
   "tasty-tap" = dontDistribute super."tasty-tap";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -7605,6 +7615,7 @@ self: super: {
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_0";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
+  "wai-app-static" = doDistribute super."wai-app-static_3_1_1";
   "wai-cors" = doDistribute super."wai-cors_0_2_3";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -7696,6 +7707,7 @@ self: super: {
   "webkit-javascriptcore" = dontDistribute super."webkit-javascriptcore";
   "webkitgtk3" = dontDistribute super."webkitgtk3";
   "webkitgtk3-javascriptcore" = dontDistribute super."webkitgtk3-javascriptcore";
+  "webpage" = doDistribute super."webpage_0_0_3_1";
   "webrtc-vad" = dontDistribute super."webrtc-vad";
   "webserver" = dontDistribute super."webserver";
   "websnap" = dontDistribute super."websnap";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.7.nix b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
index beb5e3581f53..b23f77a12809 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
@@ -1076,10 +1076,12 @@ self: super: {
   "acme-timemachine" = dontDistribute super."acme-timemachine";
   "acme-year" = dontDistribute super."acme-year";
   "acme-zero" = dontDistribute super."acme-zero";
+  "active" = doDistribute super."active_0_2_0_6";
   "activehs" = dontDistribute super."activehs";
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
   "actor" = dontDistribute super."actor";
+  "ad" = doDistribute super."ad_4_2_4";
   "adaptive-containers" = dontDistribute super."adaptive-containers";
   "adaptive-tuple" = dontDistribute super."adaptive-tuple";
   "adb" = dontDistribute super."adb";
@@ -1099,6 +1101,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-schema" = doDistribute super."aeson-schema_0_3_0_7";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
   "aeson-smart" = dontDistribute super."aeson-smart";
@@ -1414,6 +1417,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
   "barcodes-code128" = dontDistribute super."barcodes-code128";
@@ -2390,6 +2394,7 @@ self: super: {
   "diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_0_4";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
   "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_6";
+  "diagrams-core" = doDistribute super."diagrams-core_1_3_0_3";
   "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
   "diagrams-gtk" = dontDistribute super."diagrams-gtk";
   "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
@@ -2397,6 +2402,7 @@ self: super: {
   "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
   "diagrams-pdf" = dontDistribute super."diagrams-pdf";
   "diagrams-pgf" = dontDistribute super."diagrams-pgf";
+  "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_3";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_4";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
@@ -2535,6 +2541,7 @@ self: super: {
   "dtd-types" = dontDistribute super."dtd-types";
   "dtrace" = dontDistribute super."dtrace";
   "dtw" = dontDistribute super."dtw";
+  "dual-tree" = doDistribute super."dual-tree_0_2_0_7";
   "dump" = dontDistribute super."dump";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
@@ -3151,6 +3158,7 @@ self: super: {
   "glambda" = dontDistribute super."glambda";
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
@@ -3814,6 +3822,7 @@ self: super: {
   "himerge" = dontDistribute super."himerge";
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
+  "hindent" = doDistribute super."hindent_4_5_4";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -5147,6 +5156,7 @@ self: super: {
   "mono-foldable" = dontDistribute super."mono-foldable";
   "mono-traversable" = doDistribute super."mono-traversable_0_9_3";
   "monoid-absorbing" = dontDistribute super."monoid-absorbing";
+  "monoid-extras" = doDistribute super."monoid-extras_0_4_0_2";
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
@@ -7012,6 +7022,7 @@ self: super: {
   "tasty-lens" = dontDistribute super."tasty-lens";
   "tasty-program" = dontDistribute super."tasty-program";
   "tasty-quickcheck" = doDistribute super."tasty-quickcheck_0_8_3_2";
+  "tasty-silver" = doDistribute super."tasty-silver_3_1_7";
   "tasty-tap" = dontDistribute super."tasty-tap";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -7578,6 +7589,7 @@ self: super: {
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_0";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
+  "wai-app-static" = doDistribute super."wai-app-static_3_1_1";
   "wai-cors" = doDistribute super."wai-cors_0_2_3";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -7668,6 +7680,7 @@ self: super: {
   "webkit-javascriptcore" = dontDistribute super."webkit-javascriptcore";
   "webkitgtk3" = dontDistribute super."webkitgtk3";
   "webkitgtk3-javascriptcore" = dontDistribute super."webkitgtk3-javascriptcore";
+  "webpage" = doDistribute super."webpage_0_0_3_1";
   "webrtc-vad" = dontDistribute super."webrtc-vad";
   "webserver" = dontDistribute super."webserver";
   "websnap" = dontDistribute super."websnap";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.8.nix b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
index 20a7555e10bc..3af51a64177f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
@@ -1075,10 +1075,12 @@ self: super: {
   "acme-timemachine" = dontDistribute super."acme-timemachine";
   "acme-year" = dontDistribute super."acme-year";
   "acme-zero" = dontDistribute super."acme-zero";
+  "active" = doDistribute super."active_0_2_0_6";
   "activehs" = dontDistribute super."activehs";
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
   "actor" = dontDistribute super."actor";
+  "ad" = doDistribute super."ad_4_2_4";
   "adaptive-containers" = dontDistribute super."adaptive-containers";
   "adaptive-tuple" = dontDistribute super."adaptive-tuple";
   "adb" = dontDistribute super."adb";
@@ -1098,6 +1100,7 @@ self: super: {
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-schema" = doDistribute super."aeson-schema_0_3_0_7";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
   "aeson-smart" = dontDistribute super."aeson-smart";
@@ -1413,6 +1416,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
   "barcodes-code128" = dontDistribute super."barcodes-code128";
@@ -2381,14 +2385,18 @@ self: super: {
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
+  "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_7";
+  "diagrams-core" = doDistribute super."diagrams-core_1_3_0_3";
   "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
   "diagrams-gtk" = dontDistribute super."diagrams-gtk";
   "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
   "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
   "diagrams-pdf" = dontDistribute super."diagrams-pdf";
   "diagrams-pgf" = dontDistribute super."diagrams-pgf";
+  "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_3";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
+  "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_6";
   "diagrams-tikz" = dontDistribute super."diagrams-tikz";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
@@ -2521,6 +2529,7 @@ self: super: {
   "dtd-types" = dontDistribute super."dtd-types";
   "dtrace" = dontDistribute super."dtrace";
   "dtw" = dontDistribute super."dtw";
+  "dual-tree" = doDistribute super."dual-tree_0_2_0_7";
   "dump" = dontDistribute super."dump";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
@@ -3137,6 +3146,7 @@ self: super: {
   "glambda" = dontDistribute super."glambda";
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
@@ -3584,6 +3594,7 @@ self: super: {
   "haskell-reflect" = dontDistribute super."haskell-reflect";
   "haskell-rules" = dontDistribute super."haskell-rules";
   "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq";
+  "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_11";
   "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton";
   "haskell-token-utils" = dontDistribute super."haskell-token-utils";
   "haskell-type-exts" = dontDistribute super."haskell-type-exts";
@@ -3799,6 +3810,7 @@ self: super: {
   "himerge" = dontDistribute super."himerge";
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
+  "hindent" = doDistribute super."hindent_4_5_4";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -5130,6 +5142,7 @@ self: super: {
   "mono-foldable" = dontDistribute super."mono-foldable";
   "mono-traversable" = doDistribute super."mono-traversable_0_9_3";
   "monoid-absorbing" = dontDistribute super."monoid-absorbing";
+  "monoid-extras" = doDistribute super."monoid-extras_0_4_0_2";
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
@@ -6988,6 +7001,7 @@ self: super: {
   "tasty-laws" = dontDistribute super."tasty-laws";
   "tasty-lens" = dontDistribute super."tasty-lens";
   "tasty-program" = dontDistribute super."tasty-program";
+  "tasty-silver" = doDistribute super."tasty-silver_3_1_7";
   "tasty-tap" = dontDistribute super."tasty-tap";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -7553,6 +7567,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
+  "wai-app-static" = doDistribute super."wai-app-static_3_1_1";
   "wai-cors" = doDistribute super."wai-cors_0_2_3";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -7643,6 +7658,7 @@ self: super: {
   "webkit-javascriptcore" = dontDistribute super."webkit-javascriptcore";
   "webkitgtk3" = dontDistribute super."webkitgtk3";
   "webkitgtk3-javascriptcore" = dontDistribute super."webkitgtk3-javascriptcore";
+  "webpage" = doDistribute super."webpage_0_0_3_1";
   "webrtc-vad" = dontDistribute super."webrtc-vad";
   "webserver" = dontDistribute super."webserver";
   "websnap" = dontDistribute super."websnap";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.9.nix b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
index 9bb14c7d6215..6efbe331eab2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
@@ -1073,10 +1073,12 @@ self: super: {
   "acme-timemachine" = dontDistribute super."acme-timemachine";
   "acme-year" = dontDistribute super."acme-year";
   "acme-zero" = dontDistribute super."acme-zero";
+  "active" = doDistribute super."active_0_2_0_6";
   "activehs" = dontDistribute super."activehs";
   "activehs-base" = dontDistribute super."activehs-base";
   "activitystreams-aeson" = dontDistribute super."activitystreams-aeson";
   "actor" = dontDistribute super."actor";
+  "ad" = doDistribute super."ad_4_2_4";
   "adaptive-containers" = dontDistribute super."adaptive-containers";
   "adaptive-tuple" = dontDistribute super."adaptive-tuple";
   "adb" = dontDistribute super."adb";
@@ -1092,9 +1094,11 @@ self: super: {
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
   "aeson-diff" = dontDistribute super."aeson-diff";
+  "aeson-extra" = doDistribute super."aeson-extra_0_2_1_0";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-lens" = dontDistribute super."aeson-lens";
   "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
   "aeson-schema" = doDistribute super."aeson-schema_0_3_0_7";
   "aeson-serialize" = dontDistribute super."aeson-serialize";
   "aeson-smart" = dontDistribute super."aeson-smart";
@@ -1410,6 +1414,7 @@ self: super: {
   "bamboo-theme-mini-html5" = dontDistribute super."bamboo-theme-mini-html5";
   "bamse" = dontDistribute super."bamse";
   "bamstats" = dontDistribute super."bamstats";
+  "bank-holiday-usa" = dontDistribute super."bank-holiday-usa";
   "banwords" = dontDistribute super."banwords";
   "barchart" = dontDistribute super."barchart";
   "barcodes-code128" = dontDistribute super."barcodes-code128";
@@ -2375,14 +2380,18 @@ self: super: {
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
+  "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_7";
+  "diagrams-core" = doDistribute super."diagrams-core_1_3_0_3";
   "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
   "diagrams-gtk" = dontDistribute super."diagrams-gtk";
   "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
   "diagrams-pandoc" = dontDistribute super."diagrams-pandoc";
   "diagrams-pdf" = dontDistribute super."diagrams-pdf";
   "diagrams-pgf" = dontDistribute super."diagrams-pgf";
+  "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_3";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
+  "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_6";
   "diagrams-tikz" = dontDistribute super."diagrams-tikz";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
   "dicom" = dontDistribute super."dicom";
@@ -2515,6 +2524,7 @@ self: super: {
   "dtd-types" = dontDistribute super."dtd-types";
   "dtrace" = dontDistribute super."dtrace";
   "dtw" = dontDistribute super."dtw";
+  "dual-tree" = doDistribute super."dual-tree_0_2_0_7";
   "dump" = dontDistribute super."dump";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
@@ -3128,6 +3138,7 @@ self: super: {
   "glambda" = dontDistribute super."glambda";
   "glapp" = dontDistribute super."glapp";
   "glasso" = dontDistribute super."glasso";
+  "glicko" = dontDistribute super."glicko";
   "glider-nlp" = dontDistribute super."glider-nlp";
   "glintcollider" = dontDistribute super."glintcollider";
   "gll" = dontDistribute super."gll";
@@ -3575,6 +3586,7 @@ self: super: {
   "haskell-reflect" = dontDistribute super."haskell-reflect";
   "haskell-rules" = dontDistribute super."haskell-rules";
   "haskell-src-exts-qq" = dontDistribute super."haskell-src-exts-qq";
+  "haskell-src-meta" = doDistribute super."haskell-src-meta_0_6_0_11";
   "haskell-src-meta-mwotton" = dontDistribute super."haskell-src-meta-mwotton";
   "haskell-token-utils" = dontDistribute super."haskell-token-utils";
   "haskell-type-exts" = dontDistribute super."haskell-type-exts";
@@ -3790,6 +3802,7 @@ self: super: {
   "himerge" = dontDistribute super."himerge";
   "himg" = dontDistribute super."himg";
   "himpy" = dontDistribute super."himpy";
+  "hindent" = doDistribute super."hindent_4_5_4";
   "hinduce-associations-apriori" = dontDistribute super."hinduce-associations-apriori";
   "hinduce-classifier" = dontDistribute super."hinduce-classifier";
   "hinduce-classifier-decisiontree" = dontDistribute super."hinduce-classifier-decisiontree";
@@ -5120,6 +5133,7 @@ self: super: {
   "mono-foldable" = dontDistribute super."mono-foldable";
   "mono-traversable" = doDistribute super."mono-traversable_0_9_3";
   "monoid-absorbing" = dontDistribute super."monoid-absorbing";
+  "monoid-extras" = doDistribute super."monoid-extras_0_4_0_2";
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
@@ -6976,6 +6990,7 @@ self: super: {
   "tasty-laws" = dontDistribute super."tasty-laws";
   "tasty-lens" = dontDistribute super."tasty-lens";
   "tasty-program" = dontDistribute super."tasty-program";
+  "tasty-silver" = doDistribute super."tasty-silver_3_1_7";
   "tasty-tap" = dontDistribute super."tasty-tap";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -7541,6 +7556,7 @@ self: super: {
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
+  "wai-app-static" = doDistribute super."wai-app-static_3_1_1";
   "wai-cors" = doDistribute super."wai-cors_0_2_3";
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
@@ -7631,6 +7647,7 @@ self: super: {
   "webkit-javascriptcore" = dontDistribute super."webkit-javascriptcore";
   "webkitgtk3" = dontDistribute super."webkitgtk3";
   "webkitgtk3-javascriptcore" = dontDistribute super."webkitgtk3-javascriptcore";
+  "webpage" = doDistribute super."webpage_0_0_3_1";
   "webrtc-vad" = dontDistribute super."webrtc-vad";
   "webserver" = dontDistribute super."webserver";
   "websnap" = dontDistribute super."websnap";
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 4ecb0fe132ca..e246b9ecf9a9 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -4761,8 +4761,8 @@ self: {
      }:
      mkDerivation {
        pname = "Earley";
-       version = "0.10.0.1";
-       sha256 = "4d2d3f248bac0acdbcd782d5b6981ea7c2bc3e28b6dc81f7dee8e8fed071869e";
+       version = "0.10.1.0";
+       sha256 = "a90c5c1e210a0e37db577ace20b1ca2aa33d22454766ecaeb5dc253cb7d4887e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ListLike ];
@@ -10376,8 +10376,8 @@ self: {
      }:
      mkDerivation {
        pname = "HulkImport";
-       version = "0.1.0.2";
-       sha256 = "41fd2d9fb6b474298421fbe5d951585fb9bf6a3501892570b107ad2b6f5ba1e4";
+       version = "0.1.0.3";
+       sha256 = "70d0a2a086dab3c2f08592cc421f2f005ec65dd00b83a42c957a54bfd39496cd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ attoparsec base pretty text ];
@@ -11146,8 +11146,8 @@ self: {
      }:
      mkDerivation {
        pname = "JuicyPixels-scale-dct";
-       version = "0.1.0.0";
-       sha256 = "2237de808b5ed2fd2f60e79ed974a136296a67c157db072d9cb1158a0d849a57";
+       version = "0.1.1.0";
+       sha256 = "dc7ee68f2e28e2b2344bdaabd5810ebfc15353d4013cd10387289189e8bae9f9";
        libraryHaskellDepends = [
          base base-compat carray fft JuicyPixels
        ];
@@ -20886,7 +20886,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "active" = callPackage
+  "active_0_2_0_6" = callPackage
     ({ mkDerivation, base, lens, linear, QuickCheck, semigroupoids
      , semigroups, vector
      }:
@@ -20902,6 +20902,25 @@ self: {
        ];
        description = "Abstractions for animation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "active" = callPackage
+    ({ mkDerivation, base, lens, linear, QuickCheck, semigroupoids
+     , semigroups, vector
+     }:
+     mkDerivation {
+       pname = "active";
+       version = "0.2.0.8";
+       sha256 = "a8335dd10b4bab3a2a73a2f8fa49cb20ab2f9ec1400fa7a49de3d92f9e887fdf";
+       libraryHaskellDepends = [
+         base lens linear semigroupoids semigroups vector
+       ];
+       testHaskellDepends = [
+         base lens linear QuickCheck semigroupoids semigroups vector
+       ];
+       description = "Abstractions for animation";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "activehs" = callPackage
@@ -21034,7 +21053,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "ad" = callPackage
+  "ad_4_2_4" = callPackage
     ({ mkDerivation, array, base, comonad, containers, data-reify
      , directory, doctest, erf, filepath, free, nats, reflection
      , transformers
@@ -21052,6 +21071,26 @@ self: {
        homepage = "http://github.com/ekmett/ad";
        description = "Automatic Differentiation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "ad" = callPackage
+    ({ mkDerivation, array, base, comonad, containers, data-reify
+     , directory, doctest, erf, filepath, free, nats, reflection
+     , transformers
+     }:
+     mkDerivation {
+       pname = "ad";
+       version = "4.3.1";
+       sha256 = "da9baee8042acd8a266863604dd4c02b5903f366dc8b5208584745c54e027392";
+       libraryHaskellDepends = [
+         array base comonad containers data-reify erf free nats reflection
+         transformers
+       ];
+       testHaskellDepends = [ base directory doctest filepath ];
+       homepage = "http://github.com/ekmett/ad";
+       description = "Automatic Differentiation";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "adaptive-containers" = callPackage
@@ -21498,7 +21537,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "aeson-extra" = callPackage
+  "aeson-extra_0_2_1_0" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
      , exceptions, hashable, quickcheck-instances, scientific, tagged
      , tasty, tasty-hunit, tasty-quickcheck, text, unordered-containers
@@ -21522,6 +21561,31 @@ self: {
        homepage = "https://github.com/phadej/aeson-extra#readme";
        description = "Extra goodies for aeson";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "aeson-extra" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
+     , exceptions, hashable, quickcheck-instances, scientific, tasty
+     , tasty-hunit, tasty-quickcheck, text, time, unordered-containers
+     , vector
+     }:
+     mkDerivation {
+       pname = "aeson-extra";
+       version = "0.2.2.0";
+       sha256 = "368aa018e650f323a1d52cfd38596fe419667e1ef3f83faf0f7255518b18dc45";
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring containers exceptions hashable
+         scientific text time unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson attoparsec base bytestring containers exceptions hashable
+         quickcheck-instances scientific tasty tasty-hunit tasty-quickcheck
+         text time unordered-containers vector
+       ];
+       homepage = "https://github.com/phadej/aeson-extra#readme";
+       description = "Extra goodies for aeson";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "aeson-filthy" = callPackage
@@ -21580,6 +21644,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "aeson-parsec-picky" = callPackage
+    ({ mkDerivation, aeson, base, parsec, scientific, text
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "aeson-parsec-picky";
+       version = "0.1.0.0";
+       sha256 = "bd5fa3ae9322fe1f486d52d046823d843538bf85204371a0ba17736412ea9cbc";
+       libraryHaskellDepends = [
+         aeson base parsec scientific text unordered-containers vector
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/FPBrno/aeson-parsec-picky";
+       description = "Alternative JSON parser based on Parsec and Aeson";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "aeson-pretty" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, cmdargs, text
      , unordered-containers, vector
@@ -28588,25 +28669,20 @@ self: {
      }) {};
 
   "ascii-progress" = callPackage
-    ({ mkDerivation, ansi-terminal, async, base, bytestring, conduit
-     , data-default, hspec, HTTP, http-conduit, http-types, QuickCheck
-     , time, transformers
+    ({ mkDerivation, async, base, concurrent-output, data-default
+     , hspec, QuickCheck, time
      }:
      mkDerivation {
        pname = "ascii-progress";
-       version = "0.2.1.2";
-       sha256 = "3c384b6401243bbe5acb735f1550b59622cf5b2fa8ef4cb8b870c2f609bcdd52";
+       version = "0.3.2.0";
+       sha256 = "51a70a0d1fd39138f6d143bf52080c765d0f0b69d5af887f2fa80a950448c771";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         ansi-terminal async base data-default time
-       ];
-       executableHaskellDepends = [
-         ansi-terminal async base bytestring conduit data-default HTTP
-         http-conduit http-types time transformers
+         async base concurrent-output data-default time
        ];
        testHaskellDepends = [
-         ansi-terminal async base data-default hspec QuickCheck time
+         async base concurrent-output data-default hspec QuickCheck time
        ];
        homepage = "https://github.com/yamadapc/haskell-ascii-progress";
        description = "A simple progress bar for the console";
@@ -31492,6 +31568,19 @@ self: {
        license = "GPL";
      }) {};
 
+  "bank-holiday-usa" = callPackage
+    ({ mkDerivation, base, hspec, HUnit, QuickCheck, time }:
+     mkDerivation {
+       pname = "bank-holiday-usa";
+       version = "0.0.1";
+       sha256 = "f46c4950c96f0e790477d95e75709d13f0409abb53c60382fcfcc7637f204270";
+       libraryHaskellDepends = [ base time ];
+       testHaskellDepends = [ base hspec HUnit QuickCheck time ];
+       homepage = "https://github.com/tippenein/BankHoliday";
+       description = "A library for determining US bank holidays";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "bank-holidays-england_0_1_0_2" = callPackage
     ({ mkDerivation, base, containers, hspec, QuickCheck, time }:
      mkDerivation {
@@ -32388,8 +32477,8 @@ self: {
     ({ mkDerivation, base, mtl, parsec }:
      mkDerivation {
        pname = "bbdb";
-       version = "0.4";
-       sha256 = "6900c123b8a06ea8da186a9f246dbef5554458a02cfbca315ae71f075e3bc0a1";
+       version = "0.5";
+       sha256 = "03a1cc86802658fe10d6967d6d29ce07451173ae8f8d0197758fc7108139ee8e";
        libraryHaskellDepends = [ base mtl parsec ];
        homepage = "http://www.nadineloveshenry.com/haskell/database-bbdb.html";
        description = "Ability to read, write, and examine BBDB files";
@@ -39662,8 +39751,8 @@ self: {
      }:
      mkDerivation {
        pname = "cacophony";
-       version = "0.2.0";
-       sha256 = "5825a01a93e959e1da25d095e1b79c28f44abfba3e8fbc3eefac21423f953bb5";
+       version = "0.3.0";
+       sha256 = "7128a382bec1e74356c6b231e2cfa71b7be8f98781ee7cb5e20c2d9097081032";
        libraryHaskellDepends = [
          base bytestring cryptonite lens memory mtl
        ];
@@ -39677,28 +39766,6 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
-  "cacophony_0_3_0" = callPackage
-    ({ mkDerivation, base, bytestring, cryptonite, directory, doctest
-     , filepath, hlint, lens, memory, mtl, QuickCheck, tasty
-     , tasty-quickcheck
-     }:
-     mkDerivation {
-       pname = "cacophony";
-       version = "0.3.0";
-       sha256 = "7128a382bec1e74356c6b231e2cfa71b7be8f98781ee7cb5e20c2d9097081032";
-       libraryHaskellDepends = [
-         base bytestring cryptonite lens memory mtl
-       ];
-       testHaskellDepends = [
-         base bytestring directory doctest filepath hlint mtl QuickCheck
-         tasty tasty-quickcheck
-       ];
-       homepage = "https://github.com/centromere/cacophony";
-       description = "A library implementing the Noise protocol";
-       license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "caf" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -40374,8 +40441,8 @@ self: {
      }:
      mkDerivation {
        pname = "casadi-bindings";
-       version = "2.4.1.3";
-       sha256 = "0fd77702edacc58260f555cf77c8225662717cbf69f4f0755c0339ec754d8c48";
+       version = "2.4.1.4";
+       sha256 = "f04064cf031d10675b5295252dace0ab4b4fc401f78c5d0a4802a2a6dbea6fab";
        libraryHaskellDepends = [
          base binary casadi-bindings-core casadi-bindings-internal cereal
          containers linear vector vector-binary-instances
@@ -47010,10 +47077,8 @@ self: {
      }:
      mkDerivation {
        pname = "concurrent-output";
-       version = "1.6.1";
-       sha256 = "ea81fcaac04ef0dc612b403c1630f9035bfccd59a8c8894c6a64c54e31bd00f5";
-       revision = "3";
-       editedCabalFile = "9a39c6788c7ba0dc6ef247f5d92e880b3b6f57875b05ec4ee6bb21959b36a132";
+       version = "1.7.0";
+       sha256 = "f2ca9f606d34b1faa53f48315deb5d68d2e5019055341010b86b6f6f8470ed92";
        libraryHaskellDepends = [
          ansi-terminal async base directory exceptions process stm
          terminal-size text transformers unix
@@ -48399,6 +48464,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "constraints_0_6" = callPackage
+    ({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, mtl
+     , transformers, transformers-compat
+     }:
+     mkDerivation {
+       pname = "constraints";
+       version = "0.6";
+       sha256 = "bcec9873c2701e411dc54cbc142d159ff5816c9a653561ccd1719f9e5a517b27";
+       libraryHaskellDepends = [
+         base binary deepseq ghc-prim hashable mtl transformers
+         transformers-compat
+       ];
+       homepage = "http://github.com/ekmett/constraints/";
+       description = "Constraint manipulation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "constructible" = callPackage
     ({ mkDerivation, arithmoi, base, binary-search, complex-generic }:
      mkDerivation {
@@ -56746,7 +56829,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "diagrams-contrib" = callPackage
+  "diagrams-contrib_1_3_0_7" = callPackage
     ({ mkDerivation, base, circle-packing, colour, containers
      , data-default, data-default-class, diagrams-core, diagrams-lib
      , diagrams-solve, force-layout, HUnit, lens, linear, MonadRandom
@@ -56771,6 +56854,34 @@ self: {
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Collection of user contributions to diagrams EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "diagrams-contrib" = callPackage
+    ({ mkDerivation, base, circle-packing, colour, containers
+     , data-default, data-default-class, diagrams-core, diagrams-lib
+     , diagrams-solve, force-layout, HUnit, lens, linear, MonadRandom
+     , mtl, parsec, QuickCheck, random, semigroups, split
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , text
+     }:
+     mkDerivation {
+       pname = "diagrams-contrib";
+       version = "1.3.0.8";
+       sha256 = "e311406aed0718c315ba910cb96324810bceb6f526790a7c2978e44a09558dec";
+       libraryHaskellDepends = [
+         base circle-packing colour containers data-default
+         data-default-class diagrams-core diagrams-lib diagrams-solve
+         force-layout lens linear MonadRandom mtl parsec random semigroups
+         split text
+       ];
+       testHaskellDepends = [
+         base containers diagrams-lib HUnit QuickCheck test-framework
+         test-framework-hunit test-framework-quickcheck2
+       ];
+       homepage = "http://projects.haskell.org/diagrams/";
+       description = "Collection of user contributions to diagrams EDSL";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "diagrams-core_1_2_0_4" = callPackage
@@ -56852,7 +56963,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "diagrams-core" = callPackage
+  "diagrams-core_1_3_0_3" = callPackage
     ({ mkDerivation, adjunctions, base, containers, distributive
      , dual-tree, lens, linear, monoid-extras, mtl, semigroups
      , unordered-containers
@@ -56868,6 +56979,25 @@ self: {
        homepage = "http://projects.haskell.org/diagrams";
        description = "Core libraries for diagrams EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "diagrams-core" = callPackage
+    ({ mkDerivation, adjunctions, base, containers, distributive
+     , dual-tree, lens, linear, monoid-extras, mtl, semigroups
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "diagrams-core";
+       version = "1.3.0.4";
+       sha256 = "1f2ca2f8c7b9e096b76ac62b563f02c83fec53c61bd2b0de4a8f557d14fc5935";
+       libraryHaskellDepends = [
+         adjunctions base containers distributive dual-tree lens linear
+         monoid-extras mtl semigroups unordered-containers
+       ];
+       homepage = "http://projects.haskell.org/diagrams";
+       description = "Core libraries for diagrams EDSL";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "diagrams-graphviz" = callPackage
@@ -57211,7 +57341,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "diagrams-lib_1_3_0_7" = callPackage
+  "diagrams-lib_1_3_0_8" = callPackage
     ({ mkDerivation, active, adjunctions, array, base, colour
      , containers, data-default-class, diagrams-core, diagrams-solve
      , directory, distributive, dual-tree, exceptions, filepath
@@ -57221,8 +57351,8 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-lib";
-       version = "1.3.0.7";
-       sha256 = "2c491d234d9ce8b358bcd29b3349bfb5e852380e5c1ed74d437e7d9d64d75a01";
+       version = "1.3.0.8";
+       sha256 = "4d46b91284b3de5bbbf4f0aded5bdbf72670322f47992ad9b868b2a79c4ef53b";
        libraryHaskellDepends = [
          active adjunctions array base colour containers data-default-class
          diagrams-core diagrams-solve directory distributive dual-tree
@@ -57384,7 +57514,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "diagrams-postscript" = callPackage
+  "diagrams-postscript_1_3_0_3" = callPackage
     ({ mkDerivation, base, containers, data-default-class
      , diagrams-core, diagrams-lib, dlist, filepath, hashable, lens
      , monoid-extras, mtl, semigroups, split, statestack
@@ -57401,6 +57531,26 @@ self: {
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Postscript backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "diagrams-postscript" = callPackage
+    ({ mkDerivation, base, containers, data-default-class
+     , diagrams-core, diagrams-lib, dlist, filepath, hashable, lens
+     , monoid-extras, mtl, semigroups, split, statestack
+     }:
+     mkDerivation {
+       pname = "diagrams-postscript";
+       version = "1.3.0.4";
+       sha256 = "9b1829899a52b53500f415dabb719955e8a468031f91d505b1c2e93221913a35";
+       libraryHaskellDepends = [
+         base containers data-default-class diagrams-core diagrams-lib dlist
+         filepath hashable lens monoid-extras mtl semigroups split
+         statestack
+       ];
+       homepage = "http://projects.haskell.org/diagrams/";
+       description = "Postscript backend for diagrams drawing EDSL";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "diagrams-qrcode" = callPackage
@@ -57670,7 +57820,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "diagrams-svg" = callPackage
+  "diagrams-svg_1_3_1_6" = callPackage
     ({ mkDerivation, base, base64-bytestring, bytestring, colour
      , containers, diagrams-core, diagrams-lib, directory, filepath
      , hashable, JuicyPixels, lens, lucid-svg, monoid-extras, mtl
@@ -57690,6 +57840,29 @@ self: {
        homepage = "http://projects.haskell.org/diagrams/";
        description = "SVG backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "diagrams-svg" = callPackage
+    ({ mkDerivation, base, base64-bytestring, bytestring, colour
+     , containers, diagrams-core, diagrams-lib, directory, filepath
+     , hashable, JuicyPixels, lens, lucid-svg, monoid-extras, mtl
+     , old-time, optparse-applicative, process, semigroups, split, text
+     , time
+     }:
+     mkDerivation {
+       pname = "diagrams-svg";
+       version = "1.3.1.7";
+       sha256 = "88929b31c02bfc585613e85e325e707d157cf753de6cc7f2dfca44d2987a6ecc";
+       libraryHaskellDepends = [
+         base base64-bytestring bytestring colour containers diagrams-core
+         diagrams-lib directory filepath hashable JuicyPixels lens lucid-svg
+         monoid-extras mtl old-time optparse-applicative process semigroups
+         split text time
+       ];
+       homepage = "http://projects.haskell.org/diagrams/";
+       description = "SVG backend for diagrams drawing EDSL";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "diagrams-tikz" = callPackage
@@ -61056,13 +61229,12 @@ self: {
     ({ mkDerivation, array, base, random }:
      mkDerivation {
        pname = "dsp";
-       version = "0.2.3";
-       sha256 = "9b6c128bffaea8806b8a4bc85f9e104463aff5272a39b3e949782efec41afec0";
+       version = "0.2.3.1";
+       sha256 = "d5c21c9bf0a7c40b4a7f1bfed04250251a770d3a3c1935ba0b358bc43191dda2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ array base random ];
        executableHaskellDepends = [ array base ];
-       jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/DSP";
        description = "Haskell Digital Signal Processing";
        license = "GPL";
@@ -61212,7 +61384,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "dual-tree" = callPackage
+  "dual-tree_0_2_0_7" = callPackage
     ({ mkDerivation, base, monoid-extras, newtype, semigroups }:
      mkDerivation {
        pname = "dual-tree";
@@ -61221,6 +61393,18 @@ self: {
        libraryHaskellDepends = [ base monoid-extras newtype semigroups ];
        description = "Rose trees with cached and accumulating monoidal annotations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "dual-tree" = callPackage
+    ({ mkDerivation, base, monoid-extras, newtype, semigroups }:
+     mkDerivation {
+       pname = "dual-tree";
+       version = "0.2.0.8";
+       sha256 = "53c5829fc5567f6e76adc3666c9db2755d17f606e0c5789bc00e0d6b7b97c273";
+       libraryHaskellDepends = [ base monoid-extras newtype semigroups ];
+       description = "Rose trees with cached and accumulating monoidal annotations";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "dump" = callPackage
@@ -63987,8 +64171,8 @@ self: {
      }:
      mkDerivation {
        pname = "envy";
-       version = "0.3.0.2";
-       sha256 = "b8aaf779fefd85d8836f9cb2dd98abe6cb79391e889f02d4a9851517fe64f280";
+       version = "0.3.1.2";
+       sha256 = "265ccb8868ef0a3cfabf1e42da6e11dabeadcedb4b7481f96ed332d00beb487d";
        libraryHaskellDepends = [
          base bytestring containers mtl text time transformers
        ];
@@ -68033,25 +68217,6 @@ self: {
      }) {};
 
   "fft" = callPackage
-    ({ mkDerivation, array, base, carray, fftw, fftwFloat, ix-shapable
-     , QuickCheck, storable-complex, syb
-     }:
-     mkDerivation {
-       pname = "fft";
-       version = "0.1.8.1";
-       sha256 = "9c3348297388346c752adbe2d3fdd3f0dac0d5386cd9562c20c797c8b5910103";
-       libraryHaskellDepends = [
-         array base carray ix-shapable storable-complex syb
-       ];
-       libraryPkgconfigDepends = [ fftw fftwFloat ];
-       testHaskellDepends = [ base carray QuickCheck storable-complex ];
-       jailbreak = true;
-       doCheck = false;
-       description = "Bindings to the FFTW library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) fftw; inherit (pkgs) fftwFloat;};
-
-  "fft_0_1_8_2" = callPackage
     ({ mkDerivation, array, base, carray, fftw, fftwFloat, ix-shapable
      , QuickCheck, storable-complex, syb, transformers
      }:
@@ -68064,9 +68229,9 @@ self: {
        ];
        libraryPkgconfigDepends = [ fftw fftwFloat ];
        testHaskellDepends = [ base carray QuickCheck storable-complex ];
+       doCheck = false;
        description = "Bindings to the FFTW library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) fftw; inherit (pkgs) fftwFloat;};
 
   "fftwRaw" = callPackage
@@ -76620,6 +76785,22 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) glib;};
 
+  "glicko" = callPackage
+    ({ mkDerivation, base, containers, data-default, deepseq, hspec
+     , lens, parallel, QuickCheck, statistics
+     }:
+     mkDerivation {
+       pname = "glicko";
+       version = "0.1.1.0";
+       sha256 = "740b5850982ea36f750c137930bf6e070b365618a547a520fcdab34fd4f913e9";
+       libraryHaskellDepends = [
+         base containers data-default deepseq lens parallel statistics
+       ];
+       testHaskellDepends = [ base data-default hspec lens QuickCheck ];
+       description = "Glicko-2 implementation in Haskell";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "glider-nlp" = callPackage
     ({ mkDerivation, base, Cabal, containers, HUnit, text }:
      mkDerivation {
@@ -86551,7 +86732,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "haskell-src-meta" = callPackage
+  "haskell-src-meta_0_6_0_11" = callPackage
     ({ mkDerivation, base, haskell-src-exts, pretty, syb
      , template-haskell, th-orphans
      }:
@@ -86564,6 +86745,22 @@ self: {
        ];
        description = "Parse source to template-haskell abstract syntax";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "haskell-src-meta" = callPackage
+    ({ mkDerivation, base, haskell-src-exts, pretty, syb
+     , template-haskell, th-orphans
+     }:
+     mkDerivation {
+       pname = "haskell-src-meta";
+       version = "0.6.0.12";
+       sha256 = "143742510abf5863de67e3d717721c80049f3f55a60e8e0c40f21aba5d76ebd7";
+       libraryHaskellDepends = [
+         base haskell-src-exts pretty syb template-haskell th-orphans
+       ];
+       description = "Parse source to template-haskell abstract syntax";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "haskell-src-meta-mwotton" = callPackage
@@ -92133,7 +92330,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hindent" = callPackage
+  "hindent_4_5_4" = callPackage
     ({ mkDerivation, applicative-quoters, base, data-default
      , descriptive, directory, ghc-prim, haskell-src-exts, hspec
      , monad-loops, mtl, text, transformers
@@ -92159,6 +92356,35 @@ self: {
        homepage = "http://www.github.com/chrisdone/hindent";
        description = "Extensible Haskell pretty printer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "hindent" = callPackage
+    ({ mkDerivation, applicative-quoters, base, data-default
+     , descriptive, directory, ghc-prim, haskell-src-exts, hspec
+     , monad-loops, mtl, text, transformers
+     }:
+     mkDerivation {
+       pname = "hindent";
+       version = "4.5.5";
+       sha256 = "a2a5ccc62a6f8975e621b271e43ae9ac6a2315c652df7317ecc0221c9f11c662";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base data-default haskell-src-exts monad-loops mtl text
+         transformers
+       ];
+       executableHaskellDepends = [
+         applicative-quoters base descriptive directory ghc-prim
+         haskell-src-exts text
+       ];
+       testHaskellDepends = [
+         base data-default directory haskell-src-exts hspec monad-loops mtl
+         text
+       ];
+       homepage = "http://www.github.com/chrisdone/hindent";
+       description = "Extensible Haskell pretty printer";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "hinduce-associations-apriori" = callPackage
@@ -120933,7 +121159,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "lucid" = callPackage
+  "lucid_2_9_3" = callPackage
     ({ mkDerivation, base, bifunctors, blaze-builder, bytestring
      , containers, hashable, hspec, HUnit, mtl, parsec, text
      , transformers, unordered-containers
@@ -120952,6 +121178,28 @@ self: {
        homepage = "https://github.com/chrisdone/lucid";
        description = "Clear to write, read and edit DSL for HTML";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "lucid" = callPackage
+    ({ mkDerivation, base, bifunctors, blaze-builder, bytestring
+     , containers, hashable, hspec, HUnit, mtl, parsec, text
+     , transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "lucid";
+       version = "2.9.4";
+       sha256 = "9e87cfc2591d9b79d5eb5351299e4110b50a9fa6b05f9912a65274e0ddfbb9cc";
+       libraryHaskellDepends = [
+         base blaze-builder bytestring containers hashable mtl text
+         transformers unordered-containers
+       ];
+       testHaskellDepends = [
+         base bifunctors hspec HUnit mtl parsec text
+       ];
+       homepage = "https://github.com/chrisdone/lucid";
+       description = "Clear to write, read and edit DSL for HTML";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "lucid-foundation" = callPackage
@@ -123035,20 +123283,22 @@ self: {
      }) {};
 
   "markup" = callPackage
-    ({ mkDerivation, base, blaze-html, blaze-markup, comonad
-     , exceptions, lucid, mmorph, monad-control, monad-logger, mtl
-     , path-extra, resourcet, text, transformers-base, urlpath
+    ({ mkDerivation, base, blaze-html, blaze-markup, clay, comonad
+     , lucid, mmorph, monad-control, monad-logger, mtl, path-extra
+     , resourcet, text, transformers-base, urlpath
      }:
      mkDerivation {
        pname = "markup";
-       version = "2.2.0";
-       sha256 = "8eccd19b6519f4d36816261061d58c65de56e0163b85df4973168e7d173585b3";
+       version = "3.0.0";
+       sha256 = "2495c69daa4b75be45e5607c7dfbc5caafac34ed82eab1f8ee835af4ab72cdf4";
+       revision = "1";
+       editedCabalFile = "b9f36bbdca34f4e226d974e6c446738f22cd36e31ec301417ada0d2b55bb39ae";
        libraryHaskellDepends = [
-         base blaze-html blaze-markup comonad exceptions lucid mmorph
+         base blaze-html blaze-markup clay comonad lucid mmorph
          monad-control monad-logger mtl path-extra resourcet text
          transformers-base urlpath
        ];
-       description = "Abstraction for markup languages";
+       description = "Abstraction for HTML-embedded content";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -127872,7 +128122,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "monoid-extras" = callPackage
+  "monoid-extras_0_4_0_2" = callPackage
     ({ mkDerivation, base, groups, semigroupoids, semigroups }:
      mkDerivation {
        pname = "monoid-extras";
@@ -127881,6 +128131,18 @@ self: {
        libraryHaskellDepends = [ base groups semigroupoids semigroups ];
        description = "Various extra monoid-related definitions and utilities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "monoid-extras" = callPackage
+    ({ mkDerivation, base, groups, semigroupoids, semigroups }:
+     mkDerivation {
+       pname = "monoid-extras";
+       version = "0.4.0.3";
+       sha256 = "ad2949f8f76d0716d5a7890d767c5af58b1419586aa47dd081d20b370080c30a";
+       libraryHaskellDepends = [ base groups semigroupoids semigroups ];
+       description = "Various extra monoid-related definitions and utilities";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "monoid-owns" = callPackage
@@ -137354,8 +137616,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-crossref";
-       version = "0.1.5.5";
-       sha256 = "7ef23698170135f78e9f21472fd5abeb3fea887da714c587279db4ae7aa6ceba";
+       version = "0.1.5.6";
+       sha256 = "0164dcfa4d23c9e5b41172ab4e14e3f6a2aad4067c9cc3e151828baeb5d5164d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -138553,8 +138815,8 @@ self: {
      }:
      mkDerivation {
        pname = "patches-vector";
-       version = "0.1.4.2";
-       sha256 = "39e1784b8e1177c72abc74a7db90210aa317f0aafc8c69defea216ed99d3c70d";
+       version = "0.1.4.4";
+       sha256 = "44eb961a4e4d8424b73080c3003bd31a66a89cf73a0bc0db6322d76f3751e782";
        libraryHaskellDepends = [
          base edit-distance-vector microlens vector
        ];
@@ -138585,8 +138847,8 @@ self: {
     ({ mkDerivation, base, path }:
      mkDerivation {
        pname = "path-extra";
-       version = "0.0.1";
-       sha256 = "bd45c7ea5226902a3d25a506e5725a7608c4d3dec6453268d8c23e2100ceddf4";
+       version = "0.0.2";
+       sha256 = "8c5048018f855e72c0aadd6a6539a533c96dc9260a22ec2cc21c92598db17408";
        libraryHaskellDepends = [ base path ];
        description = "Chris Done's path library, enriched with URL-related goodies";
        license = stdenv.lib.licenses.bsd3;
@@ -142218,27 +142480,6 @@ self: {
      }) {};
 
   "pipes-cacophony" = callPackage
-    ({ mkDerivation, async, base, bytestring, cacophony, hlint, mtl
-     , pipes, QuickCheck, tasty, tasty-quickcheck
-     }:
-     mkDerivation {
-       pname = "pipes-cacophony";
-       version = "0.1.0";
-       sha256 = "f259f272a246d179aa76c1943bef6ceef0c008266b54e4828fc35b419ed66695";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base bytestring cacophony pipes ];
-       testHaskellDepends = [
-         async base bytestring cacophony hlint mtl pipes QuickCheck tasty
-         tasty-quickcheck
-       ];
-       doCheck = false;
-       homepage = "https://github.com/centromere/pipes-cacophony";
-       description = "Pipes for Noise-secured network connections";
-       license = stdenv.lib.licenses.publicDomain;
-     }) {};
-
-  "pipes-cacophony_0_1_1" = callPackage
     ({ mkDerivation, async, base, bytestring, cacophony, hlint, mtl
      , pipes, QuickCheck, tasty, tasty-quickcheck
      }:
@@ -142256,7 +142497,6 @@ self: {
        homepage = "https://github.com/centromere/pipes-cacophony";
        description = "Pipes for Noise-secured network connections";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-cellular" = callPackage
@@ -144977,8 +145217,8 @@ self: {
      }:
      mkDerivation {
        pname = "postgresql-typed";
-       version = "0.4.2";
-       sha256 = "7cbb155d47a31524c67272bb4e6f1c6485da73cd1f0593ab271fed55c5d09e49";
+       version = "0.4.2.1";
+       sha256 = "25ac84380478c09cd3c8c3638766f98a77d27391769ac8339fa177b18da5cfdc";
        libraryHaskellDepends = [
          aeson array attoparsec base binary bytestring containers cryptohash
          haskell-src-meta network old-locale postgresql-binary scientific
@@ -152083,9 +152323,12 @@ self: {
        pname = "regex-tdfa-utf8";
        version = "1.0";
        sha256 = "93380c3d808ffcfdd2932cf4eb408d977da4162eddb58a3edc5bb7b40788ad44";
+       revision = "1";
+       editedCabalFile = "81e8b881e28f1943ad542e543795c1db7dcb3644311b029da4b1c110aba5997c";
        libraryHaskellDepends = [
          array base bytestring regex-base regex-tdfa utf8-string
        ];
+       jailbreak = true;
        description = "This combines regex-tdfa with utf8-string to allow searching over UTF8 encoded lazy bytestrings";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -157543,15 +157786,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "sbv_5_3" = callPackage
+  "sbv_5_5" = callPackage
     ({ mkDerivation, array, async, base, base-compat, containers
      , crackNum, data-binary-ieee754, deepseq, directory, filepath, mtl
      , old-time, pretty, process, QuickCheck, random, syb
      }:
      mkDerivation {
        pname = "sbv";
-       version = "5.3";
-       sha256 = "35ce51ab2130faf4d497569959dbd6451b497cffc25c4cb96e10d064811c56f7";
+       version = "5.5";
+       sha256 = "ee5f5b81b1e84a85285870a34295a4a40a8ab6203a6be5f8f596921a15c2cd67";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -173224,16 +173467,16 @@ self: {
 
   "swagger2" = callPackage
     ({ mkDerivation, aeson, aeson-qq, base, containers, hashable, hspec
-     , http-media, HUnit, network, QuickCheck, template-haskell, text
-     , unordered-containers, vector
+     , http-media, HUnit, lens, network, QuickCheck, template-haskell
+     , text, unordered-containers, vector
      }:
      mkDerivation {
        pname = "swagger2";
-       version = "0.1";
-       sha256 = "d0dfc842ec0099ba20e8e9b6f2366b7b18bf5715e0ae4e3d29a1b45ed1347c83";
+       version = "0.3";
+       sha256 = "74109f1c1f67be44f86a4e7d181487b7fbffea275cf25ea37ad9967e74c6eef0";
        libraryHaskellDepends = [
-         aeson base containers hashable http-media network template-haskell
-         text unordered-containers
+         aeson base containers hashable http-media lens network
+         template-haskell text unordered-containers
        ];
        testHaskellDepends = [
          aeson aeson-qq base hspec HUnit QuickCheck text
@@ -175670,8 +175913,8 @@ self: {
      }:
      mkDerivation {
        pname = "tasty-html";
-       version = "0.4.1";
-       sha256 = "8fc35288736407e08618ddb8a47e0a4d8b59685350cd59df4d99a3fa08479228";
+       version = "0.4.1.1";
+       sha256 = "0eea1c9fcf1ef3aeb94b811086e11d87ce59f90bb91afa8765152b943c591f1a";
        libraryHaskellDepends = [
          base blaze-html bytestring containers filepath generic-deriving mtl
          stm tagged tasty text transformers
@@ -175917,7 +176160,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "tasty-silver" = callPackage
+  "tasty-silver_3_1_7" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, bytestring, containers
      , deepseq, directory, filepath, mtl, optparse-applicative, process
      , process-extras, regex-tdfa, stm, tagged, tasty, tasty-hunit
@@ -175939,6 +176182,31 @@ self: {
        homepage = "https://github.com/phile314/tasty-silver";
        description = "A fancy test runner, including support for golden tests";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "tasty-silver" = callPackage
+    ({ mkDerivation, ansi-terminal, async, base, bytestring, containers
+     , deepseq, directory, filepath, mtl, optparse-applicative, process
+     , process-extras, regex-tdfa, stm, tagged, tasty, tasty-hunit
+     , temporary, text, transformers
+     }:
+     mkDerivation {
+       pname = "tasty-silver";
+       version = "3.1.8";
+       sha256 = "044f65a91ef677545264d7fff0bf7a9ef5fa7ad49a6b3cb402c96f3b81aba430";
+       libraryHaskellDepends = [
+         ansi-terminal async base bytestring containers deepseq directory
+         filepath mtl optparse-applicative process process-extras regex-tdfa
+         stm tagged tasty temporary text
+       ];
+       testHaskellDepends = [
+         base directory filepath process tasty tasty-hunit temporary
+         transformers
+       ];
+       homepage = "https://github.com/phile314/tasty-silver";
+       description = "A fancy test runner, including support for golden tests";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "tasty-smallcheck" = callPackage
@@ -176183,8 +176451,8 @@ self: {
      }:
      mkDerivation {
        pname = "tellbot";
-       version = "0.6.0.4";
-       sha256 = "b17a8b6a9bbe77393d0de26cab3e9dfe68d8364cde327abae45ffa35e73dbbbc";
+       version = "0.6.0.5";
+       sha256 = "280b709ff34acc24395fa33eec9c1c647ac5f438947af5cc7066b31da51bd88c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -181372,6 +181640,8 @@ self: {
        pname = "transient";
        version = "0.1.1";
        sha256 = "edd779a4ef2c7762ddd097427a16dc96eddc6d1d0fbf714f85b7304c290819ed";
+       revision = "2";
+       editedCabalFile = "ed7129095502ad5fc1ca8aa9dbfe7526110681f7d1ffb6ff8249b359d52d3b40";
        libraryHaskellDepends = [
          base bytestring containers directory filepath HTTP mtl network
          network-info process random SHA stm TCache time transformers
@@ -185715,8 +185985,8 @@ self: {
      }:
      mkDerivation {
        pname = "urlpath";
-       version = "3.3.0";
-       sha256 = "b9539bd28c4f4b48047c7bcf6ec746e01ee1c88538d3bb0d0c2c778ecd8d3004";
+       version = "4.0.0.1";
+       sha256 = "01651fc809c8fc8ce62e0bc473a40877b698b4f589cafe3216ef0799cc187671";
        libraryHaskellDepends = [
          base exceptions mmorph monad-control monad-logger mtl path-extra
          resourcet transformers transformers-base
@@ -188930,7 +189200,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "wai-app-static" = callPackage
+  "wai-app-static_3_1_1" = callPackage
     ({ mkDerivation, base, base64-bytestring, blaze-builder, blaze-html
      , blaze-markup, byteable, bytestring, containers, cryptohash
      , cryptohash-conduit, directory, file-embed, filepath, hspec
@@ -188962,6 +189232,43 @@ self: {
        homepage = "http://www.yesodweb.com/book/web-application-interface";
        description = "WAI application for static serving";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "wai-app-static" = callPackage
+    ({ mkDerivation, base, base64-bytestring, blaze-builder, blaze-html
+     , blaze-markup, byteable, bytestring, containers, cryptohash
+     , cryptohash-conduit, directory, file-embed, filepath, hspec
+     , http-date, http-types, mime-types, network, old-locale
+     , optparse-applicative, template-haskell, temporary, text, time
+     , transformers, unix-compat, unordered-containers, wai, wai-extra
+     , warp, zlib
+     }:
+     mkDerivation {
+       pname = "wai-app-static";
+       version = "3.1.2";
+       sha256 = "5c592511781fcb3185998faba55c2f6869ad829b64103a0da499058a43b19cd3";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base base64-bytestring blaze-builder blaze-html blaze-markup
+         byteable bytestring containers cryptohash cryptohash-conduit
+         directory file-embed filepath http-date http-types mime-types
+         old-locale optparse-applicative template-haskell text time
+         transformers unix-compat unordered-containers wai wai-extra warp
+         zlib
+       ];
+       executableHaskellDepends = [
+         base bytestring containers directory mime-types text
+       ];
+       testHaskellDepends = [
+         base bytestring filepath hspec http-date http-types mime-types
+         network old-locale temporary text time transformers unix-compat wai
+         wai-extra zlib
+       ];
+       homepage = "http://www.yesodweb.com/book/web-application-interface";
+       description = "WAI application for static serving";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "wai-conduit_3_0_0_1" = callPackage
@@ -192875,7 +193182,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) webkit;};
 
-  "webpage" = callPackage
+  "webpage_0_0_3_1" = callPackage
     ({ mkDerivation, base, blaze-html, data-default, hastache, lucid
      , text
      }:
@@ -192890,6 +193197,20 @@ self: {
        ];
        description = "Organized and simple web page scaffold for blaze and lucid";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "webpage" = callPackage
+    ({ mkDerivation, base, blaze-html, data-default, lucid, text }:
+     mkDerivation {
+       pname = "webpage";
+       version = "0.0.4";
+       sha256 = "17fba395357bf4d1462d1a50e2a06d1004d0df02cab524dc26e982a90f70c648";
+       libraryHaskellDepends = [
+         base blaze-html data-default lucid text
+       ];
+       description = "Organized and simple web page scaffold for blaze and lucid";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "webrtc-vad" = callPackage
@@ -201721,19 +202042,21 @@ self: {
 
   "yesod-raml-bin" = callPackage
     ({ mkDerivation, base, blaze-html, blaze-markup, bytestring
-     , containers, optparse-applicative, shakespeare, template-haskell
-     , text, yaml, yesod-markdown, yesod-raml, yesod-raml-docs
+     , containers, http-types, optparse-applicative, shakespeare
+     , template-haskell, text, wai, warp, yaml, yesod-core
+     , yesod-markdown, yesod-raml, yesod-raml-docs, yesod-raml-mock
      }:
      mkDerivation {
        pname = "yesod-raml-bin";
-       version = "0.1.1";
-       sha256 = "c839093460d674a0ef7e43d71df0207de8f26732398b188ebc420a4dbe200839";
+       version = "0.1.2";
+       sha256 = "ccfe7a183fb3be12ba73028f3bb4f022285d05ffa916ea10ee67976177f04278";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base blaze-html blaze-markup bytestring containers
-         optparse-applicative shakespeare template-haskell text yaml
-         yesod-markdown yesod-raml yesod-raml-docs
+         base blaze-html blaze-markup bytestring containers http-types
+         optparse-applicative shakespeare template-haskell text wai warp
+         yaml yesod-core yesod-markdown yesod-raml yesod-raml-docs
+         yesod-raml-mock
        ];
        description = "The raml helper executable";
        license = stdenv.lib.licenses.mit;
@@ -201763,8 +202086,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-raml-mock";
-       version = "0.1.0";
-       sha256 = "c5c3568a27fa02df0dd0f740cbd2ddb708d7193f8597e87ce4ec79a202842684";
+       version = "0.1.1";
+       sha256 = "9e69f82bea91a60fe81d7de039b8a697723a53c726d1f5cf49f053a39b0e2dd3";
        libraryHaskellDepends = [
          base bytestring containers template-haskell text yaml yesod-core
          yesod-raml

From aee2e72122a9d509dd5a838c2df10c8f8db76c79 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 11 Nov 2015 23:55:37 +0100
Subject: [PATCH 57/73] Haskell math-functions is broken on Hydra again. :-(

---
 pkgs/development/haskell-modules/configuration-common.nix     | 3 ---
 pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index bc3284bcf2bc..1713cfdb44ce 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -920,7 +920,4 @@ self: super: {
     librarySystemDepends = (drv.librarySystemDepends or []) ++ [ pkgs.ncurses ];
   });
 
-  # Re-build this package to fix broken binaries on Hydra.
-  math-functions = triggerRebuild super.math-functions 1;
-
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
index c685f3103931..f9f94c8f57d7 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
@@ -212,4 +212,7 @@ self: super: {
   # https://github.com/DanielG/cabal-helper/issues/10
   cabal-helper = dontCheck super.cabal-helper;
 
+  # Re-build this package to fix broken binaries on Hydra.
+  math-functions = triggerRebuild super.math-functions 2;
+
 }

From 53e43204f9d04e570aceb4feb8106973e5911177 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@yahoo.com>
Date: Thu, 12 Nov 2015 16:47:41 -0800
Subject: [PATCH 58/73] ghcjs: update comment on generating built-in pkg list

Should we do `import (runCommand ...)` to automate this?
---
 pkgs/development/haskell-modules/configuration-ghcjs.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix
index f07a065e176b..6f68dec78e49 100644
--- a/pkgs/development/haskell-modules/configuration-ghcjs.nix
+++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix
@@ -15,7 +15,7 @@ self: super: {
 
   # This is the list of packages that are built into a booted ghcjs installation
   # It can be generated with the command:
-  # nix-shell '<nixpkgs>' -A pkgs.haskellPackages_ghcjs.ghc --command "ghcjs-pkg list | sed -n 's/^    \(.*\)-\([0-9.]*\)$/\1_\2/ p' | sed 's/\./_/g' | sed 's/-\(.\)/\U\1/' | sed 's/^\([^_]*\)\(.*\)$/\1 = null;/'"
+  # nix-shell -p haskell.packages.ghcjs.ghc --command "ghcjs-pkg list | sed -n 's/^    \(.*\)-\([0-9.]*\)$/\1_\2/ p' | sed 's/\./_/g' | sed 's/-\(.\)/\U\1/' | sed 's/^\([^_]*\)\(.*\)$/\1 = null;/'"
   Cabal = null;
   aeson = null;
   array = null;

From 225642e25a89db9bc9a85d719fe2aab1d30f913f Mon Sep 17 00:00:00 2001
From: James Cook <james.cook@utoronto.ca>
Date: Tue, 10 Nov 2015 21:52:47 -0800
Subject: [PATCH 59/73] Update comment for gdm service.

Emphasize experimental nature slightly less, but say it's only really
tested with Gnome.
---
 nixos/modules/services/x11/display-managers/gdm.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/display-managers/gdm.nix b/nixos/modules/services/x11/display-managers/gdm.nix
index c9a563768323..58eb6f050131 100644
--- a/nixos/modules/services/x11/display-managers/gdm.nix
+++ b/nixos/modules/services/x11/display-managers/gdm.nix
@@ -20,7 +20,9 @@ in
 
       enable = mkEnableOption ''
         GDM as the display manager.
-        <emphasis>GDM is very experimental and may render system unusable.</emphasis>
+        <emphasis>GDM in NixOS is not well-tested with desktops other
+        than GNOME, so use with caution, as it could render the
+        system unusable.</emphasis>
       '';
 
       debug = mkEnableOption ''

From 928e202034802d5fa74509d937a07021c85da1a7 Mon Sep 17 00:00:00 2001
From: Oliver Dunkl <oliver.dunkl@gmail.com>
Date: Fri, 13 Nov 2015 09:29:55 +0100
Subject: [PATCH 60/73] python-packages: pafy 0.4.1 -> 0.4.2

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1ae80e4e4823..46aab53bdf42 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -21278,11 +21278,11 @@ let
 
   pafy = buildPythonPackage rec {
     name = "pafy-${version}";
-    version = "0.4.1";
+    version = "0.4.2";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/p/pafy/${name}.tar.gz";
-      sha256 = "1zdlwwrwh04vszwgmhkmaah1ix24d2zicpv3zi7s8whh06g7pkkl";
+      sha256 = "140nacvyv1a2frvgygbpbsdpxjh82ysfmgp7jf2apn4x2gnkip59";
     };
 
     propagatedBuildInputs = with self; [ youtube-dl ];

From 3a4a0f7d03f769f9769cb4dd7ef5907c9f9b0ae6 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 13 Nov 2015 12:04:26 +0100
Subject: [PATCH 61/73] calibre: 2.43.0 -> 2.44.0

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

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 6bff13665188..5ccce783210f 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/kovidgoyal/calibre/releases/download/v${meta.version}/${name}.tar.xz";
-    sha256 = "0h8c8w7f63pl1rarr3v6gi82dcsabb3216g7scmjfj50na5cfmhi";
+    sha256 = "0d1sn2wc6h3c5girllsmnqg3jhmkal693ww3j6cj1mz2rraw45xr";
   };
 
   inherit python;
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    version = "2.43.0";
+    version = "2.44.0";
     description = "Comprehensive e-book software";
     homepage = http://calibre-ebook.com;
     license = licenses.gpl3;

From 965fbcc419f4ffa49f96481e8e15c849c1643472 Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Thu, 12 Nov 2015 09:51:39 -0300
Subject: [PATCH 62/73] elisp-ffi: init at git 2014-11-03

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ddf2f907ebca..ad16c59ab87f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11503,7 +11503,7 @@ let
     external = {
       inherit (haskellPackages) ghc-mod structured-haskell-mode Agda;
       inherit (pythonPackages) elpy;
-      inherit rtags;
+      inherit rtags libffi;
     };
   };
 
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index d36100ab5668..1a8812dde78f 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -99,6 +99,30 @@ let self = _self // overrides;
     };
   };
 
+  elisp-ffi = melpaBuild rec {
+    pname = "elisp-ffi-git";
+    version = "20141103";
+    src = fetchFromGitHub {
+        owner = "skeeto";
+        repo = "elisp-ffi";
+        rev = "eb3d826d68ace9f9a41515ab3820376c0d141634";
+        sha256 = "0w7r56qf2h8wgfs81fc9k8w8949kf2djyhsh8p12dk365nm11n2s";
+    };
+    buildInputs = [ external.libffi ];
+    preBuild = "make";
+    files = [ "ffi-glue" "ffi.el" ];
+    meta = {
+      description = "Emacs Lisp Foreign Function Interface";
+      longDescription = ''
+      This library provides an FFI for Emacs Lisp so that Emacs
+      programs can invoke functions in native libraries. It works by
+      driving a subprocess to do the heavy lifting, passing result
+      values on to Emacs.
+      '';
+      license = publicDomain;
+    };
+  };
+
   agda2-mode = with external; trivialBuild {
     pname = "agda-mode";
     version = Agda.version;

From d3c82934f8679c7dbb611a5a5eeb5637c9926637 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 13 Nov 2015 14:41:19 +0300
Subject: [PATCH 63/73] pcsclite: fix pcsc-spy

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

diff --git a/pkgs/tools/security/pcsclite/default.nix b/pkgs/tools/security/pcsclite/default.nix
index 6ec0cb238641..dd33e68c1526 100644
--- a/pkgs/tools/security/pcsclite/default.nix
+++ b/pkgs/tools/security/pcsclite/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, udev, dbus_libs, perl }:
+{ stdenv, fetchurl, pkgconfig, udev, dbus_libs, perl, python2 }:
 
 stdenv.mkDerivation rec {
   name = "pcsclite-1.8.14";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     "--enable-confdir=/etc"
   ];
 
-  nativeBuildInputs = [ pkgconfig perl ];
+  nativeBuildInputs = [ pkgconfig perl python2 ];
   buildInputs = [ udev dbus_libs ];
 
   meta = with stdenv.lib; {

From 8286d0ba05effc081644d77046c7349243503fdc Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 13 Nov 2015 15:23:32 +0300
Subject: [PATCH 64/73] pcscperl: init at 1.4.13

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index e0fe24b002ef..6292fa457f70 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8739,6 +8739,26 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  pcscperl = buildPerlPackage {
+    name = "pcsc-perl-1.4.13";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/W/WH/WHOM/pcsc-perl-1.4.13.tar.bz2;
+      sha256 = "a5f7dfb30be0346cfe80d47749994dab861592929d80786104693987b36e3684";
+    };
+    buildInputs = [ pkgs.pcsclite ];
+    nativeBuildInputs = [ pkgs.pkgconfig ];
+    NIX_CFLAGS_LINK = "-L${pkgs.pcsclite}/lib -lpcsclite";
+    # tests fail; look unfinished
+    doCheck = false;
+    meta = {
+      homepage = http://ludovic.rousseau.free.fr/softwares/pcsc-perl/;
+      description = "Communicate with a smart card using PC/SC";
+      license = stdenv.lib.licenses.gpl2Plus;
+      maintainers = with maintainers; [ abbradar ];
+      platforms = stdenv.lib.platforms.linux;
+    };
+  };
+
   Perl5lib = buildPerlPackage rec {
     name = "perl5lib-1.02";
     src = fetchurl {

From f4ec8c9dc71d43e303e265b37d672a1b25baf391 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 13 Nov 2015 15:24:03 +0300
Subject: [PATCH 65/73] pcsctools: 1.4.23 -> 1.4.25

---
 pkgs/tools/security/pcsctools/default.nix | 34 ++++++++++++++++-------
 pkgs/top-level/all-packages.nix           |  4 ++-
 2 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/security/pcsctools/default.nix b/pkgs/tools/security/pcsctools/default.nix
index 72e43f15fe62..59db6889a578 100644
--- a/pkgs/tools/security/pcsctools/default.nix
+++ b/pkgs/tools/security/pcsctools/default.nix
@@ -1,22 +1,36 @@
-{ stdenv, fetchurl, pkgconfig, udev, dbus_libs, perl, pcsclite }:
+{ stdenv, lib, fetchurl, makeWrapper, pkgconfig, udev, dbus_libs, pcsclite
+, wget, coreutils
+, perl, pcscperl, Glib, Gtk2, Pango
+}:
 
-stdenv.mkDerivation rec {
-  name = "pcsc-tools-1.4.23";
+let deps = lib.makeSearchPath "bin" [ wget coreutils ];
+
+in stdenv.mkDerivation rec {
+  name = "pcsc-tools-1.4.25";
 
   src = fetchurl {
-    url = "http://ludovic.rousseau.free.fr/softwares/pcsc-tools/pcsc-tools-1.4.23.tar.gz";
-    sha256 = "1qjgvvvwhykmzn4js9s3rjnp9pbjc3sz4lb4d7i9kvr3xsv7pjk9";
+    url = "http://ludovic.rousseau.free.fr/softwares/pcsc-tools/${name}.tar.gz";
+    sha256 = "0iqcy28pb963ds4pjrpi37577vm6nkgf3i0b3rr978jy9qi1bix9";
   };
 
   buildInputs = [ udev dbus_libs perl pcsclite ];
 
-  preBuild = ''
-    makeFlags=DESTDIR=$out
+  makeFlags = [ "DESTDIR=$(out)" ];
+
+  nativeBuildInputs = [ makeWrapper pkgconfig ];
+
+  postInstall = ''
+    wrapProgram $out/bin/scriptor \
+      --set PERL5LIB "${lib.makePerlPath [ pcscperl ]}"
+    wrapProgram $out/bin/gscriptor \
+      --set PERL5LIB "${lib.makePerlPath [ pcscperl Glib Gtk2 Pango ]}"
+    wrapProgram $out/bin/ATR_analysis \
+      --set PERL5LIB "${lib.makePerlPath [ pcscperl ]}"
+    wrapProgram $out/bin/pcsc_scan \
+      --set PATH "$out/bin:${deps}"
   '';
 
-  nativeBuildInputs = [ pkgconfig ];
-
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Tools used to test a PC/SC driver, card or reader";
     homepage = http://ludovic.rousseau.free.fr/softwares/pcsc-tools/;
     license = licenses.gpl2Plus;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 96b988ceb3c8..8449edf4d7c8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2630,7 +2630,9 @@ let
 
   pcsclite = callPackage ../tools/security/pcsclite { };
 
-  pcsctools = callPackage ../tools/security/pcsctools { };
+  pcsctools = callPackage ../tools/security/pcsctools {
+    inherit (perlPackages) pcscperl Glib Gtk2 Pango;
+  };
 
   pdf2djvu = callPackage ../tools/typesetting/pdf2djvu { };
 

From 4803b2f31a4704cb02e7f194b857e243fd7603cc Mon Sep 17 00:00:00 2001
From: lassulus <lass@aidsballs.de>
Date: Fri, 13 Nov 2015 14:37:41 +0100
Subject: [PATCH 66/73] bitlbee-steam: init at 2015-09-10

---
 .../bitlbee-steam/default.nix                 | 27 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix

diff --git a/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix
new file mode 100644
index 000000000000..2674dd521322
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/bitlbee-steam/default.nix
@@ -0,0 +1,27 @@
+{ fetchurl, fetchFromGitHub, stdenv, bitlbee, autoconf, automake, libtool, pkgconfig, glib, libgcrypt }:
+
+with stdenv.lib;
+stdenv.mkDerivation rec {
+  name = "bitlbee-steam-2015-09-10";
+
+  src = fetchFromGitHub {
+    rev = "011375b2d3c67c15d51ca203de0ecaab3b4b7587";
+    owner = "jgeboski";
+    repo = "bitlbee-steam";
+    sha256 = "1m91x3208z9zxppz998i6060alcalfly9ix9jxismj45xyp6mdx7";
+  };
+
+  buildInputs = [ bitlbee autoconf automake libtool pkgconfig glib libgcrypt ];
+
+  preConfigure = ''
+    export BITLBEE_PLUGINDIR=$out/lib/bitlbee
+    ./autogen.sh
+  '';
+
+  meta = {
+    description = "Steam protocol plugin for BitlBee";
+
+    homepage = https://github.com/jgeboski/bitlbee-steam;
+    license = licenses.gpl2Plus;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8449edf4d7c8..9b80a3a47c8b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11022,6 +11022,8 @@ let
 
   bitlbee-facebook = callPackage ../applications/networking/instant-messengers/bitlbee-facebook { };
 
+  bitlbee-steam = callPackage ../applications/networking/instant-messengers/bitlbee-steam { };
+
   bitmeter = callPackage ../applications/audio/bitmeter { };
 
   bleachbit = callPackage ../applications/misc/bleachbit { };

From a824242830eb5c8d5cdacb7415d8fa68082f4ea6 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Fri, 13 Nov 2015 14:35:48 +0100
Subject: [PATCH 67/73] snapraid: init at 8.1

---
 pkgs/tools/filesystems/snapraid/default.nix | 18 ++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 20 insertions(+)
 create mode 100644 pkgs/tools/filesystems/snapraid/default.nix

diff --git a/pkgs/tools/filesystems/snapraid/default.nix b/pkgs/tools/filesystems/snapraid/default.nix
new file mode 100644
index 000000000000..bbddedf5077b
--- /dev/null
+++ b/pkgs/tools/filesystems/snapraid/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "snapraid";
+  version = "8.1";
+
+  src = fetchurl {
+    url = "https://github.com/amadvance/snapraid/releases/download/v${version}/snapraid-${version}.tar.gz";
+    sha256 = "0pafqn9ismn4j3fsx8fgf008qwh2c6f8mjfjijah6d5c349rmy3b";
+  };
+
+  meta = {
+    homepage = http://www.snapraid.it/;
+    description = "A backup program for disk arrays";
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = [ stdenv.lib.maintainers.makefu ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d783f5154975..de631f3b84d9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15226,6 +15226,8 @@ let
 
   slock = callPackage ../misc/screensavers/slock { };
 
+  snapraid = callPackage ../tools/filesystems/snapraid { };
+
   soundOfSorting = callPackage ../misc/sound-of-sorting { };
 
   sourceAndTags = callPackage ../misc/source-and-tags {

From 519d18b06306379c947f7e322721b66ba90c50bd Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 12 Nov 2015 17:27:57 +0100
Subject: [PATCH 68/73] libpsl: list 2015-10-11 -> 2015-11-12

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

diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix
index ebdce2bfc489..2eb6c45d36ab 100644
--- a/pkgs/development/libraries/libpsl/default.nix
+++ b/pkgs/development/libraries/libpsl/default.nix
@@ -5,10 +5,10 @@ let
 
   version = "${libVersion}-list-${listVersion}";
 
-  listVersion = "2015-10-11";
+  listVersion = "2015-11-12";
   listSources = fetchFromGitHub {
-    sha256 = "1zvfywi43kyh7b6hsm8ldmdypk9n36jzp0s1lf2rzd4yzcyxwgzy";
-    rev = "8952c0c398ba44d507a8ed430fd1cff7b92dfde8";
+    sha256 = "1cwzazhvgzcp6xapk3d11ssfkq9cxmwljfd7bys7w15jfsn6r8d1";
+    rev = "2adac6ff0f612543c4e8bf9a7219d52b0386870e";
     repo = "list";
     owner = "publicsuffix";
   };

From 31563a291cfe23a82e7b389d0e8cae2077debd8a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 13 Nov 2015 17:05:28 +0100
Subject: [PATCH 69/73] python bcrypt: 1.0.2 -> 2.0.0

---
 pkgs/top-level/python-packages.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f9c9a6698f1d..8e427b0a2cc8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2751,17 +2751,20 @@ let
   };
 
   bcrypt = buildPythonPackage rec {
-    name = "bcrypt-1.0.2";
+    name = "bcrypt-2.0.0";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/b/bcrypt/${name}.tar.gz";
-      md5 = "c5df008669d17dd6eeb5e2042d5e136f";
+      sha256 = "8b2d197ef220d10eb74625dde7af3b10daa973ae9a1eadd6366f763fad4387fa";
     };
 
     buildInputs = with self; [ pycparser mock pytest py ] ++ optionals (!isPyPy) [ cffi ];
 
     meta = {
       maintainers = with maintainers; [ iElectric ];
+      description = "Modern password hashing for your software and your servers";
+      license = licenses.asl20;
+      homepage = https://github.com/pyca/bcrypt/;
     };
   };
 

From 162542bf8f20a3ec414c5df9a37a27bfb1106d77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lengyel=20Bal=C3=A1zs?= <ikervagyok@gmail.com>
Date: Fri, 13 Nov 2015 19:11:46 +0100
Subject: [PATCH 70/73] fix: ihaskell's and xmonad's dependence on haskell-ng

---
 nixos/modules/services/misc/ihaskell.nix              | 6 +++---
 nixos/modules/services/x11/window-managers/xmonad.nix | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/misc/ihaskell.nix b/nixos/modules/services/misc/ihaskell.nix
index 7f7f981de498..13c41466eab2 100644
--- a/nixos/modules/services/misc/ihaskell.nix
+++ b/nixos/modules/services/misc/ihaskell.nix
@@ -22,9 +22,9 @@ in
       };
 
       haskellPackages = mkOption {
-        default = pkgs.haskellngPackages;
-        defaultText = "pkgs.haskellngPackages";
-        example = literalExample "pkgs.haskell-ng.packages.ghc784";
+        default = pkgs.haskellPackages;
+        defaultText = "pkgs.haskellPackages";
+        example = literalExample "pkgs.haskell.packages.ghc784";
         description = ''
           haskellPackages used to build IHaskell and other packages.
           This can be used to change the GHC version used to build
diff --git a/nixos/modules/services/x11/window-managers/xmonad.nix b/nixos/modules/services/x11/window-managers/xmonad.nix
index c922ca7848d1..288800d514d3 100644
--- a/nixos/modules/services/x11/window-managers/xmonad.nix
+++ b/nixos/modules/services/x11/window-managers/xmonad.nix
@@ -20,9 +20,9 @@ in
       };
 
       haskellPackages = mkOption {
-        default = pkgs.haskellngPackages;
-        defaultText = "pkgs.haskellngPackages";
-        example = literalExample "pkgs.haskell-ng.packages.ghc784";
+        default = pkgs.haskellPackages;
+        defaultText = "pkgs.haskellPackages";
+        example = literalExample "pkgs.haskell.packages.ghc784";
         description = ''
           haskellPackages used to build Xmonad and other packages.
           This can be used to change the GHC version used to build

From 64f31fbc35ad2caf8676952e7509999abc440b59 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Fri, 13 Nov 2015 10:37:27 -0800
Subject: [PATCH 71/73] xf86-video-intel: 2015-11-10 -> 2015-11-13

---
 pkgs/servers/x11/xorg/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index a12af4776ee0..c64a0fd86b51 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1628,11 +1628,11 @@ let
   }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;};
 
   xf86videointel = (mkDerivation "xf86videointel" {
-    name = "xf86-video-intel-2015-11-10";
+    name = "xf86-video-intel-2015-11-13";
     builder = ./builder.sh;
     src = fetchurl {
-      url = http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/97786e99fbfb8f8ea3931c305f31e993de378fb2.tar.gz;
-      sha256 = "09rckmvg66yw13v9gbn34im7vjnj48skcj2kb85bfwk2c8q3dfgx";
+      url = http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/snapshot/b5c1ceaac3c1114ca260f6a785e5fc8891eb1820.tar.gz;
+      sha256 = "0lbbgdn5qx3r5zvp3spfgavvmhc5adrsy7f5g061f9lvy7jrc0dr";
     };
     buildInputs = [pkgconfig dri2proto dri3proto fontsproto libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ];
   }) // {inherit dri2proto dri3proto fontsproto libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ;};

From b0fd85342be901b924fdee24a18f7294dc95de39 Mon Sep 17 00:00:00 2001
From: noctuid <noct@openmailbox.org>
Date: Thu, 12 Nov 2015 19:31:54 -0500
Subject: [PATCH 72/73] zscroll: init at 1.0

---
 pkgs/applications/misc/zscroll/default.nix | 27 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/applications/misc/zscroll/default.nix

diff --git a/pkgs/applications/misc/zscroll/default.nix b/pkgs/applications/misc/zscroll/default.nix
new file mode 100644
index 000000000000..91e6c33310dc
--- /dev/null
+++ b/pkgs/applications/misc/zscroll/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, lib, python3, python3Packages, fetchFromGitHub }:
+
+let version = "1.0"; in
+
+python3Packages.buildPythonPackage {
+  name = "zscroll-${version}";
+  # don't prefix with python version
+  namePrefix = "";
+
+  src = fetchFromGitHub {
+    owner = "noctuid";
+    repo = "zscroll";
+    rev = "v${version}";
+    sha256 = "0rf9m1czy19hzpcp8dq9c5zawk0nhwfzzjxlhk9r2n06lhb81ig5";
+  };
+
+  doCheck = false;
+
+  propogatedBuildInputs = [ python3 ];
+
+  meta = with stdenv.lib; {
+    description = "A text scroller for use with panels and shells";
+    homepage = https://github.com/noctuid/zscroll;
+    license = licenses.bsd2;
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 747932298b85..8f229af04028 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13698,6 +13698,8 @@ let
 
   zotero = callPackage ../applications/office/zotero {};
 
+  zscroll = callPackage ../applications/misc/zscroll {};
+
   zynaddsubfx = callPackage ../applications/audio/zynaddsubfx { };
 
   ### GAMES

From a2f98ef4ac44f32fddd30257d91aa674f0581b32 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Fri, 13 Nov 2015 21:21:54 +0100
Subject: [PATCH 73/73] clipgrab 3.5.2 -> 3.5.4

---
 pkgs/applications/video/clipgrab/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix
index ebd45cea6adc..7d136de779a4 100644
--- a/pkgs/applications/video/clipgrab/default.nix
+++ b/pkgs/applications/video/clipgrab/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ffmpeg, makeDesktopItem, qt4 }:
 
-let version = "3.5.2"; in
+let version = "3.5.4"; in
 stdenv.mkDerivation rec {
   name = "clipgrab-${version}";
 
   src = fetchurl {
-    sha256 = "0prag5liwx2l1b2a5f7cp3jh50qw5iwkf2c07iws9m1j1np3lxgp";
+    sha256 = "1zvicmxnkldqnfri8y0q0vx6f5whsc7jc9jcsfzhpw47w92qvx5r";
     # The .tar.bz2 "Download" link is a binary blob, the source is the .tar.gz!
     url = "http://download.clipgrab.de/${name}.tar.gz";
   };