From 21159d8f1738ba288024f99e6c2fe8fc7c58d8bf Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@gmail.com>
Date: Sun, 17 Dec 2017 15:02:52 +0000
Subject: [PATCH 001/123] xfce4-13: init

---
 pkgs/desktops/xfce4-13/automakeAddFlags.sh    |  7 ++
 pkgs/desktops/xfce4-13/default.nix            | 80 +++++++++++++++++++
 pkgs/desktops/xfce4-13/exo/default.nix        | 23 ++++++
 pkgs/desktops/xfce4-13/exo/gtk3-only.patch    | 28 +++++++
 pkgs/desktops/xfce4-13/garcon/12700.patch     | 37 +++++++++
 pkgs/desktops/xfce4-13/garcon/13785.patch     | 75 +++++++++++++++++
 pkgs/desktops/xfce4-13/garcon/default.nix     | 12 +++
 pkgs/desktops/xfce4-13/gigolo/default.nix     | 11 +++
 pkgs/desktops/xfce4-13/libxfce4ui/default.nix | 18 +++++
 .../xfce4-13/libxfce4util/default.nix         | 16 ++++
 pkgs/desktops/xfce4-13/mkXfceDerivation.nix   | 40 ++++++++++
 pkgs/desktops/xfce4-13/mousepad/default.nix   | 12 +++
 pkgs/desktops/xfce4-13/orage/default.nix      | 18 +++++
 pkgs/desktops/xfce4-13/parole/default.nix     | 36 +++++++++
 pkgs/desktops/xfce4-13/ristretto/default.nix  | 18 +++++
 .../xfce4-13/thunar-volman/default.nix        | 11 +++
 pkgs/desktops/xfce4-13/thunar/default.nix     | 30 +++++++
 pkgs/desktops/xfce4-13/tumbler/default.nix    | 14 ++++
 pkgs/desktops/xfce4-13/xfburn/default.nix     | 18 +++++
 .../xfce4-13/xfce4-appfinder/default.nix      | 12 +++
 .../xfce4-13/xfce4-dev-tools/default.nix      | 31 +++++++
 .../xfce4-13/xfce4-dev-tools/setup-hook.sh    | 12 +++
 .../xfce4-13/xfce4-dict/configure-gio.patch   | 11 +++
 pkgs/desktops/xfce4-13/xfce4-dict/default.nix | 19 +++++
 .../desktops/xfce4-13/xfce4-mixer/default.nix | 30 +++++++
 .../xfce4-13/xfce4-notifyd/default.nix        | 13 +++
 .../desktops/xfce4-13/xfce4-panel/default.nix | 15 ++++
 .../xfce4-13/xfce4-power-manager/default.nix  | 19 +++++
 .../xfce4-13/xfce4-screenshooter/default.nix  | 11 +++
 .../xfce4-13/xfce4-settings/default.nix       | 39 +++++++++
 .../xfce4-13/xfce4-taskmanager/default.nix    | 18 +++++
 .../xfce4-13/xfce4-terminal/default.nix       | 15 ++++
 .../xfce4-13/xfce4-volumed-pulse/default.nix  | 15 ++++
 pkgs/desktops/xfce4-13/xfconf/default.nix     | 11 +++
 pkgs/desktops/xfce4-13/xfdesktop/default.nix  | 22 +++++
 pkgs/desktops/xfce4-13/xfwm4/default.nix      | 27 +++++++
 pkgs/top-level/all-packages.nix               |  3 +
 37 files changed, 827 insertions(+)
 create mode 100644 pkgs/desktops/xfce4-13/automakeAddFlags.sh
 create mode 100644 pkgs/desktops/xfce4-13/default.nix
 create mode 100644 pkgs/desktops/xfce4-13/exo/default.nix
 create mode 100644 pkgs/desktops/xfce4-13/exo/gtk3-only.patch
 create mode 100644 pkgs/desktops/xfce4-13/garcon/12700.patch
 create mode 100644 pkgs/desktops/xfce4-13/garcon/13785.patch
 create mode 100644 pkgs/desktops/xfce4-13/garcon/default.nix
 create mode 100644 pkgs/desktops/xfce4-13/gigolo/default.nix
 create mode 100644 pkgs/desktops/xfce4-13/libxfce4ui/default.nix
 create mode 100644 pkgs/desktops/xfce4-13/libxfce4util/default.nix
 create mode 100644 pkgs/desktops/xfce4-13/mkXfceDerivation.nix
 create mode 100644 pkgs/desktops/xfce4-13/mousepad/default.nix
 create mode 100644 pkgs/desktops/xfce4-13/orage/default.nix
 create mode 100644 pkgs/desktops/xfce4-13/parole/default.nix
 create mode 100644 pkgs/desktops/xfce4-13/ristretto/default.nix
 create mode 100644 pkgs/desktops/xfce4-13/thunar-volman/default.nix
 create mode 100644 pkgs/desktops/xfce4-13/thunar/default.nix
 create mode 100644 pkgs/desktops/xfce4-13/tumbler/default.nix
 create mode 100644 pkgs/desktops/xfce4-13/xfburn/default.nix
 create mode 100644 pkgs/desktops/xfce4-13/xfce4-appfinder/default.nix
 create mode 100644 pkgs/desktops/xfce4-13/xfce4-dev-tools/default.nix
 create mode 100644 pkgs/desktops/xfce4-13/xfce4-dev-tools/setup-hook.sh
 create mode 100644 pkgs/desktops/xfce4-13/xfce4-dict/configure-gio.patch
 create mode 100644 pkgs/desktops/xfce4-13/xfce4-dict/default.nix
 create mode 100644 pkgs/desktops/xfce4-13/xfce4-mixer/default.nix
 create mode 100644 pkgs/desktops/xfce4-13/xfce4-notifyd/default.nix
 create mode 100644 pkgs/desktops/xfce4-13/xfce4-panel/default.nix
 create mode 100644 pkgs/desktops/xfce4-13/xfce4-power-manager/default.nix
 create mode 100644 pkgs/desktops/xfce4-13/xfce4-screenshooter/default.nix
 create mode 100644 pkgs/desktops/xfce4-13/xfce4-settings/default.nix
 create mode 100644 pkgs/desktops/xfce4-13/xfce4-taskmanager/default.nix
 create mode 100644 pkgs/desktops/xfce4-13/xfce4-terminal/default.nix
 create mode 100644 pkgs/desktops/xfce4-13/xfce4-volumed-pulse/default.nix
 create mode 100644 pkgs/desktops/xfce4-13/xfconf/default.nix
 create mode 100644 pkgs/desktops/xfce4-13/xfdesktop/default.nix
 create mode 100644 pkgs/desktops/xfce4-13/xfwm4/default.nix

diff --git a/pkgs/desktops/xfce4-13/automakeAddFlags.sh b/pkgs/desktops/xfce4-13/automakeAddFlags.sh
new file mode 100644
index 00000000000..92d5659d05c
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/automakeAddFlags.sh
@@ -0,0 +1,7 @@
+automakeAddFlags() {
+    local file="$1"
+    local target="$2"
+    local source="$3"
+
+    sed "/$target/a\$($source) \\\\" -i $file
+}
diff --git a/pkgs/desktops/xfce4-13/default.nix b/pkgs/desktops/xfce4-13/default.nix
new file mode 100644
index 00000000000..451322bcaf9
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/default.nix
@@ -0,0 +1,80 @@
+{ lib, makeSetupHook, newScope, gnome3, gst_all_1 }:
+
+let
+  inherit (lib) makeScope;
+in
+
+makeScope newScope (self: with self; {
+  mkXfceDerivation = callPackage ./mkXfceDerivation.nix { };
+
+  automakeAddFlags = makeSetupHook { } ./automakeAddFlags.sh;
+
+  exo = callPackage ./exo { };
+
+  garcon = callPackage ./garcon { };
+
+  gigolo = callPackage ./gigolo { };
+
+  libxfce4util = callPackage ./libxfce4util { };
+
+  libxfce4ui = callPackage ./libxfce4ui { };
+
+  mousepad = callPackage ./mousepad {
+    inherit (gnome3) gtksourceview;
+  };
+
+  orage = callPackage ./orage { };
+
+  parole = callPackage ./parole {
+    inherit (gst_all_1) gst-plugins-bad gst-plugins-base gst-plugins-good;
+    gst-plugins-ugly = null;
+  };
+
+  ristretto = callPackage ./ristretto { };
+
+  thunar = callPackage ./thunar { };
+
+  thunar-volman = callPackage ./thunar-volman { };
+
+  tumbler = callPackage ./tumbler { };
+
+  xfburn = callPackage ./xfburn { };
+
+  xfconf = callPackage ./xfconf { };
+
+  xfdesktop = callPackage ./xfdesktop { };
+
+  xfce4-appfinder = callPackage ./xfce4-appfinder { };
+
+  xfce4-dev-tools = callPackage ./xfce4-dev-tools {
+    mkXfceDerivation = mkXfceDerivation.override {
+      xfce4-dev-tools = null;
+    };
+  };
+
+  xfce4-dict = callPackage ./xfce4-dict { };
+
+  xfce4-mixer = callPackage ./xfce4-mixer { };
+
+  xfce4-notifyd = callPackage ./xfce4-notifyd { };
+
+  xfce4-panel = callPackage ./xfce4-panel { };
+
+  xfce4-power-manager = callPackage ./xfce4-power-manager { };
+
+  xfce4-screenshooter = callPackage ./xfce4-screenshooter {
+    inherit (gnome3) libsoup;
+  };
+
+  xfce4-taskmanager = callPackage ./xfce4-taskmanager { };
+
+  xfce4-settings = callPackage ./xfce4-settings { };
+
+  xfce4-terminal = callPackage ./xfce4-terminal {
+    inherit (gnome3) vte;
+  };
+
+  xfce4-volumed-pulse = callPackage ./xfce4-volumed-pulse { };
+
+  xfwm4 = callPackage ./xfwm4 { };
+})
diff --git a/pkgs/desktops/xfce4-13/exo/default.nix b/pkgs/desktops/xfce4-13/exo/default.nix
new file mode 100644
index 00000000000..e11309135dd
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/exo/default.nix
@@ -0,0 +1,23 @@
+{ mkXfceDerivation, docbook_xml_xslt, libxslt, perlPackages, gtk2, gtk3
+, libxfce4ui, libxfce4util }:
+
+mkXfceDerivation rec {
+  category = "xfce";
+  pname = "exo";
+  version = "0.11.5";
+
+  sha256 = "0zxv7cx1xbjls7q2blv8ir9zwzyq7r189n6q35jwasns7rxj256v";
+
+  nativeBuildInputs = [ libxslt perlPackages.URI ];
+  buildInputs = [ gtk2 gtk3 libxfce4ui libxfce4util ];
+
+  postPatch = ''
+    substituteInPlace docs/reference/Makefile.am \
+      --replace http://docbook.sourceforge.net/release/xsl/current \
+                ${docbook_xml_xslt}/share/xml/docbook-xsl
+  '';
+
+  meta = {
+    description = "Application library for Xfce";
+  };
+}
diff --git a/pkgs/desktops/xfce4-13/exo/gtk3-only.patch b/pkgs/desktops/xfce4-13/exo/gtk3-only.patch
new file mode 100644
index 00000000000..74e6f812e3c
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/exo/gtk3-only.patch
@@ -0,0 +1,28 @@
+diff -urNZ a/configure.ac.in b/configure.ac.in
+--- a/configure.ac.in	2017-11-20 02:57:40.476664918 +0000
++++ b/configure.ac.in	2017-11-20 03:07:18.999128370 +0000
+@@ -165,11 +165,9 @@
+ dnl ***********************************
+ XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.42.0])
+ XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.42.0])
+-XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.24.0])
+ XDT_CHECK_PACKAGE([GTK3], [gtk+-3.0], [3.20.0])
+ XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.42.0])
+ XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.10.0])
+-XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.12.0])
+ XDT_CHECK_PACKAGE([LIBXFCE4UI2], [libxfce4ui-2], [4.12.0])
+ XDT_CHECK_OPTIONAL_PACKAGE([GIO_UNIX], [gio-unix-2.0], [2.42.0], [gio-unix], [GIO-Unix features])
+ 
+diff -urNZ a/exo/Makefile.am b/exo/Makefile.am
+--- a/exo/Makefile.am	2017-11-20 02:57:34.444785202 +0000
++++ b/exo/Makefile.am	2017-11-20 03:00:49.402897465 +0000
+@@ -117,7 +117,7 @@
+ 
+ libexo_2_includedir = $(includedir)/exo-2/exo
+ 
+-lib_LTLIBRARIES += libexo-2.la
++lib_LTLIBRARIES = libexo-2.la
+ 
+ libexo_2_include_HEADERS =						\
+ 	exo.h								\
+Binary files a/.git/index and b/.git/index differ
diff --git a/pkgs/desktops/xfce4-13/garcon/12700.patch b/pkgs/desktops/xfce4-13/garcon/12700.patch
new file mode 100644
index 00000000000..fda36d69651
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/garcon/12700.patch
@@ -0,0 +1,37 @@
+From: Yegor Timoshenko <yegortimoshenko@gmail.com>
+Date: Thu, 14 Dec 2017 21:13:02 +0000
+Subject: [PATCH] Decrement allocation counter on item unref (#12700)
+
+diff --git a/garcon/garcon-menu-item-pool.c b/garcon/garcon-menu-item-pool.c
+index 2017180..355e520 100644
+--- a/garcon/garcon-menu-item-pool.c
++++ b/garcon/garcon-menu-item-pool.c
+@@ -191,7 +191,12 @@ garcon_menu_item_pool_filter_exclude (const gchar    *desktop_id,
+   g_return_val_if_fail (GARCON_IS_MENU_ITEM (item), FALSE);
+   g_return_val_if_fail (node != NULL, FALSE);
+
+-  return garcon_menu_node_tree_rule_matches (node, item);
++  gboolean matches = garcon_menu_node_tree_rule_matches (node, item);
++
++  if (matches)
++    garcon_menu_item_increment_allocated (item);
++
++  return matches;
+ }
+
+
+diff --git a/garcon/garcon-menu-item.c b/garcon/garcon-menu-item.c
+index ca8cb63..b44acfe 100644
+--- a/garcon/garcon-menu-item.c
++++ b/garcon/garcon-menu-item.c
+@@ -1908,6 +1908,8 @@ garcon_menu_item_unref (GarconMenuItem *item)
+ {
+   g_return_if_fail (GARCON_IS_MENU_ITEM (item));
+
++  garcon_menu_item_decrement_allocated (item);
++
+   /* Decrement the reference counter */
+   g_object_unref (G_OBJECT (item));
+ }
+--
+2.15.1
diff --git a/pkgs/desktops/xfce4-13/garcon/13785.patch b/pkgs/desktops/xfce4-13/garcon/13785.patch
new file mode 100644
index 00000000000..1b723d21d60
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/garcon/13785.patch
@@ -0,0 +1,75 @@
+From 4387496fe332a50945e7db76bc2196b419656fe3 Mon Sep 17 00:00:00 2001
+From: Stefan Berzl <stefanberzl@gmail.com>
+Date: Mon, 21 Aug 2017 18:39:07 +0300
+Subject: [PATCH] fix: some menu icons are too big (Bug #13785)
+
+Some packages only provide icons in sizes much bigger than the standard
+GTK menu size of 16px.
+
+The clipboard manager qlipper for example provides the following icon:
+/usr/share/icons/hicolor/128x128/apps/qlipper.png
+
+In GTK 3.22.18 the function gtk_image_new_from_icon_name when given
+GTK_ICON_SIZE_MENU as second argument still returns an image with 128x128.
+
+The patch I have supplied uses existing code to scale such an image.
+
+Signed-off-by: Eric Koegel <eric.koegel@gmail.com>
+---
+ garcon-gtk/garcon-gtk-menu.c | 33 +++++++++++++++++++--------------
+ 1 file changed, 19 insertions(+), 14 deletions(-)
+
+diff --git a/garcon-gtk/garcon-gtk-menu.c b/garcon-gtk/garcon-gtk-menu.c
+index 41990f2..f31a1ed 100644
+--- a/garcon-gtk/garcon-gtk-menu.c
++++ b/garcon-gtk/garcon-gtk-menu.c
+@@ -650,7 +650,11 @@ garcon_gtk_menu_load_icon (const gchar *icon_name)
+   gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &w, &h);
+   size = MIN (w, h);
+ 
+-  if (! gtk_icon_theme_has_icon (icon_theme, icon_name))
++  if (gtk_icon_theme_has_icon (icon_theme, icon_name))
++    {
++	  pixbuf = gtk_icon_theme_load_icon (icon_theme, icon_name, size, 0, NULL);;
++    }
++  else
+     {
+       if (g_path_is_absolute (icon_name))
+         {
+@@ -684,22 +688,23 @@ garcon_gtk_menu_load_icon (const gchar *icon_name)
+               g_free (name);
+             }
+         }
++    }
+ 
+-      /* Turn the pixbuf into a gtk_image */
+-      if (G_LIKELY (pixbuf))
+-        {
+-          /* scale the pixbuf down if it needs it */
+-          GdkPixbuf *tmp = gdk_pixbuf_scale_simple (pixbuf, w, h, GDK_INTERP_BILINEAR);
+-          g_object_unref (pixbuf);
+-          pixbuf = tmp;
++  /* Turn the pixbuf into a gtk_image */
++  if (G_LIKELY (pixbuf))
++    {
++      /* scale the pixbuf down if it needs it */
++      GdkPixbuf *pixbuf_scaled = gdk_pixbuf_scale_simple (pixbuf, w, h, GDK_INTERP_BILINEAR);
++      g_object_unref (G_OBJECT (pixbuf));
+ 
+-          image = gtk_image_new_from_pixbuf (pixbuf);
+-          g_object_unref (G_OBJECT (pixbuf));
+-        }
++      image = gtk_image_new_from_pixbuf (pixbuf_scaled);
++      g_object_unref (G_OBJECT (pixbuf_scaled));
++    }
++  else
++    {
++	  /* display the placeholder at least */
++	  image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU);
+     }
+-
+-  if (image == NULL)
+-    image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU);
+ 
+   return image;
+ }
diff --git a/pkgs/desktops/xfce4-13/garcon/default.nix b/pkgs/desktops/xfce4-13/garcon/default.nix
new file mode 100644
index 00000000000..a88d64702a1
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/garcon/default.nix
@@ -0,0 +1,12 @@
+{ mkXfceDerivation, gtk2 ? null, gtk3, libxfce4ui, libxfce4util }:
+
+mkXfceDerivation rec {
+  category = "xfce";
+  pname = "garcon";
+  version = "0.6.1";
+
+  sha256 = "19k8bwn29x7hkg882pxv5xxmrbfagdqgkxg166pwz2k0prab6hl8";
+
+  patches = [ ./12700.patch ./13785.patch ];
+  buildInputs = [ gtk2 gtk3 libxfce4ui libxfce4util ];
+}
diff --git a/pkgs/desktops/xfce4-13/gigolo/default.nix b/pkgs/desktops/xfce4-13/gigolo/default.nix
new file mode 100644
index 00000000000..0d7b2210b12
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/gigolo/default.nix
@@ -0,0 +1,11 @@
+{ mkXfceDerivation, gtk2, libX11 }:
+
+mkXfceDerivation rec {
+  category = "apps";
+  pname = "gigolo";
+  version = "0.4.2";
+
+  sha256 = "0qd2jkf3zsvfyd9jn8bfnljja1xfj3ph4wjh3fx10dcwcd791al1";
+
+  buildInputs = [ gtk2 libX11 ];
+}
diff --git a/pkgs/desktops/xfce4-13/libxfce4ui/default.nix b/pkgs/desktops/xfce4-13/libxfce4ui/default.nix
new file mode 100644
index 00000000000..63df0b7cc9a
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/libxfce4ui/default.nix
@@ -0,0 +1,18 @@
+{ lib, mkXfceDerivation, gobjectIntrospection, gtk2, gtk3
+, libstartup_notification ? null, libxfce4util, xfconf }:
+
+mkXfceDerivation rec {
+  category = "xfce";
+  pname = "libxfce4ui";
+  version = "4.13.4";
+
+  sha256 = "0m9h3kvkk2nx8pxxmsg9sjnyp6ajwjrz9djjxxvranjsdw3ilydy";
+
+  buildInputs =  [ gobjectIntrospection gtk2 gtk3 libstartup_notification xfconf ];
+  propagatedBuildInputs = [ libxfce4util ];
+
+  meta = with lib; {
+    description = "Widgets library for Xfce";
+    license = licenses.lgpl2Plus;
+  };
+}
diff --git a/pkgs/desktops/xfce4-13/libxfce4util/default.nix b/pkgs/desktops/xfce4-13/libxfce4util/default.nix
new file mode 100644
index 00000000000..091d73bf72a
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/libxfce4util/default.nix
@@ -0,0 +1,16 @@
+{ lib, mkXfceDerivation, gobjectIntrospection }:
+
+mkXfceDerivation rec {
+  category = "xfce";
+  pname = "libxfce4util";
+  version = "4.13.1";
+
+  sha256 = "001ls90an2pi9l04g3r6syfa4lhyvjymp0r9djxrkc2q493mcv3d";
+
+  buildInputs = [ gobjectIntrospection ];
+
+  meta = with lib; {
+    description = "Extension library for Xfce";
+    license = licenses.lgpl2Plus;
+  };
+}
diff --git a/pkgs/desktops/xfce4-13/mkXfceDerivation.nix b/pkgs/desktops/xfce4-13/mkXfceDerivation.nix
new file mode 100644
index 00000000000..f08272e9db0
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/mkXfceDerivation.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchgit, pkgconfig, xfce4-dev-tools ? null }:
+
+{ category, pname, sha256 ? null, version, ... } @ args:
+
+let
+  inherit (builtins) filter getAttr head isList;
+  inherit (stdenv.lib) attrNames concatLists recursiveUpdate zipAttrsWithNames;
+
+  filterAttrNames = f: attrs:
+    filter (n: f (getAttr n attrs)) (attrNames attrs);
+
+  concatAttrLists = attrsets:
+    zipAttrsWithNames (filterAttrNames isList (head attrsets)) (_: concatLists) attrsets;
+
+  template = rec {
+    name = "${pname}-${version}";
+
+    nativeBuildInputs = [ pkgconfig xfce4-dev-tools ];
+    configureFlags = [ "--enable-maintainer-mode" ];
+
+    src = fetchgit {
+      url = "git://git.xfce.org/${category}/${pname}";
+      rev = name;
+      inherit sha256;
+    };
+
+    enableParallelBuilding = true;
+    outputs = [ "out" "dev" ];
+
+    meta = with stdenv.lib; {
+      homepage = "https://git.xfce.org/${category}/${pname}/about";
+      license = licenses.gpl2; # some libraries are under LGPLv2+
+      platforms = platforms.linux;
+    };
+  };
+
+  publicArgs = removeAttrs args [ "category" "pname" "sha256" ];
+in
+
+stdenv.mkDerivation (recursiveUpdate template publicArgs // concatAttrLists [ template args ])
diff --git a/pkgs/desktops/xfce4-13/mousepad/default.nix b/pkgs/desktops/xfce4-13/mousepad/default.nix
new file mode 100644
index 00000000000..84206f763f3
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/mousepad/default.nix
@@ -0,0 +1,12 @@
+{ mkXfceDerivation, exo, wrapGAppsHook, dbus_glib ? null, gtk3, gtksourceview }:
+
+mkXfceDerivation rec {
+  category = "apps";
+  pname = "mousepad";
+  version = "0.4.0";
+
+  sha256 = "0mm90iq2yd3d0qbgsjyk3yj25k0gm3p34jazl640vixk84v20lyw";
+
+  nativeBuildInputs = [ exo wrapGAppsHook ];
+  buildInputs = [ dbus_glib gtk3 gtksourceview ];
+}
diff --git a/pkgs/desktops/xfce4-13/orage/default.nix b/pkgs/desktops/xfce4-13/orage/default.nix
new file mode 100644
index 00000000000..6a2f37cbef6
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/orage/default.nix
@@ -0,0 +1,18 @@
+{ lib, mkXfceDerivation, dbus_glib ? null, gtk2, libical, libnotify ? null
+, popt ? null, libxfce4ui ? null, xfce4-panel ? null, withPanelPlugin ? true }:
+
+assert withPanelPlugin -> libxfce4ui != null && xfce4-panel != null;
+
+let
+  inherit (lib) optionals;
+in
+
+mkXfceDerivation rec {
+  category = "apps";
+  pname = "orage";
+  version = "4.12.1";
+
+  sha256 = "04z6y1vfaz1im1zq1zr7cf8pjibjhj9zkyanbp7vn30q520yxa0m";
+  buildInputs = [ dbus_glib gtk2 libical libnotify popt ]
+    ++ optionals withPanelPlugin [ libxfce4ui xfce4-panel ];
+}
diff --git a/pkgs/desktops/xfce4-13/parole/default.nix b/pkgs/desktops/xfce4-13/parole/default.nix
new file mode 100644
index 00000000000..c1976727c04
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/parole/default.nix
@@ -0,0 +1,36 @@
+{ mkXfceDerivation, makeWrapper, wrapGAppsHook, dbus, dbus_glib
+, gst-plugins-bad ? null, gst-plugins-base, gst-plugins-good
+, gst-plugins-ugly ? null, gtk3, libnotify, libxfce4ui, libxfce4util
+, taglib ? null, xfconf }:
+
+# Doesn't seem to find H.264 codec even though built with gst-plugins-bad.
+
+mkXfceDerivation rec {
+  category = "apps";
+  pname = "parole";
+  version = "0.9.2";
+
+  sha256 = "07i9d7xn2ys3z71sxvr53idq4ivy94pqgxvr0k78crva39ls08s5";
+
+  postPatch = ''
+    substituteInPlace src/plugins/mpris2/Makefile.am \
+      --replace GST_BASE_CFLAGS GST_VIDEO_CFLAGS
+  '';
+
+  nativeBuildInputs = [ makeWrapper wrapGAppsHook ];
+
+  buildInputs = [
+    dbus
+    dbus_glib
+    gst-plugins-bad
+    gst-plugins-base
+    gst-plugins-good
+    gst-plugins-ugly
+    gtk3
+    libnotify
+    libxfce4ui
+    libxfce4util
+    taglib
+    xfconf
+  ];
+}
diff --git a/pkgs/desktops/xfce4-13/ristretto/default.nix b/pkgs/desktops/xfce4-13/ristretto/default.nix
new file mode 100644
index 00000000000..5296723eb40
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/ristretto/default.nix
@@ -0,0 +1,18 @@
+{ mkXfceDerivation, automakeAddFlags, exo, dbus_glib, gtk2, libexif
+, libxfce4ui, libxfce4util, xfconf }:
+
+mkXfceDerivation rec {
+  category = "apps";
+  pname = "ristretto";
+  version = "0.8.2";
+
+  postPatch = ''
+    automakeAddFlags src/Makefile.am ristretto_CFLAGS DBUS_GLIB_CFLAGS
+    automakeAddFlags src/Makefile.am ristretto_LDADD DBUS_GLIB_LIBS
+  '';
+
+  nativeBuildInputs = [ automakeAddFlags exo ];
+  buildInputs = [ dbus_glib gtk2 libexif libxfce4ui libxfce4util xfconf ];
+
+  sha256 = "0ra50452ldk91pvhcpl3f3rhdssw3djfr6cm0hc29v8r58am0wni";
+}
diff --git a/pkgs/desktops/xfce4-13/thunar-volman/default.nix b/pkgs/desktops/xfce4-13/thunar-volman/default.nix
new file mode 100644
index 00000000000..0055d0d8217
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/thunar-volman/default.nix
@@ -0,0 +1,11 @@
+{ mkXfceDerivation, exo, gtk3, libgudev, libxfce4ui, libxfce4util, xfconf }:
+
+mkXfceDerivation rec {
+  category = "xfce";
+  pname = "thunar-volman";
+  version = "0.9.0";
+
+  buildInputs = [ exo gtk3 libgudev libxfce4ui libxfce4util xfconf ];
+
+  sha256 = "08aqbp3i0z6frj7z3laz9nj641iakrcr7vh2dxb057ky24gj61i7";
+}
diff --git a/pkgs/desktops/xfce4-13/thunar/default.nix b/pkgs/desktops/xfce4-13/thunar/default.nix
new file mode 100644
index 00000000000..7503e67e4a5
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/thunar/default.nix
@@ -0,0 +1,30 @@
+{ mkXfceDerivation, docbook_xml_xslt, exo, gdk_pixbuf, gtk3, libgudev ? null
+, libnotify ? null, libX11, libxfce4ui, libxfce4util, libxslt, xfconf }:
+
+mkXfceDerivation rec {
+  category = "xfce";
+  pname = "thunar";
+  version = "1.7.0";
+
+  sha256 = "1s262hii524a5hb15pb8xbrrrhyi5fj3837zgbscg3rdnsm52igw";
+
+  postPatch = ''
+    substituteInPlace docs/Makefile.am \
+      --replace http://docbook.sourceforge.net/release/xsl/current \
+                ${docbook_xml_xslt}/share/xml/docbook-xsl
+  '';
+
+  nativeBuildInputs = [ libxslt ];
+
+  buildInputs = [
+    exo
+    gdk_pixbuf
+    gtk3
+    libgudev
+    libnotify
+    libX11
+    libxfce4ui
+    libxfce4util
+    xfconf
+  ];
+}
diff --git a/pkgs/desktops/xfce4-13/tumbler/default.nix b/pkgs/desktops/xfce4-13/tumbler/default.nix
new file mode 100644
index 00000000000..6bcdbfbc41e
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/tumbler/default.nix
@@ -0,0 +1,14 @@
+{ mkXfceDerivation, gdk_pixbuf ? null, ffmpegthumbnailer ? null, libgsf ? null
+, poppler ? null }:
+
+# TODO: add libopenraw
+
+mkXfceDerivation rec {
+  category = "xfce";
+  pname = "tumbler";
+  version = "0.2.0";
+
+  sha256 = "0jr6rhgc57yqb3iwp7y49yf5ig541liaz6xpvjl45ki34j091iaj";
+
+  buildInputs = [ gdk_pixbuf ffmpegthumbnailer libgsf poppler ];
+}
diff --git a/pkgs/desktops/xfce4-13/xfburn/default.nix b/pkgs/desktops/xfce4-13/xfburn/default.nix
new file mode 100644
index 00000000000..266722c9b05
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/xfburn/default.nix
@@ -0,0 +1,18 @@
+{ mkXfceDerivation, docbook_xml_xslt, exo, gtk2, libburn, libICE, libisofs, libSM, libxfce4ui, libxslt }:
+
+mkXfceDerivation rec {
+  category = "apps";
+  pname = "xfburn";
+  version = "0.5.5";
+
+  postPatch = ''
+    substituteInPlace docs/Makefile.am \
+      --replace http://docbook.sourceforge.net/release/xsl/current \
+                ${docbook_xml_xslt}/share/xml/docbook-xsl
+  '';
+
+  sha256 = "1lmv48vqrlap1a2ha72g16vqly18zvcwj8y3f3f00l10pmn52bkp";
+
+  nativeBuildInputs = [ libxslt ];
+  buildInputs = [ exo gtk2 libburn libICE libisofs libSM libxfce4ui ];
+}
diff --git a/pkgs/desktops/xfce4-13/xfce4-appfinder/default.nix b/pkgs/desktops/xfce4-13/xfce4-appfinder/default.nix
new file mode 100644
index 00000000000..65941fee4c4
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/xfce4-appfinder/default.nix
@@ -0,0 +1,12 @@
+{ mkXfceDerivation, exo, garcon, gtk3, libxfce4util, libxfce4ui, xfconf }:
+
+mkXfceDerivation rec {
+  category = "xfce";
+  pname = "xfce4-appfinder";
+  version = "4.13.0";
+
+  sha256 = "13xsshzw04gx5rhalx4r0khjb0dbq26fv6n20biyiai1ykznyryy";
+
+  nativeBuildInputs = [ exo ];
+  buildInputs = [ garcon gtk3 libxfce4ui libxfce4util xfconf ];
+}
diff --git a/pkgs/desktops/xfce4-13/xfce4-dev-tools/default.nix b/pkgs/desktops/xfce4-13/xfce4-dev-tools/default.nix
new file mode 100644
index 00000000000..88ed804191a
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/xfce4-dev-tools/default.nix
@@ -0,0 +1,31 @@
+{ mkXfceDerivation, autoreconfHook, autoconf, automake, glib, gtk_doc, intltool, libtool }:
+
+mkXfceDerivation rec {
+  category = "xfce";
+  pname = "xfce4-dev-tools";
+  version = "4.12.0";
+
+  sha256 = "0bbmlmw2dpm10q2wv3vy592i0vx7b5h1qnd35j0fdzxqb8x2hbw2";
+
+  nativeBuildInputs = [ autoreconfHook ];
+
+  propagatedNativeBuildInputs = [
+    autoconf
+    automake
+    glib
+    gtk_doc
+    intltool
+    libtool
+  ];
+
+  preAutoreconf = ''
+    substitute configure.ac.in configure.ac \
+      --subst-var-by REVISION UNKNOWN
+  '';
+
+  setupHook = ./setup-hook.sh;
+
+  meta = {
+    description = "Autoconf macros and scripts to augment app build systems";
+  };
+}
diff --git a/pkgs/desktops/xfce4-13/xfce4-dev-tools/setup-hook.sh b/pkgs/desktops/xfce4-13/xfce4-dev-tools/setup-hook.sh
new file mode 100644
index 00000000000..600bf47fd87
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/xfce4-dev-tools/setup-hook.sh
@@ -0,0 +1,12 @@
+xdtEnvHook() {
+    addToSearchPath ACLOCAL_PATH $1/share/xfce4/dev-tools/m4macros
+}
+
+envHooks+=(xdtEnvHook)
+
+xdtAutogenPhase() {
+    mkdir -p m4
+    NOCONFIGURE=1 xdt-autogen
+}
+
+preConfigurePhases+=(xdtAutogenPhase)
diff --git a/pkgs/desktops/xfce4-13/xfce4-dict/configure-gio.patch b/pkgs/desktops/xfce4-13/xfce4-dict/configure-gio.patch
new file mode 100644
index 00000000000..787b63511a2
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/xfce4-dict/configure-gio.patch
@@ -0,0 +1,11 @@
+diff -urNZ a/configure.ac.in b/configure.ac.in
+--- a/configure.ac.in	2017-12-16 19:46:13.784914017 +0000
++++ b/configure.ac.in	2017-12-16 19:46:38.612477052 +0000
+@@ -53,6 +53,7 @@
+ dnl ***********************************
+ dnl *** Check for required packages ***
+ dnl ***********************************
++XDT_CHECK_PACKAGE([GIO], [gio-unix-2.0], [2.32.0])
+ XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.24.0])
+ XDT_CHECK_PACKAGE([GTK], [gtk+-3.0], [3.20.0])
+ XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.12.0])
diff --git a/pkgs/desktops/xfce4-13/xfce4-dict/default.nix b/pkgs/desktops/xfce4-13/xfce4-dict/default.nix
new file mode 100644
index 00000000000..a5357ebd590
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/xfce4-dict/default.nix
@@ -0,0 +1,19 @@
+{ mkXfceDerivation, automakeAddFlags, gtk3, libxfce4ui, libxfce4util, xfce4-panel }:
+
+mkXfceDerivation rec {
+  category = "apps";
+  pname = "xfce4-dict";
+  version = "0.8.0";
+
+  sha256 = "1r1k9cgl7zkn3q4mjf7qjql6vlxkb2m0spgj9p646mw7bnhbf9wr";
+
+  patches = [ ./configure-gio.patch ];
+
+  nativeBuildInputs = [ automakeAddFlags ];
+
+  postPatch = ''
+    automakeAddFlags lib/Makefile.am libdict_la_CFLAGS GIO_CFLAGS
+  '';
+
+  buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel ];
+}
diff --git a/pkgs/desktops/xfce4-13/xfce4-mixer/default.nix b/pkgs/desktops/xfce4-13/xfce4-mixer/default.nix
new file mode 100644
index 00000000000..96deb96e7f7
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/xfce4-mixer/default.nix
@@ -0,0 +1,30 @@
+{ mkXfceDerivation, automakeAddFlags, dbus_glib, gst-plugins-base, gtk2
+, libICE, libSM, libunique, libxfce4ui, libxfce4util, xfce4-panel, xfconf }:
+
+mkXfceDerivation rec {
+  category = "apps";
+  pname = "xfce4-mixer";
+  version = "4.11.0";
+
+  sha256 = "1kiz5ysn4rqkjfzz4dvbsfj64kqqayg7bqakcys3rw28g2q5qyys";
+
+  nativeBuildInputs = [ automakeAddFlags ];
+
+  postPatch = ''
+    automakeAddFlags panel-plugin/Makefile.am libmixer_la_CFLAGS DBUS_GLIB_CFLAGS
+    automakeAddFlags xfce4-mixer/Makefile.am xfce4_mixer_CFLAGS DBUS_GLIB_CFLAGS
+  '';
+
+  buildInputs = [
+    dbus_glib
+    gst-plugins-base
+    gtk2
+    libICE
+    libSM
+    libunique
+    libxfce4ui
+    libxfce4util
+    xfce4-panel
+    xfconf
+  ];
+}
diff --git a/pkgs/desktops/xfce4-13/xfce4-notifyd/default.nix b/pkgs/desktops/xfce4-13/xfce4-notifyd/default.nix
new file mode 100644
index 00000000000..b4be0a35a13
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/xfce4-notifyd/default.nix
@@ -0,0 +1,13 @@
+{ mkXfceDerivation, dbus_glib, exo, gtk3, libnotify, libxfce4ui, libxfce4util
+, xfce4-panel, xfconf }:
+
+mkXfceDerivation rec {
+  category = "apps";
+  pname = "xfce4-notifyd";
+  version = "0.4.1";
+
+  sha256 = "12mqi0q1hcjm16f4pndq7l58h2n0nq160r5fqx8ns320i83nh94k";
+
+  nativeBuildInputs = [ dbus_glib exo ];
+  buildInputs = [ gtk3 libnotify libxfce4ui libxfce4util xfce4-panel xfconf ];
+}
diff --git a/pkgs/desktops/xfce4-13/xfce4-panel/default.nix b/pkgs/desktops/xfce4-13/xfce4-panel/default.nix
new file mode 100644
index 00000000000..88ba2de49be
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/xfce4-panel/default.nix
@@ -0,0 +1,15 @@
+{ mkXfceDerivation, exo, garcon, gtk2, gtk3, libxfce4ui, libxfce4util, libwnck3, xfconf }:
+
+mkXfceDerivation rec {
+  category = "xfce";
+  pname = "xfce4-panel";
+  version = "4.13.2";
+
+  sha256 = "194pihmg7af4x81nia2fy3h7rls306a7c0bqny9ycqikvi6nmdmn";
+
+  buildInputs = [ exo garcon gtk2 gtk3 libxfce4ui libxfce4util libwnck3 xfconf ];
+
+  meta =  {
+    description = "Xfce's panel";
+  };
+}
diff --git a/pkgs/desktops/xfce4-13/xfce4-power-manager/default.nix b/pkgs/desktops/xfce4-13/xfce4-power-manager/default.nix
new file mode 100644
index 00000000000..bf998d2e819
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/xfce4-power-manager/default.nix
@@ -0,0 +1,19 @@
+{ mkXfceDerivation, automakeAddFlags, exo, gtk3, libnotify
+, libxfce4ui, libxfce4util, upower, xfconf }:
+
+mkXfceDerivation rec {
+  category = "xfce";
+  pname = "xfce4-power-manager";
+  version = "1.6.0";
+
+  sha256 = "1sh6ydn44j1yki8f020ljayp1fjcigkywcvjp38fsk7j25ni2wrp";
+
+  nativeBuildInputs = [ automakeAddFlags exo ];
+  buildInputs = [ gtk3 libnotify libxfce4ui libxfce4util upower xfconf ];
+
+  postPatch = ''
+    substituteInPlace configure.ac.in --replace gio-2.0 gio-unix-2.0
+    automakeAddFlags src/Makefile.am xfce4_power_manager_CFLAGS GIO_CFLAGS
+    automakeAddFlags src/Makefile.am xfce4_power_manager_settings_CFLAGS GIO_CFLAGS
+  '';
+}
diff --git a/pkgs/desktops/xfce4-13/xfce4-screenshooter/default.nix b/pkgs/desktops/xfce4-13/xfce4-screenshooter/default.nix
new file mode 100644
index 00000000000..5e2c296f056
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/xfce4-screenshooter/default.nix
@@ -0,0 +1,11 @@
+{ mkXfceDerivation, exo, gtk3, libsoup, libxfce4ui, libxfce4util, xfce4-panel }:
+
+mkXfceDerivation rec {
+  category = "apps";
+  pname = "xfce4-screenshooter";
+  version = "1.9.1";
+
+  sha256 = "1q13hvaz3ykrbgbbqb1186mhri8r9hkmpaayjwhnkvjm7jfyhbin";
+
+  buildInputs = [ exo gtk3 libsoup libxfce4ui libxfce4util xfce4-panel ];
+}
diff --git a/pkgs/desktops/xfce4-13/xfce4-settings/default.nix b/pkgs/desktops/xfce4-13/xfce4-settings/default.nix
new file mode 100644
index 00000000000..235c5cd15e4
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/xfce4-settings/default.nix
@@ -0,0 +1,39 @@
+{ mkXfceDerivation, automakeAddFlags, dbus_glib, exo, garcon, gtk3
+, libnotify ? null, libxfce4ui, libxfce4util, libxklavier ? null
+, upower ? null, xfconf, xf86inputlibinput ? null }:
+
+mkXfceDerivation rec {
+  category = "xfce";
+  pname = "xfce4-settings";
+  version = "4.13.1";
+
+  sha256 = "010vcgy3qiqykk174jhf50a8q3x4a5qq2lf6b0wcbyzv7aikydrw";
+
+  postPatch = ''
+    automakeAddFlags xfce4-settings-editor/Makefile.am xfce4_settings_editor_CFLAGS DBUS_GLIB_CFLAGS
+    for f in $(find . -name \*.c); do
+      substituteInPlace $f --replace \"libinput-properties.h\" '<xorg/libinput-properties.h>'
+    done
+  '';
+
+  nativeBuildInputs = [ automakeAddFlags ];
+
+  buildInputs = [
+    dbus_glib
+    exo
+    garcon
+    gtk3
+    libnotify
+    libxfce4ui
+    libxfce4util
+    libxklavier
+    upower
+    xfconf
+    xf86inputlibinput
+  ];
+
+  configureFlags = [
+    "--enable-pluggable-dialogs"
+    "--enable-sound-settings"
+  ];
+}
diff --git a/pkgs/desktops/xfce4-13/xfce4-taskmanager/default.nix b/pkgs/desktops/xfce4-13/xfce4-taskmanager/default.nix
new file mode 100644
index 00000000000..c2d80e31f15
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/xfce4-taskmanager/default.nix
@@ -0,0 +1,18 @@
+{ lib, mkXfceDerivation, exo, gtk2, gtk3 ? null, libwnck3 ? null, libXmu }:
+
+let
+  inherit (lib) enableFeature;
+in
+
+mkXfceDerivation rec {
+  category = "apps";
+  pname = "xfce4-taskmanager";
+  version = "1.2.0";
+
+  sha256 = "1lx66lhzfzhysymcbzfq9nrafyfmwdb79lli9kvhz6m12dhz6j18";
+
+  nativeBuildInputs = [ exo ];
+  buildInputs = [ gtk2 gtk3 libwnck3 libXmu ];
+
+  configureFlags = [ (enableFeature (gtk3 != null) "gtk3") ];
+}
diff --git a/pkgs/desktops/xfce4-13/xfce4-terminal/default.nix b/pkgs/desktops/xfce4-13/xfce4-terminal/default.nix
new file mode 100644
index 00000000000..de37e4071fe
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/xfce4-terminal/default.nix
@@ -0,0 +1,15 @@
+{ mkXfceDerivation, gtk3, libxfce4ui, vte }:
+
+mkXfceDerivation rec {
+  category = "apps";
+  pname = "xfce4-terminal";
+  version = "0.8.6";
+
+  sha256 = "1a0b2ih552zhbbx1fc5ad80nafvkc5my3gw89as4mvycnhyd5inj";
+
+  buildInputs = [ gtk3 libxfce4ui vte ];
+
+  meta = {
+    description = "A modern terminal emulator";
+  };
+}
diff --git a/pkgs/desktops/xfce4-13/xfce4-volumed-pulse/default.nix b/pkgs/desktops/xfce4-13/xfce4-volumed-pulse/default.nix
new file mode 100644
index 00000000000..e7f13e104c8
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/xfce4-volumed-pulse/default.nix
@@ -0,0 +1,15 @@
+{ lib, mkXfceDerivation, gtk2, libnotify ? null, libpulseaudio, keybinder, xfconf }:
+
+mkXfceDerivation rec {
+  category = "apps";
+  pname = "xfce4-volumed-pulse";
+  version = "0.2.2";
+
+  sha256 = "0ccb98b433lx5fgdqd3nqqppg4sldr5p1is6pnx85h9wyxx5svhp";
+
+  buildInputs = [ gtk2 libnotify libpulseaudio keybinder xfconf ];
+
+  meta = with lib; {
+    license = licenses.gpl3Plus;
+  };
+}
diff --git a/pkgs/desktops/xfce4-13/xfconf/default.nix b/pkgs/desktops/xfce4-13/xfconf/default.nix
new file mode 100644
index 00000000000..8280922d1c7
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/xfconf/default.nix
@@ -0,0 +1,11 @@
+{ mkXfceDerivation, libxfce4util }:
+
+mkXfceDerivation rec {
+  category = "xfce";
+  pname = "xfconf";
+  version = "4.13.4";
+
+  sha256 = "1bm4q06rwlmkmcy6qnwm6l70w6749iqfrmsrgj3y1jb2sacc3pd4";
+
+  buildInputs = [ libxfce4util ];
+}
diff --git a/pkgs/desktops/xfce4-13/xfdesktop/default.nix b/pkgs/desktops/xfce4-13/xfdesktop/default.nix
new file mode 100644
index 00000000000..7ce32424b9b
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/xfdesktop/default.nix
@@ -0,0 +1,22 @@
+{ mkXfceDerivation, exo, gtk3, libxfce4ui, libxfce4util, libwnck3, xfconf }:
+
+mkXfceDerivation rec {
+  category = "xfce";
+  pname = "xfdesktop";
+  version = "4.13.1";
+
+  sha256 = "0idc8j44apflvdasnvj7ld0fa8mxlwpndfqzbh97w54s8972gf6g";
+
+  buildInputs = [
+    exo
+    gtk3
+    libxfce4ui
+    libxfce4util
+    libwnck3
+    xfconf
+  ];
+
+  meta = {
+    description = "Xfce's desktop manager";
+  };
+}
diff --git a/pkgs/desktops/xfce4-13/xfwm4/default.nix b/pkgs/desktops/xfce4-13/xfwm4/default.nix
new file mode 100644
index 00000000000..d5de6817300
--- /dev/null
+++ b/pkgs/desktops/xfce4-13/xfwm4/default.nix
@@ -0,0 +1,27 @@
+{ mkXfceDerivation, exo, dbus_glib, epoxy ? null, gtk2, libICE, libSM
+, libstartup_notification ? null, libxfce4ui, libxfce4util, libwnck
+, libXpresent ? null, xfconf }:
+
+mkXfceDerivation rec {
+  category = "xfce";
+  pname = "xfwm4";
+  version = "4.13.0";
+
+  sha256 = "19ikyls4xawsbz07qdz60g5yl2jbvpb90sfy5zql7ghypd69cgn9";
+
+  nativeBuildInputs = [ exo ];
+
+  buildInputs = [
+    dbus_glib
+    epoxy
+    gtk2
+    libICE
+    libSM
+    libstartup_notification
+    libxfce4ui
+    libxfce4util
+    libwnck
+    libXpresent
+    xfconf
+  ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 230ee580522..500b398dc62 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18643,7 +18643,10 @@ with pkgs;
   };
 
   xfce = xfce4-12;
+  xfceUnstable = xfce4-13;
+
   xfce4-12 = recurseIntoAttrs (callPackage ../desktops/xfce { });
+  xfce4-13 = recurseIntoAttrs (callPackage ../desktops/xfce4-13 { });
 
   xrandr-invert-colors = callPackage ../applications/misc/xrandr-invert-colors { };
 

From 77b205b9fd661f235dddcf3ffc078d2defa02cf9 Mon Sep 17 00:00:00 2001
From: Johannes Frankenau <johannes@frankenau.net>
Date: Thu, 8 Mar 2018 22:54:24 +0100
Subject: [PATCH 002/123] masterpdfeditor: 4.3.61 -> 4.3.82

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

diff --git a/pkgs/applications/misc/masterpdfeditor/default.nix b/pkgs/applications/misc/masterpdfeditor/default.nix
index 76d23f1a8f0..19a45e7d17b 100644
--- a/pkgs/applications/misc/masterpdfeditor/default.nix
+++ b/pkgs/applications/misc/masterpdfeditor/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, glibc, sane-backends, qtbase, qtsvg, libXext, libX11, libXdmcp, libXau, libxcb }:
   let
-    version = "4.3.61";
+    version = "4.3.82";
   in
     stdenv.mkDerivation {
       name = "masterpdfeditor-${version}";
       src = fetchurl {
         url = "http://get.code-industry.net/public/master-pdf-editor-${version}_qt5.amd64.tar.gz";
-        sha256 = "1g6mx8nch6ypf78h6xsb673wim19wn5ni5840armzg0pvi3sfknm";
+        sha256 = "0bfqnpg2p5jxygcahqqljyb0gd2z28hj5n1j9g1x7px8f7wwiwl4";
       };
       libPath = stdenv.lib.makeLibraryPath [
         stdenv.cc.cc

From 8d9e54006dde0cb976af6df2fb5a263885b8c68e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Mon, 12 Mar 2018 17:34:12 +0100
Subject: [PATCH 003/123] kde-applications: 17.12.2 -> 17.12.3

---
 pkgs/applications/kde/fetch.sh |    2 +-
 pkgs/applications/kde/srcs.nix | 1688 ++++++++++++++++----------------
 2 files changed, 845 insertions(+), 845 deletions(-)

diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh
index 724f252907c..9ad488f63ab 100644
--- a/pkgs/applications/kde/fetch.sh
+++ b/pkgs/applications/kde/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/applications/17.12.2/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/applications/17.12.3/ -A '*.tar.xz' )
diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix
index ff6b1803e13..d61784805e4 100644
--- a/pkgs/applications/kde/srcs.nix
+++ b/pkgs/applications/kde/srcs.nix
@@ -3,1691 +3,1691 @@
 
 {
   akonadi = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/akonadi-17.12.2.tar.xz";
-      sha256 = "03cz5jl5qywc39krjrzby7yxcrx4iaf94pkvzbkagx1c7bfgajkf";
-      name = "akonadi-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/akonadi-17.12.3.tar.xz";
+      sha256 = "006cb98k3kxd51d0d07984aj4d0km0bn0v3rigpa3sw5s07w8dfi";
+      name = "akonadi-17.12.3.tar.xz";
     };
   };
   akonadi-calendar = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/akonadi-calendar-17.12.2.tar.xz";
-      sha256 = "1j2bs3ybl2lz3yr862kz4jnkiksawbyv96lsjvzgkalmri3y2jv9";
-      name = "akonadi-calendar-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/akonadi-calendar-17.12.3.tar.xz";
+      sha256 = "0ffrnpwyjmvx80qziajdkihdzl5pyp0zbm8qg8wkcr8nxs3fgv6a";
+      name = "akonadi-calendar-17.12.3.tar.xz";
     };
   };
   akonadi-calendar-tools = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/akonadi-calendar-tools-17.12.2.tar.xz";
-      sha256 = "0fh7zsf4ckmikqqwa3zqdd97i80s53r56bx8q0aj1dyxa5kzrid6";
-      name = "akonadi-calendar-tools-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/akonadi-calendar-tools-17.12.3.tar.xz";
+      sha256 = "0836al499pd0bmwgaqzmbbmas3jmn44hv37y9k6j6ab71gpkjjy9";
+      name = "akonadi-calendar-tools-17.12.3.tar.xz";
     };
   };
   akonadiconsole = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/akonadiconsole-17.12.2.tar.xz";
-      sha256 = "00w21nxbq9a9h1cs4wl0641hj82i3w63r9ab5hb9kw33gi9ijali";
-      name = "akonadiconsole-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/akonadiconsole-17.12.3.tar.xz";
+      sha256 = "0xny4y5i03sj93dxaafnqiyczichjnzjrx1h4z13fn62flz8fn1b";
+      name = "akonadiconsole-17.12.3.tar.xz";
     };
   };
   akonadi-contacts = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/akonadi-contacts-17.12.2.tar.xz";
-      sha256 = "1v8082walg47bl8rj6zcp2br4wr0mhrw82l0aw41gmcwi2vr4pr7";
-      name = "akonadi-contacts-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/akonadi-contacts-17.12.3.tar.xz";
+      sha256 = "0jbxyzvpp2lan8pi212adwflqx38paqvr661ia4zmdjnkhdvi95v";
+      name = "akonadi-contacts-17.12.3.tar.xz";
     };
   };
   akonadi-import-wizard = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/akonadi-import-wizard-17.12.2.tar.xz";
-      sha256 = "1yflksmvvysl3p3s37i0qc712cdzkzi501x74mk3c7sy1pw097g4";
-      name = "akonadi-import-wizard-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/akonadi-import-wizard-17.12.3.tar.xz";
+      sha256 = "0knddbgirj55l24njak7s8ixg1v9i6g5nx6ijh6cnnbr2zl6aws4";
+      name = "akonadi-import-wizard-17.12.3.tar.xz";
     };
   };
   akonadi-mime = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/akonadi-mime-17.12.2.tar.xz";
-      sha256 = "0xsm87nph967293ixwnh1450qwrn0ghfcw34444fj8f4ciwbv0iv";
-      name = "akonadi-mime-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/akonadi-mime-17.12.3.tar.xz";
+      sha256 = "0n04x37palp2k6mq20p97k89qi2zfncaapn5pcf4372bzvzi9vj2";
+      name = "akonadi-mime-17.12.3.tar.xz";
     };
   };
   akonadi-notes = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/akonadi-notes-17.12.2.tar.xz";
-      sha256 = "06ac7b1n3aaad7y1cbby44jaq748xnxfjd51c1jh0p257q22qj85";
-      name = "akonadi-notes-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/akonadi-notes-17.12.3.tar.xz";
+      sha256 = "0lwnyl12a5sc3ijmahqy3prdzh9352rsqp2jpw2y58xpa2sx0w3g";
+      name = "akonadi-notes-17.12.3.tar.xz";
     };
   };
   akonadi-search = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/akonadi-search-17.12.2.tar.xz";
-      sha256 = "0g03z7xcbl25ylrflgkycfgyvny5hr8i38flirw9jidwy5zf1pny";
-      name = "akonadi-search-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/akonadi-search-17.12.3.tar.xz";
+      sha256 = "0npnbnras7lxs4r1g0v2nynpdni7wni7y9hy30k61lbif06ghm9x";
+      name = "akonadi-search-17.12.3.tar.xz";
     };
   };
   akregator = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/akregator-17.12.2.tar.xz";
-      sha256 = "19grppwmspn7x84ygxscch3ydr5i6nanshi1pk4wr5z34g8qcxrc";
-      name = "akregator-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/akregator-17.12.3.tar.xz";
+      sha256 = "0032jg05xwk29hpqscb5xfk7ipcpprhw8m28ksfx7v77fb025dsp";
+      name = "akregator-17.12.3.tar.xz";
     };
   };
   analitza = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/analitza-17.12.2.tar.xz";
-      sha256 = "128qcnzizcvrc1mknb5qdzricymxai2mxlrxb5h93cc14jwiivg1";
-      name = "analitza-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/analitza-17.12.3.tar.xz";
+      sha256 = "0xyr5s69768l0lp1qkp68jvny8mfh36q1xpz8msdhcn4513bw5sw";
+      name = "analitza-17.12.3.tar.xz";
     };
   };
   ark = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/ark-17.12.2.tar.xz";
-      sha256 = "0xh60mf1ygyhcc06w8g4nnrhqyjf88ji3kf8d5vfpdijq8m6gg8b";
-      name = "ark-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/ark-17.12.3.tar.xz";
+      sha256 = "0hjnzcn6ijpgqld7034gwzyl9m0i5nwac457f010ibzf0qp10gdi";
+      name = "ark-17.12.3.tar.xz";
     };
   };
   artikulate = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/artikulate-17.12.2.tar.xz";
-      sha256 = "0plc81c7sc47392x183q30x39ksjr1wnjhlwy0ixngj2q9nhi6nn";
-      name = "artikulate-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/artikulate-17.12.3.tar.xz";
+      sha256 = "0ynbq0m7rk4mm3khjsh0bl744g7m6l2cq9v2a4slg7n4dq8gr8zx";
+      name = "artikulate-17.12.3.tar.xz";
     };
   };
   audiocd-kio = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/audiocd-kio-17.12.2.tar.xz";
-      sha256 = "1n3n3ylwdm5yjv0hh43rmn3bn0q32xsbrl5wlbwgiijhpqd0ahkw";
-      name = "audiocd-kio-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/audiocd-kio-17.12.3.tar.xz";
+      sha256 = "0916igzdp1v9zafq5jwhwsfja5h9zsbqgwq97mnkmx9bnd4d2r26";
+      name = "audiocd-kio-17.12.3.tar.xz";
     };
   };
   baloo-widgets = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/baloo-widgets-17.12.2.tar.xz";
-      sha256 = "0pw153cy606dggkq2njk6fs5yp6a9jlkwpp7vckd9jl5s6pbsqd2";
-      name = "baloo-widgets-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/baloo-widgets-17.12.3.tar.xz";
+      sha256 = "1gn18raxqwjx09l54a4gaisxlv4i2vf7pnpv8fqfdk49wc06b58h";
+      name = "baloo-widgets-17.12.3.tar.xz";
     };
   };
   blinken = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/blinken-17.12.2.tar.xz";
-      sha256 = "008pmr3g553xd4mcdmby0fqzp8vk651dji3c8zkad94560xysm71";
-      name = "blinken-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/blinken-17.12.3.tar.xz";
+      sha256 = "0lda34yw7h867jzfqi071yw0g47916cmr145x1gz71nclg9sdgr0";
+      name = "blinken-17.12.3.tar.xz";
     };
   };
   bomber = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/bomber-17.12.2.tar.xz";
-      sha256 = "1rdxr7w2p3r1gviqsmshx6n07gzsc3ymz6drhqk3kacqwgnnr72y";
-      name = "bomber-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/bomber-17.12.3.tar.xz";
+      sha256 = "14iyn9901canzd4hpsb4xwxd67j01wn54asplvlizmwy3jhpfx9s";
+      name = "bomber-17.12.3.tar.xz";
     };
   };
   bovo = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/bovo-17.12.2.tar.xz";
-      sha256 = "0rhj0w7li1rsfjmrivr6g6z9ja408v59pk5rpci4344piaqglrqm";
-      name = "bovo-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/bovo-17.12.3.tar.xz";
+      sha256 = "15zaf8017zqfj4z0mlc321lvfnfhda8n648zlsxxap1lj6icr3s9";
+      name = "bovo-17.12.3.tar.xz";
     };
   };
   calendarsupport = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/calendarsupport-17.12.2.tar.xz";
-      sha256 = "0c6i8gqjdgc9s3mz351qjxwv6fsk3098i7ni6x4bhh5shg863vnr";
-      name = "calendarsupport-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/calendarsupport-17.12.3.tar.xz";
+      sha256 = "020ra0sbc8pmibff5ffyzhqwww8qdi1wlmn6h9qh0z2sjk9hrs84";
+      name = "calendarsupport-17.12.3.tar.xz";
     };
   };
   cantor = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/cantor-17.12.2.tar.xz";
-      sha256 = "1b055fcbpqs4fwwyj0pywv5y8pfpg3ha5382d4hhrpvpc8xwjn6c";
-      name = "cantor-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/cantor-17.12.3.tar.xz";
+      sha256 = "08jhbm54vv5s14ig2adw83fkk1r0p98aifhiq0sc4xga7gkx032w";
+      name = "cantor-17.12.3.tar.xz";
     };
   };
   cervisia = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/cervisia-17.12.2.tar.xz";
-      sha256 = "1iqkp7d3wkmi0wfxsx2k20qblkmk6m1ndh472bxn6vvfaii2dqmm";
-      name = "cervisia-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/cervisia-17.12.3.tar.xz";
+      sha256 = "04qvgpaa5mf9jmlqd60r1df3r9rscaqasfa9c39cfmahrnvm4yyr";
+      name = "cervisia-17.12.3.tar.xz";
     };
   };
   dolphin = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/dolphin-17.12.2.tar.xz";
-      sha256 = "1pmfix569996minfc8rrjdbfvybm1a5bnljk0gxybahlainxwjp4";
-      name = "dolphin-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/dolphin-17.12.3.tar.xz";
+      sha256 = "0fd4c7kwdvjpx7q9yb2razdlv6q7y74nkk99jg20jsng0px9dp20";
+      name = "dolphin-17.12.3.tar.xz";
     };
   };
   dolphin-plugins = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/dolphin-plugins-17.12.2.tar.xz";
-      sha256 = "03637pxjf0kjbw831vvdj3lk3msvn6y3gkildsr1490v60cl2f2c";
-      name = "dolphin-plugins-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/dolphin-plugins-17.12.3.tar.xz";
+      sha256 = "0bdvwsl83bilm1jhgmcl0b8iyh4vbfg3imara2rmizfxl5g6jccf";
+      name = "dolphin-plugins-17.12.3.tar.xz";
     };
   };
   dragon = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/dragon-17.12.2.tar.xz";
-      sha256 = "03z263agwrkpqf1l3xpfmgxjzqs6icwxv22bp5shzlyiq5dvmq0d";
-      name = "dragon-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/dragon-17.12.3.tar.xz";
+      sha256 = "1j5li70fyz1ynykmxb63i2na3n964lsdkyilj1vhdzb55592b1s4";
+      name = "dragon-17.12.3.tar.xz";
     };
   };
   eventviews = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/eventviews-17.12.2.tar.xz";
-      sha256 = "1y1d8flzmi3mm15gc2q2925f1z17lcm5b8difd65z7rji4ra9rg6";
-      name = "eventviews-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/eventviews-17.12.3.tar.xz";
+      sha256 = "0v712sisa0bic6zbl7gb4jvh11wf7krsfpxffxgxc3i8zmvw9jfc";
+      name = "eventviews-17.12.3.tar.xz";
     };
   };
   ffmpegthumbs = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/ffmpegthumbs-17.12.2.tar.xz";
-      sha256 = "098w62hvjqkq9iixbipg1wl0091d0fnb49jm874k4d68mpvlmmf2";
-      name = "ffmpegthumbs-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/ffmpegthumbs-17.12.3.tar.xz";
+      sha256 = "18f2yxbfxrf4598xwzjd6fws35ipnvnsljv5jwy9lmq400iqpii5";
+      name = "ffmpegthumbs-17.12.3.tar.xz";
     };
   };
   filelight = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/filelight-17.12.2.tar.xz";
-      sha256 = "1ysh5rb9irgha62iw1yiw5f4fxanym9swgc8sd9cdlmkqm6km27m";
-      name = "filelight-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/filelight-17.12.3.tar.xz";
+      sha256 = "1k8vibkxv8m8f2q4hj3g4jvk96zkkd0wpxhag5jycla6v50q9anf";
+      name = "filelight-17.12.3.tar.xz";
     };
   };
   granatier = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/granatier-17.12.2.tar.xz";
-      sha256 = "1c86vh6jx991ig1n6n591r9va8rs029gd83m6y9appavi43aylkv";
-      name = "granatier-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/granatier-17.12.3.tar.xz";
+      sha256 = "1zysqf68d2zzhii587a3qdqqf1zhi2k3008f626r59a0yb2bdz9x";
+      name = "granatier-17.12.3.tar.xz";
     };
   };
   grantlee-editor = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/grantlee-editor-17.12.2.tar.xz";
-      sha256 = "1x4rn8liz083y8h3in743xrmk3caqcn75ba97f8ymaap0f48nly6";
-      name = "grantlee-editor-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/grantlee-editor-17.12.3.tar.xz";
+      sha256 = "03v4yrmbkpa6w8kq54iv0a6rx0q7zv1jmwka103iv89qf9d332j4";
+      name = "grantlee-editor-17.12.3.tar.xz";
     };
   };
   grantleetheme = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/grantleetheme-17.12.2.tar.xz";
-      sha256 = "0cpmd8glpjpg62h2qcngaks6adahfcbf9aikm9y4gwqbsmglqjkx";
-      name = "grantleetheme-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/grantleetheme-17.12.3.tar.xz";
+      sha256 = "0q6s5h236a61q015g9238jandibfhpw9yrx7s367qagk5wi4phsx";
+      name = "grantleetheme-17.12.3.tar.xz";
     };
   };
   gwenview = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/gwenview-17.12.2.tar.xz";
-      sha256 = "0cpv7wlbkm20vch1d4m49kxk02by9zh9lbdcli5p6bgp8mnvpxgr";
-      name = "gwenview-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/gwenview-17.12.3.tar.xz";
+      sha256 = "03gz5a4531xhmr0m5x7nzwzfr3j61xy8yw6pk06i6q7azbxxr1rr";
+      name = "gwenview-17.12.3.tar.xz";
     };
   };
   incidenceeditor = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/incidenceeditor-17.12.2.tar.xz";
-      sha256 = "1qlghzfc4lg69p5014f3zj6k0lgy57n0lg063b804nqy0378xra2";
-      name = "incidenceeditor-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/incidenceeditor-17.12.3.tar.xz";
+      sha256 = "19jl8mpabxm8gk7krpby1c0kcrss1nvxl5blpviy0m4ccq5jsbka";
+      name = "incidenceeditor-17.12.3.tar.xz";
     };
   };
   juk = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/juk-17.12.2.tar.xz";
-      sha256 = "1wa52sysy3hr7n5r59vb9qqnac73fcy2dc3zl51ba9da8lz8q0lj";
-      name = "juk-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/juk-17.12.3.tar.xz";
+      sha256 = "1zzzvwn3ahzwkd7gdavz6k72js2xh79wf1w06vfjx9h35j54smb6";
+      name = "juk-17.12.3.tar.xz";
     };
   };
   k3b = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/k3b-17.12.2.tar.xz";
-      sha256 = "0ryzchkk37yzihfhra5xh5sj2k46bdlspi9i2zfs63q3n32jyfww";
-      name = "k3b-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/k3b-17.12.3.tar.xz";
+      sha256 = "1i74c8x72qx36wl9vc7wcz5rpyd6410n3w8bas7hb5j4bfaapl3l";
+      name = "k3b-17.12.3.tar.xz";
     };
   };
   kaccounts-integration = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kaccounts-integration-17.12.2.tar.xz";
-      sha256 = "14mipln6ppg88yipwvyc6ainj250ss6xynh9smxbji533wyg72c5";
-      name = "kaccounts-integration-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kaccounts-integration-17.12.3.tar.xz";
+      sha256 = "0c3jx2wr7qxkh5i3fmhsd1r0aqf133443nc7l7krymjzd54y6db9";
+      name = "kaccounts-integration-17.12.3.tar.xz";
     };
   };
   kaccounts-providers = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kaccounts-providers-17.12.2.tar.xz";
-      sha256 = "1lapgxlgzymrdl8swn2prrlrmz5xgmkhmv7hx8fpxpc3cpfyvfsd";
-      name = "kaccounts-providers-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kaccounts-providers-17.12.3.tar.xz";
+      sha256 = "1h2asblaqmyhy4qfzcl7mxinfg0djghr9xrcvl2xyd85jkk428h5";
+      name = "kaccounts-providers-17.12.3.tar.xz";
     };
   };
   kaddressbook = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kaddressbook-17.12.2.tar.xz";
-      sha256 = "1b5a5ypmf0jr9si5cx01h52aql26v6cv16wzrrb6vhxqzksmwriw";
-      name = "kaddressbook-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kaddressbook-17.12.3.tar.xz";
+      sha256 = "1ys2hrpqpbwpml3arw076gng7ygdvvkwy489lnq7d345y79501bq";
+      name = "kaddressbook-17.12.3.tar.xz";
     };
   };
   kajongg = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kajongg-17.12.2.tar.xz";
-      sha256 = "15vnin2rg63c60injxqkx0jp5sy1hjmh5rys3qq40wy0bm41pwai";
-      name = "kajongg-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kajongg-17.12.3.tar.xz";
+      sha256 = "1p39qjj05p1zjlz9f49pvwzvlsa61h549r74ravj4xdl6fqvdgfa";
+      name = "kajongg-17.12.3.tar.xz";
     };
   };
   kalarm = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kalarm-17.12.2.tar.xz";
-      sha256 = "1vvayib91mh73kqc0linzqlwa1l9jlc2wsih80bzzglaaxbi4l7z";
-      name = "kalarm-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kalarm-17.12.3.tar.xz";
+      sha256 = "0n3cdj630q96rvljph3raz0f698pwrh2rx81xzsyp2lk917737h7";
+      name = "kalarm-17.12.3.tar.xz";
     };
   };
   kalarmcal = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kalarmcal-17.12.2.tar.xz";
-      sha256 = "04js601j477jwa5lhqdxq9gaacd7bf5ladgy3k64dwns5mx1j762";
-      name = "kalarmcal-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kalarmcal-17.12.3.tar.xz";
+      sha256 = "13bg69qsyzjaabghq6n33y211i5mz9pnnc26kqyhg87za526j7km";
+      name = "kalarmcal-17.12.3.tar.xz";
     };
   };
   kalgebra = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kalgebra-17.12.2.tar.xz";
-      sha256 = "10vfzwmz0l7yvmy8gjwcb3dnpqyfngj47knb5knvkibqzij6p4w4";
-      name = "kalgebra-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kalgebra-17.12.3.tar.xz";
+      sha256 = "1vm64azi46zgxg0kjg8ch7gxbb8wb3bafsfgxmv4x1hqy45crkv7";
+      name = "kalgebra-17.12.3.tar.xz";
     };
   };
   kalzium = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kalzium-17.12.2.tar.xz";
-      sha256 = "0rdq2cpq5mzl3qrj3ll1d0qixaiygl5x277wlr5fg9cngi51v58x";
-      name = "kalzium-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kalzium-17.12.3.tar.xz";
+      sha256 = "1zha7iy2wg8dyrajijnc3vy7wb0k4kli4q2xkv6ryc6klrp2910h";
+      name = "kalzium-17.12.3.tar.xz";
     };
   };
   kamera = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kamera-17.12.2.tar.xz";
-      sha256 = "070kvaij5chk8nkap9nm1rrilq3sc32q7ysnrld9bssbfi9m73v7";
-      name = "kamera-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kamera-17.12.3.tar.xz";
+      sha256 = "1xk2cclavzkjifzznd9kx4nq8dysmns2ni9w865s0vvl98z6jbg9";
+      name = "kamera-17.12.3.tar.xz";
     };
   };
   kanagram = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kanagram-17.12.2.tar.xz";
-      sha256 = "1300wg5k6x6s1wgmavywcwyqgv68xv0qv6hkqawvzsd61zfhxcr3";
-      name = "kanagram-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kanagram-17.12.3.tar.xz";
+      sha256 = "05dl248lvskh46mii5glvxpspf6gw1m4z2g6lpb9acafr8cqvz8k";
+      name = "kanagram-17.12.3.tar.xz";
     };
   };
   kapman = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kapman-17.12.2.tar.xz";
-      sha256 = "0njf1017dnf4xl801xinfgfmqqpjf3ifnpwchg35zm2qlrlwhmyi";
-      name = "kapman-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kapman-17.12.3.tar.xz";
+      sha256 = "04ngab85hsx4z9h45z32s1arahfzyxkyb4i9w6x51jmm3a7cnp4z";
+      name = "kapman-17.12.3.tar.xz";
     };
   };
   kapptemplate = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kapptemplate-17.12.2.tar.xz";
-      sha256 = "16p63zil3vaa5q2q01010gshn6a58kbmayks27kdgvsfdavgdh51";
-      name = "kapptemplate-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kapptemplate-17.12.3.tar.xz";
+      sha256 = "11v108jqmqp4xcmf6nz41fl7avmcpd26w4pdgfk70dzjwpzf1hl3";
+      name = "kapptemplate-17.12.3.tar.xz";
     };
   };
   kate = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kate-17.12.2.tar.xz";
-      sha256 = "1w3pswd3gpjpa55xy98yq39nck775mfv5i9lcvm8y15x1233rr6p";
-      name = "kate-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kate-17.12.3.tar.xz";
+      sha256 = "041ax9mvmgi9aj3759411bv1yj0a0v08djmwmn6kbvl8nv6a7dp5";
+      name = "kate-17.12.3.tar.xz";
     };
   };
   katomic = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/katomic-17.12.2.tar.xz";
-      sha256 = "0jhmszbq0rslwg8b8aq0vjynjlkg491di661k2b6yrsfqr4vmngw";
-      name = "katomic-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/katomic-17.12.3.tar.xz";
+      sha256 = "1ljc8h2ngsc3cqz58dal3kkn7ymwa23ikxhjakn0nsg07fbqkdjl";
+      name = "katomic-17.12.3.tar.xz";
     };
   };
   kblackbox = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kblackbox-17.12.2.tar.xz";
-      sha256 = "07bvmcfm3r4dj41dvsaba4rig2i9yilshrzl3wwprsjajmx4j6rf";
-      name = "kblackbox-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kblackbox-17.12.3.tar.xz";
+      sha256 = "1nc15k4rlpjb9p5y3g6jhi1j8nnwzxv4cymg7m7p356xr5k0m5qm";
+      name = "kblackbox-17.12.3.tar.xz";
     };
   };
   kblocks = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kblocks-17.12.2.tar.xz";
-      sha256 = "019h8rxv9p1ynby7bshr2yzrcn415magwlzmyrwvh5hzjjp0bmm9";
-      name = "kblocks-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kblocks-17.12.3.tar.xz";
+      sha256 = "04yyz71a4nr8g6fnb3mfsnlisnsw2c28z39w1hn54msmi32wyvi2";
+      name = "kblocks-17.12.3.tar.xz";
     };
   };
   kblog = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kblog-17.12.2.tar.xz";
-      sha256 = "1s2py5ll879zxcl6l7y2jryy1z29wljwm8hrgr52f8xr22vspbjc";
-      name = "kblog-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kblog-17.12.3.tar.xz";
+      sha256 = "0169m2h60iygy021j5w7fqww4ljal3gzffmj8f7arf6fin9myhwb";
+      name = "kblog-17.12.3.tar.xz";
     };
   };
   kbounce = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kbounce-17.12.2.tar.xz";
-      sha256 = "0rb9p8q0zwwfx70cxfcdbr9h3i8gag0da8nql6nnd37v2wcr4i82";
-      name = "kbounce-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kbounce-17.12.3.tar.xz";
+      sha256 = "0m0hvb8dv2z5s80c8i0ivkwnp9xaqprvgkgnrfmispj1splpzlvw";
+      name = "kbounce-17.12.3.tar.xz";
     };
   };
   kbreakout = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kbreakout-17.12.2.tar.xz";
-      sha256 = "1j9gfzgdjhfd4jz2x3qgbd4jwfix0m1qx5lnlbkbxnff5jkw68sh";
-      name = "kbreakout-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kbreakout-17.12.3.tar.xz";
+      sha256 = "04n01c36dbfq8khklc7jp2d80zxyhfy7v3x4dqpknnq22a8x8f6c";
+      name = "kbreakout-17.12.3.tar.xz";
     };
   };
   kbruch = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kbruch-17.12.2.tar.xz";
-      sha256 = "0q95i474lgbl6phshbw7f89kik8hk9k8j8vpbzy3cchwn7dmg3p3";
-      name = "kbruch-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kbruch-17.12.3.tar.xz";
+      sha256 = "1m3cdifm13gyfkhnab3nmw762kvbz64fyfw8py7lqy7i023yg35r";
+      name = "kbruch-17.12.3.tar.xz";
     };
   };
   kcachegrind = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kcachegrind-17.12.2.tar.xz";
-      sha256 = "02nx8vqvl62vdm311r4akcckzl1w4c47phl3ybswygrakik7vf2a";
-      name = "kcachegrind-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kcachegrind-17.12.3.tar.xz";
+      sha256 = "1nsx813dsngf5agdw04cdrw3h8cj4g2na28i5anxbscn7fm715hd";
+      name = "kcachegrind-17.12.3.tar.xz";
     };
   };
   kcalc = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kcalc-17.12.2.tar.xz";
-      sha256 = "13h4c97qz8g7z4r5kb4js6sjzdgr3s4mabzr16qkwmmg4lwvzcp8";
-      name = "kcalc-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kcalc-17.12.3.tar.xz";
+      sha256 = "0w4rqkjsl24528bqkqansk985iq6nk78bm0pinagm1fqrarjqk8j";
+      name = "kcalc-17.12.3.tar.xz";
     };
   };
   kcalcore = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kcalcore-17.12.2.tar.xz";
-      sha256 = "06z7xd0a8pz75zx1l2hcban39rc6dmxhhwhgidfglkj3l2xzw927";
-      name = "kcalcore-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kcalcore-17.12.3.tar.xz";
+      sha256 = "125qdd3gp6bwm6lqc1ib4icv3sa8sd0n5fjbgwr4klx8xsxzr03z";
+      name = "kcalcore-17.12.3.tar.xz";
     };
   };
   kcalutils = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kcalutils-17.12.2.tar.xz";
-      sha256 = "11vp32f53by2gc7zv08zq0z591rw4srmmjmiafds8hvx76ry3dsl";
-      name = "kcalutils-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kcalutils-17.12.3.tar.xz";
+      sha256 = "1cag7pg9qd8w7xmvplkqr6p6pscnjzlzlin9fi6yjhhsq8bi2rxb";
+      name = "kcalutils-17.12.3.tar.xz";
     };
   };
   kcharselect = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kcharselect-17.12.2.tar.xz";
-      sha256 = "1gbr6gvp2vwgvns83pmg5idhwhixyw9yqyr6nn61qf43f97nkdiy";
-      name = "kcharselect-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kcharselect-17.12.3.tar.xz";
+      sha256 = "1chxa1nsczk525hvwyw6cbzdr73i21zw9jngp9c79frcnpb5hdi4";
+      name = "kcharselect-17.12.3.tar.xz";
     };
   };
   kcolorchooser = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kcolorchooser-17.12.2.tar.xz";
-      sha256 = "0jjzpm82jy9f4qf5sf5v24vk50y4qq2sj42zn057v0kwlpwzvrr9";
-      name = "kcolorchooser-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kcolorchooser-17.12.3.tar.xz";
+      sha256 = "1yf8bizxd65h9pzai51l7piw5p4rlcl2bmw3qf9s73xii9cxz8yl";
+      name = "kcolorchooser-17.12.3.tar.xz";
     };
   };
   kcontacts = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kcontacts-17.12.2.tar.xz";
-      sha256 = "0hg442jg0rb7fsy67fg44551c02gx3i7znwl6cgr9nzlxj5srhyq";
-      name = "kcontacts-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kcontacts-17.12.3.tar.xz";
+      sha256 = "08gzaznb6nazqcd5v755cs6fvxq4y1ywa7qbff7fb28sbkz6sdjl";
+      name = "kcontacts-17.12.3.tar.xz";
     };
   };
   kcron = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kcron-17.12.2.tar.xz";
-      sha256 = "1h1bkicvfbz7s0n36iw5pilqrv2vfzl3rwqx6r0wa10341sx8wc3";
-      name = "kcron-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kcron-17.12.3.tar.xz";
+      sha256 = "0kdd0kzx26jhwrz9ism9fc5gbf1fh0qsb6h3gmx524r40wzr45bf";
+      name = "kcron-17.12.3.tar.xz";
     };
   };
   kdav = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kdav-17.12.2.tar.xz";
-      sha256 = "1jlw2l6jd2rhf7swl7bwlsphp1xddb0f9xzkpa6dxw4cimfz4r7l";
-      name = "kdav-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kdav-17.12.3.tar.xz";
+      sha256 = "141a2fk3n18554qh8h00dnik33pf4jmvp1z94gbhscgkza1xdlx4";
+      name = "kdav-17.12.3.tar.xz";
     };
   };
   kdebugsettings = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kdebugsettings-17.12.2.tar.xz";
-      sha256 = "1a9yy42x16maj60wh7x19248gp1x4diybj9k2gkmlf7hd8g82m4b";
-      name = "kdebugsettings-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kdebugsettings-17.12.3.tar.xz";
+      sha256 = "0y71ay5b7fly5rbl7fii6glkhmdkrk6fxmyx5ick5jgjgnmzjkdr";
+      name = "kdebugsettings-17.12.3.tar.xz";
     };
   };
   kde-dev-scripts = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kde-dev-scripts-17.12.2.tar.xz";
-      sha256 = "181s9cf1kqx35w9cza40svgzbqvhz48f858r0rxvl6klzm7rrqmn";
-      name = "kde-dev-scripts-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kde-dev-scripts-17.12.3.tar.xz";
+      sha256 = "1mipi7fchmf6rmivlpbncx106axaw9hi9r1kd7ibn5jqz0raa554";
+      name = "kde-dev-scripts-17.12.3.tar.xz";
     };
   };
   kde-dev-utils = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kde-dev-utils-17.12.2.tar.xz";
-      sha256 = "044w9az0jnc7lhlgyiqxsl5lgfzbnrfrdvsr2918idy2niif7cjq";
-      name = "kde-dev-utils-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kde-dev-utils-17.12.3.tar.xz";
+      sha256 = "05a8h9bdg81zlaf1zqk8vdqp1d2lkymdg82ppxvm2sxg00rrzgp6";
+      name = "kde-dev-utils-17.12.3.tar.xz";
     };
   };
   kdeedu-data = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kdeedu-data-17.12.2.tar.xz";
-      sha256 = "1sdldx357ifv4sqwa8yrcjxyricb0kk21gvj9472bi28rcgyxqgv";
-      name = "kdeedu-data-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kdeedu-data-17.12.3.tar.xz";
+      sha256 = "17xdhkaavz1b5f2iqw64b7891qc8l2i3f90zr2byw4j05gfm24wr";
+      name = "kdeedu-data-17.12.3.tar.xz";
     };
   };
   kdegraphics-mobipocket = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kdegraphics-mobipocket-17.12.2.tar.xz";
-      sha256 = "1jx5ir1q12s939m0nndhxwiarfr6r7ma79dy9fn5bbhdjgjqf7fq";
-      name = "kdegraphics-mobipocket-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kdegraphics-mobipocket-17.12.3.tar.xz";
+      sha256 = "16l5s4ha93h7bvb07kx60674i0j1n26c16w8q3drl8jmkmmf2h4j";
+      name = "kdegraphics-mobipocket-17.12.3.tar.xz";
     };
   };
   kdegraphics-thumbnailers = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kdegraphics-thumbnailers-17.12.2.tar.xz";
-      sha256 = "0d6cf2mhblxgnhv432x9rgk5k73fhpa20xajn6nfawxkmpkzngsy";
-      name = "kdegraphics-thumbnailers-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kdegraphics-thumbnailers-17.12.3.tar.xz";
+      sha256 = "1xak3c76bwprmb0anjvw5p620lm9hxyn6dzw2vh1di899b1p60n4";
+      name = "kdegraphics-thumbnailers-17.12.3.tar.xz";
     };
   };
   kdenetwork-filesharing = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kdenetwork-filesharing-17.12.2.tar.xz";
-      sha256 = "1ghdskmc0ynjb1a4qid9vjjcl8nmyqvr5x6aryzz9g1rmm6vv8l5";
-      name = "kdenetwork-filesharing-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kdenetwork-filesharing-17.12.3.tar.xz";
+      sha256 = "0hkvmv0wiyhh4b036sdqx4f69ihxwl4m3mnmwc58va3cj5p32pyh";
+      name = "kdenetwork-filesharing-17.12.3.tar.xz";
     };
   };
   kdenlive = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kdenlive-17.12.2.tar.xz";
-      sha256 = "1l2sv78wwfwrya486sm4iszkm1hsj473a5gpkgay66h4qb968w70";
-      name = "kdenlive-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kdenlive-17.12.3.tar.xz";
+      sha256 = "0gjhiwjh5h727v4lcs3yy526sr4sr563acg9xc54q76hcl1qc7rp";
+      name = "kdenlive-17.12.3.tar.xz";
     };
   };
   kdepim-addons = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kdepim-addons-17.12.2.tar.xz";
-      sha256 = "185qargpzlmphq5afzvw0pcmas8ska2cnnbv5rpicmg8q01ixnm7";
-      name = "kdepim-addons-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kdepim-addons-17.12.3.tar.xz";
+      sha256 = "13562gn2jc049pfkq8kw2w5lnmh6s6z6r57p3rpjr880izw9707h";
+      name = "kdepim-addons-17.12.3.tar.xz";
     };
   };
   kdepim-apps-libs = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kdepim-apps-libs-17.12.2.tar.xz";
-      sha256 = "0zn620bv551lgl6sx9g4f8ncpv5hs231jbrzkiwqw6y74xw5qq7g";
-      name = "kdepim-apps-libs-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kdepim-apps-libs-17.12.3.tar.xz";
+      sha256 = "178iq1kjynid2hfnlh5pbcq2z46rl55xfvvsnpbwbk80j81mpj24";
+      name = "kdepim-apps-libs-17.12.3.tar.xz";
     };
   };
   kdepim-runtime = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kdepim-runtime-17.12.2.tar.xz";
-      sha256 = "1z11ac0l4n80nybsnfk716c88ah2l7g1fsz5xmzvv6pcmhm2q94j";
-      name = "kdepim-runtime-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kdepim-runtime-17.12.3.tar.xz";
+      sha256 = "1r30wp4n020hh83znv6889w3vm0flyn31b92pmrgvsxm8yzphgwn";
+      name = "kdepim-runtime-17.12.3.tar.xz";
     };
   };
   kdesdk-kioslaves = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kdesdk-kioslaves-17.12.2.tar.xz";
-      sha256 = "09r7iqqvil2sjfzdnq64075gmm7wxd705j00qxfch99ja3nf4961";
-      name = "kdesdk-kioslaves-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kdesdk-kioslaves-17.12.3.tar.xz";
+      sha256 = "022yp5glg3dxfm5lgv4095dimw9nwbdh559y2vvvlx06pyi0b1qa";
+      name = "kdesdk-kioslaves-17.12.3.tar.xz";
     };
   };
   kdesdk-thumbnailers = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kdesdk-thumbnailers-17.12.2.tar.xz";
-      sha256 = "1j8gqwcs65cfpaqvny29yqzsgjbjmxrafnf4ggc1bjaz2p63blni";
-      name = "kdesdk-thumbnailers-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kdesdk-thumbnailers-17.12.3.tar.xz";
+      sha256 = "0qndm22x7f4w8nmai4zxrxmxkism25xh7cf8vfsihlpqj1qs7wci";
+      name = "kdesdk-thumbnailers-17.12.3.tar.xz";
     };
   };
   kdf = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kdf-17.12.2.tar.xz";
-      sha256 = "07379lagrl7hhh05dixd4ldqiy9pwmw0yai8sgcbfi3kgcns9c6a";
-      name = "kdf-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kdf-17.12.3.tar.xz";
+      sha256 = "18q0581jaqc6w2cbdq1crxgrn97p89ah205mv253pd58w9qc4xlp";
+      name = "kdf-17.12.3.tar.xz";
     };
   };
   kdialog = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kdialog-17.12.2.tar.xz";
-      sha256 = "1pwicn5jsg3jwqqkrjhaxbcd9762k9fj4w51ahglby04c4cca38a";
-      name = "kdialog-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kdialog-17.12.3.tar.xz";
+      sha256 = "1smz7q09ss963c9snsvb6biimn1d2c9yyx9lhxszfl9155cgd9x4";
+      name = "kdialog-17.12.3.tar.xz";
     };
   };
   kdiamond = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kdiamond-17.12.2.tar.xz";
-      sha256 = "03m91x6rgh3wd8mim41d08x1c06ndg9vkciyl6nkj4iyflwwy0rp";
-      name = "kdiamond-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kdiamond-17.12.3.tar.xz";
+      sha256 = "1k4mlajxwpbn4y6dlkz5psxy6iqfjj5qif7i5sfn0c3gsgm76pxc";
+      name = "kdiamond-17.12.3.tar.xz";
     };
   };
   keditbookmarks = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/keditbookmarks-17.12.2.tar.xz";
-      sha256 = "1aqqd2lvdbqhnzz28axv9j84s7i7cxrs39zyaia7cwzbbgymkal1";
-      name = "keditbookmarks-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/keditbookmarks-17.12.3.tar.xz";
+      sha256 = "066ia9n648p53g4451zfn5nram821rlbjlnfi9ny9p0j4dl6wwya";
+      name = "keditbookmarks-17.12.3.tar.xz";
     };
   };
   kfind = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kfind-17.12.2.tar.xz";
-      sha256 = "0zxm5fjf6xzl871gjbs5nzp6h5j4qm47ygfq644jqbi9f3z2in74";
-      name = "kfind-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kfind-17.12.3.tar.xz";
+      sha256 = "1xf1sw422sg3ki1phy097lwma14drdnjbgc1m5rap3dg0za25c9s";
+      name = "kfind-17.12.3.tar.xz";
     };
   };
   kfloppy = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kfloppy-17.12.2.tar.xz";
-      sha256 = "0s25jbngh6zipxm16kffvwyd1ircnf0xjsh20lm08i9kh4jcicgq";
-      name = "kfloppy-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kfloppy-17.12.3.tar.xz";
+      sha256 = "0gjp2l5jm16v1v4xwzaandplabz6rjdiimcf3b0r5d9prbiwry3p";
+      name = "kfloppy-17.12.3.tar.xz";
     };
   };
   kfourinline = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kfourinline-17.12.2.tar.xz";
-      sha256 = "0cqlqab9sazhvvsdyvwzdzrjccvlbxwq2p1n6ki8g8i6707mx3hc";
-      name = "kfourinline-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kfourinline-17.12.3.tar.xz";
+      sha256 = "1l10fj1vhxj1d647mcxp7a2bbilrhs3sf7cwkr57vavfzsp7diyw";
+      name = "kfourinline-17.12.3.tar.xz";
     };
   };
   kgeography = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kgeography-17.12.2.tar.xz";
-      sha256 = "1mf5zr4cwnnrvsad4mq0mr6p3v38payajagc2whfl1lmcg82f2wl";
-      name = "kgeography-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kgeography-17.12.3.tar.xz";
+      sha256 = "1dl3k4zlchpdhvjb459wb44iyq30ngki6x198pyc23j15mjfdrih";
+      name = "kgeography-17.12.3.tar.xz";
     };
   };
   kget = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kget-17.12.2.tar.xz";
-      sha256 = "1fm5yzxxg7lihzgnl7207gfn9gz33ydk1axf8lmdhwwld14q25f9";
-      name = "kget-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kget-17.12.3.tar.xz";
+      sha256 = "1kaxvid76s8rx07hza56s83l785dxi5whhkqzkv132z2dm01yzww";
+      name = "kget-17.12.3.tar.xz";
     };
   };
   kgoldrunner = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kgoldrunner-17.12.2.tar.xz";
-      sha256 = "0dddzimh41xm6fvz1spl58gwff9vlx12h52kbfxdb2wz60zkg8wb";
-      name = "kgoldrunner-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kgoldrunner-17.12.3.tar.xz";
+      sha256 = "1ihj48kvr9xpw4rajiyq3kng1dn6l60dmii5pnyjmxlfs08apayx";
+      name = "kgoldrunner-17.12.3.tar.xz";
     };
   };
   kgpg = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kgpg-17.12.2.tar.xz";
-      sha256 = "0r604acqm255xqjqg4islk30g62f8p9mj6haqp0iyw82239hbkp0";
-      name = "kgpg-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kgpg-17.12.3.tar.xz";
+      sha256 = "19yacv7l6kynyznb8ixn3697h04mhh4fhx02n4frdy9pnzv94hyp";
+      name = "kgpg-17.12.3.tar.xz";
     };
   };
   khangman = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/khangman-17.12.2.tar.xz";
-      sha256 = "1wk0k4lbskgxrbv91032yg6n64ghir25128pphsy61m4v00jysg3";
-      name = "khangman-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/khangman-17.12.3.tar.xz";
+      sha256 = "0hnm499qs1l2yzfqxhmkyc5lp0qb5j29h1knap1vmv4qy0qnmnjk";
+      name = "khangman-17.12.3.tar.xz";
     };
   };
   khelpcenter = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/khelpcenter-17.12.2.tar.xz";
-      sha256 = "0871xxril7dllks46f4a31dkiwmgjc8ajm2jpn5hfm3g2cbawlsd";
-      name = "khelpcenter-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/khelpcenter-17.12.3.tar.xz";
+      sha256 = "0z5hrwqsi9ifraivz59nbq247x481hx90wiyfbls9lwv56y1zi7n";
+      name = "khelpcenter-17.12.3.tar.xz";
     };
   };
   kholidays = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kholidays-17.12.2.tar.xz";
-      sha256 = "0mn2bmjiy5k99g4yv0n61jklyp1105kmnvkf4ay28ha55zy95bbk";
-      name = "kholidays-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kholidays-17.12.3.tar.xz";
+      sha256 = "0w886443zzvpwqznnn7ymw5bxzdnigfz9j45qrl1qvdd6q8710di";
+      name = "kholidays-17.12.3.tar.xz";
     };
   };
   kidentitymanagement = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kidentitymanagement-17.12.2.tar.xz";
-      sha256 = "1s5xjgbp7vdww8k59s8h2mypi1d94n4kkphkgiybdq2gxpfq73pb";
-      name = "kidentitymanagement-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kidentitymanagement-17.12.3.tar.xz";
+      sha256 = "0my4r8k8gadkda3z1myarrq4x72qz6wxsy6lj9rzkj4y549bm93y";
+      name = "kidentitymanagement-17.12.3.tar.xz";
     };
   };
   kig = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kig-17.12.2.tar.xz";
-      sha256 = "1cphrji1l3c32j8wdr88y40fzkr9s20q79hlk4c4rhzkym7jgzhp";
-      name = "kig-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kig-17.12.3.tar.xz";
+      sha256 = "0liv94y90bfd5pi003bd3jryc1dal5mwxhqy94c2n3ay8yz8kxid";
+      name = "kig-17.12.3.tar.xz";
     };
   };
   kigo = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kigo-17.12.2.tar.xz";
-      sha256 = "0xz8nmhgx8iadwmqkm6469vw8vn9n74mk2fhmciqn8xn66r11g9d";
-      name = "kigo-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kigo-17.12.3.tar.xz";
+      sha256 = "1z01w5zsbwn8h0mgr5liqagsmlppqclkjs4z5rdys75sxm142fzh";
+      name = "kigo-17.12.3.tar.xz";
     };
   };
   killbots = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/killbots-17.12.2.tar.xz";
-      sha256 = "140v8mwbkhv9fkqi0781mrk51fk00q5p1ad3p1rqgmhy0pzfvkg4";
-      name = "killbots-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/killbots-17.12.3.tar.xz";
+      sha256 = "14xgh9qhagq9c01xbv0n4g5b3q9r6qr0dsc5ilindr66psspx7an";
+      name = "killbots-17.12.3.tar.xz";
     };
   };
   kimagemapeditor = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kimagemapeditor-17.12.2.tar.xz";
-      sha256 = "16wyb80al1vp3macr2lrkh0f1l42jzm126mv2l5gbhd5qiwj6yag";
-      name = "kimagemapeditor-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kimagemapeditor-17.12.3.tar.xz";
+      sha256 = "1s9929wb3lclbn85rk3zd0nai64mrwgqdqnkw2dys98snq12r3hn";
+      name = "kimagemapeditor-17.12.3.tar.xz";
     };
   };
   kimap = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kimap-17.12.2.tar.xz";
-      sha256 = "15nbnjckmqa4kka012lvaziimgnr6vs5k361sjhdykvrvk4fhz13";
-      name = "kimap-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kimap-17.12.3.tar.xz";
+      sha256 = "1prilnf01s73ml7542s7qh0ki9gqvgq7xqzxq2mz17k4d3irdvxw";
+      name = "kimap-17.12.3.tar.xz";
     };
   };
   kio-extras = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kio-extras-17.12.2.tar.xz";
-      sha256 = "0vc8wwx9cqs48hn1hf49fmz99xa4c8vhcqq58wmpq3bg62vfipyp";
-      name = "kio-extras-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kio-extras-17.12.3.tar.xz";
+      sha256 = "1ifi09hv5aqx62x1cjnsxxh7xji9m0mmk3gfn43la9vw4rhxzlks";
+      name = "kio-extras-17.12.3.tar.xz";
     };
   };
   kiriki = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kiriki-17.12.2.tar.xz";
-      sha256 = "1a427gja7y2s37a29jl1n4bx1xa2piqm7wwv7g7agaxm5j15qvx8";
-      name = "kiriki-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kiriki-17.12.3.tar.xz";
+      sha256 = "1zl8mq1ya3x67y1pj1ir98v5lbxwccwyni8i02wc7mbgmxbk6p9q";
+      name = "kiriki-17.12.3.tar.xz";
     };
   };
   kiten = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kiten-17.12.2.tar.xz";
-      sha256 = "0bcb65pcs3xv5pmr78zlxcbicxknvbf30h83i4f4qjxrq6iw8sf4";
-      name = "kiten-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kiten-17.12.3.tar.xz";
+      sha256 = "1p1s20ks3r2zfd7wig1j2lbxbf3ch9gbykw2cgadip4nyn9nyll5";
+      name = "kiten-17.12.3.tar.xz";
     };
   };
   kjumpingcube = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kjumpingcube-17.12.2.tar.xz";
-      sha256 = "0d2gdvjd0fxxdnpxfplw9gp69b1qx35w165srd79qcx17c2r7cdv";
-      name = "kjumpingcube-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kjumpingcube-17.12.3.tar.xz";
+      sha256 = "07fakw1nq3bickj05cvb39wyb02fpfph0ia1wfm8wf43rd34c76l";
+      name = "kjumpingcube-17.12.3.tar.xz";
     };
   };
   kldap = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kldap-17.12.2.tar.xz";
-      sha256 = "177xg8ng4636gnppf4jf0m2amadlrz0n9bdmc7f6xnijchmda2p4";
-      name = "kldap-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kldap-17.12.3.tar.xz";
+      sha256 = "02adfzjlvxjff33cpyihsf9z9zm7nvgmnipg9dmkpc0cwl25a8jy";
+      name = "kldap-17.12.3.tar.xz";
     };
   };
   kleopatra = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kleopatra-17.12.2.tar.xz";
-      sha256 = "04c1w1la826dwjam19m12jg8l5c8641l7ad6injrbig1kja819v4";
-      name = "kleopatra-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kleopatra-17.12.3.tar.xz";
+      sha256 = "1417j1jh7bs0020laaimpwmmng508k85kp24k923ad2v65i51agd";
+      name = "kleopatra-17.12.3.tar.xz";
     };
   };
   klettres = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/klettres-17.12.2.tar.xz";
-      sha256 = "16pi5r4s67j6pq5jjbyap7jrxxx5wrg7dr77391yk06s955rcfr1";
-      name = "klettres-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/klettres-17.12.3.tar.xz";
+      sha256 = "0npp2dkwi3g36scipdra5xj5lf0xga3l8h8pk6isx7l86xsv3ds0";
+      name = "klettres-17.12.3.tar.xz";
     };
   };
   klickety = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/klickety-17.12.2.tar.xz";
-      sha256 = "0rwmswrmwjizv9vw3bivh75wisy09icbykvwsi43zsapar9hs89l";
-      name = "klickety-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/klickety-17.12.3.tar.xz";
+      sha256 = "0f8gxqcfanxbqjqrq1j598nbis3djxxps61hdl1wd9xki1a86xy8";
+      name = "klickety-17.12.3.tar.xz";
     };
   };
   klines = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/klines-17.12.2.tar.xz";
-      sha256 = "0nl5w65m7c46hjh0hvd76x7zf5c9qlqxqn8b96dzgrab6s9f96wf";
-      name = "klines-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/klines-17.12.3.tar.xz";
+      sha256 = "0kp7c8qxkwgf13cwa7x5wik5w7snq6830zpah6lsk4ls5jw5mln0";
+      name = "klines-17.12.3.tar.xz";
     };
   };
   kmag = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kmag-17.12.2.tar.xz";
-      sha256 = "0yxh4y5l6l528j2nz4wl0w8zmydayrgh1aracy1lymv65ww8qax2";
-      name = "kmag-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kmag-17.12.3.tar.xz";
+      sha256 = "0n9dxf5mcz6rlfr91r6yd7sxfmshgdc8znxfbncd1a9j523vba3w";
+      name = "kmag-17.12.3.tar.xz";
     };
   };
   kmahjongg = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kmahjongg-17.12.2.tar.xz";
-      sha256 = "06skr41bs29q19dm6j79h0x1l2szbr6gz9kn6s47s23wmyjkqdqr";
-      name = "kmahjongg-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kmahjongg-17.12.3.tar.xz";
+      sha256 = "0ai6jlny4fi69psiizix5adz3kga4plf70y322a3ybl8g9c44m1a";
+      name = "kmahjongg-17.12.3.tar.xz";
     };
   };
   kmail = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kmail-17.12.2.tar.xz";
-      sha256 = "0kanmbb09x6cyswq7ws6cw7j117lqwqp3hvs9hipx7nyr38mhrlc";
-      name = "kmail-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kmail-17.12.3.tar.xz";
+      sha256 = "02hjrk1c4mk3jrmyhn4ppar6vdlg51j79fqcjzfs1d8s4w0swwbs";
+      name = "kmail-17.12.3.tar.xz";
     };
   };
   kmail-account-wizard = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kmail-account-wizard-17.12.2.tar.xz";
-      sha256 = "1l7szmbhxrqj93cqvpaywgyql319n1wmw8acnca1aym9l79pns0s";
-      name = "kmail-account-wizard-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kmail-account-wizard-17.12.3.tar.xz";
+      sha256 = "1qdwqd763k5dq8mmwibnvgqjb7l6br9dqwxfsi7q8bhjxipijvdx";
+      name = "kmail-account-wizard-17.12.3.tar.xz";
     };
   };
   kmailtransport = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kmailtransport-17.12.2.tar.xz";
-      sha256 = "1prrw61vz52wp8yb587xz1kd5rm6s6dry8i9zcs66aha5g7r0wj8";
-      name = "kmailtransport-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kmailtransport-17.12.3.tar.xz";
+      sha256 = "131yy2xa61fi2dmrb3qapf589lf4s9v2rkk2js0bi1827yg097f0";
+      name = "kmailtransport-17.12.3.tar.xz";
     };
   };
   kmbox = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kmbox-17.12.2.tar.xz";
-      sha256 = "0q6217br3cpdwns6hiw5klnvkwwx7sd8gbl003clf4wkfnxpgqsb";
-      name = "kmbox-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kmbox-17.12.3.tar.xz";
+      sha256 = "15x9cdwcbwrjaj3rzphwmpayhy45j45pwj88sz0drqz3mwc55jgm";
+      name = "kmbox-17.12.3.tar.xz";
     };
   };
   kmime = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kmime-17.12.2.tar.xz";
-      sha256 = "097xzsd7lld01iz1nziy8b9vv97xaz6vsl52d5809h0kxfpixw99";
-      name = "kmime-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kmime-17.12.3.tar.xz";
+      sha256 = "0251szs8dcpnwhqk72c211mp7h0xhn0f8z21mdm6k94ij43da9cm";
+      name = "kmime-17.12.3.tar.xz";
     };
   };
   kmines = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kmines-17.12.2.tar.xz";
-      sha256 = "00apcafaxh18rxk8d3r333mzjd0b6f7946kp6ffr1ps9c93mm3ab";
-      name = "kmines-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kmines-17.12.3.tar.xz";
+      sha256 = "0r9rs97s92z5854xdampgp6igmppzp3mhaw9rscrdwvvq4xpsll9";
+      name = "kmines-17.12.3.tar.xz";
     };
   };
   kmix = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kmix-17.12.2.tar.xz";
-      sha256 = "096dbmywdhgcjzvm473sm0vjrmgfmb19cjx82066ws8pvn9fybdj";
-      name = "kmix-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kmix-17.12.3.tar.xz";
+      sha256 = "12fwimqr21hgwqscihaxwh1f39xm8k21f95f7b3gwwa5lbj0l9mp";
+      name = "kmix-17.12.3.tar.xz";
     };
   };
   kmousetool = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kmousetool-17.12.2.tar.xz";
-      sha256 = "08kv4j6r18wrl7n4j7apffyj52w77l8rkksvmdzlfg2nk87vaafj";
-      name = "kmousetool-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kmousetool-17.12.3.tar.xz";
+      sha256 = "0gbvzywnxbcb4iw7pgf70ljz0qd8xl8825srpp3fj7lv0kh9ni9z";
+      name = "kmousetool-17.12.3.tar.xz";
     };
   };
   kmouth = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kmouth-17.12.2.tar.xz";
-      sha256 = "12kdrwz3mxwz9y4srq5jjrrn0wg3905qhg1qbj8p583gk1n03g20";
-      name = "kmouth-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kmouth-17.12.3.tar.xz";
+      sha256 = "012lpy904n2isj8msxivgk0ssy56qajgjxn1hz2jy9jjyyi77f2n";
+      name = "kmouth-17.12.3.tar.xz";
     };
   };
   kmplot = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kmplot-17.12.2.tar.xz";
-      sha256 = "1pws8lajpjm4nfichd0949lmsn975ivxh2b001gsif3vvadmp48l";
-      name = "kmplot-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kmplot-17.12.3.tar.xz";
+      sha256 = "0plblgv243ymmcbpb8rs4clilwlsggn7219yqrh064lzbfblhxa9";
+      name = "kmplot-17.12.3.tar.xz";
     };
   };
   knavalbattle = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/knavalbattle-17.12.2.tar.xz";
-      sha256 = "0iil9kw7xhjq8ll93hcvcm9apigrys89nj7j2bpvs00208dcyv9c";
-      name = "knavalbattle-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/knavalbattle-17.12.3.tar.xz";
+      sha256 = "07z0h0h6fmd99x0kqjlwlkpxndypa2svdvmjv8vmwcdp45hik90f";
+      name = "knavalbattle-17.12.3.tar.xz";
     };
   };
   knetwalk = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/knetwalk-17.12.2.tar.xz";
-      sha256 = "0l98h7grhgddawbn9apm0zifxpdssdkp29cdrcyv025h72dhj5ih";
-      name = "knetwalk-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/knetwalk-17.12.3.tar.xz";
+      sha256 = "1iz819dsrdf5fck6qx0s4d0k7sz58pbxp5kk4aczszmvpnn2197k";
+      name = "knetwalk-17.12.3.tar.xz";
     };
   };
   knotes = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/knotes-17.12.2.tar.xz";
-      sha256 = "009mia832fxll0a5kl5n16zsy54jvvm9gr2zp4qy5xmimci48llj";
-      name = "knotes-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/knotes-17.12.3.tar.xz";
+      sha256 = "1iy6rmhlh7jgryxrwqrqaqaajfimdlqcw0x3yizbqalpw1k6f8m3";
+      name = "knotes-17.12.3.tar.xz";
     };
   };
   kolf = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kolf-17.12.2.tar.xz";
-      sha256 = "12zxqa88jsg4zf68ndw32gw7l6sjjzq6pkkj0a55wcwsdph59666";
-      name = "kolf-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kolf-17.12.3.tar.xz";
+      sha256 = "1zc1i36a302rpvv2lbfv8q8glh1brjk95mjkwxbplv8gmdbd71cj";
+      name = "kolf-17.12.3.tar.xz";
     };
   };
   kollision = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kollision-17.12.2.tar.xz";
-      sha256 = "1lzc0gih4lcw5dbrkkz0411al1xsjnqi1xzdwa2cijlka1py028g";
-      name = "kollision-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kollision-17.12.3.tar.xz";
+      sha256 = "019ibb9190k6qf07kgjy88lzyawvbh9hb7df96l96ilgssxxhnvz";
+      name = "kollision-17.12.3.tar.xz";
     };
   };
   kolourpaint = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kolourpaint-17.12.2.tar.xz";
-      sha256 = "0jd2r9jv0g1wrqvx7dwniv8an4miv3wjl3ym4rkczpdsjh3smc7c";
-      name = "kolourpaint-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kolourpaint-17.12.3.tar.xz";
+      sha256 = "15vd3ykixfkbwg3dk4plfpf72k2cknwpk6ip7rnw4h41r0rg838w";
+      name = "kolourpaint-17.12.3.tar.xz";
     };
   };
   kompare = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kompare-17.12.2.tar.xz";
-      sha256 = "0cww2zhvf97zya2wpmc9hyk1vp3za8r8xvxc0l4whcm33w0fwgc9";
-      name = "kompare-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kompare-17.12.3.tar.xz";
+      sha256 = "0kfrxwx2dnvbvy7ykm3dxm0873g2136jllakav8pxgf75z4iwryl";
+      name = "kompare-17.12.3.tar.xz";
     };
   };
   konqueror = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/konqueror-17.12.2.tar.xz";
-      sha256 = "08yyxkrc4rx8y166p8r871rs3b6gxq6fkrnfbg9j4n3387rpg64f";
-      name = "konqueror-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/konqueror-17.12.3.tar.xz";
+      sha256 = "0dhm22p4mx244pd2wnl7xxhkh4yc3dsl126ndmajj62i0si0y0hw";
+      name = "konqueror-17.12.3.tar.xz";
     };
   };
   konquest = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/konquest-17.12.2.tar.xz";
-      sha256 = "18c30b1z0jalkwcgdg6w5y4nl1j2iapp7588qk1zip3nfvgbdpky";
-      name = "konquest-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/konquest-17.12.3.tar.xz";
+      sha256 = "1jdwa4b9224x2m3r3v3sgk7796kvlayf7gjpsdvby0xggpihsqli";
+      name = "konquest-17.12.3.tar.xz";
     };
   };
   konsole = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/konsole-17.12.2.tar.xz";
-      sha256 = "1dbsmfqw0d1f0nhmhz61rhy6spcfvv54j7v05axjhh870wyfmrpc";
-      name = "konsole-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/konsole-17.12.3.tar.xz";
+      sha256 = "1g3c7wl10n5qhs5bnm1d92qsv7jh8gn3d1l0wivj29cn9b0rf2gs";
+      name = "konsole-17.12.3.tar.xz";
     };
   };
   kontact = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kontact-17.12.2.tar.xz";
-      sha256 = "0qn1iha7g6i85va7bvcagxjx3qk0g9lpaqikn2fvlz22sgv45a2q";
-      name = "kontact-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kontact-17.12.3.tar.xz";
+      sha256 = "0gik5h84mx3izdlml0sl1y68n7h9w8196h2l09lxnf10mmya3yas";
+      name = "kontact-17.12.3.tar.xz";
     };
   };
   kontactinterface = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kontactinterface-17.12.2.tar.xz";
-      sha256 = "044dys074cgahspx9h3bz8a807r5975b25pwjxwimr9vg4ln37d3";
-      name = "kontactinterface-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kontactinterface-17.12.3.tar.xz";
+      sha256 = "15nigzawl5rzd0s6l9xqv3sldah3wc9m6zd3avbsb3ydmi0f1hks";
+      name = "kontactinterface-17.12.3.tar.xz";
     };
   };
   korganizer = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/korganizer-17.12.2.tar.xz";
-      sha256 = "0ijw3dq0c21c11a4bhdpgd1ailamrhknim4bs4ix1fgriycwpz31";
-      name = "korganizer-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/korganizer-17.12.3.tar.xz";
+      sha256 = "0gplnra98ivhsqcrdy44ghak0h9x0fn481irqh2y11f8kjaf6z40";
+      name = "korganizer-17.12.3.tar.xz";
     };
   };
   kpat = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kpat-17.12.2.tar.xz";
-      sha256 = "1yy81rv29wfym74709hrz67ms6af408ni5dbnpwjniz86fx2jnxs";
-      name = "kpat-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kpat-17.12.3.tar.xz";
+      sha256 = "0nkqfnxrnik4ma7xrskqjsmcmbmxszyn9ckf3rql338d485h8awh";
+      name = "kpat-17.12.3.tar.xz";
     };
   };
   kpimtextedit = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kpimtextedit-17.12.2.tar.xz";
-      sha256 = "1bj3ccvccwg1x5px080w7c3adkjsl1z886bxdimdf84pdxj2fm65";
-      name = "kpimtextedit-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kpimtextedit-17.12.3.tar.xz";
+      sha256 = "0b6f1hsh3q183lkinaz9f94akaf1z2g1pb7sm83f6c4yjn9qfg9c";
+      name = "kpimtextedit-17.12.3.tar.xz";
     };
   };
   kqtquickcharts = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kqtquickcharts-17.12.2.tar.xz";
-      sha256 = "05xsvc4ppncpjj0w5j7m5075ydxjnln8kjfd002c1m2a755brv5j";
-      name = "kqtquickcharts-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kqtquickcharts-17.12.3.tar.xz";
+      sha256 = "0gigdramz5kmjyzd7yff8j0c3sisblqy0xjc301hkhh7ss93r2d0";
+      name = "kqtquickcharts-17.12.3.tar.xz";
     };
   };
   krdc = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/krdc-17.12.2.tar.xz";
-      sha256 = "0m9ij015cs8qb1sbiysy27jrz070x9dkrbkrsqy3a2n9dkv7jjz0";
-      name = "krdc-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/krdc-17.12.3.tar.xz";
+      sha256 = "1flk8pvnr4kf273xzfxb7pcsam3mb056pbvmva1k864kbb6bzdps";
+      name = "krdc-17.12.3.tar.xz";
     };
   };
   kreversi = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kreversi-17.12.2.tar.xz";
-      sha256 = "1qx0lv85pn98wbaskk0ihg3zywwfj9p0l30jjq67my254qlbaqpk";
-      name = "kreversi-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kreversi-17.12.3.tar.xz";
+      sha256 = "1hmh80dpg25ay06dmd1g6a0a7zcd2di99s989msi85wzgk6vh0fg";
+      name = "kreversi-17.12.3.tar.xz";
     };
   };
   krfb = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/krfb-17.12.2.tar.xz";
-      sha256 = "1ggi0rmb0jx9pkqcvml5q6gxzzng5mdpyj8m9knknhmdx0y19k1b";
-      name = "krfb-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/krfb-17.12.3.tar.xz";
+      sha256 = "0anfcb1xsr638k3d3ljy9khbxf7v9sj5vbksyhfjrzsifj4m2skv";
+      name = "krfb-17.12.3.tar.xz";
     };
   };
   kross-interpreters = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kross-interpreters-17.12.2.tar.xz";
-      sha256 = "05fd5cbgh81qmffbkmn3zanlrdjdqcgyafcw4jxsfvqb556wdvzv";
-      name = "kross-interpreters-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kross-interpreters-17.12.3.tar.xz";
+      sha256 = "0v3ly21lc8riv4by87kjilab5zqd6wvwl92a983ybd5bivl1a98s";
+      name = "kross-interpreters-17.12.3.tar.xz";
     };
   };
   kruler = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kruler-17.12.2.tar.xz";
-      sha256 = "1j39vrd98p3bxa5kggmg3ccx4wrn8hvd100p0njkd54wagm9r2m7";
-      name = "kruler-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kruler-17.12.3.tar.xz";
+      sha256 = "0r12vwg9jsvg8bldrfdnmcygn6rkx9dp8r0948jhf662qs7a0jsa";
+      name = "kruler-17.12.3.tar.xz";
     };
   };
   kshisen = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kshisen-17.12.2.tar.xz";
-      sha256 = "02ihwa8zhaig97z14l3jx6c7swsm8aq5107n41h0z0lzf7sir47g";
-      name = "kshisen-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kshisen-17.12.3.tar.xz";
+      sha256 = "1an28mxgc1ic6acj3r59q9nnmq267fy6k48xzdxqdxhivs74bjx0";
+      name = "kshisen-17.12.3.tar.xz";
     };
   };
   ksirk = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/ksirk-17.12.2.tar.xz";
-      sha256 = "049za390509m4gsmjybhidbq3p2qss47whwfmzcj6lpcxf0fsrja";
-      name = "ksirk-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/ksirk-17.12.3.tar.xz";
+      sha256 = "07y300qk3jls8cscf0xxgq52gxmc4j5rkn2pxhxymm0yr07ip1xz";
+      name = "ksirk-17.12.3.tar.xz";
     };
   };
   ksmtp = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/ksmtp-17.12.2.tar.xz";
-      sha256 = "0g6sjn5vkkwcdqjhpws86l5dhwilxrqqif50dndc2fyiak6x796n";
-      name = "ksmtp-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/ksmtp-17.12.3.tar.xz";
+      sha256 = "1dws2jrizixi108mw1lgb7jz6dgs5xvvmj16bkf9x54rhvjb7r9b";
+      name = "ksmtp-17.12.3.tar.xz";
     };
   };
   ksnakeduel = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/ksnakeduel-17.12.2.tar.xz";
-      sha256 = "1gqgw47im2sifxskhbgmg5rr6clvswcz81sinqffmjmpwgrabif7";
-      name = "ksnakeduel-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/ksnakeduel-17.12.3.tar.xz";
+      sha256 = "0w4nw1pyznn4dkcqgf2d5c2r7z5xg5gc97whw1i67wqq9sbi98hy";
+      name = "ksnakeduel-17.12.3.tar.xz";
     };
   };
   kspaceduel = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kspaceduel-17.12.2.tar.xz";
-      sha256 = "13636n466yna04wga7f206gw1scnjr3w3x59hwi4mdr0sghz9a7i";
-      name = "kspaceduel-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kspaceduel-17.12.3.tar.xz";
+      sha256 = "13pqdb3f0zjnv71y93kha3wkq9kivl8g01sa5g9ydjmnxahzhqc6";
+      name = "kspaceduel-17.12.3.tar.xz";
     };
   };
   ksquares = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/ksquares-17.12.2.tar.xz";
-      sha256 = "1csw9kns4b258k1hwcshw01bxbzfa1kclbd4w5fail1qp5xs7x7d";
-      name = "ksquares-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/ksquares-17.12.3.tar.xz";
+      sha256 = "19cbmc2mnljlndijb11k9l67q2cmdd5yjsjwv61rawq25xwfh667";
+      name = "ksquares-17.12.3.tar.xz";
     };
   };
   ksudoku = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/ksudoku-17.12.2.tar.xz";
-      sha256 = "0rwgzg0i8s4b7af2dhzccaklbg3rj0khyjsiawijw66p9gs9cczy";
-      name = "ksudoku-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/ksudoku-17.12.3.tar.xz";
+      sha256 = "0c335klnzq4bf91c2iib3iqhx24nf264p86mypk2as2mbcr02j9n";
+      name = "ksudoku-17.12.3.tar.xz";
     };
   };
   ksystemlog = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/ksystemlog-17.12.2.tar.xz";
-      sha256 = "1aw1m1kv3si3qqzhs5mdynmf2b8s2dpsjnb7h0c1l39kq7mbgc9i";
-      name = "ksystemlog-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/ksystemlog-17.12.3.tar.xz";
+      sha256 = "0lnjdiwq3xlqi2lw0p9vj6fbqzmmqf0y6aivyxb7lbrjgjvh64lr";
+      name = "ksystemlog-17.12.3.tar.xz";
     };
   };
   kteatime = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kteatime-17.12.2.tar.xz";
-      sha256 = "13p1v7ic64rfff7md7f33xv9pl89sgjig35q78q31h5q42k6qzv9";
-      name = "kteatime-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kteatime-17.12.3.tar.xz";
+      sha256 = "0f7cf0p7cnmw6mpc3135wk9l2j63yfd2fz06vngnl0zdysf4iwfz";
+      name = "kteatime-17.12.3.tar.xz";
     };
   };
   ktimer = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/ktimer-17.12.2.tar.xz";
-      sha256 = "1263bsqz23064v7qnrz51nbbckld3d2vz80cm6z43vcis236bvh2";
-      name = "ktimer-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/ktimer-17.12.3.tar.xz";
+      sha256 = "1ghh3433wai87ifspvsvmjvamzminf9i73vbpf61ph5qgahx804x";
+      name = "ktimer-17.12.3.tar.xz";
     };
   };
   ktnef = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/ktnef-17.12.2.tar.xz";
-      sha256 = "05cj5lghqj8js0bd14w6kbpl29wslyh36yn57sdf5dfbgpnn9a7v";
-      name = "ktnef-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/ktnef-17.12.3.tar.xz";
+      sha256 = "13irgbcq6g363n65i92c2ciw35rxmq1x5hdlrdbidp718n44n84n";
+      name = "ktnef-17.12.3.tar.xz";
     };
   };
   ktouch = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/ktouch-17.12.2.tar.xz";
-      sha256 = "1jqc0i6n70vjy6ipgv4swnd8xp404d8frax6nfd4rv3gmn68l5q4";
-      name = "ktouch-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/ktouch-17.12.3.tar.xz";
+      sha256 = "04frgq9lyk51p66lv48pgk8b4f4jxh73fpr907dnwbsyqkg6l795";
+      name = "ktouch-17.12.3.tar.xz";
     };
   };
   ktp-accounts-kcm = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/ktp-accounts-kcm-17.12.2.tar.xz";
-      sha256 = "1qfq2sg2pzv2gkr87yb3r5j0xy0f1j56cxys8c1zijpglfy6a41z";
-      name = "ktp-accounts-kcm-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/ktp-accounts-kcm-17.12.3.tar.xz";
+      sha256 = "0fi3065yq38pn2x7r5a0fynbq7xyklbzvlp4gwr4bhg41fqm74hm";
+      name = "ktp-accounts-kcm-17.12.3.tar.xz";
     };
   };
   ktp-approver = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/ktp-approver-17.12.2.tar.xz";
-      sha256 = "0jhzazj42qigdbzjidpnkqlsndv3ias80ik033hzks6m22c20bz6";
-      name = "ktp-approver-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/ktp-approver-17.12.3.tar.xz";
+      sha256 = "06x1ycp5biapalf5yk0lh9wwda1mx5a4ssv1p3q9kb7f7v1i8wkp";
+      name = "ktp-approver-17.12.3.tar.xz";
     };
   };
   ktp-auth-handler = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/ktp-auth-handler-17.12.2.tar.xz";
-      sha256 = "0h81j79285k872wfyflabk6j4s3y7fi0nv41c9n6rnsdv91yvwpk";
-      name = "ktp-auth-handler-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/ktp-auth-handler-17.12.3.tar.xz";
+      sha256 = "03vha3rf7989wi47hn004g4m1lgi236in395yl4f2bl2h0qq1g21";
+      name = "ktp-auth-handler-17.12.3.tar.xz";
     };
   };
   ktp-call-ui = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/ktp-call-ui-17.12.2.tar.xz";
-      sha256 = "1nh6a7gf3qp3vgw32rbh196ik5pzgad4z6lgrn59x36ssvcpmmd2";
-      name = "ktp-call-ui-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/ktp-call-ui-17.12.3.tar.xz";
+      sha256 = "0l85q8xykz0vj26yvcqcm3l6w84iada8hr32sn71151rv6palv0m";
+      name = "ktp-call-ui-17.12.3.tar.xz";
     };
   };
   ktp-common-internals = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/ktp-common-internals-17.12.2.tar.xz";
-      sha256 = "18i311hnyd7lwvv6c08dk674w77q1sk3bggj5mp94r987507kns4";
-      name = "ktp-common-internals-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/ktp-common-internals-17.12.3.tar.xz";
+      sha256 = "0vzppfy2ik3j9aw2rzb272h8q57vv6z3pqycfwbsd4j751hccx80";
+      name = "ktp-common-internals-17.12.3.tar.xz";
     };
   };
   ktp-contact-list = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/ktp-contact-list-17.12.2.tar.xz";
-      sha256 = "1fzw7mqk65ry16bpbrh9zp7rpcbdgjabcsw23xdz08dzl86gji24";
-      name = "ktp-contact-list-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/ktp-contact-list-17.12.3.tar.xz";
+      sha256 = "1clyfaabjjafmazw3gli10b00v0yb8m05bd6lwia7anslhs9pjfb";
+      name = "ktp-contact-list-17.12.3.tar.xz";
     };
   };
   ktp-contact-runner = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/ktp-contact-runner-17.12.2.tar.xz";
-      sha256 = "0qmwajxqhd2m2p9jnyqq5c8i1a02r8mc20limrikvg2m25cg8ii9";
-      name = "ktp-contact-runner-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/ktp-contact-runner-17.12.3.tar.xz";
+      sha256 = "0rj7l0dr0kqcijaxwq06chbmjb5xr12zcs02mjc08af5kc2girsq";
+      name = "ktp-contact-runner-17.12.3.tar.xz";
     };
   };
   ktp-desktop-applets = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/ktp-desktop-applets-17.12.2.tar.xz";
-      sha256 = "02s5b2lgcsslr2zavijp457kngmdall03li9wlgg31kxyqwrycwc";
-      name = "ktp-desktop-applets-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/ktp-desktop-applets-17.12.3.tar.xz";
+      sha256 = "16n8gj6x9cbk9bbpdf8zchrjajpw0dh2n5vf2ngyhw59w3rlwisj";
+      name = "ktp-desktop-applets-17.12.3.tar.xz";
     };
   };
   ktp-filetransfer-handler = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/ktp-filetransfer-handler-17.12.2.tar.xz";
-      sha256 = "1vc8w0aq16rfcwf48s3178y2qmz6r03bsdrgn2mkxscj8z4rv8j5";
-      name = "ktp-filetransfer-handler-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/ktp-filetransfer-handler-17.12.3.tar.xz";
+      sha256 = "1l2w39k9gmlnysphh4scc0krmxf0s9h1frj9blml9qfd8n92v5y8";
+      name = "ktp-filetransfer-handler-17.12.3.tar.xz";
     };
   };
   ktp-kded-module = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/ktp-kded-module-17.12.2.tar.xz";
-      sha256 = "1is5l0ammvqqp4cz9hk9ra63rv5kphy58b1b1qh1vwdhbc74cdx6";
-      name = "ktp-kded-module-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/ktp-kded-module-17.12.3.tar.xz";
+      sha256 = "1752m9sr7mb7hgrbarr2vnllvd67n6c059i3k2ds4npajvcdszhp";
+      name = "ktp-kded-module-17.12.3.tar.xz";
     };
   };
   ktp-send-file = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/ktp-send-file-17.12.2.tar.xz";
-      sha256 = "13xq1slbr6qhjq135kxcxmv9lk5w68i6zkc47ffj76x40hdryh34";
-      name = "ktp-send-file-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/ktp-send-file-17.12.3.tar.xz";
+      sha256 = "02z13fy21v8yl3q164lw9265k3mw5mdhmr8f0dlpkx2x3mgdgjch";
+      name = "ktp-send-file-17.12.3.tar.xz";
     };
   };
   ktp-text-ui = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/ktp-text-ui-17.12.2.tar.xz";
-      sha256 = "166ya2nggpljf591rvscd2gqbi8fbr2zq06v512clraawfzgbrqa";
-      name = "ktp-text-ui-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/ktp-text-ui-17.12.3.tar.xz";
+      sha256 = "0zhqhq7zq4xp44df77fms1jp14pfz1gdandblgcbyx55fqgkx38v";
+      name = "ktp-text-ui-17.12.3.tar.xz";
     };
   };
   ktuberling = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/ktuberling-17.12.2.tar.xz";
-      sha256 = "05h47my9f167gi811nzpdn6sdn0k7bdbr582rrm6j1gpjgay2d16";
-      name = "ktuberling-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/ktuberling-17.12.3.tar.xz";
+      sha256 = "1rqn9fzniyz3nnrjk6qjpbcs7m0gfnl2m671dgj87pwfsddicyr4";
+      name = "ktuberling-17.12.3.tar.xz";
     };
   };
   kturtle = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kturtle-17.12.2.tar.xz";
-      sha256 = "0xk3dpnld7f58b9p1hgcv6afvay1yhcm285jq22qa29wi2ckhk6m";
-      name = "kturtle-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kturtle-17.12.3.tar.xz";
+      sha256 = "1m7pppqy1c6kscy95hx284p0iinx00iafpihii8hl4bvvam2sws8";
+      name = "kturtle-17.12.3.tar.xz";
     };
   };
   kubrick = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kubrick-17.12.2.tar.xz";
-      sha256 = "0f5b3z91w4g8kl11wv43xn7n92dcfpmga51nw20wk4vsfmrwgpc9";
-      name = "kubrick-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kubrick-17.12.3.tar.xz";
+      sha256 = "0ls51xvkvxpr6pzpj67jmfbcwx7wrc9lyb149y59bmfbckc1cimp";
+      name = "kubrick-17.12.3.tar.xz";
     };
   };
   kwalletmanager = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kwalletmanager-17.12.2.tar.xz";
-      sha256 = "0aqdlm87hxw8d28jr9hhvpjcjs939595vxhg8p5bw5dzanj48zkv";
-      name = "kwalletmanager-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kwalletmanager-17.12.3.tar.xz";
+      sha256 = "1lwslsx15ymyssnwl9yam26j3m5153sjyc4cvv5sxflk5wghaad1";
+      name = "kwalletmanager-17.12.3.tar.xz";
     };
   };
   kwave = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kwave-17.12.2.tar.xz";
-      sha256 = "1l5mdy1qdzw3lmrmvylcjj4wc9xg6brcd7qd20fsanzfv7w8if6k";
-      name = "kwave-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kwave-17.12.3.tar.xz";
+      sha256 = "1wqhjdjc1cf1zjbgpxmiw60bxlxld7mikv1lkph750wygjkmnrng";
+      name = "kwave-17.12.3.tar.xz";
     };
   };
   kwordquiz = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/kwordquiz-17.12.2.tar.xz";
-      sha256 = "175cf0qvw7qiifbqbgsg036n125gqpbpw7v1qq81hfg8nl0zpy2h";
-      name = "kwordquiz-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/kwordquiz-17.12.3.tar.xz";
+      sha256 = "1w1z5hjg36jyzl247ff1xk4xhr49qhnkmcxhnyp8fsj5hq9in6xx";
+      name = "kwordquiz-17.12.3.tar.xz";
     };
   };
   libgravatar = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/libgravatar-17.12.2.tar.xz";
-      sha256 = "1vps67mbjh31y7q19wr1km0n35drimc7gi4xyhfx17l8k87nrx7a";
-      name = "libgravatar-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/libgravatar-17.12.3.tar.xz";
+      sha256 = "1862yzcmk1w9y1k83hkh749mhk9hlba7hdlsbbj8hmf3jb7hrczm";
+      name = "libgravatar-17.12.3.tar.xz";
     };
   };
   libkcddb = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/libkcddb-17.12.2.tar.xz";
-      sha256 = "1hqrpnfy5gzknvvcfmbp2axx4qbk0qkl47rmhr8gmpdvlkh33cny";
-      name = "libkcddb-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/libkcddb-17.12.3.tar.xz";
+      sha256 = "1qwizxb8y35qddiqvf0469gnjid2bc80dfnv4qixxs3ba094c2pi";
+      name = "libkcddb-17.12.3.tar.xz";
     };
   };
   libkcompactdisc = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/libkcompactdisc-17.12.2.tar.xz";
-      sha256 = "12dcyxjr6b6i8zfk3i17ah0kc3x0d9ixy65wj3zw1gf4mmdzgpbk";
-      name = "libkcompactdisc-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/libkcompactdisc-17.12.3.tar.xz";
+      sha256 = "1brz12j45vfb4xixr3lhn9fs1hbf723kc46psdg24yghfmx5j28v";
+      name = "libkcompactdisc-17.12.3.tar.xz";
     };
   };
   libkdcraw = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/libkdcraw-17.12.2.tar.xz";
-      sha256 = "1qfzyy4952b2lc3619bbzqffvrphqsq16z89bxb4pn1ad796zn62";
-      name = "libkdcraw-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/libkdcraw-17.12.3.tar.xz";
+      sha256 = "11p25ldv3ry4khb52mfay85wlfbrsvk6f52yx8shzvbzxyzxf0nc";
+      name = "libkdcraw-17.12.3.tar.xz";
     };
   };
   libkdegames = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/libkdegames-17.12.2.tar.xz";
-      sha256 = "1v3a9240crfpjdwpbz0bdwv06572s99h80l53vf3zwmqw5yk05z4";
-      name = "libkdegames-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/libkdegames-17.12.3.tar.xz";
+      sha256 = "1kh1wpdajzd1i3j0kr79npzq4w41gisn27k8v26dq1wy727vy4kd";
+      name = "libkdegames-17.12.3.tar.xz";
     };
   };
   libkdepim = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/libkdepim-17.12.2.tar.xz";
-      sha256 = "069x28ia6d95rm1g3mr339v7rdvlmiz20y4kddp2acja53b0sagg";
-      name = "libkdepim-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/libkdepim-17.12.3.tar.xz";
+      sha256 = "0zz86mnz73jj78gdfh0s19wfypb0xwxsvjcijbkr340diri5862q";
+      name = "libkdepim-17.12.3.tar.xz";
     };
   };
   libkeduvocdocument = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/libkeduvocdocument-17.12.2.tar.xz";
-      sha256 = "1g4zldr9ys7ddxqfkkhlyqgq623q303011ifaraid5zpiql092qd";
-      name = "libkeduvocdocument-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/libkeduvocdocument-17.12.3.tar.xz";
+      sha256 = "0yqilmf61izbh44rsmspslnikawikxsq8nk8a4lvq9206yy6h11v";
+      name = "libkeduvocdocument-17.12.3.tar.xz";
     };
   };
   libkexiv2 = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/libkexiv2-17.12.2.tar.xz";
-      sha256 = "0jr9wpnl80xala60yz4zd5j9nd1bv56y688fldr5dxx25ljavn24";
-      name = "libkexiv2-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/libkexiv2-17.12.3.tar.xz";
+      sha256 = "1xzrq9dn4x8afsf21sxqbsz1sk2vzp2g1ri5d5rz4vd1gj0sk3lg";
+      name = "libkexiv2-17.12.3.tar.xz";
     };
   };
   libkgapi = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/libkgapi-17.12.2.tar.xz";
-      sha256 = "1vki4sxb7dzg202waqqyvjwsx8yhx8cfp2wk4b6p81hfaq8a1syd";
-      name = "libkgapi-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/libkgapi-17.12.3.tar.xz";
+      sha256 = "015g1l4fkc5j403f0hak03iz2qi62gx4wlldm59hi1vgqq1xfp1y";
+      name = "libkgapi-17.12.3.tar.xz";
     };
   };
   libkgeomap = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/libkgeomap-17.12.2.tar.xz";
-      sha256 = "1spq6g56ih6wlc2qasf3fkpkn7m4gsbn14p6ja60cr1gvf4p9j79";
-      name = "libkgeomap-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/libkgeomap-17.12.3.tar.xz";
+      sha256 = "1064yl3whr8g9qyirpgzvag2z4lal4qyljvlapfq3mpa3jxpcwdi";
+      name = "libkgeomap-17.12.3.tar.xz";
     };
   };
   libkipi = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/libkipi-17.12.2.tar.xz";
-      sha256 = "180yg24iqh02nkcv7jbvm10lr7z7qagapjh8zarpmh6r2s3c0nh5";
-      name = "libkipi-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/libkipi-17.12.3.tar.xz";
+      sha256 = "0qqvrg1nvzcrxjvm1grxzm0vk7s9j1kzf73dk41cmvgwv9wirlgq";
+      name = "libkipi-17.12.3.tar.xz";
     };
   };
   libkleo = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/libkleo-17.12.2.tar.xz";
-      sha256 = "00nlspwnh9nvxarm34y9hdis3af2zkjf2flla4qwks5nhl7fgi8g";
-      name = "libkleo-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/libkleo-17.12.3.tar.xz";
+      sha256 = "0pp72ba58vwl1m9i72gdghbk3r5sa0pm8y7q9hz4a5qv919iny2k";
+      name = "libkleo-17.12.3.tar.xz";
     };
   };
   libkmahjongg = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/libkmahjongg-17.12.2.tar.xz";
-      sha256 = "0l8krpiyzlsn9awp8za10n9qhbac8nf98jiz7dxzn4qpniv45px5";
-      name = "libkmahjongg-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/libkmahjongg-17.12.3.tar.xz";
+      sha256 = "10j9r8mb5x90zv91m32q0in2brqcwl3h7kv7lr6dqhd6jjmrx4gd";
+      name = "libkmahjongg-17.12.3.tar.xz";
     };
   };
   libkomparediff2 = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/libkomparediff2-17.12.2.tar.xz";
-      sha256 = "07is7vn9wrivxpyd4s19371ffylj2x3s5zi14y8zr778nq68wrzq";
-      name = "libkomparediff2-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/libkomparediff2-17.12.3.tar.xz";
+      sha256 = "0w6p8lvm2rn7y4qz0x3s87lwh1758xnyhwkkkng55n8v9rpjjw7l";
+      name = "libkomparediff2-17.12.3.tar.xz";
     };
   };
   libksane = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/libksane-17.12.2.tar.xz";
-      sha256 = "01d182hnrj6n8qmh85pkwmjdyhfy0n946zp40r9r6avh9ajrx5nd";
-      name = "libksane-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/libksane-17.12.3.tar.xz";
+      sha256 = "1rnxywpljiw4fb6djlm486z98l5f7vlwca0i0q99rj17gkxlddk2";
+      name = "libksane-17.12.3.tar.xz";
     };
   };
   libksieve = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/libksieve-17.12.2.tar.xz";
-      sha256 = "1nfy96ykaxdm5h67bhykgdcmlidsjgvbsf52qs5f7j7iyl3w4nhr";
-      name = "libksieve-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/libksieve-17.12.3.tar.xz";
+      sha256 = "1cp1bfw2xd5fsnw5z061vfg8wbvv1bqk2lvcyvxgvm1im7892433";
+      name = "libksieve-17.12.3.tar.xz";
     };
   };
   lokalize = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/lokalize-17.12.2.tar.xz";
-      sha256 = "18nama2dafhp5v1lvxibm92cxwdldkxs778s948qnb7xh65mxvsb";
-      name = "lokalize-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/lokalize-17.12.3.tar.xz";
+      sha256 = "0n5f7myv45446kfpcaw7y278xsjxq5hnamfhc20h24m9pflp7bp9";
+      name = "lokalize-17.12.3.tar.xz";
     };
   };
   lskat = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/lskat-17.12.2.tar.xz";
-      sha256 = "0a4gch1krd7xpvxkscy7prsfb72dcg78alk4vz2z70nfn11zrzv3";
-      name = "lskat-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/lskat-17.12.3.tar.xz";
+      sha256 = "0n4kma0llqbgzcqsm7rb5rjidn8wlal9ay26041mic9hk51s3bm0";
+      name = "lskat-17.12.3.tar.xz";
     };
   };
   mailcommon = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/mailcommon-17.12.2.tar.xz";
-      sha256 = "0ikmbg91f4p7d4qb7nx05n5mlbmmcdwzgw0xvdsib7vkj5cfrxp2";
-      name = "mailcommon-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/mailcommon-17.12.3.tar.xz";
+      sha256 = "17m54i4a9kn8lmpj3b42q2q9gqrympl9z2lgbhsacmak9aqrv94f";
+      name = "mailcommon-17.12.3.tar.xz";
     };
   };
   mailimporter = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/mailimporter-17.12.2.tar.xz";
-      sha256 = "1p4dc7xwk6wx1j6xk3h5w5cnzm665pzrmc70v8l5898025i94ml5";
-      name = "mailimporter-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/mailimporter-17.12.3.tar.xz";
+      sha256 = "1q93lc98ak5kzz762ih906g0jj0vnib97x39sqq4awspy4a825pc";
+      name = "mailimporter-17.12.3.tar.xz";
     };
   };
   marble = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/marble-17.12.2.tar.xz";
-      sha256 = "1y6wbh571g2d8gzg9pwdbsc4a4bl67fmvnkf65acs182zfc2x7jy";
-      name = "marble-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/marble-17.12.3.tar.xz";
+      sha256 = "1pgqnvdmx7s33m2wyz73lwlpbjh9qfc3aqk532lznz3ncc54n07i";
+      name = "marble-17.12.3.tar.xz";
     };
   };
   mbox-importer = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/mbox-importer-17.12.2.tar.xz";
-      sha256 = "0f1zvp31m6i20jd7xi9hxks8759mvbsj57r2nciwhc47r3m9wi3l";
-      name = "mbox-importer-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/mbox-importer-17.12.3.tar.xz";
+      sha256 = "16gkjgqjh91kx2rgjz4idm888q6fxycqdmwy6bmks825260426rp";
+      name = "mbox-importer-17.12.3.tar.xz";
     };
   };
   messagelib = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/messagelib-17.12.2.tar.xz";
-      sha256 = "17fayacl3m7p0w0rf724fhdm287dz8n03pyliapsxybldgp2rlaz";
-      name = "messagelib-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/messagelib-17.12.3.tar.xz";
+      sha256 = "1pmdzyd8jka9wrflzv7lrr03nqf4r4vli2imhmg5hhjknn2b0ald";
+      name = "messagelib-17.12.3.tar.xz";
     };
   };
   minuet = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/minuet-17.12.2.tar.xz";
-      sha256 = "17gwnh0bd2a7fvxbjhwadh0gvb0zly71lwv8znkb18dwsyd38v3r";
-      name = "minuet-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/minuet-17.12.3.tar.xz";
+      sha256 = "1ahrcpkbs49kyhq0l5fcacn49pqfczy1b9zvydxmld5kxlpz7w8b";
+      name = "minuet-17.12.3.tar.xz";
     };
   };
   okteta = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/okteta-17.12.2.tar.xz";
-      sha256 = "1k4b2m5pvrv1zxvm6pwmkl0ahh0ynkssa8z1v51a3hxlvw593b4d";
-      name = "okteta-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/okteta-17.12.3.tar.xz";
+      sha256 = "03wsv83l1cay2dpcsksad124wzan7kh8zxdw1h0yicn398kdbck4";
+      name = "okteta-17.12.3.tar.xz";
     };
   };
   okular = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/okular-17.12.2.tar.xz";
-      sha256 = "10rkrwp3rwccvqsw7njcmggw3jkj84fb90vkvqp8k2lmhnrz1ypx";
-      name = "okular-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/okular-17.12.3.tar.xz";
+      sha256 = "0786kr75ly0h2jwabhzz3fc15swn8n90g1w3l27kphch5nf584ha";
+      name = "okular-17.12.3.tar.xz";
     };
   };
   palapeli = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/palapeli-17.12.2.tar.xz";
-      sha256 = "0j9b4a6x3bp9bki2p79ksn86l16niixa2x8xx24vdnd9y71lp2yb";
-      name = "palapeli-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/palapeli-17.12.3.tar.xz";
+      sha256 = "11kjj85axc7l1l1ip0gcf5p7f7g9rfwyn476wz25prsr2g2ijgln";
+      name = "palapeli-17.12.3.tar.xz";
     };
   };
   parley = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/parley-17.12.2.tar.xz";
-      sha256 = "0kqvj1gwsv9kdac0zsv6cda34h8qx8xr43mgwk343c8pcwm1r2r5";
-      name = "parley-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/parley-17.12.3.tar.xz";
+      sha256 = "0swb7371vz9cxr2588hgcdxa5bmdb9n7h1yvmw28fbzgz98ax7g6";
+      name = "parley-17.12.3.tar.xz";
     };
   };
   picmi = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/picmi-17.12.2.tar.xz";
-      sha256 = "0ry4vvspa2mdvxrxvbqihkdh7qvsxhl9v7i07ycx3qs7sybf1rx4";
-      name = "picmi-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/picmi-17.12.3.tar.xz";
+      sha256 = "04cza4rvgzzvrzzw27n74k7kiwm7amcg12k97fr1rvlpd5irh2vn";
+      name = "picmi-17.12.3.tar.xz";
     };
   };
   pimcommon = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/pimcommon-17.12.2.tar.xz";
-      sha256 = "0frgn2shd2qzf4rbix9k4psy81b2yzsyy0sisy0ngc68gk5mdj8a";
-      name = "pimcommon-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/pimcommon-17.12.3.tar.xz";
+      sha256 = "1yav8flw6rf5qdwgys3zkmijp81p56hwn6cd71ckfzdrjm11kikq";
+      name = "pimcommon-17.12.3.tar.xz";
     };
   };
   pim-data-exporter = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/pim-data-exporter-17.12.2.tar.xz";
-      sha256 = "1fbpz4sw4gn01yc7vzlj9v15wp3b6acbcd6xs9nsp3bfpb9mqd16";
-      name = "pim-data-exporter-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/pim-data-exporter-17.12.3.tar.xz";
+      sha256 = "0j5ynb0y602lnl571i247dbxna7xjqfphl7bcfqmg09ipjhxvk5b";
+      name = "pim-data-exporter-17.12.3.tar.xz";
     };
   };
   pim-sieve-editor = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/pim-sieve-editor-17.12.2.tar.xz";
-      sha256 = "1jwjgywqp23c17g08c18ajbl2dzq3h9vm94bmbjcan64isd03jr4";
-      name = "pim-sieve-editor-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/pim-sieve-editor-17.12.3.tar.xz";
+      sha256 = "0bkd5qsrabwg5imnif8z0hvhsk00a2n23238f9y14g963bhyw4pp";
+      name = "pim-sieve-editor-17.12.3.tar.xz";
     };
   };
   poxml = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/poxml-17.12.2.tar.xz";
-      sha256 = "0amb095qjv8d22ny86rs6wj280b2ag2zpk7bzs5834m75wlmpg6w";
-      name = "poxml-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/poxml-17.12.3.tar.xz";
+      sha256 = "0r8wm2x13ayb3mi69c35plvwzw7r9525idk3indsxc0rhv5qkhfp";
+      name = "poxml-17.12.3.tar.xz";
     };
   };
   print-manager = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/print-manager-17.12.2.tar.xz";
-      sha256 = "0sz7xqcjc5ddxkc7gbl1h673ywp3ffhmx985jzpd296n6sjppc2v";
-      name = "print-manager-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/print-manager-17.12.3.tar.xz";
+      sha256 = "0w1snq5ca7hza3x4gp17skia6g8yvarn9g3qacfwp13vad4v8zj7";
+      name = "print-manager-17.12.3.tar.xz";
     };
   };
   rocs = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/rocs-17.12.2.tar.xz";
-      sha256 = "08flyrla2kqkdc94hd8w2inzmnmzvczcgwl9hzqxxzf3fsjnnfdl";
-      name = "rocs-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/rocs-17.12.3.tar.xz";
+      sha256 = "1dfg0klvix2mgnvw3dkh13694iac5jf0jk8rm9ssxcaljvix7h46";
+      name = "rocs-17.12.3.tar.xz";
     };
   };
   signon-kwallet-extension = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/signon-kwallet-extension-17.12.2.tar.xz";
-      sha256 = "06l1mynl7wp1r3gmy5919dm0p19p23harsh6qwdvbi9lffy7ascp";
-      name = "signon-kwallet-extension-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/signon-kwallet-extension-17.12.3.tar.xz";
+      sha256 = "0r9whz7p6v9wgbycdxzgxfm1ngxhjk4dzir5k5fqvmb6wrg05v4m";
+      name = "signon-kwallet-extension-17.12.3.tar.xz";
     };
   };
   spectacle = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/spectacle-17.12.2.tar.xz";
-      sha256 = "0qhhnpdk4rqzpg3npj183nl7k1n4mvhcb97hydwaq51yh51r4gvj";
-      name = "spectacle-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/spectacle-17.12.3.tar.xz";
+      sha256 = "12g976ys2ga88n0a45zqkai28bmxw0vxy2qlgdmx7mxvkpwlccyr";
+      name = "spectacle-17.12.3.tar.xz";
     };
   };
   step = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/step-17.12.2.tar.xz";
-      sha256 = "1n9gd2sq2lvfmgvjdb8yn5g25j58jcb24qh8l41k1y0hgcbaxly7";
-      name = "step-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/step-17.12.3.tar.xz";
+      sha256 = "161r0abz18s32xpn8x2j5diwb6p4hggvlnv7p9yk1z3qm3fyj46v";
+      name = "step-17.12.3.tar.xz";
     };
   };
   svgpart = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/svgpart-17.12.2.tar.xz";
-      sha256 = "1d7yrpnxc3sm3381fd9m3fiipi664vl8cz2li8dlw2y4pbgpx28g";
-      name = "svgpart-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/svgpart-17.12.3.tar.xz";
+      sha256 = "1rcfdkpinqdbz7js7p9h0lxmnvln4y95af1icq2871w7mg4fzsf5";
+      name = "svgpart-17.12.3.tar.xz";
     };
   };
   sweeper = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/sweeper-17.12.2.tar.xz";
-      sha256 = "1qi4kfd4p8xnykv3zn3sqkx4b605mwbnr6m9l6cr0v26c01yjq3k";
-      name = "sweeper-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/sweeper-17.12.3.tar.xz";
+      sha256 = "1pwjv4knj0by0sn8j788cxg3sl3vm0gql49yv47bansrvs458n4x";
+      name = "sweeper-17.12.3.tar.xz";
     };
   };
   syndication = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/syndication-17.12.2.tar.xz";
-      sha256 = "1hcdk0apdrppfrjyfjm4cn0iyb1yrf7zq2wb2ipmxzca1hfgw4c0";
-      name = "syndication-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/syndication-17.12.3.tar.xz";
+      sha256 = "1bq220ir09sszj31xi8sk116k9xkhkmnmahigc73qc3hvgq0x808";
+      name = "syndication-17.12.3.tar.xz";
     };
   };
   umbrello = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/umbrello-17.12.2.tar.xz";
-      sha256 = "1sm0drfsyyslls5n66mvjy2knbwykws34g74c6rn1mmmdpyp7b94";
-      name = "umbrello-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/umbrello-17.12.3.tar.xz";
+      sha256 = "0j3qwisq9aqvgpqx54jd4idspbgvl72xffb8qn3wwyky9jpnmhr0";
+      name = "umbrello-17.12.3.tar.xz";
     };
   };
   zeroconf-ioslave = {
-    version = "17.12.2";
+    version = "17.12.3";
     src = fetchurl {
-      url = "${mirror}/stable/applications/17.12.2/src/zeroconf-ioslave-17.12.2.tar.xz";
-      sha256 = "09p55dmrsi8jyvs793ya2xzfbhm6f6gwg8ldri15v9n3if7crpzx";
-      name = "zeroconf-ioslave-17.12.2.tar.xz";
+      url = "${mirror}/stable/applications/17.12.3/src/zeroconf-ioslave-17.12.3.tar.xz";
+      sha256 = "1glhci1vivkx3nvk6zwf2z09dii81vr5lcp3xf0aafl4p1vlxi3i";
+      name = "zeroconf-ioslave-17.12.3.tar.xz";
     };
   };
 }

From 346996ceecc421577be638b9aac4917925329130 Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Mon, 12 Mar 2018 17:06:21 +0100
Subject: [PATCH 004/123] dockerTools: dereference hard links in tar archives

This is to improve image creation reproducibility. Since the nar
format doesn't support hard link, the tar stream of a layer can be
different if a dependency of a layer has been built locally or if it
has been fetched from a binary cache.

If the dependency has been build locally, it can contain hard links
which are encoded in the tar stream. If the dependency has been
fetched from a binary cache, the tar stream doesn't contain any hard
link. So even if the content is the same, tar streams are different.
---
 pkgs/build-support/docker/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index c40b096e208..328419d639f 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -212,7 +212,7 @@ rec {
 
       postMount = ''
         echo "Packing raw image..."
-        tar -C mnt --mtime="@$SOURCE_DATE_EPOCH" -cf $out .
+        tar -C mnt --hard-dereference --mtime="@$SOURCE_DATE_EPOCH" -cf $out .
       '';
     };
 
@@ -277,7 +277,7 @@ rec {
       # Tar up the layer and throw it into 'layer.tar'.
       echo "Packing layer..."
       mkdir $out
-      tar -C layer --mtime="@$SOURCE_DATE_EPOCH" --owner=${toString uid} --group=${toString gid} -cf $out/layer.tar .
+      tar -C layer --hard-dereference --mtime="@$SOURCE_DATE_EPOCH" --owner=${toString uid} --group=${toString gid} -cf $out/layer.tar .
 
       # Compute a checksum of the tarball.
       echo "Computing layer checksum..."
@@ -359,7 +359,7 @@ rec {
 
         echo "Packing layer..."
         mkdir $out
-        tar -C layer --mtime="@$SOURCE_DATE_EPOCH" -cf $out/layer.tar .
+        tar -C layer --hard-dereference --mtime="@$SOURCE_DATE_EPOCH" -cf $out/layer.tar .
 
         # Compute the tar checksum and add it to the output json.
         echo "Computing checksum..."
@@ -489,7 +489,7 @@ rec {
         comm <(sort -n baseFiles|uniq) \
              <(sort -n layerFiles|uniq|grep -v ${layer}) -1 -3 > newFiles
         # Append the new files to the layer.
-        tar -rpf temp/layer.tar --mtime="@$SOURCE_DATE_EPOCH" \
+        tar -rpf temp/layer.tar --hard-dereference --mtime="@$SOURCE_DATE_EPOCH" \
           --owner=0 --group=0 --no-recursion --files-from newFiles
 
         echo "Adding meta..."
@@ -537,7 +537,7 @@ rec {
         chmod -R a-w image
 
         echo "Cooking the image..."
-        tar -C image --mtime="@$SOURCE_DATE_EPOCH" --owner=0 --group=0 --xform s:'./':: -c . | pigz -nT > $out
+        tar -C image --hard-dereference --mtime="@$SOURCE_DATE_EPOCH" --owner=0 --group=0 --xform s:'./':: -c . | pigz -nT > $out
 
         echo "Finished."
       '';

From ac0c491836a835c43641989ccb4b95a172749806 Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Mon, 12 Mar 2018 18:26:15 +0100
Subject: [PATCH 005/123] dockerTools: add --sort=name options on all tar calls

This is to go to a reproducible image build.
Note without this options image are identical from the Docker point of
view but generated docker archives could have different hashes.
---
 pkgs/build-support/docker/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index 328419d639f..653a651df7b 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -212,7 +212,7 @@ rec {
 
       postMount = ''
         echo "Packing raw image..."
-        tar -C mnt --hard-dereference --mtime="@$SOURCE_DATE_EPOCH" -cf $out .
+        tar -C mnt --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" -cf $out .
       '';
     };
 
@@ -277,7 +277,7 @@ rec {
       # Tar up the layer and throw it into 'layer.tar'.
       echo "Packing layer..."
       mkdir $out
-      tar -C layer --hard-dereference --mtime="@$SOURCE_DATE_EPOCH" --owner=${toString uid} --group=${toString gid} -cf $out/layer.tar .
+      tar -C layer --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" --owner=${toString uid} --group=${toString gid} -cf $out/layer.tar .
 
       # Compute a checksum of the tarball.
       echo "Computing layer checksum..."
@@ -359,7 +359,7 @@ rec {
 
         echo "Packing layer..."
         mkdir $out
-        tar -C layer --hard-dereference --mtime="@$SOURCE_DATE_EPOCH" -cf $out/layer.tar .
+        tar -C layer --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" -cf $out/layer.tar .
 
         # Compute the tar checksum and add it to the output json.
         echo "Computing checksum..."
@@ -489,7 +489,7 @@ rec {
         comm <(sort -n baseFiles|uniq) \
              <(sort -n layerFiles|uniq|grep -v ${layer}) -1 -3 > newFiles
         # Append the new files to the layer.
-        tar -rpf temp/layer.tar --hard-dereference --mtime="@$SOURCE_DATE_EPOCH" \
+        tar -rpf temp/layer.tar --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" \
           --owner=0 --group=0 --no-recursion --files-from newFiles
 
         echo "Adding meta..."
@@ -537,7 +537,7 @@ rec {
         chmod -R a-w image
 
         echo "Cooking the image..."
-        tar -C image --hard-dereference --mtime="@$SOURCE_DATE_EPOCH" --owner=0 --group=0 --xform s:'./':: -c . | pigz -nT > $out
+        tar -C image --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" --owner=0 --group=0 --xform s:'./':: -c . | pigz -nT > $out
 
         echo "Finished."
       '';

From ef939539f37713477f1267cc6593994ed9af77e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Mon, 12 Mar 2018 17:37:45 +0100
Subject: [PATCH 006/123] kde-frameworks: 5.43 -> 5.44

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

diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh
index d4901ba4233..85a49ce6b6c 100644
--- a/pkgs/development/libraries/kde-frameworks/fetch.sh
+++ b/pkgs/development/libraries/kde-frameworks/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.kde.org/stable/frameworks/5.43/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.kde.org/stable/frameworks/5.44/ -A '*.tar.xz' )
diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix
index af01f6faef6..84cbbe798fc 100644
--- a/pkgs/development/libraries/kde-frameworks/srcs.nix
+++ b/pkgs/development/libraries/kde-frameworks/srcs.nix
@@ -3,627 +3,627 @@
 
 {
   attica = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/attica-5.43.0.tar.xz";
-      sha256 = "1vvf5d0dnfm69gahrhndy9jqxk7hkh5vj6z9pyprpl3zp5z1ki1a";
-      name = "attica-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/attica-5.44.0.tar.xz";
+      sha256 = "1ac2k3rc5dd5sc9n8qdb1d6jssjpag709sfsnvif1cvp0j8s2xj3";
+      name = "attica-5.44.0.tar.xz";
     };
   };
   baloo = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/baloo-5.43.0.tar.xz";
-      sha256 = "095z6w5qyq4z2hkdxq0vizfgv1v6g9w960wrh78b6bi1bf4ig2np";
-      name = "baloo-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/baloo-5.44.0.tar.xz";
+      sha256 = "0ybxl05njryk7zrdcwh4gbvxbn7n6xb51y2587d9bxiizasmbbiy";
+      name = "baloo-5.44.0.tar.xz";
     };
   };
   bluez-qt = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/bluez-qt-5.43.0.tar.xz";
-      sha256 = "04bsrp0biyn7b630hywk82rwn8kl8c2rwh8iwhjz35b51jjqm2b5";
-      name = "bluez-qt-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/bluez-qt-5.44.0.tar.xz";
+      sha256 = "054zh3hc7wq13iks3nryzdns61wb56j2cvvfvsnv3yl9ni6i6wxv";
+      name = "bluez-qt-5.44.0.tar.xz";
     };
   };
   breeze-icons = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/breeze-icons-5.43.0.tar.xz";
-      sha256 = "19yy6pcqjfbjxlkkf4g1hcgl3lv4m640sl26nblrydn9qyj5iniy";
-      name = "breeze-icons-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/breeze-icons-5.44.0.tar.xz";
+      sha256 = "05ndqmprwv4dd8aib3sjmvd5481znq4jg58cpk4id1xxq4dgx9gg";
+      name = "breeze-icons-5.44.0.tar.xz";
     };
   };
   extra-cmake-modules = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/extra-cmake-modules-5.43.0.tar.xz";
-      sha256 = "1zgzjh5q1ppgfzj4mhprgd4848iwjnzqsnilb0dk5rgdrvfsamsp";
-      name = "extra-cmake-modules-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/extra-cmake-modules-5.44.0.tar.xz";
+      sha256 = "121gwj54f7bns386wrw6rwqmwzsny93mb00sxxzf3ic8m6mw6wis";
+      name = "extra-cmake-modules-5.44.0.tar.xz";
     };
   };
   frameworkintegration = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/frameworkintegration-5.43.0.tar.xz";
-      sha256 = "0qjpk4lslpxqj5aisczm5kl201g4z3grgjhx38r1ih4hyp805vw0";
-      name = "frameworkintegration-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/frameworkintegration-5.44.0.tar.xz";
+      sha256 = "10rqabchldra16zb0ryynvjimc67di3r4b29fbn47wg4pwj0jn41";
+      name = "frameworkintegration-5.44.0.tar.xz";
     };
   };
   kactivities = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kactivities-5.43.0.tar.xz";
-      sha256 = "0rmmyjfgz8ybvdgpbqndsn0gxizxpmwhvglnnl8ia1s4sna6sjby";
-      name = "kactivities-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kactivities-5.44.0.tar.xz";
+      sha256 = "1j5v03mgh0prql51hy468k2vhskg1gyddhjlb8qlyzyzqz1aj82c";
+      name = "kactivities-5.44.0.tar.xz";
     };
   };
   kactivities-stats = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kactivities-stats-5.43.0.tar.xz";
-      sha256 = "1rrn1dxsiyvyf3pa5fyxa0sfbamv5c6g95s4f144xwrx2b130rh1";
-      name = "kactivities-stats-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kactivities-stats-5.44.0.tar.xz";
+      sha256 = "1p1vznw8qxdasb82cvjc35wnhvfhjhapx3r451kl3ly4cbjf39fg";
+      name = "kactivities-stats-5.44.0.tar.xz";
     };
   };
   kapidox = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kapidox-5.43.0.tar.xz";
-      sha256 = "0c358ply0qzg269vxyg6py6l8z5j8l4h6apqcynyql4dbbbm8941";
-      name = "kapidox-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kapidox-5.44.0.tar.xz";
+      sha256 = "0mn67ckxhsav70jk1wj5qci07qyy0291rm7q54qmcl6p7a7a0vj4";
+      name = "kapidox-5.44.0.tar.xz";
     };
   };
   karchive = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/karchive-5.43.0.tar.xz";
-      sha256 = "1f3pqhpdgn00ni05iflyydkmsf3vd403ma5f42zj00kh30l9lqqf";
-      name = "karchive-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/karchive-5.44.0.tar.xz";
+      sha256 = "00mvn9rsc4lb2kamfz2xzmm0a0s1m68ar65dcfrp0n2i8plxin5j";
+      name = "karchive-5.44.0.tar.xz";
     };
   };
   kauth = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kauth-5.43.0.tar.xz";
-      sha256 = "05w8vx45mrf32kzcyjmay1k9dw3j8axbrrp6infg0hhfsgk04w1f";
-      name = "kauth-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kauth-5.44.0.tar.xz";
+      sha256 = "1ph2jlbwx27g9awfvkvrynnfwyr8yqq4x7w4msn1clh8nz9c9n0k";
+      name = "kauth-5.44.0.tar.xz";
     };
   };
   kbookmarks = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kbookmarks-5.43.0.tar.xz";
-      sha256 = "0i7rfahn32m6xpbwra5m5nnpgq8l56jm0ijsq6f80cx8ww3nkcq5";
-      name = "kbookmarks-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kbookmarks-5.44.0.tar.xz";
+      sha256 = "04wwg9s3i3nj7im0cscdzb3c78lqg96k7vyg9ziyn2cpqmj6gihr";
+      name = "kbookmarks-5.44.0.tar.xz";
     };
   };
   kcmutils = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kcmutils-5.43.0.tar.xz";
-      sha256 = "1dshx859k64yp00s5xx7z6x0wlawxyq41rg795nqizhk2s76agr2";
-      name = "kcmutils-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kcmutils-5.44.0.tar.xz";
+      sha256 = "1fddjg89az0gfcl9gf3r7rq7hw9j8k10mvlvzq31x89hn8h7kafs";
+      name = "kcmutils-5.44.0.tar.xz";
     };
   };
   kcodecs = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kcodecs-5.43.0.tar.xz";
-      sha256 = "0ncrzxvy2l324yvlzha9hkyp5qq75wfb9cbnxb5mygispxhrgh2v";
-      name = "kcodecs-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kcodecs-5.44.0.tar.xz";
+      sha256 = "15fv3f2akjz8n65rj6r2nd5zzc4wsz67zc80bp45kqynrb1jgcjk";
+      name = "kcodecs-5.44.0.tar.xz";
     };
   };
   kcompletion = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kcompletion-5.43.0.tar.xz";
-      sha256 = "065nzw26ps367lf3m1j6x95swk0f6grap71wjjv688gablcaz699";
-      name = "kcompletion-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kcompletion-5.44.0.tar.xz";
+      sha256 = "1fy2krnxxppax13jb82zsfxky9n01z28d3kw4jx58yw1b1jm9ha4";
+      name = "kcompletion-5.44.0.tar.xz";
     };
   };
   kconfig = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kconfig-5.43.0.tar.xz";
-      sha256 = "1na1b2dsajl9b9rn2990fd8cqqaj2iwddrxjacbf0ib5mray1sr2";
-      name = "kconfig-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kconfig-5.44.0.tar.xz";
+      sha256 = "1vfl7jchlrw8hkf613nb9a4f0dxyppkc97506xsknxwf1z5v7cmm";
+      name = "kconfig-5.44.0.tar.xz";
     };
   };
   kconfigwidgets = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kconfigwidgets-5.43.0.tar.xz";
-      sha256 = "1qxv8m614y0j687gwcsqqkwcdwsbbwc7ivwx6l9djll4r7r1d43w";
-      name = "kconfigwidgets-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kconfigwidgets-5.44.0.tar.xz";
+      sha256 = "15a7k8ai70a061gw91aps282v1f4sric0fhyw2fysfdfv6ry92rz";
+      name = "kconfigwidgets-5.44.0.tar.xz";
     };
   };
   kcoreaddons = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kcoreaddons-5.43.0.tar.xz";
-      sha256 = "10pgja1v2x5q6jyajld3yq116g1m90djnbf6p35i6n9ng65h0zy6";
-      name = "kcoreaddons-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kcoreaddons-5.44.0.tar.xz";
+      sha256 = "0lwxa326gap83qjw1dsj330qd3klgm6jwr7d77f7hyhm95d7pidl";
+      name = "kcoreaddons-5.44.0.tar.xz";
     };
   };
   kcrash = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kcrash-5.43.0.tar.xz";
-      sha256 = "1hvfhr3s0igc1n37w5fxx0jivsgvcdvpa5iywnkk4g1r1l6snx1b";
-      name = "kcrash-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kcrash-5.44.0.tar.xz";
+      sha256 = "01dcj5cyqqn2jb6mjshjcf48jdjhmjhkqxbhhx07dy7r56r4sqp1";
+      name = "kcrash-5.44.0.tar.xz";
     };
   };
   kdbusaddons = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kdbusaddons-5.43.0.tar.xz";
-      sha256 = "1h4m6ra1cangvqyzmkxkh1fld4rlvxnzz8wny53drgbyrsq2xxv5";
-      name = "kdbusaddons-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kdbusaddons-5.44.0.tar.xz";
+      sha256 = "15b7nyivkrv7s2hdahsv27p8j6q80209ayqvi3dzlhzj2b5qqzkg";
+      name = "kdbusaddons-5.44.0.tar.xz";
     };
   };
   kdeclarative = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kdeclarative-5.43.0.tar.xz";
-      sha256 = "0jbm2ih9hzpnfaqc867fvwr414q78f9jjk6yyf1cjgq8vx8rmjq1";
-      name = "kdeclarative-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kdeclarative-5.44.0.tar.xz";
+      sha256 = "0byggaxfkna0iqlhp970fx8kp926dc6m99xihvja1765525i1lj0";
+      name = "kdeclarative-5.44.0.tar.xz";
     };
   };
   kded = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kded-5.43.0.tar.xz";
-      sha256 = "1kfli2f4hxc9a0hk75kgln3x374y4av6hfajhncwyq37zd4wxq3r";
-      name = "kded-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kded-5.44.0.tar.xz";
+      sha256 = "04sdsz5frwff602ls3mqwijckl3kl64lanhhpmzxc33xdniff9as";
+      name = "kded-5.44.0.tar.xz";
     };
   };
   kdelibs4support = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/portingAids/kdelibs4support-5.43.0.tar.xz";
-      sha256 = "1rwk436vpny3sq12bjqwapjicc3inyrq6dn34a6mr6gjcd5p2mch";
-      name = "kdelibs4support-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/portingAids/kdelibs4support-5.44.0.tar.xz";
+      sha256 = "1cyxry09qnlbc2khaqjpb598f4rscg80dmjcqhlsn6b1375iqkjn";
+      name = "kdelibs4support-5.44.0.tar.xz";
     };
   };
   kdesignerplugin = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kdesignerplugin-5.43.0.tar.xz";
-      sha256 = "0pk95vsgj67jw0qaalcrfvzkr9flxh6shkkmlaxclrz6yhnf9axz";
-      name = "kdesignerplugin-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kdesignerplugin-5.44.0.tar.xz";
+      sha256 = "1fh4nw8qh563yc2parqlbrjzx6avi4gi01jzclf4bxv78zs4957a";
+      name = "kdesignerplugin-5.44.0.tar.xz";
     };
   };
   kdesu = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kdesu-5.43.0.tar.xz";
-      sha256 = "1mll18ms5zk7i4lpkj6qdcxwaf0h52h9mi47y882hzqkvvbnk4d6";
-      name = "kdesu-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kdesu-5.44.0.tar.xz";
+      sha256 = "1p6bk7cnngwqklvm6aj5xlna6c5r6rznfbvdn7zz5h3wpzs8pqz2";
+      name = "kdesu-5.44.0.tar.xz";
     };
   };
   kdewebkit = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kdewebkit-5.43.0.tar.xz";
-      sha256 = "0yi7dv77flz7z1yjzlvrfvlybp7knz808hpfbr6hxgrp1gwi7h6b";
-      name = "kdewebkit-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kdewebkit-5.44.0.tar.xz";
+      sha256 = "07mr4x55pp6wvbgnkggwalrqx9z8y9q1mmn79jkyhf2q905ynsmj";
+      name = "kdewebkit-5.44.0.tar.xz";
     };
   };
   kdnssd = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kdnssd-5.43.0.tar.xz";
-      sha256 = "0d58aaii1r2x3nmw9s2hnk178sr54yvrqi22ry3xm3v7yvx9jr3b";
-      name = "kdnssd-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kdnssd-5.44.0.tar.xz";
+      sha256 = "18x43l7ni7jwfpch4hngiyz5w05z48q8wmhm38gz3jw09w9npgi4";
+      name = "kdnssd-5.44.0.tar.xz";
     };
   };
   kdoctools = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kdoctools-5.43.0.tar.xz";
-      sha256 = "1llif166p17ffjwsgvb0n9lq8ip3if0hqma9zm9jpghm5j21q1jh";
-      name = "kdoctools-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kdoctools-5.44.0.tar.xz";
+      sha256 = "146crn9arrbi6ha7p5p0x7zmwlz86my067rif0v7j48xmmz6h5i3";
+      name = "kdoctools-5.44.0.tar.xz";
     };
   };
   kemoticons = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kemoticons-5.43.0.tar.xz";
-      sha256 = "161n9xg82gxvl4a4by328llxz0x4w643vcxi88414zg1bm1z1cfb";
-      name = "kemoticons-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kemoticons-5.44.0.tar.xz";
+      sha256 = "1ggwyzs22907kxgapqi7md3ng1ry85gccyxbqvn638inxk299mla";
+      name = "kemoticons-5.44.0.tar.xz";
     };
   };
   kfilemetadata = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kfilemetadata-5.43.0.tar.xz";
-      sha256 = "1lxbj8fnaf6sybxgyq6h1qnic65l0mdhhxlw1djd16c7ih7ghrnq";
-      name = "kfilemetadata-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kfilemetadata-5.44.0.tar.xz";
+      sha256 = "0v8xdl0wgp67ykw5czxzvzsqzijg0qpkm5vjc9rnai7zaymxg7bg";
+      name = "kfilemetadata-5.44.0.tar.xz";
     };
   };
   kglobalaccel = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kglobalaccel-5.43.0.tar.xz";
-      sha256 = "00ygkszkklaz7k4hkshcb5gfynha8rncwvj7z9jvhd9chmwkiffc";
-      name = "kglobalaccel-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kglobalaccel-5.44.0.tar.xz";
+      sha256 = "16qhf6kb6q85p6y9zh72b4rz0ikmahvhyzmrx0jd1r044g4j81wn";
+      name = "kglobalaccel-5.44.0.tar.xz";
     };
   };
   kguiaddons = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kguiaddons-5.43.0.tar.xz";
-      sha256 = "0z6sf4pr4ykhlzdckyfap2f41y2chrl2kwlrb4djflfxf7q2xcqr";
-      name = "kguiaddons-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kguiaddons-5.44.0.tar.xz";
+      sha256 = "1npl2ibk7ilsicmyvlnvf42lz6qjmqp4nl607a66ikxp3kvk3sdc";
+      name = "kguiaddons-5.44.0.tar.xz";
     };
   };
   kholidays = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kholidays-5.43.0.tar.xz";
-      sha256 = "0zkjh7y0gdwakil6dj0z8yi2zzczzvdfhmnsd54s5yn0fvv37xbk";
-      name = "kholidays-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kholidays-5.44.0.tar.xz";
+      sha256 = "134zxnkclh16gh0qf2ak1pmhlxxwrcgzgmkn5wrynwraplf9b812";
+      name = "kholidays-5.44.0.tar.xz";
     };
   };
   khtml = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/portingAids/khtml-5.43.0.tar.xz";
-      sha256 = "034aycdi7i6pvwkwz632nzk3vp8040hlvmzpp38nsy4idl4klh46";
-      name = "khtml-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/portingAids/khtml-5.44.0.tar.xz";
+      sha256 = "1sph90cfwq0067a6ih8mx1bn715lvsspn6s9lijmm0ck9vbbixgp";
+      name = "khtml-5.44.0.tar.xz";
     };
   };
   ki18n = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/ki18n-5.43.0.tar.xz";
-      sha256 = "1zspxv6z4a3rarrn9n38g7rp0gc48bl4kih91m3r2nkap83jb04a";
-      name = "ki18n-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/ki18n-5.44.0.tar.xz";
+      sha256 = "1rg24i8ks5mxryssq0zdig0q545zyj4svy9kb6r84qwag4vn7pcc";
+      name = "ki18n-5.44.0.tar.xz";
     };
   };
   kiconthemes = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kiconthemes-5.43.0.tar.xz";
-      sha256 = "105c892d4np4lshmd5f5x74m1ib3fbmvwgjzf6j317mq261r3rsw";
-      name = "kiconthemes-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kiconthemes-5.44.0.tar.xz";
+      sha256 = "1xkrczqw332hr667qp9pwlkypcn9d6zkx51bmi4bg9xfgpg1pwz4";
+      name = "kiconthemes-5.44.0.tar.xz";
     };
   };
   kidletime = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kidletime-5.43.0.tar.xz";
-      sha256 = "1jm2rdbzffnw0fv1pzfyz5lvzaa3x2pfp12zm9kl7skyj39z5vbj";
-      name = "kidletime-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kidletime-5.44.0.tar.xz";
+      sha256 = "1zf8rspn603hyz1rr3rkslnij7883f4ha0ls6v5phh19jdp9hcis";
+      name = "kidletime-5.44.0.tar.xz";
     };
   };
   kimageformats = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kimageformats-5.43.0.tar.xz";
-      sha256 = "1bn4rx5xx68m101n3ba774pd8qddaw3bwf2bc7zp7gi6d8bprh9i";
-      name = "kimageformats-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kimageformats-5.44.0.tar.xz";
+      sha256 = "1zpz3a4wghh348is2yyfs5qhhkg0261p5v2khxcgcy6vpblv1h1j";
+      name = "kimageformats-5.44.0.tar.xz";
     };
   };
   kinit = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kinit-5.43.0.tar.xz";
-      sha256 = "1jrzr4kv84rvf214wszd2zdnvlx2qxvr1ah9f564h23vvdrg79gd";
-      name = "kinit-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kinit-5.44.0.tar.xz";
+      sha256 = "1v3zmlmh3yg9333v7ha1xg3hp7ig2q8w7ixyzww5a5q4gxpzz9z5";
+      name = "kinit-5.44.0.tar.xz";
     };
   };
   kio = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kio-5.43.0.tar.xz";
-      sha256 = "1mbjld1kh5hhslfm4rx9nddghkcgrxbw2pf39c7niq0r1llx5v76";
-      name = "kio-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kio-5.44.0.tar.xz";
+      sha256 = "1dvif1779kh8d8yh6svmbs2yhvprzc38hchd4wb4l70hmzqcd3vs";
+      name = "kio-5.44.0.tar.xz";
     };
   };
   kirigami2 = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kirigami2-5.43.0.tar.xz";
-      sha256 = "0vshabb1q5pjscw0g57l7lpaal69g1mdpf01w0yskmbiqnzzpjl0";
-      name = "kirigami2-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kirigami2-5.44.0.tar.xz";
+      sha256 = "1vvq3c2j9v07ngkm3c8hwvik80sfd7i20ga7hyx4i94spjcagj6h";
+      name = "kirigami2-5.44.0.tar.xz";
     };
   };
   kitemmodels = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kitemmodels-5.43.0.tar.xz";
-      sha256 = "1yw7h7g0knlljizsf9cir196v22cqhlaazmrbm6jqz198g47sqdd";
-      name = "kitemmodels-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kitemmodels-5.44.0.tar.xz";
+      sha256 = "0m63i10nvgp86ajsd7aizah4g21dpwxrs2lvglv0kybhaykziwa8";
+      name = "kitemmodels-5.44.0.tar.xz";
     };
   };
   kitemviews = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kitemviews-5.43.0.tar.xz";
-      sha256 = "19w6xhhxr7w40baw6i6lfq0fd7bahxfzr7pj10mrwb5i6bcbsk1h";
-      name = "kitemviews-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kitemviews-5.44.0.tar.xz";
+      sha256 = "1vg99figpspm0p7ipbgf94j4xarcf2zicm3rijywxfcwcl0sr99h";
+      name = "kitemviews-5.44.0.tar.xz";
     };
   };
   kjobwidgets = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kjobwidgets-5.43.0.tar.xz";
-      sha256 = "1kri6z737abwsglh29bh4kckbf1ici8n162lcyvw8b3w91l4dyc6";
-      name = "kjobwidgets-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kjobwidgets-5.44.0.tar.xz";
+      sha256 = "1c26vdq8sqja95scqbvm0y2zhl1qx5aapkadi44vrjf54q4kgqrv";
+      name = "kjobwidgets-5.44.0.tar.xz";
     };
   };
   kjs = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/portingAids/kjs-5.43.0.tar.xz";
-      sha256 = "1jdqdy1kxarv6k31yd0k280jyfy7y3qwgd9c7is7aya1ns46nx59";
-      name = "kjs-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/portingAids/kjs-5.44.0.tar.xz";
+      sha256 = "1y350xgxip9qlwzanzlbyj4mb7i53msldv2wmacdp2di1hxn8ihy";
+      name = "kjs-5.44.0.tar.xz";
     };
   };
   kjsembed = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/portingAids/kjsembed-5.43.0.tar.xz";
-      sha256 = "11hcwwhkrl7sns4s36nxnp550n9xvky1rkrissm0mqh76309g6hy";
-      name = "kjsembed-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/portingAids/kjsembed-5.44.0.tar.xz";
+      sha256 = "0d71pnfx5fylxlpc0m08i1qasnrk0jvwmcv7zr7r8fnfagjl7gpk";
+      name = "kjsembed-5.44.0.tar.xz";
     };
   };
   kmediaplayer = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/portingAids/kmediaplayer-5.43.0.tar.xz";
-      sha256 = "1q1s5v3fqnmxx58ixgdhkhrgkrdxy8mq8hg4ll7l6038lgycfsxf";
-      name = "kmediaplayer-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/portingAids/kmediaplayer-5.44.0.tar.xz";
+      sha256 = "1nwpx2y8bl92m8yxk5c3sw7a0zm50hfpfrcicdqpv7nfs4n70anj";
+      name = "kmediaplayer-5.44.0.tar.xz";
     };
   };
   knewstuff = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/knewstuff-5.43.0.tar.xz";
-      sha256 = "1v3wzydi1jqb9an2bnxzfhwxhlb2lj8l735mdhym4859njj8x7w7";
-      name = "knewstuff-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/knewstuff-5.44.0.tar.xz";
+      sha256 = "1sd5780gpxidlc9g3dmd38ji5q5c1va49r604x5y739wjdrsgm0a";
+      name = "knewstuff-5.44.0.tar.xz";
     };
   };
   knotifications = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/knotifications-5.43.0.tar.xz";
-      sha256 = "0kgn5h38z9xd5a210w989j3z0khs4l9ahf19lqfara1ziwl4gaiv";
-      name = "knotifications-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/knotifications-5.44.0.tar.xz";
+      sha256 = "137snmjix1jji1vn40vxsnigddz7xxlkkch1rag79f6dqjnswb76";
+      name = "knotifications-5.44.0.tar.xz";
     };
   };
   knotifyconfig = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/knotifyconfig-5.43.0.tar.xz";
-      sha256 = "0nrjxs263sp64h9pmrmr7fjkbpkalzr6crpyq0aqclciwfjpj326";
-      name = "knotifyconfig-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/knotifyconfig-5.44.0.tar.xz";
+      sha256 = "0122w5mklyr958284824qzxxp76hacnf8zgv58b9ihr5finc919z";
+      name = "knotifyconfig-5.44.0.tar.xz";
     };
   };
   kpackage = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kpackage-5.43.0.tar.xz";
-      sha256 = "1nr7zkqp7zbvyrhc7iqznyqnfhmnqhhaqs30ig4gwsagq3x2a02b";
-      name = "kpackage-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kpackage-5.44.0.tar.xz";
+      sha256 = "1av8m9m7by0j128779rhws0pjc3hhi37cp311nks5sa5mmpbksmz";
+      name = "kpackage-5.44.0.tar.xz";
     };
   };
   kparts = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kparts-5.43.0.tar.xz";
-      sha256 = "09i2ds6xgkbm9k9nd9yj1p3qw9xl3a25lh97ln9c39ccx32i32wd";
-      name = "kparts-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kparts-5.44.0.tar.xz";
+      sha256 = "0bbf17y8nnd1gbhdnffhgj9xn1wjida6a7qgwi16k3zp4yjmpgac";
+      name = "kparts-5.44.0.tar.xz";
     };
   };
   kpeople = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kpeople-5.43.0.tar.xz";
-      sha256 = "0xi6sxprqvmjc30cw1rfpryahid9dswql6b1wrdv5wsmci8k4xmq";
-      name = "kpeople-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kpeople-5.44.0.tar.xz";
+      sha256 = "0gp602c2wq2ipbsan84r11a14xqpzyfszhb4lw3qkd7y4dpha37i";
+      name = "kpeople-5.44.0.tar.xz";
     };
   };
   kplotting = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kplotting-5.43.0.tar.xz";
-      sha256 = "0d5mf5xaysw837ninvdx1hfra8qjaxd9lcm28fyjfm506iq8v09f";
-      name = "kplotting-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kplotting-5.44.0.tar.xz";
+      sha256 = "0ccgpbccfrn4c4wri80zm8ni8390jnqywh4k1z5r68hzmr3l79xw";
+      name = "kplotting-5.44.0.tar.xz";
     };
   };
   kpty = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kpty-5.43.0.tar.xz";
-      sha256 = "09m02ramzk6jc9scnsvcm2sgnia2vmnnfgmjsddspc2kp1aj2km8";
-      name = "kpty-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kpty-5.44.0.tar.xz";
+      sha256 = "08jxq693mkwxr45696nz05f2zxa16finvacif330r6s03izvwfw0";
+      name = "kpty-5.44.0.tar.xz";
     };
   };
   kross = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/portingAids/kross-5.43.0.tar.xz";
-      sha256 = "05px64msss6as0pbrpl6l4y2n97kayphxqhwfilgsj9yjmyhm46h";
-      name = "kross-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/portingAids/kross-5.44.0.tar.xz";
+      sha256 = "1gq2cg3gq40rqih0kflfxl2n5l7j4gli0w57xnfhc39xpkpd1cqv";
+      name = "kross-5.44.0.tar.xz";
     };
   };
   krunner = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/krunner-5.43.0.tar.xz";
-      sha256 = "1wiaaz7wc2ls0gxyyws7cw6gmphkzayhdz1xxsyn4bzrc1h3z7dw";
-      name = "krunner-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/krunner-5.44.0.tar.xz";
+      sha256 = "1zr3zm528p4agw8d7krm4drs8638gfmbnm011r9kcmpjadkv0ila";
+      name = "krunner-5.44.0.tar.xz";
     };
   };
   kservice = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kservice-5.43.0.tar.xz";
-      sha256 = "1mdxd8kxawlhrsnd9lrx6cx9p8gvvsr9mx2d1s0bi90kapfqyqi3";
-      name = "kservice-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kservice-5.44.0.tar.xz";
+      sha256 = "0gzp8sbf0mk7nhy1hz9m3fz97lkwijpxwf2l2ljz375ylf374iyk";
+      name = "kservice-5.44.0.tar.xz";
     };
   };
   ktexteditor = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/ktexteditor-5.43.0.tar.xz";
-      sha256 = "1rhw1y0js2vjjp7c9f539lvqvci4nrgdicaypw3p5ndg8vsw2xag";
-      name = "ktexteditor-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/ktexteditor-5.44.0.tar.xz";
+      sha256 = "1g0v5sax3pfkvdcvyxyz81j3ainm0n1m7nc1rxh106iz8gs0z9cn";
+      name = "ktexteditor-5.44.0.tar.xz";
     };
   };
   ktextwidgets = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/ktextwidgets-5.43.0.tar.xz";
-      sha256 = "0h5bxf1a9mik2p2xhnm7nnr0r54s6zf4cby4qd8nlwl292dyf8gy";
-      name = "ktextwidgets-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/ktextwidgets-5.44.0.tar.xz";
+      sha256 = "1kxh39n9gzism99x1x7fpdqkppdpn7aaj6j3wp4a4y4hrn82bqwp";
+      name = "ktextwidgets-5.44.0.tar.xz";
     };
   };
   kunitconversion = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kunitconversion-5.43.0.tar.xz";
-      sha256 = "14syfc9vybmaais740xmb79g7ffpyanwkb2blar88zm810dpshqd";
-      name = "kunitconversion-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kunitconversion-5.44.0.tar.xz";
+      sha256 = "1zr7m1wmyr9phg3lq11qm0l24kkc1zh6xc3x4hcrpv1yn458qxdl";
+      name = "kunitconversion-5.44.0.tar.xz";
     };
   };
   kwallet = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kwallet-5.43.0.tar.xz";
-      sha256 = "01mxl06nbpgkp6dva1kvqcbhjahgjqkbql6rhwgdyhb4asabnsmj";
-      name = "kwallet-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kwallet-5.44.0.tar.xz";
+      sha256 = "01bah8rycjhgycd2bfkxj5jwfrwdbi2ba6bis79kbiaacl0q0qns";
+      name = "kwallet-5.44.0.tar.xz";
     };
   };
   kwayland = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kwayland-5.43.0.tar.xz";
-      sha256 = "0glp9bnv53jjycwni0ywd7apr0jps3j0hpzs14y2v9bp4mwjgaji";
-      name = "kwayland-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kwayland-5.44.0.tar.xz";
+      sha256 = "1pq8gikwcq6p67whhfm653xq79cdwr48br5ydism06644ikc2nlk";
+      name = "kwayland-5.44.0.tar.xz";
     };
   };
   kwidgetsaddons = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kwidgetsaddons-5.43.0.tar.xz";
-      sha256 = "15x7k953jj6vqmb2bbw4wad2n10akkg4i5n0gmkj4fsaiag359sr";
-      name = "kwidgetsaddons-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kwidgetsaddons-5.44.0.tar.xz";
+      sha256 = "11yaqwqkmwvhn9phmsfgyfl229zcrikdi3hz2w7nk8ibraagn5pi";
+      name = "kwidgetsaddons-5.44.0.tar.xz";
     };
   };
   kwindowsystem = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kwindowsystem-5.43.0.tar.xz";
-      sha256 = "0zcrls3m9np2a9r5n7fry03ll6vrj36abjh2sajm531z657xmxjd";
-      name = "kwindowsystem-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kwindowsystem-5.44.0.tar.xz";
+      sha256 = "0qn02c0yq1ir7vb56jhlla8j7nm6yx725hxnw31b8i62k1i7nvqy";
+      name = "kwindowsystem-5.44.0.tar.xz";
     };
   };
   kxmlgui = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kxmlgui-5.43.0.tar.xz";
-      sha256 = "1jncpyfvanyl02zx8zi2mmwbx86yaq9k7k40vh716dswbh2idzd3";
-      name = "kxmlgui-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kxmlgui-5.44.0.tar.xz";
+      sha256 = "1qr6j4cnndb14fdppc2mpbqgk1mkjfdxyl5pl7gjrwd8558brjg2";
+      name = "kxmlgui-5.44.0.tar.xz";
     };
   };
   kxmlrpcclient = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/kxmlrpcclient-5.43.0.tar.xz";
-      sha256 = "0c99wq7kqaqvafppcai47q8w9n21ncfmrc562cvhyqnx9qr9n5vn";
-      name = "kxmlrpcclient-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/kxmlrpcclient-5.44.0.tar.xz";
+      sha256 = "1r6mcwgagnskh8jiy2fyajgzqacw03d2qfk1fb3vv4lfwry4h2j3";
+      name = "kxmlrpcclient-5.44.0.tar.xz";
     };
   };
   modemmanager-qt = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/modemmanager-qt-5.43.0.tar.xz";
-      sha256 = "16h8af046jlhn31dg1y3ajpniidkijf0wy0qa7z6bpqw01vj4l6w";
-      name = "modemmanager-qt-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/modemmanager-qt-5.44.0.tar.xz";
+      sha256 = "1dkbyn6y605i8xqwqvpxmspp0fh7zarc0h54k30rnvv1g9rs1dd4";
+      name = "modemmanager-qt-5.44.0.tar.xz";
     };
   };
   networkmanager-qt = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/networkmanager-qt-5.43.0.tar.xz";
-      sha256 = "0pkm02bg201xcxyn2cbw1w3gag9ig4g5yz4wbd2db6qzvficmfqc";
-      name = "networkmanager-qt-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/networkmanager-qt-5.44.0.tar.xz";
+      sha256 = "0bhsminn31b8w1678im5zqixmyx1m5275szca9hh7wx6dl0sxhlw";
+      name = "networkmanager-qt-5.44.0.tar.xz";
     };
   };
   oxygen-icons5 = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/oxygen-icons5-5.43.0.tar.xz";
-      sha256 = "13c80jnc6h2z9bbwwzq1b8jsn80n4bs0zzr2xsbzsfbl5sw0hwpc";
-      name = "oxygen-icons5-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/oxygen-icons5-5.44.0.tar.xz";
+      sha256 = "0ymd9s26x2ryyw851y4yb2wl9f3syzfp0z08387h90jg6xk36si5";
+      name = "oxygen-icons5-5.44.0.tar.xz";
     };
   };
   plasma-framework = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/plasma-framework-5.43.0.tar.xz";
-      sha256 = "1v7far0jz0b0rvx4jzqsq2pp1diny5c2qz67jyxnqlfgsba8y466";
-      name = "plasma-framework-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/plasma-framework-5.44.0.tar.xz";
+      sha256 = "1lfrmrgamizfkr9jmfmf3afis0z40r1chpk854pqfr4p27j4gdmz";
+      name = "plasma-framework-5.44.0.tar.xz";
     };
   };
   prison = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/prison-5.43.0.tar.xz";
-      sha256 = "018kj3xgl5wr3nhrasxmwvk6fh63fdwlz78z1rzyd78jx95wpaqc";
-      name = "prison-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/prison-5.44.0.tar.xz";
+      sha256 = "0glcifwjm50kn6fk3lvwpslmh4s6s8g5r7h208dw56n19yhpkrfm";
+      name = "prison-5.44.0.tar.xz";
     };
   };
   purpose = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/purpose-5.43.0.tar.xz";
-      sha256 = "1vk796f3w2arqaql16yy012211vxgz6awa8kg0p1zrxbid43x757";
-      name = "purpose-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/purpose-5.44.0.tar.xz";
+      sha256 = "1scc2vbb5ws70kvicaay634ghgp2c7xhm7d907b36jj9gvyp4d2f";
+      name = "purpose-5.44.0.tar.xz";
     };
   };
   qqc2-desktop-style = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/qqc2-desktop-style-5.43.0.tar.xz";
-      sha256 = "0q6v1si1c8dlvq5f303dd4n1qqrn9kw0r51dl37px6rvy2n16d0w";
-      name = "qqc2-desktop-style-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/qqc2-desktop-style-5.44.0.tar.xz";
+      sha256 = "02s22xncpy988fbyjj17j5saamaf8q0sll4gd2s5xsswmalvnb51";
+      name = "qqc2-desktop-style-5.44.0.tar.xz";
     };
   };
   solid = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/solid-5.43.0.tar.xz";
-      sha256 = "0q62z23dml6rndgmkg6r09gsi0in8c4gbgv66dw47v02spsnp7v9";
-      name = "solid-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/solid-5.44.0.tar.xz";
+      sha256 = "08xw54m5srjr5n1h689hd05ld7ssimwvhlb9dlpxdavkag1vbqq1";
+      name = "solid-5.44.0.tar.xz";
     };
   };
   sonnet = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/sonnet-5.43.0.tar.xz";
-      sha256 = "0i5vxaw124093fi7fi8gjyi08xgxpkpb68lrpsxqdikadvx6nwaa";
-      name = "sonnet-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/sonnet-5.44.0.tar.xz";
+      sha256 = "1dip8h9frxvzy39cjc205y2szdpczyh1fldlcpcq8ckjfk8pmgdm";
+      name = "sonnet-5.44.0.tar.xz";
     };
   };
   syntax-highlighting = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/syntax-highlighting-5.43.0.tar.xz";
-      sha256 = "0a1xrpk3wavcq6d3cld33l05g5xlhz635vwcc6i1092gsgdns7k1";
-      name = "syntax-highlighting-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/syntax-highlighting-5.44.0.tar.xz";
+      sha256 = "10s5m1as9c1kln8mc7zf2m8zsqrf9rxfa2rzfyff1kki1icp65nm";
+      name = "syntax-highlighting-5.44.0.tar.xz";
     };
   };
   threadweaver = {
-    version = "5.43.0";
+    version = "5.44.0";
     src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.43/threadweaver-5.43.0.tar.xz";
-      sha256 = "0mmnf6lirvqwlrijpn5vqd8l9pk74dpsbr81y6kyfmx31mj36jjx";
-      name = "threadweaver-5.43.0.tar.xz";
+      url = "${mirror}/stable/frameworks/5.44/threadweaver-5.44.0.tar.xz";
+      sha256 = "135x9z1rzvlhx13nbkacmcj7g0z88rpv0c2vy8yybysfaspc1hzn";
+      name = "threadweaver-5.44.0.tar.xz";
     };
   };
 }

From f9dda86b39bb40da707c50191ba11f537ff68149 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sun, 18 Mar 2018 23:28:34 +0100
Subject: [PATCH 007/123] sqldeveloper: 17.4.0.355.2349 -> 17.4.1.054.0712

---
 pkgs/development/tools/database/sqldeveloper/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/database/sqldeveloper/default.nix b/pkgs/development/tools/database/sqldeveloper/default.nix
index 72c0aaabf85..a5d5702029b 100644
--- a/pkgs/development/tools/database/sqldeveloper/default.nix
+++ b/pkgs/development/tools/database/sqldeveloper/default.nix
@@ -1,7 +1,7 @@
 { stdenv, makeWrapper, requireFile, unzip, openjdk }:
 
 stdenv.mkDerivation rec {
-  version = "17.4.0.355.2349";
+  version = "17.4.1.054.0712";
   name = "sqldeveloper-${version}";
 
   src = requireFile rec {
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
         nix-prefetch-url --type sha256 file:///path/to/${name}
     '';
     # obtained by `sha256sum sqldeveloper-${version}-no-jre.zip`
-    sha256 = "70add9b5c998583416e3d127aeb63dde8e3d0489036982026b930c85496c7850";
+    sha256 = "7e92ca94d02489002db291c96f1d67f9b2501a8967ff3457103fcf60c1eb154a";
   };
 
   buildInputs = [ makeWrapper unzip ];

From 6634049f220ac0cde10cf9c3725c7f41d21e020a Mon Sep 17 00:00:00 2001
From: Hendrik Schaeidt <he.schaeidt@gmail.com>
Date: Tue, 13 Mar 2018 15:49:34 +0100
Subject: [PATCH 008/123] stabber: init at 2016-11-09

---
 pkgs/misc/stabber/default.nix   | 31 +++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/misc/stabber/default.nix

diff --git a/pkgs/misc/stabber/default.nix b/pkgs/misc/stabber/default.nix
new file mode 100644
index 00000000000..ec8ef076c2f
--- /dev/null
+++ b/pkgs/misc/stabber/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, expat
+, libmicrohttpd
+}:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  name = "stabber-unstable-${version}";
+  version = "2016-11-09";
+
+  src = fetchFromGitHub {
+    owner = "boothj5";
+    repo = "stabber";
+    rev = "ed75087e4483233eb2cc5472dbd85ddfb7a1d4d4";
+    sha256 = "1l6cibggi9rx6d26j1g92r1m8zm1g899f6z7n4pfqp84mrfqgz0p";
+  };
+
+  preAutoreconf = ''
+    mkdir m4
+  '';
+
+  buildInputs = [ autoreconfHook pkgconfig glib expat libmicrohttpd ];
+
+  meta = {
+    description = "Stubbed XMPP Server";
+    homepage = https://github.com/boothj5/stabber;
+    license = licenses.gpl3;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ hschaeidt ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8858029a687..b3cd06e92aa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4894,6 +4894,8 @@ with pkgs;
 
   ssss = callPackage ../tools/security/ssss { };
 
+  stabber = callPackage ../misc/stabber { };
+
   stress = callPackage ../tools/system/stress { };
 
   stress-ng = callPackage ../tools/system/stress-ng { };

From 86ff559f8282cdffd108933f48f9d3b13539ab74 Mon Sep 17 00:00:00 2001
From: Hendrik Schaeidt <he.schaeidt@gmail.com>
Date: Wed, 14 Mar 2018 16:38:06 +0100
Subject: [PATCH 009/123] add hschaeidt to maintainer list

---
 maintainers/maintainer-list.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 2f4e4355673..b31ed2d083d 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1523,6 +1523,11 @@
     github = "hrdinka";
     name = "Christoph Hrdinka";
   };
+  hschaeidt = {
+    email = "he.schaeidt@gmail.com";
+    github = "hschaeidt";
+    name = "Hendrik Schaeidt";
+  };
   htr = {
     email = "hugo@linux.com";
     github = "htr";

From c0cf13e52ea9757ded4294521fbe266637006548 Mon Sep 17 00:00:00 2001
From: Clemens Fruhwirth <clemens@endorphin.org>
Date: Mon, 19 Mar 2018 13:18:49 +0100
Subject: [PATCH 010/123] Add space for NIX_CXXSTDLIB_COMPILE+=' ...' as
 NIX_CXXSTDLIB_COMPILE might not be empty.

---
 pkgs/development/compilers/gcc/libstdc++-hook.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/gcc/libstdc++-hook.sh b/pkgs/development/compilers/gcc/libstdc++-hook.sh
index 2d30c845b5a..893bbbc0c2d 100644
--- a/pkgs/development/compilers/gcc/libstdc++-hook.sh
+++ b/pkgs/development/compilers/gcc/libstdc++-hook.sh
@@ -1,2 +1,2 @@
-export NIX_CXXSTDLIB_COMPILE+="-isystem $(echo -n @gcc@/include/c++/*) -isystem $(echo -n @gcc@/include/c++/*)/$(@gcc@/bin/gcc -dumpmachine)"
+export NIX_CXXSTDLIB_COMPILE+=" -isystem $(echo -n @gcc@/include/c++/*) -isystem $(echo -n @gcc@/include/c++/*)/$(@gcc@/bin/gcc -dumpmachine)"
 export NIX_CXXSTDLIB_LINK=" -stdlib=libstdc++"

From 8ade9e6705701c1445c82cf895ddbe99b2557c41 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Thu, 15 Mar 2018 12:04:54 +0100
Subject: [PATCH 011/123] h5utils: init at 1.13.1

---
 pkgs/tools/misc/h5utils/default.nix | 38 +++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  5 ++++
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/tools/misc/h5utils/default.nix

diff --git a/pkgs/tools/misc/h5utils/default.nix b/pkgs/tools/misc/h5utils/default.nix
new file mode 100644
index 00000000000..db18cae77b1
--- /dev/null
+++ b/pkgs/tools/misc/h5utils/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchurl, lib
+, hdf5, libpng, libjpeg
+, hdf4 ? null
+, libmatheval ? null
+}:
+
+stdenv.mkDerivation rec {
+  version = "1.13.1";
+  name = "h5utils-${version}";
+
+  # fetchurl is used instead of fetchFromGitHub because the git repo version requires
+  # additional tools to build compared to the tarball release; see the README for details.
+  src = fetchurl {
+    url = "https://github.com/stevengj/h5utils/releases/download/${version}/h5utils-${version}.tar.gz";
+    sha256 = "0rbx3m8p5am8z5m0f3sryryfc41541hjpkixb1jkxakd9l36z9y5";
+  };
+
+  # libdf is an alternative name for libhdf (hdf4)
+  preConfigure = lib.optionalString (hdf4 != null)
+  ''
+    substituteInPlace configure \
+    --replace "-ldf" "-lhdf" \
+  '';
+
+  preBuild = lib.optionalString hdf5.mpiSupport "export CC=${hdf5.mpi}/bin/mpicc";
+
+  buildInputs = with lib; [ hdf5 libjpeg libpng ] ++ optional hdf5.mpiSupport hdf5.mpi
+    ++ optional (hdf4 != null) hdf4
+    ++ optional (libmatheval != null) libmatheval;
+
+  meta = with lib; {
+    description = "A set of utilities for visualization and conversion of scientific data in the free, portable HDF5 format";
+    homepage = https://github.com/stevengj/h5utils;
+    license = with licenses; [ mit gpl2 ];
+    maintainers = with maintainers; [ sfrijters ];
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 908dbf4f0a1..7fe87becb09 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2769,6 +2769,11 @@ with pkgs;
 
   h2 = callPackage ../servers/h2 { };
 
+  h5utils = callPackage ../tools/misc/h5utils {
+    libmatheval = null;
+    hdf4 = null;
+  };
+
   haproxy = callPackage ../tools/networking/haproxy { };
 
   haveged = callPackage ../tools/security/haveged { };

From e506914cfb484195153490673eb558ec9e604325 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Mon, 19 Mar 2018 22:39:42 -0700
Subject: [PATCH 012/123] commonsCompress: 1.8.1 -> 1.16.1

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.16.1 in filename of file in /nix/store/bkj0f3csgr7z46ancws66bzgcxpamq8x-commons-compress-1.16.1
- directory tree listing: https://gist.github.com/2f7f8d5e9ede388260bcf5a3e305bd80
---
 pkgs/development/libraries/java/commons/compress/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/java/commons/compress/default.nix b/pkgs/development/libraries/java/commons/compress/default.nix
index a35eaa0b260..eff57d6f2fd 100644
--- a/pkgs/development/libraries/java/commons/compress/default.nix
+++ b/pkgs/development/libraries/java/commons/compress/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "1.8.1";
+  version = "1.16.1";
   name    = "commons-compress-${version}";
 
   src = fetchurl {
     url    = "mirror://apache/commons/compress/binaries/${name}-bin.tar.gz";
-    sha256 = "11viabgf34r3zx1avj51n00hzmx89kym3i90l6a5v5dbfh61h0lp";
+    sha256 = "0yz2m3qac1idg9346i64mjfrkq4kniajzx2manyybhj43v9dpx37";
   };
 
   installPhase = ''

From ba74cf4d5ceb3aa516af2a10d2ee86b79ff75ac1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 20 Mar 2018 09:58:15 +0100
Subject: [PATCH 013/123] pythonPackages.django_pipeline: move expression

---
 .../django-pipeline/default.nix               | 20 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 18 +----------------
 2 files changed, 21 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/development/python-modules/django-pipeline/default.nix

diff --git a/pkgs/development/python-modules/django-pipeline/default.nix b/pkgs/development/python-modules/django-pipeline/default.nix
new file mode 100644
index 00000000000..f29ae365877
--- /dev/null
+++ b/pkgs/development/python-modules/django-pipeline/default.nix
@@ -0,0 +1,20 @@
+{ lib, buildPythonPackage, fetchPypi
+, django, futures }:
+
+buildPythonPackage rec {
+  pname = "django-pipeline";
+  version = "1.5.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1y49fa8jj7x9qjj5wzhns3zxwj0s73sggvkrv660cqw5qb7d8hha";
+  };
+
+  propagatedBuildInputs = [ django futures ];
+
+  meta = with lib; {
+    description = "Pipeline is an asset packaging library for Django";
+    homepage = https://github.com/cyberdelia/django-pipeline;
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8acec15fd71..b5e3f96d849 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6883,23 +6883,7 @@ in {
     };
   };
 
-  django_pipeline = buildPythonPackage rec {
-    name = "django-pipeline-${version}";
-    version = "1.5.1";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/d/django-pipeline/${name}.tar.gz";
-      sha256 = "1y49fa8jj7x9qjj5wzhns3zxwj0s73sggvkrv660cqw5qb7d8hha";
-    };
-
-    propagatedBuildInputs = with self; [ django futures ];
-
-    meta = with stdenv.lib; {
-      description = "Pipeline is an asset packaging library for Django";
-      homepage = https://github.com/cyberdelia/django-pipeline;
-      license = stdenv.lib.licenses.mit;
-    };
-  };
+  django_pipeline = callPackage ../development/python-modules/django-pipeline { };
 
   django_pipeline_1_3 = self.django_pipeline.overrideDerivation (super: rec {
     name = "django-pipeline-1.3.27";

From 127045d8e0a9481084649567c1520468582e3f33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 20 Mar 2018 10:31:35 +0100
Subject: [PATCH 014/123] pythonPackages.slimit: init at 0.8.1

---
 .../python-modules/slimit/default.nix         | 36 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/development/python-modules/slimit/default.nix

diff --git a/pkgs/development/python-modules/slimit/default.nix b/pkgs/development/python-modules/slimit/default.nix
new file mode 100644
index 00000000000..ff4c63891e5
--- /dev/null
+++ b/pkgs/development/python-modules/slimit/default.nix
@@ -0,0 +1,36 @@
+{ lib, buildPythonPackage, fetchPypi, isPy3k, fetchpatch, python, ply }:
+
+buildPythonPackage rec {
+  pname = "slimit";
+  version = "0.8.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    extension = "zip";
+    sha256 = "f433dcef899f166b207b67d91d3f7344659cb33b8259818f084167244e17720b";
+  };
+
+  # Some patches from https://github.com/rspivak/slimit/pull/65
+  patches = lib.optionals isPy3k [
+    (fetchpatch {
+      url = https://github.com/lelit/slimit/commit/a61e12d88cc123c4b7af2abef21d06fd182e561a.patch;
+      sha256 = "0lbhvkgn4l8g9fwvb81rfwjx7hsaq2pid8a5gczdk1ba65wfvdq5";
+    })
+    (fetchpatch {
+      url = https://github.com/lelit/slimit/commit/e8331659fb89e8a4613c5e4e338c877fead9c551.patch;
+      sha256 = "1hv4ysn09c9bfd5bxhhrp51hsi81hdidmx0y7zcrjjiich9ayrni";
+    })
+  ];
+
+  propagatedBuildInputs = [ ply ];
+
+  checkPhase = ''
+    ${python.interpreter} -m unittest discover -s src/slimit
+  '';
+
+  meta = with lib; {
+    description = "JavaScript minifier";
+    homepage = http://slimit.readthedocs.org/;
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b5e3f96d849..96d3cd2f75e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15021,6 +15021,8 @@ in {
     };
   };
 
+  slimit = callPackage ../development/python-modules/slimit { };
+
   slob = buildPythonPackage rec {
     name = "slob-unstable-2016-11-03";
 

From 7e44f19fceaae77422b04f74407f600c404e8ab2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 20 Mar 2018 13:41:38 +0100
Subject: [PATCH 015/123] zstd: Fix install name on macOS

It had an install name '/usr/local/lib/libzstd.1.dylib'.
---
 pkgs/tools/compression/zstd/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix
index 457170013ce..6617a4346e5 100644
--- a/pkgs/tools/compression/zstd/default.nix
+++ b/pkgs/tools/compression/zstd/default.nix
@@ -1,4 +1,5 @@
 { stdenv, fetchFromGitHub, gnugrep
+, fixDarwinDylibNames
 , legacySupport ? false }:
 
 stdenv.mkDerivation rec {
@@ -12,6 +13,8 @@ stdenv.mkDerivation rec {
     owner = "facebook";
   };
 
+  buildInputs = stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames;
+
   makeFlags = [
     "ZSTD_LEGACY_SUPPORT=${if legacySupport then "1" else "0"}"
   ];

From 9aa22191cf38df2c99ef79c505f6e7d85a16adb8 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 20 Mar 2018 08:10:08 -0500
Subject: [PATCH 016/123] python*: set thread stack size on musl

Ensure recursion limit is reached before stack overflow.

Python does this for OSX and BSD:
https://github.com/python/cpython/blob/13ff24582c99dfb439b1af7295b401415e7eb05b/Python/thread_pthread.h#L22

Size of 1MB chosen to match value in Alpine:
https://git.alpinelinux.org/cgit/aports/commit/main/python2/APKBUILD?id=2f35283fec8ec451fe5fb477dd32ffdcc0776e89

Manual testing via Alpine's test-stacksize.py crashes on these
previously, and works with these changes.
---
 pkgs/development/interpreters/python/cpython/2.7/default.nix | 3 ++-
 pkgs/development/interpreters/python/cpython/3.4/default.nix | 3 +++
 pkgs/development/interpreters/python/cpython/3.5/default.nix | 3 +++
 pkgs/development/interpreters/python/cpython/3.6/default.nix | 3 +++
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix
index a934d6c3bcf..98e5b4b1da0 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/default.nix
+++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix
@@ -176,7 +176,8 @@ in stdenv.mkDerivation {
     LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
     inherit (mkPaths buildInputs) C_INCLUDE_PATH LIBRARY_PATH;
 
-    NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-msse2";
+    NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin "-msse2"
+      + optionalString hostPlatform.isMusl " -DTHREAD_STACK_SIZE=0x100000";
     DETERMINISTIC_BUILD = 1;
 
     setupHook = python-setup-hook sitePackages;
diff --git a/pkgs/development/interpreters/python/cpython/3.4/default.nix b/pkgs/development/interpreters/python/cpython/3.4/default.nix
index d4391d873af..797a5be40ff 100644
--- a/pkgs/development/interpreters/python/cpython/3.4/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.4/default.nix
@@ -105,6 +105,9 @@ in stdenv.mkDerivation {
     ${optionalString stdenv.isDarwin ''
        export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2"
        export MACOSX_DEPLOYMENT_TARGET=10.6
+     ''
+     + optionalString stdenv.hostPlatform.isMusl ''
+      export NIX_CFLAGS_COMPILE+=" -DTHREAD_STACK_SIZE=0x100000"
      ''}
   '';
 
diff --git a/pkgs/development/interpreters/python/cpython/3.5/default.nix b/pkgs/development/interpreters/python/cpython/3.5/default.nix
index 4f9e79c1d5f..6dbf9a09cf5 100644
--- a/pkgs/development/interpreters/python/cpython/3.5/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.5/default.nix
@@ -99,6 +99,9 @@ in stdenv.mkDerivation {
     ${optionalString stdenv.isDarwin ''
        export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2"
        export MACOSX_DEPLOYMENT_TARGET=10.6
+     ''
+     + optionalString stdenv.hostPlatform.isMusl ''
+      export NIX_CFLAGS_COMPILE+=" -DTHREAD_STACK_SIZE=0x100000"
      ''}
   '';
 
diff --git a/pkgs/development/interpreters/python/cpython/3.6/default.nix b/pkgs/development/interpreters/python/cpython/3.6/default.nix
index 317a335b344..63a70b7496d 100644
--- a/pkgs/development/interpreters/python/cpython/3.6/default.nix
+++ b/pkgs/development/interpreters/python/cpython/3.6/default.nix
@@ -122,6 +122,9 @@ in stdenv.mkDerivation {
     ${optionalString stdenv.isDarwin ''
        export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -msse2"
        export MACOSX_DEPLOYMENT_TARGET=10.6
+     ''
+     + optionalString stdenv.hostPlatform.isMusl ''
+      export NIX_CFLAGS_COMPILE+=" -DTHREAD_STACK_SIZE=0x100000"
      ''}
   '';
 

From de0ea1dd18e77733e604a972d7fc88bba4a069b2 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 20 Mar 2018 09:37:59 -0400
Subject: [PATCH 017/123] scala: 2.12.4 -> 2.12.5

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

diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix
index 7622fbb9d18..bfbd9d05d05 100644
--- a/pkgs/development/compilers/scala/default.nix
+++ b/pkgs/development/compilers/scala/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }:
 
 stdenv.mkDerivation rec {
-  name = "scala-2.12.4";
+  name = "scala-2.12.5";
 
   src = fetchurl {
     url = "http://www.scala-lang.org/files/archive/${name}.tgz";
-    sha256 = "089a54qj8psh4jxqbrrwk5zahw13fyqq24l87s3031xa675a0m4m";
+    sha256 = "18bah2n3jfvc3cb10n4b3d6pwm3rwlqp7lrfvafjxccmlklzyqdj";
   };
 
   propagatedBuildInputs = [ jre ] ;

From 497e50cf161f2873490e19ae392553f6d2bdcac3 Mon Sep 17 00:00:00 2001
From: Alastair Pharo <asppsa@gmail.com>
Date: Wed, 21 Mar 2018 01:45:19 +1100
Subject: [PATCH 018/123] emscripten: use matching binaryen version (#37427)

This changes the emscripten package so that it specifies the rev from
the binaryen repo to use, and sets it to always use the version that has
been tagged for use with that version of emscripten.  This should force
future updates of emscripten to also update binaryen.

Binaryen can also be installed as a stand-alone package, so there's some
logic added to the binaryen package to allow building in both ways, and
distinguishing between them.
---
 .../compilers/binaryen/default.nix            | 25 ++++++++++++++++---
 .../compilers/emscripten/default.nix          |  3 ++-
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix
index 2b3919160e4..2c2869f76e7 100644
--- a/pkgs/development/compilers/binaryen/default.nix
+++ b/pkgs/development/compilers/binaryen/default.nix
@@ -1,14 +1,31 @@
-{ stdenv, cmake, fetchFromGitHub }:
+{ stdenv, cmake, fetchFromGitHub, emscriptenRev ? null }:
+
+let
+  defaultVersion = "44";
+
+  # Map from git revs to SHA256 hashes
+  sha256s = {
+    "version_44" = "0zsqppc05fm62807w6vyccxkk2y2gar7kxbxxixq8zz3xsp6w84p";
+    "1.37.36" = "1wgzfzjjzkiaz0rf2lnwrcvlcsjvjhyvbyh58jxhqq43vi34zyjc";
+  };
+in
 
 stdenv.mkDerivation rec {
-  version = "44";
-  rev = "version_${version}";
+  version = if emscriptenRev == null
+            then defaultVersion
+            else "emscripten-${emscriptenRev}";
+  rev = if emscriptenRev == null
+        then "version_${version}"
+        else emscriptenRev;
   name = "binaryen-${version}";
 
   src = fetchFromGitHub {
     owner = "WebAssembly";
     repo = "binaryen";
-    sha256 = "0zsqppc05fm62807w6vyccxkk2y2gar7kxbxxixq8zz3xsp6w84p";
+    sha256 =
+      if builtins.hasAttr rev sha256s
+      then builtins.getAttr rev sha256s
+      else null;
     inherit rev;
   };
 
diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix
index ac972c99a95..8e268aa7eb7 100644
--- a/pkgs/development/compilers/emscripten/default.nix
+++ b/pkgs/development/compilers/emscripten/default.nix
@@ -5,6 +5,7 @@
 let
   rev = emscriptenVersion;
   appdir = "share/emscripten";
+  binaryenVersioned = binaryen.override { emscriptenRev = rev; };
 in
 
 stdenv.mkDerivation {
@@ -44,7 +45,7 @@ stdenv.mkDerivation {
     echo "SPIDERMONKEY_ENGINE = []" >> $out/${appdir}/config
   ''
   + stdenv.lib.optionalString enableWasm ''
-    echo "BINARYEN_ROOT = '${binaryen}'" >> $out/share/emscripten/config
+    echo "BINARYEN_ROOT = '${binaryenVersioned}'" >> $out/share/emscripten/config
   ''
   +
   ''

From d3396058317d5a0d72685458ee743e3b324d3e53 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 20 Mar 2018 08:18:38 -0700
Subject: [PATCH 019/123] jsonnet: 0.9.5 -> 0.10.0 (#37455)

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/348mi6qinpcnhrk0l8zy9m9lk43xqpml-jsonnet-0.10.0/bin/jsonnet -h` got 0 exit code
- ran `/nix/store/348mi6qinpcnhrk0l8zy9m9lk43xqpml-jsonnet-0.10.0/bin/jsonnet --help` got 0 exit code
- ran `/nix/store/348mi6qinpcnhrk0l8zy9m9lk43xqpml-jsonnet-0.10.0/bin/jsonnet -v` and found version 0.10.0
- ran `/nix/store/348mi6qinpcnhrk0l8zy9m9lk43xqpml-jsonnet-0.10.0/bin/jsonnet --version` and found version 0.10.0
- ran `/nix/store/348mi6qinpcnhrk0l8zy9m9lk43xqpml-jsonnet-0.10.0/bin/jsonnet -h` and found version 0.10.0
- ran `/nix/store/348mi6qinpcnhrk0l8zy9m9lk43xqpml-jsonnet-0.10.0/bin/jsonnet --help` and found version 0.10.0
- found 0.10.0 with grep in /nix/store/348mi6qinpcnhrk0l8zy9m9lk43xqpml-jsonnet-0.10.0
- directory tree listing: https://gist.github.com/9a4279146abdaa645fdcd5481889e783
---
 pkgs/development/compilers/jsonnet/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/jsonnet/default.nix b/pkgs/development/compilers/jsonnet/default.nix
index d4664673306..839e3e71e81 100644
--- a/pkgs/development/compilers/jsonnet/default.nix
+++ b/pkgs/development/compilers/jsonnet/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchFromGitHub, emscripten }:
 
-let version = "0.9.5"; in
+let version = "0.10.0"; in
 
 stdenv.mkDerivation {
   name = "jsonnet-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
     rev = "v${version}";
     owner = "google";
     repo = "jsonnet";
-    sha256 = "193sa4hdhvml0c32nmdkjii41hbyc5l0zisdn699ar0gaq7yiqan";
+    sha256 = "0xj540140r89qrdh3h4kzlz4x8c576ynq9i1x82zzl3d7fxbk5f0";
   };
 
   buildInputs = [ emscripten ];

From 61d4538812f12a46acc24693e71fcbe5d9c44f1e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 18 Mar 2018 18:03:00 +0100
Subject: [PATCH 020/123] LTS Haskell 11.1

This update was generated by hackage2nix v2.9.1-1-g63041e4 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/6aec0b311cc2d5685d1d55c277148c9bfe1580da.
---
 .../configuration-hackage2nix.yaml            |  218 +-
 .../haskell-modules/hackage-packages.nix      | 4035 ++++++++---------
 2 files changed, 1879 insertions(+), 2374 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 24a96299635..901d49a4fae 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -38,7 +38,7 @@ core-packages:
   - ghcjs-base-0
 
 default-package-overrides:
-  # LTS Haskell 11.0
+  # LTS Haskell 11.1
   - abstract-deque ==0.3
   - abstract-deque-tests ==0.3
   - abstract-par ==0.3.3
@@ -60,7 +60,7 @@ default-package-overrides:
   - active ==0.2.0.13
   - ad ==4.3.5
   - adjunctions ==4.4
-  - adler32 ==0.1.1.0
+  - adler32 ==0.1.2.0
   - aern2-mp ==0.1.2.0
   - aern2-real ==0.1.1.0
   - aeson ==1.2.4.0
@@ -71,10 +71,10 @@ default-package-overrides:
   - aeson-extra ==0.4.1.0
   - aeson-generic-compat ==0.0.1.1
   - aeson-injector ==1.1.0.0
-  - aeson-picker ==0.1.0.3
+  - aeson-picker ==0.1.0.4
   - aeson-pretty ==0.8.5
   - aeson-qq ==0.8.2
-  - aeson-typescript ==0.1.0.3
+  - aeson-typescript ==0.1.0.6
   - aeson-utils ==0.3.0.2
   - aeson-yak ==0.1.1.3
   - Agda ==2.5.3
@@ -108,7 +108,7 @@ default-package-overrides:
   - array-memoize ==0.6.0
   - arrow-extras ==0.1.0.1
   - arrow-list ==0.7
-  - asciidiagram ==1.3.3
+  - asciidiagram ==1.3.3.1
   - ascii-progress ==0.3.3.0
   - asn1-encoding ==0.9.5
   - asn1-parse ==0.9.4
@@ -136,11 +136,11 @@ default-package-overrides:
   - authenticate ==1.3.4
   - authenticate-oauth ==1.6
   - auto ==0.4.3.1
-  - autoexporter ==1.1.4
+  - autoexporter ==1.1.9
   - auto-update ==0.1.4
   - avwx ==0.3.0.2
   - axiom ==0.4.6
-  - b9 ==0.5.35
+  - b9 ==0.5.41
   - backprop ==0.1.3.0
   - bank-holidays-england ==0.1.0.6
   - barrier ==0.1.1
@@ -205,7 +205,7 @@ default-package-overrides:
   - blas-hs ==0.1.1.0
   - blastxml ==0.3.2
   - blaze-bootstrap ==0.1.0.1
-  - blaze-builder ==0.4.0.2
+  - blaze-builder ==0.4.1.0
   - blaze-html ==0.9.0.1
   - blaze-markup ==0.8.2.0
   - blaze-svg ==0.3.6.1
@@ -230,6 +230,7 @@ default-package-overrides:
   - brick ==0.34.1
   - brittany ==0.9.0.1
   - broadcast-chan ==0.1.1
+  - bsb-http-chunked ==0.0.0.2
   - bson ==0.3.2.3
   - bson-lens ==0.1.1
   - btrfs ==0.1.2.3
@@ -266,7 +267,7 @@ default-package-overrides:
   - carray ==0.1.6.8
   - cartel ==0.18.0.2
   - cased ==0.1.0.0
-  - case-insensitive ==1.2.0.10
+  - case-insensitive ==1.2.0.11
   - cases ==0.1.3.2
   - casing ==0.1.2.1
   - cassava ==0.5.1.0
@@ -316,7 +317,7 @@ default-package-overrides:
   - clr-host ==0.2.0.1
   - clr-marshal ==0.2.0.0
   - clumpiness ==0.17.0.0
-  - ClustalParser ==1.2.2
+  - ClustalParser ==1.2.3
   - cmark ==0.5.6
   - cmark-gfm ==0.1.3
   - cmark-highlight ==0.2.0.0
@@ -345,12 +346,13 @@ default-package-overrides:
   - compressed ==3.11
   - concise ==0.1.0.1
   - concurrency ==1.4.0.2
-  - concurrent-extra ==0.7.0.11
-  - concurrent-output ==1.10.4
+  - concurrent-extra ==0.7.0.12
+  - concurrent-output ==1.10.5
   - concurrent-split ==0.0.1
   - concurrent-supply ==0.1.8
   - cond ==0.4.1.1
-  - conduit ==1.3.0
+  - conduit ==1.3.0.1
+  - conduit-algorithms ==0.0.8.0
   - conduit-combinators ==1.3.0
   - conduit-connection ==0.1.0.4
   - conduit-extra ==1.3.0
@@ -358,7 +360,7 @@ default-package-overrides:
   - conduit-throttle ==0.3.1.0
   - ConfigFile ==1.1.4
   - config-ini ==0.2.2.0
-  - configuration-tools ==0.3.0
+  - configuration-tools ==0.3.1
   - configurator ==0.3.0.0
   - configurator-export ==0.1.0.1
   - connection ==0.2.8
@@ -393,7 +395,7 @@ default-package-overrides:
   - crypto-cipher-tests ==0.0.11
   - crypto-cipher-types ==0.0.9
   - cryptocompare ==0.1.1
-  - crypto-enigma ==0.0.2.10
+  - crypto-enigma ==0.0.2.11
   - cryptohash ==0.11.9
   - cryptohash-cryptoapi ==0.1.4
   - cryptohash-md5 ==0.11.100.1
@@ -414,15 +416,15 @@ default-package-overrides:
   - csv-conduit ==0.6.8.1
   - ctrie ==0.2
   - cubicspline ==0.1.2
-  - cublas ==0.4.0.0
-  - cuda ==0.9.0.2
+  - cublas ==0.4.0.1
+  - cuda ==0.9.0.3
   - cue-sheet ==1.0.1
   - cufft ==0.8.0.0
   - curl ==1.3.8
   - curl-runnings ==0.2.0
   - currencies ==0.1.1.1
-  - cusolver ==0.1.0.0
-  - cusparse ==0.1.0.0
+  - cusolver ==0.1.0.1
+  - cusparse ==0.1.0.1
   - cutter ==0.0
   - czipwith ==1.0.0.0
   - data-accessor ==0.2.2.7
@@ -468,13 +470,14 @@ default-package-overrides:
   - debug ==0.1
   - Decimal ==0.5.1
   - deepseq-generics ==0.2.0.0
-  - dejafu ==1.3.1.0
+  - dejafu ==1.3.2.0
   - dependent-map ==0.2.4.0
   - dependent-sum ==0.4
   - dependent-sum-template ==0.0.0.6
   - deque ==0.2
   - deriving-compat ==0.4.1
   - descriptive ==0.9.4
+  - dhall ==1.11.1
   - dice ==0.1
   - dictionaries ==0.2.0.4
   - Diff ==0.3.4
@@ -506,17 +509,17 @@ default-package-overrides:
   - dlist-instances ==0.1.1.1
   - dlist-nonempty ==0.1.1
   - dns ==3.0.2
-  - docker ==0.5.1.0
-  - docker-build-cacher ==1.9.1
+  - docker ==0.5.1.1
+  - docker-build-cacher ==1.9.2
   - dockerfile ==0.1.0.1
   - docopt ==0.7.0.5
-  - doctemplates ==0.2.2
+  - doctemplates ==0.2.2.1
   - doctest ==0.13.0
   - doctest-discover ==0.1.0.7
   - doctest-driver-gen ==0.2.0.0
   - do-list ==1.0.1
   - dom-parser ==3.0.0
-  - dotenv ==0.5.2.3
+  - dotenv ==0.5.2.4
   - dotnet-timespan ==0.0.1.0
   - double-conversion ==2.0.2.0
   - download ==0.3.2.6
@@ -529,7 +532,7 @@ default-package-overrides:
   - dvorak ==0.1.0.0
   - dynamic-state ==0.3
   - dyre ==0.8.12
-  - Earley ==0.12.0.1
+  - Earley ==0.12.1.0
   - easy-file ==0.2.1
   - Ebnf2ps ==1.0.15
   - echo ==0.1.3
@@ -550,8 +553,9 @@ default-package-overrides:
   - eliminators ==0.3
   - elm-core-sources ==1.0.0
   - elm-export ==0.6.0.1
+  - elm-export-persistent ==0.2.0
   - emailaddress ==0.2.0.0
-  - email-validate ==2.3.2.3
+  - email-validate ==2.3.2.5
   - enclosed-exceptions ==1.0.2
   - entropy ==0.3.8
   - enummapset ==0.5.2.1
@@ -564,7 +568,7 @@ default-package-overrides:
   - equal-files ==0.0.5.3
   - equivalence ==0.3.2
   - erf ==2.0.0.0
-  - errors ==2.2.4
+  - errors ==2.2.5
   - errors-ext ==0.4.1
   - error-util ==0.0.1.2
   - ersatz ==0.4.2
@@ -595,7 +599,7 @@ default-package-overrides:
   - exhaustive ==1.1.5
   - expiring-cache-map ==0.0.6.1
   - explicit-exception ==0.1.9.2
-  - exp-pairs ==0.1.5.2
+  - exp-pairs ==0.1.6.0
   - extensible ==0.4.8
   - extensible-effects ==2.4.0.0
   - extensible-exceptions ==0.1.1.4
@@ -644,7 +648,7 @@ default-package-overrides:
   - fmt ==0.5.0.0
   - fn ==0.3.0.2
   - focus ==0.1.5.2
-  - fold-debounce ==0.2.0.6
+  - fold-debounce ==0.2.0.7
   - fold-debounce-conduit ==0.2.0.0
   - foldl ==1.3.7
   - folds ==0.7.4
@@ -655,7 +659,7 @@ default-package-overrides:
   - ForestStructures ==0.0.0.2
   - forma ==0.2.0
   - format-numbers ==0.1.0.0
-  - formatting ==6.3.0
+  - formatting ==6.3.1
   - foundation ==0.0.20
   - FPretty ==1.1
   - Frames ==0.3.0.2
@@ -665,7 +669,7 @@ default-package-overrides:
   - freetype2 ==0.1.2
   - free-vl ==0.1.4
   - friday ==0.2.3.1
-  - friday-juicypixels ==0.1.2.3
+  - friday-juicypixels ==0.1.2.4
   - friendly-time ==0.4.1
   - frisby ==0.2.2
   - from-sum ==0.2.1.0
@@ -688,7 +692,7 @@ default-package-overrides:
   - generic-lens ==0.5.1.0
   - GenericPretty ==1.2.2
   - generic-random ==1.1.0.2
-  - generics-eot ==0.2.1.1
+  - generics-eot ==0.2.1.2
   - generics-sop ==0.3.2.0
   - generics-sop-lens ==0.1.2.1
   - generic-xmlpickler ==0.1.0.5
@@ -698,7 +702,7 @@ default-package-overrides:
   - genvalidity-bytestring ==0.1.0.0
   - genvalidity-containers ==0.3.0.0
   - genvalidity-hspec ==0.5.0.0
-  - genvalidity-hspec-aeson ==0.1.0.1
+  - genvalidity-hspec-aeson ==0.1.0.2
   - genvalidity-hspec-binary ==0.1.0.0
   - genvalidity-hspec-cereal ==0.1.0.0
   - genvalidity-hspec-hashable ==0.1.0.0
@@ -713,20 +717,20 @@ default-package-overrides:
   - getopt-generics ==0.13.0.1
   - ghc-compact ==0.1.0.0
   - ghc-core ==0.5.6
-  - ghc-events ==0.7.1
+  - ghc-events ==0.7.2
   - ghc-exactprint ==0.5.6.1
   - ghcid ==0.6.10
   - ghcjs-base-stub ==0.1.0.4
   - ghcjs-codemirror ==0.0.0.1
   - ghcjs-perch ==0.3.3.2
-  - ghc-parser ==0.2.0.1
+  - ghc-parser ==0.2.0.2
   - ghc-paths ==0.1.0.9
   - ghc-prof ==1.4.1
   - ghc-syb-utils ==0.2.3.3
-  - ghc-tcplugins-extra ==0.2.2
+  - ghc-tcplugins-extra ==0.2.4
   - ghc-typelits-extra ==0.2.4
-  - ghc-typelits-knownnat ==0.4
-  - ghc-typelits-natnormalise ==0.5.8
+  - ghc-typelits-knownnat ==0.4.1
+  - ghc-typelits-natnormalise ==0.5.9
   - ghost-buster ==0.1.1.0
   - gi-atk ==2.0.15
   - gi-cairo ==1.0.15
@@ -779,7 +783,7 @@ default-package-overrides:
   - groundhog-sqlite ==0.8.0.1
   - groundhog-th ==0.8.0.2
   - group-by-date ==0.1.0.2
-  - grouped-list ==0.2.1.5
+  - grouped-list ==0.2.2.0
   - groups ==0.4.1.0
   - gtk2hs-buildtools ==0.13.3.1
   - H ==0.9.0.1
@@ -816,14 +820,14 @@ default-package-overrides:
   - HaskellNet ==0.5.1
   - HaskellNet-SSL ==0.3.4.0
   - haskell-spacegoo ==0.2.0.1
-  - haskell-src ==1.0.2.0
+  - haskell-src ==1.0.3.0
   - haskell-src-exts ==1.20.2
   - haskell-src-exts-util ==0.2.2
   - haskell-src-meta ==0.8.0.2
   - haskell-tools-ast ==1.0.1.1
   - haskell-tools-backend-ghc ==1.0.1.1
   - haskell-tools-prettyprint ==1.0.1.1
-  - haskell-tools-refactor ==1.0.1.1
+  - haskell-tools-refactor ==1.0.1.2
   - haskell-tools-rewrite ==1.0.1.1
   - haskintex ==0.8.0.0
   - hasmin ==1.0.1
@@ -849,14 +853,14 @@ default-package-overrides:
   - heaps ==0.3.6
   - heatshrink ==0.1.0.0
   - hebrew-time ==0.1.1
-  - hedgehog ==0.5.2
+  - hedgehog ==0.5.3
   - hedgehog-quickcheck ==0.1
-  - hedis ==0.10.0
+  - hedis ==0.10.1
   - heist ==1.0.1.2
   - here ==1.2.13
   - heredoc ==0.2.0.0
   - herms ==1.8.1.4
-  - heterocephalus ==1.0.5.1
+  - heterocephalus ==1.0.5.2
   - hex ==0.1.2
   - hexml ==0.3.3
   - hexml-lens ==0.2.1
@@ -892,7 +896,7 @@ default-package-overrides:
   - hmatrix-vector-sized ==0.1.1.0
   - hmpfr ==0.4.4
   - hocilib ==0.2.0
-  - Hoed ==0.5.0
+  - Hoed ==0.5.1
   - hOpenPGP ==2.6
   - hopfli ==0.2.2.1
   - hosc ==0.16
@@ -958,7 +962,7 @@ default-package-overrides:
   - HSvm ==0.1.0.3.22
   - hsx-jmacro ==7.3.8
   - hsyslog ==5.0.1
-  - hsyslog-udp ==0.2.1
+  - hsyslog-udp ==0.2.2
   - htaglib ==1.1.1
   - HTF ==0.13.2.2
   - html ==1.0.1.2
@@ -966,10 +970,10 @@ default-package-overrides:
   - html-email-validate ==0.2.0.0
   - html-entity-map ==0.1.0.0
   - htoml ==1.0.0.3
-  - HTTP ==4000.3.10
+  - HTTP ==4000.3.11
   - http2 ==1.6.3
   - http-api-data ==0.3.7.2
-  - http-client ==0.5.10
+  - http-client ==0.5.11
   - http-client-openssl ==0.2.1.1
   - http-client-tls ==0.3.5.3
   - http-common ==0.8.2.0
@@ -977,7 +981,7 @@ default-package-overrides:
   - http-date ==0.0.6.1
   - http-link-header ==1.0.3
   - http-media ==0.7.1.2
-  - http-reverse-proxy ==0.5.0
+  - http-reverse-proxy ==0.5.0.1
   - http-streams ==0.8.5.5
   - http-types ==0.12.1
   - human-readable-duration ==0.2.0.3
@@ -992,7 +996,7 @@ default-package-overrides:
   - hweblib ==0.6.3
   - hw-excess ==0.2.0.0
   - hw-fingertree ==0.1.0.0
-  - hw-fingertree-strict ==0.1.0.0
+  - hw-fingertree-strict ==0.1.0.1
   - hw-hedgehog ==0.1.0.1
   - hw-hspec-hedgehog ==0.1.0.2
   - hw-int ==0.0.0.3
@@ -1025,7 +1029,7 @@ default-package-overrides:
   - if ==0.1.0.0
   - iff ==0.0.6
   - ignore ==0.1.1.0
-  - ihaskell ==0.9.0.2
+  - ihaskell ==0.9.0.3
   - ihs ==0.1.0.2
   - ilist ==0.3.1.0
   - imagesize-conduit ==1.1
@@ -1058,7 +1062,7 @@ default-package-overrides:
   - intervals ==0.8.1
   - intro ==0.3.1.0
   - invariant ==0.5
-  - invertible ==0.2.0.3
+  - invertible ==0.2.0.4
   - io-choice ==0.0.6
   - io-machine ==0.2.0.0
   - io-manager ==0.1.0.2
@@ -1069,10 +1073,10 @@ default-package-overrides:
   - io-streams-haproxy ==1.0.0.2
   - ip ==1.1.2
   - ip6addr ==0.5.3
-  - iproute ==1.7.2
+  - iproute ==1.7.3
   - IPv6Addr ==1.0.1
   - IPv6DB ==0.2.5
-  - ipython-kernel ==0.9.0.1
+  - ipython-kernel ==0.9.0.2
   - irc ==0.6.1.0
   - irc-client ==1.1.0.2
   - irc-conduit ==0.3.0.1
@@ -1103,7 +1107,7 @@ default-package-overrides:
   - json-rpc-generic ==0.2.1.3
   - json-schema ==0.7.4.1
   - json-stream ==0.4.2.0
-  - JuicyPixels ==3.2.9.4
+  - JuicyPixels ==3.2.9.5
   - JuicyPixels-extra ==0.3.0
   - JuicyPixels-scale-dct ==0.1.1.2
   - justified-containers ==0.3.0.0
@@ -1112,7 +1116,7 @@ default-package-overrides:
   - jvm-streaming ==0.3.1
   - jwt ==0.7.2
   - kan-extensions ==5.1
-  - kanji ==3.1.0
+  - kanji ==3.1.0.1
   - katydid ==0.1.1.0
   - kawhi ==0.3.0
   - kdt ==0.2.4
@@ -1136,7 +1140,7 @@ default-package-overrides:
   - language-glsl ==0.2.1
   - language-haskell-extract ==0.2.4
   - language-java ==0.2.9
-  - language-javascript ==0.6.0.10
+  - language-javascript ==0.6.0.11
   - lapack-carray ==0.0.1
   - lapack-ffi ==0.0.1
   - lapack-ffi-tools ==0.1
@@ -1160,7 +1164,7 @@ default-package-overrides:
   - lens-properties ==4.11.1
   - lens-regex ==0.1.0
   - lens-simple ==0.1.0.9
-  - lentil ==1.0.10.0
+  - lentil ==1.0.10.1
   - leveldb-haskell ==0.6.5
   - lexer-applicative ==2.1.0.1
   - libffi ==0.1
@@ -1174,7 +1178,7 @@ default-package-overrides:
   - LibZip ==1.0.1
   - licensor ==0.2.2
   - lifted-async ==0.9.3.3
-  - lifted-base ==0.2.3.11
+  - lifted-base ==0.2.3.12
   - lift-generics ==0.1.2
   - line ==4.0.1
   - linear ==1.20.7
@@ -1210,7 +1214,7 @@ default-package-overrides:
   - loop ==0.3.0
   - lrucache ==1.2.0.0
   - lrucaching ==0.3.3
-  - lucid ==2.9.9
+  - lucid ==2.9.10
   - lxd-client ==0.1.0.6
   - lxd-client-config ==0.1.0.1
   - lzma ==0.0.0.3
@@ -1225,12 +1229,12 @@ default-package-overrides:
   - mandrill ==0.5.3.3
   - mapquest-api ==0.3.1
   - map-syntax ==0.2.0.2
-  - markdown ==0.1.16
+  - markdown ==0.1.17
   - markdown-unlit ==0.5.0
   - markov-chain ==0.0.3.4
   - markup ==4.0.4
   - marvin-interpolate ==1.1.2
-  - massiv ==0.1.1.0
+  - massiv ==0.1.2.0
   - massiv-io ==0.1.1.0
   - mathexpr ==0.3.0.0
   - math-functions ==0.2.1.0
@@ -1298,9 +1302,9 @@ default-package-overrides:
   - monadic-arrays ==0.2.2
   - monad-journal ==0.8.1
   - monadloc ==0.7.1
-  - monad-logger ==0.3.28.1
+  - monad-logger ==0.3.28.2
   - monad-logger-json ==0.1.0.0
-  - monad-logger-prefix ==0.1.8
+  - monad-logger-prefix ==0.1.9
   - monad-logger-syslog ==0.1.4.0
   - monad-loops ==0.4.3
   - monad-memo ==0.4.1
@@ -1322,10 +1326,10 @@ default-package-overrides:
   - monad-time ==0.2
   - monad-unlift ==0.2.0
   - monad-unlift-ref ==0.2.1
-  - mongoDB ==2.3.0.4
+  - mongoDB ==2.3.0.5
   - monoidal-containers ==0.3.1.0
   - monoid-extras ==0.4.2
-  - monoid-subclasses ==0.4.4
+  - monoid-subclasses ==0.4.6
   - monoid-transformer ==0.0.4
   - mono-traversable ==1.0.8.1
   - mono-traversable-instances ==0.1.0.0
@@ -1387,7 +1391,7 @@ default-package-overrides:
   - network-transport-tests ==0.2.4.2
   - network-uri ==2.6.1.0
   - newtype ==0.2
-  - newtype-generics ==0.5.2.1
+  - newtype-generics ==0.5.2.2
   - next-ref ==0.1.0.2
   - nfc ==0.1.0
   - nicify-lib ==1.0.1
@@ -1402,7 +1406,7 @@ default-package-overrides:
   - normalization-insensitive ==2.0.1
   - NoTrace ==0.3.0.2
   - nsis ==0.3.2
-  - n-tuple ==0.0.1.1
+  - n-tuple ==0.0.2.0
   - numbers ==3000.2.0.1
   - numeric-extras ==0.1
   - numeric-prelude ==0.4.3
@@ -1410,7 +1414,7 @@ default-package-overrides:
   - numhask-range ==0.1.3.0
   - NumInstances ==1.4
   - numtype-dk ==0.5.0.1
-  - nvvm ==0.8.0.2
+  - nvvm ==0.8.0.3
   - oauthenticated ==0.2.1.0
   - objective ==1.1.2
   - ObjectName ==1.1.0.1
@@ -1492,7 +1496,7 @@ default-package-overrides:
   - pem ==0.2.4
   - perf ==0.3.1.1
   - perfect-hash-generator ==0.2.0.6
-  - persistable-record ==0.6.0.1
+  - persistable-record ==0.6.0.2
   - persistable-types-HDBC-pg ==0.0.1.5
   - persistent ==2.8.1
   - persistent-mongoDB ==2.8.0
@@ -1512,7 +1516,7 @@ default-package-overrides:
   - pid1 ==0.1.2.0
   - pinboard ==0.9.12.9
   - pinch ==0.3.2.0
-  - pipes ==4.3.8
+  - pipes ==4.3.9
   - pipes-aeson ==0.4.1.8
   - pipes-attoparsec ==0.5.1.5
   - pipes-bytestring ==2.1.6
@@ -1528,7 +1532,7 @@ default-package-overrides:
   - pipes-network ==0.6.4.1
   - pipes-parse ==3.0.8
   - pipes-random ==1.0.0.4
-  - pipes-safe ==2.2.6
+  - pipes-safe ==2.2.9
   - pipes-text ==0.0.2.5
   - pipes-wai ==3.2.0
   - pixelated-avatar-generator ==0.1.3
@@ -1608,14 +1612,14 @@ default-package-overrides:
   - proxied ==0.3
   - psql-helpers ==0.1.0.0
   - PSQueue ==1.1
-  - psqueues ==0.2.5.0
+  - psqueues ==0.2.6.0
   - pthread ==0.2.0
   - publicsuffix ==0.20171229
   - pure-io ==0.2.1
   - pureMD5 ==2.1.3
   - purescript-bridge ==0.11.1.2
-  - pushbullet-types ==0.4.0.2
-  - pusher-http-haskell ==1.5.1.2
+  - pushbullet-types ==0.4.1.0
+  - pusher-http-haskell ==1.5.1.3
   - pwstore-fast ==2.4.4
   - qchas ==1.1.0.0
   - qm-interpolated-string ==0.3.0.0
@@ -1647,10 +1651,10 @@ default-package-overrides:
   - random-tree ==0.6.0.5
   - range-set-list ==0.1.2.0
   - rank1dynamic ==0.4.0
-  - rank2classes ==1.0.1
+  - rank2classes ==1.0.2
   - rank-product ==0.2.0.1
-  - Rasterific ==0.7.2.1
-  - rasterific-svg ==0.3.3
+  - Rasterific ==0.7.2.3
+  - rasterific-svg ==0.3.3.1
   - ratel ==1.0.2
   - ratel-wai ==1.0.1
   - ratio-int ==0.1.2
@@ -1727,7 +1731,7 @@ default-package-overrides:
   - rvar ==0.2.0.3
   - s3-signer ==0.3.0.0
   - safe ==0.3.17
-  - safecopy ==0.9.4
+  - safecopy ==0.9.4.1
   - safe-exceptions ==0.1.7.0
   - safe-exceptions-checked ==0.1.0
   - safeio ==0.0.5.0
@@ -1739,13 +1743,13 @@ default-package-overrides:
   - say ==0.1.0.0
   - sbp ==2.3.9
   - sbv ==7.5
-  - scalendar ==1.2.0
   - SCalendar ==1.1.0
+  - scalendar ==1.2.0
   - scalpel ==0.5.1
   - scalpel-core ==0.5.1
   - scanner ==0.2
   - schematic ==0.4.2.0
-  - scientific ==0.3.5.2
+  - scientific ==0.3.5.3
   - scotty ==0.11.0
   - scrypt ==0.5.0
   - sdl2 ==2.4.0.1
@@ -1804,10 +1808,10 @@ default-package-overrides:
   - ses-html ==0.4.0.0
   - set-cover ==0.0.9
   - setenv ==0.1.1.3
-  - setlocale ==1.0.0.5
+  - setlocale ==1.0.0.6
   - set-monad ==0.2.0.0
   - sets ==0.0.5.2
-  - SHA ==1.6.4.2
+  - SHA ==1.6.4.4
   - shake ==0.16.3
   - shake-language-c ==0.11.0
   - shakespeare ==2.0.15
@@ -1822,7 +1826,7 @@ default-package-overrides:
   - silently ==1.2.5
   - simple ==0.11.2
   - simple-log ==0.9.3
-  - simple-reflect ==0.3.2
+  - simple-reflect ==0.3.3
   - simple-sendfile ==0.2.27
   - simple-session ==0.10.1.1
   - simple-templates ==0.8.0.1
@@ -1844,9 +1848,9 @@ default-package-overrides:
   - snap-core ==1.0.3.1
   - snap-server ==1.0.3.3
   - snowflake ==0.1.1.1
-  - soap ==0.2.3.5
+  - soap ==0.2.3.6
   - soap-openssl ==0.1.0.2
-  - soap-tls ==0.1.1.2
+  - soap-tls ==0.1.1.4
   - socket ==0.8.0.1
   - socket-activation ==0.1.0.2
   - socks ==0.5.6
@@ -1886,7 +1890,7 @@ default-package-overrides:
   - statestack ==0.2.0.5
   - StateVar ==1.1.0.4
   - stateWriter ==0.2.10
-  - static-text ==0.2
+  - static-text ==0.2.0.1
   - statistics ==0.14.0.2
   - stb-image-redux ==0.2.1.2
   - stitch ==0.5.0.0
@@ -1900,7 +1904,7 @@ default-package-overrides:
   - stm-split ==0.0.2
   - stm-stats ==0.2.0.0
   - stm-supply ==0.2.0.0
-  - stopwatch ==0.1.0.4
+  - stopwatch ==0.1.0.5
   - storable-complex ==0.2.2
   - storable-endian ==0.2.6
   - storable-record ==0.0.4
@@ -1909,7 +1913,7 @@ default-package-overrides:
   - store ==0.4.3.2
   - store-core ==0.4.1
   - Strafunski-StrategyLib ==5.0.1.0
-  - stratosphere ==0.19.0
+  - stratosphere ==0.19.1
   - streaming ==0.2.1.0
   - streaming-bytestring ==0.1.5
   - streaming-commons ==0.1.19
@@ -1936,7 +1940,7 @@ default-package-overrides:
   - sundown ==0.6
   - superbuffer ==0.3.1.1
   - svg-builder ==0.1.0.2
-  - svg-tree ==0.6.2.1
+  - svg-tree ==0.6.2.2
   - swagger ==0.3.0
   - swagger2 ==2.2
   - swish ==0.9.2.0
@@ -1964,7 +1968,7 @@ default-package-overrides:
   - tasty-auto ==0.2.0.0
   - tasty-dejafu ==1.1.0.1
   - tasty-discover ==4.2.0
-  - tasty-expected-failure ==0.11.1
+  - tasty-expected-failure ==0.11.1.1
   - tasty-golden ==2.3.1.3
   - tasty-hedgehog ==0.1.0.2
   - tasty-hspec ==1.1.3.3
@@ -2015,7 +2019,7 @@ default-package-overrides:
   - text-region ==0.3.0.0
   - text-short ==0.1.2
   - text-show ==3.7.2
-  - text-show-instances ==3.6.2
+  - text-show-instances ==3.6.3
   - text-zipper ==0.10.1
   - tfp ==1.0.0.2
   - tf-random ==0.5
@@ -2030,7 +2034,7 @@ default-package-overrides:
   - th-orphans ==0.13.5
   - thread-hierarchy ==0.3.0.0
   - thread-local-storage ==0.1.2
-  - threads ==0.5.1.5
+  - threads ==0.5.1.6
   - threads-extras ==0.1.0.2
   - threepenny-editors ==0.5.6
   - threepenny-gui ==0.8.2.2
@@ -2057,8 +2061,8 @@ default-package-overrides:
   - time-parsers ==0.1.2.0
   - timerep ==2.0.0.2
   - timespan ==0.3.0.0
-  - timezone-olson ==0.1.8
-  - timezone-series ==0.1.8
+  - timezone-olson ==0.1.9
+  - timezone-series ==0.1.9
   - tinylog ==0.14.0
   - tinytemplate ==0.1.2.0
   - titlecase ==1.0.1
@@ -2067,7 +2071,7 @@ default-package-overrides:
   - tls-debug ==0.4.5
   - tls-session-manager ==0.0.0.2
   - tmapchan ==0.0.3
-  - tmapmvar ==0.0.3
+  - tmapmvar ==0.0.4
   - tmp-postgres ==0.1.1.1
   - token-bucket ==0.1.0.1
   - tostring ==0.2.1.1
@@ -2082,7 +2086,7 @@ default-package-overrides:
   - traverse-with-class ==1.0.0.0
   - tree-diff ==0.0.1
   - tree-fun ==0.8.1.0
-  - tries ==0.0.4.2
+  - tries ==0.0.5
   - trifecta ==1.7.1.1
   - triplesec ==0.1.2.0
   - true-name ==0.1.0.3
@@ -2091,7 +2095,7 @@ default-package-overrides:
   - tuple ==0.3.0.2
   - tuples-homogenous-h98 ==0.1.1.0
   - tuple-th ==0.2.5
-  - turtle ==1.5.5
+  - turtle ==1.5.6
   - turtle-options ==0.1.0.4
   - type-assertions ==0.1.0.0
   - type-combinators ==0.2.4.3
@@ -2127,8 +2131,8 @@ default-package-overrides:
   - union-find ==0.2
   - uniplate ==1.6.12
   - uniq-deep ==1.1.0.0
-  - Unique ==0.4.7.2
   - unique ==0
+  - Unique ==0.4.7.2
   - unit-constraint ==0.0.0
   - units-parser ==0.1.1.2
   - universe ==1.0
@@ -2141,14 +2145,14 @@ default-package-overrides:
   - unix-bytestring ==0.3.7.3
   - unix-compat ==0.5.0.1
   - unix-time ==0.3.8
-  - unliftio ==0.2.4.0
+  - unliftio ==0.2.5.0
   - unliftio-core ==0.1.1.0
   - unlit ==0.4.0.0
   - unordered-containers ==0.2.9.0
   - unordered-intmap ==0.1.0.0
   - unsafe ==0.0
   - uri-bytestring ==0.3.1.1
-  - uri-bytestring-aeson ==0.1.0.5
+  - uri-bytestring-aeson ==0.1.0.6
   - uri-encode ==1.5.0.5
   - uri-templater ==0.3.1.0
   - urlpath ==8.0.1
@@ -2231,7 +2235,7 @@ default-package-overrides:
   - warp ==3.2.18.1
   - warp-tls ==3.2.4.2
   - wave ==0.1.5
-  - wavefront ==0.7.1.1
+  - wavefront ==0.7.1.2
   - webdriver ==0.8.5
   - webdriver-angular ==0.1.11
   - webpage ==0.0.5
@@ -2243,14 +2247,14 @@ default-package-overrides:
   - web-routes-th ==0.22.6.2
   - web-routes-wai ==0.24.3.1
   - webrtc-vad ==0.1.0.3
-  - websockets ==0.12.3.1
+  - websockets ==0.12.4.0
   - websockets-rpc ==0.6.0
   - websockets-simple ==0.0.6.3
   - websockets-snap ==0.10.2.4
   - weigh ==0.0.7
-  - wide-word ==0.1.0.5
+  - wide-word ==0.1.0.6
   - wikicfp-scraper ==0.1.0.9
-  - wild-bind ==0.1.1.0
+  - wild-bind ==0.1.1.1
   - wild-bind-x11 ==0.2.0.1
   - Win32 ==2.5.4.1
   - Win32-notify ==0.3.0.3
@@ -2291,11 +2295,11 @@ default-package-overrides:
   - x509-validation ==1.6.10
   - Xauth ==0.1
   - xdg-basedir ==0.2.2
-  - xeno ==0.3.2
+  - xeno ==0.3.3
   - xenstore ==0.1.1
   - xhtml ==3000.2.2
   - xls ==0.1.1
-  - xlsx ==0.7.0
+  - xlsx ==0.7.1
   - xlsx-tabular ==0.2.2.1
   - xml ==1.3.14
   - xml-basic ==0.1.3
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index e5ebeed0405..be3d3ae673f 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -2957,23 +2957,6 @@ self: {
      }) {};
 
   "ClustalParser" = callPackage
-    ({ mkDerivation, base, cmdargs, either-unwrap, hspec, parsec, text
-     , vector
-     }:
-     mkDerivation {
-       pname = "ClustalParser";
-       version = "1.2.2";
-       sha256 = "1x6ag9knvc18pwvm3cdj936pn8k2nbd54n3ii44r7b7kjcb7cgk6";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base parsec text vector ];
-       executableHaskellDepends = [ base cmdargs either-unwrap ];
-       testHaskellDepends = [ base hspec parsec text ];
-       description = "Libary for parsing Clustal tools output";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "ClustalParser_1_2_3" = callPackage
     ({ mkDerivation, base, cmdargs, either-unwrap, hspec
      , hspec-discover, parsec, text, vector
      }:
@@ -2988,7 +2971,6 @@ self: {
        testHaskellDepends = [ base hspec hspec-discover parsec text ];
        description = "Libary for parsing Clustal tools output";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Coadjute" = callPackage
@@ -4684,27 +4666,6 @@ self: {
      }) {};
 
   "Earley" = callPackage
-    ({ mkDerivation, base, criterion, deepseq, ListLike, parsec
-     , QuickCheck, tasty, tasty-hunit, tasty-quickcheck
-     }:
-     mkDerivation {
-       pname = "Earley";
-       version = "0.12.0.1";
-       sha256 = "1cfmarpbldayhdynahw5gkxspsgi4kkjcybisk4kzhdj40yaj9pw";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base ListLike ];
-       testHaskellDepends = [
-         base QuickCheck tasty tasty-hunit tasty-quickcheck
-       ];
-       benchmarkHaskellDepends = [
-         base criterion deepseq ListLike parsec
-       ];
-       description = "Parsing all context-free grammars using Earley's algorithm";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "Earley_0_12_1_0" = callPackage
     ({ mkDerivation, base, criterion, deepseq, ListLike, parsec
      , QuickCheck, tasty, tasty-hunit, tasty-quickcheck
      }:
@@ -4723,7 +4684,6 @@ self: {
        ];
        description = "Parsing all context-free grammars using Earley's algorithm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Ebnf2ps" = callPackage
@@ -8756,29 +8716,6 @@ self: {
      }) {};
 
   "HTTP" = callPackage
-    ({ mkDerivation, array, base, bytestring, case-insensitive, conduit
-     , conduit-extra, deepseq, http-types, httpd-shed, HUnit, mtl
-     , network, network-uri, parsec, pureMD5, split, test-framework
-     , test-framework-hunit, time, wai, warp
-     }:
-     mkDerivation {
-       pname = "HTTP";
-       version = "4000.3.10";
-       sha256 = "12cy8yn06cm9xqcnvvk0s0yh6w67r6bxs8wn37q97y0b6fjiwdfj";
-       libraryHaskellDepends = [
-         array base bytestring mtl network network-uri parsec time
-       ];
-       testHaskellDepends = [
-         base bytestring case-insensitive conduit conduit-extra deepseq
-         http-types httpd-shed HUnit mtl network network-uri pureMD5 split
-         test-framework test-framework-hunit wai warp
-       ];
-       homepage = "https://github.com/haskell/HTTP";
-       description = "A library for client-side HTTP";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "HTTP_4000_3_11" = callPackage
     ({ mkDerivation, array, base, bytestring, case-insensitive, conduit
      , conduit-extra, deepseq, http-types, httpd-shed, HUnit, mtl
      , network, network-uri, parsec, pureMD5, split, test-framework
@@ -8799,7 +8736,6 @@ self: {
        homepage = "https://github.com/haskell/HTTP";
        description = "A library for client-side HTTP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HTTP-Simple" = callPackage
@@ -9060,6 +8996,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "HaTeX_3_19_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, hashable, matrix
+     , parsec, QuickCheck, tasty, tasty-quickcheck, text, transformers
+     , wl-pprint-extras
+     }:
+     mkDerivation {
+       pname = "HaTeX";
+       version = "3.19.0.0";
+       sha256 = "0ja7w9l1pnf4pgbggr8cmsq0234cvsn75b9jzvd64jplhajpgn8z";
+       libraryHaskellDepends = [
+         base bytestring containers hashable matrix parsec QuickCheck text
+         transformers wl-pprint-extras
+       ];
+       testHaskellDepends = [
+         base parsec QuickCheck tasty tasty-quickcheck text
+       ];
+       homepage = "https://github.com/Daniel-Diaz/HaTeX/blob/master/README.md";
+       description = "The Haskell LaTeX library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "HaTeX-meta" = callPackage
     ({ mkDerivation, base, Cabal, containers, directory, filepath, ghc
      , haddock, haskell-src-exts, mtl, parsec
@@ -9826,32 +9784,6 @@ self: {
      }) {};
 
   "Hoed" = callPackage
-    ({ mkDerivation, array, base, bytestring, cereal, cereal-text
-     , cereal-vector, clock, containers, deepseq, directory, hashable
-     , hashtables, libgraph, open-browser, primitive, process
-     , QuickCheck, regex-tdfa, regex-tdfa-text, semigroups, strict
-     , template-haskell, terminal-size, text, transformers, uniplate
-     , vector, vector-th-unbox
-     }:
-     mkDerivation {
-       pname = "Hoed";
-       version = "0.5.0";
-       sha256 = "1pj2scisdissbhlf6gn5bxqp09zvi5v7h8n7l3y1rirkqwwf74a8";
-       libraryHaskellDepends = [
-         array base bytestring cereal cereal-text cereal-vector clock
-         containers deepseq directory hashable hashtables libgraph
-         open-browser primitive process QuickCheck regex-tdfa
-         regex-tdfa-text semigroups strict template-haskell terminal-size
-         text transformers uniplate vector vector-th-unbox
-       ];
-       testHaskellDepends = [ base process QuickCheck ];
-       homepage = "https://github.com/MaartenFaddegon/Hoed";
-       description = "Lightweight algorithmic debugging";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "Hoed_0_5_1" = callPackage
     ({ mkDerivation, array, base, bytestring, cereal, cereal-text
      , cereal-vector, clock, containers, deepseq, directory, hashable
      , libgraph, open-browser, primitive, process, QuickCheck
@@ -10465,6 +10397,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "IPv6Addr_1_0_2" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, HUnit, iproute, network
+     , network-info, random, test-framework, test-framework-hunit, text
+     }:
+     mkDerivation {
+       pname = "IPv6Addr";
+       version = "1.0.2";
+       sha256 = "09gb38m1fw0a1x8saldgsd5x58ycqirk8h6z8dqzpcd7vz23vayn";
+       libraryHaskellDepends = [
+         aeson attoparsec base iproute network network-info random text
+       ];
+       testHaskellDepends = [
+         base HUnit test-framework test-framework-hunit text
+       ];
+       homepage = "https://github.com/MichelBoucey/IPv6Addr";
+       description = "Library to deal with IPv6 address text representations";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "IPv6DB" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, fast-logger
      , hedis, hspec, http-client, http-types, IPv6Addr, mtl
@@ -10495,6 +10447,36 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "IPv6DB_0_2_6" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, fast-logger
+     , hedis, hspec, http-client, http-types, IPv6Addr, mtl
+     , optparse-applicative, text, unordered-containers, vector, wai
+     , wai-logger, warp
+     }:
+     mkDerivation {
+       pname = "IPv6DB";
+       version = "0.2.6";
+       sha256 = "1dshvq3amnwfvf50g4gs93rc307sk1hi3snjhflzjz0dfn8xa2d4";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring hedis http-types IPv6Addr mtl text
+         unordered-containers vector
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring fast-logger hedis http-types IPv6Addr mtl
+         optparse-applicative text unordered-containers vector wai
+         wai-logger warp
+       ];
+       testHaskellDepends = [
+         aeson base hspec http-client http-types vector
+       ];
+       homepage = "http://ipv6db.cybervisible.com";
+       description = "A RESTful Web Service for IPv6-related data";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "IcoGrid" = callPackage
     ({ mkDerivation, array, base, GlomeVec }:
      mkDerivation {
@@ -10903,23 +10885,6 @@ self: {
      }) {};
 
   "JuicyPixels" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, deepseq, mtl
-     , primitive, transformers, vector, zlib
-     }:
-     mkDerivation {
-       pname = "JuicyPixels";
-       version = "3.2.9.4";
-       sha256 = "1mlj3zcr3c49mjv0sddsfdzvzv3m0cbv56fbrkarygs5dxyh8dgz";
-       libraryHaskellDepends = [
-         base binary bytestring containers deepseq mtl primitive
-         transformers vector zlib
-       ];
-       homepage = "https://github.com/Twinside/Juicy.Pixels";
-       description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "JuicyPixels_3_2_9_5" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, deepseq, mtl
      , primitive, transformers, vector, zlib
      }:
@@ -10934,7 +10899,6 @@ self: {
        homepage = "https://github.com/Twinside/Juicy.Pixels";
        description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "JuicyPixels-blp" = callPackage
@@ -10944,8 +10908,8 @@ self: {
      }:
      mkDerivation {
        pname = "JuicyPixels-blp";
-       version = "0.1.0.0";
-       sha256 = "02hw885a47smwbnyk5fxvb44bdpaspsair9fmsj23sbp6f2wi0hk";
+       version = "0.1.0.1";
+       sha256 = "16fcrd8g4pgwhbvp34mqqvmszlkhjs1qryrn1bll3f0zwirhg3ic";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -15778,23 +15742,6 @@ self: {
      }) {};
 
   "Rasterific" = callPackage
-    ({ mkDerivation, base, bytestring, containers, dlist, FontyFruity
-     , free, JuicyPixels, mtl, primitive, transformers, vector
-     , vector-algorithms
-     }:
-     mkDerivation {
-       pname = "Rasterific";
-       version = "0.7.2.1";
-       sha256 = "0x2dyk72krfxwz2kk7w8cr8ws9imv7c2sgy1v4nsffjsb94qcvbz";
-       libraryHaskellDepends = [
-         base bytestring containers dlist FontyFruity free JuicyPixels mtl
-         primitive transformers vector vector-algorithms
-       ];
-       description = "A pure haskell drawing engine";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "Rasterific_0_7_2_3" = callPackage
     ({ mkDerivation, base, bytestring, containers, dlist, FontyFruity
      , free, JuicyPixels, mtl, primitive, transformers, vector
      , vector-algorithms
@@ -15809,7 +15756,6 @@ self: {
        ];
        description = "A pure haskell drawing engine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ReadArgs" = callPackage
@@ -16269,25 +16215,6 @@ self: {
      }) {};
 
   "SHA" = callPackage
-    ({ mkDerivation, array, base, binary, bytestring, QuickCheck
-     , test-framework, test-framework-quickcheck2
-     }:
-     mkDerivation {
-       pname = "SHA";
-       version = "1.6.4.2";
-       sha256 = "134ajm87fm4lpsw86m9q8apv20dw4bpk46raa389zr6bcdpifw64";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ array base binary bytestring ];
-       testHaskellDepends = [
-         array base binary bytestring QuickCheck test-framework
-         test-framework-quickcheck2
-       ];
-       description = "Implementations of the SHA suite of message digest functions";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "SHA_1_6_4_4" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, QuickCheck
      , test-framework, test-framework-quickcheck2
      }:
@@ -16304,7 +16231,6 @@ self: {
        ];
        description = "Implementations of the SHA suite of message digest functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SHA2" = callPackage
@@ -20420,6 +20346,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "accelerate-arithmetic_1_0_0_1" = callPackage
+    ({ mkDerivation, accelerate, accelerate-utility, base, QuickCheck
+     , utility-ht
+     }:
+     mkDerivation {
+       pname = "accelerate-arithmetic";
+       version = "1.0.0.1";
+       sha256 = "05hnbsccd8wm984zpkrkk7653rwml33rq3hymy2llzbi010jm82y";
+       libraryHaskellDepends = [
+         accelerate accelerate-utility base QuickCheck utility-ht
+       ];
+       testHaskellDepends = [
+         accelerate accelerate-utility base QuickCheck
+       ];
+       homepage = "http://hub.darcs.net/thielema/accelerate-arithmetic/";
+       description = "Linear algebra and interpolation using the Accelerate framework";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "accelerate-bignum" = callPackage
     ({ mkDerivation, accelerate, accelerate-io, accelerate-llvm
      , accelerate-llvm-native, accelerate-llvm-ptx, base, criterion
@@ -20634,6 +20580,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "accelerate-fftw_1_0_0_1" = callPackage
+    ({ mkDerivation, accelerate, accelerate-io, base, carray, fft
+     , storable-complex
+     }:
+     mkDerivation {
+       pname = "accelerate-fftw";
+       version = "1.0.0.1";
+       sha256 = "1qakxrm0f61zb21awjvpiw5054p7lhrm9sa2bha4jfzksw9phypy";
+       libraryHaskellDepends = [
+         accelerate accelerate-io base carray fft storable-complex
+       ];
+       homepage = "http://hub.darcs.net/thielema/accelerate-fftw/";
+       description = "Accelerate frontend to the FFTW library (Fourier transform)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "accelerate-fourier" = callPackage
     ({ mkDerivation, accelerate, accelerate-arithmetic
      , accelerate-llvm-native, accelerate-utility, base, containers
@@ -20660,6 +20623,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "accelerate-fourier_1_0_0_5" = callPackage
+    ({ mkDerivation, accelerate, accelerate-arithmetic
+     , accelerate-llvm-native, accelerate-utility, base, containers
+     , criterion, QuickCheck, transformers, utility-ht
+     }:
+     mkDerivation {
+       pname = "accelerate-fourier";
+       version = "1.0.0.5";
+       sha256 = "03bbs6k6mn76nsgjhi823mzmhl3fsgyqjqix9wsslj8jh2vg3kr8";
+       libraryHaskellDepends = [
+         accelerate accelerate-arithmetic accelerate-utility base containers
+         QuickCheck transformers utility-ht
+       ];
+       testHaskellDepends = [
+         accelerate accelerate-arithmetic accelerate-utility base QuickCheck
+         utility-ht
+       ];
+       benchmarkHaskellDepends = [
+         accelerate accelerate-arithmetic accelerate-llvm-native
+         accelerate-utility base criterion utility-ht
+       ];
+       homepage = "http://hub.darcs.net/thielema/accelerate-fourier/";
+       description = "Fast Fourier transform and convolution using the Accelerate framework";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "accelerate-fourier-benchmark" = callPackage
     ({ mkDerivation, accelerate, accelerate-cuda, accelerate-cufft
      , accelerate-fftw, accelerate-fourier, base, criterion
@@ -20809,6 +20799,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "accelerate-utility_1_0_0_1" = callPackage
+    ({ mkDerivation, accelerate, base, utility-ht }:
+     mkDerivation {
+       pname = "accelerate-utility";
+       version = "1.0.0.1";
+       sha256 = "1wdxypkgkjngrlkw4fnxqqqbcy3chaw5fim0xyzcbh52zd0b62wh";
+       libraryHaskellDepends = [ accelerate base utility-ht ];
+       homepage = "http://hub.darcs.net/thielema/accelerate-utility/";
+       description = "Utility functions for the Accelerate framework";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "accentuateus" = callPackage
     ({ mkDerivation, base, bytestring, HTTP, json, network, text }:
      mkDerivation {
@@ -21775,22 +21778,6 @@ self: {
      }) {};
 
   "adler32" = callPackage
-    ({ mkDerivation, base, bytestring, hspec, zlib }:
-     mkDerivation {
-       pname = "adler32";
-       version = "0.1.1.0";
-       sha256 = "1v18d4xfbgqflx957xy6wiv7zhkgimpy85fy49d91p2ifkmbk32p";
-       revision = "1";
-       editedCabalFile = "087fykdlay78g9zg1w6a36xwd4pizcyi5wqzvj7cw5sh6gq493km";
-       libraryHaskellDepends = [ base bytestring ];
-       librarySystemDepends = [ zlib ];
-       testHaskellDepends = [ base bytestring hspec ];
-       homepage = "https://github.com/redneb/hs-adler32";
-       description = "An implementation of Adler-32, supporting rolling checksum operation";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) zlib;};
-
-  "adler32_0_1_2_0" = callPackage
     ({ mkDerivation, base, bytestring, hspec, zlib }:
      mkDerivation {
        pname = "adler32";
@@ -21802,7 +21789,6 @@ self: {
        homepage = "https://github.com/redneb/hs-adler32";
        description = "An implementation of Adler-32, supporting rolling checksum operation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) zlib;};
 
   "adobe-swatch-exchange" = callPackage
@@ -22170,6 +22156,8 @@ self: {
        pname = "aeson-extra";
        version = "0.4.1.0";
        sha256 = "11chkybn96q39j9y4h2wmq5vs0a0sb24qvk0g1qq8kyaiahvsd8y";
+       revision = "1";
+       editedCabalFile = "0fqhf8prdgjskr3qpryx2pn5s78l9dpapm4kmghak0dxh90sfp33";
        libraryHaskellDepends = [
          aeson aeson-compat attoparsec attoparsec-iso8601 base base-compat
          bytestring containers deepseq exceptions hashable parsec
@@ -22291,12 +22279,17 @@ self: {
      }) {};
 
   "aeson-iproute" = callPackage
-    ({ mkDerivation, aeson, base, iproute, text }:
+    ({ mkDerivation, aeson, base, doctest, iproute, text
+     , unordered-containers
+     }:
      mkDerivation {
        pname = "aeson-iproute";
-       version = "0.1.2";
-       sha256 = "09l1q44869hl6pknrrkg7ccwfj4w3mhr3k43j9a7sg7961lnqnsz";
-       libraryHaskellDepends = [ aeson base iproute text ];
+       version = "0.2";
+       sha256 = "13r6vyyw1pbk5sz32ari5kig23vsg57a5pir037adi7xicrm6kgf";
+       libraryHaskellDepends = [
+         aeson base iproute text unordered-containers
+       ];
+       testHaskellDepends = [ base doctest ];
        homepage = "https://github.com/greydot/aeson-iproute";
        description = "Aeson instances for iproute types";
        license = stdenv.lib.licenses.bsd3;
@@ -22381,19 +22374,6 @@ self: {
      }) {};
 
   "aeson-picker" = callPackage
-    ({ mkDerivation, aeson, base, hspec, lens, lens-aeson, text }:
-     mkDerivation {
-       pname = "aeson-picker";
-       version = "0.1.0.3";
-       sha256 = "0ipkl5plyhbkld3i6jrlzy9y1kpvb69gy1nqb45rbnjbdxafslpk";
-       libraryHaskellDepends = [ aeson base lens lens-aeson text ];
-       testHaskellDepends = [ base hspec text ];
-       homepage = "https://github.com/ozzzzz/aeson-picker#readme";
-       description = "Tiny library to get fields from JSON format";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "aeson-picker_0_1_0_4" = callPackage
     ({ mkDerivation, aeson, base, hspec, lens, lens-aeson, text }:
      mkDerivation {
        pname = "aeson-picker";
@@ -22404,7 +22384,6 @@ self: {
        homepage = "https://github.com/ozzzzz/aeson-picker#readme";
        description = "Tiny library to get fields from JSON format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aeson-prefix" = callPackage
@@ -22646,31 +22625,6 @@ self: {
      }) {};
 
   "aeson-typescript" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, directory
-     , filepath, hspec, interpolate, mtl, process, tasty, tasty-ant-xml
-     , tasty-hspec, template-haskell, temporary, text, th-abstraction
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "aeson-typescript";
-       version = "0.1.0.3";
-       sha256 = "0f5s26fhkpcciqy5wcdsq123nzgcxf2dx9g2v0n9i6h3jkp5800b";
-       libraryHaskellDepends = [
-         aeson base containers interpolate mtl template-haskell text
-         th-abstraction unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson base bytestring containers directory filepath hspec
-         interpolate mtl process tasty tasty-ant-xml tasty-hspec
-         template-haskell temporary text th-abstraction unordered-containers
-       ];
-       homepage = "https://github.com/codedownio/aeson-typescript#readme";
-       description = "Generate TypeScript definition files from your ADTs";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "aeson-typescript_0_1_0_6" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, directory
      , filepath, hspec, interpolate, mtl, process, template-haskell
      , temporary, text, th-abstraction, unordered-containers
@@ -23339,8 +23293,8 @@ self: {
     ({ mkDerivation, base, c2hs, mtl, openal }:
      mkDerivation {
        pname = "al";
-       version = "0.1.4.1";
-       sha256 = "1mmka0cc9kl6s3sq6jgw82qk77psym2yibr922f6c3k3b528rr9h";
+       version = "0.1.4.2";
+       sha256 = "1lpcdh2dak1r9lwd6irjs8p56p1fjphq58ixwjwbg9syl2rz7w4b";
        libraryHaskellDepends = [ base mtl ];
        libraryPkgconfigDepends = [ openal ];
        libraryToolDepends = [ c2hs ];
@@ -26926,8 +26880,8 @@ self: {
      }:
      mkDerivation {
        pname = "ansi-terminal-game";
-       version = "0.2.0.0";
-       sha256 = "0lh3yhx5ylfi7m35p5kbnfh0vrcp2p7yrr6lxpfab6y0gs683snk";
+       version = "0.2.1.0";
+       sha256 = "0a227gs7a0hz705lgq97mx4sdlbwqflns0zls7qsr9yr6ljc4836";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -27234,14 +27188,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "apecs_0_3_0_0" = callPackage
+  "apecs_0_3_0_1" = callPackage
     ({ mkDerivation, async, base, containers, criterion, linear, mtl
      , QuickCheck, template-haskell, vector
      }:
      mkDerivation {
        pname = "apecs";
-       version = "0.3.0.0";
-       sha256 = "0iir47vj8fgclppynav0skda7q91kw0nnw6pjr4cz6gz9ragh9wh";
+       version = "0.3.0.1";
+       sha256 = "04vqhkikyxgyzm61jlw21ycg3iv5fsx24q31a7gy5cxh5fqmw76k";
        libraryHaskellDepends = [
          async base containers mtl template-haskell vector
        ];
@@ -28124,6 +28078,8 @@ self: {
        pname = "arbtt";
        version = "0.10";
        sha256 = "0klxsxyq4yij11c9z11jgrarmz1fya2rpx0zax7kqpvc26xbc24n";
+       revision = "1";
+       editedCabalFile = "13a0qvaqlaw6pcg4dizvs6p2g2kjabgznkl6789dw21nry2xqynb";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -29036,29 +28992,6 @@ self: {
      }) {};
 
   "asciidiagram" = callPackage
-    ({ mkDerivation, base, bytestring, containers, directory, filepath
-     , FontyFruity, JuicyPixels, lens, linear, mtl, optparse-applicative
-     , rasterific-svg, svg-tree, text, vector
-     }:
-     mkDerivation {
-       pname = "asciidiagram";
-       version = "1.3.3";
-       sha256 = "062zcirgkjlypyzj7igjmhyisgs19svyzzqpmgy7vah8ykslhjb9";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring containers FontyFruity JuicyPixels lens linear mtl
-         rasterific-svg svg-tree text vector
-       ];
-       executableHaskellDepends = [
-         base bytestring directory filepath FontyFruity JuicyPixels
-         optparse-applicative rasterific-svg svg-tree text
-       ];
-       description = "Pretty rendering of Ascii diagram into svg or png";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "asciidiagram_1_3_3_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
      , FontyFruity, JuicyPixels, lens, linear, mtl, optparse-applicative
      , rasterific-svg, svg-tree, text, vector
@@ -29079,7 +29012,6 @@ self: {
        ];
        description = "Pretty rendering of Ascii diagram into svg or png";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "asic" = callPackage
@@ -29761,8 +29693,8 @@ self: {
      }:
      mkDerivation {
        pname = "atlassian-connect-descriptor";
-       version = "0.4.5.0";
-       sha256 = "0dzswy71awgxqchb3ydq8idxlvqaalal45fx5prhr7xg4077apm0";
+       version = "0.4.6.0";
+       sha256 = "1yyc5cp10zqhmi2hay0hiz526lxfcn56g13ikfh25pqzayrxnd8b";
        libraryHaskellDepends = [
          aeson base cases network network-uri text time-units
          unordered-containers
@@ -30790,12 +30722,12 @@ self: {
     ({ mkDerivation, base, Cabal, directory, filepath }:
      mkDerivation {
        pname = "autoexporter";
-       version = "1.1.4";
-       sha256 = "08jkmh4zlgzp5wc6qivriqqf4n0ddh4wqffk3dpg8rsvj299648l";
+       version = "1.1.9";
+       sha256 = "0hm0njnfgjfbnpjjqmhim773zbzgkfq96caxckcv8vkrj78l839v";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base Cabal directory filepath ];
-       executableHaskellDepends = [ base ];
+       executableHaskellDepends = [ base Cabal directory filepath ];
        homepage = "https://github.com/tfausak/autoexporter#readme";
        description = "Automatically re-export modules";
        license = stdenv.lib.licenses.mit;
@@ -31991,39 +31923,6 @@ self: {
      }) {};
 
   "b9" = callPackage
-    ({ mkDerivation, aeson, async, base, bifunctors, binary, boxes
-     , bytestring, conduit, conduit-extra, ConfigFile, directory
-     , filepath, free, hashable, hspec, hspec-expectations, mtl
-     , optparse-applicative, parallel, parsec, pretty, pretty-show
-     , process, QuickCheck, random, semigroups, syb, template, text
-     , time, transformers, unordered-containers, vector, yaml
-     }:
-     mkDerivation {
-       pname = "b9";
-       version = "0.5.35";
-       sha256 = "11j2mr03hn9xz7dq1p7kr448mdj1dva360xf6n7qmq3nq4vrl1av";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson async base bifunctors binary boxes bytestring conduit
-         conduit-extra ConfigFile directory filepath free hashable mtl
-         parallel parsec pretty pretty-show process QuickCheck random
-         semigroups syb template text time transformers unordered-containers
-         vector yaml
-       ];
-       executableHaskellDepends = [
-         base bytestring directory optparse-applicative
-       ];
-       testHaskellDepends = [
-         aeson base bytestring hspec hspec-expectations QuickCheck
-         semigroups text unordered-containers vector yaml
-       ];
-       homepage = "https://github.com/sheyll/b9-vm-image-builder";
-       description = "A tool and library for building virtual machine images";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "b9_0_5_41" = callPackage
     ({ mkDerivation, aeson, async, base, bifunctors, binary, boxes
      , bytestring, conduit, conduit-extra, ConfigFile, directory
      , filepath, free, hashable, hspec, hspec-expectations, mtl
@@ -32053,7 +31952,6 @@ self: {
        homepage = "https://github.com/sheyll/b9-vm-image-builder";
        description = "A tool and library for building virtual machine images";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "babl" = callPackage
@@ -32564,12 +32462,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "base_4_10_1_0" = callPackage
+  "base_4_11_0_0" = callPackage
     ({ mkDerivation, ghc-prim, invalid-cabal-flag-settings, rts }:
      mkDerivation {
        pname = "base";
-       version = "4.10.1.0";
-       sha256 = "0hnzhqdf2bxz9slia67sym6s0hi5szh8596kcckighchs9jzl9wx";
+       version = "4.11.0.0";
+       sha256 = "1p18cm61ql911nqfld1kc7h6qpmhfxrf1xyahik180a7rbygbkq3";
        libraryHaskellDepends = [
          ghc-prim invalid-cabal-flag-settings rts
        ];
@@ -32633,8 +32531,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "base-noprelude";
-       version = "4.10.1.0";
-       sha256 = "0nsgqfkxzp762i2c06lgpkza9a6a31aq5qx2cd820rpqg5yllbx2";
+       version = "4.11.0.0";
+       sha256 = "11q2cqy865q13hy2kc9k41cprdmlzh172prh5dhy3xp6zsbppjnh";
        libraryHaskellDepends = [ base ];
        doHaddock = false;
        homepage = "https://github.com/hvr/base-noprelude";
@@ -33079,6 +32977,35 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "battleplace" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, cereal, data-default
+     , hashable, memory, servant, text, vector
+     }:
+     mkDerivation {
+       pname = "battleplace";
+       version = "0.1.0.0";
+       sha256 = "1p3dxz8a752wc6fmj6kip4gcwj77c96ic5wzlhgv670xsh4ac1qg";
+       libraryHaskellDepends = [
+         aeson base bytestring cereal data-default hashable memory servant
+         text vector
+       ];
+       description = "Core definitions for BattlePlace.io service";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "battleplace-api" = callPackage
+    ({ mkDerivation, base, battleplace, servant, servant-client }:
+     mkDerivation {
+       pname = "battleplace-api";
+       version = "0.1.0.0";
+       sha256 = "0hy1y5n064i7g2zknvj7yl7zw3bljqjrfr2sg68cmk9gkd854rlw";
+       libraryHaskellDepends = [
+         base battleplace servant servant-client
+       ];
+       description = "Public API definitions of BattlePlace.io service";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "battleship-combinatorics" = callPackage
     ({ mkDerivation, base, combinatorial, containers, deepseq
      , directory, filepath, non-empty, pooled-io, prelude-compat
@@ -36924,27 +36851,6 @@ self: {
      }) {};
 
   "blaze-builder" = callPackage
-    ({ mkDerivation, base, bytestring, deepseq, HUnit, QuickCheck
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , text, utf8-string
-     }:
-     mkDerivation {
-       pname = "blaze-builder";
-       version = "0.4.0.2";
-       sha256 = "1m33y6p5xldni8p4fzg8fmsyqvkfmnimdamr1xjnsmgm3dkf9lws";
-       revision = "1";
-       editedCabalFile = "1n8z1zcvrslsa9dvflx8528hsialmnljl1zzdjf1azs24xdq2npm";
-       libraryHaskellDepends = [ base bytestring deepseq text ];
-       testHaskellDepends = [
-         base bytestring HUnit QuickCheck test-framework
-         test-framework-hunit test-framework-quickcheck2 text utf8-string
-       ];
-       homepage = "http://github.com/lpsmith/blaze-builder";
-       description = "Efficient buffered output";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "blaze-builder_0_4_1_0" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, HUnit, QuickCheck
      , test-framework, test-framework-hunit, test-framework-quickcheck2
      , text, utf8-string
@@ -36961,7 +36867,6 @@ self: {
        homepage = "http://github.com/lpsmith/blaze-builder";
        description = "Efficient buffered output";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "blaze-builder-conduit" = callPackage
@@ -37930,14 +37835,28 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "bookkeeping_0_3_3_0" = callPackage
+    ({ mkDerivation, base, dlist, doctest, Glob, mtl, text, time }:
+     mkDerivation {
+       pname = "bookkeeping";
+       version = "0.3.3.0";
+       sha256 = "040ivbr9slbsxghrgys2ym9mxfmc5jh579f2x8cl7yqr851gq1g6";
+       libraryHaskellDepends = [ base dlist mtl text time ];
+       testHaskellDepends = [ base doctest Glob ];
+       homepage = "https://github.com/arowM/haskell-bookkeeping#readme";
+       description = "A module for bookkeeping by double entry";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "bookkeeping-jp" = callPackage
     ({ mkDerivation, base, bookkeeping, doctest, Glob, mono-traversable
      , text, time
      }:
      mkDerivation {
        pname = "bookkeeping-jp";
-       version = "0.1.1.1";
-       sha256 = "1mnjwfdzhp1kbd02g7vdc1x2rrm10hzi96j6ljin17vynh06dmm0";
+       version = "0.1.1.2";
+       sha256 = "0i0il5h6zf8hps8i3y4s6s80sqpvv0xgld1g3pm752v91r3z3dgv";
        libraryHaskellDepends = [
          base bookkeeping mono-traversable text time
        ];
@@ -39147,6 +39066,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "buffer-builder_0_2_4_5" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, criterion
+     , deepseq, HTF, http-types, json-builder, mtl, quickcheck-instances
+     , text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "buffer-builder";
+       version = "0.2.4.5";
+       sha256 = "08g47zaqrh40lvkwijpx3x8xflpnjvrijd9bsfv0m94139xrncmc";
+       libraryHaskellDepends = [
+         base bytestring mtl text unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson attoparsec base bytestring criterion deepseq HTF
+         quickcheck-instances text vector
+       ];
+       benchmarkHaskellDepends = [
+         aeson base bytestring criterion deepseq http-types json-builder
+         text vector
+       ];
+       homepage = "https://github.com/chadaustin/buffer-builder";
+       description = "Library for efficiently building up buffers, one piece at a time";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "buffer-builder-aeson" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, buffer-builder
      , bytestring, criterion, deepseq, hashable, HUnit, integer-gmp
@@ -41353,8 +41298,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal2nix";
-       version = "2.9.1";
-       sha256 = "1qz5gjwzkfpmqiz5k62sxkv4prdmzwfa3hg9zma5dg1k4vs9dhkv";
+       version = "2.9.2";
+       sha256 = "1wcc7a2xzi8kq7k0rv0jc0z4z1w9ry6h71a730m3rz601j8n7q2v";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -42620,26 +42565,6 @@ self: {
      }) {};
 
   "case-insensitive" = callPackage
-    ({ mkDerivation, base, bytestring, criterion, deepseq, hashable
-     , HUnit, test-framework, test-framework-hunit, text
-     }:
-     mkDerivation {
-       pname = "case-insensitive";
-       version = "1.2.0.10";
-       sha256 = "0v1hclvv0516fnlj5j2izd9xmakl7dshi9cb32iz6dgvzx01qck6";
-       revision = "2";
-       editedCabalFile = "197c93pa4lq6rgv59s9q9m11lziyyy6jlizvqap4lz0ijfnmj1gx";
-       libraryHaskellDepends = [ base bytestring deepseq hashable text ];
-       testHaskellDepends = [
-         base bytestring HUnit test-framework test-framework-hunit text
-       ];
-       benchmarkHaskellDepends = [ base bytestring criterion deepseq ];
-       homepage = "https://github.com/basvandijk/case-insensitive";
-       description = "Case insensitive string comparison";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "case-insensitive_1_2_0_11" = callPackage
     ({ mkDerivation, base, bytestring, criterion, deepseq, hashable
      , HUnit, test-framework, test-framework-hunit, text
      }:
@@ -42655,7 +42580,6 @@ self: {
        homepage = "https://github.com/basvandijk/case-insensitive";
        description = "Case insensitive string comparison";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "case-insensitive-match" = callPackage
@@ -43363,6 +43287,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "cayley-client_0_4_5" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, binary, bytestring
+     , exceptions, hspec, http-client, http-conduit, lens, lens-aeson
+     , mtl, text, transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "cayley-client";
+       version = "0.4.5";
+       sha256 = "12gmav4bwf3i44wbwc68vgrnal7j6q3428d6wl5zq078pv2c3x7w";
+       libraryHaskellDepends = [
+         aeson attoparsec base binary bytestring exceptions http-client
+         http-conduit lens lens-aeson mtl text transformers
+         unordered-containers vector
+       ];
+       testHaskellDepends = [ aeson base hspec unordered-containers ];
+       homepage = "https://github.com/MichelBoucey/cayley-client";
+       description = "A Haskell client for the Cayley graph database";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cayley-dickson" = callPackage
     ({ mkDerivation, base, random }:
      mkDerivation {
@@ -49815,24 +49760,6 @@ self: {
      }) {};
 
   "concurrent-extra" = callPackage
-    ({ mkDerivation, async, base, HUnit, random, stm, test-framework
-     , test-framework-hunit, unbounded-delays
-     }:
-     mkDerivation {
-       pname = "concurrent-extra";
-       version = "0.7.0.11";
-       sha256 = "0bvfgm26hyix074c36l7cqdq40xx8zzml6v50qdfly04g1bb05m5";
-       libraryHaskellDepends = [ base stm unbounded-delays ];
-       testHaskellDepends = [
-         async base HUnit random stm test-framework test-framework-hunit
-         unbounded-delays
-       ];
-       homepage = "https://github.com/basvandijk/concurrent-extra";
-       description = "Extra concurrency primitives";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "concurrent-extra_0_7_0_12" = callPackage
     ({ mkDerivation, async, base, HUnit, random, stm, test-framework
      , test-framework-hunit, unbounded-delays
      }:
@@ -49848,7 +49775,6 @@ self: {
        homepage = "https://github.com/basvandijk/concurrent-extra";
        description = "Extra concurrency primitives";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "concurrent-machines" = callPackage
@@ -49873,22 +49799,6 @@ self: {
      }) {};
 
   "concurrent-output" = callPackage
-    ({ mkDerivation, ansi-terminal, async, base, directory, exceptions
-     , process, stm, terminal-size, text, transformers, unix
-     }:
-     mkDerivation {
-       pname = "concurrent-output";
-       version = "1.10.4";
-       sha256 = "0zq50g3l9f55vhwjw6s6jf1nqyi0a7f1ih7vas686ckj2z33z9ay";
-       libraryHaskellDepends = [
-         ansi-terminal async base directory exceptions process stm
-         terminal-size text transformers unix
-       ];
-       description = "Ungarble output from several threads or commands";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "concurrent-output_1_10_5" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, directory, exceptions
      , process, stm, terminal-size, text, transformers, unix
      }:
@@ -49902,7 +49812,6 @@ self: {
        ];
        description = "Ungarble output from several threads or commands";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "concurrent-rpc" = callPackage
@@ -50143,8 +50052,8 @@ self: {
      }:
      mkDerivation {
        pname = "conduit";
-       version = "1.3.0";
-       sha256 = "1520pdyb8lawcbqapr1v8lj9zzxnm6d20zfgawa6ds0dxskz1kyp";
+       version = "1.3.0.1";
+       sha256 = "14vkv5l3zzs68k4dxmp4rl9n4fapq2kzw0h81xy0r35g9jmqycaq";
        libraryHaskellDepends = [
          base bytestring directory exceptions filepath mono-traversable mtl
          primitive resourcet text transformers unix unliftio-core vector
@@ -50163,7 +50072,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "conduit_1_3_0_1" = callPackage
+  "conduit_1_3_0_2" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, directory
      , exceptions, filepath, gauge, hspec, kan-extensions
      , mono-traversable, mtl, mwc-random, primitive, QuickCheck
@@ -50172,8 +50081,8 @@ self: {
      }:
      mkDerivation {
        pname = "conduit";
-       version = "1.3.0.1";
-       sha256 = "14vkv5l3zzs68k4dxmp4rl9n4fapq2kzw0h81xy0r35g9jmqycaq";
+       version = "1.3.0.2";
+       sha256 = "0nqy9bffg2p2ij8isz99r7i5zm7sib0m9fqwisknakjh8b99kw60";
        libraryHaskellDepends = [
          base bytestring directory exceptions filepath mono-traversable mtl
          primitive resourcet text transformers unix unliftio-core vector
@@ -50804,39 +50713,6 @@ self: {
      }) {};
 
   "configuration-tools" = callPackage
-    ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base
-     , base-unicode-symbols, base64-bytestring, bytestring, Cabal
-     , case-insensitive, connection, data-default, deepseq, directory
-     , dlist, enclosed-exceptions, filepath, http-client
-     , http-client-tls, http-types, monad-control, mtl, network-uri
-     , optparse-applicative, process, profunctors, text, tls
-     , transformers, unordered-containers, wai, warp, warp-tls, x509
-     , x509-system, x509-validation, yaml
-     }:
-     mkDerivation {
-       pname = "configuration-tools";
-       version = "0.3.0";
-       sha256 = "0kpjmnmc7vzdarqczk4z1hxizm9fsnbvhazb6xg4y1a7j8ps99wz";
-       libraryHaskellDepends = [
-         aeson ansi-wl-pprint attoparsec base base-unicode-symbols
-         base64-bytestring bytestring Cabal case-insensitive connection
-         data-default deepseq directory dlist enclosed-exceptions filepath
-         http-client http-client-tls http-types monad-control mtl
-         network-uri optparse-applicative process profunctors text tls
-         transformers unordered-containers x509 x509-system x509-validation
-         yaml
-       ];
-       testHaskellDepends = [
-         base base-unicode-symbols bytestring Cabal enclosed-exceptions
-         http-types monad-control mtl text transformers unordered-containers
-         wai warp warp-tls yaml
-       ];
-       homepage = "https://github.com/alephcloud/hs-configuration-tools";
-       description = "Tools for specifying and parsing configurations";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "configuration-tools_0_3_1" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base
      , base-unicode-symbols, base64-bytestring, bytestring, Cabal
      , case-insensitive, connection, data-default, deepseq, directory
@@ -50867,7 +50743,6 @@ self: {
        homepage = "https://github.com/alephcloud/hs-configuration-tools";
        description = "Tools for specifying and parsing configurations";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "configurator" = callPackage
@@ -51354,8 +51229,8 @@ self: {
      }:
      mkDerivation {
        pname = "consumers";
-       version = "2.1.0.0";
-       sha256 = "19pi32g1kpjasapg7bkrn3rxhzwl4ml1ndg5is3pjckm72awkf5y";
+       version = "2.1.1.0";
+       sha256 = "0p52j96kcgrdiccx48j24jdfsfhwi3n3x2rq75n660qrqiab2gf2";
        libraryHaskellDepends = [
          base containers exceptions extra hpqtypes lifted-base
          lifted-threads log-base monad-control monad-time mtl stm time
@@ -51500,6 +51375,8 @@ self: {
        pname = "containers-verified";
        version = "0.5.11.0";
        sha256 = "01qcsxrrg2zjqnd1r4i2m8a1wb9nyyss32rckfs7wni42ladzj07";
+       revision = "1";
+       editedCabalFile = "12jw1aq053wbbam8n2vvfdl00yha551bbk4xnwxk9rwfday45m4j";
        libraryHaskellDepends = [ containers ];
        homepage = "https://github.com/nomeata/containers-verified";
        description = "Formally verified drop-in replacement of containers";
@@ -53190,6 +53067,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "crackNum_2_0" = callPackage
+    ({ mkDerivation, base, data-binary-ieee754, FloatingHex, ieee754 }:
+     mkDerivation {
+       pname = "crackNum";
+       version = "2.0";
+       sha256 = "1wi2k7yrm9z3n1b6vnw5zc3yj4k8drhap7fm2hk1z98wih4qppzp";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base data-binary-ieee754 FloatingHex ieee754
+       ];
+       executableHaskellDepends = [
+         base data-binary-ieee754 FloatingHex ieee754
+       ];
+       description = "Crack various integer, floating-point data formats";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "craft" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base
      , bytestring, conduit, conduit-combinators, conduit-extra
@@ -54027,23 +53923,6 @@ self: {
      }) {};
 
   "crypto-enigma" = callPackage
-    ({ mkDerivation, base, containers, HUnit, MissingH, mtl, QuickCheck
-     , split
-     }:
-     mkDerivation {
-       pname = "crypto-enigma";
-       version = "0.0.2.10";
-       sha256 = "1c7baw7k9shllfxp1yg5czr9m0392pnpqiblaz8v17rc71d402p6";
-       revision = "1";
-       editedCabalFile = "0ijaqjhrv772qnjk3i5lv4yrj3cdz15jkrd3v954x281gixm9j1x";
-       libraryHaskellDepends = [ base containers MissingH mtl split ];
-       testHaskellDepends = [ base HUnit QuickCheck ];
-       homepage = "https://github.com/orome/crypto-enigma-hs";
-       description = "An Enigma machine simulator with display";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "crypto-enigma_0_0_2_11" = callPackage
     ({ mkDerivation, base, containers, HUnit, MissingH, mtl, QuickCheck
      , split
      }:
@@ -54056,7 +53935,6 @@ self: {
        homepage = "https://github.com/orome/crypto-enigma-hs";
        description = "An Enigma machine simulator with display";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "crypto-multihash" = callPackage
@@ -54658,6 +54536,38 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "csg" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, containers
+     , criterion, doctest, doctest-discover, gloss, gloss-raster
+     , QuickCheck, simple-vec3, strict, system-filepath, tasty
+     , tasty-hunit, tasty-quickcheck, transformers, turtle, vector
+     }:
+     mkDerivation {
+       pname = "csg";
+       version = "0.1";
+       sha256 = "06fc7j1izwwalngjvgvkg90xvp3cjr53c4laqp5giwl2vdqrj2zs";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         attoparsec base bytestring containers QuickCheck simple-vec3 strict
+         transformers
+       ];
+       executableHaskellDepends = [
+         base gloss gloss-raster QuickCheck simple-vec3 strict
+         system-filepath turtle
+       ];
+       testHaskellDepends = [
+         base bytestring doctest doctest-discover simple-vec3 tasty
+         tasty-hunit tasty-quickcheck
+       ];
+       benchmarkHaskellDepends = [
+         base criterion simple-vec3 strict vector
+       ];
+       homepage = "https://github.com/dzhus/csg#readme";
+       description = "Analytical CSG (Constructive Solid Geometry) library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "csound-catalog" = callPackage
     ({ mkDerivation, base, csound-expression, csound-sampler
      , sharc-timbre, transformers
@@ -55102,24 +55012,6 @@ self: {
      }) {};
 
   "cublas" = callPackage
-    ({ mkDerivation, base, c2hs, Cabal, cuda, directory, filepath, half
-     , storable-complex, template-haskell
-     }:
-     mkDerivation {
-       pname = "cublas";
-       version = "0.4.0.0";
-       sha256 = "1y1vwrsgiirzn83iza2k1h699qw5m2bimx6r5vv0im8gxr9fgvkw";
-       setupHaskellDepends = [ base Cabal cuda directory filepath ];
-       libraryHaskellDepends = [
-         base cuda half storable-complex template-haskell
-       ];
-       libraryToolDepends = [ c2hs ];
-       description = "FFI bindings to the CUDA BLAS library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "cublas_0_4_0_1" = callPackage
     ({ mkDerivation, base, c2hs, Cabal, cuda, directory, filepath, half
      , storable-complex, template-haskell
      }:
@@ -55151,27 +55043,6 @@ self: {
      }) {};
 
   "cuda" = callPackage
-    ({ mkDerivation, base, bytestring, c2hs, Cabal, directory, filepath
-     , pretty, template-haskell
-     }:
-     mkDerivation {
-       pname = "cuda";
-       version = "0.9.0.2";
-       sha256 = "0l7dpvpr6k0nm7fardga2cyc9ivvv67yndnxpmixifrhdsbm8hvc";
-       isLibrary = true;
-       isExecutable = true;
-       setupHaskellDepends = [ base Cabal directory filepath ];
-       libraryHaskellDepends = [
-         base bytestring filepath template-haskell
-       ];
-       libraryToolDepends = [ c2hs ];
-       executableHaskellDepends = [ base pretty ];
-       homepage = "https://github.com/tmcdonell/cuda";
-       description = "FFI binding to the CUDA interface for programming NVIDIA GPUs";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "cuda_0_9_0_3" = callPackage
     ({ mkDerivation, base, bytestring, c2hs, Cabal, directory, filepath
      , pretty, template-haskell
      }:
@@ -55190,7 +55061,6 @@ self: {
        homepage = "https://github.com/tmcdonell/cuda";
        description = "FFI binding to the CUDA interface for programming NVIDIA GPUs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cudd" = callPackage
@@ -55393,8 +55263,8 @@ self: {
      }:
      mkDerivation {
        pname = "currency-codes";
-       version = "3.0.0.0";
-       sha256 = "0xv5mad6d5y0slizwvh3q9m4n2nxjlav4lxy30s3fv0cfkx4hhwn";
+       version = "3.0.0.1";
+       sha256 = "0b3yqybpd8lk5jw7ajrmn6d4minxqr8l6sq35v1yxhjl81zbria8";
        libraryHaskellDepends = [
          aeson base bson deepseq random safe text
        ];
@@ -55580,24 +55450,6 @@ self: {
      }) {};
 
   "cusolver" = callPackage
-    ({ mkDerivation, base, c2hs, Cabal, cublas, cuda, cusparse
-     , directory, filepath, half, storable-complex
-     }:
-     mkDerivation {
-       pname = "cusolver";
-       version = "0.1.0.0";
-       sha256 = "00ki40s6z9llsbxlp4c46qn7iaamrhnr5yfr983gqg2mfc3wx355";
-       setupHaskellDepends = [ base Cabal cuda directory filepath ];
-       libraryHaskellDepends = [
-         base cublas cuda cusparse half storable-complex
-       ];
-       libraryToolDepends = [ c2hs ];
-       description = "FFI bindings to CUDA Solver, a LAPACK-like library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "cusolver_0_1_0_1" = callPackage
     ({ mkDerivation, base, c2hs, Cabal, cublas, cuda, cusparse
      , directory, filepath, half, storable-complex
      }:
@@ -55616,22 +55468,6 @@ self: {
      }) {};
 
   "cusparse" = callPackage
-    ({ mkDerivation, base, c2hs, Cabal, cuda, directory, filepath, half
-     , storable-complex
-     }:
-     mkDerivation {
-       pname = "cusparse";
-       version = "0.1.0.0";
-       sha256 = "0a45b7y18v50r5lzgkbjapivajqymndl3yvdzp1x25n3imi4knxn";
-       setupHaskellDepends = [ base Cabal cuda directory filepath ];
-       libraryHaskellDepends = [ base cuda half storable-complex ];
-       libraryToolDepends = [ c2hs ];
-       description = "FFI bindings to the CUDA Sparse BLAS library";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "cusparse_0_1_0_1" = callPackage
     ({ mkDerivation, base, c2hs, Cabal, cuda, directory, filepath, half
      , storable-complex
      }:
@@ -56453,6 +56289,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "data-accessor-template_0_2_1_15" = callPackage
+    ({ mkDerivation, base, data-accessor, template-haskell, utility-ht
+     }:
+     mkDerivation {
+       pname = "data-accessor-template";
+       version = "0.2.1.15";
+       sha256 = "0vxs6d6xv2lsxz81msgh5l91pvxma9gif69csi23nxq2xxapyaw0";
+       libraryHaskellDepends = [
+         base data-accessor template-haskell utility-ht
+       ];
+       homepage = "http://www.haskell.org/haskellwiki/Record_access";
+       description = "Utilities for accessing and manipulating fields of records";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "data-accessor-transformers" = callPackage
     ({ mkDerivation, base, data-accessor, transformers }:
      mkDerivation {
@@ -58127,6 +57979,34 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "datadog_0_2_2_0" = callPackage
+    ({ mkDerivation, aeson, auto-update, base, buffer-builder
+     , bytestring, Cabal, dlist, exceptions, hspec, http-client
+     , http-client-tls, http-types, lens, lifted-base, monad-control
+     , network, old-locale, random, text, time, transformers-base
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "datadog";
+       version = "0.2.2.0";
+       sha256 = "0i399f5p9ch4bjmqchq890i6x5jd137pw5lz4v43k5qxlbxvc3s5";
+       libraryHaskellDepends = [
+         aeson auto-update base buffer-builder bytestring dlist http-client
+         http-client-tls http-types lens lifted-base monad-control network
+         old-locale text time transformers-base unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson auto-update base buffer-builder bytestring Cabal dlist
+         exceptions hspec http-client http-client-tls http-types lens
+         lifted-base monad-control network old-locale random text time
+         transformers-base unordered-containers vector
+       ];
+       homepage = "https://github.com/iand675/datadog";
+       description = "Datadog client for Haskell. Supports both the HTTP API and StatsD.";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "dataenc" = callPackage
     ({ mkDerivation, array, base, containers }:
      mkDerivation {
@@ -59193,6 +59073,36 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "debug_0_1_1" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, clock, containers
+     , deepseq, directory, extra, filepath, ghc-prim, hashable, Hoed
+     , libgraph, open-browser, prettyprinter
+     , prettyprinter-compat-ansi-wl-pprint, template-haskell, text
+     , uniplate, unordered-containers, vector, yaml
+     }:
+     mkDerivation {
+       pname = "debug";
+       version = "0.1.1";
+       sha256 = "0j4jskz8zq2ww81mfarshi5g2m6xfivgl26grkhcacqq6k3483rk";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         aeson base bytestring clock containers deepseq directory extra
+         ghc-prim hashable Hoed libgraph open-browser prettyprinter
+         prettyprinter-compat-ansi-wl-pprint template-haskell text uniplate
+         unordered-containers vector
+       ];
+       executableHaskellDepends = [ aeson base directory filepath yaml ];
+       testHaskellDepends = [
+         aeson base bytestring containers directory extra filepath text
+       ];
+       homepage = "https://github.com/ndmitchell/debug";
+       description = "Simple trace-based debugger";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "debug-diff" = callPackage
     ({ mkDerivation, base, groom, process, temporary }:
      mkDerivation {
@@ -59722,8 +59632,8 @@ self: {
      }:
      mkDerivation {
        pname = "dejafu";
-       version = "1.3.1.0";
-       sha256 = "09c2gsgqxnr9kpkhbz4g1wrl66qy02vp3sckp8vsg194r5xx4s1b";
+       version = "1.3.2.0";
+       sha256 = "1gxwfyyinr1bkab3p4s7swb0d15a4a4d27xwy7ci0nmwgqgb6lf9";
        libraryHaskellDepends = [
          base concurrency containers deepseq exceptions leancheck
          profunctors random ref-fd transformers
@@ -59733,17 +59643,17 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "dejafu_1_3_2_0" = callPackage
+  "dejafu_1_4_0_0" = callPackage
     ({ mkDerivation, base, concurrency, containers, deepseq, exceptions
-     , leancheck, profunctors, random, ref-fd, transformers
+     , leancheck, profunctors, random, transformers
      }:
      mkDerivation {
        pname = "dejafu";
-       version = "1.3.2.0";
-       sha256 = "1gxwfyyinr1bkab3p4s7swb0d15a4a4d27xwy7ci0nmwgqgb6lf9";
+       version = "1.4.0.0";
+       sha256 = "0ydfhgl8011lx5yp3nxhaz1418y7p1d1yfsj9fg1c59djsfrnd45";
        libraryHaskellDepends = [
          base concurrency containers deepseq exceptions leancheck
-         profunctors random ref-fd transformers
+         profunctors random transformers
        ];
        homepage = "https://github.com/barrucadu/dejafu";
        description = "A library for unit-testing concurrent programs";
@@ -60355,8 +60265,8 @@ self: {
     ({ mkDerivation, base, doctest }:
      mkDerivation {
        pname = "derulo";
-       version = "1.0.0";
-       sha256 = "0ylfaj73yv9bzp1sygbhcipji2g9jws2r4alvhns1y7wzl74fgbz";
+       version = "1.0.1";
+       sha256 = "0y5rm5gg53siax0q43z79a0b95fkq5plk91qz658ihxmjd2fbv67";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -60807,8 +60717,8 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-braille";
-       version = "0.1.0.0";
-       sha256 = "0825zczccr878ghlw26x1skg56g8wxa9c0zq3dfaxhfyvxi9d6aq";
+       version = "0.1.0.1";
+       sha256 = "11xq2mx4mmg12cyhs2r7brjn00jy7rh7rwh15gr7piynmx723xhl";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -63752,40 +63662,6 @@ self: {
      }) {};
 
   "docker" = callPackage
-    ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit
-     , conduit-combinators, conduit-extra, connection, containers
-     , data-default-class, directory, exceptions, filemanip, filepath
-     , http-client, http-client-tls, http-conduit, http-types, lens
-     , lens-aeson, monad-control, mtl, network, process, QuickCheck
-     , resourcet, scientific, tar, tasty, tasty-hunit, tasty-quickcheck
-     , temporary, text, time, tls, transformers, transformers-base
-     , unliftio-core, unordered-containers, uuid, vector, x509
-     , x509-store, x509-system, zlib
-     }:
-     mkDerivation {
-       pname = "docker";
-       version = "0.5.1.0";
-       sha256 = "1g1bmz185hibm0n23yxkili4v8768yascd8mc8z2pil9bky7lvww";
-       libraryHaskellDepends = [
-         aeson base blaze-builder bytestring conduit conduit-combinators
-         conduit-extra containers data-default-class directory exceptions
-         filemanip filepath http-client http-conduit http-types
-         monad-control mtl network resourcet scientific tar temporary text
-         time tls transformers transformers-base unliftio-core
-         unordered-containers uuid vector x509 x509-store x509-system zlib
-       ];
-       testHaskellDepends = [
-         aeson base bytestring connection containers directory http-client
-         http-client-tls http-types lens lens-aeson process QuickCheck tasty
-         tasty-hunit tasty-quickcheck text transformers unordered-containers
-         vector
-       ];
-       homepage = "https://github.com/denibertovic/docker-hs";
-       description = "An API client for docker written in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "docker_0_5_1_1" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit
      , conduit-combinators, conduit-extra, connection, containers
      , data-default-class, directory, exceptions, filemanip, filepath
@@ -63817,7 +63693,6 @@ self: {
        homepage = "https://github.com/denibertovic/docker-hs";
        description = "An API client for docker written in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "docker-build-cacher" = callPackage
@@ -63826,8 +63701,8 @@ self: {
      }:
      mkDerivation {
        pname = "docker-build-cacher";
-       version = "1.9.1";
-       sha256 = "1d8v9900j9ygx060gahwk208i5f36sdpnlpdaa1qqhcnywvmfzi4";
+       version = "1.9.2";
+       sha256 = "11k91vvdisnh031w9l5r650ibngjd3fgylkcllp01wz1s67w78v7";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -63940,26 +63815,6 @@ self: {
      }) {};
 
   "doctemplates" = callPackage
-    ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
-     , containers, hspec, parsec, scientific, text, unordered-containers
-     , vector
-     }:
-     mkDerivation {
-       pname = "doctemplates";
-       version = "0.2.2";
-       sha256 = "1bfi33r48ifgrnj2iyx9d39vadzaq4ssqmf1k3cal5q0ywiw2srz";
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson base blaze-html blaze-markup bytestring containers parsec
-         scientific text unordered-containers vector
-       ];
-       testHaskellDepends = [ aeson base hspec text ];
-       homepage = "https://github.com/jgm/doctemplates#readme";
-       description = "Pandoc-style document templates";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "doctemplates_0_2_2_1" = callPackage
     ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring
      , containers, hspec, parsec, scientific, text, unordered-containers
      , vector
@@ -63977,7 +63832,6 @@ self: {
        homepage = "https://github.com/jgm/doctemplates#readme";
        description = "Pandoc-style document templates";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "doctest" = callPackage
@@ -64373,36 +64227,6 @@ self: {
      }) {};
 
   "dotenv" = callPackage
-    ({ mkDerivation, base, base-compat, directory, exceptions, hspec
-     , hspec-megaparsec, megaparsec, optparse-applicative, process, text
-     , transformers, yaml
-     }:
-     mkDerivation {
-       pname = "dotenv";
-       version = "0.5.2.3";
-       sha256 = "194cjf641q54b19daldg9nyi9gf8j4fxql6aslqzbgy7bfg5aj5b";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base base-compat directory exceptions megaparsec process text
-         transformers yaml
-       ];
-       executableHaskellDepends = [
-         base base-compat megaparsec optparse-applicative process text
-         transformers yaml
-       ];
-       testHaskellDepends = [
-         base base-compat directory exceptions hspec hspec-megaparsec
-         megaparsec process text transformers yaml
-       ];
-       homepage = "https://github.com/stackbuilders/dotenv-hs";
-       description = "Loads environment variables from dotenv files";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "dotenv_0_5_2_4" = callPackage
     ({ mkDerivation, base, base-compat, directory, exceptions, hspec
      , hspec-megaparsec, megaparsec, optparse-applicative, process, text
      , transformers, yaml
@@ -65586,15 +65410,15 @@ self: {
      }) {};
 
   "dwarf-el" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, transformers
-     , utf8-string
+    ({ mkDerivation, base, binary, bytestring, containers, text
+     , text-show, transformers
      }:
      mkDerivation {
        pname = "dwarf-el";
-       version = "0.2.1.1";
-       sha256 = "18ba03v1m7xbsgygjgfrzr9c7fah21lr3300mhvqipicdgrb691w";
+       version = "0.3";
+       sha256 = "177y84zgl215jivbxifn09w8mdv0k65bxyky0l1hadd64hgp2nq7";
        libraryHaskellDepends = [
-         base binary bytestring containers transformers utf8-string
+         base binary bytestring containers text text-show transformers
        ];
        description = "Parser for DWARF debug format";
        license = stdenv.lib.licenses.bsd3;
@@ -65602,17 +65426,17 @@ self: {
 
   "dwarfadt" = callPackage
     ({ mkDerivation, base, bytestring, bytestring-mmap, containers
-     , dwarf-el, elf, lens, pretty, transformers
+     , dwarf-el, elf, lens, pretty, text, text-show, transformers
      }:
      mkDerivation {
        pname = "dwarfadt";
-       version = "0.4";
-       sha256 = "15mzv6sa2qf0g9skwq4ij35l3lqbc4x3fzwj5hkx93f8pz2bj1hi";
+       version = "0.6";
+       sha256 = "1fzkigzrm6s9060vmxsgw4bwzpfvcxc510ghb1rkqh5gslqszcb0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base bytestring bytestring-mmap containers dwarf-el elf lens pretty
-         transformers
+         text text-show transformers
        ];
        executableHaskellDepends = [ base containers dwarf-el ];
        description = "High-level wrapper around the dwarf library";
@@ -67011,6 +66835,8 @@ self: {
        pname = "ekg-core";
        version = "0.1.1.4";
        sha256 = "0dz9iv6viya7b5nx9gxj9g0d1k155pvb7i59azf9272wl369mn36";
+       revision = "1";
+       editedCabalFile = "01hp42jjp1cg8z692xahbwlv4x521pdxhyd8d89fjdkvccf8gvnk";
        libraryHaskellDepends = [
          base containers ghc-prim text unordered-containers
        ];
@@ -67839,23 +67665,6 @@ self: {
      }) {};
 
   "email-validate" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, doctest, hspec
-     , QuickCheck, template-haskell
-     }:
-     mkDerivation {
-       pname = "email-validate";
-       version = "2.3.2.3";
-       sha256 = "1alz5j2bz7x3cwlksdxdynzgcrbbf7jyxmgh61n0wmqnav509y96";
-       libraryHaskellDepends = [
-         attoparsec base bytestring template-haskell
-       ];
-       testHaskellDepends = [ base bytestring doctest hspec QuickCheck ];
-       homepage = "https://github.com/Porges/email-validate-hs";
-       description = "Email address validation";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "email-validate_2_3_2_5" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, doctest, hspec
      , QuickCheck, template-haskell
      }:
@@ -67870,7 +67679,6 @@ self: {
        homepage = "https://github.com/Porges/email-validate-hs";
        description = "Email address validation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "email-validate-json" = callPackage
@@ -68510,6 +68318,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "enummapset_0_5_2_2" = callPackage
+    ({ mkDerivation, base, containers, deepseq, semigroups }:
+     mkDerivation {
+       pname = "enummapset";
+       version = "0.5.2.2";
+       sha256 = "0x6fihrgvb2y6m0z2gi8n97b54aidydd8fnbmj02bq3x73gxnbvr";
+       libraryHaskellDepends = [ base containers deepseq semigroups ];
+       homepage = "https://github.com/michalt/enummapset";
+       description = "IntMap and IntSet with Enum keys/elements";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "enummapset-th" = callPackage
     ({ mkDerivation, base, containers, deepseq, template-haskell }:
      mkDerivation {
@@ -69069,22 +68890,6 @@ self: {
      }) {};
 
   "errors" = callPackage
-    ({ mkDerivation, base, exceptions, safe, text, transformers
-     , transformers-compat, unexceptionalio
-     }:
-     mkDerivation {
-       pname = "errors";
-       version = "2.2.4";
-       sha256 = "0v5jdjh6k3wys2m1ff6pgiydy6fzd0r0pn2k3bsisrj6nf6gff7a";
-       libraryHaskellDepends = [
-         base exceptions safe text transformers transformers-compat
-         unexceptionalio
-       ];
-       description = "Simplified error-handling";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "errors_2_2_5" = callPackage
     ({ mkDerivation, base, exceptions, safe, text, transformers
      , transformers-compat, unexceptionalio
      }:
@@ -69098,7 +68903,6 @@ self: {
        ];
        description = "Simplified error-handling";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "errors-ext" = callPackage
@@ -70788,27 +70592,6 @@ self: {
      }) {};
 
   "exp-pairs" = callPackage
-    ({ mkDerivation, base, containers, deepseq, ghc-prim, matrix
-     , QuickCheck, random, smallcheck, tasty, tasty-hunit
-     , tasty-quickcheck, tasty-smallcheck, wl-pprint
-     }:
-     mkDerivation {
-       pname = "exp-pairs";
-       version = "0.1.5.2";
-       sha256 = "17dcmv08xvbq11b8dkka7na9hxdh3r566s00wygnqrjg9gfc5bcd";
-       libraryHaskellDepends = [
-         base containers deepseq ghc-prim wl-pprint
-       ];
-       testHaskellDepends = [
-         base matrix QuickCheck random smallcheck tasty tasty-hunit
-         tasty-quickcheck tasty-smallcheck
-       ];
-       homepage = "https://github.com/Bodigrim/exp-pairs";
-       description = "Linear programming over exponent pairs";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "exp-pairs_0_1_6_0" = callPackage
     ({ mkDerivation, base, containers, deepseq, ghc-prim, matrix
      , prettyprinter, QuickCheck, random, smallcheck, tasty, tasty-hunit
      , tasty-quickcheck, tasty-smallcheck
@@ -70827,7 +70610,6 @@ self: {
        homepage = "https://github.com/Bodigrim/exp-pairs";
        description = "Linear programming over exponent pairs";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "expand" = callPackage
@@ -71482,8 +71264,8 @@ self: {
      }:
      mkDerivation {
        pname = "fadno-braids";
-       version = "0.1.0";
-       sha256 = "0imf4cd8gl5hq4qrrp5jgfhv4k0vmrm2qm124nbnj65zhgxvm9lz";
+       version = "0.1.1";
+       sha256 = "1d8ca0lnvkpqbrfmvk8mash0kgkxwzlzzspsp35n7csp6iyll543";
        libraryHaskellDepends = [
          base containers data-default diagrams diagrams-lib
          diagrams-rasterific lens random
@@ -71499,8 +71281,8 @@ self: {
      }:
      mkDerivation {
        pname = "fadno-xml";
-       version = "1.1.0";
-       sha256 = "0wm4kj544zyg2rfb0qdcc9m60l5awskcc0w0rs5bw0v5jdzk2d3j";
+       version = "1.1.1";
+       sha256 = "0xsklyavmgi0b2qn7758i3ph7ifnkkjyz0yczw5zj4586q184am5";
        libraryHaskellDepends = [
          base containers Decimal lens mtl parsec xml
        ];
@@ -71832,8 +71614,8 @@ self: {
      }:
      mkDerivation {
        pname = "fast-tags";
-       version = "1.4";
-       sha256 = "17gnpf5w9a3k4wjwzj6qrsn5fm508pqq8wy4zsqjy3pfprm3239z";
+       version = "1.4.1";
+       sha256 = "0d3i5npmc9nx91nmfbd2cwq33yd48b269gbc9k2ls6sbj9qdi172";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -74428,8 +74210,8 @@ self: {
        pname = "flac";
        version = "0.1.2";
        sha256 = "0adc88h5dmazf9m2xah0qkcav3pm0l3jiy8wbg9fxjv1qpgv74jn";
-       revision = "1";
-       editedCabalFile = "1hl2dgf4ccbk0qk6yqdwr1qbdjp4yi25dhs595lmnf7wrhk7662f";
+       revision = "2";
+       editedCabalFile = "0pn5mw1n152i106x60gz05bnpfhn50ll005v4ihvawq5faq3h44l";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers data-default-class directory exceptions
@@ -74851,6 +74633,20 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "flow_1_0_12" = callPackage
+    ({ mkDerivation, base, doctest, QuickCheck, template-haskell }:
+     mkDerivation {
+       pname = "flow";
+       version = "1.0.12";
+       sha256 = "0c9mg6d8krv7c0sxlkgcpvhcspb8g65hp0h7pgjql4644ivqpn3p";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base doctest QuickCheck template-haskell ];
+       homepage = "https://github.com/tfausak/flow#readme";
+       description = "Write more understandable Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "flow-er" = callPackage
     ({ mkDerivation, base, doctest, flow, QuickCheck }:
      mkDerivation {
@@ -75363,23 +75159,6 @@ self: {
      }) {};
 
   "fold-debounce" = callPackage
-    ({ mkDerivation, base, data-default-class, hspec, stm, stm-delay
-     , time
-     }:
-     mkDerivation {
-       pname = "fold-debounce";
-       version = "0.2.0.6";
-       sha256 = "133q81c6gvk6zgn3zv5wkvp5sa6b5fvzf9i4facs9s00l7y2nrgk";
-       libraryHaskellDepends = [
-         base data-default-class stm stm-delay time
-       ];
-       testHaskellDepends = [ base hspec stm time ];
-       homepage = "https://github.com/debug-ito/fold-debounce";
-       description = "Fold multiple events that happen in a given period of time";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "fold-debounce_0_2_0_7" = callPackage
     ({ mkDerivation, base, data-default-class, hspec, stm, stm-delay
      , time
      }:
@@ -75394,7 +75173,6 @@ self: {
        homepage = "https://github.com/debug-ito/fold-debounce";
        description = "Fold multiple events that happen in a given period of time";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fold-debounce-conduit" = callPackage
@@ -76010,23 +75788,6 @@ self: {
      }) {};
 
   "formatting" = callPackage
-    ({ mkDerivation, array, base, bytestring, clock, ghc-prim, hspec
-     , integer-gmp, old-locale, scientific, text, time, transformers
-     }:
-     mkDerivation {
-       pname = "formatting";
-       version = "6.3.0";
-       sha256 = "16xngayk1jd92bj2qaf7fmrgzdskdnc7rsgpk1ij06xd8cdgahf1";
-       libraryHaskellDepends = [
-         array base bytestring clock ghc-prim integer-gmp old-locale
-         scientific text time transformers
-       ];
-       testHaskellDepends = [ base hspec ];
-       description = "Combinator-based type-safe formatting (like printf() or FORMAT)";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "formatting_6_3_1" = callPackage
     ({ mkDerivation, array, base, bytestring, clock, ghc-prim, hspec
      , integer-gmp, old-locale, scientific, text, time, transformers
      }:
@@ -76041,7 +75802,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Combinator-based type-safe formatting (like printf() or FORMAT)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "forml" = callPackage
@@ -77147,23 +76907,6 @@ self: {
      }) {inherit (pkgs) libdevil;};
 
   "friday-juicypixels" = callPackage
-    ({ mkDerivation, base, bytestring, file-embed, friday, hspec
-     , JuicyPixels, vector
-     }:
-     mkDerivation {
-       pname = "friday-juicypixels";
-       version = "0.1.2.3";
-       sha256 = "19j321vqca8sl366j3acdskr8zhzcki429zxzs8xawdmxqh93vzv";
-       libraryHaskellDepends = [ base friday JuicyPixels vector ];
-       testHaskellDepends = [
-         base bytestring file-embed friday hspec JuicyPixels
-       ];
-       homepage = "https://github.com/TomMD/friday-juicypixels";
-       description = "Converts between the Friday and JuicyPixels image types";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "friday-juicypixels_0_1_2_4" = callPackage
     ({ mkDerivation, base, bytestring, file-embed, friday, hspec
      , JuicyPixels, vector
      }:
@@ -77178,7 +76921,6 @@ self: {
        homepage = "github.com/TomMD/friday-juicypixels";
        description = "Converts between the Friday and JuicyPixels image types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "friday-scale-dct" = callPackage
@@ -77341,6 +77083,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "frpnow-vty" = callPackage
+    ({ mkDerivation, base, containers, frpnow, vty }:
+     mkDerivation {
+       pname = "frpnow-vty";
+       version = "0.2.0.1";
+       sha256 = "06rd09a13kssxzbspm1r172m5wf94fph0sjm78jd29d8ml279p1h";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base frpnow vty ];
+       executableHaskellDepends = [ base containers frpnow vty ];
+       homepage = "https://github.com/noughtmare/frpnow-vty";
+       description = "Program terminal applications with vty and frpnow!";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "frquotes" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -79502,24 +79259,6 @@ self: {
      }) {};
 
   "generics-eot" = callPackage
-    ({ mkDerivation, base, directory, doctest, filepath, hspec
-     , interpolate, markdown-unlit, mockery, QuickCheck, shake
-     }:
-     mkDerivation {
-       pname = "generics-eot";
-       version = "0.2.1.1";
-       sha256 = "1n6h90vjr0q1xckr5xyv2gfncvhs8l4k63r4mf3bqdxdsa6jkbw9";
-       libraryHaskellDepends = [ base markdown-unlit ];
-       testHaskellDepends = [
-         base directory doctest filepath hspec interpolate markdown-unlit
-         mockery QuickCheck shake
-       ];
-       homepage = "https://github.com/soenkehahn/generics-eot#readme";
-       description = "A library for generic programming that aims to be easy to understand";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "generics-eot_0_2_1_2" = callPackage
     ({ mkDerivation, base, directory, doctest, filepath, hspec
      , hspec-discover, interpolate, markdown-unlit, mockery, QuickCheck
      , shake
@@ -79537,7 +79276,6 @@ self: {
        homepage = "https://github.com/soenkehahn/generics-eot#readme";
        description = "A library for generic programming that aims to be easy to understand";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "generics-sop" = callPackage
@@ -79903,29 +79641,6 @@ self: {
      }) {};
 
   "genvalidity-hspec-aeson" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, deepseq, doctest
-     , genvalidity, genvalidity-aeson, genvalidity-hspec
-     , genvalidity-text, hspec, QuickCheck, text
-     }:
-     mkDerivation {
-       pname = "genvalidity-hspec-aeson";
-       version = "0.1.0.1";
-       sha256 = "0ww43pcmya7gqjfxsp7a9f4pf3dpc0g57988l92rl5arix17fkr2";
-       libraryHaskellDepends = [
-         aeson base bytestring deepseq genvalidity genvalidity-hspec hspec
-         QuickCheck
-       ];
-       testHaskellDepends = [
-         aeson base doctest genvalidity genvalidity-aeson genvalidity-hspec
-         genvalidity-text hspec text
-       ];
-       homepage = "http://cs-syd.eu";
-       description = "Standard spec's for aeson-related instances";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "genvalidity-hspec-aeson_0_1_0_2" = callPackage
     ({ mkDerivation, aeson, base, bytestring, deepseq, doctest
      , genvalidity, genvalidity-aeson, genvalidity-hspec
      , genvalidity-text, hspec, QuickCheck, text
@@ -80432,6 +80147,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "getopt-generics_0_13_0_2" = callPackage
+    ({ mkDerivation, base, base-compat, base-orphans, filepath
+     , generics-sop, hspec, QuickCheck, safe, silently, tagged
+     }:
+     mkDerivation {
+       pname = "getopt-generics";
+       version = "0.13.0.2";
+       sha256 = "0330f63gy5gk461hvyy79jxrz5bcxdh2sgl0r1g1ffl4swjsl176";
+       libraryHaskellDepends = [
+         base base-compat base-orphans generics-sop tagged
+       ];
+       testHaskellDepends = [
+         base base-compat base-orphans filepath generics-sop hspec
+         QuickCheck safe silently tagged
+       ];
+       homepage = "https://github.com/soenkehahn/getopt-generics#readme";
+       description = "Create command line interfaces with ease";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "getopt-simple" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
@@ -80736,25 +80472,6 @@ self: {
      }) {};
 
   "ghc-events" = callPackage
-    ({ mkDerivation, array, base, binary, bytestring, containers, text
-     , vector
-     }:
-     mkDerivation {
-       pname = "ghc-events";
-       version = "0.7.1";
-       sha256 = "0cpmc107rhy28700qa2jixdp78jw7hsmni40v90z5is9b048mk3i";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         array base binary bytestring containers text vector
-       ];
-       executableHaskellDepends = [ base containers ];
-       testHaskellDepends = [ base ];
-       description = "Library and tool for parsing .eventlog files from GHC";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "ghc-events_0_7_2" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers, text
      , vector
      }:
@@ -80771,7 +80488,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Library and tool for parsing .eventlog files from GHC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-events-analyze" = callPackage
@@ -81107,19 +80823,6 @@ self: {
      }) {};
 
   "ghc-parser" = callPackage
-    ({ mkDerivation, base, cpphs, ghc, happy }:
-     mkDerivation {
-       pname = "ghc-parser";
-       version = "0.2.0.1";
-       sha256 = "10xx2d9awgizjz1jrlw2m30nsl938mh297azp7zay7zkdzsv0fyh";
-       libraryHaskellDepends = [ base ghc ];
-       libraryToolDepends = [ cpphs happy ];
-       homepage = "https://github.com/gibiansky/IHaskell";
-       description = "Haskell source parser from GHC";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "ghc-parser_0_2_0_2" = callPackage
     ({ mkDerivation, base, cpphs, ghc, happy }:
      mkDerivation {
        pname = "ghc-parser";
@@ -81130,7 +80833,6 @@ self: {
        homepage = "https://github.com/gibiansky/IHaskell";
        description = "Haskell source parser from GHC";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-paths" = callPackage
@@ -81215,6 +80917,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ghc-prof_1_4_1_1" = callPackage
+    ({ mkDerivation, attoparsec, base, containers, directory, filepath
+     , process, scientific, tasty, tasty-hunit, temporary, text, time
+     }:
+     mkDerivation {
+       pname = "ghc-prof";
+       version = "1.4.1.1";
+       sha256 = "1zxk2fs0zykpqklyfwssbi5hfmzm7hc1yx8l8x1fy29qxim3y2z5";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         attoparsec base containers scientific text time
+       ];
+       testHaskellDepends = [
+         attoparsec base containers directory filepath process tasty
+         tasty-hunit temporary text
+       ];
+       homepage = "https://github.com/maoe/ghc-prof";
+       description = "Library for parsing GHC time and allocation profiling reports";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghc-prof-aeson" = callPackage
     ({ mkDerivation, aeson, base, bytestring, hspec, text, vector }:
      mkDerivation {
@@ -81365,8 +81090,8 @@ self: {
     ({ mkDerivation, base, ghc }:
      mkDerivation {
        pname = "ghc-tcplugins-extra";
-       version = "0.2.2";
-       sha256 = "1k52r8hdbhsp5ydfi010976nck81q38lm8x069x6sdvslmwda1wq";
+       version = "0.2.4";
+       sha256 = "03lxph20m33ipa117i917khgk8rv3fljly3fh31j92d0l02bh9sb";
        libraryHaskellDepends = [ base ghc ];
        homepage = "http://github.com/clash-lang/ghc-tcplugins-extra";
        description = "Utilities for writing GHC type-checker plugins";
@@ -81435,8 +81160,8 @@ self: {
      }:
      mkDerivation {
        pname = "ghc-typelits-knownnat";
-       version = "0.4";
-       sha256 = "0qwp44jpp8jbrgri0i3yviqnypdj79b8hpxxbk80dwwsjg1q5ynv";
+       version = "0.4.1";
+       sha256 = "0m3flri3y82wvqania3yj7mhnnxvx8z5hxwl6mr5ppavxak169q9";
        libraryHaskellDepends = [
          base ghc ghc-tcplugins-extra ghc-typelits-natnormalise
          template-haskell transformers
@@ -81455,8 +81180,8 @@ self: {
      }:
      mkDerivation {
        pname = "ghc-typelits-natnormalise";
-       version = "0.5.8";
-       sha256 = "0xkhj0kka7j9achgzn66zbxs84pxr5h9jq35x4kdnha5hw34c0i1";
+       version = "0.5.9";
+       sha256 = "1aw0pgcplljll86gk9jvqc22zpnb17amamna11n9b4xzrw2lrnkg";
        libraryHaskellDepends = [
          base ghc ghc-tcplugins-extra integer-gmp
        ];
@@ -82012,6 +81737,50 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) cairo;};
 
+  "gi-dbusmenu" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers, dbusmenu-glib
+     , gi-glib, gi-gobject, haskell-gi, haskell-gi-base
+     , haskell-gi-overloading, text, transformers
+     }:
+     mkDerivation {
+       pname = "gi-dbusmenu";
+       version = "0.4.1";
+       sha256 = "0fi07jf6bsrxsk101ffpyv17lirjgyx4afz26lhbpkqadnpc3kp4";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
+       libraryHaskellDepends = [
+         base bytestring containers gi-glib gi-gobject haskell-gi
+         haskell-gi-base haskell-gi-overloading text transformers
+       ];
+       libraryPkgconfigDepends = [ dbusmenu-glib ];
+       doHaddock = false;
+       homepage = "https://github.com/haskell-gi/haskell-gi";
+       description = "Dbusmenu bindings";
+       license = stdenv.lib.licenses.lgpl21;
+     }) {dbusmenu-glib = null;};
+
+  "gi-dbusmenugtk3" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers, dbusmenu-gtk3
+     , gi-atk, gi-dbusmenu, gi-gdk, gi-gdkpixbuf, gi-glib, gi-gobject
+     , gi-gtk, haskell-gi, haskell-gi-base, haskell-gi-overloading, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "gi-dbusmenugtk3";
+       version = "0.4.1";
+       sha256 = "0gl37jsska2qsakzbmvwvb33lskdrbxpk1hmw907y187d0hq7pry";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
+       libraryHaskellDepends = [
+         base bytestring containers gi-atk gi-dbusmenu gi-gdk gi-gdkpixbuf
+         gi-glib gi-gobject gi-gtk haskell-gi haskell-gi-base
+         haskell-gi-overloading text transformers
+       ];
+       libraryPkgconfigDepends = [ dbusmenu-gtk3 ];
+       doHaddock = false;
+       homepage = "https://github.com/haskell-gi/haskell-gi";
+       description = "DbusmenuGtk bindings";
+       license = stdenv.lib.licenses.lgpl21;
+     }) {dbusmenu-gtk3 = null;};
+
   "gi-gdk" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo
      , gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject, gi-pango, gtk3
@@ -82355,8 +82124,8 @@ self: {
        pname = "gi-gtk-hs";
        version = "0.3.5.0";
        sha256 = "10vshqkc398lribxfz1lk2zbp2y1iqyb0gszzzkin07y3fzlfhiv";
-       revision = "1";
-       editedCabalFile = "01gcz19v90iw2iy8mmlavin68i5w1c1zzliyqnlss7sn5dqqx8bh";
+       revision = "2";
+       editedCabalFile = "0cv2ca8skkz4gfnw7xxy9ppcxcr9d97rnxr1jj5ii7nki9njb693";
        libraryHaskellDepends = [
          base base-compat containers gi-gdk gi-gdkpixbuf gi-glib gi-gobject
          gi-gtk haskell-gi-base mtl text transformers
@@ -83503,6 +83272,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "github-release_1_1_6" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, http-client
+     , http-client-tls, http-types, mime-types, optparse-generic, text
+     , unordered-containers, uri-templater
+     }:
+     mkDerivation {
+       pname = "github-release";
+       version = "1.1.6";
+       sha256 = "1amvbrs7sb6d2l20rr4qc8gjj6m9xlhgkbrr13nrnjfg5fg0midn";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring http-client http-client-tls http-types
+         mime-types optparse-generic text unordered-containers uri-templater
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring http-client http-client-tls http-types
+         mime-types optparse-generic text unordered-containers uri-templater
+       ];
+       homepage = "https://github.com/tfausak/github-release#readme";
+       description = "Upload files to GitHub releases";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "github-tools" = callPackage
     ({ mkDerivation, base, bytestring, containers, exceptions, github
      , groom, html, http-client, http-client-tls, monad-parallel
@@ -83894,8 +83688,8 @@ self: {
      }:
      mkDerivation {
        pname = "gitter";
-       version = "0.3.0";
-       sha256 = "13mi1c4z80nmj00adikbkdjijkciy2zkkyqbvf10r5zilqhdbaw1";
+       version = "0.4";
+       sha256 = "0lvsjpb1iakpbvh8prnwd90p8fp7hhj5120yp2w5ra9pm5fqcl49";
        libraryHaskellDepends = [
          aeson base bytestring exceptions lens lens-aeson mtl text wreq
        ];
@@ -84009,6 +83803,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "glabrous_0_3_5" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
+     , cereal, cereal-text, directory, either, hspec, text
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "glabrous";
+       version = "0.3.5";
+       sha256 = "0n3mqpcmxz9z339r18dac5s4zdgkknlx470cd1mfi9gd932cr4z9";
+       libraryHaskellDepends = [
+         aeson aeson-pretty attoparsec base bytestring cereal cereal-text
+         either text unordered-containers
+       ];
+       testHaskellDepends = [
+         base directory either hspec text unordered-containers
+       ];
+       homepage = "https://github.com/MichelBoucey/glabrous";
+       description = "A template DSL library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "glade" = callPackage
     ({ mkDerivation, base, Cabal, glib, gtk, gtk2hs-buildtools
      , libglade
@@ -84306,8 +84122,8 @@ self: {
        pname = "glirc";
        version = "2.25";
        sha256 = "1hh6zqkk1cm50n7d17i2490q2xh7hzy63krpj58rwhgpmn3ps5sb";
-       revision = "1";
-       editedCabalFile = "13bf4rcwik6lq4rv1ci9i01hpmvvbqd1xs7fixrk10qsjm31cakw";
+       revision = "2";
+       editedCabalFile = "10n3vhnb77ai3qw2xdkwlhjr3wa6146djk6780l2nc8yfg4axi9j";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal filepath ];
@@ -88749,22 +88565,6 @@ self: {
      }) {};
 
   "grouped-list" = callPackage
-    ({ mkDerivation, base, containers, criterion, deepseq, pointed
-     , QuickCheck, tasty, tasty-quickcheck
-     }:
-     mkDerivation {
-       pname = "grouped-list";
-       version = "0.2.1.5";
-       sha256 = "18y3v4jjrj1vrf3q8ki3yamb1n2sm8azp0cnaylpd6xslyr08yv5";
-       libraryHaskellDepends = [ base containers deepseq pointed ];
-       testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
-       benchmarkHaskellDepends = [ base criterion ];
-       homepage = "https://github.com/Daniel-Diaz/grouped-list/blob/master/README.md";
-       description = "Grouped lists. Equal consecutive elements are grouped.";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "grouped-list_0_2_2_0" = callPackage
     ({ mkDerivation, base, binary, containers, criterion, deepseq
      , pointed, QuickCheck, tasty, tasty-quickcheck
      }:
@@ -88778,7 +88578,6 @@ self: {
        homepage = "https://github.com/Daniel-Diaz/grouped-list/blob/master/README.md";
        description = "Grouped lists. Equal consecutive elements are grouped.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "groupoid" = callPackage
@@ -92561,19 +92360,19 @@ self: {
   "hamtsolo" = callPackage
     ({ mkDerivation, async, attoparsec, attoparsec-binary, base, binary
      , bytestring, conduit, conduit-combinators, conduit-extra
-     , exceptions, optparse-applicative, resourcet, stm-conduit, unix
-     , word8
+     , exceptions, gitrev, optparse-applicative, resourcet, stm-conduit
+     , unix
      }:
      mkDerivation {
        pname = "hamtsolo";
-       version = "1.0.2";
-       sha256 = "0756ffnh1fxwagwkj3zy8axnwkwhnn8m37583sr0ymwyp9vwi3sx";
+       version = "1.0.3";
+       sha256 = "0dbhpdfmbs6ydin2p75wqia9lcrw82gfv3kx8659gnw2ll3dmpnh";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          async attoparsec attoparsec-binary base binary bytestring conduit
-         conduit-combinators conduit-extra exceptions optparse-applicative
-         resourcet stm-conduit unix word8
+         conduit-combinators conduit-extra exceptions gitrev
+         optparse-applicative resourcet stm-conduit unix
        ];
        homepage = "https://github.com/tfc/hamtsolo#readme";
        description = "Intel AMT serial-over-lan (SOL) client";
@@ -95706,20 +95505,6 @@ self: {
      }) {};
 
   "haskell-src" = callPackage
-    ({ mkDerivation, array, base, happy, pretty, syb }:
-     mkDerivation {
-       pname = "haskell-src";
-       version = "1.0.2.0";
-       sha256 = "19lilhpwnjb7cks9fq1ipnc8f7dwxy0ri3dgjkdxs3i355byw99a";
-       revision = "1";
-       editedCabalFile = "13lipvh20r35vcgschkvxl8csfi6bn7nqk6avzp7jwrhmpgi9wi0";
-       libraryHaskellDepends = [ array base pretty syb ];
-       libraryToolDepends = [ happy ];
-       description = "Support for manipulating Haskell source code";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "haskell-src_1_0_3_0" = callPackage
     ({ mkDerivation, array, base, happy, pretty, syb }:
      mkDerivation {
        pname = "haskell-src";
@@ -95729,7 +95514,6 @@ self: {
        libraryToolDepends = [ happy ];
        description = "Support for manipulating Haskell source code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-src-exts_1_19_1" = callPackage
@@ -96244,37 +96028,6 @@ self: {
      }) {};
 
   "haskell-tools-refactor" = callPackage
-    ({ mkDerivation, aeson, base, Cabal, containers, directory, either
-     , filepath, ghc, ghc-paths, haskell-tools-ast
-     , haskell-tools-backend-ghc, haskell-tools-prettyprint
-     , haskell-tools-rewrite, mtl, old-time, polyparse, references
-     , split, tasty, tasty-hunit, template-haskell, time, transformers
-     , uniplate
-     }:
-     mkDerivation {
-       pname = "haskell-tools-refactor";
-       version = "1.0.1.1";
-       sha256 = "1s0nd1swxqiip5hq13ys9f6vbj22mw1c5dh5m9360md163hvvlw2";
-       libraryHaskellDepends = [
-         aeson base Cabal containers directory filepath ghc ghc-paths
-         haskell-tools-ast haskell-tools-backend-ghc
-         haskell-tools-prettyprint haskell-tools-rewrite mtl references
-         split template-haskell transformers uniplate
-       ];
-       testHaskellDepends = [
-         base Cabal containers directory either filepath ghc ghc-paths
-         haskell-tools-ast haskell-tools-backend-ghc
-         haskell-tools-prettyprint haskell-tools-rewrite mtl old-time
-         polyparse references split tasty tasty-hunit template-haskell time
-         transformers uniplate
-       ];
-       homepage = "https://github.com/haskell-tools/haskell-tools";
-       description = "Refactoring Tool for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "haskell-tools-refactor_1_0_1_2" = callPackage
     ({ mkDerivation, aeson, base, Cabal, containers, directory, either
      , filepath, ghc, ghc-paths, haskell-tools-ast
      , haskell-tools-backend-ghc, haskell-tools-prettyprint
@@ -99709,33 +99462,6 @@ self: {
      }) {};
 
   "hedgehog" = callPackage
-    ({ mkDerivation, ansi-terminal, async, base, bytestring
-     , concurrent-output, containers, directory, exceptions
-     , lifted-async, mmorph, monad-control, mtl, pretty-show, primitive
-     , random, resourcet, semigroups, stm, template-haskell, text
-     , th-lift, time, transformers, transformers-base, unix
-     , wl-pprint-annotated
-     }:
-     mkDerivation {
-       pname = "hedgehog";
-       version = "0.5.2";
-       sha256 = "1nl6q4hlsqbwqjk3ywpd6hdyi3qyz34agrp9533lmkx7120jfblh";
-       libraryHaskellDepends = [
-         ansi-terminal async base bytestring concurrent-output containers
-         directory exceptions lifted-async mmorph monad-control mtl
-         pretty-show primitive random resourcet semigroups stm
-         template-haskell text th-lift time transformers transformers-base
-         unix wl-pprint-annotated
-       ];
-       testHaskellDepends = [
-         base containers pretty-show semigroups text transformers
-       ];
-       homepage = "https://hedgehog.qa";
-       description = "Hedgehog will eat all your bugs";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hedgehog_0_5_3" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, bytestring
      , concurrent-output, containers, directory, exceptions
      , lifted-async, mmorph, monad-control, mtl, pretty-show, primitive
@@ -99762,7 +99488,6 @@ self: {
        homepage = "https://hedgehog.qa";
        description = "Hedgehog will eat all your bugs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hedgehog-checkers" = callPackage
@@ -99846,31 +99571,6 @@ self: {
      }) {};
 
   "hedis" = callPackage
-    ({ mkDerivation, async, base, bytestring, bytestring-lexing
-     , deepseq, doctest, errors, HTTP, HUnit, mtl, network, network-uri
-     , resource-pool, scanner, slave-thread, stm, test-framework
-     , test-framework-hunit, text, time, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "hedis";
-       version = "0.10.0";
-       sha256 = "02f095461v812csrncf4bdhvgpn1a3wqpd66gpb72pxij4mrh5zy";
-       libraryHaskellDepends = [
-         async base bytestring bytestring-lexing deepseq errors HTTP mtl
-         network network-uri resource-pool scanner stm text time
-         unordered-containers vector
-       ];
-       testHaskellDepends = [
-         async base bytestring doctest HUnit mtl slave-thread stm
-         test-framework test-framework-hunit text time
-       ];
-       benchmarkHaskellDepends = [ base mtl time ];
-       homepage = "https://github.com/informatikr/hedis";
-       description = "Client library for the Redis datastore: supports full command set, pipelining";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hedis_0_10_1" = callPackage
     ({ mkDerivation, async, base, bytestring, bytestring-lexing
      , deepseq, doctest, errors, HTTP, HUnit, mtl, network, network-uri
      , resource-pool, scanner, slave-thread, stm, test-framework
@@ -99893,7 +99593,6 @@ self: {
        homepage = "https://github.com/informatikr/hedis";
        description = "Client library for the Redis datastore: supports full command set, pipelining";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hedis-config" = callPackage
@@ -100851,25 +100550,6 @@ self: {
      }) {};
 
   "heterocephalus" = callPackage
-    ({ mkDerivation, base, blaze-html, blaze-markup, containers, dlist
-     , doctest, Glob, mtl, parsec, shakespeare, template-haskell, text
-     , transformers
-     }:
-     mkDerivation {
-       pname = "heterocephalus";
-       version = "1.0.5.1";
-       sha256 = "01klxr6wmibav30yaxz0mf8xhd57frs6ika8c26qsgwjlj5qd94p";
-       libraryHaskellDepends = [
-         base blaze-html blaze-markup containers dlist mtl parsec
-         shakespeare template-haskell text transformers
-       ];
-       testHaskellDepends = [ base doctest Glob ];
-       homepage = "https://github.com/arowM/heterocephalus#readme";
-       description = "A type-safe template engine for working with popular front end development tools";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "heterocephalus_1_0_5_2" = callPackage
     ({ mkDerivation, base, blaze-html, blaze-markup, containers, dlist
      , doctest, Glob, mtl, parsec, shakespeare, template-haskell, text
      , transformers
@@ -100886,7 +100566,6 @@ self: {
        homepage = "https://github.com/arowM/heterocephalus#readme";
        description = "A type-safe template engine for working with popular front end development tools";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "heterolist" = callPackage
@@ -106754,20 +106433,51 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) postgresql;};
 
+  "hpqtypes_1_5_2_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, Cabal, containers
+     , data-default-class, directory, exceptions, filepath, HUnit
+     , lifted-base, monad-control, mtl, postgresql, QuickCheck, random
+     , resource-pool, scientific, semigroups, test-framework
+     , test-framework-hunit, text, text-show, time, transformers
+     , transformers-base, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "hpqtypes";
+       version = "1.5.2.0";
+       sha256 = "0ghqrayylsm68nkqzrb7y81n3zslqv0rjpd0fyya67cy26ks43gw";
+       setupHaskellDepends = [ base Cabal directory filepath ];
+       libraryHaskellDepends = [
+         aeson base bytestring containers data-default-class exceptions
+         lifted-base monad-control mtl resource-pool semigroups text
+         text-show time transformers transformers-base vector
+       ];
+       librarySystemDepends = [ postgresql ];
+       testHaskellDepends = [
+         aeson base bytestring exceptions HUnit lifted-base monad-control
+         mtl QuickCheck random scientific test-framework
+         test-framework-hunit text text-show time transformers-base
+         unordered-containers vector
+       ];
+       homepage = "https://github.com/scrive/hpqtypes";
+       description = "Haskell bindings to libpqtypes";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) postgresql;};
+
   "hpqtypes-extras" = callPackage
     ({ mkDerivation, base, base16-bytestring, bytestring, containers
      , cryptohash, data-default, exceptions, fields-json, hpqtypes
-     , lifted-base, log-base, monad-control, mtl, safe, tasty
-     , tasty-hunit, text, text-show, transformers
+     , lifted-base, log-base, monad-control, mtl, safe, semigroups
+     , tasty, tasty-hunit, text, text-show, transformers
      }:
      mkDerivation {
        pname = "hpqtypes-extras";
-       version = "1.6.0.0";
-       sha256 = "1cp4dnamc0gia8xsf9f6hp8gfmhkfrfs8ijjcl9dqaka87m4hkmx";
+       version = "1.6.1.0";
+       sha256 = "1k23dk3f1d3d3a1qdkvwjk91nw7iz4906clnwhd9k2s70zgsw111";
        libraryHaskellDepends = [
          base base16-bytestring bytestring containers cryptohash
          data-default exceptions fields-json hpqtypes lifted-base log-base
-         monad-control mtl safe text text-show
+         monad-control mtl safe semigroups text text-show
        ];
        testHaskellDepends = [
          base exceptions hpqtypes lifted-base log-base monad-control tasty
@@ -111257,23 +110967,6 @@ self: {
      }) {};
 
   "hsyslog-udp" = callPackage
-    ({ mkDerivation, base, bytestring, hspec, hsyslog, network, text
-     , time, unix
-     }:
-     mkDerivation {
-       pname = "hsyslog-udp";
-       version = "0.2.1";
-       sha256 = "0133yr6cg7z1ix6dqskjzi36d62803549vdbpg9a29lb49kl1yv3";
-       libraryHaskellDepends = [
-         base bytestring hsyslog network text time unix
-       ];
-       testHaskellDepends = [ base hspec time ];
-       homepage = "https://github.com/ThoughtLeadr/hsyslog-udp";
-       description = "Log to syslog over a network via UDP";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hsyslog-udp_0_2_2" = callPackage
     ({ mkDerivation, base, bytestring, hspec, hsyslog, network, text
      , time, unix
      }:
@@ -111288,7 +110981,6 @@ self: {
        homepage = "https://github.com/ThoughtLeadr/hsyslog-udp";
        description = "Log to syslog over a network via UDP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hszephyr" = callPackage
@@ -111928,35 +111620,6 @@ self: {
      }) {};
 
   "http-client" = callPackage
-    ({ mkDerivation, array, async, base, base64-bytestring
-     , blaze-builder, bytestring, case-insensitive, containers, cookie
-     , deepseq, directory, exceptions, filepath, ghc-prim, hspec
-     , http-types, mime-types, monad-control, network, network-uri
-     , random, stm, streaming-commons, text, time, transformers, zlib
-     }:
-     mkDerivation {
-       pname = "http-client";
-       version = "0.5.10";
-       sha256 = "1hmshs97smigqy334rfkgv3vri5fas3cj8zz2gqlby9jsrp6kygm";
-       libraryHaskellDepends = [
-         array base base64-bytestring blaze-builder bytestring
-         case-insensitive containers cookie deepseq exceptions filepath
-         ghc-prim http-types mime-types network network-uri random stm
-         streaming-commons text time transformers
-       ];
-       testHaskellDepends = [
-         async base base64-bytestring blaze-builder bytestring
-         case-insensitive containers deepseq directory hspec http-types
-         monad-control network network-uri streaming-commons text time
-         transformers zlib
-       ];
-       doCheck = false;
-       homepage = "https://github.com/snoyberg/http-client";
-       description = "An HTTP client engine";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "http-client_0_5_11" = callPackage
     ({ mkDerivation, array, async, base, blaze-builder, bytestring
      , case-insensitive, containers, cookie, deepseq, directory
      , exceptions, filepath, ghc-prim, hspec, http-types, memory
@@ -111982,7 +111645,6 @@ self: {
        homepage = "https://github.com/snoyberg/http-client";
        description = "An HTTP client engine";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-client-auth" = callPackage
@@ -112650,34 +112312,6 @@ self: {
      }) {};
 
   "http-reverse-proxy" = callPackage
-    ({ mkDerivation, async, base, blaze-builder, bytestring
-     , case-insensitive, conduit, conduit-extra, containers
-     , data-default-class, hspec, http-client, http-conduit, http-types
-     , lifted-base, monad-control, network, resourcet, streaming-commons
-     , text, transformers, wai, wai-logger, warp, word8
-     }:
-     mkDerivation {
-       pname = "http-reverse-proxy";
-       version = "0.5.0";
-       sha256 = "10j58i0xkbf84ypk5q8pxz2a85kk24s4xqhkprr6j12d4hx1zl6i";
-       libraryHaskellDepends = [
-         async base blaze-builder bytestring case-insensitive conduit
-         conduit-extra containers data-default-class http-client http-types
-         lifted-base monad-control network resourcet streaming-commons text
-         transformers wai wai-logger word8
-       ];
-       testHaskellDepends = [
-         base blaze-builder bytestring conduit conduit-extra hspec
-         http-conduit http-types lifted-base network resourcet
-         streaming-commons transformers wai warp
-       ];
-       homepage = "https://github.com/fpco/http-reverse-proxy";
-       description = "Reverse proxy HTTP requests, either over raw sockets or with WAI";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "http-reverse-proxy_0_5_0_1" = callPackage
     ({ mkDerivation, async, base, blaze-builder, bytestring
      , case-insensitive, conduit, conduit-extra, containers
      , data-default-class, hspec, http-client, http-conduit, http-types
@@ -113268,6 +112902,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hunit-dejafu_1_1_0_3" = callPackage
+    ({ mkDerivation, base, dejafu, exceptions, HUnit }:
+     mkDerivation {
+       pname = "hunit-dejafu";
+       version = "1.1.0.3";
+       sha256 = "18zpvc77p0djay8d8lz3d6y7ppmdjk2cihakhlin7bqpzmyydkbl";
+       libraryHaskellDepends = [ base dejafu exceptions HUnit ];
+       homepage = "https://github.com/barrucadu/dejafu";
+       description = "Deja Fu support for the HUnit test framework";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hunit-gui" = callPackage
     ({ mkDerivation, base, cairo, gtk, haskell98, HUnit }:
      mkDerivation {
@@ -113734,25 +113381,6 @@ self: {
      }) {};
 
   "hw-fingertree-strict" = callPackage
-    ({ mkDerivation, base, hedgehog, hspec, HUnit, hw-hspec-hedgehog
-     , QuickCheck, test-framework, test-framework-hunit
-     , test-framework-quickcheck2
-     }:
-     mkDerivation {
-       pname = "hw-fingertree-strict";
-       version = "0.1.0.0";
-       sha256 = "02bgqcjjhxpzd5nql50abbbjlg5pan2wy1dhdwc2br87n3jhx90x";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [
-         base hedgehog hspec HUnit hw-hspec-hedgehog QuickCheck
-         test-framework test-framework-hunit test-framework-quickcheck2
-       ];
-       homepage = "https://github.com/githubuser/hw-fingertree-strict#readme";
-       description = "Generic strict finger-tree structure";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hw-fingertree-strict_0_1_0_1" = callPackage
     ({ mkDerivation, base, hedgehog, hspec, HUnit, hw-hspec-hedgehog
      , QuickCheck, test-framework, test-framework-hunit
      , test-framework-quickcheck2
@@ -113769,7 +113397,6 @@ self: {
        homepage = "https://github.com/githubuser/hw-fingertree-strict#readme";
        description = "Generic strict finger-tree structure";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-hedgehog" = callPackage
@@ -113921,8 +113548,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-kafka-client";
-       version = "2.4.0";
-       sha256 = "1c7q05wrwwk2mqr09r14q2c38k5fdpn8phhdzxby0nj1q28azmmk";
+       version = "2.4.1";
+       sha256 = "0mhi85czipxk0mxrzxchljabhkiq5a6y3xn9k5rivi2dgy28mrrk";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -116183,42 +115810,6 @@ self: {
      }) {};
 
   "ihaskell" = callPackage
-    ({ mkDerivation, aeson, base, base64-bytestring, bytestring, cereal
-     , cmdargs, containers, directory, filepath, ghc, ghc-boot
-     , ghc-parser, ghc-paths, haskeline, haskell-src-exts, here, hlint
-     , hspec, hspec-contrib, http-client, http-client-tls, HUnit
-     , ipython-kernel, mtl, parsec, process, random, setenv, shelly
-     , split, stm, strict, system-argv0, text, transformers, unix
-     , unordered-containers, utf8-string, uuid, vector
-     }:
-     mkDerivation {
-       pname = "ihaskell";
-       version = "0.9.0.2";
-       sha256 = "0pa366b4vn5hc9ymd4g1pr4dsffvk80x9c8yq4d1pf4jngjfayql";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson base base64-bytestring bytestring cereal cmdargs containers
-         directory filepath ghc ghc-boot ghc-parser ghc-paths haskeline
-         haskell-src-exts hlint http-client http-client-tls ipython-kernel
-         mtl parsec process random shelly split stm strict system-argv0 text
-         transformers unix unordered-containers utf8-string uuid vector
-       ];
-       executableHaskellDepends = [
-         aeson base bytestring containers directory ghc ipython-kernel
-         process strict text transformers unix
-       ];
-       testHaskellDepends = [
-         base directory ghc ghc-paths here hspec hspec-contrib HUnit setenv
-         shelly text transformers
-       ];
-       homepage = "http://github.com/gibiansky/IHaskell";
-       description = "A Haskell backend kernel for the IPython project";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "ihaskell_0_9_0_3" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, bytestring, cereal
      , cmdargs, containers, directory, filepath, ghc, ghc-boot
      , ghc-parser, ghc-paths, haskeline, haskell-src-exts, here, hlint
@@ -116252,7 +115843,6 @@ self: {
        homepage = "http://github.com/gibiansky/IHaskell";
        description = "A Haskell backend kernel for the IPython project";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ihaskell-aeson" = callPackage
@@ -118876,27 +118466,6 @@ self: {
      }) {};
 
   "invertible" = callPackage
-    ({ mkDerivation, base, haskell-src-meta, invariant, lens
-     , partial-isomorphisms, QuickCheck, semigroupoids, template-haskell
-     , transformers, TypeCompose
-     }:
-     mkDerivation {
-       pname = "invertible";
-       version = "0.2.0.3";
-       sha256 = "0pckhl1nv6w66k3ll9q1bwbmzl2rpbwk6c3xkm7dscxzjzw43qwf";
-       revision = "1";
-       editedCabalFile = "0jkwx19gj653ribqmlpysyp2kf4rphwj837zzwwd7jf9cnmgyqlp";
-       libraryHaskellDepends = [
-         base haskell-src-meta invariant lens partial-isomorphisms
-         semigroupoids template-haskell transformers TypeCompose
-       ];
-       testHaskellDepends = [ base QuickCheck transformers ];
-       description = "bidirectional arrows, bijective functions, and invariant functors";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "invertible_0_2_0_4" = callPackage
     ({ mkDerivation, base, haskell-src-meta, invariant, lens
      , partial-isomorphisms, QuickCheck, semigroupoids, template-haskell
      , transformers, TypeCompose
@@ -119399,26 +118968,6 @@ self: {
      }) {};
 
   "iproute" = callPackage
-    ({ mkDerivation, appar, base, byteorder, containers, doctest, hspec
-     , network, QuickCheck, safe
-     }:
-     mkDerivation {
-       pname = "iproute";
-       version = "1.7.2";
-       sha256 = "15w56dia70hbqdmd16bbl68sjr0y3195hhykr4vb21krlr821dlp";
-       libraryHaskellDepends = [
-         appar base byteorder containers network
-       ];
-       testHaskellDepends = [
-         appar base byteorder containers doctest hspec network QuickCheck
-         safe
-       ];
-       homepage = "http://www.mew.org/~kazu/proj/iproute/";
-       description = "IP Routing Table";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "iproute_1_7_3" = callPackage
     ({ mkDerivation, appar, base, byteorder, containers, doctest, hspec
      , network, QuickCheck, safe
      }:
@@ -119436,7 +118985,6 @@ self: {
        homepage = "http://www.mew.org/~kazu/proj/iproute/";
        description = "IP Routing Table";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "iptables-helpers" = callPackage
@@ -119485,28 +119033,6 @@ self: {
      }) {};
 
   "ipython-kernel" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, cereal, containers
-     , directory, filepath, mtl, process, SHA, temporary, text
-     , transformers, unordered-containers, uuid, zeromq4-haskell
-     }:
-     mkDerivation {
-       pname = "ipython-kernel";
-       version = "0.9.0.1";
-       sha256 = "0nzl5zcl03cdp0l6idscp648n64qjnhvfyj2j47fiiy1fkz133s7";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         aeson base bytestring cereal containers directory filepath mtl
-         process SHA temporary text transformers unordered-containers uuid
-         zeromq4-haskell
-       ];
-       homepage = "http://github.com/gibiansky/IHaskell";
-       description = "A library for creating kernels for IPython frontends";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "ipython-kernel_0_9_0_2" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cereal, containers
      , directory, filepath, mtl, process, SHA, temporary, text
      , transformers, unordered-containers, uuid, zeromq4-haskell
@@ -119526,7 +119052,6 @@ self: {
        homepage = "http://github.com/gibiansky/IHaskell";
        description = "A library for creating kernels for IPython frontends";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "irc" = callPackage
@@ -120673,6 +120198,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ixset-typed_0_4" = callPackage
+    ({ mkDerivation, base, containers, deepseq, HUnit, QuickCheck
+     , safecopy, syb, tasty, tasty-hunit, tasty-quickcheck
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "ixset-typed";
+       version = "0.4";
+       sha256 = "0xjj7vjyp4p6cid5xcin36xd8lwqah0vix4rj2d4mnmbb9ch19aa";
+       libraryHaskellDepends = [
+         base containers deepseq safecopy syb template-haskell
+       ];
+       testHaskellDepends = [
+         base containers HUnit QuickCheck tasty tasty-hunit tasty-quickcheck
+       ];
+       description = "Efficient relational queries on Haskell sets";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ixshader" = callPackage
     ({ mkDerivation, base, ghc-prim, indexed, language-glsl, parsec
      , prettyclass, singletons, template-haskell, text
@@ -121802,6 +121347,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "json_0_9_2" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, mtl, parsec
+     , pretty, syb, text
+     }:
+     mkDerivation {
+       pname = "json";
+       version = "0.9.2";
+       sha256 = "13kkfgx58z18jphbg56jn08jn72wi3kvfndlwwx87hqwg7x1dfz6";
+       libraryHaskellDepends = [
+         array base bytestring containers mtl parsec pretty syb text
+       ];
+       description = "Support for serialising Haskell to and from JSON";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "json-api" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
      , data-default, hspec, lens, lens-aeson, text, unordered-containers
@@ -122048,8 +121609,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-feed";
-       version = "1.0.0";
-       sha256 = "06h9qji4cnzqw4nmxs6dka7ywhz8jr56v5pcb3dlvganjg3s0gdx";
+       version = "1.0.1";
+       sha256 = "16x0k1iwq9z9sq7z6a2007w8cczy6yd7sniylhacqnf1gsjfb4q6";
        libraryHaskellDepends = [
          aeson base bytestring mime-types network-uri tagsoup text time
        ];
@@ -123281,10 +122842,8 @@ self: {
      }:
      mkDerivation {
        pname = "kanji";
-       version = "3.1.0";
-       sha256 = "0l1fbznzw6z8cpcrkmchabwf7zfhb3zj18s323xlxiq3537bxjz4";
-       revision = "2";
-       editedCabalFile = "0n88shf40v4jiqyj24dv1ha8m6s8mja4x5yrh8427byf2s80780c";
+       version = "3.1.0.1";
+       sha256 = "1qxjaqqb3i8w65qda3nxnqxwvgcpfics38yifzf3chy49c3v04wj";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -123662,6 +123221,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "katydid_0_2_0_1" = callPackage
+    ({ mkDerivation, base, containers, criterion, deepseq, directory
+     , filepath, HUnit, hxt, json, mtl, parsec, regex-tdfa, tasty
+     , tasty-hunit, text
+     }:
+     mkDerivation {
+       pname = "katydid";
+       version = "0.2.0.1";
+       sha256 = "1m3rclgrjc7f1rirn39w55rw4vlr769kvm0byw53kg2ib95l2nlg";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers deepseq hxt json mtl parsec regex-tdfa
+       ];
+       executableHaskellDepends = [ base mtl ];
+       testHaskellDepends = [
+         base containers directory filepath HUnit hxt json mtl parsec tasty
+         tasty-hunit
+       ];
+       benchmarkHaskellDepends = [
+         base criterion deepseq directory filepath hxt mtl text
+       ];
+       homepage = "https://github.com/katydid/katydid-haskell";
+       description = "A haskell implementation of Katydid";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "kawa" = callPackage
     ({ mkDerivation, attoparsec, base, directory, hashable, hedgehog
      , optparse-applicative, text, unordered-containers
@@ -125166,6 +124753,20 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "lackey_1_0_2" = callPackage
+    ({ mkDerivation, base, hspec, servant, servant-foreign, text }:
+     mkDerivation {
+       pname = "lackey";
+       version = "1.0.2";
+       sha256 = "00zvbdls0nr4q18889xr8z3cpfldi5gg3m2g7d572bcxvwfhm4y4";
+       libraryHaskellDepends = [ base servant servant-foreign text ];
+       testHaskellDepends = [ base hspec servant servant-foreign text ];
+       homepage = "https://github.com/tfausak/lackey#readme";
+       description = "Generate Ruby clients from Servant APIs";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "lagrangian" = callPackage
     ({ mkDerivation, ad, base, hmatrix, HUnit, nonlinear-optimization
      , test-framework, test-framework-hunit, test-framework-quickcheck2
@@ -126543,28 +126144,6 @@ self: {
      }) {};
 
   "language-javascript" = callPackage
-    ({ mkDerivation, alex, array, base, blaze-builder, bytestring
-     , Cabal, containers, happy, hspec, mtl, QuickCheck, text
-     , utf8-light, utf8-string
-     }:
-     mkDerivation {
-       pname = "language-javascript";
-       version = "0.6.0.10";
-       sha256 = "0m1yk0v4myzjjv3czhavwlsgzp8ffpmbkwks97d3yipl1d0lrwfa";
-       libraryHaskellDepends = [
-         array base blaze-builder bytestring containers mtl text utf8-string
-       ];
-       libraryToolDepends = [ alex happy ];
-       testHaskellDepends = [
-         array base blaze-builder bytestring Cabal containers hspec mtl
-         QuickCheck utf8-light utf8-string
-       ];
-       homepage = "https://github.com/erikd/language-javascript";
-       description = "Parser for JavaScript";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "language-javascript_0_6_0_11" = callPackage
     ({ mkDerivation, alex, array, base, blaze-builder, bytestring
      , Cabal, containers, happy, hspec, mtl, QuickCheck, text
      , utf8-light, utf8-string
@@ -126584,7 +126163,6 @@ self: {
        homepage = "https://github.com/erikd/language-javascript";
        description = "Parser for JavaScript";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-js" = callPackage
@@ -127194,6 +126772,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lapack-ffi-tools_0_1_0_1" = callPackage
+    ({ mkDerivation, base, bytestring, cassava, containers
+     , explicit-exception, filepath, non-empty, optparse-applicative
+     , parsec, pathtype, transformers, unordered-containers, utility-ht
+     , vector
+     }:
+     mkDerivation {
+       pname = "lapack-ffi-tools";
+       version = "0.1.0.1";
+       sha256 = "0cddhc6hm72sjkj3i5f38z3bf4m0cy44jnbgv2v5ck5x0h55173w";
+       isLibrary = false;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       executableHaskellDepends = [
+         base bytestring cassava containers explicit-exception filepath
+         non-empty optparse-applicative parsec pathtype transformers
+         unordered-containers utility-ht vector
+       ];
+       homepage = "http://hub.darcs.net/thielema/lapack-ffi-tools/";
+       description = "Generator for Haskell interface to Fortran LAPACK";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "large-hashable" = callPackage
     ({ mkDerivation, aeson, base, base16-bytestring, byteable, bytes
      , bytestring, cereal, containers, cryptohash, deepseq, hashable
@@ -128352,6 +127954,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lens-labels_0_2_0_0" = callPackage
+    ({ mkDerivation, base, ghc-prim, profunctors, tagged }:
+     mkDerivation {
+       pname = "lens-labels";
+       version = "0.2.0.0";
+       sha256 = "137axpd2j7q4k34mav0338spk985ksh760nfv3vsm59aq9ab76xf";
+       libraryHaskellDepends = [ base ghc-prim profunctors tagged ];
+       homepage = "https://github.com/google/proto-lens#readme";
+       description = "Integration of lenses with OverloadedLabels";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "lens-named" = callPackage
     ({ mkDerivation, base, lens, template-haskell }:
      mkDerivation {
@@ -128558,33 +128173,6 @@ self: {
      }) {};
 
   "lentil" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, csv, directory, filemanip
-     , filepath, hspec, natural-sort, optparse-applicative, parsec
-     , pipes, regex-tdfa, semigroups, terminal-progress-bar, text
-     , transformers
-     }:
-     mkDerivation {
-       pname = "lentil";
-       version = "1.0.10.0";
-       sha256 = "0s7qxd65bjw0h709q9igb5q4jls80wc9jzh5s8ic7ww11f0m5hm7";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         ansi-wl-pprint base csv directory filemanip filepath natural-sort
-         optparse-applicative parsec pipes regex-tdfa semigroups
-         terminal-progress-bar text transformers
-       ];
-       testHaskellDepends = [
-         ansi-wl-pprint base csv directory filemanip filepath hspec
-         natural-sort optparse-applicative parsec pipes regex-tdfa
-         semigroups terminal-progress-bar text transformers
-       ];
-       homepage = "http://www.ariis.it/static/articles/lentil/page.html";
-       description = "frugal issue tracker";
-       license = stdenv.lib.licenses.gpl3;
-     }) {};
-
-  "lentil_1_0_10_1" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, csv, directory, filemanip
      , filepath, hspec, natural-sort, optparse-applicative, parsec
      , pipes, regex-tdfa, semigroups, terminal-progress-bar, text
@@ -128609,7 +128197,6 @@ self: {
        homepage = "http://www.ariis.it/static/articles/lentil/page.html";
        description = "frugal issue tracker";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lenz" = callPackage
@@ -129772,30 +129359,6 @@ self: {
      }) {};
 
   "lifted-base" = callPackage
-    ({ mkDerivation, base, criterion, HUnit, monad-control, monad-peel
-     , test-framework, test-framework-hunit, transformers
-     , transformers-base, transformers-compat
-     }:
-     mkDerivation {
-       pname = "lifted-base";
-       version = "0.2.3.11";
-       sha256 = "1ass00wfa91z5xp2xmm97xrvwm7j5hdkxid5cqvr3xbwrsgpmi4f";
-       revision = "1";
-       editedCabalFile = "0vrik0j1xv2yp759ffa7jb7q838z4wglnbgsrja97mx0dwsbavnx";
-       libraryHaskellDepends = [ base monad-control transformers-base ];
-       testHaskellDepends = [
-         base HUnit monad-control test-framework test-framework-hunit
-         transformers transformers-base transformers-compat
-       ];
-       benchmarkHaskellDepends = [
-         base criterion monad-control monad-peel transformers
-       ];
-       homepage = "https://github.com/basvandijk/lifted-base";
-       description = "lifted IO operations from the base library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "lifted-base_0_2_3_12" = callPackage
     ({ mkDerivation, base, criterion, HUnit, monad-control, monad-peel
      , test-framework, test-framework-hunit, transformers
      , transformers-base, transformers-compat
@@ -129815,7 +129378,6 @@ self: {
        homepage = "https://github.com/basvandijk/lifted-base";
        description = "lifted IO operations from the base library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lifted-protolude" = callPackage
@@ -131094,6 +130656,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "list-t_1_0_1" = callPackage
+    ({ mkDerivation, base, base-prelude, HTF, mmorph, monad-control
+     , mtl, mtl-prelude, transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "list-t";
+       version = "1.0.1";
+       sha256 = "0wv78c3fg4g98pwdamsaasfnww4mdyffp4fhvb685s12kpg8shy3";
+       libraryHaskellDepends = [
+         base mmorph monad-control mtl transformers transformers-base
+       ];
+       testHaskellDepends = [ base-prelude HTF mmorph mtl-prelude ];
+       homepage = "https://github.com/nikita-volkov/list-t";
+       description = "ListT done right";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "list-t-attoparsec" = callPackage
     ({ mkDerivation, attoparsec, base-prelude, either, hspec, list-t
      , list-t-text, text, transformers
@@ -133669,30 +133249,6 @@ self: {
      }) {};
 
   "lucid" = callPackage
-    ({ mkDerivation, base, bifunctors, blaze-builder, bytestring
-     , containers, criterion, deepseq, hashable, hspec, HUnit, mmorph
-     , mtl, parsec, text, transformers, unordered-containers
-     }:
-     mkDerivation {
-       pname = "lucid";
-       version = "2.9.9";
-       sha256 = "0cqdlm1kamfn8kv3r3vphz16j2xi9yf15kpb6440rhsyvwddbani";
-       libraryHaskellDepends = [
-         base blaze-builder bytestring containers hashable mmorph mtl text
-         transformers unordered-containers
-       ];
-       testHaskellDepends = [
-         base bifunctors hspec HUnit mtl parsec text
-       ];
-       benchmarkHaskellDepends = [
-         base blaze-builder bytestring criterion deepseq text transformers
-       ];
-       homepage = "https://github.com/chrisdone/lucid";
-       description = "Clear to write, read and edit DSL for HTML";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "lucid_2_9_10" = callPackage
     ({ mkDerivation, base, bifunctors, blaze-builder, bytestring
      , containers, criterion, deepseq, hashable, hspec, HUnit, mmorph
      , mtl, parsec, text, transformers, unordered-containers
@@ -133714,7 +133270,6 @@ 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-colonnade" = callPackage
@@ -135619,30 +135174,6 @@ self: {
      }) {};
 
   "markdown" = callPackage
-    ({ mkDerivation, attoparsec, base, blaze-html, blaze-markup
-     , conduit, conduit-extra, containers, data-default, directory
-     , filepath, hspec, text, transformers, xml-conduit, xml-types
-     , xss-sanitize
-     }:
-     mkDerivation {
-       pname = "markdown";
-       version = "0.1.16";
-       sha256 = "11gdawvwji7301lm07z5q94g5jlf9iq63wf6k7f6sc88w99b7c08";
-       libraryHaskellDepends = [
-         attoparsec base blaze-html blaze-markup conduit conduit-extra
-         containers data-default text transformers xml-conduit xml-types
-         xss-sanitize
-       ];
-       testHaskellDepends = [
-         base blaze-html conduit conduit-extra containers directory filepath
-         hspec text transformers
-       ];
-       homepage = "https://github.com/snoyberg/markdown";
-       description = "Convert Markdown to HTML, with XSS protection";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "markdown_0_1_17" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-html, blaze-markup
      , call-stack, conduit, conduit-extra, containers, data-default
      , directory, filepath, hspec, text, transformers, xml-conduit
@@ -135664,7 +135195,6 @@ self: {
        homepage = "https://github.com/snoyberg/markdown";
        description = "Convert Markdown to HTML, with XSS protection";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "markdown-kate" = callPackage
@@ -136021,10 +135551,8 @@ self: {
      }:
      mkDerivation {
        pname = "massiv";
-       version = "0.1.1.0";
-       sha256 = "0xl6f3cxhfbyz15p4mayj0489mjgrvla7hz0sf0i58bfcl2b8r8q";
-       revision = "2";
-       editedCabalFile = "06d7lkd65bd5gfpgfgppcg8pagfc8k03qf7psggv2d3sixm088bn";
+       version = "0.1.2.0";
+       sha256 = "0nqlxjyaxp23sqywbv7wqvvlf76hbm1kwg3zj11gnbbm5iabhdli";
        libraryHaskellDepends = [
          base data-default-class deepseq ghc-prim primitive vector
        ];
@@ -136036,14 +135564,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "massiv_0_1_2_0" = callPackage
+  "massiv_0_1_3_0" = callPackage
     ({ mkDerivation, base, data-default, data-default-class, deepseq
      , ghc-prim, hspec, primitive, QuickCheck, safe-exceptions, vector
      }:
      mkDerivation {
        pname = "massiv";
-       version = "0.1.2.0";
-       sha256 = "0nqlxjyaxp23sqywbv7wqvvlf76hbm1kwg3zj11gnbbm5iabhdli";
+       version = "0.1.3.0";
+       sha256 = "0bpy370004rvsz7qq41x7cdim8l4rj79zlz7jzpw7casm6ly0473";
        libraryHaskellDepends = [
          base data-default-class deepseq ghc-prim primitive vector
        ];
@@ -136356,14 +135884,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "matrix_0_3_6_0" = callPackage
+  "matrix_0_3_6_1" = callPackage
     ({ mkDerivation, base, criterion, deepseq, loop, primitive
      , QuickCheck, semigroups, tasty, tasty-quickcheck, vector
      }:
      mkDerivation {
        pname = "matrix";
-       version = "0.3.6.0";
-       sha256 = "1l1pwj6j4k9da4c507z0k17zjvni895qgcgjvln2ggxinzz88fcb";
+       version = "0.3.6.1";
+       sha256 = "0b1v17rc9q7ni44gkzp124kmc5d6xmlpiqvskgjrq54qpjinr5zs";
        libraryHaskellDepends = [
          base deepseq loop primitive semigroups vector
        ];
@@ -139355,6 +138883,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "miso_0_15_0_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, http-api-data
+     , http-types, lucid, network-uri, servant, servant-lucid, text
+     , transformers, vector
+     }:
+     mkDerivation {
+       pname = "miso";
+       version = "0.15.0.0";
+       sha256 = "1kkh71psj0acia9r1mzvp16lzmc6gsma81shp7bhfy35yhbvwsl4";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers http-api-data http-types lucid
+         network-uri servant servant-lucid text transformers vector
+       ];
+       homepage = "http://github.com/dmjio/miso";
+       description = "A tasty Haskell front-end framework";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "missing-foreign" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -139770,8 +139319,8 @@ self: {
        pname = "modern-uri";
        version = "0.2.1.0";
        sha256 = "06lqkx91s0lvkamxxf070l990kh8g0c5f5yshh2lffjbk5zclnp6";
-       revision = "3";
-       editedCabalFile = "05kk7q1bwrnffi2ya4mmmsgy8qr2s5d2lrxa2h0acygvdwg3gx7s";
+       revision = "4";
+       editedCabalFile = "00vr4g5cmhd3d1329hwcdq55yjq8n5jxz15sgl0sawcg5mw5ihyy";
        libraryHaskellDepends = [
          base bytestring containers contravariant deepseq exceptions
          megaparsec mtl profunctors QuickCheck reflection tagged
@@ -140480,28 +140029,6 @@ self: {
      }) {};
 
   "monad-logger" = callPackage
-    ({ mkDerivation, base, blaze-builder, bytestring, conduit
-     , conduit-extra, exceptions, fast-logger, lifted-base
-     , monad-control, monad-loops, mtl, resourcet, stm, stm-chans
-     , template-haskell, text, transformers, transformers-base
-     , transformers-compat, unliftio-core
-     }:
-     mkDerivation {
-       pname = "monad-logger";
-       version = "0.3.28.1";
-       sha256 = "15gpr6wgyqfiz780p8l4lfxmxnanpviyvkba20hdsx92czq64cgr";
-       libraryHaskellDepends = [
-         base blaze-builder bytestring conduit conduit-extra exceptions
-         fast-logger lifted-base monad-control monad-loops mtl resourcet stm
-         stm-chans template-haskell text transformers transformers-base
-         transformers-compat unliftio-core
-       ];
-       homepage = "https://github.com/kazu-yamamoto/logger";
-       description = "A class of monads which can log messages";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "monad-logger_0_3_28_2" = callPackage
     ({ mkDerivation, base, bytestring, conduit, conduit-extra
      , exceptions, fast-logger, lifted-base, monad-control, monad-loops
      , mtl, resourcet, stm, stm-chans, template-haskell, text
@@ -140521,7 +140048,6 @@ self: {
        homepage = "https://github.com/kazu-yamamoto/logger";
        description = "A class of monads which can log messages";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-logger-json" = callPackage
@@ -140540,26 +140066,6 @@ self: {
      }) {};
 
   "monad-logger-prefix" = callPackage
-    ({ mkDerivation, base, criterion, doctest, exceptions, Glob, hspec
-     , monad-control, monad-logger, mtl, QuickCheck, resourcet, text
-     , transformers, transformers-base
-     }:
-     mkDerivation {
-       pname = "monad-logger-prefix";
-       version = "0.1.8";
-       sha256 = "1p8sqynxl898vf2fq5lw8j7r50jrxp8npbsw6sc2mbsi336j79xj";
-       libraryHaskellDepends = [
-         base exceptions monad-control monad-logger mtl resourcet text
-         transformers transformers-base
-       ];
-       testHaskellDepends = [ base doctest Glob hspec QuickCheck ];
-       benchmarkHaskellDepends = [ base criterion monad-logger ];
-       homepage = "https://github.com/parsonsmatt/monad-logger-prefix#readme";
-       description = "Add prefixes to your monad-logger output";
-       license = stdenv.lib.licenses.asl20;
-     }) {};
-
-  "monad-logger-prefix_0_1_9" = callPackage
     ({ mkDerivation, base, criterion, doctest, exceptions, Glob, hspec
      , monad-control, monad-logger, mtl, QuickCheck, resourcet, text
      , transformers, transformers-base
@@ -140577,7 +140083,6 @@ self: {
        homepage = "https://github.com/parsonsmatt/monad-logger-prefix#readme";
        description = "Add prefixes to your monad-logger output";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-logger-syslog" = callPackage
@@ -140923,6 +140428,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "monad-recorder_0_1_1" = callPackage
+    ({ mkDerivation, base, exceptions, hspec, monad-control, mtl
+     , transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "monad-recorder";
+       version = "0.1.1";
+       sha256 = "05d27h3lx7p4qzby8jrxf6wj5z69s11pgpbkdacxrag0v8vynqq8";
+       libraryHaskellDepends = [
+         base exceptions monad-control mtl transformers transformers-base
+       ];
+       testHaskellDepends = [ base hspec ];
+       homepage = "http://github.com/harendra-kumar/monad-recorder";
+       description = "Record and replay the results of monadic actions";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "monad-resumption" = callPackage
     ({ mkDerivation, base, mmorph, mtl, transformers }:
      mkDerivation {
@@ -141529,37 +141052,6 @@ self: {
      }) {};
 
   "mongoDB" = callPackage
-    ({ mkDerivation, array, base, base16-bytestring, base64-bytestring
-     , binary, bson, bytestring, conduit, conduit-extra, containers
-     , criterion, cryptohash, data-default-class, hashtables, hspec
-     , lifted-base, monad-control, mtl, network, nonce, old-locale
-     , parsec, pureMD5, random, random-shuffle, resourcet, tagged, text
-     , time, tls, transformers, transformers-base
-     }:
-     mkDerivation {
-       pname = "mongoDB";
-       version = "2.3.0.4";
-       sha256 = "0qxwk154wd2ir3z7qjn8b7p6lx34ga5r7gcpmf4yp1z8vzsbxn57";
-       libraryHaskellDepends = [
-         array base base16-bytestring base64-bytestring binary bson
-         bytestring conduit conduit-extra containers cryptohash
-         data-default-class hashtables lifted-base monad-control mtl network
-         nonce parsec pureMD5 random random-shuffle resourcet tagged text
-         time tls transformers transformers-base
-       ];
-       testHaskellDepends = [ base hspec mtl old-locale text time ];
-       benchmarkHaskellDepends = [
-         array base base16-bytestring base64-bytestring binary bson
-         bytestring containers criterion cryptohash data-default-class
-         hashtables lifted-base monad-control mtl network nonce parsec
-         random random-shuffle text transformers-base
-       ];
-       homepage = "https://github.com/mongodb-haskell/mongodb";
-       description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS";
-       license = stdenv.lib.licenses.asl20;
-     }) {};
-
-  "mongoDB_2_3_0_5" = callPackage
     ({ mkDerivation, array, base, base16-bytestring, base64-bytestring
      , binary, bson, bytestring, conduit, conduit-extra, containers
      , criterion, cryptohash, data-default-class, hashtables, hspec
@@ -141588,7 +141080,6 @@ self: {
        homepage = "https://github.com/mongodb-haskell/mongodb";
        description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mongodb-queue" = callPackage
@@ -141808,26 +141299,6 @@ self: {
      }) {};
 
   "monoid-subclasses" = callPackage
-    ({ mkDerivation, base, bytestring, containers, primes, QuickCheck
-     , quickcheck-instances, tasty, tasty-quickcheck, text, vector
-     }:
-     mkDerivation {
-       pname = "monoid-subclasses";
-       version = "0.4.4";
-       sha256 = "1ycrcrw3gnsb8zxx8hvrfclj1skfapkvxp37r2j4j31wjhv3fycp";
-       libraryHaskellDepends = [
-         base bytestring containers primes text vector
-       ];
-       testHaskellDepends = [
-         base bytestring containers primes QuickCheck quickcheck-instances
-         tasty tasty-quickcheck text vector
-       ];
-       homepage = "https://github.com/blamario/monoid-subclasses/";
-       description = "Subclasses of Monoid";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "monoid-subclasses_0_4_6" = callPackage
     ({ mkDerivation, base, bytestring, containers, primes, QuickCheck
      , quickcheck-instances, tasty, tasty-quickcheck, text, vector
      }:
@@ -141845,7 +141316,6 @@ self: {
        homepage = "https://github.com/blamario/monoid-subclasses/";
        description = "Subclasses of Monoid";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monoid-transformer" = callPackage
@@ -142170,6 +141640,40 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "morte_1_6_17" = callPackage
+    ({ mkDerivation, alex, array, base, binary, code-page, containers
+     , criterion, deepseq, Earley, formatting, http-client
+     , http-client-tls, microlens, microlens-mtl, mtl
+     , optparse-applicative, pipes, QuickCheck, system-fileio
+     , system-filepath, tasty, tasty-hunit, tasty-quickcheck, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "morte";
+       version = "1.6.17";
+       sha256 = "1sw986mprhlbgzz3zgjlr3mynj4caj3dyl7b6ln7y6y8jb567h3n";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         array base binary containers deepseq Earley formatting http-client
+         http-client-tls microlens microlens-mtl pipes system-fileio
+         system-filepath text transformers
+       ];
+       libraryToolDepends = [ alex ];
+       executableHaskellDepends = [
+         base code-page formatting optparse-applicative text
+       ];
+       testHaskellDepends = [
+         base mtl QuickCheck system-filepath tasty tasty-hunit
+         tasty-quickcheck text transformers
+       ];
+       benchmarkHaskellDepends = [ base criterion system-filepath text ];
+       description = "A bare-bones calculus of constructions";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mosaico-lib" = callPackage
     ({ mkDerivation, base, base-unicode-symbols, colour, diagrams-cairo
      , diagrams-core, diagrams-gtk, diagrams-lib, glib, gtk, JuicyPixels
@@ -144671,18 +144175,6 @@ self: {
      }) {};
 
   "n-tuple" = callPackage
-    ({ mkDerivation, base, singletons, vector }:
-     mkDerivation {
-       pname = "n-tuple";
-       version = "0.0.1.1";
-       sha256 = "1pwz4rs0bbanhlwcm7v06s4dkwr3h41w203kab1s7k201na7j9r1";
-       libraryHaskellDepends = [ base singletons vector ];
-       homepage = "https://github.com/athanclark/n-tuple#readme";
-       description = "Homogeneous tuples of arbitrary length";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "n-tuple_0_0_2_0" = callPackage
     ({ mkDerivation, base, singletons, vector }:
      mkDerivation {
        pname = "n-tuple";
@@ -144692,7 +144184,6 @@ self: {
        homepage = "https://github.com/athanclark/n-tuple#readme";
        description = "Homogeneous tuples of arbitrary length";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nagios-check" = callPackage
@@ -147433,22 +146924,6 @@ self: {
      }) {};
 
   "newtype-generics" = callPackage
-    ({ mkDerivation, base, criterion, hspec, hspec-discover, HUnit
-     , semigroups, transformers
-     }:
-     mkDerivation {
-       pname = "newtype-generics";
-       version = "0.5.2.1";
-       sha256 = "1wdm6mg78a5cipbvqinbh33266rgk0axxzdchpzfdxw1iz4xs4nk";
-       libraryHaskellDepends = [ base transformers ];
-       testHaskellDepends = [ base hspec HUnit ];
-       testToolDepends = [ hspec-discover ];
-       benchmarkHaskellDepends = [ base criterion semigroups ];
-       description = "A typeclass and set of functions for working with newtypes, with generics support";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "newtype-generics_0_5_2_2" = callPackage
     ({ mkDerivation, base, criterion, hspec, hspec-discover, HUnit
      , semigroups, transformers
      }:
@@ -147462,7 +146937,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion semigroups ];
        description = "A typeclass and set of functions for working with newtypes, with generics support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "newtype-th" = callPackage
@@ -149418,25 +148892,6 @@ self: {
      }) {};
 
   "nvvm" = callPackage
-    ({ mkDerivation, base, bytestring, c2hs, Cabal, cuda, directory
-     , filepath, template-haskell
-     }:
-     mkDerivation {
-       pname = "nvvm";
-       version = "0.8.0.2";
-       sha256 = "05px0bxqqxph5ancvklg1fmp6p7c15vghzrwq8alsfjg7lvrd933";
-       setupHaskellDepends = [
-         base Cabal cuda directory filepath template-haskell
-       ];
-       libraryHaskellDepends = [ base bytestring cuda template-haskell ];
-       libraryToolDepends = [ c2hs ];
-       homepage = "https://github.com/tmcdonell/nvvm";
-       description = "FFI bindings to NVVM";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "nvvm_0_8_0_3" = callPackage
     ({ mkDerivation, base, bytestring, c2hs, Cabal, cuda, directory
      , filepath, template-haskell
      }:
@@ -149785,6 +149240,20 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "ochintin-daicho_0_1_0_2" = callPackage
+    ({ mkDerivation, base, bookkeeping, doctest, Glob, text }:
+     mkDerivation {
+       pname = "ochintin-daicho";
+       version = "0.1.0.2";
+       sha256 = "1j44dbp0fdsbm117rgwfsg2n3hbl782nz4484p5fif489yqv62vp";
+       libraryHaskellDepends = [ base bookkeeping text ];
+       testHaskellDepends = [ base doctest Glob ];
+       homepage = "https://github.com/arowM/haskell-ochintin-daicho#readme";
+       description = "A module to manage payroll books for Japanese companies";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "octane" = callPackage
     ({ mkDerivation, aeson, base, bimap, binary, bytestring, containers
      , data-default-class, file-embed, http-client, http-client-tls
@@ -152495,8 +151964,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "packcheck";
-       version = "0.1.1";
-       sha256 = "10c822mx6vjf42d0lzi950s61s8hcw6451ckxq5g7wg4pavyr7zp";
+       version = "0.2.0";
+       sha256 = "0frxr78vkwm0yjxz1rq71h8b01krdidi19ld1yragkfk54krcz1n";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
        benchmarkHaskellDepends = [ base ];
@@ -152964,6 +152433,57 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ peti ];
      }) {};
 
+  "pandoc_2_1_3" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, base, base-compat
+     , base64-bytestring, binary, blaze-html, blaze-markup, bytestring
+     , Cabal, case-insensitive, cmark-gfm, containers, criterion
+     , data-default, deepseq, Diff, directory, doctemplates, exceptions
+     , executable-path, filepath, Glob, haddock-library, hslua
+     , hslua-module-text, HTTP, http-client, http-client-tls, http-types
+     , JuicyPixels, mtl, network, network-uri, pandoc-types, parsec
+     , process, QuickCheck, random, safe, scientific, SHA, skylighting
+     , split, syb, tagsoup, tasty, tasty-golden, tasty-hunit
+     , tasty-quickcheck, temporary, texmath, text, time, unix
+     , unordered-containers, vector, weigh, xml, yaml, zip-archive, zlib
+     }:
+     mkDerivation {
+       pname = "pandoc";
+       version = "2.1.3";
+       sha256 = "023h0jdn996q37p8b5wdi1hifq17drrwbfq92c6imxwk2a4rl3jf";
+       configureFlags = [ "-fhttps" "-f-trypandoc" ];
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       setupHaskellDepends = [ base Cabal ];
+       libraryHaskellDepends = [
+         aeson aeson-pretty base base-compat base64-bytestring binary
+         blaze-html blaze-markup bytestring case-insensitive cmark-gfm
+         containers data-default deepseq directory doctemplates exceptions
+         filepath Glob haddock-library hslua hslua-module-text HTTP
+         http-client http-client-tls http-types JuicyPixels mtl network
+         network-uri pandoc-types parsec process random safe scientific SHA
+         skylighting split syb tagsoup temporary texmath text time unix
+         unordered-containers vector xml yaml zip-archive zlib
+       ];
+       executableHaskellDepends = [ base base-compat ];
+       testHaskellDepends = [
+         base base-compat base64-bytestring bytestring containers Diff
+         directory executable-path filepath Glob hslua pandoc-types process
+         QuickCheck tasty tasty-golden tasty-hunit tasty-quickcheck
+         temporary text time xml zip-archive
+       ];
+       benchmarkHaskellDepends = [
+         base base-compat bytestring containers criterion mtl text time
+         weigh
+       ];
+       doCheck = false;
+       homepage = "https://pandoc.org";
+       description = "Conversion between markup formats";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ peti ];
+     }) {};
+
   "pandoc-citeproc" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
      , Cabal, containers, data-default, directory, filepath, hs-bibutils
@@ -152999,6 +152519,42 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pandoc-citeproc_0_14_2" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
+     , Cabal, containers, data-default, directory, filepath, hs-bibutils
+     , mtl, old-locale, pandoc, pandoc-types, parsec, process, rfc5051
+     , setenv, split, syb, tagsoup, temporary, text, time
+     , unordered-containers, vector, xml-conduit, yaml
+     }:
+     mkDerivation {
+       pname = "pandoc-citeproc";
+       version = "0.14.2";
+       sha256 = "1dz3ybvi7bydpjfwpk72whmy9agz6g1xa60nazs1r9im97apfgw5";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       setupHaskellDepends = [ base Cabal ];
+       libraryHaskellDepends = [
+         aeson base bytestring containers data-default directory filepath
+         hs-bibutils mtl old-locale pandoc pandoc-types parsec rfc5051
+         setenv split syb tagsoup text time unordered-containers vector
+         xml-conduit yaml
+       ];
+       executableHaskellDepends = [
+         aeson aeson-pretty attoparsec base bytestring filepath pandoc
+         pandoc-types syb text yaml
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers directory filepath mtl pandoc
+         pandoc-types process temporary text yaml
+       ];
+       doCheck = false;
+       homepage = "https://github.com/jgm/pandoc-citeproc";
+       description = "Supports using pandoc with citeproc";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pandoc-citeproc-preamble" = callPackage
     ({ mkDerivation, base, directory, filepath, pandoc-types, process
      }:
@@ -153025,8 +152581,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-crossref";
-       version = "0.3.0.1";
-       sha256 = "0lhjbkgmd9hshi3lxvciwviknbbj8lyrzinzfxbwssgqrdzcaayn";
+       version = "0.3.0.3";
+       sha256 = "1w24s76w5jj6nngq0q13m7szqs2d5jc70gm94n37pwvxgm4kabrc";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -153050,7 +152606,7 @@ self: {
        ];
        homepage = "https://github.com/lierdakil/pandoc-crossref#readme";
        description = "Pandoc filter for cross-references";
-       license = "GPL";
+       license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -155038,6 +154594,8 @@ self: {
        pname = "path";
        version = "0.6.1";
        sha256 = "0nayla4k1gb821k8y5b9miflv1bi8f0czf9rqr044nrr2dddi2sb";
+       revision = "1";
+       editedCabalFile = "05b1zwx2a893h4h5wvgpc5g5pyx71hfmx409rqisd8s1bq1hn463";
        libraryHaskellDepends = [
          aeson base deepseq exceptions filepath hashable template-haskell
        ];
@@ -155068,8 +154626,8 @@ self: {
        pname = "path-io";
        version = "1.3.3";
        sha256 = "1g9m3qliqjk1img894wsb89diym5zrq51qkkrwhz4sbm9a8hbv1a";
-       revision = "1";
-       editedCabalFile = "16jfcjpqbzj6jr0sqxq2ys1z9qd2d8xr9k9vyij08ywynmwwvvzm";
+       revision = "2";
+       editedCabalFile = "1zipck6lhhff9v86s4awgl6z35znjd7wcy1x25xplsdrxpzps3nl";
        libraryHaskellDepends = [
          base containers directory dlist exceptions filepath path temporary
          time transformers unix-compat
@@ -156400,25 +155958,6 @@ self: {
      }) {};
 
   "persistable-record" = callPackage
-    ({ mkDerivation, array, base, containers, dlist, names-th
-     , product-isomorphic, quickcheck-simple, template-haskell
-     , th-data-compat, transformers
-     }:
-     mkDerivation {
-       pname = "persistable-record";
-       version = "0.6.0.1";
-       sha256 = "1jjydxzjvkw3jzm968ngj0v531fly0h4f7621fjzgbkdcjfgkgm1";
-       libraryHaskellDepends = [
-         array base containers dlist names-th product-isomorphic
-         template-haskell th-data-compat transformers
-       ];
-       testHaskellDepends = [ base quickcheck-simple ];
-       homepage = "http://khibino.github.io/haskell-relational-record/";
-       description = "Binding between SQL database values and haskell records";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "persistable-record_0_6_0_2" = callPackage
     ({ mkDerivation, array, base, containers, dlist, names-th
      , product-isomorphic, quickcheck-simple, template-haskell
      , th-data-compat, transformers
@@ -156435,7 +155974,6 @@ self: {
        homepage = "http://khibino.github.io/haskell-relational-record/";
        description = "Binding between SQL database values and haskell records";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "persistable-types-HDBC-pg" = callPackage
@@ -158063,8 +157601,8 @@ self: {
      }:
      mkDerivation {
        pname = "pinpon";
-       version = "0.2.0.1";
-       sha256 = "0l21lh66iwqk5bq2zxpjxp04gypcpy74xj4xnxmgbj7qzcxp9xha";
+       version = "0.2.0.2";
+       sha256 = "1fwdzmzm1s0bpxcw79hifpsc0ksaz2rdn76hprk7bqiw81c4amxs";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -158118,29 +157656,6 @@ self: {
      }) {};
 
   "pipes" = callPackage
-    ({ mkDerivation, base, criterion, exceptions, mmorph, mtl
-     , optparse-applicative, QuickCheck, semigroups, test-framework
-     , test-framework-quickcheck2, transformers, void
-     }:
-     mkDerivation {
-       pname = "pipes";
-       version = "4.3.8";
-       sha256 = "1wlppz7vlkmbrrvjv6cjrp8x39lhvdqp2sgc9w6hv25y3qirz9wi";
-       libraryHaskellDepends = [
-         base exceptions mmorph mtl semigroups transformers void
-       ];
-       testHaskellDepends = [
-         base mtl QuickCheck test-framework test-framework-quickcheck2
-         transformers
-       ];
-       benchmarkHaskellDepends = [
-         base criterion mtl optparse-applicative transformers
-       ];
-       description = "Compositional pipelines";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pipes_4_3_9" = callPackage
     ({ mkDerivation, base, criterion, exceptions, mmorph, mtl
      , optparse-applicative, QuickCheck, semigroups, test-framework
      , test-framework-quickcheck2, transformers, void
@@ -158161,7 +157676,6 @@ self: {
        ];
        description = "Compositional pipelines";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-aeson" = callPackage
@@ -158468,6 +157982,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pipes-concurrency_2_0_10" = callPackage
+    ({ mkDerivation, async, base, contravariant, pipes, semigroups, stm
+     , void
+     }:
+     mkDerivation {
+       pname = "pipes-concurrency";
+       version = "2.0.10";
+       sha256 = "1qrnwr7m8yjn80k4qzcr75g64jvbh7f903apvmlsqrgppwfp4xa6";
+       libraryHaskellDepends = [
+         async base contravariant pipes semigroups stm void
+       ];
+       testHaskellDepends = [ async base pipes stm ];
+       description = "Concurrency for the pipes ecosystem";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pipes-conduit" = callPackage
     ({ mkDerivation, base, conduit, mtl, pipes-core }:
      mkDerivation {
@@ -159035,22 +158566,6 @@ self: {
      }) {};
 
   "pipes-safe" = callPackage
-    ({ mkDerivation, base, containers, exceptions, monad-control, mtl
-     , pipes, primitive, transformers, transformers-base
-     }:
-     mkDerivation {
-       pname = "pipes-safe";
-       version = "2.2.6";
-       sha256 = "1y891xqp5qdv0lkgv66v7b2wnmvximmh6fjb2i5apm8p4rwih6wz";
-       libraryHaskellDepends = [
-         base containers exceptions monad-control mtl pipes primitive
-         transformers transformers-base
-       ];
-       description = "Safety for the pipes ecosystem";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pipes-safe_2_2_9" = callPackage
     ({ mkDerivation, base, containers, exceptions, monad-control, mtl
      , pipes, primitive, transformers, transformers-base
      }:
@@ -159064,7 +158579,6 @@ self: {
        ];
        description = "Safety for the pipes ecosystem";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-shell" = callPackage
@@ -159772,17 +159286,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "plot-light_0_3_1" = callPackage
-    ({ mkDerivation, base, blaze-svg, colour, containers, data-default
-     , hspec, mtl, QuickCheck, scientific, text, time
+  "plot-light_0_3_2_1" = callPackage
+    ({ mkDerivation, base, blaze-svg, colour, containers
+     , data-default-class, hspec, mtl, QuickCheck, scientific, text
+     , time
      }:
      mkDerivation {
        pname = "plot-light";
-       version = "0.3.1";
-       sha256 = "02bivm4gi0sv13yx2alxkcm0ssxbgiwyn93m54x8xwnvczfavsmw";
+       version = "0.3.2.1";
+       sha256 = "00gl17lsavwn1cglaa8jqzl1v3vczskkiz0zg51xg4g7v1v1irr7";
        libraryHaskellDepends = [
-         base blaze-svg colour containers data-default mtl scientific text
-         time
+         base blaze-svg colour containers data-default-class mtl scientific
+         text time
        ];
        testHaskellDepends = [ base hspec QuickCheck ];
        homepage = "https://github.com/ocramz/plot-light";
@@ -159797,11 +159312,12 @@ self: {
      }:
      mkDerivation {
        pname = "plot-light-examples";
-       version = "0.1.0.0";
-       sha256 = "19r07cdv34ks0810gq1x6cmdk7jf8f1s983rf2jn4vga4w5akf0p";
-       isLibrary = false;
+       version = "0.2.0.0";
+       sha256 = "0sw7hxp96s8sbaghs3lzl856q72y0gxn58px0wd4568fdbvgd6vl";
+       isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
+       libraryHaskellDepends = [ attoparsec base ];
        executableHaskellDepends = [
          attoparsec attoparsec-time base blaze-svg colour plot-light
          scientific text time
@@ -162216,6 +161732,8 @@ self: {
        pname = "pptable";
        version = "0.3.0.0";
        sha256 = "05wkvnk2h3xvjivk8cd6z8xlscipvd2az1v1n4sdianf9r0gzdwq";
+       revision = "1";
+       editedCabalFile = "0c1srvgwyczbfnw3zw5pbsjqgxifq9yb1h60w3aq91q7iamrvdgb";
        libraryHaskellDepends = [
          base boxes containers generic-deriving pretty syb vector
        ];
@@ -164683,6 +164201,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "proto-lens_0_3_0_0" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, containers
+     , data-default-class, deepseq, lens-family, lens-labels, parsec
+     , pretty, text, transformers, void
+     }:
+     mkDerivation {
+       pname = "proto-lens";
+       version = "0.3.0.0";
+       sha256 = "0skbqawzz58ilpvkdcx1hmpaj67pyjz449qmdrp2scdpdcc1nica";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         attoparsec base bytestring containers data-default-class deepseq
+         lens-family lens-labels parsec pretty text transformers void
+       ];
+       homepage = "https://github.com/google/proto-lens#readme";
+       description = "A lens-based implementation of protocol buffers in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "proto-lens-arbitrary" = callPackage
     ({ mkDerivation, base, bytestring, containers, lens-family
      , proto-lens, QuickCheck, text
@@ -164699,6 +164237,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "proto-lens-arbitrary_0_1_2_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, lens-family
+     , proto-lens, QuickCheck, text
+     }:
+     mkDerivation {
+       pname = "proto-lens-arbitrary";
+       version = "0.1.2.0";
+       sha256 = "1xkvv822qsi1h99f7xpbprq4j9yf5ykz6bd5lj5jn8626vfq0n67";
+       libraryHaskellDepends = [
+         base bytestring containers lens-family proto-lens QuickCheck text
+       ];
+       homepage = "https://github.com/google/proto-lens#readme";
+       description = "Arbitrary instances for proto-lens";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "proto-lens-combinators" = callPackage
     ({ mkDerivation, base, Cabal, data-default-class, HUnit
      , lens-family, lens-family-core, proto-lens, proto-lens-protoc
@@ -164706,18 +164261,17 @@ self: {
      }:
      mkDerivation {
        pname = "proto-lens-combinators";
-       version = "0.1.0.8";
-       sha256 = "0byz61d1xd1khksvh170q7a7qvziigxf76ngcsd650fahqaardzz";
+       version = "0.1.0.9";
+       sha256 = "1kkns9p2ipq4b3jy1l4lbh9h1m3vvg1l5r6ncqs0ydc2rqy1iasf";
        setupHaskellDepends = [ base Cabal proto-lens-protoc ];
        libraryHaskellDepends = [
-         base data-default-class lens-family proto-lens proto-lens-protoc
-         transformers
+         base data-default-class lens-family proto-lens-protoc transformers
        ];
        testHaskellDepends = [
          base HUnit lens-family lens-family-core proto-lens
          proto-lens-protoc test-framework test-framework-hunit
        ];
-       homepage = "https://github.com/google/proto-lens";
+       homepage = "https://github.com/google/proto-lens#readme";
        description = "Utilities functions to proto-lens";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -164753,19 +164307,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "proto-lens-optparse_0_1_1_0" = callPackage
+    ({ mkDerivation, base, optparse-applicative, proto-lens, text }:
+     mkDerivation {
+       pname = "proto-lens-optparse";
+       version = "0.1.1.0";
+       sha256 = "0m32sb05mjajwli9ivrcblkxyy8hrgi8sm2zwjlrjai6aq0ckh1c";
+       libraryHaskellDepends = [
+         base optparse-applicative proto-lens text
+       ];
+       homepage = "https://github.com/google/proto-lens#readme";
+       description = "Adapting proto-lens to optparse-applicative ReadMs";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "proto-lens-protobuf-types" = callPackage
     ({ mkDerivation, base, Cabal, lens-family, proto-lens
      , proto-lens-protoc, text
      }:
      mkDerivation {
        pname = "proto-lens-protobuf-types";
-       version = "0.2.2.0";
-       sha256 = "0b6n7qwyxql7966accdg0ms5mmxygjy1jx31j5bgdpkdayz4hf72";
+       version = "0.3.0.0";
+       sha256 = "1r9pbpapgi8bq938m1fliwbv8cxr18v3a3hbziq33psvas48kwa4";
        setupHaskellDepends = [ base Cabal proto-lens-protoc ];
        libraryHaskellDepends = [
          base lens-family proto-lens proto-lens-protoc text
        ];
-       homepage = "https://github.com/google/proto-lens";
+       homepage = "https://github.com/google/proto-lens#readme";
        description = "Basic protocol buffer message types";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -164773,25 +164342,26 @@ self: {
 
   "proto-lens-protoc" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers
-     , data-default-class, directory, filepath, haskell-src-exts
-     , lens-family, lens-labels, process, proto-lens
-     , proto-lens-descriptors, text
+     , data-default-class, deepseq, directory, filepath
+     , haskell-src-exts, lens-family, lens-labels, pretty, process
+     , proto-lens, text
      }:
      mkDerivation {
        pname = "proto-lens-protoc";
-       version = "0.2.2.3";
-       sha256 = "08s93h25l66z7w45jmy632lhhkddqarj94bpwn3wmv5kdpsp33pq";
+       version = "0.3.0.0";
+       sha256 = "0fh6q3alm8pw32zsg6yrf8b3gf2ww5yqsjax2hmij3y20fl26s79";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring Cabal containers data-default-class directory
-         filepath haskell-src-exts lens-family lens-labels process
-         proto-lens proto-lens-descriptors text
+         base bytestring Cabal containers data-default-class deepseq
+         directory filepath haskell-src-exts lens-family lens-labels pretty
+         process proto-lens text
        ];
        executableHaskellDepends = [
-         base bytestring containers data-default-class filepath
-         haskell-src-exts lens-family proto-lens proto-lens-descriptors text
+         base bytestring containers data-default-class deepseq filepath
+         haskell-src-exts lens-family proto-lens text
        ];
+       homepage = "https://github.com/google/proto-lens#readme";
        description = "Protocol buffer compiler for the proto-lens library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -165203,29 +164773,6 @@ self: {
      }) {};
 
   "psqueues" = callPackage
-    ({ mkDerivation, array, base, containers, criterion, deepseq
-     , fingertree-psqueue, ghc-prim, hashable, HUnit, mtl, PSQueue
-     , QuickCheck, random, tagged, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, unordered-containers
-     }:
-     mkDerivation {
-       pname = "psqueues";
-       version = "0.2.5.0";
-       sha256 = "1fy2rflmk2g5qkrbdz53wcxbr2nzxlnvkwwf4xf56yhm1ciffgqn";
-       libraryHaskellDepends = [ base deepseq ghc-prim hashable ];
-       testHaskellDepends = [
-         array base deepseq ghc-prim hashable HUnit QuickCheck tagged
-         test-framework test-framework-hunit test-framework-quickcheck2
-       ];
-       benchmarkHaskellDepends = [
-         base containers criterion deepseq fingertree-psqueue ghc-prim
-         hashable mtl PSQueue random unordered-containers
-       ];
-       description = "Pure priority search queues";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "psqueues_0_2_6_0" = callPackage
     ({ mkDerivation, array, base, containers, criterion, deepseq
      , fingertree-psqueue, ghc-prim, hashable, HUnit, mtl, PSQueue
      , QuickCheck, random, tagged, test-framework, test-framework-hunit
@@ -165246,7 +164793,6 @@ self: {
        ];
        description = "Pure priority search queues";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pstemmer" = callPackage
@@ -166016,22 +165562,6 @@ self: {
      }) {};
 
   "pushbullet-types" = callPackage
-    ({ mkDerivation, aeson, base, http-api-data, microlens
-     , microlens-th, scientific, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "pushbullet-types";
-       version = "0.4.0.2";
-       sha256 = "0r6cg0g98b7zzf4sjl4mrpnwmffhz2dnba9bgjw3943xf06afnn1";
-       libraryHaskellDepends = [
-         aeson base http-api-data microlens microlens-th scientific text
-         time unordered-containers
-       ];
-       description = "Datatypes used by the Pushbullet APIs";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "pushbullet-types_0_4_1_0" = callPackage
     ({ mkDerivation, aeson, base, http-api-data, microlens
      , microlens-th, scientific, text, time, unordered-containers
      }:
@@ -166045,7 +165575,6 @@ self: {
        ];
        description = "Datatypes used by the Pushbullet APIs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pusher-haskell" = callPackage
@@ -166067,31 +165596,6 @@ self: {
      }) {};
 
   "pusher-http-haskell" = callPackage
-    ({ mkDerivation, aeson, base, base16-bytestring, bytestring
-     , cryptonite, hashable, hspec, http-client, http-types, memory
-     , QuickCheck, scientific, text, time, transformers
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "pusher-http-haskell";
-       version = "1.5.1.2";
-       sha256 = "1jrb0ni157a9wa5mbqz1dmd1i7nkjh1nhjyvx52mbk530hslcnnn";
-       libraryHaskellDepends = [
-         aeson base base16-bytestring bytestring cryptonite hashable
-         http-client http-types memory text time transformers
-         unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson base base16-bytestring bytestring cryptonite hspec
-         http-client http-types QuickCheck scientific text time transformers
-         unordered-containers vector
-       ];
-       homepage = "https://github.com/pusher-community/pusher-http-haskell";
-       description = "Haskell client library for the Pusher HTTP API";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "pusher-http-haskell_1_5_1_3" = callPackage
     ({ mkDerivation, aeson, base, base16-bytestring, bytestring
      , cryptonite, hashable, hspec, http-client, http-types, memory
      , QuickCheck, scientific, text, time, transformers
@@ -166114,7 +165618,6 @@ self: {
        homepage = "https://github.com/pusher-community/pusher-http-haskell";
        description = "Haskell client library for the Pusher HTTP API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pusher-ws" = callPackage
@@ -168452,8 +167955,8 @@ self: {
      }:
      mkDerivation {
        pname = "random-bytestring";
-       version = "0.1.3";
-       sha256 = "0npm55xzb6rv4spqn5mhkq8r43nwm818v6f2c20yv2bzhk11a0qm";
+       version = "0.1.3.1";
+       sha256 = "1d0f3y8n87fyyvlkn1c87d47xi50qn4cn11bnsn052860kyjda1k";
        libraryHaskellDepends = [ base bytestring mwc-random pcg-random ];
        benchmarkHaskellDepends = [
          async base bytestring criterion cryptonite entropy ghc-prim
@@ -168860,20 +168363,6 @@ self: {
      }) {};
 
   "rank2classes" = callPackage
-    ({ mkDerivation, base, doctest, template-haskell, transformers }:
-     mkDerivation {
-       pname = "rank2classes";
-       version = "1.0.1";
-       sha256 = "1m48d5paxagx0916miiya09f8myfv7i4swjbi2yymh80xdjq5wxh";
-       libraryHaskellDepends = [ base template-haskell transformers ];
-       testHaskellDepends = [ base doctest ];
-       homepage = "https://github.com/blamario/grampa/tree/master/rank2classes";
-       description = "standard type constructor class hierarchy, only with methods of rank 2 types";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "rank2classes_1_0_2" = callPackage
     ({ mkDerivation, base, doctest, template-haskell, transformers }:
      mkDerivation {
        pname = "rank2classes";
@@ -169158,31 +168647,6 @@ self: {
      }) {};
 
   "rasterific-svg" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, directory
-     , filepath, FontyFruity, JuicyPixels, lens, linear, mtl
-     , optparse-applicative, primitive, Rasterific, scientific, svg-tree
-     , text, transformers, vector
-     }:
-     mkDerivation {
-       pname = "rasterific-svg";
-       version = "0.3.3";
-       sha256 = "0jqdqf3y61z98sxdziqhafgsf5m01a00gkfdnv1w4vd6zli8xpaa";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base binary bytestring containers directory filepath FontyFruity
-         JuicyPixels lens linear mtl primitive Rasterific scientific
-         svg-tree text transformers vector
-       ];
-       executableHaskellDepends = [
-         base bytestring directory filepath FontyFruity JuicyPixels
-         optparse-applicative Rasterific svg-tree
-       ];
-       description = "SVG renderer based on Rasterific";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "rasterific-svg_0_3_3_1" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, directory
      , filepath, FontyFruity, JuicyPixels, lens, linear, mtl
      , optparse-applicative, primitive, Rasterific, scientific, svg-tree
@@ -169205,7 +168669,6 @@ self: {
        ];
        description = "SVG renderer based on Rasterific";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rate-limit" = callPackage
@@ -169239,6 +168702,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "ratel_1_0_3" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, case-insensitive
+     , containers, filepath, hspec, http-client, http-client-tls
+     , http-types, text, uuid
+     }:
+     mkDerivation {
+       pname = "ratel";
+       version = "1.0.3";
+       sha256 = "1f49nrkvyms9a8q46dpjgcx3h51l1x4zlq6pxnw26bvf8xx0yj4h";
+       libraryHaskellDepends = [
+         aeson base bytestring case-insensitive containers http-client
+         http-client-tls http-types text uuid
+       ];
+       testHaskellDepends = [
+         aeson base bytestring case-insensitive containers filepath hspec
+         http-client http-client-tls http-types text uuid
+       ];
+       homepage = "https://github.com/tfausak/ratel#readme";
+       description = "Notify Honeybadger about exceptions";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ratel-wai" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
      , http-client, ratel, wai
@@ -169255,6 +168741,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "ratel-wai_1_0_2" = callPackage
+    ({ mkDerivation, base, bytestring, case-insensitive, containers
+     , http-client, ratel, wai
+     }:
+     mkDerivation {
+       pname = "ratel-wai";
+       version = "1.0.2";
+       sha256 = "07hpsmv3c75r8lc9fpa2mn5xsz5xml5nadzlzq8dihbgv6ma4mss";
+       libraryHaskellDepends = [
+         base bytestring case-insensitive containers http-client ratel wai
+       ];
+       homepage = "https://github.com/tfausak/ratel-wai#readme";
+       description = "Notify Honeybadger about exceptions via a WAI middleware";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "rating-systems" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -169286,8 +168789,8 @@ self: {
      }:
      mkDerivation {
        pname = "rattletrap";
-       version = "4.0.5";
-       sha256 = "0yxmym79xrs35lz8qyrkyqa9vihng4p3448085ybwbfqmaqk6pl5";
+       version = "4.0.6";
+       sha256 = "0ph0kcf8rzn99j6c98786x0kdvbxpi355kqzxj0ia5748jk7ds0m";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -173362,6 +172865,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "req-oauth2" = callPackage
+    ({ mkDerivation, aeson, base, base64-bytestring, bytestring
+     , data-default-class, hspec, http-client, http-types, lens
+     , modern-uri, req, req-url-extra, text, transformers
+     }:
+     mkDerivation {
+       pname = "req-oauth2";
+       version = "0.1.0.0";
+       sha256 = "1qx5f4flyainc0m87fjyn6z65bfh10y6bh6vbbqmyy4m4aw47wia";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base base64-bytestring bytestring data-default-class
+         http-client http-types lens modern-uri req req-url-extra text
+         transformers
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base hspec ];
+       homepage = "https://github.com/rcook/req-oauth2#readme";
+       description = "Provides OAuth2 authentication for use with Req";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "req-url-extra" = callPackage
     ({ mkDerivation, aeson, base, data-default-class, hspec, modern-uri
      , req, text
@@ -176667,29 +176193,6 @@ self: {
      }) {};
 
   "safecopy" = callPackage
-    ({ mkDerivation, array, base, bytestring, cereal, containers, lens
-     , lens-action, old-time, QuickCheck, quickcheck-instances, tasty
-     , tasty-quickcheck, template-haskell, text, time, vector
-     }:
-     mkDerivation {
-       pname = "safecopy";
-       version = "0.9.4";
-       sha256 = "1zss1k1yxa8gky9vx1w8bb8lkbz0nrwzq5n0rhmxary49nhp31n1";
-       libraryHaskellDepends = [
-         array base bytestring cereal containers old-time template-haskell
-         text time vector
-       ];
-       testHaskellDepends = [
-         array base cereal containers lens lens-action QuickCheck
-         quickcheck-instances tasty tasty-quickcheck template-haskell time
-         vector
-       ];
-       homepage = "https://github.com/acid-state/safecopy";
-       description = "Binary serialization with version control";
-       license = stdenv.lib.licenses.publicDomain;
-     }) {};
-
-  "safecopy_0_9_4_1" = callPackage
     ({ mkDerivation, array, base, bytestring, cereal, containers, lens
      , lens-action, old-time, QuickCheck, quickcheck-instances, tasty
      , tasty-quickcheck, template-haskell, text, time, vector
@@ -176710,7 +176213,6 @@ self: {
        homepage = "https://github.com/acid-state/safecopy";
        description = "Binary serialization with version control";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "safecopy-migrate" = callPackage
@@ -176959,8 +176461,8 @@ self: {
     ({ mkDerivation, base, doctest }:
      mkDerivation {
        pname = "salve";
-       version = "1.0.0";
-       sha256 = "0s7np2xdzc7sbhyh0hwfx6bznjxji5cg4ymvqncjdcdkb8w31gdk";
+       version = "1.0.2";
+       sha256 = "0c5022vd2pll27q49s4jq47jip27v1kr417wzip7dw5z3b3dd1ni";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest ];
        homepage = "https://github.com/tfausak/salve#readme";
@@ -177562,6 +177064,35 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) z3;};
 
+  "sbv_7_6" = callPackage
+    ({ mkDerivation, array, async, base, bytestring, containers
+     , crackNum, data-binary-ieee754, deepseq, directory, doctest
+     , filepath, generic-deriving, ghc, Glob, hlint, mtl, pretty
+     , process, QuickCheck, random, syb, tasty, tasty-golden
+     , tasty-hunit, template-haskell, time, z3
+     }:
+     mkDerivation {
+       pname = "sbv";
+       version = "7.6";
+       sha256 = "0ycrwmyi1ba5v71qjladn0mn2hlrxdswy5mlx2dxzhrf2r6k6zd9";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         array async base containers crackNum data-binary-ieee754 deepseq
+         directory filepath generic-deriving ghc mtl pretty process
+         QuickCheck random syb template-haskell time
+       ];
+       testHaskellDepends = [
+         base bytestring containers data-binary-ieee754 directory doctest
+         filepath Glob hlint mtl random syb tasty tasty-golden tasty-hunit
+         template-haskell
+       ];
+       testSystemDepends = [ z3 ];
+       homepage = "http://leventerkok.github.com/sbv/";
+       description = "SMT Based Verification: Symbolic Haskell theorem prover using SMT solving";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) z3;};
+
   "sbvPlugin" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, ghc
      , ghc-prim, mtl, process, sbv, tasty, tasty-golden
@@ -177755,6 +177286,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "scanf" = callPackage
+    ({ mkDerivation, base, template-haskell }:
+     mkDerivation {
+       pname = "scanf";
+       version = "0.1.0.0";
+       sha256 = "0xf3g3dajaci71mgnd7z5xy4a29w40gg43a41x3fvd1a2wpi6xan";
+       libraryHaskellDepends = [ base template-haskell ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/Lysxia/scanf#readme";
+       description = "Easy and type-safe format strings for parsing and printing";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "scanner" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, cereal, criterion
      , hspec, text
@@ -178142,32 +177686,6 @@ self: {
      }) {};
 
   "scientific" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, criterion
-     , deepseq, hashable, integer-gmp, integer-logarithms, primitive
-     , QuickCheck, smallcheck, tasty, tasty-ant-xml, tasty-hunit
-     , tasty-quickcheck, tasty-smallcheck, text
-     }:
-     mkDerivation {
-       pname = "scientific";
-       version = "0.3.5.2";
-       sha256 = "0msnjz7ml0zycw9bssslxbg0nigziw7vs5km4q3vjbs8jpzpkr2w";
-       revision = "5";
-       editedCabalFile = "19rrdna5f75rc21x6wr9m6x9h7776qbmi4z1cwwipfpij8hah54n";
-       libraryHaskellDepends = [
-         base binary bytestring containers deepseq hashable integer-gmp
-         integer-logarithms primitive text
-       ];
-       testHaskellDepends = [
-         base binary bytestring QuickCheck smallcheck tasty tasty-ant-xml
-         tasty-hunit tasty-quickcheck tasty-smallcheck text
-       ];
-       benchmarkHaskellDepends = [ base criterion ];
-       homepage = "https://github.com/basvandijk/scientific";
-       description = "Numbers represented using scientific notation";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "scientific_0_3_5_3" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, criterion
      , deepseq, hashable, integer-gmp, integer-logarithms, primitive
      , QuickCheck, smallcheck, tasty, tasty-ant-xml, tasty-hunit
@@ -178189,7 +177707,6 @@ self: {
        homepage = "https://github.com/basvandijk/scientific";
        description = "Numbers represented using scientific notation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scion" = callPackage
@@ -179701,6 +179218,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "semirings" = callPackage
+    ({ mkDerivation }:
+     mkDerivation {
+       pname = "semirings";
+       version = "0.0.0";
+       sha256 = "0dc4vi7zlpvz12b9hvq5b6v621aw84hp331rcbn617gpw7dvflcq";
+       doHaddock = false;
+       description = "TBA";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "semver" = callPackage
     ({ mkDerivation, attoparsec, base, criterion, deepseq, tasty
      , tasty-hunit, text
@@ -181078,8 +180606,8 @@ self: {
     ({ mkDerivation, base, servant }:
      mkDerivation {
        pname = "servant-flatten";
-       version = "0.1";
-       sha256 = "00swcc6dkc9nbwj69g96ysbmv9s81g5j39qk39qqapxh34wgrakq";
+       version = "0.2";
+       sha256 = "0j8dv8010yr63sl3ks0an64ry53ajc2xd47vpd6i1svhb9b6l79i";
        libraryHaskellDepends = [ base servant ];
        homepage = "https://github.com/alpmestan/servant-flatten";
        description = "Utilities for flattening servant API types";
@@ -182521,18 +182049,6 @@ self: {
      }) {};
 
   "setlocale" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "setlocale";
-       version = "1.0.0.5";
-       sha256 = "1w4zgpjjy56bpgjjcxh2fj3v4pqwmfhfwwvs5nhys12h8y8q8hsp";
-       libraryHaskellDepends = [ base ];
-       homepage = "https://bitbucket.org/IchUndNichtDu/haskell-setlocale";
-       description = "Haskell bindings to setlocale";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "setlocale_1_0_0_6" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "setlocale";
@@ -182542,7 +182058,6 @@ self: {
        homepage = "https://bitbucket.org/IchUndNichtDu/haskell-setlocale";
        description = "Haskell bindings to setlocale";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "setoid" = callPackage
@@ -182679,18 +182194,18 @@ self: {
 
   "sexp-grammar" = callPackage
     ({ mkDerivation, alex, array, base, bytestring, containers
-     , criterion, happy, mtl, profunctors, QuickCheck, scientific
-     , semigroups, split, tagged, tasty, tasty-hunit, tasty-quickcheck
-     , template-haskell, text, transformers, wl-pprint-text
+     , criterion, happy, mtl, prettyprinter, profunctors, QuickCheck
+     , scientific, semigroups, split, tagged, tasty, tasty-hunit
+     , tasty-quickcheck, template-haskell, text, transformers
      }:
      mkDerivation {
        pname = "sexp-grammar";
-       version = "1.2.3";
-       sha256 = "107mfa4g13k6asfwddfbjphjpgnc58ddjir85srz2dmp06paf539";
+       version = "1.3.0";
+       sha256 = "0h9b9rmymfy0qwr51yllapmp7g0j3f70pmhwyzag782giff8q0x3";
        libraryHaskellDepends = [
-         array base bytestring containers mtl profunctors scientific
-         semigroups split tagged template-haskell text transformers
-         wl-pprint-text
+         array base bytestring containers mtl prettyprinter profunctors
+         scientific semigroups split tagged template-haskell text
+         transformers
        ];
        libraryToolDepends = [ alex happy ];
        testHaskellDepends = [
@@ -183693,6 +183208,37 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "shelly_1_7_2" = callPackage
+    ({ mkDerivation, async, base, bytestring, containers, directory
+     , enclosed-exceptions, exceptions, filepath, hspec, hspec-contrib
+     , HUnit, lifted-async, lifted-base, monad-control, mtl, process
+     , system-fileio, system-filepath, text, time, transformers
+     , transformers-base, unix-compat
+     }:
+     mkDerivation {
+       pname = "shelly";
+       version = "1.7.2";
+       sha256 = "04gi3vixi69s95kwbbh0yxmfrkga1aafdp80zs2zfwcai13cfqkn";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         async base bytestring containers directory enclosed-exceptions
+         exceptions lifted-async lifted-base monad-control mtl process
+         system-fileio system-filepath text time transformers
+         transformers-base unix-compat
+       ];
+       testHaskellDepends = [
+         async base bytestring containers directory enclosed-exceptions
+         exceptions filepath hspec hspec-contrib HUnit lifted-async
+         lifted-base monad-control mtl process system-fileio system-filepath
+         text time transformers transformers-base unix-compat
+       ];
+       homepage = "https://github.com/yesodweb/Shelly.hs";
+       description = "shell-like (systems) programming in Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "shelly-extra" = callPackage
     ({ mkDerivation, async, base, hspec, HUnit, mtl, SafeSemaphore
      , shelly, text
@@ -184875,18 +184421,6 @@ self: {
      }) {};
 
   "simple-reflect" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "simple-reflect";
-       version = "0.3.2";
-       sha256 = "1dpcf6w3cf1sfl9bnlsx04x7aghw029glj5d05qzrsnms2rlw8iq";
-       libraryHaskellDepends = [ base ];
-       homepage = "http://twanvl.nl/blog/haskell/simple-reflection-of-expressions";
-       description = "Simple reflection of expressions containing variables";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "simple-reflect_0_3_3" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "simple-reflect";
@@ -184896,7 +184430,6 @@ self: {
        homepage = "http://twanvl.nl/blog/haskell/simple-reflection-of-expressions";
        description = "Simple reflection of expressions containing variables";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simple-rope" = callPackage
@@ -185093,8 +184626,8 @@ self: {
      }:
      mkDerivation {
        pname = "simple-vec3";
-       version = "0.4";
-       sha256 = "13qlnpjl5n6rpvhgn0pdnljx0g7nvjk2xr4mds3nvd93d9ciqcxl";
+       version = "0.4.0.1";
+       sha256 = "17nvwph2g5xzi8lqgyrsbskdm9flwr7h3ch7yf4rnbx3bg37bvsh";
        libraryHaskellDepends = [ base QuickCheck vector ];
        testHaskellDepends = [
          base doctest doctest-discover tasty tasty-quickcheck
@@ -185657,17 +185190,17 @@ self: {
 
   "sized" = callPackage
     ({ mkDerivation, base, constraints, containers, deepseq
-     , equational-reasoning, hashable, lens, ListLike, mono-traversable
-     , monomorphic, singletons, type-natural, vector
+     , equational-reasoning, ghc-typelits-presburger, hashable, lens
+     , ListLike, mono-traversable, singletons, type-natural, vector
      }:
      mkDerivation {
        pname = "sized";
-       version = "0.2.1.1";
-       sha256 = "1agy5yyj6ci89v1jp6k2lj2316h9sap7x65j8n5w7d4ldqsb3i7z";
+       version = "0.3.0.0";
+       sha256 = "1w00s0wgbr1n2x2ariixixy07bhxiyp5728givdrz0xg63gnw1s7";
        libraryHaskellDepends = [
-         base constraints containers deepseq equational-reasoning hashable
-         lens ListLike mono-traversable monomorphic singletons type-natural
-         vector
+         base constraints containers deepseq equational-reasoning
+         ghc-typelits-presburger hashable lens ListLike mono-traversable
+         singletons type-natural vector
        ];
        description = "Sized sequence data-types";
        license = stdenv.lib.licenses.bsd3;
@@ -188454,32 +187987,6 @@ self: {
      }) {};
 
   "soap" = callPackage
-    ({ mkDerivation, base, bytestring, conduit, configurator
-     , data-default, exceptions, hspec, http-client, http-types, HUnit
-     , iconv, mtl, resourcet, text, unordered-containers, xml-conduit
-     , xml-conduit-writer, xml-types
-     }:
-     mkDerivation {
-       pname = "soap";
-       version = "0.2.3.5";
-       sha256 = "01xprcrgy0galalh27by3csbm8m2m9dxlw3y83s4qnassv8zf2xs";
-       revision = "3";
-       editedCabalFile = "0kdxd31csfmixq3jps9kqhcbqirrvrlxh4lv07gyb761dpfpc039";
-       libraryHaskellDepends = [
-         base bytestring conduit configurator data-default exceptions
-         http-client http-types iconv mtl resourcet text
-         unordered-containers xml-conduit xml-conduit-writer xml-types
-       ];
-       testHaskellDepends = [
-         base bytestring hspec HUnit text unordered-containers xml-conduit
-         xml-conduit-writer
-       ];
-       homepage = "https://bitbucket.org/dpwiz/haskell-soap";
-       description = "SOAP client tools";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "soap_0_2_3_6" = callPackage
     ({ mkDerivation, base, bytestring, conduit, configurator
      , data-default, exceptions, hspec, http-client, http-types, HUnit
      , iconv, mtl, resourcet, text, unordered-containers, xml-conduit
@@ -188501,7 +188008,6 @@ self: {
        homepage = "https://bitbucket.org/dpwiz/haskell-soap";
        description = "SOAP client tools";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "soap-openssl" = callPackage
@@ -188524,26 +188030,6 @@ self: {
      }) {};
 
   "soap-tls" = callPackage
-    ({ mkDerivation, base, configurator, connection, data-default
-     , http-client, http-client-tls, soap, text, tls, x509, x509-store
-     , x509-validation
-     }:
-     mkDerivation {
-       pname = "soap-tls";
-       version = "0.1.1.2";
-       sha256 = "0xnzwzmhh2i5nci7xbnkr28hxm376fbmgjcwz7svk46k1vxvlfp4";
-       revision = "1";
-       editedCabalFile = "0h6jgiifrphdphxfvgk95and4a86xp6afxi90v0b93cs2zyi0vsy";
-       libraryHaskellDepends = [
-         base configurator connection data-default http-client
-         http-client-tls soap text tls x509 x509-store x509-validation
-       ];
-       homepage = "https://bitbucket.org/dpwiz/haskell-soap";
-       description = "TLS-enabled SOAP transport (using tls package)";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "soap-tls_0_1_1_4" = callPackage
     ({ mkDerivation, base, configurator, connection, data-default
      , http-client, http-client-tls, soap, text, tls, x509, x509-store
      , x509-validation
@@ -188559,7 +188045,6 @@ self: {
        homepage = "https://bitbucket.org/dpwiz/haskell-soap";
        description = "TLS-enabled SOAP transport (using tls package)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sock2stream" = callPackage
@@ -189314,6 +188799,42 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "sparrow" = callPackage
+    ({ mkDerivation, aeson, aeson-attoparsec, async, attoparsec
+     , attoparsec-uri, base, bytestring, deepseq, exceptions
+     , extractable-singleton, hashable, http-client, http-client-tls
+     , http-types, list-t, monad-control, monad-control-aligned, mtl
+     , nested-routes, path, path-extra, pred-trie, stm, strict, text
+     , tmapchan, tmapmvar, transformers, unordered-containers, urlpath
+     , uuid, wai-middleware-content-type, wai-transformers, websockets
+     , websockets-simple, wuss
+     }:
+     mkDerivation {
+       pname = "sparrow";
+       version = "0.0.0";
+       sha256 = "1qjrzfwcscdaz828l1rm0nyr7965kj5bbk777n8l2ylk287xnyjb";
+       libraryHaskellDepends = [
+         aeson aeson-attoparsec async attoparsec attoparsec-uri base
+         bytestring deepseq exceptions extractable-singleton hashable
+         http-client http-client-tls http-types list-t monad-control
+         monad-control-aligned mtl nested-routes path path-extra pred-trie
+         stm strict text tmapchan tmapmvar transformers unordered-containers
+         urlpath uuid wai-middleware-content-type wai-transformers
+         websockets websockets-simple wuss
+       ];
+       testHaskellDepends = [
+         aeson aeson-attoparsec async attoparsec attoparsec-uri base
+         bytestring deepseq exceptions extractable-singleton hashable
+         http-client http-client-tls http-types list-t monad-control
+         monad-control-aligned mtl nested-routes path path-extra pred-trie
+         stm strict text tmapchan tmapmvar transformers unordered-containers
+         urlpath uuid wai-middleware-content-type wai-transformers
+         websockets websockets-simple wuss
+       ];
+       description = "Unified streaming dependency management for web apps";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "sparse" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, contravariant
      , criterion, deepseq, directory, doctest, filepath, hlint
@@ -192070,27 +191591,6 @@ self: {
      }) {};
 
   "static-text" = callPackage
-    ({ mkDerivation, base, bytestring, doctest, doctest-discover, tasty
-     , tasty-hunit, template-haskell, text, vector
-     }:
-     mkDerivation {
-       pname = "static-text";
-       version = "0.2";
-       sha256 = "1rilg9izmw29s33abz5prhzkfay1c482n3y7zbcxjbssvc5c2vhz";
-       libraryHaskellDepends = [
-         base bytestring template-haskell text vector
-       ];
-       testHaskellDepends = [
-         base bytestring doctest doctest-discover tasty tasty-hunit
-         template-haskell
-       ];
-       homepage = "https://github.com/dzhus/static-text#readme";
-       description = "Lists, Texts, ByteStrings and Vectors of statically known length";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "static-text_0_2_0_1" = callPackage
     ({ mkDerivation, base, bytestring, doctest, doctest-discover, tasty
      , tasty-hunit, template-haskell, text, vector
      }:
@@ -192947,19 +192447,6 @@ self: {
      }) {};
 
   "stopwatch" = callPackage
-    ({ mkDerivation, base, clock, hspec, transformers }:
-     mkDerivation {
-       pname = "stopwatch";
-       version = "0.1.0.4";
-       sha256 = "1hmmn4jf3rwk68himknzm9vy1mxbz4gvv810zp4r351mjcpw5x5r";
-       libraryHaskellDepends = [ base clock transformers ];
-       testHaskellDepends = [ base clock hspec ];
-       homepage = "https://github.com/debug-ito/stopwatch";
-       description = "A simple stopwatch utility";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "stopwatch_0_1_0_5" = callPackage
     ({ mkDerivation, base, clock, hspec, transformers }:
      mkDerivation {
        pname = "stopwatch";
@@ -192970,7 +192457,6 @@ self: {
        homepage = "https://github.com/debug-ito/stopwatch";
        description = "A simple stopwatch utility";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "storable" = callPackage
@@ -193192,30 +192678,6 @@ self: {
      }) {};
 
   "stratosphere" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
-     , hashable, hspec, hspec-discover, lens, template-haskell, text
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "stratosphere";
-       version = "0.19.0";
-       sha256 = "0j43znxgsxm8g7vk74hfqyn30ay6371ndmq11xf6qxdnpxn65fgf";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson aeson-pretty base bytestring containers hashable lens
-         template-haskell text unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson aeson-pretty base bytestring containers hashable hspec
-         hspec-discover lens template-haskell text unordered-containers
-       ];
-       homepage = "https://github.com/frontrowed/stratosphere#readme";
-       description = "EDSL for AWS CloudFormation";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "stratosphere_0_19_1" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
      , hashable, hspec, hspec-discover, lens, template-haskell, text
      , unordered-containers
@@ -193237,7 +192699,6 @@ self: {
        homepage = "https://github.com/frontrowed/stratosphere#readme";
        description = "EDSL for AWS CloudFormation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stratum-tool" = callPackage
@@ -193715,6 +193176,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "streaming-sort" = callPackage
+    ({ mkDerivation, base, binary, bytestring, directory, exceptions
+     , hspec, QuickCheck, streaming, streaming-binary
+     , streaming-bytestring, streaming-with, transformers
+     }:
+     mkDerivation {
+       pname = "streaming-sort";
+       version = "0.1.0.0";
+       sha256 = "0zv66xdrg457gskfnviic9mmh38zk9vxsigrlbci8a2fwmphmjxg";
+       libraryHaskellDepends = [
+         base binary bytestring directory exceptions streaming
+         streaming-binary streaming-bytestring streaming-with transformers
+       ];
+       testHaskellDepends = [
+         base binary directory exceptions hspec QuickCheck streaming
+         streaming-with transformers
+       ];
+       description = "Sorting streams";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "streaming-utils" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, http-client
      , http-client-tls, json-stream, mtl, network, network-simple, pipes
@@ -193792,6 +193274,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "streamly_0_1_1" = callPackage
+    ({ mkDerivation, atomic-primops, base, containers, criterion
+     , exceptions, hspec, lifted-base, lockfree-queue, monad-control
+     , mtl, stm, transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "streamly";
+       version = "0.1.1";
+       sha256 = "1zblhnn2rjsmbdliihsghwl6rv7g0bcdh3d10xx8c4x420hwg2f6";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         atomic-primops base containers exceptions lifted-base
+         lockfree-queue monad-control mtl stm transformers transformers-base
+       ];
+       testHaskellDepends = [ base containers hspec ];
+       benchmarkHaskellDepends = [ atomic-primops base criterion mtl ];
+       homepage = "https://github.com/composewell/streamly";
+       description = "Beautiful Streaming, Concurrent and Reactive Composition";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "streamproc" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -194481,6 +193986,30 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "strive_5_0_4" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, data-default, gpolyline
+     , http-client, http-client-tls, http-types, markdown-unlit
+     , template-haskell, text, time, transformers
+     }:
+     mkDerivation {
+       pname = "strive";
+       version = "5.0.4";
+       sha256 = "1lj3fqyl1a6nix32y5irvlvsdl518gv7zvz67my5dp5fa3z9hklg";
+       libraryHaskellDepends = [
+         aeson base bytestring data-default gpolyline http-client
+         http-client-tls http-types template-haskell text time transformers
+       ];
+       testHaskellDepends = [
+         aeson base bytestring data-default gpolyline http-client
+         http-client-tls http-types markdown-unlit template-haskell text
+         time transformers
+       ];
+       homepage = "https://github.com/tfausak/strive#readme";
+       description = "A client for the Strava V3 API";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "strptime" = callPackage
     ({ mkDerivation, base, bytestring, text, time }:
      mkDerivation {
@@ -195589,23 +195118,6 @@ self: {
      }) {};
 
   "svg-tree" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, containers
-     , JuicyPixels, lens, linear, mtl, scientific, text, transformers
-     , vector, xml
-     }:
-     mkDerivation {
-       pname = "svg-tree";
-       version = "0.6.2.1";
-       sha256 = "03xwx2gr3fi19rdkskxl1jwncngnjra234d378mfxxfvfs820f9q";
-       libraryHaskellDepends = [
-         attoparsec base bytestring containers JuicyPixels lens linear mtl
-         scientific text transformers vector xml
-       ];
-       description = "SVG file loader and serializer";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "svg-tree_0_6_2_2" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers
      , JuicyPixels, lens, linear, mtl, scientific, text, transformers
      , vector, xml
@@ -195620,7 +195132,6 @@ self: {
        ];
        description = "SVG file loader and serializer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "svg2q" = callPackage
@@ -198142,6 +197653,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tao" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "tao";
+       version = "1.0.0";
+       sha256 = "0iqsah4l87bd25cpk575hsq5qbx506gz1ajf6fyv6pmi0sb1w2hb";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/jship/tao#readme";
+       description = "Type-level assertion operators";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "tao-example" = callPackage
+    ({ mkDerivation, base, tao }:
+     mkDerivation {
+       pname = "tao-example";
+       version = "1.0.0";
+       sha256 = "1ch09fgj46fy5h33rcqlbkm02v8cq246bpxswxfdj8p9g1dkkpk5";
+       libraryHaskellDepends = [ base tao ];
+       homepage = "https://github.com/jship/tao#readme";
+       description = "Example usage of the tao package";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "tar_0_4_1_0" = callPackage
     ({ mkDerivation, base, bytestring, directory, filepath, old-time }:
      mkDerivation {
@@ -198428,6 +197963,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "tasty-dejafu_1_1_0_2" = callPackage
+    ({ mkDerivation, base, dejafu, random, tagged, tasty }:
+     mkDerivation {
+       pname = "tasty-dejafu";
+       version = "1.1.0.2";
+       sha256 = "0navsbmga0zzia6v8halqm0hli8x8zs0g80zix2170a55w8k3f0h";
+       libraryHaskellDepends = [ base dejafu random tagged tasty ];
+       homepage = "https://github.com/barrucadu/dejafu";
+       description = "Deja Fu support for the Tasty test framework";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tasty-discover" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, Glob
      , hedgehog, tasty, tasty-hedgehog, tasty-hspec, tasty-hunit
@@ -198456,18 +198004,6 @@ self: {
      }) {};
 
   "tasty-expected-failure" = callPackage
-    ({ mkDerivation, base, tagged, tasty }:
-     mkDerivation {
-       pname = "tasty-expected-failure";
-       version = "0.11.1";
-       sha256 = "1hr9fgypxz8f9hanxnq6r0gbfdfglcx0c3iqyjximy9sn6nsvndy";
-       libraryHaskellDepends = [ base tagged tasty ];
-       homepage = "http://github.com/nomeata/tasty-expected-failure";
-       description = "Mark tasty tests as failure expected";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "tasty-expected-failure_0_11_1_1" = callPackage
     ({ mkDerivation, base, tagged, tasty }:
      mkDerivation {
        pname = "tasty-expected-failure";
@@ -198477,7 +198013,6 @@ self: {
        homepage = "http://github.com/nomeata/tasty-expected-failure";
        description = "Mark tasty tests as failure expected";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tasty-fail-fast" = callPackage
@@ -198594,6 +198129,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tasty-hspec_1_1_4" = callPackage
+    ({ mkDerivation, base, hspec, hspec-core, QuickCheck, tasty
+     , tasty-quickcheck, tasty-smallcheck
+     }:
+     mkDerivation {
+       pname = "tasty-hspec";
+       version = "1.1.4";
+       sha256 = "17f4rcga0qnynf1h047chwm5nicmik79lw04kiwpw48ahwc0zkp3";
+       libraryHaskellDepends = [
+         base hspec hspec-core QuickCheck tasty tasty-quickcheck
+         tasty-smallcheck
+       ];
+       homepage = "https://github.com/mitchellwrosen/tasty-hspec";
+       description = "Hspec support for the Tasty test framework";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tasty-html" = callPackage
     ({ mkDerivation, base, blaze-html, bytestring, containers, filepath
      , generic-deriving, mtl, stm, tagged, tasty, text, transformers
@@ -199632,8 +199185,8 @@ self: {
     ({ mkDerivation, base, Boolean }:
      mkDerivation {
        pname = "temporal-media";
-       version = "0.6.1";
-       sha256 = "1bmnii427fdpms23p8dinhs1zi34cin3qfap2csgrmsgcn1qs6bc";
+       version = "0.6.2";
+       sha256 = "0dsvpag8j2lfn6nz9wbzcbdfrzmq35ww9n8p5db638b11749sc97";
        libraryHaskellDepends = [ base Boolean ];
        homepage = "https://github.com/anton-k/temporal-media";
        description = "data types for temporal media";
@@ -201474,41 +201027,6 @@ self: {
      }) {};
 
   "text-show-instances" = callPackage
-    ({ mkDerivation, base, base-compat, bifunctors, binary, bytestring
-     , containers, directory, generic-deriving, ghc-boot-th, ghc-prim
-     , haskeline, hoopl, hpc, hspec, old-locale, old-time, pretty
-     , process, QuickCheck, quickcheck-instances, random, semigroups
-     , tagged, template-haskell, terminfo, text, text-show, th-orphans
-     , time, transformers, transformers-compat, unix
-     , unordered-containers, vector, xhtml
-     }:
-     mkDerivation {
-       pname = "text-show-instances";
-       version = "3.6.2";
-       sha256 = "0c64ibvzpz2h4f54bhrla4yf4mhsl3x2ag2nx2kj81g47pw917r5";
-       revision = "3";
-       editedCabalFile = "1nzl40bcg17i98xnlcm5djhriaz6pcmhyzmmd0pavkgyra57arz0";
-       libraryHaskellDepends = [
-         base base-compat bifunctors binary bytestring containers directory
-         ghc-boot-th haskeline hoopl hpc old-locale old-time pretty process
-         random semigroups tagged template-haskell terminfo text text-show
-         time transformers transformers-compat unix unordered-containers
-         vector xhtml
-       ];
-       testHaskellDepends = [
-         base base-compat bifunctors binary bytestring containers directory
-         generic-deriving ghc-boot-th ghc-prim haskeline hoopl hpc hspec
-         old-locale old-time pretty process QuickCheck quickcheck-instances
-         random semigroups tagged template-haskell terminfo text text-show
-         th-orphans time transformers transformers-compat unix
-         unordered-containers vector xhtml
-       ];
-       homepage = "https://github.com/RyanGlScott/text-show-instances";
-       description = "Additional instances for text-show";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "text-show-instances_3_6_3" = callPackage
     ({ mkDerivation, base, base-compat, bifunctors, binary, bytestring
      , containers, directory, generic-deriving, ghc-boot-th, ghc-prim
      , haskeline, hoopl, hpc, hspec, hspec-discover, old-locale
@@ -201540,7 +201058,6 @@ self: {
        homepage = "https://github.com/RyanGlScott/text-show-instances";
        description = "Additional instances for text-show";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-stream-decode" = callPackage
@@ -202228,8 +201745,8 @@ self: {
      }:
      mkDerivation {
        pname = "th-printf";
-       version = "0.5.0";
-       sha256 = "1fn1l503x3y5dgv8wsgyxhm66dyvdvfalzmwmsqf86sy643qjpw6";
+       version = "0.5.1";
+       sha256 = "0dgi93pb3zci1isxjmnzhn6apm4pyg12ayz8l1gxlilli8q1z4l6";
        libraryHaskellDepends = [
          ansi-wl-pprint attoparsec base charset containers template-haskell
          text transformers trifecta utf8-string
@@ -202677,24 +202194,6 @@ self: {
      }) {};
 
   "threads" = callPackage
-    ({ mkDerivation, base, Cabal, concurrent-extra, HUnit, stm
-     , test-framework, test-framework-hunit
-     }:
-     mkDerivation {
-       pname = "threads";
-       version = "0.5.1.5";
-       sha256 = "0phbspm8k2k6w66hv6ldccvy3kc4rjnspj0jwabiwklinkv7wpd1";
-       setupHaskellDepends = [ base Cabal ];
-       libraryHaskellDepends = [ base stm ];
-       testHaskellDepends = [
-         base concurrent-extra HUnit stm test-framework test-framework-hunit
-       ];
-       homepage = "https://github.com/basvandijk/threads";
-       description = "Fork threads and wait for their result";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "threads_0_5_1_6" = callPackage
     ({ mkDerivation, base, Cabal, concurrent-extra, HUnit, stm
      , test-framework, test-framework-hunit
      }:
@@ -202710,7 +202209,6 @@ self: {
        homepage = "https://github.com/basvandijk/threads";
        description = "Fork threads and wait for their result";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "threads-extras" = callPackage
@@ -204108,22 +203606,6 @@ self: {
      }) {};
 
   "timezone-olson" = callPackage
-    ({ mkDerivation, base, binary, bytestring, extensible-exceptions
-     , time, timezone-series
-     }:
-     mkDerivation {
-       pname = "timezone-olson";
-       version = "0.1.8";
-       sha256 = "0irpvmqpiw4j2wq4rn3jrndgn2jg10yvrnxvsrb1l6g5b80h2sxr";
-       libraryHaskellDepends = [
-         base binary bytestring extensible-exceptions time timezone-series
-       ];
-       homepage = "http://projects.haskell.org/time-ng/";
-       description = "A pure Haskell parser and renderer for binary Olson timezone files";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "timezone-olson_0_1_9" = callPackage
     ({ mkDerivation, base, binary, bytestring, extensible-exceptions
      , time, timezone-series
      }:
@@ -204137,7 +203619,6 @@ self: {
        homepage = "http://projects.haskell.org/time-ng/";
        description = "A pure Haskell parser and renderer for binary Olson timezone files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "timezone-olson-th" = callPackage
@@ -204157,18 +203638,6 @@ self: {
      }) {};
 
   "timezone-series" = callPackage
-    ({ mkDerivation, base, deepseq, time }:
-     mkDerivation {
-       pname = "timezone-series";
-       version = "0.1.8";
-       sha256 = "1xndlg0n46qjdh5yjzkkg285x3k76073aaizx1ibdzbq9q7dj6c1";
-       libraryHaskellDepends = [ base deepseq time ];
-       homepage = "http://projects.haskell.org/time-ng/";
-       description = "Enhanced timezone handling for Data.Time";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "timezone-series_0_1_9" = callPackage
     ({ mkDerivation, base, deepseq, time }:
      mkDerivation {
        pname = "timezone-series";
@@ -204178,7 +203647,6 @@ self: {
        homepage = "http://projects.haskell.org/time-ng/";
        description = "Enhanced timezone handling for Data.Time";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "timezone-unix" = callPackage
@@ -204591,27 +204059,6 @@ self: {
      }) {};
 
   "tmapmvar" = callPackage
-    ({ mkDerivation, async, base, containers, hashable, QuickCheck
-     , quickcheck-instances, stm, tasty, tasty-quickcheck
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "tmapmvar";
-       version = "0.0.3";
-       sha256 = "1w5afnh7v04cjwb6qmgmmzgqhqj58rrxl6m31myk2rgd8i9j1fvf";
-       libraryHaskellDepends = [
-         base containers hashable stm unordered-containers
-       ];
-       testHaskellDepends = [
-         async base containers QuickCheck quickcheck-instances stm tasty
-         tasty-quickcheck
-       ];
-       homepage = "https://github.com/athanclark/tmapmvar#readme";
-       description = "A single-entity stateful Map in STM, similar to tmapchan";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "tmapmvar_0_0_4" = callPackage
     ({ mkDerivation, async, base, containers, hashable, QuickCheck
      , quickcheck-instances, stm, tasty, tasty-quickcheck
      , unordered-containers
@@ -204629,7 +204076,6 @@ self: {
        ];
        description = "A single-entity stateful Map in STM, similar to tmapchan";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tmp-postgres" = callPackage
@@ -205597,8 +205043,8 @@ self: {
      }:
      mkDerivation {
        pname = "transfer-db";
-       version = "0.3.1.1";
-       sha256 = "1wgxg576dqivwxfks75nc0yaxxiaf8zyxz0fpay0qgdfwd218f2n";
+       version = "0.3.1.2";
+       sha256 = "1vpcf4k78cnpb5n1bwn2v9l7g38nlgr2y9j8kvmi7ncfvh1nvbqw";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -205614,6 +205060,7 @@ self: {
          base bytestring cpu hspec QuickCheck sqlcli store time transformers
        ];
        homepage = "http://hub.darcs.net/mihaigiurgeanu/transfer-db";
+       description = "ODBC database transfer";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -206418,33 +205865,6 @@ self: {
      }) {};
 
   "tries" = callPackage
-    ({ mkDerivation, base, bytestring, bytestring-trie, composition
-     , composition-extra, containers, criterion, deepseq, hashable, keys
-     , mtl, QuickCheck, quickcheck-instances, rose-trees, semigroups
-     , sets, tasty, tasty-quickcheck, unordered-containers
-     }:
-     mkDerivation {
-       pname = "tries";
-       version = "0.0.4.2";
-       sha256 = "152rs6g3p6nc4xw3fnh0psmlqmchq038y0p18nandgggsnl2ck0n";
-       libraryHaskellDepends = [
-         base bytestring bytestring-trie composition composition-extra
-         containers deepseq hashable keys QuickCheck quickcheck-instances
-         rose-trees semigroups sets unordered-containers
-       ];
-       testHaskellDepends = [
-         base containers mtl QuickCheck quickcheck-instances tasty
-         tasty-quickcheck
-       ];
-       benchmarkHaskellDepends = [
-         base containers criterion mtl rose-trees unordered-containers
-       ];
-       description = "Various trie implementations in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "tries_0_0_5" = callPackage
     ({ mkDerivation, base, bytestring, bytestring-trie, composition
      , containers, criterion, deepseq, hashable, keys, mtl, QuickCheck
      , quickcheck-instances, rose-trees, semigroups, sets, tasty
@@ -207235,29 +206655,6 @@ self: {
      }) {};
 
   "turtle" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
-     , containers, criterion, directory, doctest, exceptions, foldl
-     , hostname, managed, optional-args, optparse-applicative, process
-     , semigroups, stm, system-fileio, system-filepath, temporary, text
-     , time, transformers, unix, unix-compat
-     }:
-     mkDerivation {
-       pname = "turtle";
-       version = "1.5.5";
-       sha256 = "0iv87zlb5pzn5ljvkf0440gia3mkhn7m35falm3yvyn9d8pz8ym1";
-       libraryHaskellDepends = [
-         ansi-wl-pprint async base bytestring clock containers directory
-         exceptions foldl hostname managed optional-args
-         optparse-applicative process semigroups stm system-fileio
-         system-filepath temporary text time transformers unix unix-compat
-       ];
-       testHaskellDepends = [ base doctest system-filepath temporary ];
-       benchmarkHaskellDepends = [ base criterion text ];
-       description = "Shell programming, Haskell-style";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "turtle_1_5_6" = callPackage
     ({ mkDerivation, ansi-wl-pprint, async, base, bytestring, clock
      , containers, criterion, directory, doctest, exceptions, foldl
      , hostname, managed, optional-args, optparse-applicative, process
@@ -207278,7 +206675,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion text ];
        description = "Shell programming, Haskell-style";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "turtle-options" = callPackage
@@ -208233,8 +207629,8 @@ self: {
     ({ mkDerivation, base, containers, mtl, template-haskell }:
      mkDerivation {
        pname = "type-interpreter";
-       version = "0.1.2";
-       sha256 = "1phi14lmwyz6qi55vnnjhibglm74xkic2xiwmd1qxkj0dnb423wj";
+       version = "0.1.3";
+       sha256 = "0gv1782vj48v9cybsyc8wqsgndg966gkpnzxaw7s9f2g1c18jj1s";
        libraryHaskellDepends = [ base containers mtl template-haskell ];
        testHaskellDepends = [ base template-haskell ];
        description = "Interpreter for Template Haskell types";
@@ -208409,18 +207805,16 @@ self: {
 
   "type-natural" = callPackage
     ({ mkDerivation, base, constraints, equational-reasoning
-     , ghc-typelits-natnormalise, ghc-typelits-presburger, monomorphic
-     , singletons, template-haskell
+     , ghc-typelits-natnormalise, ghc-typelits-presburger, singletons
+     , template-haskell
      }:
      mkDerivation {
        pname = "type-natural";
-       version = "0.7.1.4";
-       sha256 = "1rs0sbkzjlvwjsp4yz7mg4sd2y422vqnzj13fdcssfdmkbs0ybyn";
-       revision = "1";
-       editedCabalFile = "0g75rszhy7fj3riy0j8y6j78m7gx6pp8h4j67zqax6anq3ry12fn";
+       version = "0.8.0.0";
+       sha256 = "0cdym66cvidccimhfpy9i5wa29c1aa6vchnywniyaxlmivqjybj4";
        libraryHaskellDepends = [
          base constraints equational-reasoning ghc-typelits-natnormalise
-         ghc-typelits-presburger monomorphic singletons template-haskell
+         ghc-typelits-presburger singletons template-haskell
        ];
        homepage = "https://github.com/konn/type-natural";
        description = "Type-level natural and proofs of their properties";
@@ -208667,6 +208061,27 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "typed-process_0_2_2_0" = callPackage
+    ({ mkDerivation, async, base, base64-bytestring, bytestring, hspec
+     , process, stm, temporary, transformers
+     }:
+     mkDerivation {
+       pname = "typed-process";
+       version = "0.2.2.0";
+       sha256 = "0c6gvgvjyncbni9a5bvpbglknd4yclr3d3hfg9bhgahmkj40dva2";
+       libraryHaskellDepends = [
+         async base bytestring process stm transformers
+       ];
+       testHaskellDepends = [
+         async base base64-bytestring bytestring hspec process stm temporary
+         transformers
+       ];
+       homepage = "https://haskell-lang.org/library/typed-process";
+       description = "Run external processes, with strong typing of streams";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "typed-spreadsheet" = callPackage
     ({ mkDerivation, async, base, diagrams-cairo, diagrams-gtk
      , diagrams-lib, foldl, gtk, microlens, stm, text, transformers
@@ -209249,13 +208664,13 @@ self: {
     ({ mkDerivation, base, bytestring, network, resourcet, streaming }:
      mkDerivation {
        pname = "udp-streaming";
-       version = "0.1.0.0";
-       sha256 = "1q03bm8mdbpzalb89sjm71x97znbzddbzfxdr639jzw7516bz5js";
+       version = "0.2.0.0";
+       sha256 = "18xamvak7zr4d826141jqkhs45ij2xgp4s5b2fn955prs0iq7bnb";
        libraryHaskellDepends = [
          base bytestring network resourcet streaming
        ];
        homepage = "https://hub.darcs.net/mihaigiurgeanu/udp-streaming";
-       description = "Simple fire-and-forget udp Streaming components modelled after udp-conduit";
+       description = "Streaming to and from UDP socket";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -210650,17 +210065,16 @@ self: {
   "unjson" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
      , free, hashable, HUnit, invariant, pretty, primitive, scientific
-     , text, time, unordered-containers, vector
+     , semigroups, text, time, unordered-containers, vector
      }:
      mkDerivation {
        pname = "unjson";
-       version = "0.15.1.0";
-       sha256 = "1k61lak22snr7fimpr7pjri33rg0gm1hhfn253bwlz3pvpn85vmp";
-       revision = "1";
-       editedCabalFile = "1icfcg8dbqw48a96w6j9jwa6xf08nms55pfixjwf4332qk7q7hkc";
+       version = "0.15.2.0";
+       sha256 = "040s1b9frl0sj8saa9b0bzsnqhmb4vdrscff2jzzcdn0papn5rbj";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring containers free hashable invariant
-         pretty primitive scientific text time unordered-containers vector
+         pretty primitive scientific semigroups text time
+         unordered-containers vector
        ];
        testHaskellDepends = [
          aeson attoparsec base bytestring containers free hashable HUnit
@@ -210687,27 +210101,6 @@ self: {
      }) {};
 
   "unliftio" = callPackage
-    ({ mkDerivation, async, base, deepseq, directory, filepath, hspec
-     , stm, transformers, unix, unliftio-core
-     }:
-     mkDerivation {
-       pname = "unliftio";
-       version = "0.2.4.0";
-       sha256 = "0vpncmwaq5zb6bziqfns4qdgxmq8ky0rlxna2yngxp170s5zxx9z";
-       libraryHaskellDepends = [
-         async base deepseq directory filepath stm transformers unix
-         unliftio-core
-       ];
-       testHaskellDepends = [
-         async base deepseq directory filepath hspec stm transformers unix
-         unliftio-core
-       ];
-       homepage = "https://github.com/fpco/unliftio/tree/master/unliftio#readme";
-       description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "unliftio_0_2_5_0" = callPackage
     ({ mkDerivation, async, base, deepseq, directory, filepath, hspec
      , process, stm, transformers, unix, unliftio-core
      }:
@@ -210726,6 +210119,27 @@ self: {
        homepage = "https://github.com/fpco/unliftio/tree/master/unliftio#readme";
        description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)";
        license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "unliftio_0_2_6_0" = callPackage
+    ({ mkDerivation, async, base, deepseq, directory, filepath, hspec
+     , process, stm, time, transformers, unix, unliftio-core
+     }:
+     mkDerivation {
+       pname = "unliftio";
+       version = "0.2.6.0";
+       sha256 = "0rmklk2d2ip1mcizqn8j38lbqy58lc8h9hwigvab5ggilxpmnzgq";
+       libraryHaskellDepends = [
+         async base deepseq directory filepath process stm time transformers
+         unix unliftio-core
+       ];
+       testHaskellDepends = [
+         async base deepseq directory filepath hspec process stm time
+         transformers unix unliftio-core
+       ];
+       homepage = "https://github.com/fpco/unliftio/tree/master/unliftio#readme";
+       description = "The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)";
+       license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -211243,20 +210657,6 @@ self: {
      }) {};
 
   "uri-bytestring-aeson" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, text, uri-bytestring }:
-     mkDerivation {
-       pname = "uri-bytestring-aeson";
-       version = "0.1.0.5";
-       sha256 = "1rcy3afmm1faapnw5y4pbxn4m0h2bp2pa51g3r8lh6gffk1xi9x3";
-       libraryHaskellDepends = [
-         aeson base bytestring text uri-bytestring
-       ];
-       homepage = "https://github.com/reactormonk/uri-bytestring-aeson";
-       description = "Aeson instances for URI Bytestring";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "uri-bytestring-aeson_0_1_0_6" = callPackage
     ({ mkDerivation, aeson, base, bytestring, text, uri-bytestring }:
      mkDerivation {
        pname = "uri-bytestring-aeson";
@@ -211268,7 +210668,6 @@ self: {
        homepage = "https://github.com/reactormonk/uri-bytestring-aeson";
        description = "Aeson instances for URI Bytestring";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uri-conduit" = callPackage
@@ -213339,6 +212738,8 @@ self: {
        pname = "vector-fftw";
        version = "0.1.3.8";
        sha256 = "0xlr4566hh6lnpinzrk623a96jnb8mp8mq6cymlsl8y38qx36jp6";
+       revision = "1";
+       editedCabalFile = "0417f7grdvs3ws508a7k9ngpnisw7f7b6bcmmasflvvr66m6166f";
        libraryHaskellDepends = [ base primitive storable-complex vector ];
        librarySystemDepends = [ fftw ];
        homepage = "http://hackage.haskell.org/package/vector-fftw";
@@ -214468,6 +213869,42 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "vty_5_21" = callPackage
+    ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers
+     , deepseq, directory, filepath, hashable, HUnit, microlens
+     , microlens-mtl, microlens-th, mtl, parallel, parsec, QuickCheck
+     , quickcheck-assertions, random, smallcheck, stm, string-qq
+     , terminfo, test-framework, test-framework-hunit
+     , test-framework-smallcheck, text, transformers, unix, utf8-string
+     , vector
+     }:
+     mkDerivation {
+       pname = "vty";
+       version = "5.21";
+       sha256 = "0nvsjc5awr6kwrsv02sz64vgza6g8phk9g6g07dx1sm2yfsvhyas";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base blaze-builder bytestring containers deepseq directory filepath
+         hashable microlens microlens-mtl microlens-th mtl parallel parsec
+         stm terminfo text transformers unix utf8-string vector
+       ];
+       executableHaskellDepends = [
+         base containers microlens microlens-mtl mtl
+       ];
+       testHaskellDepends = [
+         base blaze-builder bytestring Cabal containers deepseq HUnit
+         microlens microlens-mtl mtl QuickCheck quickcheck-assertions random
+         smallcheck stm string-qq terminfo test-framework
+         test-framework-hunit test-framework-smallcheck text unix
+         utf8-string vector
+       ];
+       homepage = "https://github.com/jtdaugherty/vty";
+       description = "A simple terminal UI library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "vty-examples" = callPackage
     ({ mkDerivation, array, base, bytestring, Cabal, containers
      , data-default, deepseq, lens, mtl, parallel, parsec, QuickCheck
@@ -214657,6 +214094,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "wai_3_2_1_2" = callPackage
+    ({ mkDerivation, base, bytestring, hspec, hspec-discover
+     , http-types, network, text, transformers, vault
+     }:
+     mkDerivation {
+       pname = "wai";
+       version = "3.2.1.2";
+       sha256 = "0jr3b2789wa4m6mxkz12ynz4lfsqmgbrcy0am8karyqr3x3528r8";
+       libraryHaskellDepends = [
+         base bytestring http-types network text transformers vault
+       ];
+       testHaskellDepends = [ base bytestring hspec ];
+       testToolDepends = [ hspec-discover ];
+       homepage = "https://github.com/yesodweb/wai";
+       description = "Web Application Interface";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wai-accept-language" = callPackage
     ({ mkDerivation, base, bytestring, file-embed, http-types, text
      , wai, wai-app-static, wai-extra, warp, word8
@@ -214742,6 +214198,41 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "wai-app-static_3_1_6_2" = callPackage
+    ({ mkDerivation, base, blaze-html, blaze-markup, bytestring
+     , containers, cryptonite, directory, file-embed, filepath, hspec
+     , http-date, http-types, memory, mime-types, mockery, 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.6.2";
+       sha256 = "0gnwq6ad5m8w8sqq4dzpz23l5rjdphfsf8h9h27lrvv1prkabc6h";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base blaze-html blaze-markup bytestring containers cryptonite
+         directory file-embed filepath http-date http-types memory
+         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
+         mockery 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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wai-cli" = callPackage
     ({ mkDerivation, ansi-terminal, base, http-types, monads-tf
      , network, options, socket-activation, stm, streaming-commons, unix
@@ -214777,6 +214268,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "wai-conduit_3_0_0_4" = callPackage
+    ({ mkDerivation, base, bytestring, conduit, http-types
+     , transformers, wai
+     }:
+     mkDerivation {
+       pname = "wai-conduit";
+       version = "3.0.0.4";
+       sha256 = "07yn41rn2skd5p3wqqa09wa761vj7ibl8l19gh4bi4i8slxhk417";
+       libraryHaskellDepends = [
+         base bytestring conduit http-types transformers wai
+       ];
+       homepage = "https://github.com/yesodweb/wai";
+       description = "conduit wrappers for WAI";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wai-cors" = callPackage
     ({ mkDerivation, attoparsec, base, base-unicode-symbols, bytestring
      , case-insensitive, directory, filepath, http-types, mtl, network
@@ -214906,6 +214414,38 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "wai-extra_3_0_22_1" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring
+     , bytestring, case-insensitive, containers, cookie
+     , data-default-class, deepseq, directory, fast-logger, hspec
+     , http-types, HUnit, iproute, lifted-base, network, old-locale
+     , resourcet, streaming-commons, stringsearch, text, time
+     , transformers, unix, unix-compat, vault, void, wai, wai-logger
+     , word8, zlib
+     }:
+     mkDerivation {
+       pname = "wai-extra";
+       version = "3.0.22.1";
+       sha256 = "0bvj0nc3m314hh6n4rpz6dzb4bqg24b1sz4x0w7bj5ah8msr0z3y";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson ansi-terminal base base64-bytestring bytestring
+         case-insensitive containers cookie data-default-class deepseq
+         directory fast-logger http-types iproute lifted-base network
+         old-locale resourcet streaming-commons stringsearch text time
+         transformers unix unix-compat vault void wai wai-logger word8 zlib
+       ];
+       testHaskellDepends = [
+         base bytestring case-insensitive cookie fast-logger hspec
+         http-types HUnit resourcet text time transformers wai zlib
+       ];
+       homepage = "http://github.com/yesodweb/wai";
+       description = "Provides some basic WAI handlers and middleware";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wai-frontend-monadcgi" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, cgi
      , containers, http-types, transformers, wai
@@ -216235,6 +215775,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "wai-websockets_3_0_1_2" = callPackage
+    ({ mkDerivation, base, bytestring, case-insensitive, file-embed
+     , http-types, network, text, transformers, wai, wai-app-static
+     , warp, websockets
+     }:
+     mkDerivation {
+       pname = "wai-websockets";
+       version = "3.0.1.2";
+       sha256 = "0b2xmdsrsqpssyib53wbr6r8hf75789ndyyanv37sv99iyqcwz4i";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring case-insensitive http-types network transformers
+         wai websockets
+       ];
+       executableHaskellDepends = [
+         base bytestring case-insensitive file-embed http-types network text
+         transformers wai wai-app-static warp websockets
+       ];
+       homepage = "http://github.com/yesodweb/wai";
+       description = "Provide a bridge between WAI and the websockets package";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wait-handle" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -216404,6 +215969,42 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "warp_3_2_18_2" = callPackage
+    ({ mkDerivation, array, async, auto-update, base, bsb-http-chunked
+     , bytestring, case-insensitive, containers, directory, doctest
+     , gauge, ghc-prim, hashable, hspec, http-client, http-date
+     , http-types, http2, HUnit, iproute, lifted-base, network, process
+     , QuickCheck, silently, simple-sendfile, stm, streaming-commons
+     , text, time, transformers, unix, unix-compat, vault, wai, word8
+     }:
+     mkDerivation {
+       pname = "warp";
+       version = "3.2.18.2";
+       sha256 = "01jmwq9a5xxig14qh30w2fspjv4rhprv6q6i6bsv1qy9m9n2mczb";
+       libraryHaskellDepends = [
+         array async auto-update base bsb-http-chunked bytestring
+         case-insensitive containers ghc-prim hashable http-date http-types
+         http2 iproute network simple-sendfile stm streaming-commons text
+         unix unix-compat vault wai word8
+       ];
+       testHaskellDepends = [
+         array async auto-update base bsb-http-chunked bytestring
+         case-insensitive containers directory doctest ghc-prim hashable
+         hspec http-client http-date http-types http2 HUnit iproute
+         lifted-base network process QuickCheck silently simple-sendfile stm
+         streaming-commons text time transformers unix unix-compat vault wai
+         word8
+       ];
+       benchmarkHaskellDepends = [
+         auto-update base bytestring containers gauge hashable http-date
+         http-types network unix unix-compat
+       ];
+       homepage = "http://github.com/yesodweb/wai";
+       description = "A fast, light-weight web server for WAI applications";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "warp-dynamic" = callPackage
     ({ mkDerivation, base, data-default, dyre, http-types, wai, warp }:
      mkDerivation {
@@ -216601,8 +216202,8 @@ self: {
      }:
      mkDerivation {
        pname = "wavefront";
-       version = "0.7.1.1";
-       sha256 = "1d9hh3si3fwbb42y9nlqwp3ccl8gpip65fh75gidfzzricjyw7fw";
+       version = "0.7.1.2";
+       sha256 = "047hdcvrkh4xwyp8i18w45qx7nhd59iii34nrh6ih9k77l6rr4qj";
        libraryHaskellDepends = [
          attoparsec base dlist filepath mtl text transformers vector
        ];
@@ -217475,41 +217076,6 @@ self: {
      }) {};
 
   "websockets" = callPackage
-    ({ mkDerivation, attoparsec, base, base64-bytestring, binary
-     , blaze-builder, bytestring, case-insensitive, containers
-     , criterion, entropy, HUnit, network, QuickCheck, random, SHA
-     , streaming-commons, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, text
-     }:
-     mkDerivation {
-       pname = "websockets";
-       version = "0.12.3.1";
-       sha256 = "019jkvmbs5wvjwczqy06spd6545mly08n5pqbsaacmff4xznkz39";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         attoparsec base base64-bytestring binary blaze-builder bytestring
-         case-insensitive containers entropy network random SHA
-         streaming-commons text
-       ];
-       testHaskellDepends = [
-         attoparsec base base64-bytestring binary blaze-builder bytestring
-         case-insensitive containers entropy HUnit network QuickCheck random
-         SHA streaming-commons test-framework test-framework-hunit
-         test-framework-quickcheck2 text
-       ];
-       benchmarkHaskellDepends = [
-         attoparsec base base64-bytestring binary blaze-builder bytestring
-         case-insensitive containers criterion entropy network random SHA
-         text
-       ];
-       doCheck = false;
-       homepage = "http://jaspervdj.be/websockets";
-       description = "A sensible and clean way to write WebSocket-capable servers in Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "websockets_0_12_4_0" = callPackage
     ({ mkDerivation, attoparsec, base, base64-bytestring, binary
      , bytestring, bytestring-builder, case-insensitive, containers
      , criterion, entropy, HUnit, network, QuickCheck, random, SHA
@@ -217542,7 +217108,6 @@ self: {
        homepage = "http://jaspervdj.be/websockets";
        description = "A sensible and clean way to write WebSocket-capable servers in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "websockets-rpc" = callPackage
@@ -217619,23 +217184,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "websockets-simple_0_1_0" = callPackage
-    ({ mkDerivation, aeson, async, base, bytestring, every, exceptions
-     , hspec, monad-control, profunctors, stm, tasty, tasty-hspec
-     , transformers, wai-transformers, websockets
+  "websockets-simple_0_1_1" = callPackage
+    ({ mkDerivation, aeson, async, base, bytestring, exceptions, hspec
+     , monad-control, profunctors, stm, tasty, tasty-hspec, transformers
+     , vector, wai-transformers, websockets
      }:
      mkDerivation {
        pname = "websockets-simple";
-       version = "0.1.0";
-       sha256 = "0jxqgnrmchn3sabyz0f2733cgvay0ksasc9qnil9kvj0z3n2h4zz";
+       version = "0.1.1";
+       sha256 = "0hakr1vrfj0n3sgax08vsa1bcnddqkizr2fb9pjk9abhw4hn5k2y";
        libraryHaskellDepends = [
-         aeson async base bytestring every exceptions monad-control
-         profunctors stm transformers wai-transformers websockets
+         aeson async base bytestring exceptions monad-control profunctors
+         stm transformers vector wai-transformers websockets
        ];
        testHaskellDepends = [
-         aeson async base bytestring every exceptions hspec monad-control
-         profunctors stm tasty tasty-hspec transformers wai-transformers
-         websockets
+         aeson async base bytestring exceptions hspec monad-control
+         profunctors stm tasty tasty-hspec transformers vector
+         wai-transformers websockets
        ];
        homepage = "https://github.com/athanclark/websockets-simple#readme";
        description = "Composable websockets clients";
@@ -218011,21 +217576,6 @@ self: {
      }) {};
 
   "wide-word" = callPackage
-    ({ mkDerivation, base, bytestring, deepseq, ghc-prim, hspec
-     , QuickCheck
-     }:
-     mkDerivation {
-       pname = "wide-word";
-       version = "0.1.0.5";
-       sha256 = "0aj0jpj2w46fdzvddc76l62cmcwvsndc1vj6z391bybw4q8khlmd";
-       libraryHaskellDepends = [ base deepseq ghc-prim ];
-       testHaskellDepends = [ base bytestring ghc-prim hspec QuickCheck ];
-       homepage = "https://github.com/erikd/wide-word";
-       description = "Data types for large but fixed width signed and unsigned integers";
-       license = stdenv.lib.licenses.bsd2;
-     }) {};
-
-  "wide-word_0_1_0_6" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, ghc-prim, hspec
      , QuickCheck
      }:
@@ -218038,7 +217588,6 @@ self: {
        homepage = "https://github.com/erikd/wide-word";
        description = "Data types for large but fixed width signed and unsigned integers";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wigner-symbols" = callPackage
@@ -218113,23 +217662,6 @@ self: {
      }) {};
 
   "wild-bind" = callPackage
-    ({ mkDerivation, base, containers, hspec, microlens, QuickCheck
-     , stm, text, transformers
-     }:
-     mkDerivation {
-       pname = "wild-bind";
-       version = "0.1.1.0";
-       sha256 = "1z9jiqbla3nxfij6cxcpd5lpgnixz89mhnfr5ksma5khfyc01sis";
-       libraryHaskellDepends = [ base containers text transformers ];
-       testHaskellDepends = [
-         base hspec microlens QuickCheck stm transformers
-       ];
-       homepage = "https://github.com/debug-ito/wild-bind";
-       description = "Dynamic key binding framework";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "wild-bind_0_1_1_1" = callPackage
     ({ mkDerivation, base, containers, hspec, microlens, QuickCheck
      , stm, text, transformers
      }:
@@ -218144,7 +217676,6 @@ self: {
        homepage = "https://github.com/debug-ito/wild-bind";
        description = "Dynamic key binding framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wild-bind-indicator" = callPackage
@@ -219452,23 +218983,26 @@ self: {
      }) {};
 
   "ws" = callPackage
-    ({ mkDerivation, async, base, bytestring, exceptions, haskeline
-     , mtl, network, network-uri, optparse-applicative, text, websockets
-     , wuss
+    ({ mkDerivation, async, attoparsec, attoparsec-uri, base
+     , bytestring, exceptions, haskeline, mtl, network
+     , optparse-applicative, strict, text, vector, websockets, wuss
      }:
      mkDerivation {
        pname = "ws";
-       version = "0.0.3";
-       sha256 = "01awmbs6dmf9crhp6vvwzh8pjqyjpgjgxzcy62nh52s959snwc9m";
+       version = "0.0.4";
+       sha256 = "00jz7a7x260ix2rg46bmp6c3rjnra9c7j4p0in7cpk2iap28106q";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         async base bytestring exceptions haskeline mtl network network-uri
-         text websockets wuss
+         async attoparsec-uri base bytestring exceptions haskeline mtl
+         network text websockets wuss
        ];
        executableHaskellDepends = [
-         base exceptions network-uri optparse-applicative
+         async attoparsec attoparsec-uri base bytestring exceptions
+         haskeline mtl network optparse-applicative strict text vector
+         websockets wuss
        ];
+       homepage = "https://github.com/athanclark/ws#readme";
        description = "A simple CLI utility for interacting with a websocket";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -219682,6 +219216,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "wuss_1_1_8" = callPackage
+    ({ mkDerivation, base, bytestring, connection, network, websockets
+     }:
+     mkDerivation {
+       pname = "wuss";
+       version = "1.1.8";
+       sha256 = "1isw32n4qdaip350928v7v7cph4p4sb28hva5vd3jvq4309n65df";
+       libraryHaskellDepends = [
+         base bytestring connection network websockets
+       ];
+       homepage = "https://github.com/tfausak/wuss#readme";
+       description = "Secure WebSocket (WSS) clients";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wx" = callPackage
     ({ mkDerivation, base, stm, time, wxcore }:
      mkDerivation {
@@ -220232,27 +219782,6 @@ self: {
      }) {};
 
   "xeno" = callPackage
-    ({ mkDerivation, array, base, bytestring, criterion, deepseq
-     , ghc-prim, hexml, hexpat, hspec, mtl, mutable-containers, vector
-     , weigh, xml
-     }:
-     mkDerivation {
-       pname = "xeno";
-       version = "0.3.2";
-       sha256 = "14vwfkhfrxpa0mszjlbvm704nnv1xpbnb4klsyifihp7j4hngpp9";
-       libraryHaskellDepends = [
-         array base bytestring deepseq mtl mutable-containers vector
-       ];
-       testHaskellDepends = [ base bytestring hexml hspec ];
-       benchmarkHaskellDepends = [
-         base bytestring criterion deepseq ghc-prim hexml hexpat weigh xml
-       ];
-       homepage = "https://github.com/ocramz/xeno";
-       description = "A fast event-based XML parser in pure Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "xeno_0_3_3" = callPackage
     ({ mkDerivation, array, base, bytestring, criterion, deepseq
      , ghc-prim, hexml, hexpat, hspec, mtl, mutable-containers, vector
      , weigh, xml
@@ -220271,7 +219800,6 @@ self: {
        homepage = "https://github.com/ocramz/xeno";
        description = "A fast event-based XML parser in pure Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xenstore" = callPackage
@@ -220615,36 +220143,6 @@ self: {
      }) {};
 
   "xlsx" = callPackage
-    ({ mkDerivation, attoparsec, base, base64-bytestring, binary-search
-     , bytestring, conduit, containers, criterion, data-default, deepseq
-     , Diff, errors, extra, filepath, groom, lens, mtl, network-uri
-     , old-locale, raw-strings-qq, safe, smallcheck, tasty, tasty-hunit
-     , tasty-smallcheck, text, time, transformers, vector, xeno
-     , xml-conduit, zip-archive, zlib
-     }:
-     mkDerivation {
-       pname = "xlsx";
-       version = "0.7.0";
-       sha256 = "1fg0y6raxavqnk6hnchjppizc01zszav78hdf38d3c7rgnd0vnmd";
-       libraryHaskellDepends = [
-         attoparsec base base64-bytestring binary-search bytestring conduit
-         containers data-default deepseq errors extra filepath lens mtl
-         network-uri old-locale safe text time transformers vector xeno
-         xml-conduit zip-archive zlib
-       ];
-       testHaskellDepends = [
-         base bytestring containers Diff groom lens mtl raw-strings-qq
-         smallcheck tasty tasty-hunit tasty-smallcheck text time vector
-         xml-conduit
-       ];
-       benchmarkHaskellDepends = [ base bytestring criterion ];
-       homepage = "https://github.com/qrilka/xlsx";
-       description = "Simple and incomplete Excel file parser/writer";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "xlsx_0_7_1" = callPackage
     ({ mkDerivation, attoparsec, base, base64-bytestring, binary-search
      , bytestring, conduit, containers, criterion, data-default, deepseq
      , Diff, errors, extra, filepath, groom, lens, mtl, network-uri
@@ -223285,8 +222783,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-auth-hmac-keccak";
-       version = "0.0.0.4";
-       sha256 = "17i3xxxdpq58q7y80xrh266lzkl8dh686v25kpapn2r0c4vxm291";
+       version = "0.0.0.5";
+       sha256 = "1va81j58abhfi2hwgiac8d819yisy4g6nxq6l6gh0qvsg5r36j0g";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base bytestring cryptonite mtl persistent random shakespeare
@@ -224054,11 +223552,14 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-gitrev";
-       version = "0.1.0.0";
-       sha256 = "0jcgc8l2gh6ahxwddra0jyf78bi4rzff9nfi1knjxixfll73rrih";
+       version = "0.2.0.0";
+       sha256 = "0lp0zraj6015bl8pcgi9b9w4d1yf0lb4awy25jv5xrcrc173g7yz";
+       revision = "1";
+       editedCabalFile = "1b0df34lz569gnwbbz0p20dml6bi2nbva9wfdsxyvva0dhvxjaz5";
        libraryHaskellDepends = [
          aeson base gitrev template-haskell yesod-core
        ];
+       homepage = "https://github.com/DanBurton/yesod-gitrev";
        description = "A subsite for displaying git information";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -226793,8 +226294,8 @@ self: {
     ({ mkDerivation, base, binary, bytestring, containers }:
      mkDerivation {
        pname = "zmidi-core";
-       version = "0.8.1";
-       sha256 = "1n6bcblk8ck1xgbyd7gspisg3i3zw3pqzi6s402ivsi03ns0iysv";
+       version = "0.8.2";
+       sha256 = "02895shbxbswnczgljafr9k7vfrxg7w2sqhnlx8azixkw84lk5mh";
        libraryHaskellDepends = [ base binary bytestring containers ];
        homepage = "https://github.com/stephentetley/zmidi-core";
        description = "Read and write MIDI files";

From 53309758e39eb1ddc302114848d7c70138260de4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 18 Mar 2018 19:55:12 +0100
Subject: [PATCH 021/123] haskell-matrix: the new version has fixed the test
 suite failure

---
 pkgs/development/haskell-modules/configuration-common.nix    | 3 ---
 pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 6153c68a0dc..c76f0df91f6 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1011,7 +1011,4 @@ self: super: {
     sha256 = "1485bbjca1wqbh3c9yqj85kmq8j7zxq79y5isxypy3r6wjpr3g6b";
   });
 
-  # https://github.com/Daniel-Diaz/matrix/issues/55
-  matrix_0_3_6_0 = dontCheck super.matrix_0_3_6_0;
-
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 2cc3cdb8eba..c910b0856be 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -705,7 +705,7 @@ self: super: {
   # Older versions don't compile.
   brick = self.brick_0_35;
   timezone-olson = self.timezone-olson_0_1_9;
-  matrix = self.matrix_0_3_6_0;
+  matrix = self.matrix_0_3_6_1;
 
   # https://github.com/pikajude/th-printf/issues/8
   th-printf = doJailbreak super.th-printf;

From a413639a26c03229f3d7639b0cb00f3374cfff76 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 18 Mar 2018 19:55:44 +0100
Subject: [PATCH 022/123] haskell-th-printf: drop obsolete override for ghc
 8.4.x

---
 pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index c910b0856be..bf450f76ce6 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -707,9 +707,6 @@ self: super: {
   timezone-olson = self.timezone-olson_0_1_9;
   matrix = self.matrix_0_3_6_1;
 
-  # https://github.com/pikajude/th-printf/issues/8
-  th-printf = doJailbreak super.th-printf;
-
   # https://github.com/xmonad/xmonad/issues/155
   xmonad = addBuildDepend (appendPatch super.xmonad (pkgs.fetchpatch
     { url = https://github.com/xmonad/xmonad/pull/153/commits/c96a59fa0de2f674e60befd0f57e67b93ea7dcf6.patch;

From c9777cdf9d8ba789a495e7f833bb6088654c392f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 18 Mar 2018 19:56:15 +0100
Subject: [PATCH 023/123] haskell-SHA: the new version has fixed the test suite
 failure

---
 pkgs/development/haskell-modules/configuration-common.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index c76f0df91f6..935fec829dc 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1005,10 +1005,4 @@ self: super: {
   # https://github.com/fpco/inline-c/issues/72
   inline-c = dontCheck super.inline-c;
 
-  # Avoid GHC compiler crash a la https://ghc.haskell.org/trac/ghc/ticket/5361.
-  SHA = appendPatch super.SHA (pkgs.fetchpatch {
-    url = https://github.com/GaloisInc/SHA/commit/c258350e953c3de2f98c5625ac3857f1a6863afc.patch;
-    sha256 = "1485bbjca1wqbh3c9yqj85kmq8j7zxq79y5isxypy3r6wjpr3g6b";
-  });
-
 }

From e4a5fea87fdfa0431c068661c32fc6781b629577 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 18 Mar 2018 19:56:36 +0100
Subject: [PATCH 024/123] haskell-blaze-builder: drop obsolete override for ghc
 8.4.x

---
 .../haskell-modules/configuration-ghc-8.4.x.nix | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index bf450f76ce6..d2b7f369fc8 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -301,23 +301,6 @@ self: super: {
 
   ## Unmerged
 
-  ## Unmerged.  PR: https://github.com/lpsmith/blaze-builder/pull/10
-  ## Issue: https://github.com/lpsmith/blaze-builder/issues/12
-  blaze-builder = overrideCabal super.blaze-builder (drv: {
-    ##     • No instance for (Semigroup Poke)
-    ##         arising from the superclasses of an instance declaration
-    ##     • In the instance declaration for ‘Monoid Poke’
-    src = pkgs.fetchFromGitHub {
-      owner  = "bgamari";
-      repo   = "blaze-builder";
-      rev    = "b7195f160795a081adbb9013810d843f1ba5e062";
-      sha256 = "1g351fdpsvn2lbqiy9bg2s0wwrdccb8q1zh7gvpsx5nnj24b1c00";
-    };
-    ## Setup: Encountered missing dependencies:
-    ## base >=4 && <4.11
-    jailbreak       = true;
-  });
-
   ## Unmerged.  PR: https://github.com/wrengr/bytestring-trie/pull/3
   bytestring-trie = overrideCabal super.bytestring-trie (drv: {
     ##     • Could not deduce (Semigroup (Trie a))

From 92935aeac850d5ae4ad0a3bd94e1e5a2177a384c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 19 Mar 2018 14:01:36 +0100
Subject: [PATCH 025/123] haskell-conduit: drop obsolete override for ghc 8.4.x

---
 pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index d2b7f369fc8..9757b485fdd 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -662,9 +662,6 @@ self: super: {
       sha256 = "1wwdzrbsjqb7ih4nl28sq5bbj125mxf93a74yh4viv5gmxwj606a";
     });
 
-  # 1.3.0.0 does not compile.
-  conduit = self.conduit_1_3_0_1;
-
   # https://github.com/jgm/pandoc-types/issues/37
   pandoc-types = self.pandoc-types_1_17_4_2;
 

From ad1cd53ec875f91fa70493b8e755cf27893d249d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 19 Mar 2018 14:05:03 +0100
Subject: [PATCH 026/123] haskell-src: drop obsolete override for ghc 8.4.x

---
 pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 9757b485fdd..807efe3f61d 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -42,9 +42,6 @@ self: super: {
   unix = null;
   xhtml = null;
 
-  # Need newer version.
-  haskell-src = super.haskell-src_1_0_3_0;
-
   ## Shadowed:
 
   ## Needs bump to a versioned attribute

From 97d56e94faf202348214f542517fb8947a19690f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 20 Mar 2018 09:18:23 +0100
Subject: [PATCH 027/123] haskell-getopt-generics: override to latest version
 for ghc-8.4.x

---
 pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
index 807efe3f61d..b39efcbde77 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix
@@ -683,6 +683,7 @@ self: super: {
   brick = self.brick_0_35;
   timezone-olson = self.timezone-olson_0_1_9;
   matrix = self.matrix_0_3_6_1;
+  getopt-generics = self.getopt-generics_0_13_0_2;
 
   # https://github.com/xmonad/xmonad/issues/155
   xmonad = addBuildDepend (appendPatch super.xmonad (pkgs.fetchpatch

From e8e7e78d9fbc5eb8cfb49d51d796123a79a08799 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Tue, 20 Mar 2018 17:22:32 +0100
Subject: [PATCH 028/123] titaniumenv: add 7.1 SDK and make it the default

---
 .../mobile/titaniumenv/build-app.nix          |   5 +-
 .../mobile/titaniumenv/default.nix            |   3 +-
 .../mobile/titaniumenv/examples/default.nix   |   2 +-
 .../examples/kitchensink/default.nix          |   2 +-
 .../mobile/titaniumenv/titaniumsdk-7.1.nix    | 102 ++++++++++++++++++
 5 files changed, 109 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/development/mobile/titaniumenv/titaniumsdk-7.1.nix

diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix
index 4079adaef51..25713a1b88b 100644
--- a/pkgs/development/mobile/titaniumenv/build-app.nix
+++ b/pkgs/development/mobile/titaniumenv/build-app.nix
@@ -47,7 +47,7 @@ in
 stdenv.mkDerivation {
   name = stdenv.lib.replaceChars [" "] [""] name;
   inherit src;
-  
+
   buildInputs = [ nodejs titanium alloy jdk python which file ] ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") xcodewrapper;
   
   buildPhase = ''
@@ -84,7 +84,8 @@ stdenv.mkDerivation {
           titanium config --config-file $TMPDIR/config.json --no-colors android.sdkPath ${androidsdkComposition}/libexec
 
           export PATH=$(echo ${androidsdkComposition}/libexec/tools):$(echo ${androidsdkComposition}/libexec/build-tools/android-*):$PATH
-          
+          export GRADLE_USER_HOME=$TMPDIR/gradle
+
           ${if release then
             ''titanium build --config-file $TMPDIR/config.json --no-colors --force --platform android --target dist-playstore --keystore ${androidKeyStore} --alias ${androidKeyAlias} --store-password ${androidKeyStorePassword} --output-dir $out''
           else
diff --git a/pkgs/development/mobile/titaniumenv/default.nix b/pkgs/development/mobile/titaniumenv/default.nix
index 031fe3b18c6..6765a9cc5c3 100644
--- a/pkgs/development/mobile/titaniumenv/default.nix
+++ b/pkgs/development/mobile/titaniumenv/default.nix
@@ -1,4 +1,4 @@
-{pkgs, pkgs_i686, xcodeVersion ? "9.2", xcodeBaseDir ? "/Applications/Xcode.app", tiVersion ? "6.3.1.GA"}:
+{pkgs, pkgs_i686, xcodeVersion ? "9.2", xcodeBaseDir ? "/Applications/Xcode.app", tiVersion ? "7.1.0.GA"}:
 
 rec {
   androidenv = pkgs.androidenv;
@@ -10,6 +10,7 @@ rec {
   
   titaniumsdk = let
     titaniumSdkFile = if tiVersion == "6.3.1.GA" then ./titaniumsdk-6.3.nix
+      else if tiVersion == "7.1.0.GA" then ./titaniumsdk-7.1.nix
       else throw "Titanium version not supported: "+tiVersion;
     in
     import titaniumSdkFile {
diff --git a/pkgs/development/mobile/titaniumenv/examples/default.nix b/pkgs/development/mobile/titaniumenv/examples/default.nix
index 5753c8d7da9..78f91dd39fb 100644
--- a/pkgs/development/mobile/titaniumenv/examples/default.nix
+++ b/pkgs/development/mobile/titaniumenv/examples/default.nix
@@ -2,7 +2,7 @@
 , systems ? [ "x86_64-linux" "x86_64-darwin" ]
 , xcodeVersion ? "9.2"
 , xcodeBaseDir ? "/Applications/Xcode.app"
-, tiVersion ? "6.3.1.GA"
+, tiVersion ? "7.1.0.GA"
 , rename ? false
 , newBundleId ? "com.example.kitchensink", iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? "Example", iosCertificatePassword ? "", iosVersion ? "11.2"
 , enableWirelessDistribution ? false, installURL ? null
diff --git a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix
index 5849ee368c1..42f80cbd9d0 100644
--- a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix
+++ b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix
@@ -1,4 +1,4 @@
-{ titaniumenv, fetchgit, target, androidPlatformVersions ? [ "25" "26" ], tiVersion ? "6.3.1.GA", release ? false
+{ titaniumenv, fetchgit, target, androidPlatformVersions ? [ "25" "26" ], tiVersion ? "7.1.0.GA", release ? false
 , rename ? false, stdenv ? null, newBundleId ? null, iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? null, iosCertificatePassword ? null, iosVersion ? "11.2"
 , enableWirelessDistribution ? false, installURL ? null
 }:
diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-7.1.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-7.1.nix
new file mode 100644
index 00000000000..61c23a6d0b3
--- /dev/null
+++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-7.1.nix
@@ -0,0 +1,102 @@
+{stdenv, fetchurl, unzip, makeWrapper, python, jdk}:
+
+let
+  # Gradle is a build system that bootstraps itself. This is what it actually
+  # downloads in the bootstrap phase.
+  gradleAllZip = fetchurl {
+    url = http://services.gradle.org/distributions/gradle-4.1-all.zip;
+    sha256 = "1rcrh263vq7a0is800y5z36jj97p67c6zpqzzfcbr7r0qaxb61sw";
+  };
+
+  # A Titanium-Android build requires proguard plugins. We create a fake
+  # repository so that Gradle does not attempt to download them in the builder.
+  # Since there are only 3 plugins required, this is still (sort of) manageable
+  # without a generator.
+  proguardVersion = "5.3.3";
+
+  proguardGradlePOM = fetchurl {
+    url = "https://repo1.maven.org/maven2/net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.pom";
+    sha256 = "03v9zm3ykfkyb5cs5ald07ph103fh68d5c33rv070r29p71dwszj";
+  };
+  proguardGradleJAR = fetchurl {
+    url = "https://repo1.maven.org/maven2/net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.jar";
+    sha256 = "0shhpsjfc5gam15jnv1hk718v5c7vi7dwdc3gvmnid6dc85kljzk";
+  };
+  proguardParentPOM = fetchurl {
+    url = "https://repo1.maven.org/maven2/net/sf/proguard/proguard-parent/${proguardVersion}/proguard-parent-${proguardVersion}.pom";
+    sha256 = "0mv0zbwyw8xa4mkc5kw69y5xqashkz9gp123akfvh9f6152l3202";
+  };
+  proguardBasePOM = fetchurl {
+    url = "https://repo1.maven.org/maven2/net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.pom";
+    sha256 = "1jnr6zsxfimb8wglqlwa6rrdc3g3nqf1dyw0k2dq9cj0q4pgn7p5";
+  };
+  proguardBaseJAR = fetchurl {
+    url = "https://repo1.maven.org/maven2/net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.jar";
+    sha256 = "11nwdb9y84cghcx319nsjjf9m035s4s1184zrhzpvaxq2wvqhbhx";
+  };
+
+  # Put the download plugins in a fake Maven repository
+  fakeMavenRepo = stdenv.mkDerivation {
+    name = "fake-maven-repo";
+    buildCommand = ''
+      mkdir -p $out
+      cd $out
+      mkdir -p net/sf/proguard/proguard-gradle/${proguardVersion}
+      cp ${proguardGradlePOM} net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.pom
+      cp ${proguardGradleJAR} net/sf/proguard/proguard-gradle/${proguardVersion}/proguard-gradle-${proguardVersion}.jar
+      mkdir -p net/sf/proguard/proguard-parent/${proguardVersion}
+      cp ${proguardParentPOM} net/sf/proguard/proguard-parent/${proguardVersion}/proguard-parent-${proguardVersion}.pom
+      mkdir -p net/sf/proguard/proguard-base/${proguardVersion}
+      cp ${proguardBasePOM} net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.pom
+      cp ${proguardBaseJAR} net/sf/proguard/proguard-base/${proguardVersion}/proguard-base-${proguardVersion}.jar
+    '';
+  };
+in
+stdenv.mkDerivation {
+  name = "mobilesdk-7.1.0.GA";
+  src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl {
+    url = http://builds.appcelerator.com/mobile/7_1_X/mobilesdk-7.1.0.v20180314133955-linux.zip;
+    sha256 = "18b3jnr65sdn5wj191bcl48gvhyklxmighxakv4vrz1fb59kyvqn";
+  }
+  else if stdenv.system == "x86_64-darwin" then fetchurl {
+    url = http://builds.appcelerator.com/mobile/7_1_X/mobilesdk-7.1.0.v20180314133955-osx.zip;
+    sha256 = "1f62616biwsw1fqxz2sq7lpa6bsfjazffliplyf5dpnh298cnc1m";
+  }
+  else throw "Platform: ${stdenv.system} not supported!";
+
+  buildInputs = [ unzip makeWrapper ];
+
+  buildCommand = ''
+    mkdir -p $out
+    cd $out
+    (yes y | unzip $src) || true
+
+    # Rename ugly version number
+    cd mobilesdk/*
+    mv * 7.1.0.GA
+    cd *
+
+    # Patch bundled gradle build infrastructure to make shebangs work
+    patchShebangs android/templates/gradle
+
+    # Substitute the gradle-all zip URL by a local file to prevent downloads from happening while building an Android app
+    sed -i -e "s|distributionUrl=|#distributionUrl=|" android/templates/gradle/gradle/wrapper/gradle-wrapper.properties
+    cp ${gradleAllZip} android/templates/gradle/gradle/wrapper/gradle-4.1-all.zip
+    echo "distributionUrl=gradle-4.1-all.zip" >> android/templates/gradle/gradle/wrapper/gradle-wrapper.properties
+
+    # Patch maven central repository with our own local directory. This prevents the builder from downloading Maven artifacts
+    sed -i -e 's|mavenCentral()|maven { url "${fakeMavenRepo}" }|' android/templates/build/proguard.gradle
+
+    # Patch some executables
+
+    ${if stdenv.system == "i686-linux" then
+      ''
+        patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 android/titanium_prep.linux32
+      ''
+      else if stdenv.system == "x86_64-linux" then
+      ''
+        patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 android/titanium_prep.linux64
+      ''
+      else ""}
+  '';
+}

From 6e78005ef1de6dca89abc6df4877722cc3ed841a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 20 Mar 2018 11:04:43 +0100
Subject: [PATCH 029/123] pythonPackages.django_pipeline: 1.5.1 -> 1.6.14

---
 .../django-pipeline/default.nix               | 30 ++++++++++++++-----
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/django-pipeline/default.nix b/pkgs/development/python-modules/django-pipeline/default.nix
index f29ae365877..58e9d746b97 100644
--- a/pkgs/development/python-modules/django-pipeline/default.nix
+++ b/pkgs/development/python-modules/django-pipeline/default.nix
@@ -1,16 +1,32 @@
-{ lib, buildPythonPackage, fetchPypi
-, django, futures }:
+{ lib, buildPythonPackage, fetchFromGitHub, isPy3k
+, django, futures, mock, jinja2, jsmin, slimit }:
 
 buildPythonPackage rec {
   pname = "django-pipeline";
-  version = "1.5.1";
+  version = "1.6.14";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1y49fa8jj7x9qjj5wzhns3zxwj0s73sggvkrv660cqw5qb7d8hha";
+  # no tests on PyPI
+  src = fetchFromGitHub {
+    owner = "jazzband";
+    repo = pname;
+    rev = version;
+    sha256 = "1xf732bd17mgha75jfhlnms46ib2pffhpfa0ca7bmng9jhbvsl9j";
   };
 
-  propagatedBuildInputs = [ django futures ];
+  postPatch = ''
+    substituteInPlace tests/tests/test_compiler.py \
+      --replace "/usr/bin/env" ""
+  '';
+
+  propagatedBuildInputs = [ django ] ++ lib.optional (!isPy3k) futures;
+
+  checkInputs = [ jinja2 jsmin slimit ] ++ lib.optional (!isPy3k) mock;
+
+  checkPhase = ''
+    export PYTHONPATH=.:$PYTHONPATH
+    export DJANGO_SETTINGS_MODULE=tests.settings
+    ${django}/bin/django-admin.py test tests
+  '';
 
   meta = with lib; {
     description = "Pipeline is an asset packaging library for Django";

From fbff08f2f213c8cb09f845f8c4d8bfd40eff2699 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 20 Mar 2018 11:20:13 +0100
Subject: [PATCH 030/123] pythonPackages.{reviewboard,djblets}: uninit

Djblets is unmaintained: has not been updated since 2015, but had many releases.
Dependency django_pipeline_1_3 is broken and should anyway be removed from pythonPackages because we want to have a consistent package set.
Because the reviewboard package also hasn't been updated since 2015 and depends on djblets, it is removed as well.
---
 pkgs/top-level/python-packages.nix | 50 ------------------------------
 1 file changed, 50 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 96d3cd2f75e..5a5012f10d1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6885,35 +6885,6 @@ in {
 
   django_pipeline = callPackage ../development/python-modules/django-pipeline { };
 
-  django_pipeline_1_3 = self.django_pipeline.overrideDerivation (super: rec {
-    name = "django-pipeline-1.3.27";
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/d/django-pipeline/${name}.tar.gz";
-      sha256 = "0iva3cmnh5jw54c7w83nx9nqv523hjvkbjchzd2pb6vzilxf557k";
-    };
-  });
-
-
-  djblets = if (versionOlder self.django.version "1.6.11") ||
-               (versionAtLeast self.django.version "1.9")
-            then throw "djblets only suported for Django<1.8.999,>=1.6.11"
-            else buildPythonPackage rec {
-    name = "Djblets-0.9";
-
-    src = pkgs.fetchurl {
-      url = "http://downloads.reviewboard.org/releases/Djblets/0.9/${name}.tar.gz";
-      sha256 = "1rr5vjwiiw3kih4k9nawislf701l838dbk5xgizadvwp6lpbpdpl";
-    };
-
-    propagatedBuildInputs = with self; [
-      django feedparser django_pipeline_1_3 pillowfight pytz ];
-
-    meta = {
-      description = "A collection of useful extensions for Django";
-      homepage = https://github.com/djblets/djblets;
-    };
-  };
-
   dj-database-url = callPackage ../development/python-modules/dj-database-url { };
 
   djmail = callPackage ../development/python-modules/djmail { };
@@ -14404,27 +14375,6 @@ in {
 
   django-multiselectfield = callPackage ../development/python-modules/django-multiselectfield { };
 
-  reviewboard = buildPythonPackage rec {
-    name = "ReviewBoard-2.5.1.1";
-
-    src = pkgs.fetchurl {
-      url = "http://downloads.reviewboard.org/releases/ReviewBoard/2.5/${name}.tar.gz";
-      sha256 = "14m8yy2aqxnnzi822b797wc9nmkfkp2fqmq24asdnm66bxhyzjwn";
-    };
-
-    patchPhase = ''
-      sed -i 's/mimeparse/python-mimeparse/' setup.py
-      sed -i 's/markdown>=2.4.0,<2.4.999/markdown/' setup.py
-    '';
-
-    propagatedBuildInputs = with self;
-      [ django recaptcha_client pytz memcached dateutil_1_5 paramiko flup
-        pygments djblets django_evolution pycrypto pysvn pillow
-        psycopg2 django-haystack python_mimeparse markdown django-multiselectfield
-      ];
-  };
-
-
   rdflib = callPackage ../development/python-modules/rdflib { };
 
   isodate = buildPythonPackage rec {

From 061e79806e35b6477d67a9c9ba6b3ed997b4572b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 20 Mar 2018 11:38:02 +0100
Subject: [PATCH 031/123] pythonPackages.stem: move expression

---
 .../python-modules/stem/default.nix            | 18 ++++++++++++++++++
 pkgs/top-level/python-packages.nix             | 18 +-----------------
 2 files changed, 19 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/development/python-modules/stem/default.nix

diff --git a/pkgs/development/python-modules/stem/default.nix b/pkgs/development/python-modules/stem/default.nix
new file mode 100644
index 00000000000..68ad178bd4b
--- /dev/null
+++ b/pkgs/development/python-modules/stem/default.nix
@@ -0,0 +1,18 @@
+{ lib, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "stem";
+  version = "1.6.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1va9p3ij7lxg6ixfsvaql06dn11l3fgpxmss1dhlvafm7sqizznp";
+  };
+
+  meta = with lib; {
+    description = "Controller library that allows applications to interact with Tor";
+    homepage = https://stem.torproject.org/;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ phreedom ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5a5012f10d1..431ae02c9fd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6324,23 +6324,7 @@ in {
 
   schema = callPackage ../development/python-modules/schema {};
 
-  stem = buildPythonPackage rec {
-    name = "stem-${version}";
-    version = "1.6.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/s/stem/${name}.tar.gz";
-      sha256 = "1va9p3ij7lxg6ixfsvaql06dn11l3fgpxmss1dhlvafm7sqizznp";
-    };
-
-    meta = {
-      description = "Controller library that allows applications to interact with Tor (https://www.torproject.org/";
-      homepage = https://stem.torproject.org/;
-      license = licenses.gpl3;
-      maintainers = with maintainers; [ phreedom ];
-    };
-
-  };
+  stem = callPackage ../development/python-modules/stem { };
 
   svg-path = buildPythonPackage rec {
     name = "svg.path-${version}";

From 685dd8d21db16ffb3d8888f4f9cd5e6d5dd3c6c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 20 Mar 2018 12:06:31 +0100
Subject: [PATCH 032/123] pythonPackages.stem: run unit tests

---
 pkgs/development/python-modules/stem/default.nix | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/stem/default.nix b/pkgs/development/python-modules/stem/default.nix
index 68ad178bd4b..1df139ab29c 100644
--- a/pkgs/development/python-modules/stem/default.nix
+++ b/pkgs/development/python-modules/stem/default.nix
@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi }:
+{ lib, buildPythonPackage, fetchPypi, python, mock }:
 
 buildPythonPackage rec {
   pname = "stem";
@@ -9,6 +9,18 @@ buildPythonPackage rec {
     sha256 = "1va9p3ij7lxg6ixfsvaql06dn11l3fgpxmss1dhlvafm7sqizznp";
   };
 
+  postPatch = ''
+    rm test/unit/installation.py
+    sed -i "/test.unit.installation/d" test/settings.cfg
+  '';
+
+  checkInputs = [ mock ];
+
+  checkPhase = ''
+    touch .gitignore
+    ${python.interpreter} run_tests.py -u
+  '';
+
   meta = with lib; {
     description = "Controller library that allows applications to interact with Tor";
     homepage = https://stem.torproject.org/;

From 12695be641abb28ba4abb42b331431b143938a9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 20 Mar 2018 12:22:32 +0100
Subject: [PATCH 033/123] pythonPackages.zope_copy: 4.0.2 -> 4.1.0

---
 .../python-modules/zope_copy/default.nix            | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/zope_copy/default.nix b/pkgs/development/python-modules/zope_copy/default.nix
index 305928c1846..6bd7ae33fb9 100644
--- a/pkgs/development/python-modules/zope_copy/default.nix
+++ b/pkgs/development/python-modules/zope_copy/default.nix
@@ -8,20 +8,23 @@
 
 
 buildPythonPackage rec {
-  pname = "zope_copy";
-  version = "4.0.2";
+  pname = "zope.copy";
+  version = "4.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    extension = "zip";
-    sha256 = "eb2a95866df1377741876a3ee62d8600e80089e6246e1a235e86791b29534457";
+    sha256 = "702dbb52e2427a1cc2e2b4b3f5a40c64dcbf9ebed85888ae8fa67172263a6994";
   };
 
   propagatedBuildInputs = [ zope_interface ];
 
   checkInputs = [ zope_location zope_schema ];
 
+  checkPhase = ''
+    python -m unittest discover -s src/zope/copy
+  '';
+
   meta = {
     maintainers = with lib.maintainers; [ domenkozar ];
   };
-}
\ No newline at end of file
+}

From a1b9cc79386a0c41789e4bbb6af8ee9ac1472bd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 20 Mar 2018 12:38:29 +0100
Subject: [PATCH 034/123] pythonPackages.deform: move expression

---
 .../python-modules/deform/default.nix         | 31 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 27 +---------------
 2 files changed, 32 insertions(+), 26 deletions(-)
 create mode 100644 pkgs/development/python-modules/deform/default.nix

diff --git a/pkgs/development/python-modules/deform/default.nix b/pkgs/development/python-modules/deform/default.nix
new file mode 100644
index 00000000000..60b8c0814c8
--- /dev/null
+++ b/pkgs/development/python-modules/deform/default.nix
@@ -0,0 +1,31 @@
+{ lib, buildPythonPackage, fetchPypi
+, beautifulsoup4, peppercorn, colander, translationstring
+, chameleon, zope_deprecation, coverage, nose }:
+
+buildPythonPackage rec {
+  pname = "deform";
+  version = "2.0a2";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "3fa4d287c8da77a83556e4a5686de006ddd69da359272120b915dc8f5a70cabd";
+  };
+
+  propagatedBuildInputs = [
+    beautifulsoup4
+    peppercorn
+    colander
+    translationstring
+    chameleon
+    zope_deprecation
+    coverage
+    nose
+  ];
+
+  meta = with lib; {
+    description = "Form library with advanced features like nested forms";
+    homepage = https://docs.pylonsproject.org/projects/deform/en/latest/;
+    license = licenses.free; # http://www.repoze.org/LICENSE.txt
+    maintainers = with maintainers; [ garbas domenkozar ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 431ae02c9fd..81740f34e52 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3651,32 +3651,7 @@ in {
 
   decorator = callPackage ../development/python-modules/decorator { };
 
-  deform = buildPythonPackage rec {
-    name = "deform-2.0a2";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/d/deform/${name}.tar.gz";
-      sha256 = "3fa4d287c8da77a83556e4a5686de006ddd69da359272120b915dc8f5a70cabd";
-    };
-
-    buildInputs = with self; [] ++ optional isPy26 unittest2;
-
-    propagatedBuildInputs =
-      [ self.beautifulsoup4
-        self.peppercorn
-        self.colander
-        self.translationstring
-        self.chameleon
-        self.zope_deprecation
-        self.coverage
-        self.nose
-      ];
-
-    meta = {
-      maintainers = with maintainers; [ garbas domenkozar ];
-      platforms = platforms.all;
-    };
-  };
+  deform = callPackage ../development/python-modules/deform { };
 
   demjson = callPackage ../development/python-modules/demjson { };
 

From 86f21360acb0319509536164046da918d0002dff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 20 Mar 2018 12:44:08 +0100
Subject: [PATCH 035/123] pythonPackages.deform: 2.0.a2 -> 2.0.5

---
 .../python-modules/deform/default.nix         | 28 +++++++++++++------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/deform/default.nix b/pkgs/development/python-modules/deform/default.nix
index 60b8c0814c8..53286b38722 100644
--- a/pkgs/development/python-modules/deform/default.nix
+++ b/pkgs/development/python-modules/deform/default.nix
@@ -1,25 +1,35 @@
 { lib, buildPythonPackage, fetchPypi
-, beautifulsoup4, peppercorn, colander, translationstring
-, chameleon, zope_deprecation, coverage, nose }:
+, chameleon, colander, iso8601, peppercorn, translationstring, zope_deprecation
+, nose, coverage, beautifulsoup4, flaky }:
 
 buildPythonPackage rec {
   pname = "deform";
-  version = "2.0a2";
+  version = "2.0.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "3fa4d287c8da77a83556e4a5686de006ddd69da359272120b915dc8f5a70cabd";
+    sha256 = "874d3346a02c500432efdcc73b1a7174aa0ea69cd52a99bb9a812967f54f6f79";
   };
 
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "iso8601<=0.1.11" iso8601
+  '';
+
   propagatedBuildInputs = [
-    beautifulsoup4
-    peppercorn
-    colander
-    translationstring
     chameleon
+    colander
+    iso8601
+    peppercorn
+    translationstring
     zope_deprecation
-    coverage
+  ];
+
+  checkInputs = [
     nose
+    coverage
+    beautifulsoup4
+    flaky
   ];
 
   meta = with lib; {

From 86e007bd31391c4bddf6c1610aa3fb2538896861 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 20 Mar 2018 12:55:22 +0100
Subject: [PATCH 036/123] pythonPackages.klein: move expression

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

diff --git a/pkgs/development/python-modules/klein/default.nix b/pkgs/development/python-modules/klein/default.nix
new file mode 100644
index 00000000000..f4748a93277
--- /dev/null
+++ b/pkgs/development/python-modules/klein/default.nix
@@ -0,0 +1,21 @@
+{ lib, buildPythonPackage, fetchPypi, isPy3k, werkzeug, twisted }:
+
+buildPythonPackage rec {
+  pname = "klein";
+  version = "15.3.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1hl2psnn1chm698rimyn9dgcpl1mxgc8dj11b3ipp8z37yfjs3z9";
+  };
+
+  disabled = isPy3k;
+
+  propagatedBuildInputs = [ werkzeug twisted ];
+
+  meta = with lib; {
+    description = "Klein Web Micro-Framework";
+    homepage    = "https://github.com/twisted/klein";
+    license     = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 81740f34e52..246f92e8e73 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8835,24 +8835,8 @@ in {
 
   keyutils = callPackage ../development/python-modules/keyutils { };
 
-  klein = buildPythonPackage rec {
-    name = "klein-15.3.1";
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/k/klein/${name}.tar.gz";
-      sha256 = "1hl2psnn1chm698rimyn9dgcpl1mxgc8dj11b3ipp8z37yfjs3z9";
-    };
-
-    disabled = isPy3k;
-
-    propagatedBuildInputs = with self; [ werkzeug twisted ];
-
-    meta = {
-      description = "Klein Web Micro-Framework";
-      homepage    = "https://github.com/twisted/klein";
-      license     = licenses.mit;
-    };
-  };
-
+  klein = callPackage ../development/python-modules/klein { };
+ 
   koji = callPackage ../development/python-modules/koji { };
 
   kombu = buildPythonPackage rec {

From b34af91889356f815156adf9dd13263ded5ab773 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 20 Mar 2018 13:04:04 +0100
Subject: [PATCH 037/123] pythonPackages.klein: 15.3.1 -> 17.10.0

---
 .../development/python-modules/klein/default.nix | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/klein/default.nix b/pkgs/development/python-modules/klein/default.nix
index f4748a93277..3dfbb4e17db 100644
--- a/pkgs/development/python-modules/klein/default.nix
+++ b/pkgs/development/python-modules/klein/default.nix
@@ -1,17 +1,23 @@
-{ lib, buildPythonPackage, fetchPypi, isPy3k, werkzeug, twisted }:
+{ lib, buildPythonPackage, fetchPypi
+, six, twisted, werkzeug, incremental
+, mock }:
 
 buildPythonPackage rec {
   pname = "klein";
-  version = "15.3.1";
+  version = "17.10.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1hl2psnn1chm698rimyn9dgcpl1mxgc8dj11b3ipp8z37yfjs3z9";
+    sha256 = "30aaf0d78a987d5dbfe0968a07367ad0c73e02823cc8eef4c54f80ab848370d0";
   };
 
-  disabled = isPy3k;
+  propagatedBuildInputs = [ six twisted werkzeug incremental ];
 
-  propagatedBuildInputs = [ werkzeug twisted ];
+  checkInputs = [ mock ];
+
+  checkPhase = ''
+    trial klein
+  '';
 
   meta = with lib; {
     description = "Klein Web Micro-Framework";

From 3d989e3d7a27c0c01f97ee5817f5dd1223f13f93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 20 Mar 2018 14:30:01 +0100
Subject: [PATCH 038/123] pythonPackages.astropy: disable for python 2

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

diff --git a/pkgs/development/python-modules/astropy/default.nix b/pkgs/development/python-modules/astropy/default.nix
index ccf988fc56d..4ff4841cf5f 100644
--- a/pkgs/development/python-modules/astropy/default.nix
+++ b/pkgs/development/python-modules/astropy/default.nix
@@ -1,16 +1,18 @@
 { lib
 , fetchPypi
 , buildPythonPackage
+, isPy3k
 , numpy
 , pytest }:
 
 buildPythonPackage rec {
-  
   pname = "astropy";
   version = "3.0";
 
-  name = "${pname}-${version}";
+  disabled = !isPy3k; # according to setup.py
+
   doCheck = false; #Some tests are failing. More importantly setup.py hangs on completion. Needs fixing with a proper shellhook.
+
   src = fetchPypi {
     inherit pname version;
     sha256 = "9e0ad19b9d6d227bdf0932bbe64a8c5dd4a47d4ec078586cf24bf9f0c61d9ecf";
@@ -18,7 +20,6 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ pytest numpy ]; # yes it really has pytest in install_requires
 
-
   meta = {
     description = "Astronomy/Astrophysics library for Python";
     homepage = http://www.astropy.org;

From 9f54b031fdbda6ebf71fb92222537786039abc75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 20 Mar 2018 15:40:43 +0100
Subject: [PATCH 039/123] pythonPackages.WSME: move expression

---
 .../python-modules/WSME/default.nix           | 40 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 29 +-------------
 2 files changed, 41 insertions(+), 28 deletions(-)
 create mode 100644 pkgs/development/python-modules/WSME/default.nix

diff --git a/pkgs/development/python-modules/WSME/default.nix b/pkgs/development/python-modules/WSME/default.nix
new file mode 100644
index 00000000000..fc2b066ce1e
--- /dev/null
+++ b/pkgs/development/python-modules/WSME/default.nix
@@ -0,0 +1,40 @@
+{ lib, buildPythonPackage, fetchPypi, isPy3k
+, pbr, six, simplegeneric, netaddr, pytz, webob
+, cornice, nose, webtest, pecan, transaction, cherrypy, sphinx }:
+
+buildPythonPackage rec {
+  pname = "WSME";
+  version = "0.8.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1nw827iz5g9jlfnfbdi8kva565v0kdjzba2lccziimj09r71w900";
+  };
+
+  checkPhase = ''
+    # remove turbogears tests as we don't have it packaged
+    rm tests/test_tg*
+    # remove flask since we don't have flask-restful
+    rm tests/test_flask*
+    # https://bugs.launchpad.net/wsme/+bug/1510823
+    ${if isPy3k then "rm tests/test_cornice.py" else ""}
+
+    nosetests tests/
+  '';
+
+  nativeBuildInputs = [ pbr ];
+
+  propagatedBuildInputs = [
+    six simplegeneric netaddr pytz webob
+  ];
+
+  checkInputs = [
+    cornice nose webtest pecan transaction cherrypy sphinx
+  ];
+
+  meta = with lib; {
+    description = "Simplify the writing of REST APIs, and extend them with additional protocols";
+    homepage = http://git.openstack.org/cgit/openstack/wsme;
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 246f92e8e73..54ec6192016 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11165,34 +11165,7 @@ in {
     };
   };
 
-  WSME = buildPythonPackage rec {
-    name = "WSME-${version}";
-    version = "0.8.0";
-
-    src = pkgs.fetchurl {
-      url = "mirror://pypi/W/WSME/${name}.tar.gz";
-      sha256 = "1nw827iz5g9jlfnfbdi8kva565v0kdjzba2lccziimj09r71w900";
-    };
-
-    checkPhase = ''
-      # remove turbogears tests as we don't have it packaged
-      rm tests/test_tg*
-      # remove flask since we don't have flask-restful
-      rm tests/test_flask*
-      # https://bugs.launchpad.net/wsme/+bug/1510823
-      ${if isPy3k then "rm tests/test_cornice.py" else ""}
-
-      nosetests tests/
-    '';
-
-    propagatedBuildInputs = with self; [
-      pbr six simplegeneric netaddr pytz webob
-    ];
-    buildInputs = with self; [
-      cornice nose webtest pecan transaction cherrypy sphinx
-    ];
-  };
-
+  WSME = callPackage ../development/python-modules/WSME { };
 
   zake = buildPythonPackage rec {
     name = "zake-${version}";

From 2773b76f33549f68ca53e4d9f0457314ce87f9e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 20 Mar 2018 16:13:38 +0100
Subject: [PATCH 040/123] pythonPackages.WSME: 0.8.0 -> 0.9.2

---
 .../python-modules/WSME/default.nix           | 25 +++++++++++++------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/WSME/default.nix b/pkgs/development/python-modules/WSME/default.nix
index fc2b066ce1e..8cbbd2c767f 100644
--- a/pkgs/development/python-modules/WSME/default.nix
+++ b/pkgs/development/python-modules/WSME/default.nix
@@ -1,27 +1,35 @@
 { lib, buildPythonPackage, fetchPypi, isPy3k
 , pbr, six, simplegeneric, netaddr, pytz, webob
-, cornice, nose, webtest, pecan, transaction, cherrypy, sphinx }:
+, cornice, nose, webtest, pecan, transaction, cherrypy, sphinx
+, flask, flask-restful, suds-jurko, glibcLocales }:
 
 buildPythonPackage rec {
   pname = "WSME";
-  version = "0.8.0";
+  version = "0.9.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1nw827iz5g9jlfnfbdi8kva565v0kdjzba2lccziimj09r71w900";
+    sha256 = "e790ac755a7e36eaa796d3966d3878677896dbc7d1c2685cb85c06b744c21976";
   };
 
-  checkPhase = ''
+  postPatch = ''
     # remove turbogears tests as we don't have it packaged
     rm tests/test_tg*
-    # remove flask since we don't have flask-restful
-    rm tests/test_flask*
+    # WSME seems incompatible with recent SQLAlchemy version
+    rm wsmeext/tests/test_sqlalchemy*
     # https://bugs.launchpad.net/wsme/+bug/1510823
     ${if isPy3k then "rm tests/test_cornice.py" else ""}
-
-    nosetests tests/
   '';
 
+  checkPhae = ''
+    nosetests --exclude test_buildhtml \
+              --exlcude test_custom_clientside_error \
+              --exclude test_custom_non_http_clientside_error
+  '';
+
+  # UnicodeEncodeError, ImportError, ...
+  doCheck = !isPy3k;
+
   nativeBuildInputs = [ pbr ];
 
   propagatedBuildInputs = [
@@ -30,6 +38,7 @@ buildPythonPackage rec {
 
   checkInputs = [
     cornice nose webtest pecan transaction cherrypy sphinx
+    flask flask-restful suds-jurko glibcLocales
   ];
 
   meta = with lib; {

From 43d822178bc933bc5dce38d4ff71b50dab081758 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Tue, 20 Mar 2018 16:33:08 +0100
Subject: [PATCH 041/123] pythonPackages.altair: fix build

---
 pkgs/development/python-modules/altair/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/altair/default.nix b/pkgs/development/python-modules/altair/default.nix
index d3cdc0f43f2..d98eba693d2 100644
--- a/pkgs/development/python-modules/altair/default.nix
+++ b/pkgs/development/python-modules/altair/default.nix
@@ -1,17 +1,20 @@
 { stdenv, buildPythonPackage, fetchPypi
-, pytest, vega, pandas, ipython, traitlets }:
+, pytest, glibcLocales, vega, pandas, ipython, traitlets }:
 
 buildPythonPackage rec {
   pname = "altair";
   version = "1.2.1";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "c1303f77f1ba4d632f2958c83c0f457b2b969860b1ac9adfb872aefa1780baa7";
   };
 
-  buildInputs = [ pytest ];
+  postPatch = ''
+    sed -i "s/vega==/vega>=/g" setup.py
+  '';
+
+  checkInputs = [ pytest glibcLocales ];
 
   checkPhase = ''
     export LANG=en_US.UTF-8
@@ -19,8 +22,6 @@ buildPythonPackage rec {
   '';
 
   propagatedBuildInputs = [ vega pandas ipython traitlets ];
-  # Disabling checks, MockRequest object has no method send()
-  doCheck = false;
 
   meta = with stdenv.lib; {
     description = "A declarative statistical visualization library for Python.";

From 175d4ab1db65088c008e667f0423efbf325c179f Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 19 Mar 2018 22:14:45 -0400
Subject: [PATCH 042/123] lib: Make platform predicates greppable

Should have commited on here and on merged master to begin with, but I
didn't, so instead I cherry-pick.

(cherry picked from commit 88c04a8b6b6714a61c8a28ec8bbd5ecf580ed2c7)
---
 lib/systems/for-meta.nix | 28 ++++++++--------
 lib/systems/inspect.nix  | 70 +++++++++++++++++++---------------------
 2 files changed, 48 insertions(+), 50 deletions(-)

diff --git a/lib/systems/for-meta.nix b/lib/systems/for-meta.nix
index 0a7a4bf5b0c..fa713b1e613 100644
--- a/lib/systems/for-meta.nix
+++ b/lib/systems/for-meta.nix
@@ -7,21 +7,21 @@ in rec {
   inherit (lib.systems.doubles) all mesaPlatforms;
   none = [];
 
-  arm     = [ patterns.Arm ];
-  aarch64 = [ patterns.Aarch64 ];
-  x86     = [ patterns.x86 ];
-  i686    = [ patterns.i686 ];
-  x86_64  = [ patterns.x86_64 ];
-  mips    = [ patterns.Mips ];
+  arm     = [ patterns.isArm ];
+  aarch64 = [ patterns.isAarch64 ];
+  x86     = [ patterns.isx86 ];
+  i686    = [ patterns.isi686 ];
+  x86_64  = [ patterns.isx86_64 ];
+  mips    = [ patterns.isMips ];
 
-  cygwin  = [ patterns.Cygwin ];
-  darwin  = [ patterns.Darwin ];
-  freebsd = [ patterns.FreeBSD ];
+  cygwin  = [ patterns.isCygwin ];
+  darwin  = [ patterns.isDarwin ];
+  freebsd = [ patterns.isFreeBSD ];
   # Should be better, but MinGW is unclear, and HURD is bit-rotted.
   gnu     = [ { kernel = parse.kernels.linux; abi = parse.abis.gnu; } ];
-  illumos = [ patterns.SunOS ];
-  linux   = [ patterns.Linux ];
-  netbsd  = [ patterns.NetBSD ];
-  openbsd = [ patterns.OpenBSD ];
-  unix    = patterns.Unix; # Actually a list
+  illumos = [ patterns.isSunOS ];
+  linux   = [ patterns.isLinux ];
+  netbsd  = [ patterns.isNetBSD ];
+  openbsd = [ patterns.isOpenBSD ];
+  unix    = patterns.isUnix; # Actually a list
 }
diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix
index ab220af46e3..a7bd17f68a4 100644
--- a/lib/systems/inspect.nix
+++ b/lib/systems/inspect.nix
@@ -5,51 +5,49 @@ with lib.lists;
 
 rec {
   patterns = rec {
-    i686         = { cpu = cpuTypes.i686; };
-    x86_64       = { cpu = cpuTypes.x86_64; };
-    PowerPC      = { cpu = cpuTypes.powerpc; };
-    x86          = { cpu = { family = "x86"; }; };
-    Arm          = { cpu = { family = "arm"; }; };
-    Aarch64      = { cpu = { family = "aarch64"; }; };
-    Mips         = { cpu = { family = "mips"; }; };
-    RiscV        = { cpu = { family = "riscv"; }; };
-    Wasm         = { cpu = { family = "wasm"; }; };
+    isi686         = { cpu = cpuTypes.i686; };
+    isx86_64       = { cpu = cpuTypes.x86_64; };
+    isPowerPC      = { cpu = cpuTypes.powerpc; };
+    isx86          = { cpu = { family = "x86"; }; };
+    isArm          = { cpu = { family = "arm"; }; };
+    isAarch64      = { cpu = { family = "aarch64"; }; };
+    isMips         = { cpu = { family = "mips"; }; };
+    isRiscV        = { cpu = { family = "riscv"; }; };
+    isWasm         = { cpu = { family = "wasm"; }; };
 
-    "32bit"      = { cpu = { bits = 32; }; };
-    "64bit"      = { cpu = { bits = 64; }; };
-    BigEndian    = { cpu = { significantByte = significantBytes.bigEndian; }; };
-    LittleEndian = { cpu = { significantByte = significantBytes.littleEndian; }; };
+    is32bit        = { cpu = { bits = 32; }; };
+    is64bit        = { cpu = { bits = 64; }; };
+    isBigEndian    = { cpu = { significantByte = significantBytes.bigEndian; }; };
+    isLittleEndian = { cpu = { significantByte = significantBytes.littleEndian; }; };
 
-    BSD          = { kernel = { families = { inherit (kernelFamilies) bsd; }; }; };
-    Unix         = [ BSD Darwin Linux SunOS Hurd Cygwin ];
+    isBSD          = { kernel = { families = { inherit (kernelFamilies) bsd; }; }; };
+    isUnix         = [ isBSD isDarwin isLinux isSunOS isHurd isCygwin ];
 
-    Darwin       = { kernel = kernels.darwin; };
-    Linux        = { kernel = kernels.linux; };
-    SunOS        = { kernel = kernels.solaris; };
-    FreeBSD      = { kernel = kernels.freebsd; };
-    Hurd         = { kernel = kernels.hurd; };
-    NetBSD       = { kernel = kernels.netbsd; };
-    OpenBSD      = { kernel = kernels.openbsd; };
-    Windows      = { kernel = kernels.windows; };
-    Cygwin       = { kernel = kernels.windows; abi = abis.cygnus; };
-    MinGW        = { kernel = kernels.windows; abi = abis.gnu; };
+    isDarwin       = { kernel = kernels.darwin; };
+    isLinux        = { kernel = kernels.linux; };
+    isSunOS        = { kernel = kernels.solaris; };
+    isFreeBSD      = { kernel = kernels.freebsd; };
+    isHurd         = { kernel = kernels.hurd; };
+    isNetBSD       = { kernel = kernels.netbsd; };
+    isOpenBSD      = { kernel = kernels.openbsd; };
+    isWindows      = { kernel = kernels.windows; };
+    isCygwin       = { kernel = kernels.windows; abi = abis.cygnus; };
+    isMinGW        = { kernel = kernels.windows; abi = abis.gnu; };
 
-    Android      = [ { abi = abis.android; } { abi = abis.androideabi; } ];
-    Musl         = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf ];
+    isAndroid      = [ { abi = abis.android; } { abi = abis.androideabi; } ];
+    isMusl         = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf ];
 
-    Kexecable    = map (family: { kernel = kernels.linux; cpu.family = family; })
-                     [ "x86" "arm" "aarch64" "mips" ];
-    Efi          = map (family: { cpu.family = family; })
-                     [ "x86" "arm" "aarch64" ];
-    Seccomputable = map (family: { kernel = kernels.linux; cpu.family = family; })
-                      [ "x86" "arm" "aarch64" "mips" ];
+    isKexecable    = map (family: { kernel = kernels.linux; cpu.family = family; })
+                       [ "x86" "arm" "aarch64" "mips" ];
+    isEfi          = map (family: { cpu.family = family; })
+                       [ "x86" "arm" "aarch64" ];
+    isSeccomputable = map (family: { kernel = kernels.linux; cpu.family = family; })
+                        [ "x86" "arm" "aarch64" "mips" ];
   };
 
   matchAnyAttrs = patterns:
     if builtins.isList patterns then attrs: any (pattern: matchAttrs pattern attrs) patterns
     else matchAttrs patterns;
 
-  predicates = mapAttrs'
-    (name: value: nameValuePair ("is" + name) (matchAnyAttrs value))
-    patterns;
+  predicates = mapAttrs (_: matchAnyAttrs) patterns;
 }

From c234c01de04ca3e2cff5b126a536f42ab9e0ba95 Mon Sep 17 00:00:00 2001
From: Ken Micklas <kmicklas@gmail.com>
Date: Fri, 16 Mar 2018 15:03:15 -0400
Subject: [PATCH 043/123] zoom-us: add desktop item

---
 .../instant-messengers/zoom-us/default.nix         | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
index e13f0001f02..49311bc5930 100644
--- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, system, makeWrapper,
+{ stdenv, fetchurl, system, makeWrapper, makeDesktopItem,
   alsaLib, dbus, glib, gstreamer, fontconfig, freetype, libpulseaudio, libxml2,
   libxslt, libGLU_combined, nspr, nss, sqlite, utillinux, zlib, xorg, udev, expat, libv4l }:
 
@@ -88,9 +88,19 @@ in stdenv.mkDerivation {
     Prefix = $packagePath
     EOF
 
-    $postInstallHooks
+    runHook postInstall
   '';
 
+  postInstall = (makeDesktopItem {
+    name = "zoom-us";
+    exec = "$out/bin/zoom-us %U";
+    icon = "$out/share/zoom-us/application-x-zoom.png";
+    desktopName = "Zoom";
+    genericName = "Video Conference";
+    categories = "Network;Application;";
+    mimeType = "x-scheme-handler/zoommtg;";
+  }).buildCommand;
+
   meta = {
     homepage = https://zoom.us/;
     description = "zoom.us video conferencing application";

From 5532cc1641c0d2f2dae2893e5980861bb4fd8062 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Tue, 20 Mar 2018 17:39:45 +0100
Subject: [PATCH 044/123] titaniumenv: remove obsolete java fix wrapper on
 darwin

---
 .../mobile/titaniumenv/build-app.nix          | 31 +------------------
 1 file changed, 1 insertion(+), 30 deletions(-)

diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix
index 25713a1b88b..a6bf05c2465 100644
--- a/pkgs/development/mobile/titaniumenv/build-app.nix
+++ b/pkgs/development/mobile/titaniumenv/build-app.nix
@@ -15,34 +15,12 @@ let
     abiVersions = androidAbiVersions;
     useGoogleAPIs = true;
   };
-  
+
   deleteKeychain = ''
     security default-keychain -s login.keychain
     security delete-keychain $keychainName
     rm -f $HOME/lock-keychain
   '';
-  
-  # On macOS, the java executable shows an -unoffical postfix in the version
-  # number. This confuses the build script's version detector.
-  # We fix this by creating a wrapper that strips it out of the output.
-  
-  javaVersionFixWrapper = stdenv.mkDerivation {
-    name = "javaVersionFixWrapper";
-    buildCommand = ''
-      mkdir -p $out/bin
-      cat > $out/bin/javac <<EOF
-      #! ${stdenv.shell} -e
-      
-      if [ "\$1" = "-version" ]
-      then
-          ${jdk}/bin/javac "\$@" 2>&1 | sed "s|-unofficial||" | sed "s|-u60|_60|" >&2
-      else
-          exec ${jdk}/bin/javac "\$@"
-      fi
-      EOF
-      chmod +x $out/bin/javac
-    '';
-  };
 in
 stdenv.mkDerivation {
   name = stdenv.lib.replaceChars [" "] [""] name;
@@ -74,13 +52,6 @@ stdenv.mkDerivation {
     
     ${if target == "android" then
         ''
-          ${stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") ''
-            # Hack to make version detection work with OpenJDK on macOS
-            export PATH=${javaVersionFixWrapper}/bin:$PATH
-            export JAVA_HOME=${javaVersionFixWrapper}
-            javac -version
-          ''}
-
           titanium config --config-file $TMPDIR/config.json --no-colors android.sdkPath ${androidsdkComposition}/libexec
 
           export PATH=$(echo ${androidsdkComposition}/libexec/tools):$(echo ${androidsdkComposition}/libexec/build-tools/android-*):$PATH

From 0e9d1fad4d42ef72f34140641804f16f6db8c198 Mon Sep 17 00:00:00 2001
From: Ken Micklas <kmicklas@gmail.com>
Date: Tue, 20 Mar 2018 12:40:04 -0400
Subject: [PATCH 045/123] zoom-us: fix preInstall

---
 .../networking/instant-messengers/zoom-us/default.nix           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
index 49311bc5930..03b4b980929 100644
--- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
+++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix
@@ -59,7 +59,7 @@ in stdenv.mkDerivation {
   ];
 
   installPhase = ''
-    $preInstallHooks
+    runHook preInstall
 
     packagePath=$out/share/zoom-us
     mkdir -p $packagePath

From 8add42f90c5457a256225469d4a6d865e967b87d Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Tue, 20 Mar 2018 16:40:35 +0000
Subject: [PATCH 046/123] nix-serve: patch for nix 2.0 (#37459)

Fixes incompatible secret file handling. See https://github.com/edolstra/nix-serve/pull/8
---
 pkgs/tools/package-management/nix-serve/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nix-serve/default.nix b/pkgs/tools/package-management/nix-serve/default.nix
index dadcab1ea4f..d03e6f614e5 100644
--- a/pkgs/tools/package-management/nix-serve/default.nix
+++ b/pkgs/tools/package-management/nix-serve/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchFromGitHub,
+{ stdenv, fetchFromGitHub, fetchpatch,
   bzip2, nix, perl, perlPackages,
 }:
 
 with stdenv.lib;
 
 let
-  rev = "7e09caa2a7a435aeb2cd5446aa590d6f9ae1699d";
-  sha256 = "0mjzsiknln3isdri9004wwjjjpak5fj8ncizyncf5jv7g4m4q1pj";
+  rev = "e4675e38ab54942e351c7686e40fabec822120b9";
+  sha256 = "1wm24p6pkxl1d7hrvf4ph6mwzawvqi22c60z9xzndn5xfyr4v0yr";
 in
 
 stdenv.mkDerivation rec {

From 3c8ae01a45196759cd01de639f0d200fdfcb6d77 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 20 Mar 2018 11:46:12 -0400
Subject: [PATCH 047/123] lib: Make `platforms.all` actually match all
 platforms

Otherwise obscure cross-compilations are hampered. `all` breaks all but
the initial derivation (which we can't even write yet) in an open world
setting however, so we really shouldn't have it.
---
 lib/systems/for-meta.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/systems/for-meta.nix b/lib/systems/for-meta.nix
index fa713b1e613..3402fa0ca19 100644
--- a/lib/systems/for-meta.nix
+++ b/lib/systems/for-meta.nix
@@ -4,8 +4,8 @@ let
   inherit (lib.systems.inspect) patterns;
 
 in rec {
-  inherit (lib.systems.doubles) all mesaPlatforms;
-  none = [];
+  all     = [ {} ]; # `{}` matches anything
+  none    = [];
 
   arm     = [ patterns.isArm ];
   aarch64 = [ patterns.isAarch64 ];
@@ -24,4 +24,6 @@ in rec {
   netbsd  = [ patterns.isNetBSD ];
   openbsd = [ patterns.isOpenBSD ];
   unix    = patterns.isUnix; # Actually a list
+
+  inherit (lib.systems.doubles) mesaPlatforms;
 }

From d9a1800239620425ef3608487f87002b1a4d1437 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 20 Mar 2018 12:31:07 -0400
Subject: [PATCH 048/123] lib: Add `lib.platforms.windows`

---
 lib/systems/for-meta.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/systems/for-meta.nix b/lib/systems/for-meta.nix
index 3402fa0ca19..63f24b46535 100644
--- a/lib/systems/for-meta.nix
+++ b/lib/systems/for-meta.nix
@@ -24,6 +24,7 @@ in rec {
   netbsd  = [ patterns.isNetBSD ];
   openbsd = [ patterns.isOpenBSD ];
   unix    = patterns.isUnix; # Actually a list
+  windows = [ patterns.isWindows ];
 
   inherit (lib.systems.doubles) mesaPlatforms;
 }

From 87420118242bf77e71e4d712db7416789b974699 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 20 Mar 2018 09:49:12 -0700
Subject: [PATCH 049/123] lazarus: 1.8.0 -> 1.8.2

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.8.2 with grep in /nix/store/z3r30kr064x672zqnrs1pwzshlvgnv9n-lazarus-1.8.2
- found 1.8.2 in filename of file in /nix/store/z3r30kr064x672zqnrs1pwzshlvgnv9n-lazarus-1.8.2
- directory tree listing: https://gist.github.com/895d2d01174298ff36a30bc7387286a2
---
 pkgs/development/compilers/fpc/lazarus.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix
index e646debd9d7..0793a9d7ed0 100644
--- a/pkgs/development/compilers/fpc/lazarus.nix
+++ b/pkgs/development/compilers/fpc/lazarus.nix
@@ -8,10 +8,10 @@ stdenv, fetchurl
 let
   s =
   rec {
-    version = "1.8.0";
+    version = "1.8.2";
     versionSuffix = "";
     url = "mirror://sourceforge/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20${version}/lazarus-${version}${versionSuffix}.tar.gz";
-    sha256 = "0i58ngrr1vjyazirfmz0cgikglc02z1m0gcrsfw9awpi3ax8h21j";
+    sha256 = "06ajdnyba3v3d37mjq1yim96hsmbx1w5n695m5zlhjbydgw62a15";
     name = "lazarus-${version}";
   };
   buildInputs = [

From e38d28840dabb21e53c73a44aa0089804f46955f Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 20 Mar 2018 09:53:14 -0700
Subject: [PATCH 050/123] lua51Packages.lgi: 0.9.1 -> 0.9.2

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.9.2 with grep in /nix/store/q6lcshhmi0dn8ndz2jz9nlircfww4fcm-lgi-0.9.2
- directory tree listing: https://gist.github.com/48d4d638fbd1169b1c96b7e506202b93
---
 pkgs/top-level/lua-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index 75f2ab9e582..0cc4482f402 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -696,13 +696,13 @@ let
 
   lgi = stdenv.mkDerivation rec {
     name = "lgi-${version}";
-    version = "0.9.1";
+    version = "0.9.2";
 
     src = fetchFromGitHub {
       owner = "pavouk";
       repo = "lgi";
       rev = version;
-      sha256 = "09pbapjhyc3sn0jgx747shqr9286wqfzw02h43p4pk8fv2b766b9";
+      sha256 = "03rbydnj411xpjvwsyvhwy4plm96481d7jax544mvk7apd8sd5jj";
     };
 
     nativeBuildInputs = [ pkgconfig ];

From e49c14c35b73d464d0b3070de7802ca309f7bb6b Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 20 Mar 2018 12:31:43 -0400
Subject: [PATCH 051/123] libatomic_ops: Allow Building on Windows too

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

diff --git a/pkgs/development/libraries/libatomic_ops/default.nix b/pkgs/development/libraries/libatomic_ops/default.nix
index fe4cd3ca0a9..04cf1c1e696 100644
--- a/pkgs/development/libraries/libatomic_ops/default.nix
+++ b/pkgs/development/libraries/libatomic_ops/default.nix
@@ -28,6 +28,6 @@ stdenv.mkDerivation rec {
     description = ''A library for semi-portable access to hardware-provided atomic memory update operations'';
     license = stdenv.lib.licenses.gpl2Plus ;
     maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.unix;
+    platforms = with stdenv.lib.platforms; unix ++ windows;
   };
 }

From 65e24f22e69ea18b5ec638f89a87e070d4e2154a Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 20 Mar 2018 11:51:37 -0400
Subject: [PATCH 052/123] haskell-generic-builder: Default to window + unix
 platforms,

Since GHC is a cross compiler, it's perfectly possible to make haskell
binaries on platforms without GHCs. `windows ++ unix` seems good enough
for now.

Also don't default `hydraPlatforms` to `platforms`. The former must be a
list of systems (strings), but the latter is a list of systems or
patterns.
---
 pkgs/development/haskell-modules/generic-builder.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 1a788ae642e..3cdf2e2252b 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -34,8 +34,8 @@ in
 , enableStaticLibraries ? true
 , extraLibraries ? [], librarySystemDepends ? [], executableSystemDepends ? []
 , homepage ? "http://hackage.haskell.org/package/${pname}"
-, platforms ? ghc.meta.platforms
-, hydraPlatforms ? platforms
+, platforms ? with stdenv.lib.platforms; unix ++ windows # GHC can cross-compile
+, hydraPlatforms ? null
 , hyperlinkSource ? true
 , isExecutable ? false, isLibrary ? !isExecutable
 , jailbreak ? false
@@ -404,7 +404,7 @@ stdenv.mkDerivation ({
          // optionalAttrs broken               { inherit broken; }
          // optionalAttrs (description != "")  { inherit description; }
          // optionalAttrs (maintainers != [])  { inherit maintainers; }
-         // optionalAttrs (hydraPlatforms != platforms) { inherit hydraPlatforms; }
+         // optionalAttrs (hydraPlatforms != null) { inherit hydraPlatforms; }
          ;
 
 }

From aec57cfabe44acf0b87fa0bf9512da6b808f3c5f Mon Sep 17 00:00:00 2001
From: Remy Goldschmidt <taktoa@gmail.com>
Date: Mon, 19 Mar 2018 16:45:37 -0400
Subject: [PATCH 053/123] mingw-w64: Add enable-idl / enable-secure-api flags

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

diff --git a/pkgs/os-specific/windows/mingw-w64/common.nix b/pkgs/os-specific/windows/mingw-w64/common.nix
index ece2586dc80..05f2fbe5a86 100644
--- a/pkgs/os-specific/windows/mingw-w64/common.nix
+++ b/pkgs/os-specific/windows/mingw-w64/common.nix
@@ -8,4 +8,9 @@ rec {
     url = "mirror://sourceforge/mingw-w64/mingw-w64-v${version}.tar.bz2";
     sha256 = "0p01vm5kx1ixc08402z94g1alip4vx66gjpvyi9maqyqn2a76h0c";
   };
+
+  configureFlags = [
+    "--enable-idl"
+    "--enable-secure-api"
+  ];
 }

From 1d3db8139ea1e15d02b77e6ac0c20426fa9301cf Mon Sep 17 00:00:00 2001
From: Moritz Angermann <moritz.angermann@gmail.com>
Date: Tue, 27 Feb 2018 09:46:03 +0800
Subject: [PATCH 054/123] mingw-w64: 4.0.6 -> 5.0.3

This came up with GHC, as GHC requires `_(un)lock_file`, which are only present in mingw-w64 >= 5.
---
 pkgs/os-specific/windows/mingw-w64/common.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/windows/mingw-w64/common.nix b/pkgs/os-specific/windows/mingw-w64/common.nix
index 05f2fbe5a86..102d9489fe9 100644
--- a/pkgs/os-specific/windows/mingw-w64/common.nix
+++ b/pkgs/os-specific/windows/mingw-w64/common.nix
@@ -1,12 +1,12 @@
 { fetchurl }:
 
 rec {
-  version = "4.0.6";
+  version = "5.0.3";
   name = "mingw-w64-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/mingw-w64/mingw-w64-v${version}.tar.bz2";
-    sha256 = "0p01vm5kx1ixc08402z94g1alip4vx66gjpvyi9maqyqn2a76h0c";
+    sha256 = "1d4wrjfdlq5xqpv9zg6ssw4lm8jnv6522xf7d6zbjygmkswisq1a";
   };
 
   configureFlags = [

From 7e1a1889a78006200cf0b3c16d22d2063acd287d Mon Sep 17 00:00:00 2001
From: Marius Bergmann <marius@yeai.de>
Date: Tue, 20 Mar 2018 18:19:58 +0100
Subject: [PATCH 055/123] journalbeat: 5.6.0 -> 5.6.8

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

diff --git a/pkgs/tools/system/journalbeat/default.nix b/pkgs/tools/system/journalbeat/default.nix
index b914ffaa0cb..20951fe5240 100644
--- a/pkgs/tools/system/journalbeat/default.nix
+++ b/pkgs/tools/system/journalbeat/default.nix
@@ -7,7 +7,7 @@ let
 in buildGoPackage rec {
 
   name = "journalbeat-${version}";
-  version = "5.6.0";
+  version = "5.6.8";
 
   goPackagePath = "github.com/mheese/journalbeat";
 
@@ -23,7 +23,7 @@ in buildGoPackage rec {
     owner = "mheese";
     repo = "journalbeat";
     rev = "v${version}";
-    sha256 = "0b5yqzw1h945mwwyy7cza6bc7kzv3x1p9w2xkzmvr7rw3pd32r06";
+    sha256 = "1vgpwnwqjc93nvdpcd52748bwl3r371jb55l17bsgdzrmlcyfm8a";
   };
 
   meta = with lib; {

From 7db841512abf6484155448504f1c2f3586db8d9a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 20 Mar 2018 18:26:13 +0100
Subject: [PATCH 056/123] Remove obsolete
 /nix/var/nix/{manifests,channel-cache}

---
 doc/languages-frameworks/haskell.md        | 4 +---
 lib/tests/release.nix                      | 1 -
 nixos/modules/services/misc/nix-daemon.nix | 4 +---
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/doc/languages-frameworks/haskell.md b/doc/languages-frameworks/haskell.md
index 764fae3ce93..1623e0d276f 100644
--- a/doc/languages-frameworks/haskell.md
+++ b/doc/languages-frameworks/haskell.md
@@ -689,9 +689,7 @@ might be necessary to purge the local caches that store data from those
 machines to disable these binary channels for the duration of the previous
 command, i.e. by running:
 ```shell
-rm /nix/var/nix/binary-cache-v3.sqlite
-rm /nix/var/nix/manifests/*
-rm /nix/var/nix/channel-cache/*
+rm ~/.cache/nix/binary-cache*.sqlite
 ```
 
 ### Builds on Darwin fail with `math.h` not found
diff --git a/lib/tests/release.nix b/lib/tests/release.nix
index 9904a25ecc4..d9a8a006725 100644
--- a/lib/tests/release.nix
+++ b/lib/tests/release.nix
@@ -13,7 +13,6 @@ pkgs.stdenv.mkDerivation {
     export NIX_DB_DIR=$TEST_ROOT/db
     export NIX_LOCALSTATE_DIR=$TEST_ROOT/var
     export NIX_LOG_DIR=$TEST_ROOT/var/log/nix
-    export NIX_MANIFESTS_DIR=$TEST_ROOT/var/nix/manifests
     export NIX_STATE_DIR=$TEST_ROOT/var/nix
     export NIX_STORE_DIR=$TEST_ROOT/store
     export PAGER=cat
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index 484079ed62d..ea964fd68e4 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -445,12 +445,10 @@ in
         mkdir -m 0755 -p \
           /nix/var/nix/gcroots \
           /nix/var/nix/temproots \
-          /nix/var/nix/manifests \
           /nix/var/nix/userpool \
           /nix/var/nix/profiles \
           /nix/var/nix/db \
-          /nix/var/log/nix/drvs \
-          /nix/var/nix/channel-cache
+          /nix/var/log/nix/drvs
         mkdir -m 1777 -p \
           /nix/var/nix/gcroots/per-user \
           /nix/var/nix/profiles/per-user \

From f1f6b462fff6e84031a522adb311991b8a173570 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 20 Mar 2018 10:34:42 -0700
Subject: [PATCH 057/123] libfixposix: 0.4.1 -> 0.4.3

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.4.3 with grep in /nix/store/ksrz74w4gzxb2mf8yb3f3i67i80cr93v-libfixposix-0.4.3
- directory tree listing: https://gist.github.com/ddc89b6def68fbc70c046bfdaa1c02b8
---
 pkgs/development/libraries/libfixposix/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libfixposix/default.nix b/pkgs/development/libraries/libfixposix/default.nix
index f56dc60771d..2d2d56dda4f 100644
--- a/pkgs/development/libraries/libfixposix/default.nix
+++ b/pkgs/development/libraries/libfixposix/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name="libfixposix-${version}";
-  version="0.4.1";
+  version="0.4.3";
 
   src = fetchFromGitHub {
     owner = "sionescu";
     repo = "libfixposix";
     rev = "v${version}";
-    sha256 = "19wjb43mn16f4lin5a2dfi3ym2hy7kqibs0z631d205b16vxas15";
+    sha256 = "1x4q6yspi5g2s98vq4qszw4z3zjgk9l5zs8471w4d4cs6l97w08j";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From 7c3b57c7cd3352cad10412876b7d1f858ffdf025 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 20 Mar 2018 11:26:03 -0700
Subject: [PATCH 058/123] mpd_clientlib: 2.13 -> 2.14

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 2.14 with grep in /nix/store/8q00s6prlgljs1imp7r40rq3jyafzlhc-libmpdclient-2.14
- found 2.14 in filename of file in /nix/store/8q00s6prlgljs1imp7r40rq3jyafzlhc-libmpdclient-2.14
- directory tree listing: https://gist.github.com/acd3295fdde722768ff964a7284a00c4
---
 pkgs/servers/mpd/clientlib.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/mpd/clientlib.nix b/pkgs/servers/mpd/clientlib.nix
index dab63a5bad8..478d4372267 100644
--- a/pkgs/servers/mpd/clientlib.nix
+++ b/pkgs/servers/mpd/clientlib.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, meson, ninja, fixDarwinDylibNames }:
 
 stdenv.mkDerivation rec {
-  version = "2.13";
+  version = "2.14";
   name = "libmpdclient-${version}";
 
   src = fetchFromGitHub {
     owner  = "MusicPlayerDaemon";
     repo   = "libmpdclient";
     rev    = "v${version}";
-    sha256 = "1g1n6rk8kn87mbjqxxj0vi7haj8xx21xmqlzbrx2fvyp5357zvsq";
+    sha256 = "15vn9m4qcsccff5rg7jkzy5503skz6bmqqk6qc2smgvjgwn533sm";
   };
 
   nativeBuildInputs = [ meson ninja ]

From e675217786da54caa39115193e667194309807c8 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 20 Mar 2018 12:04:55 -0700
Subject: [PATCH 059/123] krita: 3.3.3 -> 4.0.0 (#37461)

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 4.0.0 with grep in /nix/store/k8xscjzkd9w5n6hly18qcwgg62m3fjh9-krita-4.0.0
- directory tree listing: https://gist.github.com/c2d48bc58cc453eac241620389f2b9ce
---
 pkgs/applications/graphics/krita/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix
index 1f7e779e88a..f74ad3c877c 100644
--- a/pkgs/applications/graphics/krita/default.nix
+++ b/pkgs/applications/graphics/krita/default.nix
@@ -9,11 +9,11 @@
 
 mkDerivation rec {
   name = "krita-${version}";
-  version = "3.3.3";
+  version = "4.0.0";
 
   src = fetchurl {
     url = "https://download.kde.org/stable/krita/${version}/${name}.tar.gz";
-    sha256 = "0pc6hnakkqy81x5b5ncivaps6hqv43i50sjwgi3i3cz9j8rlxh5y";
+    sha256 = "14sm67vkpxzpnh4c2mzvr0rpk8a3i8kzxx6fi3lpczrcc1g7di09";
   };
 
   nativeBuildInputs = [ cmake extra-cmake-modules ];

From 792161895fbdf29e58bdf5ec168317d4174885f3 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 20 Mar 2018 22:06:14 +0300
Subject: [PATCH 060/123] steam: add dependencies for Surviving Mars

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

diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix
index ce6e86c50b8..e896c74ca35 100644
--- a/pkgs/games/steam/chrootenv.nix
+++ b/pkgs/games/steam/chrootenv.nix
@@ -109,6 +109,7 @@ in buildFHSUserEnv rec {
     networkmanager098
 
     # Verified games requirements
+    xorg.libXt
     xorg.libXmu
     xorg.libxcb
     libGLU
@@ -121,6 +122,9 @@ in buildFHSUserEnv rec {
     openssl
     libidn
     tbb
+    wayland
+    mesa_noglu
+    libxkbcommon
 
     # Other things from runtime
     flac

From ab67f36e7376e6e5d09f5bdfb00944ef2f7abaf0 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 20 Mar 2018 22:15:56 +0300
Subject: [PATCH 061/123] xdg_utils: fix xdg-screensaver

---
 pkgs/tools/X11/xdg-utils/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/X11/xdg-utils/default.nix b/pkgs/tools/X11/xdg-utils/default.nix
index 52ecdc26734..28839891aa5 100644
--- a/pkgs/tools/X11/xdg-utils/default.nix
+++ b/pkgs/tools/X11/xdg-utils/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, fetchFromGitHub
 , file, libxslt, docbook_xml_dtd_412, docbook_xsl, xmlto
-, w3m, which, gnugrep, gnused, coreutils
+, w3m, which, gnugrep, gnused, coreutils, xset
 , mimiSupport ? false, gawk ? null }:
 
 assert mimiSupport -> gawk != null;
@@ -38,6 +38,7 @@ stdenv.mkDerivation rec {
     file()  { ${file}/bin/file      "$@"; }\
     awk()   { ${gawk}/bin/awk       "$@"; }\
     sort()  { ${coreutils}/bin/sort "$@"; }\
+    xset()  { ${xset}/bin/xset      "$@"; }\
     &#' -i "$out"/bin/*
 
     substituteInPlace $out/bin/xdg-open \

From 918edbe485333376549aef70f923dd224bca6395 Mon Sep 17 00:00:00 2001
From: Moritz Angermann <moritz.angermann@gmail.com>
Date: Mon, 5 Mar 2018 21:33:49 +0800
Subject: [PATCH 062/123] haskell-generic-builder: Add `enableHsc2hsViaAsm` for
 Windows cross compilation

---
 pkgs/development/haskell-modules/generic-builder.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 3cdf2e2252b..45299e01369 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -32,6 +32,7 @@ in
 , enableSharedLibraries ? ((ghc.isGhcjs or false) || stdenv.lib.versionOlder "7.7" ghc.version)
 , enableDeadCodeElimination ? (!stdenv.isDarwin)  # TODO: use -dead_strip for darwin
 , enableStaticLibraries ? true
+, enableHsc2hsViaAsm ? hostPlatform.isWindows && stdenv.lib.versionAtLeast ghc.version "8.4"
 , extraLibraries ? [], librarySystemDepends ? [], executableSystemDepends ? []
 , homepage ? "http://hackage.haskell.org/package/${pname}"
 , platforms ? with stdenv.lib.platforms; unix ++ windows # GHC can cross-compile
@@ -114,9 +115,13 @@ let
     "--with-ghc-pkg=${ghc.targetPrefix}ghc-pkg"
     "--with-gcc=${stdenv.cc.targetPrefix}cc"
     "--with-ld=${stdenv.cc.bintools.targetPrefix}ld"
-    "--with-hsc2hs=${nativeGhc}/bin/hsc2hs" # not cross one
+    # use the one that comes with the cross compiler.
+    "--with-hsc2hs=${ghc.targetPrefix}hsc2hs"
     "--with-strip=${stdenv.cc.bintools.targetPrefix}strip"
-  ] ++ (if isHaLVM then [] else ["--hsc2hs-options=--cross-compile"]);
+  ] ++ optionals (!isHaLVM) [
+    "--hsc2hs-option=--cross-compile"
+    (optionalString enableHsc2hsViaAsm "--hsc2hs-option=--via-asm")
+  ];
 
   crossCabalFlagsString =
     stdenv.lib.optionalString isCross (" " + stdenv.lib.concatStringsSep " " crossCabalFlags);

From abf27609c6ffd4d90932219a2c839679fbeb0da3 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@yahoo.com>
Date: Tue, 1 Aug 2017 13:15:08 -0400
Subject: [PATCH 063/123] top-level: Move comma for stylistic consistency

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

diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix
index 9cf9eb4db65..da7fc1bed34 100644
--- a/pkgs/top-level/default.nix
+++ b/pkgs/top-level/default.nix
@@ -22,9 +22,9 @@
   # `*Platform`s.
   localSystem
 
-  # The system packages will ultimately be run on. Null if the two should be the
+, # The system packages will ultimately be run on. Null if the two should be the
   # same.
-, crossSystem ? null
+  crossSystem ? null
 
 , # Allow a configuration attribute set to be passed in as an argument.
   config ? {}

From 8727284a4b211556f59d700c41fa40ec33a78cd2 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 20 Mar 2018 14:38:40 -0500
Subject: [PATCH 064/123] haskell: only use glibcLocales when using glibc

Fixes eval w/musl.

Possible alternative would be using glibcLocales
when it is non-null, to avoid duplicating the logic.
---
 pkgs/development/haskell-modules/generic-builder.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 1a788ae642e..0f948f42f25 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -386,7 +386,7 @@ stdenv.mkDerivation ({
       buildInputs = systemBuildInputs;
       nativeBuildInputs = [ ghcEnv ] ++ nativeBuildInputs;
       LANG = "en_US.UTF-8";
-      LOCALE_ARCHIVE = optionalString stdenv.isLinux "${glibcLocales}/lib/locale/locale-archive";
+      LOCALE_ARCHIVE = optionalString (stdenv.hostPlatform.libc == "glibc") "${glibcLocales}/lib/locale/locale-archive";
       shellHook = ''
         export NIX_${ghcCommandCaps}="${ghcEnv}/bin/${ghcCommand}"
         export NIX_${ghcCommandCaps}PKG="${ghcEnv}/bin/${ghcCommand}-pkg"
@@ -430,5 +430,5 @@ stdenv.mkDerivation ({
 // optionalAttrs (postFixup != "")      { inherit postFixup; }
 // optionalAttrs (dontStrip)            { inherit dontStrip; }
 // optionalAttrs (hardeningDisable != []) { inherit hardeningDisable; }
-// optionalAttrs (buildPlatform.isLinux){ LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive"; }
+// optionalAttrs (buildPlatform.libc == "glibc"){ LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive"; }
 )

From 45e253cacbd272f9bab414b260dd5bf5331d0409 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 19 Mar 2018 16:25:54 -0400
Subject: [PATCH 065/123] cross stdenv: Make depsBuildBuild overrideable by
 config too.

---
 pkgs/stdenv/cross/default.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix
index 8da3555c6c6..6e306571853 100644
--- a/pkgs/stdenv/cross/default.nix
+++ b/pkgs/stdenv/cross/default.nix
@@ -10,9 +10,15 @@ let
     config = builtins.removeAttrs config [ "replaceStdenv" ];
   };
 
-in bootStages ++ [
+in lib.init bootStages ++ [
 
-  # Build Packages
+  # Regular native packages
+  (somePrevStage: lib.last bootStages somePrevStage // {
+    # It's OK to change the built-time dependencies
+    allowCustomOverrides = true;
+  })
+
+  # Build tool Packages
   (vanillaPackages: {
     inherit config overlays;
     selfBuild = false;

From 300a28bb31cf3f0de962e0b9313c3ba2c4879b38 Mon Sep 17 00:00:00 2001
From: Nikita Uvarov <uv.nikita@gmail.com>
Date: Tue, 20 Mar 2018 17:37:23 +0100
Subject: [PATCH 066/123] todolist: init at 0.8

---
 maintainers/maintainer-list.nix             |  5 +++++
 pkgs/applications/misc/todolist/default.nix | 22 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 3 files changed, 29 insertions(+)
 create mode 100644 pkgs/applications/misc/todolist/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 867cd0b4888..369508f842c 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3670,6 +3670,11 @@
     github = "utdemir";
     name = "Utku Demir";
   };
+  uvnikita = {
+    email = "uv.nikita@gmail.com";
+    github = "uvNikita";
+    name = "Nikita Uvarov";
+  };
   uwap = {
     email = "me@uwap.name";
     github = "uwap";
diff --git a/pkgs/applications/misc/todolist/default.nix b/pkgs/applications/misc/todolist/default.nix
new file mode 100644
index 00000000000..61e10b6d1a6
--- /dev/null
+++ b/pkgs/applications/misc/todolist/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, buildGoPackage, fetchFromGitHub }:
+
+buildGoPackage rec {
+  name = "todolist-${version}";
+  version = "0.8";
+
+  goPackagePath = "github.com/gammons/todolist";
+
+  src = fetchFromGitHub {
+    owner = "gammons";
+    repo = "todolist";
+    rev = "${version}";
+    sha256 = "0agv9a44q81qr960b7m1jxk0pb8ahk6lvmzmijvw4v6mbip2720z";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Simple GTD-style todo list for the command line";
+    homepage = "http://todolist.site";
+    license = licenses.mit;
+    maintainers = with maintainers; [ uvnikita ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9966f862f90..007a128f18a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8204,6 +8204,8 @@ with pkgs;
 
   texi2mdoc = callPackage ../tools/misc/texi2mdoc { };
 
+  todolist = callPackage ../applications/misc/todolist { };
+
   travis = callPackage ../development/tools/misc/travis { };
 
   tweak = callPackage ../applications/editors/tweak { };

From cc6dc2cefc0f534283ab22de0a63e65da71d8568 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 20 Mar 2018 13:22:09 -0700
Subject: [PATCH 067/123] libyamlcpp: 0.6.1 -> 0.6.2

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 0.6.2 with grep in /nix/store/cfm3y6c18a0ys0ndbv4g4zixay7zh331-libyaml-cpp-0.6.2
- found 0.6.2 in filename of file in /nix/store/cfm3y6c18a0ys0ndbv4g4zixay7zh331-libyaml-cpp-0.6.2
- directory tree listing: https://gist.github.com/54fa524e8988d3fbe9920824135802a0
---
 pkgs/development/libraries/libyaml-cpp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libyaml-cpp/default.nix b/pkgs/development/libraries/libyaml-cpp/default.nix
index fc4c280d47c..ff09aeab2c6 100644
--- a/pkgs/development/libraries/libyaml-cpp/default.nix
+++ b/pkgs/development/libraries/libyaml-cpp/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "libyaml-cpp-${version}";
-  version = "0.6.1";
+  version = "0.6.2";
 
   src = fetchFromGitHub {
     owner = "jbeder";
     repo = "yaml-cpp";
     rev = "yaml-cpp-${version}";
-    sha256 = "16x53p9gfch7gpyg865j7m1zhqsixx2hbbd206ffjv0ip8cjipjf";
+    sha256 = "16lclpa487yghf9019wymj419wkyx4795wv9q7539hhimajw9kpb";
   };
 
   outputs = [ "out" "dev" ];

From c1912bdedec2d7924c8c4b6d31cb9fe425cfb8ee Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 20 Mar 2018 13:39:39 -0700
Subject: [PATCH 068/123] libtirpc: 1.0.2 -> 1.0.3 (#37487)

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- found 1.0.3 with grep in /nix/store/npaq7mvly8z13h38c8g1x0y4ggxi77k0-libtirpc-1.0.3
- directory tree listing: https://gist.github.com/ad3687f7d46ffd3201e6fbe6e2e090b9
---
 pkgs/development/libraries/ti-rpc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/ti-rpc/default.nix b/pkgs/development/libraries/ti-rpc/default.nix
index d34a6dca783..aa134d35104 100644
--- a/pkgs/development/libraries/ti-rpc/default.nix
+++ b/pkgs/development/libraries/ti-rpc/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, fetchpatch, stdenv, autoreconfHook, libkrb5 }:
 
 stdenv.mkDerivation rec {
-  name = "libtirpc-1.0.2";
+  name = "libtirpc-1.0.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/libtirpc/${name}.tar.bz2";
-    sha256 = "1xchbxy0xql7yl7z4n1icj8r7dmly46i22fvm00vdjq64zlmqg3j";
+    sha256 = "0ppxl3k3nsz0qdakq844i2kj4fvh9h937lhx26bgmpmxq67sghw6";
   };
 
   patches = stdenv.lib.optional stdenv.hostPlatform.isMusl

From 00fb7d29bfd860b8593caa2906281a9afb27bb62 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 20 Mar 2018 15:48:50 -0500
Subject: [PATCH 069/123] vim-plugins: updates!

Only updated the ones I have experience with,
so this is not exhaustive.
---
 pkgs/misc/vim-plugins/default.nix | 126 +++++++++++++++---------------
 1 file changed, 63 insertions(+), 63 deletions(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index bce13612fd6..3198086ffb6 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -309,11 +309,11 @@ rec {
   };
 
   The_NERD_tree = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "The_NERD_tree-2018-03-06";
+    name = "The_NERD_tree-2018-03-13";
     src = fetchgit {
       url = "git://github.com/scrooloose/nerdtree";
-      rev = "ed446e5cbe0733a8f98befc88d33e42edebb67d2";
-      sha256 = "0i5qy8lb8w5ri30905i7411754g2vzj4jlccak5lj852vyzgdp56";
+      rev = "a172d7cfcb4fe9b927dcc24184204fc89d826301";
+      sha256 = "1nfk1j2n2jgrdhcahva1kq3qjj4fdn1x20xxvgl88v3j3fj62n0f";
     };
     dependencies = [];
 
@@ -493,11 +493,11 @@ rec {
   };
 
   fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "fugitive-2018-01-25";
+    name = "fugitive-2018-03-14";
     src = fetchgit {
       url = "git://github.com/tpope/vim-fugitive";
-      rev = "b82abd5bd583cfb90be63ae12adc36a84577bd45";
-      sha256 = "0y3fkw7f5gqb339qlby19f444085c929gjbmbibmgig7hrarqrz4";
+      rev = "3e0bd86b99c50691f830d9e25a4bbe2a88078f8f";
+      sha256 = "1prfb0m61r499i35qn1ql2pag5w64mhpkby4wbbvlpm50xwq8w9b";
     };
     dependencies = [];
 
@@ -661,11 +661,11 @@ rec {
   };
 
   neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neomake-2018-03-07";
+    name = "neomake-2018-03-18";
     src = fetchgit {
       url = "https://github.com/benekastah/neomake";
-      rev = "666e20797f8e8c9d2fdab906d313a5b9714543f0";
-      sha256 = "0wx82bal16jfq1kk2rxrpl79brqfhpdmwbx55wggh7rc893ll4v4";
+      rev = "b225234f71983ed95aac6efb8e4c43ee950a4f20";
+      sha256 = "19v0c710yyjd0rlhz43frsh1kcdnj602xz7flqfpv6kbcr5lsq22";
     };
     dependencies = [];
 
@@ -826,11 +826,11 @@ rec {
   };
 
   vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-2018-03-11";
+    name = "vim-2018-03-19";
     src = fetchgit {
       url = "https://github.com/dracula/vim";
-      rev = "1f44625290f0f1488f7056e166f69ee6f171d273";
-      sha256 = "0xs5mbqgs5nvymiiwgbycb278v9mmjm3pxybqlyg5r09ri6ncfkq";
+      rev = "0743d3d7b3769d012827bc8d1e5375164791cc2f";
+      sha256 = "0fxkwvz3a8gpcg958hikpkn8rrhivb40yybvm1lrab5vzzbpphb3";
     };
     dependencies = [];
 
@@ -892,11 +892,11 @@ rec {
   };
 
   vim-elixir = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-elixir-2018-02-28";
+    name = "vim-elixir-2018-03-20";
     src = fetchgit {
       url = "https://github.com/elixir-lang/vim-elixir";
-      rev = "bd75abb934c97a3d6d753f019e0f3aef3c132c2e";
-      sha256 = "1qic3av5avf50dvxkz1iq98impdabflk64xj5wmzr9iag1p0qwz9";
+      rev = "99022e6a7df9581109a26a369eb12d87eeabb2dc";
+      sha256 = "1gs9f0mgp17iib7pxc79gjifwr8qzvl48ybjp985qvlbf5bq0n9z";
     };
     dependencies = [];
 
@@ -969,11 +969,11 @@ rec {
   };
 
   vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-go-2018-03-07";
+    name = "vim-go-2018-03-20";
     src = fetchgit {
       url = "https://github.com/fatih/vim-go";
-      rev = "d2b0a234ffb5441a3488c78fe8e5f551ddbdd454";
-      sha256 = "1qcy1w9p23gxrii4ddg6mn8kn4i9d0q3rmkrblvxhbk7snxbh7n8";
+      rev = "37e2587aa82fc7a7106a95e86fa54ae54ecb744b";
+      sha256 = "00sgij05fs0mqvd1cw4rrym0zv8h45kfiihijwmrlw72jqhys919";
     };
     dependencies = [];
 
@@ -1376,11 +1376,11 @@ rec {
   };
 
   vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimtex-2018-03-10";
+    name = "vimtex-2018-03-20";
     src = fetchgit {
       url = "https://github.com/lervag/vimtex";
-      rev = "38a434a38a11d10da43dea1aac8f1143404c3eaf";
-      sha256 = "0hz807i3byhrvbv98rl8k4r3n6dyninaqlr1kga95dllg6xr0k5p";
+      rev = "17d809706edcb277f1ee7fa5e33aff3619926fe4";
+      sha256 = "0hq9zyrr1c5myi7llh9s2s7qchzsvyz8gdiq6y5r44idwa53na2w";
     };
     dependencies = [];
 
@@ -1648,22 +1648,22 @@ rec {
   };
 
   vim-markdown = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-markdown-2018-01-20";
+    name = "vim-markdown-2018-03-19";
     src = fetchgit {
       url = "https://github.com/plasticboy/vim-markdown";
-      rev = "861e84fc0bc97be8387e92ac2fc180599dc2b5a3";
-      sha256 = "1lfcl6rsjqyzny5rvipm1wd4qxnv96ff8anjaba0rv4m7b99yv6z";
+      rev = "45852fa3e937150aae93efb3dc10f4370b4763a9";
+      sha256 = "131njs5pw72sknb6kb64g86biw4zmfaibcvm25kbwhxqkl27wxhn";
     };
     dependencies = [];
 
   };
 
   python-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "python-mode-2018-02-19";
+    name = "python-mode-2018-03-17";
     src = fetchgit {
       url = "https://github.com/python-mode/python-mode";
-      rev = "d5e7be11a74e8bda57388415d07d0faa0bcf9c5c";
-      sha256 = "13863z80dwzmyi2adjc3hywqqd14w43nkhzy7lqarqiv7ks207kv";
+      rev = "585b369e9cc4710432ae50466f8292725211c2ff";
+      sha256 = "03lp9fk6vzagxqiv6lw3p4063hf5ipjss1m7wvhcwkxm8x1i605v";
     };
     dependencies = [];
 
@@ -1800,11 +1800,11 @@ rec {
   };
 
   neoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neoformat-2018-03-03";
+    name = "neoformat-2018-03-13";
     src = fetchgit {
       url = "https://github.com/sbdchd/neoformat";
-      rev = "c042511faa57fbe9c0c55ca30c710c1605345cf5";
-      sha256 = "0rdd4jsk1l7yfbfd7v9z9rb6k0darlms2hxsy602v7j485n4ayd9";
+      rev = "9ab966a6def98bab5cd88bcdd9b376da3ce471b4";
+      sha256 = "1d745zhmx8ghh9s09kwpmxflgff5lgczcg3gzb46gk7vq7y6s47d";
     };
     dependencies = [];
 
@@ -1921,22 +1921,22 @@ rec {
   };
 
   neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neosnippet-snippets-2018-01-28";
+    name = "neosnippet-snippets-2018-03-12";
     src = fetchgit {
       url = "https://github.com/shougo/neosnippet-snippets";
-      rev = "5902053e0202248f0855d7a2b4f562425447493e";
-      sha256 = "12a89hlpz0gydl7wpqnanybmrl88r6pqznm0p76y6ir9m460gxw6";
+      rev = "4aaa1713c88a74e340a97afa80d0b935f60bfecd";
+      sha256 = "10i2b9b8la3ia2f0nkg2bfjz54h0b1slqn1jrb7a8iwg5jmsn7yh";
     };
     dependencies = [];
 
   };
 
   neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neosnippet-vim-2018-02-22";
+    name = "neosnippet-vim-2018-03-12";
     src = fetchgit {
       url = "https://github.com/shougo/neosnippet.vim";
-      rev = "e38afeab494bbc66be15e181bc96b78df3654a88";
-      sha256 = "1pm2drwq3hmbibai03pn6qh373kwfqf49npv1gq8d566wfmg0qrq";
+      rev = "8cf286e3bf7a5fc859f4c5f1bef52c351f24fefa";
+      sha256 = "15mxckg5s9pjfm7xkhs4awx0vpmwdwwifqrvrh1r4mbia39pk6ry";
     };
     dependencies = [];
 
@@ -2115,11 +2115,11 @@ rec {
   };
 
   vim-dispatch = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-dispatch-2018-03-02";
+    name = "vim-dispatch-2018-03-18";
     src = fetchgit {
       url = "https://github.com/tpope/vim-dispatch";
-      rev = "e83ac42fefa4bcf2b4197bec2b4d917e15225815";
-      sha256 = "1mkhygh5pgp9z6gn2chn8kvj6fgfvg9gnym9icfdlm0hl2ldig1w";
+      rev = "4104901e9d6a304a5022b780f8e20d3becc7da93";
+      sha256 = "1n01g7q6cvdjz3fw7pfmx2r8kzhilxprd25nfj9zj01mbxbkz3mc";
     };
     dependencies = [];
 
@@ -2203,11 +2203,11 @@ rec {
   };
 
   youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "youcompleteme-2018-03-09";
+    name = "youcompleteme-2018-03-19";
     src = fetchgit {
       url = "https://github.com/valloric/youcompleteme";
-      rev = "3a760212cb306655780a2c3be6412890ba5cf89b";
-      sha256 = "0q0gjlsb0l3k7a1fiz4lqa75r146y4myr42kwri0rm8y4fgpbc12";
+      rev = "788c293aee78c6ab60cbc06bbc3339e7b2bff98f";
+      sha256 = "1a7dgk04lgai51s9yjxzc87cdmm9wix2fx4kfm95s02qm2dnryci";
     };
     dependencies = [];
     buildPhase = ''
@@ -2525,11 +2525,11 @@ rec {
   };
 
   zig-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "zig-vim-2018-02-28";
+    name = "zig-vim-2018-03-16";
     src = fetchgit {
       url = "https://github.com/zig-lang/zig.vim";
-      rev = "1ce1b03ace88c447733cd5f398f09ff1d83d6831";
-      sha256 = "0y96dwfh1291gn7ia749nc8r03ndq7f29lgqag4dcs59x0pk4f5w";
+      rev = "7d2905a945308cc5ac4e0c32d9f5be86edf08399";
+      sha256 = "1afy9md2xb7acrphwmplyrln8h6cckbfd6a6ls0hlmb3jybzk0zy";
     };
     dependencies = [];
 
@@ -2602,11 +2602,11 @@ rec {
   };
 
   pathogen = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "pathogen-2017-08-04";
+    name = "pathogen-2018-03-14";
     src = fetchgit {
       url = "git://github.com/tpope/vim-pathogen";
-      rev = "e7857bed4e0705f91f781dbe99706f07d08d104b";
-      sha256 = "15s08q1chrdywj7fdiwzygxywg4cpcbvk5r1r8zvw6d82kyhadw1";
+      rev = "f4fd6044e37a4e255f2ea934e9e1ebc7bfe70f70";
+      sha256 = "1fjnfr8zjk39xvv64qg7ydic87gmg547siqplxgdv9a0vkk0p7jd";
     };
     dependencies = [];
 
@@ -2723,11 +2723,11 @@ rec {
   };
 
   table-mode = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "table-mode-2018-02-13";
+    name = "table-mode-2018-03-17";
     src = fetchgit {
       url = "git://github.com/dhruvasagar/vim-table-mode";
-      rev = "c35fd9b104fb75017f3866a28a77cf38f61b7801";
-      sha256 = "0l52ipl7a1g3js6lfig4xjw17nmmjvpv7gsrpn166kwgrxgis802";
+      rev = "d0a640518957417ce689411d807dff3bf9eca194";
+      sha256 = "1b6mka45lhb7n06pjxg697ha63gg4vw6zgj0v037w1izj619xa33";
     };
     dependencies = [];
 
@@ -2997,11 +2997,11 @@ rec {
   };
 
   vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-airline-2018-03-06";
+    name = "vim-airline-2018-03-20";
     src = fetchgit {
       url = "git://github.com/vim-airline/vim-airline";
-      rev = "958f78335eafe419ee002ad58d358854323de33a";
-      sha256 = "1h0a0rsnbbwhw55r2hcpfkxqamnx62jzqb451lh3ipvfs0ral6w7";
+      rev = "b9f55455fb50234b3f2ac86f5d70607efade31bd";
+      sha256 = "1yqx5mabanykaqrmgnppw870k25qs59vh5wpcwghwf2qf033mfll";
     };
     dependencies = [];
 
@@ -3063,11 +3063,11 @@ rec {
   };
 
   vim-gitgutter = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-gitgutter-2018-03-08";
+    name = "vim-gitgutter-2018-03-16";
     src = fetchgit {
       url = "git://github.com/airblade/vim-gitgutter";
-      rev = "380e7935b7b4cac10d3bc3031d492deaf5008495";
-      sha256 = "0c1dh3rkhgrp1sala1y5y2wn7b94c75y7h3j3dsl8lmbl64y2vl8";
+      rev = "37bdd03d176c5e182c7e8dbdc79c3f71d2a04898";
+      sha256 = "0l7sz77ymy5g6j7ads70r3xhvaymwmvlqi7hy1k40giq4dxzivv7";
     };
     dependencies = [];
 
@@ -3140,11 +3140,11 @@ rec {
   };
 
   vim-multiple-cursors = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-multiple-cursors-2018-03-02";
+    name = "vim-multiple-cursors-2018-03-20";
     src = fetchgit {
       url = "git://github.com/terryma/vim-multiple-cursors";
-      rev = "c9b95e49a48937903c9fc41d87d9b4c9aded10d7";
-      sha256 = "1r8xlfydarvaags541xn1mc5ry97ikyvjhkrpyngzfw48jlc0aaa";
+      rev = "13232e4b544775cf2b039571537b0e630406f801";
+      sha256 = "0ib0gj5ybmlb4lajhl1pc41kgfxaj19z22jsxc5sr0q67xwfpki4";
     };
     dependencies = [];
 
@@ -3239,11 +3239,11 @@ rec {
   };
 
   vimwiki = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimwiki-2018-02-26";
+    name = "vimwiki-2018-03-18";
     src = fetchgit {
       url = "git://github.com/vimwiki/vimwiki";
-      rev = "4bacbe00005f23d72d247fdde3a9e857d690b44b";
-      sha256 = "1kbblgzl311ksgyy4q44cngzacn3i2sfmfgmv441vzc7lq0fpmd6";
+      rev = "16b9e45b03baa377cee807f2bef7d97682e8bad6";
+      sha256 = "1ja3rspabsva6ja4jrbl19mck5k8lvss82sl3l2wgc8cv8ya1kkq";
     };
     dependencies = [];
 

From 7da0786caaabfef8544674fed88ba8f6e827f21b Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 20 Mar 2018 21:50:32 +0100
Subject: [PATCH 070/123] st: 0.8 -> 0.8.1

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

diff --git a/pkgs/applications/misc/st/default.nix b/pkgs/applications/misc/st/default.nix
index 4b6873ea33f..825a37faf1e 100644
--- a/pkgs/applications/misc/st/default.nix
+++ b/pkgs/applications/misc/st/default.nix
@@ -5,11 +5,11 @@ with stdenv.lib;
 
 let patches' = if patches == null then [] else patches;
 in stdenv.mkDerivation rec {
-  name = "st-0.8";
+  name = "st-0.8.1";
 
   src = fetchurl {
     url = "http://dl.suckless.org/st/${name}.tar.gz";
-    sha256 = "0xkmb7f1qq01ny1667c7bkf2zi3h4ryc6zpml22ccrkxs0h3jdbp";
+    sha256 = "09k94v3n20gg32xy7y68p96x9dq5msl80gknf9gbvlyjp3i0zyy4";
   };
 
   patches = patches';

From 7a0027804cf04b6907a1a0cc9186649c2a24011a Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 20 Mar 2018 22:25:02 +0100
Subject: [PATCH 071/123] josepy: init at 1.0.1

---
 .../python-modules/josepy/default.nix         | 35 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/development/python-modules/josepy/default.nix

diff --git a/pkgs/development/python-modules/josepy/default.nix b/pkgs/development/python-modules/josepy/default.nix
new file mode 100644
index 00000000000..541455642ef
--- /dev/null
+++ b/pkgs/development/python-modules/josepy/default.nix
@@ -0,0 +1,35 @@
+{ lib, fetchPypi, buildPythonPackage
+# buildInputs
+, six
+, setuptools
+, pyopenssl
+, cryptography
+}:
+
+buildPythonPackage rec {
+  pname = "josepy";
+  version = "1.0.1";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1k0ahzzaq2rrjiifwbhbp7vm8z4zk0ipgiqwicil80kzlf6bhj4z";
+  };
+
+  propagatedBuildInputs = [
+    pyopenssl
+    cryptography
+    six
+    setuptools
+  ];
+
+  # too many unpackaged check requirements
+  doCheck = false;
+
+  meta = with lib; {
+    description = "JOSE protocol implementation in Python";
+    homepage = https://github.com/jezdez/josepy;
+    license = licenses.asl20;
+    maintainers = with maintainers; [  ];
+  };
+}
+
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b513288da69..1d3aa948877 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5219,6 +5219,8 @@ in {
 
   JPype1 = callPackage ../development/python-modules/JPype1 {};
 
+  josepy = callPackage ../development/python-modules/josepy {};
+
   jsbeautifier = callPackage ../development/python-modules/jsbeautifier {};
 
   jug = callPackage ../development/python-modules/jug {};

From e9f176a09a6a21119f6ba4a0ac7b3b0d1db330d1 Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 20 Mar 2018 22:25:50 +0100
Subject: [PATCH 072/123] certbot: 0.19.0 -> 0.22.2

---
 .../python-modules/acme/default.nix           | 20 +++++++++++++++----
 pkgs/tools/admin/certbot/default.nix          | 12 +++++------
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/acme/default.nix b/pkgs/development/python-modules/acme/default.nix
index 71357e5bef2..ccf56c208f2 100644
--- a/pkgs/development/python-modules/acme/default.nix
+++ b/pkgs/development/python-modules/acme/default.nix
@@ -1,6 +1,18 @@
 { stdenv, buildPythonPackage, fetchPypi
-, certbot, nose, cryptography, pyasn1, pyopenssl, pyRFC3339
-, pytz, requests, six, werkzeug, mock, ndg-httpsclient }:
+, certbot
+, nose
+, cryptography
+, pyasn1
+, pyopenssl
+, pyRFC3339
+, josepy
+, pytz
+, requests
+, six
+, werkzeug
+, mock
+, ndg-httpsclient
+}:
 
 buildPythonPackage rec {
   inherit (certbot) src version;
@@ -10,10 +22,10 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [
     cryptography pyasn1 pyopenssl pyRFC3339 pytz requests six werkzeug mock
-    ndg-httpsclient
+    ndg-httpsclient josepy
   ];
 
-  buildInputs = [ nose ];
+  checkInputs = [ nose ];
 
   postUnpack = "sourceRoot=\${sourceRoot}/acme";
 }
diff --git a/pkgs/tools/admin/certbot/default.nix b/pkgs/tools/admin/certbot/default.nix
index 78a38e07cc2..bf2b4ac6799 100644
--- a/pkgs/tools/admin/certbot/default.nix
+++ b/pkgs/tools/admin/certbot/default.nix
@@ -1,19 +1,19 @@
-{ stdenv, python2Packages, fetchFromGitHub, dialog }:
+{ stdenv, pythonPackages, fetchFromGitHub, dialog }:
 
 # Latest version of certbot supports python3 and python3 version of pythondialog
 
-python2Packages.buildPythonApplication rec {
+pythonPackages.buildPythonApplication rec {
   name = "certbot-${version}";
-  version = "0.19.0";
+  version = "0.22.2";
 
   src = fetchFromGitHub {
     owner = "certbot";
     repo = "certbot";
     rev = "v${version}";
-    sha256 = "14i3q59v7j0q2pa1dri420fhil4h0vgl4vb471hp81f4y14gq6h7";
+    sha256 = "08x80x9d71j84mwjm5wzd0x5gcw6gwyvkvadi2js39js6hfnc6jg";
   };
 
-  propagatedBuildInputs = with python2Packages; [
+  propagatedBuildInputs = with pythonPackages; [
     ConfigArgParse
     acme
     configobj
@@ -28,7 +28,7 @@ python2Packages.buildPythonApplication rec {
     zope_component
     zope_interface
   ];
-  buildInputs = [ dialog ] ++ (with python2Packages; [ nose mock gnureadline ]);
+  buildInputs = [ dialog ] ++ (with pythonPackages; [ nose mock gnureadline ]);
 
   patchPhase = ''
     substituteInPlace certbot/notify.py --replace "/usr/sbin/sendmail" "/run/wrappers/bin/sendmail"

From e144fa07b9f635ebef591b4c029a66fedaa7b7db Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Tue, 20 Mar 2018 22:26:30 +0100
Subject: [PATCH 073/123] simp_le: 0.6.2 -> 0.8.0

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

diff --git a/pkgs/tools/admin/simp_le/default.nix b/pkgs/tools/admin/simp_le/default.nix
index ce416e7cd25..91656eb0c55 100644
--- a/pkgs/tools/admin/simp_le/default.nix
+++ b/pkgs/tools/admin/simp_le/default.nix
@@ -1,26 +1,26 @@
 { stdenv, fetchFromGitHub, fetchpatch, pythonPackages }:
-
+ 
 pythonPackages.buildPythonApplication rec {
   pname = "simp_le-client";
-  version = "0.6.1";
-  name = "${pname}-${version}";
+  version = "0.8.0";
 
   src = pythonPackages.fetchPypi {
     inherit pname version;
-    sha256 = "0x4fky9jizs3xi55cdy217cvm3ikpghiabysan71b07ackkdfj6k";
+    sha256 = "0nv9mm99rm8i9flgfgwvmajbsxb5rm162nfxlq3wk66bbbyr6y1i";
   };
 
   checkPhase = ''
     $out/bin/simp_le --test
   '';
 
-  propagatedBuildInputs = with pythonPackages; [ acme setuptools_scm ];
+  propagatedBuildInputs = with pythonPackages; [ acme setuptools_scm josepy ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/zenhack/simp_le;
     description = "Simple Let's Encrypt client";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ gebner ];
+    maintainers = with maintainers; [ gebner makefu ];
     platforms = platforms.all;
   };
 }
+

From 3c64662e14145f2f8d7ca2be7418611e49a3342b Mon Sep 17 00:00:00 2001
From: Spencer Janssen <spencerjanssen@gmail.com>
Date: Tue, 20 Mar 2018 16:55:42 -0500
Subject: [PATCH 074/123] awscli: 1.14.47 -> 1.14.50

Fixes a broken build introduced when botocore was updated in ce34a9a3
---
 pkgs/tools/admin/awscli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix
index eb735a04abb..23908a8b66f 100644
--- a/pkgs/tools/admin/awscli/default.nix
+++ b/pkgs/tools/admin/awscli/default.nix
@@ -19,11 +19,11 @@ let
 
 in py.pkgs.buildPythonApplication rec {
   pname = "awscli";
-  version = "1.14.47";
+  version = "1.14.50";
 
   src = py.pkgs.fetchPypi {
     inherit pname version;
-    sha256 = "269483910c820ae5b4f60021375f07e4f1c23f86505e1b9e29243880a660c1d8";
+    sha256 = "1yiwj7cl9r1k9226mdq6pcmrs044k7p3d133lzgv9rb1dgp4053c";
   };
 
   # No tests included

From 0458c7b88557e6d11ad4b748dc7741e7e0d31ee6 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Tue, 20 Mar 2018 15:26:00 -0700
Subject: [PATCH 075/123] fix static libs on darwin

---
 pkgs/development/haskell-modules/generic-builder.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 1a788ae642e..60a4e28609e 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -244,7 +244,11 @@ stdenv.mkDerivation ({
         configureFlags+=" --extra-lib-dirs=$p/lib"
       fi
     done
-  '' + (optionalString stdenv.isDarwin ''
+  ''
+  # only use the links hack if we're actually building dylibs. otherwise, the
+  # "dynamic-library-dirs" point to nonexistent paths, and the ln command becomes
+  # "ln -s $out/lib/links", which tries to recreate the links dir and fails
+  + (optionalString (stdenv.isDarwin && enableSharedLibraries) ''
     # Work around a limit in the macOS Sierra linker on the number of paths
     # referenced by any one dynamic library:
     #

From 1a4b6a6d41623763d6fd92a8adc7fc841966edd1 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 20 Mar 2018 16:38:20 -0700
Subject: [PATCH 076/123] lua51Packages.luarocks: 2.4.3 -> 2.4.4

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/az3lanws83s5q26z1s03rx6z6yxphjbq-luarocks-2.4.4/bin/luarocks --help` got 0 exit code
- ran `/nix/store/az3lanws83s5q26z1s03rx6z6yxphjbq-luarocks-2.4.4/bin/luarocks help` got 0 exit code
- ran `/nix/store/az3lanws83s5q26z1s03rx6z6yxphjbq-luarocks-2.4.4/bin/luarocks --version` and found version 2.4.4
- ran `/nix/store/az3lanws83s5q26z1s03rx6z6yxphjbq-luarocks-2.4.4/bin/luarocks --help` and found version 2.4.4
- ran `/nix/store/az3lanws83s5q26z1s03rx6z6yxphjbq-luarocks-2.4.4/bin/luarocks help` and found version 2.4.4
- ran `/nix/store/az3lanws83s5q26z1s03rx6z6yxphjbq-luarocks-2.4.4/bin/luarocks-5.1 --help` got 0 exit code
- ran `/nix/store/az3lanws83s5q26z1s03rx6z6yxphjbq-luarocks-2.4.4/bin/luarocks-5.1 help` got 0 exit code
- ran `/nix/store/az3lanws83s5q26z1s03rx6z6yxphjbq-luarocks-2.4.4/bin/luarocks-5.1 --version` and found version 2.4.4
- ran `/nix/store/az3lanws83s5q26z1s03rx6z6yxphjbq-luarocks-2.4.4/bin/luarocks-5.1 --help` and found version 2.4.4
- ran `/nix/store/az3lanws83s5q26z1s03rx6z6yxphjbq-luarocks-2.4.4/bin/luarocks-5.1 help` and found version 2.4.4
- ran `/nix/store/az3lanws83s5q26z1s03rx6z6yxphjbq-luarocks-2.4.4/bin/luarocks-admin --help` got 0 exit code
- ran `/nix/store/az3lanws83s5q26z1s03rx6z6yxphjbq-luarocks-2.4.4/bin/luarocks-admin help` got 0 exit code
- ran `/nix/store/az3lanws83s5q26z1s03rx6z6yxphjbq-luarocks-2.4.4/bin/luarocks-admin --version` and found version 2.4.4
- ran `/nix/store/az3lanws83s5q26z1s03rx6z6yxphjbq-luarocks-2.4.4/bin/luarocks-admin --help` and found version 2.4.4
- ran `/nix/store/az3lanws83s5q26z1s03rx6z6yxphjbq-luarocks-2.4.4/bin/luarocks-admin help` and found version 2.4.4
- ran `/nix/store/az3lanws83s5q26z1s03rx6z6yxphjbq-luarocks-2.4.4/bin/luarocks-admin-5.1 --help` got 0 exit code
- ran `/nix/store/az3lanws83s5q26z1s03rx6z6yxphjbq-luarocks-2.4.4/bin/luarocks-admin-5.1 help` got 0 exit code
- ran `/nix/store/az3lanws83s5q26z1s03rx6z6yxphjbq-luarocks-2.4.4/bin/luarocks-admin-5.1 --version` and found version 2.4.4
- ran `/nix/store/az3lanws83s5q26z1s03rx6z6yxphjbq-luarocks-2.4.4/bin/luarocks-admin-5.1 --help` and found version 2.4.4
- ran `/nix/store/az3lanws83s5q26z1s03rx6z6yxphjbq-luarocks-2.4.4/bin/luarocks-admin-5.1 help` and found version 2.4.4
- found 2.4.4 with grep in /nix/store/az3lanws83s5q26z1s03rx6z6yxphjbq-luarocks-2.4.4
- directory tree listing: https://gist.github.com/cb3889fda28e8066faebd32a433c69d2
---
 pkgs/development/tools/misc/luarocks/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/misc/luarocks/default.nix b/pkgs/development/tools/misc/luarocks/default.nix
index 6d3dffa894c..afe026359e5 100644
--- a/pkgs/development/tools/misc/luarocks/default.nix
+++ b/pkgs/development/tools/misc/luarocks/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="luarocks";
-    version="2.4.3";
+    version="2.4.4";
     name="${baseName}-${version}";
-    hash="0binkd8mpzdzvx0jw0dwm4kr1p7jny015zykf8f15fymzqr4shad";
-    url="http://luarocks.org/releases/luarocks-2.4.3.tar.gz";
-    sha256="0binkd8mpzdzvx0jw0dwm4kr1p7jny015zykf8f15fymzqr4shad";
+    hash="0d7rl60dwh52qh5pfsphgx5ypp7k190h9ri6qpr2yx9kvqrxyf1r";
+    url="http://luarocks.org/releases/luarocks-2.4.4.tar.gz";
+    sha256="0d7rl60dwh52qh5pfsphgx5ypp7k190h9ri6qpr2yx9kvqrxyf1r";
   };
   buildInputs = [
     lua curl makeWrapper which unzip

From 35ad8dded9bf96072f33b14ccc336e9bad0812d2 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 20 Mar 2018 17:53:39 -0700
Subject: [PATCH 077/123] mir-qualia: 1.0.0 -> 2.0.0

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/k04xnvxmkwbyjis7x2fwfdhc8s1cdfyw-mir.qualia-2.0.0/bin/.qualia-wrapped -h` got 0 exit code
- ran `/nix/store/k04xnvxmkwbyjis7x2fwfdhc8s1cdfyw-mir.qualia-2.0.0/bin/.qualia-wrapped --help` got 0 exit code
- ran `/nix/store/k04xnvxmkwbyjis7x2fwfdhc8s1cdfyw-mir.qualia-2.0.0/bin/qualia -h` got 0 exit code
- ran `/nix/store/k04xnvxmkwbyjis7x2fwfdhc8s1cdfyw-mir.qualia-2.0.0/bin/qualia --help` got 0 exit code
- found 2.0.0 with grep in /nix/store/k04xnvxmkwbyjis7x2fwfdhc8s1cdfyw-mir.qualia-2.0.0
- directory tree listing: https://gist.github.com/18601b1231672c52d2a59f11fff236f8
---
 pkgs/tools/text/mir-qualia/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/text/mir-qualia/default.nix b/pkgs/tools/text/mir-qualia/default.nix
index b22d5893915..4e3be9e17e0 100644
--- a/pkgs/tools/text/mir-qualia/default.nix
+++ b/pkgs/tools/text/mir-qualia/default.nix
@@ -2,14 +2,14 @@
 
 pythonPackages.buildPythonApplication rec {
   name = "mir.qualia-${version}";
-  version = "1.0.0";
-  doCheck = false; # 1.0.0-released pytests are broken
+  version = "2.0.0";
+  doCheck = false; # 2.0.0-released pytests are broken
 
   buildInputs = with pythonPackages; [ pytest ];
 
   src = fetchurl {
     url = "mirror://pypi/m/mir.qualia/mir.qualia-${version}.tar.gz";
-    sha256 = "1g0nwncwk4nq7b7zszqi1q4d2bdga1q50g9nkxigdaq647wqdf7x";
+    sha256 = "1ybq6jb5clh9hw0sp3idp4hjv2gkm9yiaph48gcc208affflc8m9";
   };
 
   meta = {

From cf981d3e2b3a7761ff6f050138fc301d19c12862 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 21 Mar 2018 04:08:42 +0300
Subject: [PATCH 078/123] python.pkgs.nbxmpp: 0.6.3 -> 0.6.4

---
 .../python-modules/nbxmpp/default.nix         | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/nbxmpp/default.nix b/pkgs/development/python-modules/nbxmpp/default.nix
index 295354003ba..b6f94536e2f 100644
--- a/pkgs/development/python-modules/nbxmpp/default.nix
+++ b/pkgs/development/python-modules/nbxmpp/default.nix
@@ -1,17 +1,30 @@
-{ stdenv, buildPythonPackage, fetchPypi }:
+{ stdenv, buildPythonPackage, fetchzip, pyopenssl }:
 
 buildPythonPackage rec {
   pname = "nbxmpp";
-  version = "0.6.3";
+  version = "0.6.4";
+  name = "${pname}-${version}";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "dd66e701a4856e3cace8f4865837ccc9bcfcdb286df01f01aa19531f5d834a83";
+  # Tests aren't included in PyPI tarball.
+  src = fetchzip {
+    name = "${name}.tar.bz2";
+    url = "https://dev.gajim.org/gajim/python-nbxmpp/repository/archive.tar.bz2?"
+        + "ref=${name}";
+    sha256 = "0mikgksf01w82wnnm0phmzkijk2c93g24fzd59s71n3zy7f7dx3l";
   };
 
+  propagatedBuildInputs = [ pyopenssl ];
+
+  checkPhase = ''
+    # Disable tests requiring networking
+    echo "" > test/unit/test_xmpp_transports_nb2.py
+    python test/runtests.py
+  '';
+
   meta = with stdenv.lib; {
     homepage = "https://dev.gajim.org/gajim/python-nbxmpp";
     description = "Non-blocking Jabber/XMPP module";
     license = licenses.gpl3;
+    maintainers = with maintainers; [ abbradar ];
   };
 }

From eda6b9553b998b2ad4d36e22bd0f2b7a536fd517 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 21 Mar 2018 04:08:59 +0300
Subject: [PATCH 079/123] gajim: 0.16.9 -> 1.0.0

Massive update.
---
 .../instant-messengers/gajim/default.nix      | 149 ++++--------------
 pkgs/top-level/all-packages.nix               |   5 +-
 2 files changed, 39 insertions(+), 115 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix
index 2f5ea071568..a60df1ead53 100644
--- a/pkgs/applications/networking/instant-messengers/gajim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix
@@ -1,139 +1,60 @@
-{ stdenv, fetchurl, autoreconfHook, python, intltool, pkgconfig, libX11
-, ldns, pythonPackages
-
-, enableJingle ? true, farstream ? null, gst-plugins-bad ? null
-,                      libnice ? null
-, enableE2E ? true
-, enableRST ? true
-, enableSpelling ? true, gtkspell2 ? null
-, enableNotifications ? false
-, enableOmemoPluginDependencies ? true
-, extraPythonPackages ? pkgs: []
+{ buildPythonApplication, lib, fetchurl, gettext, wrapGAppsHook
+, python, gtk3, gobjectIntrospection
+, nbxmpp, pyasn1, pygobject3, dbus-python, pillow
+, enableJingle ? true, farstream, gstreamer, gst-plugins-base, gst-libav, gst-plugins-ugly
+, enableE2E ? true, pycrypto, python-gnupg
+, enableSecrets ? true, libsecret
+, enableRST ? true, docutils
+, enableSpelling ? true, gspell
+, enableUPnP ? true, gupnp-igd
+, enableOmemoPluginDependencies ? true, python-axolotl, qrcode
+, extraPythonPackages ? pkgs: [], pythonPackages
 }:
 
-assert enableJingle -> farstream != null && gst-plugins-bad != null
-                    && libnice != null;
-assert enableE2E -> pythonPackages.pycrypto != null;
-assert enableRST -> pythonPackages.docutils != null;
-assert enableSpelling -> gtkspell2 != null;
-assert enableNotifications -> pythonPackages.notify != null;
+with lib;
 
-with stdenv.lib;
-
-stdenv.mkDerivation rec {
+buildPythonApplication rec {
   name = "gajim-${version}";
-  majorVersion = "0.16";
-  version = "${majorVersion}.9";
+  majorVersion = "1.0";
+  version = "${majorVersion}.0";
 
   src = fetchurl {
-    name = "${name}.tar.bz2";
-    url = "https://dev.gajim.org/gajim/gajim/repository/archive.tar.bz2?"
-        + "ref=${name}";
-    sha256 = "121dh906zya9n7npyk7b5xama0z3ycy9jl7l5jm39pc86h1winh3";
-  };
-
-  # Needed for Plugin Installer
-  release = fetchurl {
     url = "https://gajim.org/downloads/${majorVersion}/gajim-${version}.tar.bz2";
-    sha256 = "0v08zdvpqaig0wxpxn1l8rsj3wr3fqvnagn8cnvch17vfqv9gcr1";
+    sha256 = "10da4imfldj04917h54vrmg70a1d832jd8p6386paa5jqzf5qk20";
   };
 
-  postUnpack = ''
-    tar -xaf $release
-    cp -r ${name}/plugins/plugin_installer gajim-${name}-*/plugins
-    rm -rf ${name}
-  '';
-
-  patches = let
-    # An attribute set of revisions to apply from the upstream repository.
-    cherries = {
-      #example-fix = {
-      #  rev = "<replace-with-git-revsion>";
-      #  sha256 = "<replace-with-sha256>";
-      #};
-    };
-  in (mapAttrsToList (name: { rev, sha256 }: fetchurl {
-    name = "gajim-${name}.patch";
-    url = "https://dev.gajim.org/gajim/gajim/commit/${rev}.diff";
-    inherit sha256;
-  }) cherries);
-
-  postPatch = ''
-    sed -i -e '0,/^[^#]/ {
-      /^[^#]/i export \\\
-        GST_PLUGIN_PATH="'"\$GST_PLUGIN_PATH''${GST_PLUGIN_PATH:+:}${""
-        }$GST_PLUGIN_PATH"'"
-    }' scripts/gajim.in
-
-    # requires network access
-    echo "" > test/integration/test_resolver.py
-
-    # We want to run tests in installCheckPhase rather than checkPhase to test
-    # whether the *installed* version of Gajim works rather than just whether it
-    # works in the unpacked source tree.
-    sed -i -e '/sys\.path\.insert.*gajim_root.*\/src/d' test/lib/__init__.py
-  '' + optionalString enableSpelling ''
-    sed -i -e 's|=.*find_lib.*|= "${gtkspell2}/lib/libgtkspell.so"|'   \
-      src/gtkspell.py
-  '';
-
   buildInputs = [
-    python libX11
-  ] ++ optionals enableJingle [ farstream gst-plugins-bad libnice ];
+    gobjectIntrospection gtk3
+  ] ++ optionals enableJingle [ farstream gstreamer gst-plugins-base gst-libav gst-plugins-ugly ]
+    ++ optional enableSecrets libsecret
+    ++ optional enableSpelling gspell
+    ++ optional enableUPnP gupnp-igd;
 
   nativeBuildInputs = [
-    autoreconfHook pythonPackages.wrapPython intltool pkgconfig
+    gettext wrapGAppsHook
   ];
 
-  autoreconfPhase = ''
-    sed -e 's/which/type -P/;s,\./configure,:,' autogen.sh | bash
+  propagatedBuildInputs = [
+    nbxmpp pyasn1 pygobject3 dbus-python pillow
+  ] ++ optionals enableE2E [ pycrypto python-gnupg ]
+    ++ optional enableRST docutils
+    ++ optionals enableOmemoPluginDependencies [ python-axolotl qrcode ]
+    ++ extraPythonPackages pythonPackages;
+
+  checkPhase = ''
+    ${python.interpreter} test/runtests.py
   '';
 
-  propagatedBuildInputs = with pythonPackages; [
-    libasyncns
-    pygobject2 pyGtkGlade
-    pyasn1
-    pyxdg
-    nbxmpp
-    pyopenssl dbus-python
-  ] ++ optional enableE2E pythonPackages.pycrypto
-    ++ optional enableRST pythonPackages.docutils
-    ++ optional enableNotifications pythonPackages.notify
-    ++ optionals enableOmemoPluginDependencies (with pythonPackages; [
-      cryptography python-axolotl python-axolotl-curve25519 qrcode
-    ]) ++ extraPythonPackages pythonPackages;
-
-  postFixup = ''
-    install -m 644 -t "$out/share/gajim/icons/hicolor" \
-                      "icons/hicolor/index.theme"
-
-    buildPythonPath "$out"
-
-    for i in $out/bin/*; do
-      name="$(basename "$i")"
-      if [ "$name" = "gajim-history-manager" ]; then
-        name="history_manager"
-      fi
-
-      patchPythonScript "$out/share/gajim/src/$name.py"
-    done
-  '';
-
-  doInstallCheck = true;
-  installCheckPhase = ''
-    PYTHONPATH="test:$out/share/gajim/src:''${PYTHONPATH:+:}$PYTHONPATH" \
-      make test_nogui
-  '';
-
-  enableParallelBuilding = true;
+  # Tests try to use GTK+ which fails.
+  doCheck = false;
 
   meta = {
     homepage = http://gajim.org/;
     description = "Jabber client written in PyGTK";
     license = licenses.gpl3Plus;
-    maintainers = [ maintainers.raskin maintainers.aszlig ];
+    maintainers = with maintainers; [ raskin aszlig abbradar ];
     downloadPage = "http://gajim.org/downloads.php";
     updateWalker = true;
-    platforms = stdenv.lib.platforms.linux;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 92ee23b4572..e6364d840ce 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20289,7 +20289,10 @@ with pkgs;
 
   foomatic-filters = callPackage ../misc/drivers/foomatic-filters {};
 
-  gajim = callPackage ../applications/networking/instant-messengers/gajim { };
+  gajim = python3.pkgs.callPackage ../applications/networking/instant-messengers/gajim {
+    inherit (gst_all_1) gstreamer gst-plugins-base gst-libav gst-plugins-ugly;
+    inherit (gnome3) gspell;
+  };
 
   gammu = callPackage ../applications/misc/gammu { };
 

From b46aea76e996d73def17a0c91b9bc3f26abe662a Mon Sep 17 00:00:00 2001
From: Yegor Timoshenko <yegortimoshenko@riseup.net>
Date: Wed, 21 Mar 2018 02:44:02 +0000
Subject: [PATCH 080/123] epsxe: remove duplicated `with stdenv.lib;`

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

diff --git a/pkgs/misc/emulators/epsxe/default.nix b/pkgs/misc/emulators/epsxe/default.nix
index e367d6a1498..2f11384d845 100644
--- a/pkgs/misc/emulators/epsxe/default.nix
+++ b/pkgs/misc/emulators/epsxe/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   name = "epsxe-${version}";
   version = "2.0.5";
 
-  src = with stdenv.lib; let
+  src = let
     version2 = concatStrings (splitString "." version);
     platform = "linux" + (optionalString stdenv.is64bit "_x64");
   in fetchurl {

From 1ce37ab8a9ab9ca8f450474d28f0655193fa8ad6 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 14 Mar 2018 08:03:53 +0000
Subject: [PATCH 081/123] coqPackages.contribs.containers: make available for
 Coq 8.7

---
 .../coq-modules/contribs/default.nix            | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/coq-modules/contribs/default.nix b/pkgs/development/coq-modules/contribs/default.nix
index 88ef8011aa8..82d1f7a4746 100644
--- a/pkgs/development/coq-modules/contribs/default.nix
+++ b/pkgs/development/coq-modules/contribs/default.nix
@@ -189,11 +189,18 @@ let mkContrib = repo: revs: param:
     sha256 = "1ddwzg12pbzpnz3njin4zhpph92kscrbsn3bzds26yj8fp76zc33";
   };
 
-  containers = mkContrib "containers" [ "8.6" ] {
-    version = "8.6.0";
-    rev = "fa1fec7";
-    sha256 = "1ns0swlr8hzb1zc7fsyd3vws1vbq0vvfxcf0lszqnca9c9hfkfy4";
-  };
+  containers = mkContrib "containers" [ "8.6" "8.7" ] {
+    "8.6" = {
+      version = "8.6.0";
+      rev = "fa1fec7";
+      sha256 = "1ns0swlr8hzb1zc7fsyd3vws1vbq0vvfxcf0lszqnca9c9hfkfy4";
+    };
+    "8.7" = {
+      version = "20180313";
+      rev = "77ac16366529c9e558f70ba86f0168a76ca76b8f";
+      sha256 = "01gp8injb0knaxgqsdc4x9h8714k7qxg7j5w7y6i45dnpd81ndr4";
+    };
+  }."${coq.coq-version}";
 
   continuations = mkContrib "continuations" [ ] {
     version = "v8.5.0-13-g6885310";

From 3a7854032afc792e42e0a724919969ade3a5b694 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Tue, 20 Mar 2018 15:12:19 +0100
Subject: [PATCH 082/123] octave: 4.2.1 -> 4.2.2

See http://lists.gnu.org/archive/html/info-gnu/2018-03/msg00006.html
for release announcement
---
 pkgs/development/interpreters/octave/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index c13d862267f..ce3ce584434 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -18,11 +18,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  version = "4.2.1";
+  version = "4.2.2";
   name = "octave-${version}";
   src = fetchurl {
     url = "mirror://gnu/octave/${name}.tar.gz";
-    sha256 = "0frk0nk3aaic8hj3g45h11rnz3arp7pjsq0frbx50sspk1iqzhl0";
+    sha256 = "0vkjfrpv7aikcn73bxqkph1qrhrdx7jqy193n8d8lwp7v2al7f3p";
   };
 
   buildInputs = [ gfortran readline ncurses perl flex texinfo qhull

From 727c76765db60ce201c810bf282f3885b64e3644 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Wed, 21 Mar 2018 10:14:52 +0100
Subject: [PATCH 083/123] simp_le: patch shebangs

---
 pkgs/tools/admin/simp_le/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/admin/simp_le/default.nix b/pkgs/tools/admin/simp_le/default.nix
index 91656eb0c55..b618e71568d 100644
--- a/pkgs/tools/admin/simp_le/default.nix
+++ b/pkgs/tools/admin/simp_le/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, pythonPackages }:
+{ stdenv, fetchFromGitHub, fetchpatch, pythonPackages, bash }:
  
 pythonPackages.buildPythonApplication rec {
   pname = "simp_le-client";
@@ -9,6 +9,11 @@ pythonPackages.buildPythonApplication rec {
     sha256 = "0nv9mm99rm8i9flgfgwvmajbsxb5rm162nfxlq3wk66bbbyr6y1i";
   };
 
+  postPatch = ''
+    substituteInPlace simp_le.py \
+      --replace "/bin/sh" "${bash}/bin/sh"
+  '';
+
   checkPhase = ''
     $out/bin/simp_le --test
   '';

From 07361daf04d30142e54fbd8bec3d76ffb61f395c Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 21 Mar 2018 12:52:28 +0100
Subject: [PATCH 084/123] androidStudioPackages.beta: 3.1.0.14 -> 3.1.0.15

---
 .../editors/android-studio/default.nix            | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index 382066d1dbd..d054e6481ec 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -1,4 +1,5 @@
 { stdenv, callPackage, fetchurl, makeFontsConf, gnome2 }:
+
 let
   mkStudio = opts: callPackage (import ./common.nix opts) {
     fontsConf = makeFontsConf {
@@ -10,12 +11,11 @@ in rec {
   # Old alias
   preview = beta;
 
-  # Attributes are named by the channels
+  # Attributes are named by the corresponding release channels
 
-  # linux-bundle
   stable = mkStudio {
     pname = "android-studio";
-    #pname = "android-studio-stable"; # TODO: Rename
+    #pname = "android-studio-stable"; # TODO: Rename and provide symlink
     version = "3.0.1.0"; # "Android Studio 3.0.1"
     build = "171.4443003";
     sha256Hash = "1krahlqr70nq3csqiinq2m4fgs68j11hd9gg2dx2nrpw5zni0wdd";
@@ -33,13 +33,12 @@ in rec {
     };
   };
 
-  # linux-beta-bundle
   beta = mkStudio {
     pname = "android-studio-preview";
-    #pname = "android-studio-beta"; # TODO: Rename
-    version = "3.1.0.14"; # "Android Studio 3.1 RC 2"
-    build = "173.4640767";
-    sha256Hash = "00v8qbis4jm31v1g9989f9y15av6p3ywj8mmfxcsc3hjlpzdgid8";
+    #pname = "android-studio-beta"; # TODO: Rename and provide symlink
+    version = "3.1.0.15"; # "Android Studio 3.1 RC 3"
+    build = "173.4658569";
+    sha256Hash = "0jvq7k5vhrli41bj2imnsp3z70c7yws3fvs8m873qrjvfgmi5qrq";
 
     meta = stable.meta // {
       description = "The Official IDE for Android (beta channel)";

From 629d1219805b9344984c11c0cc9c626f9d2271cb Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 21 Mar 2018 13:06:37 +0100
Subject: [PATCH 085/123] androidStudioPackages.{dev,canary}: 3.2.0.5 ->
 3.2.0.6

---
 .../editors/android-studio/default.nix        | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index d054e6481ec..4583066842a 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -7,6 +7,11 @@ let
     };
     inherit (gnome2) GConf gnome_vfs;
   };
+  latestVersion = {
+    version = "3.2.0.6"; # "Android Studio 3.2 Canary 7"
+    build = "173.4658582";
+    sha256Hash = "0a6ssw5mb9my5kfd5fkfdddkgdi2jdq23jlhd6rrqcs6rhdlpl38";
+  };
 in rec {
   # Old alias
   preview = beta;
@@ -46,25 +51,19 @@ in rec {
     };
   };
 
-  dev = mkStudio {
+  dev = mkStudio (latestVersion // {
     pname = "android-studio-dev";
-    version = "3.2.0.5"; # "Android Studio 3.2 Canary 6"
-    build = "173.4640885";
-    sha256Hash = "1fbjk1dhvi975dm09s9iz9ja53fjqca07nw5h068gdj3358pj3k8";
 
     meta = beta.meta // {
       description = "The Official IDE for Android (dev channel)";
     };
-  };
+  });
 
-  canary = mkStudio {
+  canary = mkStudio (latestVersion // {
     pname = "android-studio-canary";
-    version = "3.2.0.5"; # "Android Studio 3.2 Canary 6"
-    build = "173.4640885";
-    sha256Hash = "1fbjk1dhvi975dm09s9iz9ja53fjqca07nw5h068gdj3358pj3k8";
 
     meta = beta.meta // {
       description = "The Official IDE for Android (canary channel)";
     };
-  };
+  });
 }

From 3583cf8f4b3e7d7691d3463797f5d98d505ba811 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Wed, 21 Mar 2018 13:34:04 +0100
Subject: [PATCH 086/123] lf: 2018-01-11 -> 2018-03-19

---
 pkgs/tools/misc/lf/default.nix | 6 +++---
 pkgs/tools/misc/lf/deps.nix    | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/misc/lf/default.nix b/pkgs/tools/misc/lf/default.nix
index 7e5a464764a..bed07bc8448 100644
--- a/pkgs/tools/misc/lf/default.nix
+++ b/pkgs/tools/misc/lf/default.nix
@@ -2,13 +2,13 @@
 
 buildGoPackage rec {
   name = "lf-unstable-${version}";
-  version = "2018-01-11";
+  version = "2018-03-19";
 
   src = fetchFromGitHub {
     owner = "gokcehan";
     repo = "lf";
-    rev = "58538c802044a3a2590ebe4979f3c85d807ea2d9"; # nightly
-    sha256 = "0xp5accliwz1d0nbsc6cnsv38czcfqn5nyxfndkpw8jkh8w2pm9p";
+    rev = "c76ad181f5753984e39608628ac4def4183b53a4"; # nightly
+    sha256 = "1wsmljina9n2zij7gzh7b4zbzi7sdsa6hnyaj75nsmqn9lshngap";
   };
 
   goPackagePath = "github.com/gokcehan/lf";
diff --git a/pkgs/tools/misc/lf/deps.nix b/pkgs/tools/misc/lf/deps.nix
index 6c1e07667b3..ec9dc30e0cd 100644
--- a/pkgs/tools/misc/lf/deps.nix
+++ b/pkgs/tools/misc/lf/deps.nix
@@ -4,8 +4,8 @@
     fetch = {
       type = "git";
       url = "https://github.com/nsf/termbox-go";
-      rev = "aa4a75b1c20a2b03751b1a9f7e41d58bd6f71c43"; # master
-      sha256 = "1xfd0mq6jkq55dx14nksyyfc66qla7cz0xxscpw07b25qmww9518";
+      rev = "e2050e41c8847748ec5288741c0b19a8cb26d084"; # master
+      sha256 = "181b1df2b6fcn5wizq2qqxl1kwqbih5k15n08rx3bcz36q34n23s";
     };
   }
   {

From 8265979114071ebdc633f663a6bdb0deb0b0b8fc Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 21 Mar 2018 07:33:50 -0500
Subject: [PATCH 087/123] pan: 0.139 -> 0.144

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

diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix
index ad35c49c014..42788cfe1a5 100644
--- a/pkgs/applications/networking/newsreaders/pan/default.nix
+++ b/pkgs/applications/networking/newsreaders/pan/default.nix
@@ -1,22 +1,22 @@
 { spellChecking ? true
 , stdenv, fetchurl, pkgconfig, gtk2, gtkspell2 ? null
-, perl, pcre, gmime, gettext, intltool, dbus-glib, libnotify
+, perl, pcre, gmime, gettext, intltool, itstool, libxml2, dbus-glib, libnotify
 }:
 
 assert spellChecking -> gtkspell2 != null;
 
-let version = "0.139"; in
+let version = "0.144"; in
 
 stdenv.mkDerivation {
   name = "pan-${version}";
 
   src = fetchurl {
     url = "http://pan.rebelbase.com/download/releases/${version}/source/pan-${version}.tar.bz2";
-    sha256 = "1fab2i6ngqp66lhls0g7j8d1c1rk75afiqr3r1x2sn3zk47k4pxz";
+    sha256 = "0l07y75z8jxhbmfv28slw81gjncs7i89x7fq44zif7xhq5vy7yli";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ gtk2 perl gmime gettext intltool dbus-glib libnotify ]
+  buildInputs = [ gtk2 perl gmime gettext intltool itstool libxml2 dbus-glib libnotify ]
     ++ stdenv.lib.optional spellChecking gtkspell2;
 
   enableParallelBuilding = true;

From 4beb695eceea1aa00201e7f0ee5165fc948e9eb3 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Wed, 21 Mar 2018 14:57:57 +0100
Subject: [PATCH 088/123] titaniumenv: fix Android signing on darwin

---
 pkgs/development/mobile/titaniumenv/build-app.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix
index a6bf05c2465..83bd941e5ff 100644
--- a/pkgs/development/mobile/titaniumenv/build-app.nix
+++ b/pkgs/development/mobile/titaniumenv/build-app.nix
@@ -58,7 +58,13 @@ stdenv.mkDerivation {
           export GRADLE_USER_HOME=$TMPDIR/gradle
 
           ${if release then
-            ''titanium build --config-file $TMPDIR/config.json --no-colors --force --platform android --target dist-playstore --keystore ${androidKeyStore} --alias ${androidKeyAlias} --store-password ${androidKeyStorePassword} --output-dir $out''
+            ''
+              ${stdenv.lib.optionalString stdenv.isDarwin ''
+                # Signing the app does not work with OpenJDK on macOS, use host SDK instead
+                export JAVA_HOME="$(/usr/libexec/java_home -v 1.8)"
+              ''}
+              titanium build --config-file $TMPDIR/config.json --no-colors --force --platform android --target dist-playstore --keystore ${androidKeyStore} --alias ${androidKeyAlias} --store-password ${androidKeyStorePassword} --output-dir $out
+            ''
           else
             ''titanium build --config-file $TMPDIR/config.json --no-colors --force --platform android --target emulator --build-only -B foo --output $out''}
         ''

From 07be047a91d0dfeef49f026ecbb882e2211daa60 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 21 Mar 2018 13:25:25 +0000
Subject: [PATCH 089/123] Merge pull request #37559 from dylex/release-18.03

julia: update rmath-julia hash for 0.1
(cherry picked from commit ea9f3fca6587494f25ef470397b32904e2325e23)
---
 pkgs/development/compilers/julia/0.5.nix     | 2 +-
 pkgs/development/compilers/julia/0.6.nix     | 2 +-
 pkgs/development/compilers/julia/default.nix | 2 +-
 pkgs/development/compilers/julia/git.nix     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/julia/0.5.nix b/pkgs/development/compilers/julia/0.5.nix
index 0cf933ee4d2..cff6c1c446f 100644
--- a/pkgs/development/compilers/julia/0.5.nix
+++ b/pkgs/development/compilers/julia/0.5.nix
@@ -42,7 +42,7 @@ let
   rmathVersion = "0.1";
   rmath-julia = fetchurl {
     url = "https://api.github.com/repos/JuliaLang/Rmath-julia/tarball/v${rmathVersion}";
-    sha256 = "0ai5dhjc43zcvangz123ryxmlbm51s21rg13bllwyn98w67arhb4";
+    sha256 = "1qyps217175qhid46l8f5i1v8i82slgp23ia63x2hzxwfmx8617p";
   };
   
   virtualenvVersion = "15.0.0";
diff --git a/pkgs/development/compilers/julia/0.6.nix b/pkgs/development/compilers/julia/0.6.nix
index 6acb192933e..36bbb7d817f 100644
--- a/pkgs/development/compilers/julia/0.6.nix
+++ b/pkgs/development/compilers/julia/0.6.nix
@@ -42,7 +42,7 @@ let
   rmathVersion = "0.1";
   rmath-julia = fetchurl {
     url = "https://api.github.com/repos/JuliaLang/Rmath-julia/tarball/v${rmathVersion}";
-    sha256 = "0ai5dhjc43zcvangz123ryxmlbm51s21rg13bllwyn98w67arhb4";
+    sha256 = "1qyps217175qhid46l8f5i1v8i82slgp23ia63x2hzxwfmx8617p";
   };
   
   virtualenvVersion = "15.0.0";
diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix
index 63252084b5d..a263703ffa5 100644
--- a/pkgs/development/compilers/julia/default.nix
+++ b/pkgs/development/compilers/julia/default.nix
@@ -42,7 +42,7 @@ let
   rmathVersion = "0.1";
   rmath-julia = fetchurl {
     url = "https://api.github.com/repos/JuliaLang/Rmath-julia/tarball/v${rmathVersion}";
-    sha256 = "0ai5dhjc43zcvangz123ryxmlbm51s21rg13bllwyn98w67arhb4";
+    sha256 = "1qyps217175qhid46l8f5i1v8i82slgp23ia63x2hzxwfmx8617p";
   };
 in
 
diff --git a/pkgs/development/compilers/julia/git.nix b/pkgs/development/compilers/julia/git.nix
index 19519823f37..4b9a369e8d2 100644
--- a/pkgs/development/compilers/julia/git.nix
+++ b/pkgs/development/compilers/julia/git.nix
@@ -40,7 +40,7 @@ let
   rmathVersion = "0.1";
   rmath-julia = fetchurl {
     url = "https://api.github.com/repos/JuliaLang/Rmath-julia/tarball/v${rmathVersion}";
-    sha256 = "0ai5dhjc43zcvangz123ryxmlbm51s21rg13bllwyn98w67arhb4";
+    sha256 = "1qyps217175qhid46l8f5i1v8i82slgp23ia63x2hzxwfmx8617p";
   };
   
   virtualenvVersion = "15.0.0";

From 607d8cbfd718f96c3171d23a32d40d92755d4687 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?=
 <robert.schuetz@stud.uni-heidelberg.de>
Date: Wed, 21 Mar 2018 15:22:09 +0100
Subject: [PATCH 090/123] pythonPackages.pyhomematic: 0.1.39 -> 0.1.40

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

diff --git a/pkgs/development/python-modules/pyhomematic/default.nix b/pkgs/development/python-modules/pyhomematic/default.nix
index be6fb7c8bb6..90616c09269 100644
--- a/pkgs/development/python-modules/pyhomematic/default.nix
+++ b/pkgs/development/python-modules/pyhomematic/default.nix
@@ -2,7 +2,7 @@
 
 buildPythonPackage rec {
   pname = "pyhomematic";
-  version = "0.1.39";
+  version = "0.1.40";
 
   disabled = !isPy3k;
 
@@ -11,7 +11,7 @@ buildPythonPackage rec {
     owner = "danielperna84";
     repo = pname;
     rev = version;
-    sha256 = "1g181x2mrhxcaswr6vi2m7if97wv4rf2g2pny60334sciga8njfz";
+    sha256 = "0rflfak505cgc69594yc9chz5mblqvc2d7bbbfcddzhlhs5qcsq2";
   };
 
   # Unreliable timing: https://github.com/danielperna84/pyhomematic/issues/126

From 9f6d1ac711cff435cca49cf19d3a4d654dbc4386 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 21 Mar 2018 14:52:53 +0100
Subject: [PATCH 091/123] node-webkit/nw9.nix: remove

Obsolete since #37380 and severly outdated (#37361)

/cc @Profpatsch
---
 pkgs/development/tools/node-webkit/nw9.nix | 57 ----------------------
 1 file changed, 57 deletions(-)
 delete mode 100644 pkgs/development/tools/node-webkit/nw9.nix

diff --git a/pkgs/development/tools/node-webkit/nw9.nix b/pkgs/development/tools/node-webkit/nw9.nix
deleted file mode 100644
index ba5d6c8e334..00000000000
--- a/pkgs/development/tools/node-webkit/nw9.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{ stdenv, fetchurl, buildEnv, makeWrapper
-, xorg, alsaLib, dbus, glib, gtk2, atk, pango, freetype, fontconfig
-, gdk_pixbuf, cairo, zlib, nss, nssTools, nspr, gconf, expat, systemd }:
-let
-  bits = if stdenv.system == "x86_64-linux" then "x64"
-         else "ia32";
-
-  nwEnv = buildEnv {
-    name = "node-webkit-env";
-    paths = [
-      xorg.libX11 xorg.libXrender glib gtk2 atk pango cairo gdk_pixbuf
-      freetype fontconfig xorg.libXcomposite alsaLib xorg.libXdamage
-      xorg.libXext xorg.libXfixes nss nspr gconf expat dbus stdenv.cc.cc
-      xorg.libXtst xorg.libXi
-    ];
-    
-    extraOutputsToInstall = [ "lib" "out" ];
-  };
-
-in stdenv.mkDerivation rec {
-  name = "node-webkit-${version}";
-  version = "0.9.2";
-
-  src = fetchurl {
-    url = "http://dl.node-webkit.org/v${version}/node-webkit-v${version}-linux-${bits}.tar.gz";
-    sha256 = if bits == "x64" then
-      "04b9hgrxxnvrzyc7kmlabvrfbzj9d6lif7z69zgsbn3x25nxxd2n" else
-      "0icwdl564sbx27124js1l4whfld0n6nbysdd522frzk1759dzgri";
-  };
-
-  installPhase = ''
-    mkdir -p $out/share/node-webkit
-    cp -R * $out/share/node-webkit
-
-    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/node-webkit/nw
-    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/node-webkit/nwsnapshot
-
-    ln -s ${systemd.lib}/lib/libudev.so $out/share/node-webkit/libudev.so.0
-
-    patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/node-webkit" $out/share/node-webkit/nw
-    patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/node-webkit" $out/share/node-webkit/nwsnapshot
-
-    mkdir -p $out/bin
-    ln -s $out/share/node-webkit/nw $out/bin
-    ln -s $out/share/node-webkit/nwsnapshot $out/bin
-  '';
-
-  buildInputs = [ makeWrapper ];
-
-  meta = with stdenv.lib; {
-    description = "An app runtime based on Chromium and node.js";
-    homepage = https://github.com/rogerwang/node-webkit;
-    platforms = ["i686-linux" "x86_64-linux"];
-    maintainers = [ maintainers.offline ];
-    license = licenses.bsd3;
-  };
-}

From 96f0d4e98cd0be7c05b4b2d0a3a6d8db2c6726c5 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 21 Mar 2018 07:44:40 -0500
Subject: [PATCH 092/123] pan: wrap to provide gpg2, which it crashes without

Fixes #37556.
---
 pkgs/applications/networking/newsreaders/pan/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix
index 42788cfe1a5..34e24823e46 100644
--- a/pkgs/applications/networking/newsreaders/pan/default.nix
+++ b/pkgs/applications/networking/newsreaders/pan/default.nix
@@ -1,6 +1,7 @@
 { spellChecking ? true
 , stdenv, fetchurl, pkgconfig, gtk2, gtkspell2 ? null
 , perl, pcre, gmime, gettext, intltool, itstool, libxml2, dbus-glib, libnotify
+, makeWrapper, gnupg
 }:
 
 assert spellChecking -> gtkspell2 != null;
@@ -15,10 +16,14 @@ stdenv.mkDerivation {
     sha256 = "0l07y75z8jxhbmfv28slw81gjncs7i89x7fq44zif7xhq5vy7yli";
   };
 
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ gtk2 perl gmime gettext intltool itstool libxml2 dbus-glib libnotify ]
+  nativeBuildInputs = [ pkgconfig makeWrapper ];
+  buildInputs = [ gtk2 perl gmime gettext gnupg intltool itstool libxml2 dbus-glib libnotify ]
     ++ stdenv.lib.optional spellChecking gtkspell2;
 
+  postInstall = ''
+    wrapProgram $out/bin/pan --suffix PATH : ${gnupg}/bin
+  '';
+
   enableParallelBuilding = true;
 
   meta = {

From 7d873b8fd245aff7ef8dc41863a6c86e3e8fb8d5 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 21 Mar 2018 08:45:47 -0500
Subject: [PATCH 093/123] pan: ensure features we provide deps for are used,
 move to gtk3

---
 .../networking/newsreaders/pan/default.nix    | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix
index 34e24823e46..1d913118433 100644
--- a/pkgs/applications/networking/newsreaders/pan/default.nix
+++ b/pkgs/applications/networking/newsreaders/pan/default.nix
@@ -1,10 +1,11 @@
 { spellChecking ? true
-, stdenv, fetchurl, pkgconfig, gtk2, gtkspell2 ? null
-, perl, pcre, gmime, gettext, intltool, itstool, libxml2, dbus-glib, libnotify
+, stdenv, fetchurl, pkgconfig, gtk3, gtkspell3 ? null
+, perl, pcre, gmime2, gettext, intltool, itstool, libxml2, dbus-glib, libnotify, gnutls
 , makeWrapper, gnupg
+, gnomeSupport ? true, libgnome-keyring3
 }:
 
-assert spellChecking -> gtkspell2 != null;
+assert spellChecking -> gtkspell3 != null;
 
 let version = "0.144"; in
 
@@ -17,8 +18,17 @@ stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [ pkgconfig makeWrapper ];
-  buildInputs = [ gtk2 perl gmime gettext gnupg intltool itstool libxml2 dbus-glib libnotify ]
-    ++ stdenv.lib.optional spellChecking gtkspell2;
+  buildInputs = [ gtk3 perl gmime2 gettext intltool itstool libxml2 dbus-glib libnotify gnutls ]
+    ++ stdenv.lib.optional spellChecking gtkspell3
+    ++ stdenv.lib.optional gnomeSupport libgnome-keyring3;
+
+  configureFlags = [
+    "--with-dbus"
+    "--with-gtk3"
+    "--with-gnutls"
+    "--enable-libnotify"
+  ] ++ stdenv.lib.optional spellChecking "--with-gtkspell"
+    ++ stdenv.lib.optional gnomeSupport "--enable-gkr";
 
   postInstall = ''
     wrapProgram $out/bin/pan --suffix PATH : ${gnupg}/bin

From 603556085bc8cca64202a1d930f4546789955b25 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Wed, 21 Mar 2018 15:50:44 +0100
Subject: [PATCH 094/123] titaniumenv: update example app

---
 .../mobile/titaniumenv/examples/kitchensink/default.nix     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix
index 42f80cbd9d0..469fad09bf7 100644
--- a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix
+++ b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix
@@ -7,9 +7,9 @@ assert rename -> (stdenv != null && newBundleId != null && iosMobileProvisioning
 
 let
   src = fetchgit {
-    url = https://github.com/appcelerator/KitchenSink.git;
-    rev = "ec9edebf35030f61368000a8a9071dd7a0773884";
-    sha256 = "3e020004b73c9c2386f2672fdf9203083295f1524f5e504a07842e062de181c8";
+    url = https://github.com/appcelerator/kitchensink-v2.git;
+    rev = "94364df2ef60a80bd354a4273e3cb5f4c5185537";
+    sha256 = "0q4gzidpsq401frkngy4yk5kqvm8dz00ls74bw3fnpvg4714d6gf";
   };
 
   # Rename the bundle id to something else

From 479ec3d888849a0b9c3ad471231135c9704fc550 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Wed, 21 Mar 2018 16:08:56 +0100
Subject: [PATCH 095/123] titaniumenv: fix renaming strategy

---
 .../mobile/titaniumenv/examples/kitchensink/default.nix          | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix
index 469fad09bf7..70ab1b168c4 100644
--- a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix
+++ b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix
@@ -18,7 +18,6 @@ let
     inherit src;
     buildPhase = ''
       sed -i -e "s|com.appcelerator.kitchensink|${newBundleId}|" tiapp.xml
-      sed -i -e "s|com.appcelerator.kitchensink|${newBundleId}|" manifest
     '';
     installPhase = ''
       mkdir -p $out

From 63ba3490de0ddeb9b2b64c0c316cc6d9756ef04a Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 21 Mar 2018 10:18:21 -0500
Subject: [PATCH 096/123] pan: enable spell-checking features by default

Seems to work, not sure why disabled.

Steps are something like:
* install dictionaries into profile
* attempt to compose a message
  * (navigate dialogs about server and posting profile)
* enable spell-checking from edit->checkbox
  (note this toggle is avail even when pan can't spellcheck)
---
 pkgs/top-level/all-packages.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dbd82e2a875..77e68001373 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17023,9 +17023,7 @@ with pkgs;
 
   ncpamixer = callPackage ../applications/audio/ncpamixer { };
 
-  pan = callPackage ../applications/networking/newsreaders/pan {
-    spellChecking = false;
-  };
+  pan = callPackage ../applications/networking/newsreaders/pan { };
 
   panotools = callPackage ../applications/graphics/panotools { };
 

From a7bc556ce994babb0616a4e49579ce928405085f Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 21 Mar 2018 09:52:05 -0500
Subject: [PATCH 097/123] gtkspell3: add missing isocodes dep

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

diff --git a/pkgs/development/libraries/gtkspell/3.nix b/pkgs/development/libraries/gtkspell/3.nix
index 5376482e58a..2e6ecd7b520 100644
--- a/pkgs/development/libraries/gtkspell/3.nix
+++ b/pkgs/development/libraries/gtkspell/3.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, gtk3, aspell, pkgconfig, enchant, intltool}:
+{stdenv, fetchurl, gtk3, aspell, pkgconfig, enchant, isocodes, intltool}:
 
 stdenv.mkDerivation rec {
   name = "gtkspell-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig intltool ];
-  buildInputs = [ aspell gtk3 enchant ];
+  buildInputs = [ aspell gtk3 enchant isocodes ];
   propagatedBuildInputs = [ enchant ];
 
   meta = with stdenv.lib; {

From 6fa9d9cdbde0e7a9ca418fb100aa2e8a350121de Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Wed, 21 Mar 2018 12:58:19 -0400
Subject: [PATCH 098/123] hologram-server module: add cache timeout option

The version of hologram we're using has supported this option for a
while, but we didn't expose it through the NixOS module
---
 nixos/modules/services/security/hologram-server.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/security/hologram-server.nix b/nixos/modules/services/security/hologram-server.nix
index bb56e2df09b..bad02c7440b 100644
--- a/nixos/modules/services/security/hologram-server.nix
+++ b/nixos/modules/services/security/hologram-server.nix
@@ -23,8 +23,9 @@ let
       account     = cfg.awsAccount;
       defaultrole = cfg.awsDefaultRole;
     };
-    stats  = cfg.statsAddress;
-    listen = cfg.listenAddress;
+    stats        = cfg.statsAddress;
+    listen       = cfg.listenAddress;
+    cachetimeout = cfg.cacheTimeoutSeconds;
   });
 in {
   options = {
@@ -106,6 +107,12 @@ in {
         default     = "";
         description = "Address of statsd server";
       };
+
+      cacheTimeoutSeconds = mkOption {
+        type        = types.int;
+        default     = 3600;
+        description = "How often (in seconds) to refresh the LDAP cache";
+      };
     };
   };
 

From 4a3ad82bcd663360b42940655fe2f77a73e033ea Mon Sep 17 00:00:00 2001
From: Matthew Pickering <matthewtpickering@gmail.com>
Date: Wed, 21 Mar 2018 17:16:20 +0000
Subject: [PATCH 099/123] dontCheck pure-zlib

Fixes #37499
---
 pkgs/development/haskell-modules/configuration-common.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 935fec829dc..48fa8c0e303 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -344,6 +344,7 @@ self: super: {
   orgmode-parse = dontCheck super.orgmode-parse;
   os-release = dontCheck super.os-release;
   persistent-redis = dontCheck super.persistent-redis;
+  pure-zlib = dontCheck super.pure-zlib; # https://github.com/NixOS/nixpkgs/issues/37499
   pipes-extra = dontCheck super.pipes-extra;
   pipes-websockets = dontCheck super.pipes-websockets;
   postgresql-binary = dontCheck super.postgresql-binary; # needs a running postgresql server

From 8f75a5808179bc5be12feaaaea02dc52dfa589a9 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 21 Mar 2018 04:34:27 -0700
Subject: [PATCH 100/123] verilator: 3.920 -> 3.922

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/fnypnfihpivkzgwrpi3g6r7ag5psfdim-verilator-3.922/bin/verilator_bin -V` and found version 3.922
- ran `/nix/store/fnypnfihpivkzgwrpi3g6r7ag5psfdim-verilator-3.922/bin/verilator_bin --version` and found version 3.922
- ran `/nix/store/fnypnfihpivkzgwrpi3g6r7ag5psfdim-verilator-3.922/bin/verilator_bin_dbg -V` and found version 3.922
- ran `/nix/store/fnypnfihpivkzgwrpi3g6r7ag5psfdim-verilator-3.922/bin/verilator_bin_dbg --version` and found version 3.922
- ran `/nix/store/fnypnfihpivkzgwrpi3g6r7ag5psfdim-verilator-3.922/bin/verilator_coverage_bin_dbg -V` and found version 3.922
- ran `/nix/store/fnypnfihpivkzgwrpi3g6r7ag5psfdim-verilator-3.922/bin/verilator_coverage_bin_dbg --version` and found version 3.922
- ran `/nix/store/fnypnfihpivkzgwrpi3g6r7ag5psfdim-verilator-3.922/bin/verilator -V` and found version 3.922
- ran `/nix/store/fnypnfihpivkzgwrpi3g6r7ag5psfdim-verilator-3.922/bin/verilator --version` and found version 3.922
- ran `/nix/store/fnypnfihpivkzgwrpi3g6r7ag5psfdim-verilator-3.922/bin/verilator_coverage -V` and found version 3.922
- ran `/nix/store/fnypnfihpivkzgwrpi3g6r7ag5psfdim-verilator-3.922/bin/verilator_coverage --version` and found version 3.922
- ran `/nix/store/fnypnfihpivkzgwrpi3g6r7ag5psfdim-verilator-3.922/bin/verilator_profcfunc help` got 0 exit code
- found 3.922 with grep in /nix/store/fnypnfihpivkzgwrpi3g6r7ag5psfdim-verilator-3.922
- directory tree listing: https://gist.github.com/04b5044a54bb4ff549696cbcd57cd88e
---
 pkgs/applications/science/electronics/verilator/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix
index dade8296e99..75e99dcf659 100644
--- a/pkgs/applications/science/electronics/verilator/default.nix
+++ b/pkgs/applications/science/electronics/verilator/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "verilator-${version}";
-  version = "3.920";
+  version = "3.922";
 
   src = fetchurl {
     url    = "http://www.veripool.org/ftp/${name}.tgz";
-    sha256 = "1zs3d6h5sbz455fwpgg89h81hkfn92ary8bmhjinc1rd8fm3hp1b";
+    sha256 = "1srv8d1w3mwblfydznl3frswg98i3dkylx8x18c4807wsjk8vflg";
   };
 
   enableParallelBuilding = true;

From 2f7878ac568b9241782e9a69d82cd7ddf23e0a89 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Mon, 19 Mar 2018 23:11:49 -0700
Subject: [PATCH 101/123] criu: 3.7 -> 3.8

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- ran `/nix/store/rhcppqwmdlwak4ifncamjiqqybwlhvcj-criu-3.8/bin/compel -h` got 0 exit code
- ran `/nix/store/rhcppqwmdlwak4ifncamjiqqybwlhvcj-criu-3.8/bin/compel --help` got 0 exit code
- ran `/nix/store/rhcppqwmdlwak4ifncamjiqqybwlhvcj-criu-3.8/bin/criu -h` got 0 exit code
- ran `/nix/store/rhcppqwmdlwak4ifncamjiqqybwlhvcj-criu-3.8/bin/criu --help` got 0 exit code
- ran `/nix/store/rhcppqwmdlwak4ifncamjiqqybwlhvcj-criu-3.8/bin/criu -V` and found version 3.8
- ran `/nix/store/rhcppqwmdlwak4ifncamjiqqybwlhvcj-criu-3.8/bin/criu --version` and found version 3.8
- found 3.8 with grep in /nix/store/rhcppqwmdlwak4ifncamjiqqybwlhvcj-criu-3.8
- directory tree listing: https://gist.github.com/6bc3ef9b1f4c69a6862043a1158fba16
---
 pkgs/os-specific/linux/criu/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/criu/default.nix b/pkgs/os-specific/linux/criu/default.nix
index 4ef162e56c7..42ab0092f7d 100644
--- a/pkgs/os-specific/linux/criu/default.nix
+++ b/pkgs/os-specific/linux/criu/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name    = "criu-${version}";
-  version = "3.7";
+  version = "3.8";
 
   src = fetchurl {
     url    = "http://download.openvz.org/criu/${name}.tar.bz2";
-    sha256 = "0qrpz7pvnks34v7d8lb73flz3mb7qwnib94pdwaxh0mskn8470fq";
+    sha256 = "0gmvbnb5wa3f4nzam7gssclfai8g5363dhp8qc7q32dcx4wxbgam";
   };
 
   enableParallelBuilding = true;

From 501b6d0e13aeabddabc66886b2c71385ac5c8d06 Mon Sep 17 00:00:00 2001
From: Hendrik Schaeidt <he.schaeidt@gmail.com>
Date: Tue, 13 Mar 2018 16:17:30 +0100
Subject: [PATCH 102/123] profanity: refactor build to build from source

* fix osx build
* fix undefined macros in configure.ac
* activate the check phase to run the test suite
---
 .../instant-messengers/profanity/default.nix  | 35 ++++++++++++----
 .../profanity/patches/packages-osx.patch      | 11 +++++
 .../profanity/patches/undefined-macros.patch  | 40 +++++++++++++++++++
 3 files changed, 78 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/applications/networking/instant-messengers/profanity/patches/packages-osx.patch
 create mode 100644 pkgs/applications/networking/instant-messengers/profanity/patches/undefined-macros.patch

diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix
index 74dc36bc7ac..327b02b2352 100644
--- a/pkgs/applications/networking/instant-messengers/profanity/default.nix
+++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix
@@ -1,5 +1,6 @@
-{ stdenv, fetchurl, pkgconfig, glib, openssl, expat, libmesode
-, ncurses, libotr, curl, readline, libuuid
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, glib, openssl
+, glibcLocales, expect, ncurses, libotr, curl, readline, libuuid
+, cmocka, libmicrohttpd, stabber, expat, libmesode
 
 , autoAwaySupport ? false,       libXScrnSaver ? null, libX11 ? null
 , notifySupport ? false,         libnotify ? null, gdk_pixbuf ? null
@@ -20,18 +21,22 @@ stdenv.mkDerivation rec {
   name = "profanity-${version}";
   version = "0.5.1";
 
-  src = fetchurl {
-    url = "http://www.profanity.im/profanity-${version}.tar.gz";
-    sha256 = "1f7ylw3mhhnii52mmk40hyc4kqhpvjdr3hmsplzkdhsfww9kflg3";
+  src = fetchFromGitHub {
+    owner = "boothj5";
+    repo = "profanity";
+    rev = "${version}";
+    sha256 = "1ppr02wivhlrqr62r901clnycna8zpn6kr7n5rw8y3zfw21ny17z";
   };
 
+  patches = [ ./patches/packages-osx.patch ./patches/undefined-macros.patch ];
+
   enableParallelBuilding = true;
 
-  nativeBuildInputs = [ pkgconfig ];
+  nativeBuildInputs = [ autoreconfHook glibcLocales pkgconfig ];
 
   buildInputs = [
-    readline libuuid libmesode
-    glib openssl expat ncurses libotr curl
+    expect readline libuuid glib openssl expat ncurses libotr
+    curl libmesode cmocka libmicrohttpd stabber
   ] ++ optionals autoAwaySupport     [ libXScrnSaver libX11 ]
     ++ optionals notifySupport       [ libnotify gdk_pixbuf ]
     ++ optionals traySupport         [ gnome2.gtk ]
@@ -45,6 +50,20 @@ stdenv.mkDerivation rec {
     ++ optionals pgpSupport          [ "--enable-pgp" ]
     ++ optionals pythonPluginSupport [ "--enable-python-plugins" ];
 
+  preAutoreconf = ''
+    mkdir m4
+  '';
+
+  doCheck = true;
+
+  LC_ALL = "en_US.utf8";
+
+  NIX_CFLAGS_COMPILE = [ ]
+    ++ optionals pythonPluginSupport [ "-I${python}/include/${python.libPrefix}" ];
+
+  LDFLAGS = [ ]
+    ++ optionals pythonPluginSupport [ "-L${python}/lib" "-lpython${python.majorVersion}m" ];
+
   meta = {
     description = "A console based XMPP client";
     longDescription = ''
diff --git a/pkgs/applications/networking/instant-messengers/profanity/patches/packages-osx.patch b/pkgs/applications/networking/instant-messengers/profanity/patches/packages-osx.patch
new file mode 100644
index 00000000000..77bfc5e78bd
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/profanity/patches/packages-osx.patch
@@ -0,0 +1,11 @@
+diff --git a/configure.ac b/configure.ac
+index 1e55b1cc..0832a387 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -22,7 +22,6 @@ AC_CANONICAL_HOST
+ PLATFORM="unknown"
+ AS_CASE([$host_os],
+     [freebsd*], [PLATFORM="freebsd"],
+-    [darwin*], [PLATFORM="osx"],
+     [cygwin], [PLATFORM="cygwin"],
+     [PLATFORM="nix"])
diff --git a/pkgs/applications/networking/instant-messengers/profanity/patches/undefined-macros.patch b/pkgs/applications/networking/instant-messengers/profanity/patches/undefined-macros.patch
new file mode 100644
index 00000000000..9ef4e7bebe5
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/profanity/patches/undefined-macros.patch
@@ -0,0 +1,40 @@
+diff --git a/configure.ac b/configure.ac
+index 1e55b1cc..0832a387 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -83,12 +81,12 @@ elif test "x$enable_python_plugins" != xno; then
+         AM_CONDITIONAL([BUILD_PYTHON_API], [true])
+         AC_DEFINE([HAVE_PYTHON], [1], [Python support])
+     else
+-        if test "x$enable_python_plugins" = xyes; then
+-            AC_MSG_ERROR([Python not found, cannot enable Python plugins.])
+-        else
+-            AM_CONDITIONAL([BUILD_PYTHON_API], [false])
+-            AC_MSG_NOTICE([Python development package not found, Python plugin support disabled.])
+-        fi
++        AS_IF(
++            [test "x$enable_python_plugins" = xyes],
++            [],
++            [AM_CONDITIONAL([BUILD_PYTHON_API], [false])
++            AC_MSG_NOTICE([Python development package not found, Python plugin support disabled.])]
++        )
+     fi
+     AS_IF([test "x$PLATFORM" = xosx], [rm -f Python.framework])
+ else
+@@ -107,7 +105,7 @@ else
+             [AM_CONDITIONAL([BUILD_C_API], [true]) LIBS="$LIBS -ldl" AC_DEFINE([HAVE_C], [1], [C support])],
+             [AS_IF(
+                 [test "x$enable_c_plugins" = xyes],
+-                    [AC_MSG_ERROR([dl library needed to run C plugins])],
++                [],
+                 [AM_CONDITIONAL([BUILD_C_API], [false])])
+             ])
+     else
+@@ -116,7 +114,6 @@ else
+ fi
+ 
+ # threading
+-ACX_PTHREAD([], [AC_MSG_ERROR([pthread is required])])
+ LIBS="$PTHREAD_LIBS $LIBS"
+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+ AS_IF([test "x$PTHREAD_CC" != x], [ CC="$PTHREAD_CC" ])

From 0fdc4cb94bca8a186c622dfae256dfd45b5ee4f5 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 21 Mar 2018 15:15:50 -0500
Subject: [PATCH 103/123] ngx_brotli: update for fixes, zero copy.

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

diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix
index 32d1523547e..95e156f9627 100644
--- a/pkgs/servers/http/nginx/modules.nix
+++ b/pkgs/servers/http/nginx/modules.nix
@@ -5,8 +5,8 @@
     src = let gitsrc = pkgs.fetchFromGitHub {
       owner = "eustas";
       repo = "ngx_brotli";
-      rev = "8cd9dd5fc232d3a01644584921e52dae99034779";
-      sha256 = "0ap1kf51hzb8yvvxjkcj9hnmsmmd5drcay64hd4n7vybf9dqw6g6";
+      rev = "6a1174446f5a866d3d13615dd2824177570f0a69";
+      sha256 = "148xfh6w1wgql2jj922ryiddrs93dyacs903j2hnil67cpia45p6";
     }; in pkgs.runCommandNoCC "ngx_brotli-src" {} ''
       cp -a ${gitsrc} $out
       substituteInPlace $out/config \

From 5566bf97e56e483e3bb3678c419c2fd37fae3361 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Wed, 21 Mar 2018 21:12:39 +0100
Subject: [PATCH 104/123] libheimdal: 7.4.0 -> 7.5.0

In Heimdal 7.1 through 7.4, remote unauthenticated attackers are able to
crash the KDC by sending a crafted UDP packet containing empty data
fields for client name or realm.

Security: CVE-2017-17439
---
 .../kerberos/heimdal-make-missing-headers.patch        | 10 ++++++++++
 pkgs/development/libraries/kerberos/heimdal.nix        | 10 ++++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/kerberos/heimdal-make-missing-headers.patch

diff --git a/pkgs/development/libraries/kerberos/heimdal-make-missing-headers.patch b/pkgs/development/libraries/kerberos/heimdal-make-missing-headers.patch
new file mode 100644
index 00000000000..a0fa625538b
--- /dev/null
+++ b/pkgs/development/libraries/kerberos/heimdal-make-missing-headers.patch
@@ -0,0 +1,10 @@
+--- a/lib/hx509/Makefile.am 2018-03-21 15:41:38.622968809 +0100
++++ b/lib/hx509/Makefile.am 2018-03-21 15:41:32.655162197 +0100
+@@ -9,6 +9,8 @@
+	sel-gram.h			\
+	$(gen_files_ocsp:.x=.c)		\
+	$(gen_files_pkcs10:.x=.c)	\
++	ocsp_asn1.h			\
++	pkcs10_asn1.h			\
+	hx509_err.c			\
+	hx509_err.h
diff --git a/pkgs/development/libraries/kerberos/heimdal.nix b/pkgs/development/libraries/kerberos/heimdal.nix
index 81f878daaaa..b72a00d242e 100644
--- a/pkgs/development/libraries/kerberos/heimdal.nix
+++ b/pkgs/development/libraries/kerberos/heimdal.nix
@@ -12,15 +12,17 @@ in
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "${type}heimdal-${version}";
-  version = "7.4.0";
+  version = "7.5.0";
 
   src = fetchFromGitHub {
     owner = "heimdal";
     repo = "heimdal";
     rev = "heimdal-${version}";
-    sha256 = "01ch6kqjrxi9fki54yjj2fhxhdkxijz161w2inh5k8mcixlf67vp";
+    sha256 = "1j38wjj4k0q8vx168k3d3k0fwa8j1q5q8f2688nnx1b9qgjd6w1d";
   };
 
+  patches = [ ./heimdal-make-missing-headers.patch ];
+
   nativeBuildInputs = [ autoreconfHook pkgconfig python2 perl yacc flex ]
     ++ (with perlPackages; [ JSON ])
     ++ optional (!libOnly) texinfo;
@@ -44,6 +46,10 @@ stdenv.mkDerivation rec {
     "--with-capng"
   ];
 
+  postUnpack = ''
+    sed -i '/^DEFAULT_INCLUDES/ s,$, -I..,' source/cf/Makefile.am.common
+  '';
+
   buildPhase = optionalString libOnly ''
     (cd include; make -j $NIX_BUILD_CORES)
     (cd lib; make -j $NIX_BUILD_CORES)

From 3918182cb540cf0e6455653b05a7b3338a5d8a31 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Wed, 21 Mar 2018 21:02:15 +0200
Subject: [PATCH 105/123] nixos/manual: Don't depend on non-bin outputs of
 libxml2 and libxslt

Might fix https://hydra.nixos.org/build/71580290.
---
 nixos/doc/manual/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix
index 3b01f4fed35..c51c30065a3 100644
--- a/nixos/doc/manual/default.nix
+++ b/nixos/doc/manual/default.nix
@@ -139,7 +139,7 @@ let
 
   manual-combined = runCommand "nixos-manual-combined"
     { inherit sources;
-      nativeBuildInputs = [ buildPackages.libxml2 buildPackages.libxslt ];
+      nativeBuildInputs = [ buildPackages.libxml2.bin buildPackages.libxslt.bin ];
       meta.description = "The NixOS manual as plain docbook XML";
     }
     ''
@@ -194,7 +194,7 @@ let
 
   olinkDB = runCommand "manual-olinkdb"
     { inherit sources;
-      nativeBuildInputs = [ buildPackages.libxml2 buildPackages.libxslt ];
+      nativeBuildInputs = [ buildPackages.libxml2.bin buildPackages.libxslt.bin ];
     }
     ''
       xsltproc \
@@ -244,7 +244,7 @@ in rec {
   # Generate the NixOS manual.
   manual = runCommand "nixos-manual"
     { inherit sources;
-      nativeBuildInputs = [ buildPackages.libxml2 buildPackages.libxslt ];
+      nativeBuildInputs = [ buildPackages.libxml2.bin buildPackages.libxslt.bin ];
       meta.description = "The NixOS manual in HTML format";
       allowedReferences = ["out"];
     }
@@ -272,7 +272,7 @@ in rec {
 
   manualEpub = runCommand "nixos-manual-epub"
     { inherit sources;
-      buildInputs = [ libxml2 libxslt zip ];
+      buildInputs = [ libxml2.bin libxslt.bin zip ];
     }
     ''
       # Generate the epub manual.
@@ -302,7 +302,7 @@ in rec {
   # Generate the NixOS manpages.
   manpages = runCommand "nixos-manpages"
     { inherit sources;
-      nativeBuildInputs = [ buildPackages.libxml2 buildPackages.libxslt ];
+      nativeBuildInputs = [ buildPackages.libxml2.bin buildPackages.libxslt.bin ];
       allowedReferences = ["out"];
     }
     ''

From 1874678d12df675fb1dff7d84876d030b8822d57 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Wed, 21 Mar 2018 22:12:41 +0200
Subject: [PATCH 106/123] make-dbus-conf: Don't depend on unnecessary libxslt
 outputs

Might fix https://hydra.nixos.org/build/71580290.
---
 pkgs/development/libraries/dbus/make-dbus-conf.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/dbus/make-dbus-conf.nix b/pkgs/development/libraries/dbus/make-dbus-conf.nix
index c3c41b74f09..b5bf2b23000 100644
--- a/pkgs/development/libraries/dbus/make-dbus-conf.nix
+++ b/pkgs/development/libraries/dbus/make-dbus-conf.nix
@@ -24,7 +24,7 @@ runCommand "dbus-1"
           rewritePrefix="file://${dbus}/share/xml/dbus/"/>
       </catalog>
     '';
-    nativeBuildInputs = [ libxslt ];
+    nativeBuildInputs = [ libxslt.bin ];
   }
   ''
     mkdir -p $out

From ccbaacaec59e3917219439113cab2dc6228f7db6 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Tue, 20 Mar 2018 19:25:06 -0700
Subject: [PATCH 107/123] netsurf.buildsystem: 1.5 -> 1.6

Semi-automatic update generated by https://github.com/ryantm/nix-update tools. These checks were done:

- built on NixOS
- Warning: no binary found that responded to help or version flags. (This warning appears even if the package isn't expected to have binaries.)
- directory tree listing: https://gist.github.com/8d2bc8fda08696882cec0fd25ff22ac3
---
 pkgs/applications/misc/netsurf/buildsystem/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/netsurf/buildsystem/default.nix b/pkgs/applications/misc/netsurf/buildsystem/default.nix
index 74e7c694ea4..f25180505e8 100644
--- a/pkgs/applications/misc/netsurf/buildsystem/default.nix
+++ b/pkgs/applications/misc/netsurf/buildsystem/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
 
   name = "netsurf-buildsystem-${version}";
-  version = "1.5";
+  version = "1.6";
 
   src = fetchurl {
     url = "http://download.netsurf-browser.org/libs/releases/buildsystem-${version}.tar.gz";
-    sha256 = "0wdgvasrjik1dgvvpqbppbpyfzkqd1v45x3g9rq7p67n773azinv";
+    sha256 = "0p5k708lcq8dip9xxck6hml32bjrbyipprm22bbsvdnsc0pqm71x";
   };
 
   makeFlags = [

From 9a054d7cd65716b99c0e5ab037e7032db7a9582e Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 21 Mar 2018 20:40:39 +0100
Subject: [PATCH 108/123] libnfs: fix clang build

/cc ZHF #36454
---
 pkgs/development/libraries/libnfs/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/libnfs/default.nix b/pkgs/development/libraries/libnfs/default.nix
index d9149a1fbac..2955aaebc01 100644
--- a/pkgs/development/libraries/libnfs/default.nix
+++ b/pkgs/development/libraries/libnfs/default.nix
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook ];
 
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.cc.isClang "-Wno-error=tautological-compare";
+
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {

From c2ca5c057de6a5576cecd2b05381328a63629375 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 21 Mar 2018 20:46:21 +0100
Subject: [PATCH 109/123] libqglviewer: fix darwin build

/cc ZHF #36454
---
 pkgs/development/libraries/libqglviewer/default.nix | 5 +++--
 pkgs/top-level/all-packages.nix                     | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libqglviewer/default.nix b/pkgs/development/libraries/libqglviewer/default.nix
index eef9e05ca03..e68c5052beb 100644
--- a/pkgs/development/libraries/libqglviewer/default.nix
+++ b/pkgs/development/libraries/libqglviewer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, qt4, qmake4Hook }:
+{ stdenv, fetchurl, qt4, qmake4Hook, AGL }:
 
 stdenv.mkDerivation rec {
   name = "libqglviewer-2.6.3";
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "00jdkyk4wg1356c3ar6nk3hyp494ya3yvshq9m57kfmqpn3inqdy";
   };
 
-  buildInputs = [ qt4 qmake4Hook ];
+  buildInputs = [ qt4 qmake4Hook ]
+    ++ stdenv.lib.optional stdenv.isDarwin AGL;
 
   postPatch =
     ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c41ee08582d..9b04ff0f368 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9928,7 +9928,9 @@ with pkgs;
 
   libplist = callPackage ../development/libraries/libplist { };
 
-  libqglviewer = callPackage ../development/libraries/libqglviewer { };
+  libqglviewer = callPackage ../development/libraries/libqglviewer {
+    inherit (darwin.apple_sdk.frameworks) AGL;
+  };
 
   libre = callPackage ../development/libraries/libre {};
   librem = callPackage ../development/libraries/librem {};

From fe37684525d39a3342a25f7123e632f5058bccf3 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 21 Mar 2018 21:13:33 +0100
Subject: [PATCH 110/123] luaffi: fix darwin build

/cc ZHF #36454
---
 pkgs/development/libraries/luaffi/darwin.patch | 17 +++++++++++++++++
 pkgs/development/libraries/luaffi/default.nix  |  6 +++---
 2 files changed, 20 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/libraries/luaffi/darwin.patch

diff --git a/pkgs/development/libraries/luaffi/darwin.patch b/pkgs/development/libraries/luaffi/darwin.patch
new file mode 100644
index 00000000000..50db81b776d
--- /dev/null
+++ b/pkgs/development/libraries/luaffi/darwin.patch
@@ -0,0 +1,17 @@
+diff --git a/Makefile b/Makefile
+index b2b5f2c..b690a5d 100644
+--- a/Makefile
++++ b/Makefile
+@@ -18,10 +18,10 @@ test:
+ 	if [ `uname` = "Darwin" ]; then $(MAKE) test_macosx; else $(MAKE) test_posix; fi
+ 
+ macosx:
+-	$(MAKE) posix "SOCC=MACOSX_DEPLOYMENT_TARGET=10.3 $(CC) -dynamiclib -single_module -undefined dynamic_lookup $(SOCFLAGS)"
++	$(MAKE) posix "SOCC= $(CC) -dynamiclib -single_module -undefined dynamic_lookup -Wl,-install_name,$(PREFIX)/lib/$(MODSO) $(SOCFLAGS)"
+ 
+ test_macosx:
+-	$(MAKE) test_posix "SOCC=MACOSX_DEPLOYMENT_TARGET=10.3 $(CC) -dynamiclib -single_module -undefined dynamic_lookup $(SOCFLAGS)"
++	$(MAKE) test_posix "SOCC= $(CC) -dynamiclib -single_module -undefined dynamic_lookup -Wl,-install_name,$(PREFIX)/lib/$(MODSO) $(SOCFLAGS)"
+ 
+ posix: $(MODSO) test_cdecl.so
+ 
diff --git a/pkgs/development/libraries/luaffi/default.nix b/pkgs/development/libraries/luaffi/default.nix
index 1e4cf11d1fa..065562ac82e 100644
--- a/pkgs/development/libraries/luaffi/default.nix
+++ b/pkgs/development/libraries/luaffi/default.nix
@@ -12,9 +12,9 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ lua ];
 
-  patches = [
-    ./makefile-errors.patch
-  ];
+  patches = [ ./darwin.patch ./makefile-errors.patch ];
+
+  makeFlags = [ "PREFIX=$(out)" ];
 
   installPhase = ''
     mkdir -p $out/lib

From 9b5669b5a6947e8f5230df521d859a66346a9b90 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 21 Mar 2018 21:25:54 +0100
Subject: [PATCH 111/123] lxtask: fix darwin build

/cc ZHF #36454
---
 pkgs/desktops/lxde/core/lxtask/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxde/core/lxtask/default.nix b/pkgs/desktops/lxde/core/lxtask/default.nix
index ef95f6035b2..dbed065190e 100644
--- a/pkgs/desktops/lxde/core/lxtask/default.nix
+++ b/pkgs/desktops/lxde/core/lxtask/default.nix
@@ -10,11 +10,13 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig intltool ];
-  
+
   buildInputs = [ gtk3 ];
 
   configureFlags = [ "--enable-gtk3" ];
 
+  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
+
   meta = {
     description = "Lightweight and desktop independent task manager";
     longDescription = ''
@@ -24,7 +26,7 @@ stdenv.mkDerivation rec {
       Desktop Environment, it's totally desktop independent and only
       requires pure gtk+.
     '';
-    homepage = https://wiki.lxde.org/en/LXTask; 
+    homepage = https://wiki.lxde.org/en/LXTask;
     license = stdenv.lib.licenses.gpl2Plus;
     platforms = stdenv.lib.platforms.unix;
     maintainers = [ stdenv.lib.maintainers.romildo ];

From b1b4c6c4eb92e59dcd664645f74b1c57b08204d0 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 21 Mar 2018 23:07:05 +0300
Subject: [PATCH 112/123] pyqt5: propagate Qt dependencies

This is so that Qt user environment packages are also propagated. Fixes
Electrum environment installations when no other Qt applications are installed.

Added `dev` output so that closure size won't explode.
---
 pkgs/development/python-modules/pyqt/5.x.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix
index 225da204e21..50cb8ceba91 100644
--- a/pkgs/development/python-modules/pyqt/5.x.nix
+++ b/pkgs/development/python-modules/pyqt/5.x.nix
@@ -9,6 +9,7 @@ let
   version = "5.10";
 
   inherit (pythonPackages) buildPythonPackage python dbus-python sip;
+
 in buildPythonPackage {
   pname = pname;
   version = version;
@@ -27,14 +28,16 @@ in buildPythonPackage {
     sha256 = "0l2zy6b7bfjxmg4bb8yikg6i8iy2xdwmvk7knfmrzfpqbmkycbrl";
   };
 
-  nativeBuildInputs = [ pkgconfig qmake ];
+  outputs = [ "out" "dev" ];
 
-  buildInputs = [
-    lndir qtbase qtsvg qtwebkit qtwebengine dbus_libs
+  nativeBuildInputs = [ pkgconfig qmake lndir ];
+
+  buildInputs = [ dbus_libs ];
+
+  propagatedBuildInputs = [
+    sip qtbase qtsvg qtwebkit qtwebengine
   ] ++ lib.optional withWebSockets qtwebsockets ++ lib.optional withConnectivity qtconnectivity;
 
-  propagatedBuildInputs = [ sip ];
-
   configurePhase = ''
     runHook preConfigure
 

From 38323015e2011ee2ed9af0a516b5f2c804627d5f Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 21 Mar 2018 21:42:06 +0100
Subject: [PATCH 113/123] masscan: fix build

---
 pkgs/tools/security/masscan/default.nix | 8 ++++++--
 pkgs/top-level/all-packages.nix         | 4 +++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/masscan/default.nix b/pkgs/tools/security/masscan/default.nix
index 22a452ccabd..26497659d23 100644
--- a/pkgs/tools/security/masscan/default.nix
+++ b/pkgs/tools/security/masscan/default.nix
@@ -11,9 +11,13 @@ stdenv.mkDerivation rec {
     sha256 = "0mjvwh4i0ncsa3ywavw2s55v5bfv7pyga028c8m8xfash9764wwf";
   };
 
-  buildInputs = [ makeWrapper ];
+  nativeBuildInputs = [ makeWrapper ];
 
-  makeFlags = [ "PREFIX=$(out)" "CC=cc" "-j" ];
+  makeFlags = [ "PREFIX=$(out)" "GITVER=${version}" "CC=cc" ];
+
+  preInstall = ''
+    mkdir -p $out/bin
+  '';
 
   postInstall = ''
     mkdir -p $out/share/man/man8
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9b04ff0f368..0bdff7935bc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1298,7 +1298,9 @@ with pkgs;
 
   mathics = pythonPackages.mathics;
 
-  masscan = callPackage ../tools/security/masscan { };
+  masscan = callPackage ../tools/security/masscan {
+    stdenv = gccStdenv;
+  };
 
   massren = callPackage ../tools/misc/massren { };
 

From df861685cb1f0612ccce339c91f13823316fd4bb Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 21 Mar 2018 16:00:47 -0500
Subject: [PATCH 114/123] icestorm: 2018.03.07 -> 2018.03.21

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/tools/icestorm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/icestorm/default.nix b/pkgs/development/tools/icestorm/default.nix
index b277957efa9..3c87abbdce9 100644
--- a/pkgs/development/tools/icestorm/default.nix
+++ b/pkgs/development/tools/icestorm/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "icestorm-${version}";
-  version = "2018.03.07";
+  version = "2018.03.21";
 
   src = fetchFromGitHub {
     owner  = "cliffordwolf";
     repo   = "icestorm";
-    rev    = "535fde63613eccfeb7e5aad8ff97fbfb652a33b6";
-    sha256 = "1j2p961k1fsq1xq8fnrv0hpwrb948q12jkb479zmrfk61w6la0df";
+    rev    = "4476d83f76fa0222be0b691fe27c1e0228266f82";
+    sha256 = "1r43vwwz61rvdpc3kylg8yzv0flz9p4j3yc1cc4h904zsdwjx39a";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 7a00f136e980a5afa2fc12ecbabbff89535be770 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 21 Mar 2018 16:00:55 -0500
Subject: [PATCH 115/123] yosys: 2018.03.07 -> 2018.03.21

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/development/compilers/yosys/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix
index b087eca30c0..568c94718e7 100644
--- a/pkgs/development/compilers/yosys/default.nix
+++ b/pkgs/development/compilers/yosys/default.nix
@@ -6,14 +6,14 @@ with builtins;
 
 stdenv.mkDerivation rec {
   name = "yosys-${version}";
-  version = "2018.03.07";
+  version = "2018.03.21";
 
   srcs = [
     (fetchFromGitHub {
       owner  = "yosyshq";
       repo   = "yosys";
-      rev    = "8b604004dae31f7f3120685dd05d16a4bace904a";
-      sha256 = "18i4l5rka3l9lg8cdpigprw80im293j3bmv0zab1gxf3rhbjpcb7";
+      rev    = "3f0070247590458c5ed28c5a7abfc3b9d1ec138b";
+      sha256 = "0rsnjk25asg7dkxcmim464rmxgvm7x7njmcp5nyl8y4iwn8i9p8v";
       name   = "yosys";
     })
 

From 011e70155b2b1b41655966bc8a9e0aae41e3432b Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 21 Mar 2018 16:01:02 -0500
Subject: [PATCH 116/123] symbiyosys: 2018.03.07 -> 2018.03.21

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/applications/science/logic/symbiyosys/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/science/logic/symbiyosys/default.nix b/pkgs/applications/science/logic/symbiyosys/default.nix
index 682f9282e6b..b6312bfe466 100644
--- a/pkgs/applications/science/logic/symbiyosys/default.nix
+++ b/pkgs/applications/science/logic/symbiyosys/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "symbiyosys-${version}";
-  version = "2018.03.07";
+  version = "2018.03.21";
 
   src = fetchFromGitHub {
     owner  = "yosyshq";
     repo   = "symbiyosys";
-    rev    = "2c13fbefe67adb3a4adb8a6f283b198abb8a43a0";
-    sha256 = "0v60530w5y4yj66zcp7lwa82158iw26mil1gj41lzyi2p651kc1k";
+    rev    = "76a624a363bc44df102359595d34f29370c6668b";
+    sha256 = "1ikax1yiqgj5442wcgp1iigw8wiyw7k848z4ykn7k068kbc320bm";
   };
 
   buildInputs = [ python3 yosys ];
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
                 "sys.path += [p + \"/share/yosys/python3/\" for p in [\"$out\", \"${yosys}\"]]"
   '';
   meta = {
-    description = "Yosys verification tools for Hardware Definition Languages";
+    description = "Tooling for Yosys-based verification flows";
     homepage    = https://symbiyosys.readthedocs.io/;
     license     = stdenv.lib.licenses.mit;
     maintainers = with stdenv.lib.maintainers; [ thoughtpolice ];

From 044d4b0875e65d334c6c9df105459d93d5de4dc6 Mon Sep 17 00:00:00 2001
From: Vasyl Solovei <svsdep@gmail.com>
Date: Wed, 7 Mar 2018 22:06:34 +0200
Subject: [PATCH 117/123] skypeforlinux: 8.16.0.4 -> 8.17.0.2

---
 .../networking/instant-messengers/skypeforlinux/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
index 87b2ee22381..8cd9eb84b83 100644
--- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
+++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
@@ -6,7 +6,7 @@ let
 
   # Please keep the version x.y.0.z and do not update to x.y.76.z because the
   # source of the latter disappears much faster.
-  version = "8.16.0.4";
+  version = "8.17.0.2";
 
   rpath = stdenv.lib.makeLibraryPath [
     alsaLib
@@ -57,7 +57,7 @@ let
     if stdenv.system == "x86_64-linux" then
       fetchurl {
         url = "https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb";
-        sha256 = "1qc5qd07r768q9wkr2fq1q731hslh21i8rs41jb6pbn3ai65mxf5";
+        sha256 = "0lv8sb49ws8yjh4kkppzqy7sap2b1fw0y13lsc9s45w8mw3l16rp";
       }
     else
       throw "Skype for linux is not supported on ${stdenv.system}";

From 1d854b479c74f0eb5e47a4241384a0146d268300 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Wed, 14 Mar 2018 15:47:09 +0200
Subject: [PATCH 118/123] edk2: Reformat a bit for readability

- Have only one sed expression per line
- Put the important stuff closer to the command and not hidden in some
continuation line. That is, don't do:

sed \
    <boring stuff> \
    <boring stuff> \
    <boring stuff> \
    <boring stuff> \
    <boring stuff> \
    <IMPORTANT STUFF>

but:

sed <IMPORTANT STUFF> \
    <boring stuff> \
    <boring stuff> \
    <boring stuff> \
    <boring stuff> \
    <boring stuff>
---
 pkgs/development/compilers/edk2/default.nix | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix
index 4b87beb0879..5cc4846d3ae 100644
--- a/pkgs/development/compilers/edk2/default.nix
+++ b/pkgs/development/compilers/edk2/default.nix
@@ -58,13 +58,20 @@ edk2 = stdenv.mkDerivation {
 
       configurePhase = ''
         mkdir -v Conf
-        sed -e 's|Nt32Pkg/Nt32Pkg.dsc|${projectDscPath}|' -e \
-          's|MYTOOLS|GCC49|' -e 's|IA32|${targetArch}|' -e 's|DEBUG|RELEASE|'\
-          < ${edk2}/BaseTools/Conf/target.template > Conf/target.txt
-        sed -e 's|DEFINE GCC48_IA32_PREFIX       = /usr/bin/|DEFINE GCC48_IA32_PREFIX       = ""|' \
+
+        cp ${edk2}/BaseTools/Conf/target.template Conf/target.txt
+        sed -i Conf/target.txt \
+          -e 's|Nt32Pkg/Nt32Pkg.dsc|${projectDscPath}|' \
+          -e 's|MYTOOLS|GCC49|' \
+          -e 's|IA32|${targetArch}|' \
+          -e 's|DEBUG|RELEASE|'\
+
+        cp ${edk2}/BaseTools/Conf/tools_def.template Conf/tools_def.txt
+        sed -i Conf/tools_def.txt \
+          -e 's|DEFINE GCC48_IA32_PREFIX       = /usr/bin/|DEFINE GCC48_IA32_PREFIX       = ""|' \
           -e 's|DEFINE GCC48_X64_PREFIX        = /usr/bin/|DEFINE GCC48_X64_PREFIX        = ""|' \
-          -e 's|DEFINE UNIX_IASL_BIN           = /usr/bin/iasl|DEFINE UNIX_IASL_BIN           = ${iasl}/bin/iasl|' \
-          < ${edk2}/BaseTools/Conf/tools_def.template > Conf/tools_def.txt
+          -e 's|DEFINE UNIX_IASL_BIN           = /usr/bin/iasl|DEFINE UNIX_IASL_BIN           = ${iasl}/bin/iasl|'
+
         export WORKSPACE="$PWD"
         export EFI_SOURCE="$PWD/EdkCompatibilityPkg"
         ln -sv ${edk2}/BaseTools BaseTools

From 164501198375091b89e38ce3adba21f0466d61d1 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Wed, 14 Mar 2018 15:52:32 +0200
Subject: [PATCH 119/123] OVMF: Reformat a bit for readability

- Use 'somePkg == null' instead of 'somePkg == false' which is more
  conventional in rest of Nixpkgs
- Use lib.optionalString where applicable
---
 .../virtualization/OVMF/default.nix           | 31 +++++++++----------
 pkgs/top-level/all-packages.nix               |  6 ++--
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix
index fcf569a762a..dca29e28cbb 100644
--- a/pkgs/applications/virtualization/OVMF/default.nix
+++ b/pkgs/applications/virtualization/OVMF/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, edk2, nasm, iasl, seabios, openssl, secureBoot ? false }:
+{ stdenv, lib, edk2, nasm, iasl, seabios, openssl, secureBoot ? false }:
 
 let
 
@@ -36,25 +36,24 @@ stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" {
       ln -sv "$file" .
     done
 
-    ${if (seabios == false) then ''
-        ln -sv ${src}/OvmfPkg .
-      '' else ''
+    ${if seabios != null then ''
         cp -r ${src}/OvmfPkg .
         chmod +w OvmfPkg/Csm/Csm16
         cp ${seabios}/Csm16.bin OvmfPkg/Csm/Csm16/Csm16.bin
-      ''}
-
-    ${if (secureBoot == true) then ''
-        ln -sv ${src}/SecurityPkg .
-        ln -sv ${src}/CryptoPkg .
-      '' else ''
-      ''}
-    '';
-
-  buildPhase = if (seabios == false) then ''
-      build ${if secureBoot then "-DSECURE_BOOT_ENABLE=TRUE" else ""}
     '' else ''
-      build -D CSM_ENABLE -D FD_SIZE_2MB ${if secureBoot then "-DSECURE_BOOT_ENABLE=TRUE" else ""}
+        ln -sv ${src}/OvmfPkg .
+    ''}
+
+    ${lib.optionalString secureBoot ''
+      ln -sv ${src}/SecurityPkg .
+      ln -sv ${src}/CryptoPkg .
+    ''}
+  '';
+
+  buildPhase = if seabios == null then ''
+      build ${lib.optionalString secureBoot "-DSECURE_BOOT_ENABLE=TRUE"}
+    '' else ''
+      build -D CSM_ENABLE -D FD_SIZE_2MB ${lib.optionalString secureBoot "-DSECURE_BOOT_ENABLE=TRUE"}
     '';
 
   postFixup = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0bdff7935bc..40824ac4efc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12589,9 +12589,9 @@ with pkgs;
 
   qboot = callPackage ../applications/virtualization/qboot { stdenv = stdenv_32bit; };
 
-  OVMF = callPackage ../applications/virtualization/OVMF { seabios=false; openssl=null; };
-  OVMF-CSM = callPackage ../applications/virtualization/OVMF { openssl=null; };
-  #WIP: OVMF-secureBoot = callPackage ../applications/virtualization/OVMF { seabios=false; secureBoot=true; };
+  OVMF = callPackage ../applications/virtualization/OVMF { seabios = null; openssl = null; };
+  OVMF-CSM = callPackage ../applications/virtualization/OVMF { openssl = null; };
+  #WIP: OVMF-secureBoot = callPackage ../applications/virtualization/OVMF { seabios = null; secureBoot = true; };
 
   seabios = callPackage ../applications/virtualization/seabios { };
 

From f59eab75d2bb20e44aff84ccadf65e4024db6eb4 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Wed, 14 Mar 2018 17:37:49 +0200
Subject: [PATCH 120/123] edk2, OVMF: Build on aarch64

And also build in parallel.

I don't understand why we manually tediously link every single directory
from the source, but I don't want to investigate too much.
---
 .../virtualization/OVMF/default.nix           | 40 ++++++++++++++-----
 pkgs/development/compilers/edk2/default.nix   |  4 +-
 2 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix
index dca29e28cbb..ee4ea4346e4 100644
--- a/pkgs/applications/virtualization/OVMF/default.nix
+++ b/pkgs/applications/virtualization/OVMF/default.nix
@@ -2,10 +2,12 @@
 
 let
 
-  targetArch = if stdenv.isi686 then
-    "Ia32"
+  projectDscPath = if stdenv.isi686 then
+    "OvmfPkg/OvmfPkgIa32.dsc"
   else if stdenv.isx86_64 then
-    "X64"
+    "OvmfPkg/OvmfPkgX64.dsc"
+  else if stdenv.isAarch64 then
+    "ArmVirtPkg/ArmVirtQemu.dsc"
   else
     throw "Unsupported architecture";
 
@@ -14,7 +16,7 @@ let
   src = edk2.src;
 in
 
-stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" {
+stdenv.mkDerivation (edk2.setup projectDscPath {
   name = "OVMF-${version}";
 
   inherit src;
@@ -36,7 +38,13 @@ stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" {
       ln -sv "$file" .
     done
 
-    ${if seabios != null then ''
+    ${if stdenv.isAarch64 then ''
+      ln -sv ${src}/ArmPkg .
+      ln -sv ${src}/ArmPlatformPkg .
+      ln -sv ${src}/ArmVirtPkg .
+      ln -sv ${src}/EmbeddedPkg .
+      ln -sv ${src}/OvmfPkg .
+    '' else if seabios != null then ''
         cp -r ${src}/OvmfPkg .
         chmod +w OvmfPkg/Csm/Csm16
         cp ${seabios}/Csm16.bin OvmfPkg/Csm/Csm16/Csm16.bin
@@ -50,13 +58,25 @@ stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" {
     ''}
   '';
 
-  buildPhase = if seabios == null then ''
-      build ${lib.optionalString secureBoot "-DSECURE_BOOT_ENABLE=TRUE"}
+  buildPhase = if stdenv.isAarch64 then ''
+      build -n $NIX_BUILD_CORES
+    '' else if seabios == null then ''
+      build -n $NIX_BUILD_CORES ${lib.optionalString secureBoot "-DSECURE_BOOT_ENABLE=TRUE"}
     '' else ''
-      build -D CSM_ENABLE -D FD_SIZE_2MB ${lib.optionalString secureBoot "-DSECURE_BOOT_ENABLE=TRUE"}
+      build -n $NIX_BUILD_CORES -D CSM_ENABLE -D FD_SIZE_2MB ${lib.optionalString secureBoot "-DSECURE_BOOT_ENABLE=TRUE"}
     '';
 
-  postFixup = ''
+  postFixup = if stdenv.isAarch64 then ''
+    mkdir -vp $fd/FV
+    mkdir -vp $fd/AAVMF
+    mv -v $out/FV/QEMU_{EFI,VARS}.fd $fd/FV
+
+    # Uses Fedora dir layout: https://src.fedoraproject.org/cgit/rpms/edk2.git/tree/edk2.spec
+    # FIXME: why is it different from Debian dir layout? https://anonscm.debian.org/cgit/pkg-qemu/edk2.git/tree/debian/rules
+    dd of=$fd/AAVMF/QEMU_EFI-pflash.raw       if=/dev/zero bs=1M    count=64
+    dd of=$fd/AAVMF/QEMU_EFI-pflash.raw       if=$fd/FV/QEMU_EFI.fd conv=notrunc
+    dd of=$fd/AAVMF/vars-template-pflash.raw if=/dev/zero bs=1M    count=64
+  '' else ''
     mkdir -vp $OUTPUT_FD/FV
     mv -v $out/FV/OVMF{,_CODE,_VARS}.fd $OUTPUT_FD/FV
   '';
@@ -67,6 +87,6 @@ stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" {
     description = "Sample UEFI firmware for QEMU and KVM";
     homepage = https://sourceforge.net/apps/mediawiki/tianocore/index.php?title=OVMF;
     license = stdenv.lib.licenses.bsd2;
-    platforms = ["x86_64-linux" "i686-linux"];
+    platforms = ["x86_64-linux" "i686-linux" "aarch64-linux"];
   };
 })
diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix
index 5cc4846d3ae..1dc4430dc6a 100644
--- a/pkgs/development/compilers/edk2/default.nix
+++ b/pkgs/development/compilers/edk2/default.nix
@@ -7,6 +7,8 @@ targetArch = if stdenv.isi686 then
   "IA32"
 else if stdenv.isx86_64 then
   "X64"
+else if stdenv.isAarch64 then
+  "AARCH64"
 else
   throw "Unsupported architecture";
 
@@ -48,7 +50,7 @@ edk2 = stdenv.mkDerivation {
     homepage = https://sourceforge.net/projects/edk2/;
     license = stdenv.lib.licenses.bsd2;
     branch = "UDK2017";
-    platforms = ["x86_64-linux" "i686-linux"];
+    platforms = ["x86_64-linux" "i686-linux" "aarch64-linux"];
   };
 
   passthru = {

From e58624a877342d1fea39b02a5d6528cd53eefefe Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Wed, 14 Mar 2018 20:36:35 +0200
Subject: [PATCH 121/123] nixos/tests: Make simpleUefiGrub test work on AArch64

Needs more refactoring for the AArch64 '-enable-kvm' stuff some day...
---
 nixos/tests/installer.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index c12919540a3..f67011b4412 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -69,11 +69,17 @@ let
     let
       iface = if grubVersion == 1 then "ide" else "virtio";
       isEfi = bootLoader == "systemd-boot" || (bootLoader == "grub" && grubUseEfi);
+
+      # FIXME don't duplicate the -enable-kvm etc. flags here yet again!
       qemuFlags =
         (if system == "x86_64-linux" then "-m 768 " else "-m 512 ") +
-        (optionalString (system == "x86_64-linux") "-cpu kvm64 ");
+        (optionalString (system == "x86_64-linux") "-cpu kvm64 ") +
+        (optionalString (system == "aarch64-linux") "-enable-kvm -machine virt,gic-version=host -cpu host ");
+
       hdFlags = ''hda => "vm-state-machine/machine.qcow2", hdaInterface => "${iface}", ''
-        + optionalString isEfi ''bios => "${pkgs.OVMF.fd}/FV/OVMF.fd", '';
+        + optionalString isEfi (if pkgs.stdenv.isAarch64
+            then ''bios => "${pkgs.OVMF.fd}/FV/QEMU_EFI.fd", ''
+            else ''bios => "${pkgs.OVMF.fd}/FV/OVMF.fd", '');
     in
     ''
       $machine->start;

From fa50e903cfec03c325766f032833f92b700199a3 Mon Sep 17 00:00:00 2001
From: xeji <xeji@cat3.de>
Date: Wed, 21 Mar 2018 11:02:37 +0100
Subject: [PATCH 122/123] libhttpseverywhere: fix build

run tests in correct directory
---
 pkgs/development/libraries/libhttpseverywhere/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libhttpseverywhere/default.nix b/pkgs/development/libraries/libhttpseverywhere/default.nix
index f39cc2574c9..c674b155fd1 100644
--- a/pkgs/development/libraries/libhttpseverywhere/default.nix
+++ b/pkgs/development/libraries/libhttpseverywhere/default.nix
@@ -19,7 +19,7 @@ in stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  checkPhase = "./httpseverywhere_test";
+  checkPhase = "(cd test && ./httpseverywhere_test)";
 
   outputs = [ "out" "devdoc" ];
 

From 5d4d4df8c0899af2342bfbb4f5c898c2cd3241ce Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Wed, 21 Mar 2018 22:41:26 +0100
Subject: [PATCH 123/123] monero: fix darwin build

/cc ZHF #36454
---
 pkgs/applications/altcoins/monero/default.nix | 4 +++-
 pkgs/top-level/all-packages.nix               | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/altcoins/monero/default.nix b/pkgs/applications/altcoins/monero/default.nix
index 4b1e9cd4ea3..57a058bada6 100644
--- a/pkgs/applications/altcoins/monero/default.nix
+++ b/pkgs/applications/altcoins/monero/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchpatch, fetchFromGitHub, cmake
 , boost, miniupnpc, openssl, pkgconfig, unbound
+, IOKit
 }:
 
 stdenv.mkDerivation rec {
@@ -15,7 +16,8 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake pkgconfig ];
 
-  buildInputs = [ boost miniupnpc openssl unbound ];
+  buildInputs = [ boost miniupnpc openssl unbound ]
+    ++ stdenv.lib.optional stdenv.isDarwin IOKit;
 
   patches = [
     ./build-wallet-rpc.patch # fixed in next release
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 40824ac4efc..1e3095ee7fc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16614,7 +16614,9 @@ with pkgs;
 
   mod-distortion = callPackage ../applications/audio/mod-distortion { };
 
-  monero = callPackage ../applications/altcoins/monero { };
+  monero = callPackage ../applications/altcoins/monero {
+    inherit (darwin.apple_sdk.frameworks) IOKit;
+  };
 
   monero-gui = libsForQt5.callPackage ../applications/altcoins/monero-gui { };