From 0810111cedde02d499059d33b8f29498520ff118 Mon Sep 17 00:00:00 2001
From: Richard Marko <srk@48.io>
Date: Thu, 2 Nov 2017 01:15:37 +0100
Subject: [PATCH 01/23] lxcfs: don't enable cgmanager

Related to #30023
---
 nixos/modules/virtualisation/lxcfs.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/nixos/modules/virtualisation/lxcfs.nix b/nixos/modules/virtualisation/lxcfs.nix
index 48462dc66da8..5f256e377815 100644
--- a/nixos/modules/virtualisation/lxcfs.nix
+++ b/nixos/modules/virtualisation/lxcfs.nix
@@ -28,8 +28,6 @@ in {
 
   ###### implementation
   config = mkIf cfg.enable {
-    services.cgmanager.enable = true;
-
     systemd.services.lxcfs = {
       description = "FUSE filesystem for LXC";
       wantedBy = [ "multi-user.target" ];

From 4e26054ff541cd9903fd00600ca85bab9131df62 Mon Sep 17 00:00:00 2001
From: Richard Marko <srk@48.io>
Date: Thu, 2 Nov 2017 01:35:00 +0100
Subject: [PATCH 02/23] pam, lxcfs: enable pam_cgfs

Related to #30023
---
 nixos/modules/security/pam.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index 5ded36329f33..dfc3246a735e 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -351,6 +351,8 @@ let
           ${optionalString (cfg.enableKwallet)
               ("session optional ${pkgs.plasma5.kwallet-pam}/lib/security/pam_kwallet5.so" +
                " kwalletd=${pkgs.libsForQt5.kwallet.bin}/bin/kwalletd5")}
+          ${optionalString (config.virtualisation.lxc.lxcfs.enable)
+               "session optional ${pkgs.lxcfs}/lib/security/pam_cgfs.so -c freezer,memory,name=systemd,unified,cpuset"}
         '');
     };
 

From c75c99f42e5a4d77839374e2a64977efd9590206 Mon Sep 17 00:00:00 2001
From: Richard Marko <srk@48.io>
Date: Thu, 2 Nov 2017 02:38:39 +0100
Subject: [PATCH 03/23] lxcfs: 2.0.7 -> 2.0.8, add debugBuild option

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

diff --git a/pkgs/os-specific/linux/lxcfs/default.nix b/pkgs/os-specific/linux/lxcfs/default.nix
index c23457c6b5f6..8a6b2f8ca8af 100644
--- a/pkgs/os-specific/linux/lxcfs/default.nix
+++ b/pkgs/os-specific/linux/lxcfs/default.nix
@@ -1,19 +1,24 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, help2man, fuse, pam }:
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, help2man, fuse, pam,
+  debugBuild ? false }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "lxcfs-2.0.7";
+  name = "lxcfs-2.0.8";
 
   src = fetchFromGitHub {
     owner = "lxc";
     repo = "lxcfs";
     rev = name;
-    sha256 = "1z6d52dc12rcplgc9jdgi3lbxm6ahlsjgs1k8v8kvn261xsq1m0a";
+    sha256 = "04dzn6snqgw0znf7a7qdm64400jirip6q8amcx5fmz4705qdqahc";
   };
 
   nativeBuildInputs = [ pkgconfig help2man autoreconfHook ];
   buildInputs = [ fuse pam ];
 
+  preConfigure = stdenv.lib.optionalString debugBuild ''
+    sed -i 's,#AM_CFLAGS += -DDEBUG,AM_CFLAGS += -DDEBUG,' Makefile.am
+  '';
+
   configureFlags = [
     "--with-init-script=systemd"
     "--sysconfdir=/etc"

From 84f40186b2c55ac28b2ab6e40e618d412f042b95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Tue, 7 Nov 2017 11:01:42 +0000
Subject: [PATCH 04/23] lxcfs: do not inherit enableDebugBuild from global
 namespace

---
 pkgs/os-specific/linux/lxcfs/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix          | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/lxcfs/default.nix b/pkgs/os-specific/linux/lxcfs/default.nix
index 8a6b2f8ca8af..4f62b7eb128a 100644
--- a/pkgs/os-specific/linux/lxcfs/default.nix
+++ b/pkgs/os-specific/linux/lxcfs/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, help2man, fuse, pam,
-  debugBuild ? false }:
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, help2man, fuse, pam
+, enableDebugBuild ? false }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig help2man autoreconfHook ];
   buildInputs = [ fuse pam ];
 
-  preConfigure = stdenv.lib.optionalString debugBuild ''
+  preConfigure = stdenv.lib.optionalString enableDebugBuild ''
     sed -i 's,#AM_CFLAGS += -DDEBUG,AM_CFLAGS += -DDEBUG,' Makefile.am
   '';
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8fd266caa5fa..ce8041cab653 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3204,7 +3204,9 @@ with pkgs;
   ltris = callPackage ../games/ltris { };
 
   lxc = callPackage ../os-specific/linux/lxc { };
-  lxcfs = callPackage ../os-specific/linux/lxcfs { };
+  lxcfs = callPackage ../os-specific/linux/lxcfs {
+    enableDebugBuild = config.lxcfs.enableDebugBuild or false;
+  };
   lxd = callPackage ../tools/admin/lxd { };
 
   lzfse = callPackage ../tools/compression/lzfse { };

From ea78f0f06ca9a63c1e89e5b82e638977a7942c6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Tue, 7 Nov 2017 11:02:57 +0000
Subject: [PATCH 05/23] lxcfs: remove cgmanager dependency

---
 nixos/modules/virtualisation/lxcfs.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/nixos/modules/virtualisation/lxcfs.nix b/nixos/modules/virtualisation/lxcfs.nix
index 5f256e377815..b2457403463a 100644
--- a/nixos/modules/virtualisation/lxcfs.nix
+++ b/nixos/modules/virtualisation/lxcfs.nix
@@ -31,8 +31,6 @@ in {
     systemd.services.lxcfs = {
       description = "FUSE filesystem for LXC";
       wantedBy = [ "multi-user.target" ];
-      requires = [ "cgmanager.service" ];
-      after = [ "cgmanager.service" ];
       before = [ "lxc.service" ];
       restartIfChanged = false;
       serviceConfig = {

From b28348dd74d7c6b57c09c683527e12b2e2d89bc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miguel=20Madrid=20Menc=C3=ADa?= <mimadrid@ucm.es>
Date: Sun, 31 Dec 2017 01:59:55 +0100
Subject: [PATCH 06/23] girara: 0.2.7 -> 0.2.8

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

diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix
index b6bb3c2fd83d..7fd3db860dfb 100644
--- a/pkgs/applications/misc/girara/default.nix
+++ b/pkgs/applications/misc/girara/default.nix
@@ -6,11 +6,11 @@ assert withBuildColors -> ncurses != null;
 
 stdenv.mkDerivation rec {
   name = "girara-${version}";
-  version = "0.2.7";
+  version = "0.2.8";
 
   src = fetchurl {
     url    = "http://pwmt.org/projects/girara/download/${name}.tar.gz";
-    sha256 = "1r9jbhf9n40zj4ddqv1q5spijpjm683nxg4hr5lnir4a551s7rlq";
+    sha256 = "18wss3sak3djip090v2vdbvq1mvkwcspfswc87zbvv3magihan98";
   };
 
   preConfigure = ''

From 22946e68d50d02d47b561a7d2e4aa7dd2d856563 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miguel=20Madrid=20Menc=C3=ADa?= <mimadrid@ucm.es>
Date: Sun, 31 Dec 2017 02:01:21 +0100
Subject: [PATCH 07/23] zathura-core: 0.3.7 -> 0.3.8

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

diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix
index cf9230fa193e..d7a487ce3096 100644
--- a/pkgs/applications/misc/zathura/core/default.nix
+++ b/pkgs/applications/misc/zathura/core/default.nix
@@ -10,11 +10,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name    = "zathura-core-${version}";
-  version = "0.3.7";
+  version = "0.3.8";
 
   src = fetchurl {
     url    = "http://pwmt.org/projects/zathura/download/zathura-${version}.tar.gz";
-    sha256 = "1w0g74dq4z2vl3f99s2gkaqrb5pskgzig10qhbxj4gq9yj4zzbr2";
+    sha256 = "0dz5pky3vmf3s2cp2rv1c099gb1s49p9xlgm3ghyy4pzyxc8bgs6";
   };
 
   icon = ./icon.xpm;
@@ -29,6 +29,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = [
     "PREFIX=$(out)"
+    "RSTTOMAN=${docutils}/bin/rst2man.py"
     "VERBOSE=1"
     "TPUT=${ncurses.out}/bin/tput"
     (optionalString synctexSupport "WITH_SYNCTEX=1")

From be83e0c562b3c8e6e602e7db3d02419e82bb2d2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miguel=20Madrid=20Menc=C3=ADa?= <mimadrid@ucm.es>
Date: Sun, 31 Dec 2017 02:01:57 +0100
Subject: [PATCH 08/23] zathura-pdf-mupdf: 0.3.1 -> 0.3.2

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

diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
index c9472f356672..aca676de2136 100644
--- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
+++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
@@ -2,12 +2,12 @@
 , libjpeg, jbig2dec, openjpeg, fetchpatch }:
 
 stdenv.mkDerivation rec {
-  version = "0.3.1";
+  version = "0.3.2";
   name = "zathura-pdf-mupdf-${version}";
 
   src = fetchurl {
     url = "https://pwmt.org/projects/zathura-pdf-mupdf/download/${name}.tar.gz";
-    sha256 = "06zqn8z6a0hfsx3s1kzqvqzb73afgcl6z5r062sxv7kv570fvffr";
+    sha256 = "0xkajc3is7ncmb2fmymbzfgrran2bz12i7zsm1vvxhxds728h7ck";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 8b67faf2360ebdb7bd140ab3c53a63056affaaef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miguel=20Madrid=20Menc=C3=ADa?= <mimadrid@ucm.es>
Date: Sun, 31 Dec 2017 02:02:24 +0100
Subject: [PATCH 09/23] zathura-pdf-poppler: 0.2.6 -> 0.2.8

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

diff --git a/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/pkgs/applications/misc/zathura/pdf-poppler/default.nix
index 2dda88f409b5..f954d2392d76 100644
--- a/pkgs/applications/misc/zathura/pdf-poppler/default.nix
+++ b/pkgs/applications/misc/zathura/pdf-poppler/default.nix
@@ -1,12 +1,12 @@
 { stdenv, lib, fetchurl, pkgconfig, zathura_core, girara, poppler }:
 
 stdenv.mkDerivation rec {
-  version = "0.2.6";
+  version = "0.2.8";
   name = "zathura-pdf-poppler-${version}";
 
   src = fetchurl {
     url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz";
-    sha256 = "1maqiv7yv8d8hymlffa688c5z71v85kbzmx2j88i8z349xx0rsyi";
+    sha256 = "1m55m7s7f8ng8a7lmcw9z4n5zv7xk4vp9n6fp9j84z6rk2imf7a2";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     homepage = http://pwmt.org/projects/zathura/;
     description = "A zathura PDF plugin (poppler)";
     longDescription = ''
-      The zathura-pdf-poppler plugin adds PDF support to zathura by 
+      The zathura-pdf-poppler plugin adds PDF support to zathura by
       using the poppler rendering library.
     '';
     license = licenses.zlib;

From f0c992bf510656f0a797a4a41f1ea7b2b5011269 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miguel=20Madrid=20Menc=C3=ADa?= <mimadrid@ucm.es>
Date: Sun, 31 Dec 2017 02:05:11 +0100
Subject: [PATCH 10/23] zathura-ps: 0.2.3 -> 0.2.5

---
 pkgs/applications/misc/zathura/ps/default.nix |  4 +--
 .../misc/zathura/ps/gtkflags.patch            | 28 +++++++++----------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/misc/zathura/ps/default.nix b/pkgs/applications/misc/zathura/ps/default.nix
index a415cde3c7ee..dd8c3a26ce1a 100644
--- a/pkgs/applications/misc/zathura/ps/default.nix
+++ b/pkgs/applications/misc/zathura/ps/default.nix
@@ -1,11 +1,11 @@
 { stdenv, lib, fetchurl, pkgconfig, gtk, zathura_core, girara, libspectre, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "zathura-ps-0.2.3";
+  name = "zathura-ps-0.2.5";
 
   src = fetchurl {
     url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz";
-    sha256 = "18wsfy8pqficdgj8wy2aws7j4fy8z78157rhqk17mj5f295zgvm9";
+    sha256 = "1x4knqja8pw2a5cb3y2209nr3iddj1z8nwasy48v5nprj61fdxqj";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/misc/zathura/ps/gtkflags.patch b/pkgs/applications/misc/zathura/ps/gtkflags.patch
index 7c944a12f0ef..1464d2c8373b 100644
--- a/pkgs/applications/misc/zathura/ps/gtkflags.patch
+++ b/pkgs/applications/misc/zathura/ps/gtkflags.patch
@@ -1,9 +1,7 @@
-diff --git a/config.mk b/config.mk.new
-index c3a7b37..0cbce67 100644
---- a/config.mk
-+++ b/config.mk
-@@ -10,6 +10,9 @@ ZATHURA_VERSION_CHECK ?= $(shell pkg-config --atleast-version=$(ZATHURA_MIN_VERS
- PREFIX ?= /usr
+--- zathura-ps-0.2.5.orig/config.mk	2017-12-21 14:21:17.000000000 +0100
++++ zathura-ps-0.2.5/config.mk	2017-12-31 01:05:17.507268817 +0100
+@@ -16,6 +16,9 @@
+ DESKTOPPREFIX ?= ${PREFIX}/share/applications
  
  # libs
 +GTK_INC ?= $(shell pkg-config --cflags gtk+-2.0)
@@ -12,14 +10,14 @@ index c3a7b37..0cbce67 100644
  CAIRO_INC ?= $(shell pkg-config --cflags cairo)
  CAIRO_LIB ?= $(shell pkg-config --libs cairo)
  
-@@ -26,8 +29,8 @@ ZATHURA_INC ?= $(shell pkg-config --cflags zathura)
- PLUGINDIR ?= $(shell pkg-config --variable=plugindir zathura)
- PLUGINDIR ?= ${PREFIX}/lib/zathura
+@@ -34,8 +37,8 @@
+ PLUGINDIR = ${LIBDIR}/zathura
+ endif
  
--INCS = ${GLIB_INC} ${SPECTRE_INC} ${GIRARA_INC} ${ZATHURA_INC}
--LIBS = ${GLIB_LIB} ${SPECTRE_LIB} ${GIRARA_LIB}
-+INCS = ${GLIB_INC} ${SPECTRE_INC} ${GIRARA_INC} ${ZATHURA_INC} ${GTK_INC}
-+LIBS = ${GLIB_LIB} ${SPECTRE_LIB} ${GIRARA_LIB} ${GTK_LIB}
+-INCS = ${GLIB_INC} ${SPECTRE_INC} ${GIRARA_INC} ${CAIRO_INC} ${ZATHURA_INC}
+-LIBS = ${GLIB_LIB} ${SPECTRE_LIB} ${GIRARA_LIB} ${CAIRO_LIB}
++INCS = ${GLIB_INC} ${SPECTRE_INC} ${GIRARA_INC} ${CAIRO_INC} ${ZATHURA_INC} ${GTK_INC}
++LIBS = ${GLIB_LIB} ${SPECTRE_LIB} ${GIRARA_LIB} ${CAIRO_LIB } ${GTK_LIB}
  
- # flags
- CFLAGS += -std=c99 -fPIC -pedantic -Wall -Wno-format-zero-length $(INCS)
+ # compiler flags
+ CFLAGS += -std=c11 -fPIC -pedantic -Wall -Wno-format-zero-length $(INCS)

From e67078d394974e118470cf618a615fd38dc7d608 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miguel=20Madrid=20Menc=C3=ADa?= <mimadrid@ucm.es>
Date: Sun, 31 Dec 2017 02:06:17 +0100
Subject: [PATCH 11/23] zathura-djvu: 0.2.5 -> 0.2.7

---
 .../misc/zathura/djvu/default.nix             |  4 ++--
 .../misc/zathura/djvu/gtkflags.patch          | 22 +++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/misc/zathura/djvu/default.nix b/pkgs/applications/misc/zathura/djvu/default.nix
index 34508da0e371..bb573020b4e0 100644
--- a/pkgs/applications/misc/zathura/djvu/default.nix
+++ b/pkgs/applications/misc/zathura/djvu/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, gtk, zathura_core, girara, djvulibre, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "zathura-djvu-0.2.5";
+  name = "zathura-djvu-0.2.7";
 
   src = fetchurl {
     url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz";
-    sha256 = "03cw54d2fipvbrnbqy0xccqkx6s77dyhyymx479aj5ryy4513dq8";
+    sha256 = "1sbfdsyp50qc85xc4458sn4w1rv1qbygdwmcr5kjlfpsmdq98vhd";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/applications/misc/zathura/djvu/gtkflags.patch b/pkgs/applications/misc/zathura/djvu/gtkflags.patch
index 2a2fe298a7b9..6e8819e60823 100644
--- a/pkgs/applications/misc/zathura/djvu/gtkflags.patch
+++ b/pkgs/applications/misc/zathura/djvu/gtkflags.patch
@@ -1,7 +1,7 @@
---- a/config.mk	2012-05-14 01:13:09.009740082 +0400
-+++ b/config.mk	2012-05-14 01:13:50.400525700 +0400
-@@ -11,6 +11,9 @@
- LIBDIR ?= ${PREFIX}/lib
+--- zathura-djvu-0.2.7.orig/config.mk	2017-12-21 14:20:24.000000000 +0100
++++ zathura-djvu-0.2.7/config.mk	2017-12-31 00:41:02.580154770 +0100
+@@ -16,6 +16,9 @@
+ DESKTOPPREFIX ?= ${PREFIX}/share/applications
  
  # libs
 +GTK_INC ?= $(shell pkg-config --cflags gtk+-2.0)
@@ -10,14 +10,14 @@
  CAIRO_INC ?= $(shell pkg-config --cflags cairo)
  CAIRO_LIB ?= $(shell pkg-config --libs cairo)
  
-@@ -29,8 +32,8 @@
+@@ -34,8 +37,8 @@
  PLUGINDIR = ${LIBDIR}/zathura
  endif
  
--INCS = ${GIRARA_INC} ${GLIB_INC} ${DJVU_INC} ${ZATHURA_INC}
--LIBS = ${GIRARA_LIB} ${GLIB_LIB} ${DJVU_LIB}
-+INCS = ${GIRARA_INC} ${GLIB_INC} ${DJVU_INC} ${ZATHURA_INC} ${GTK_INC}
-+LIBS = ${GIRARA_LIB} ${GLIB_LIB} ${DJVU_LIB} ${GTK_LIB}
+-INCS = ${GIRARA_INC} ${GLIB_INC} ${DJVU_INC} ${CAIRO_INC} ${ZATHURA_INC}
+-LIBS = ${GIRARA_LIB} ${GLIB_LIB} ${DJVU_LIB} ${CAIRO_LIB}
++INCS = ${GIRARA_INC} ${GLIB_INC} ${DJVU_INC} ${CAIRO_INC} ${ZATHURA_INC} ${GTK_INC}
++LIBS = ${GIRARA_LIB} ${GLIB_LIB} ${DJVU_LIB} ${CAIRO_LIB} ${GTK_LIB}
  
- # flags
- CFLAGS += -std=c99 -fPIC -pedantic -Wall -Wno-format-zero-length $(INCS)
+ # pre-processor flags
+ CPPFLAGS += -D_FILE_OFFSET_BITS=64

From f51aba5ddfa6b97f18a7b52156266467c36772ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Sun, 31 Dec 2017 16:51:47 +0100
Subject: [PATCH 12/23] audacious: 3.8.2 -> 3.9

Also fixes compilation with qt 5.10.
---
 pkgs/applications/audio/audacious/default.nix |  6 +++---
 pkgs/applications/audio/audacious/qt-5.nix    | 19 +++++++++++++++----
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix
index 8242d035e5b8..e5e8640b4fd9 100644
--- a/pkgs/applications/audio/audacious/default.nix
+++ b/pkgs/applications/audio/audacious/default.nix
@@ -8,16 +8,16 @@
 
 stdenv.mkDerivation rec {
   name = "audacious-${version}";
-  version = "3.8.2";
+  version = "3.9";
 
   src = fetchurl {
     url = "http://distfiles.audacious-media-player.org/audacious-${version}-gtk3.tar.bz2";
-    sha256 = "1g08xprc9q0lyw3knq723j7xr7i15f8v1x1j3k5wvi8jv21bvijf";
+    sha256 = "0dc7fg0v2l2j4h9cz1baz7rf4n0a5jgk09qvsj806sh6jp7w6ipm";
   };
 
   pluginsSrc = fetchurl {
     url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}-gtk3.tar.bz2";
-    sha256 = "1vqcxwqinlwb2l0kkrarg33sw1brjzrnq5jbhzrql6z6x95h4jbq";
+    sha256 = "1gck37c5pnzxdhrnb1g75b5hi31s2dc952wifxns45pkdlayrmra";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/applications/audio/audacious/qt-5.nix b/pkgs/applications/audio/audacious/qt-5.nix
index 803b0115fbdf..353865e8ec04 100644
--- a/pkgs/applications/audio/audacious/qt-5.nix
+++ b/pkgs/applications/audio/audacious/qt-5.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation, lib, fetchurl,
+  mkDerivation, lib, fetchurl, fetchpatch,
   gettext, pkgconfig,
   qtbase,
   alsaLib, curl, faad2, ffmpeg, flac, fluidsynth, gdk_pixbuf, lame, libbs2b,
@@ -10,18 +10,23 @@
 }:
 
 let
-  version = "3.8.2";
+  version = "3.9";
   sources = {
     "audacious-${version}" = fetchurl {
       url = "http://distfiles.audacious-media-player.org/audacious-${version}.tar.bz2";
-      sha256 = "14xyvmxdax0aj1gqcz8z23cjcavsysyh6b3lkiczkv4vrqf4gwdx";
+      sha256 = "0pmhrhsjhqnrq3zh4rhfys5jas53ph5ijkq010dxg1n779kl901d";
     };
 
     "audacious-plugins-${version}" = fetchurl {
       url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}.tar.bz2";
-      sha256 = "1m7xln93zc4qvb1fi83icyd5x2r6azqlvs5nigjz8az3l2kzrknp";
+      sha256 = "1f17r7ar0mngcf7z41s6xh073vjafw3i7iy9ijb0cd6bi48g5xwb";
     };
   };
+
+  qt510_plugins_patch = fetchpatch {
+    url = "https://github.com/audacious-media-player/audacious-plugins/commit/971f7ff7c3d8a0b9b420bf4fd19ab97755607637.patch";
+    sha256 = "15fy37syj9ygl2ibkkz3g3b9wd22vk9bjfmvqhhkpxphry2zwb17";
+  };
 in
 
 mkDerivation {
@@ -33,6 +38,8 @@ mkDerivation {
 
   nativeBuildInputs = [ gettext pkgconfig ];
 
+  inherit qt510_plugins_patch;
+
   buildInputs = [
     # Core dependencies
     qtbase
@@ -55,6 +62,10 @@ mkDerivation {
     for (( i=0 ; i < ''${#sourceFiles[*]} ; i++ )); do
 
       (
+        # only patch the plugins
+        if [ "$i" -eq "1" ]; then
+          patches=( $qt510_plugins_patch )
+        fi
         src=''${sourceFiles[$i]}
         sourceRoot=''${sourceRoots[$i]}
         source $stdenv/setup

From 638c01773d0968f98794d3879b726332e6e74d80 Mon Sep 17 00:00:00 2001
From: Brian McKenna <bmckenna@atlassian.com>
Date: Mon, 1 Jan 2018 18:09:46 +1100
Subject: [PATCH 13/23] dirt: 2015-04-28 -> 2018-01-01

---
 pkgs/applications/audio/dirt/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/audio/dirt/default.nix b/pkgs/applications/audio/dirt/default.nix
index 740d6d8d7e0a..c50f85e96ae3 100644
--- a/pkgs/applications/audio/dirt/default.nix
+++ b/pkgs/applications/audio/dirt/default.nix
@@ -1,19 +1,20 @@
 { stdenv, fetchFromGitHub, libsndfile, libsamplerate, liblo, libjack2 }:
 
 stdenv.mkDerivation rec {
-  name = "dirt-2015-04-28";
+  name = "dirt-2018-01-01";
   src = fetchFromGitHub {
     repo = "Dirt";
     owner = "tidalcycles";
-    rev = "cfc5e85318defda7462192b5159103c823ce61f7";
-    sha256 = "1shbyp54q64g6bsl6hhch58k3z1dyyy9ph6cq2xvdf8syy00sisz";
+    rev = "b09604c7d8e581bc7799d7e2ad293e7cdd254bda";
+    sha256 = "13adglk2d31d7mswfvi02b0rjdhzmsv11cc8smhidmrns3f9s96n";
+    fetchSubmodules = true;
   };
   buildInputs = [ libsndfile libsamplerate liblo libjack2 ];
   postPatch = ''
-    sed -i "s|./samples|$out/share/dirt/samples|" file.h
+    sed -i "s|./samples|$out/share/dirt/samples|" dirt.c
   '';
   configurePhase = ''
-    export DESTDIR=$out
+    export PREFIX=$out
   '';
   postInstall = ''
     mkdir -p $out/share/dirt/

From 9d87e8395fe7af0ffd4f24e76d32a44f2350407c Mon Sep 17 00:00:00 2001
From: Ruben Maher <r@rkm.id.au>
Date: Mon, 1 Jan 2018 20:13:27 +1030
Subject: [PATCH 14/23] ocamlPackages.dtoa: init at 0.3.1

---
 .../ocaml-modules/dtoa/default.nix            | 32 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/dtoa/default.nix

diff --git a/pkgs/development/ocaml-modules/dtoa/default.nix b/pkgs/development/ocaml-modules/dtoa/default.nix
new file mode 100644
index 000000000000..47d761894d50
--- /dev/null
+++ b/pkgs/development/ocaml-modules/dtoa/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, ocaml, findlib, jbuilder, ounit }:
+
+assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01";
+
+stdenv.mkDerivation rec {
+  pname = "dtoa";
+  name = "ocaml-${pname}-${version}";
+  version = "0.3.1";
+
+  src = fetchurl {
+    url = "https://github.com/flowtype/ocaml-${pname}/releases/download/v${version}/${pname}-${version}.tbz";
+    sha256 = "0rzysj07z2q6gk0yhjxnjnba01vmdb9x32wwna10qk3rrb8r2pnn";
+  };
+
+  unpackCmd = "tar xjf $src";
+
+  buildInputs = [ ocaml findlib jbuilder ounit ];
+
+  buildPhase = "jbuilder build -p dtoa";
+
+  inherit (jbuilder) installPhase;
+
+  createFindLibDestdir = true;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/flowtype/ocaml-dtoa;
+    description = "Converts OCaml floats into strings (doubles to ascii, \"d to a\"), using the efficient Grisu3 algorithm.";
+    license = licenses.mit;
+    platforms = ocaml.meta.platforms or [];
+    maintainers = [ maintainers.eqyiel ];
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 67d77c570fa4..b74f9009aece 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -208,6 +208,8 @@ let
 
     dolog = callPackage ../development/ocaml-modules/dolog { };
 
+    dtoa = callPackage ../development/ocaml-modules/dtoa { };
+
     easy-format = callPackage ../development/ocaml-modules/easy-format { };
 
     eff = callPackage ../development/interpreters/eff { };

From 671fb2d2d7fcbf639cb106f91f438540e64208ed Mon Sep 17 00:00:00 2001
From: Ruben Maher <r@rkm.id.au>
Date: Mon, 1 Jan 2018 20:13:46 +1030
Subject: [PATCH 15/23] ocamlPackages.wtf8: init at 1.0.1

---
 .../ocaml-modules/wtf8/default.nix            | 32 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/wtf8/default.nix

diff --git a/pkgs/development/ocaml-modules/wtf8/default.nix b/pkgs/development/ocaml-modules/wtf8/default.nix
new file mode 100644
index 000000000000..4cde95c0c4cc
--- /dev/null
+++ b/pkgs/development/ocaml-modules/wtf8/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchurl, ocaml, findlib, jbuilder }:
+
+assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.01";
+
+stdenv.mkDerivation rec {
+  pname = "wtf8";
+  name = "ocaml-${pname}-${version}";
+  version = "1.0.1";
+
+  src = fetchurl {
+    url = "https://github.com/flowtype/ocaml-${pname}/releases/download/v${version}/${pname}-${version}.tbz";
+    sha256 = "1msg3vycd3k8qqj61sc23qks541cxpb97vrnrvrhjnqxsqnh6ygq";
+  };
+
+  unpackCmd = "tar xjf $src";
+
+  buildInputs = [ ocaml findlib jbuilder ];
+
+  buildPhase = "jbuilder build -p wtf8";
+
+  inherit (jbuilder) installPhase;
+
+  createFindLibDestdir = true;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/flowtype/ocaml-wtf8;
+    description = "WTF-8 is a superset of UTF-8 that allows unpaired surrogates.";
+    license = licenses.mit;
+    platforms = ocaml.meta.platforms or [];
+    maintainers = [ maintainers.eqyiel ];
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index b74f9009aece..4a7c77172cc0 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -681,6 +681,8 @@ let
 
     wasm = callPackage ../development/ocaml-modules/wasm { };
 
+    wtf8 = callPackage ../development/ocaml-modules/wtf8 { };
+
     x509 = callPackage ../development/ocaml-modules/x509 { };
 
     xmlm = callPackage ../development/ocaml-modules/xmlm { };

From 8d03bcad73eccc2c1798b66a5fd11a460716a362 Mon Sep 17 00:00:00 2001
From: Ruben Maher <r@rkm.id.au>
Date: Mon, 1 Jan 2018 20:14:02 +1030
Subject: [PATCH 16/23] flow: 0.61.0 -> 0.62.0

---
 pkgs/development/tools/analysis/flow/default.nix | 12 +++++++-----
 pkgs/top-level/all-packages.nix                  |  3 ++-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix
index 539a8ef59b75..e1b11397b30f 100644
--- a/pkgs/development/tools/analysis/flow/default.nix
+++ b/pkgs/development/tools/analysis/flow/default.nix
@@ -1,16 +1,17 @@
-{ stdenv, fetchFromGitHub, lib, ocaml, libelf, cf-private, CoreServices, findlib, camlp4, sedlex, ocamlbuild, ocaml_lwt }:
+{ stdenv, fetchFromGitHub, lib, ocaml, libelf, cf-private, CoreServices,
+  findlib, camlp4, sedlex, ocamlbuild, ocaml_lwt, wtf8, dtoa }:
 
 with lib;
 
 stdenv.mkDerivation rec {
-  version = "0.61.0";
+  version = "0.62.0";
   name = "flow-${version}";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "flow";
     rev = "v${version}";
-    sha256 = "0742hcg97gw6zsvm5j30rfyj71n71pfag3vcmjdh7yamn8gpn8ga";
+    sha256 = "03la72wgsh7s063h2l171h74c84haqsinnnk8fwifq3id0gq6xk1";
   };
 
   installPhase = ''
@@ -18,8 +19,9 @@ stdenv.mkDerivation rec {
     cp bin/flow $out/bin/
   '';
 
-  buildInputs = [ ocaml libelf findlib camlp4 sedlex ocamlbuild ocaml_lwt ]
-    ++ optionals stdenv.isDarwin [ cf-private CoreServices ];
+  buildInputs = [
+    ocaml libelf findlib camlp4 sedlex ocamlbuild ocaml_lwt wtf8 dtoa
+  ] ++ optionals stdenv.isDarwin [ cf-private CoreServices ];
 
   meta = with stdenv.lib; {
     description = "A static type checker for JavaScript";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8b31298701e6..2df95aed72ab 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7404,7 +7404,8 @@ with pkgs;
   flow = callPackage ../development/tools/analysis/flow {
     inherit (darwin.apple_sdk.frameworks) CoreServices;
     inherit (darwin) cf-private;
-    inherit (ocamlPackages) ocaml findlib camlp4 sedlex ocamlbuild ocaml_lwt;
+    inherit (ocamlPackages) ocaml findlib camlp4 sedlex ocamlbuild ocaml_lwt
+      wtf8 dtoa;
   };
 
   framac = callPackage ../development/tools/analysis/frama-c { };

From eebcc66b913cf8abe0050dc3154f97a1463ee3bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@higgsboson.tk>
Date: Mon, 1 Jan 2018 14:52:57 +0000
Subject: [PATCH 17/23] dirt: export PREFIX as makeFlags instead

---
 pkgs/applications/audio/dirt/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/applications/audio/dirt/default.nix b/pkgs/applications/audio/dirt/default.nix
index c50f85e96ae3..6d56f53bd16f 100644
--- a/pkgs/applications/audio/dirt/default.nix
+++ b/pkgs/applications/audio/dirt/default.nix
@@ -13,9 +13,7 @@ stdenv.mkDerivation rec {
   postPatch = ''
     sed -i "s|./samples|$out/share/dirt/samples|" dirt.c
   '';
-  configurePhase = ''
-    export PREFIX=$out
-  '';
+  makeFlags = ["PREFIX=$(out)"];
   postInstall = ''
     mkdir -p $out/share/dirt/
     cp -r samples $out/share/dirt/

From 8b2d22041fa5df10126706c777a07367c00bbb42 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Mon, 1 Jan 2018 18:54:47 +0800
Subject: [PATCH 18/23] cantata: drop qt4 option

---
 pkgs/applications/audio/cantata/default.nix | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix
index 35fe510cbb2b..57d8b554c4f2 100644
--- a/pkgs/applications/audio/cantata/default.nix
+++ b/pkgs/applications/audio/cantata/default.nix
@@ -1,6 +1,5 @@
 { stdenv, fetchFromGitHub, cmake, pkgconfig, vlc
-, withQt4 ? false, qt4
-, withQt5 ? true, qtbase, qtmultimedia, qtsvg, qttools
+, qtbase, qtmultimedia, qtsvg, qttools
 
 # Cantata doesn't build with cdparanoia enabled so we disable that
 # default for now until I (or someone else) figure it out.
@@ -19,11 +18,6 @@
 , withStreams ? true
 }:
 
-# One and only one front-end.
-assert withQt5 -> withQt4 == false;
-assert withQt4 -> withQt5 == false;
-assert withQt4 || withQt5;
-
 # Inter-dependencies.
 assert withCddb -> withCdda && withTaglib;
 assert withCdda -> withCddb && withMusicbrainz;
@@ -51,9 +45,7 @@ in stdenv.mkDerivation rec {
     sha256 = "1b633chgfs8rya78bzzck5zijna15d1y4nmrz4dcjp862ks5y5q6";
   };
 
-  buildInputs = [ vlc ]
-    ++ stdenv.lib.optional  withQt4 qt4
-    ++ stdenv.lib.optionals withQt5 [ qtbase qtmultimedia qtsvg qttools ]
+  buildInputs = [ vlc qtbase qtmultimedia qtsvg ]
     ++ stdenv.lib.optionals withTaglib [ taglib taglib_extras ]
     ++ stdenv.lib.optionals withReplaygain [ ffmpeg speex mpg123 ]
     ++ stdenv.lib.optional  withCdda cdparanoia
@@ -63,12 +55,11 @@ in stdenv.mkDerivation rec {
     ++ stdenv.lib.optional  withMusicbrainz libmusicbrainz5
     ++ stdenv.lib.optional  withUdisks udisks2;
 
-  nativeBuildInputs = [ cmake pkgconfig ];
+  nativeBuildInputs = [ cmake pkgconfig qttools ];
 
   enableParallelBuilding = true;
 
   cmakeFlags = stdenv.lib.flatten [
-    (fstat withQt5            "QT5")
     (fstats withTaglib        [ "TAGLIB" "TAGLIB_EXTRAS" ])
     (fstats withReplaygain    [ "FFMPEG" "MPG123" "SPEEXDSP" ])
     (fstat withCdda           "CDPARANOIA")

From 7833d55a066cdc2eb55911b188072f2998f8280b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Mon, 1 Jan 2018 16:00:43 +0100
Subject: [PATCH 19/23] alacritty: 2017-11-12 -> 2017-12-29

---
 pkgs/applications/misc/alacritty/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/alacritty/default.nix b/pkgs/applications/misc/alacritty/default.nix
index bb934ff4812c..7bfcc6e72c89 100644
--- a/pkgs/applications/misc/alacritty/default.nix
+++ b/pkgs/applications/misc/alacritty/default.nix
@@ -12,6 +12,7 @@
   libXcursor,
   libXxf86vm,
   libXi,
+  libXrandr,
   xclip }:
 
 with rustPlatform;
@@ -24,22 +25,23 @@ let
     libX11
     libXcursor
     libXxf86vm
+    libXrandr
     libXi
   ];
 in buildRustPackage rec {
   name = "alacritty-unstable-${version}";
-  version = "2017-11-12";
+  version = "2017-12-29";
 
   # At the moment we cannot handle git dependencies in buildRustPackage.
   # This fork only replaces rust-fontconfig/libfontconfig with a git submodules.
   src = fetchgit {
     url = https://github.com/Mic92/alacritty.git;
     rev = "rev-${version}";
-    sha256 = "0096fzrfzj0a2n2n531r4b6c8rlfj5qc90d6i4iin5axalk3i1h4";
+    sha256 = "0pk4b8kfxixmd9985v2fya1m7np8ggws8d9msw210drc0grwbfkd";
     fetchSubmodules = true;
   };
 
-  cargoSha256 = "10blch8pzk1zk3w27sbcszhcnq908xh1q55vqgy8iv5x47rpl02q";
+  cargoSha256 = "0acj526cx4xl52vbcbd3hp1klh4p756j6alxqqz3x715zi2dqkzf";
 
   nativeBuildInputs = [
     cmake

From f3ec623b7048da2252572f19c72233b1312d941a Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Wed, 27 Dec 2017 13:23:59 +0100
Subject: [PATCH 20/23] testssl: refactor and improve expression

---
 pkgs/applications/networking/testssl/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/testssl/default.nix b/pkgs/applications/networking/testssl/default.nix
index dc7c961856d6..50ebee4a0ce5 100644
--- a/pkgs/applications/networking/testssl/default.nix
+++ b/pkgs/applications/networking/testssl/default.nix
@@ -1,7 +1,11 @@
 { stdenv, fetchFromGitHub, pkgs }:
 
-stdenv.mkDerivation rec {
+let
   version = "2.9.5-1";
+  pwdBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ coreutils ])}/pwd";
+  opensslBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ openssl ])}/openssl";
+
+in stdenv.mkDerivation rec {
   name = "testssl.sh-${version}";
 
   src = fetchFromGitHub {
@@ -17,8 +21,6 @@ stdenv.mkDerivation rec {
 
   patches = [ ./testssl.patch ];
 
-  pwdBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ coreutils ])}/pwd";
-  opensslBinPath = "${stdenv.lib.makeBinPath (with pkgs; [ openssl ])}/openssl";
   postPatch = ''
     sed -i -e "s|/bin/pwd|${pwdBinPath}|g"                                     \
            -e "s|TESTSSL_INSTALL_DIR:-\"\"|TESTSSL_INSTALL_DIR:-\"$out\"|g"    \

From e8f401e61be8981b21378b3fa08c3b35aafebc16 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Jan 2018 10:58:01 +0100
Subject: [PATCH 21/23] LTS Haskell 10.2

---
 .../configuration-hackage2nix.yaml            | 90 +++++++++----------
 1 file changed, 45 insertions(+), 45 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 39064998c441..573d256f42cd 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 10.1
+  # LTS Haskell 10.2
   - abstract-deque ==0.3
   - abstract-deque-tests ==0.3
   - abstract-par ==0.3.3
@@ -181,7 +181,7 @@ default-package-overrides:
   - amazonka-xray ==1.5.0
   - amqp ==0.18.1
   - annotated-wl-pprint ==0.7.0
-  - ansigraph ==0.3.0.4
+  - ansigraph ==0.3.0.5
   - ansi-terminal ==0.7.1.1
   - ansi-wl-pprint ==0.6.8.1
   - apecs ==0.2.4.7
@@ -352,7 +352,7 @@ default-package-overrides:
   - cabal-file-th ==0.2.4
   - cabal-rpm ==0.12
   - cabal-toolkit ==0.0.4
-  - cache ==0.1.0.0
+  - cache ==0.1.0.1
   - cairo ==0.13.4.2
   - calendar-recycling ==0.0
   - call-stack ==0.1.0
@@ -378,7 +378,7 @@ default-package-overrides:
   - Chart ==1.8.2
   - Chart-cairo ==1.8.2
   - Chart-diagrams ==1.8.2
-  - chart-unit ==0.5.4
+  - chart-unit ==0.5.5.0
   - chaselev-deque ==0.5.0.5
   - chatwork ==0.1.2.0
   - cheapskate ==0.1.1
@@ -449,7 +449,7 @@ default-package-overrides:
   - conduit-algorithms ==0.0.6.1
   - conduit-combinators ==1.1.2
   - conduit-connection ==0.1.0.3
-  - conduit-extra ==1.2.3
+  - conduit-extra ==1.2.3.1
   - conduit-iconv ==0.1.1.2
   - conduit-parse ==0.1.2.2
   - conduit-throttle ==0.3.1.0
@@ -489,7 +489,7 @@ default-package-overrides:
   - cryptocipher ==0.6.2
   - crypto-cipher-tests ==0.0.11
   - crypto-cipher-types ==0.0.9
-  - crypto-enigma ==0.0.2.9
+  - crypto-enigma ==0.0.2.10
   - cryptohash ==0.11.9
   - cryptohash-cryptoapi ==0.1.4
   - cryptohash-md5 ==0.11.100.1
@@ -560,7 +560,7 @@ default-package-overrides:
   - DAV ==1.3.1
   - dawg-ord ==0.5.1.0
   - dbcleaner ==0.1.3
-  - dbus ==0.10.13
+  - dbus ==0.10.14
   - debian-build ==0.10.1.0
   - debug ==0.0.2
   - Decimal ==0.4.2
@@ -628,7 +628,7 @@ default-package-overrides:
   - doctest-driver-gen ==0.1.0.1
   - do-list ==1.0.1
   - dom-parser ==3.0.0
-  - dotenv ==0.5.2.0
+  - dotenv ==0.5.2.1
   - dotnet-timespan ==0.0.1.0
   - double-conversion ==2.0.2.0
   - download ==0.3.2.6
@@ -764,7 +764,7 @@ default-package-overrides:
   - FloatingHex ==0.4
   - floatshow ==0.2.4
   - flow ==1.0.10
-  - fmlist ==0.9
+  - fmlist ==0.9.1
   - fmt ==0.5.0.0
   - fn ==0.3.0.2
   - focus ==0.1.5.2
@@ -799,7 +799,7 @@ default-package-overrides:
   - funcmp ==1.8
   - functor-classes-compat ==1
   - fuzzcheck ==0.1.1
-  - fuzzyset ==0.1.0.2
+  - fuzzyset ==0.1.0.3
   - gauge ==0.1.3
   - gd ==3000.7.3
   - gdax ==0.6.0.0
@@ -808,7 +808,7 @@ default-package-overrides:
   - generic-aeson ==0.2.0.9
   - generic-arbitrary ==0.1.0
   - generic-deriving ==1.12
-  - generic-lens ==0.5.0.0
+  - generic-lens ==0.5.1.0
   - GenericPretty ==1.2.1
   - generic-random ==1.0.0.0
   - generics-eot ==0.2.1.1
@@ -1024,7 +1024,7 @@ default-package-overrides:
   - hamlet ==1.2.0
   - HandsomeSoup ==0.4.2
   - handwriting ==0.1.0.3
-  - hapistrano ==0.3.5.0
+  - hapistrano ==0.3.5.1
   - happstack-hsp ==7.3.7.3
   - happstack-jmacro ==7.0.12
   - happstack-server ==7.5.0.1
@@ -1043,8 +1043,8 @@ default-package-overrides:
   - haskell-gi-overloading ==1.0
   - haskell-import-graph ==1.0.3
   - haskell-lexer ==1.0.1
-  - haskell-lsp ==0.2.0.0
-  - haskell-lsp-client ==1.0.0.0
+  - haskell-lsp ==0.2.0.1
+  - haskell-lsp-client ==1.0.0.1
   - haskell-names ==0.9.0
   - haskell-neo4j-client ==0.3.2.4
   - HaskellNet ==0.5.1
@@ -1106,7 +1106,7 @@ default-package-overrides:
   - hfsevents ==0.1.6
   - hid ==0.2.2
   - hidapi ==0.1.4
-  - hidden-char ==0.1.0.1
+  - hidden-char ==0.1.0.2
   - hierarchical-clustering ==0.4.6
   - higher-leveldb ==0.4.0.1
   - highjson ==0.4.0.0
@@ -1155,7 +1155,7 @@ default-package-overrides:
   - hquantlib ==0.0.4.0
   - hreader ==1.1.0
   - hreader-lens ==0.1.3.0
-  - hruby ==0.3.5
+  - hruby ==0.3.5.1
   - hsass ==0.5.0
   - hsb2hs ==0.3.1
   - hs-bibutils ==6.2.0.1
@@ -1281,13 +1281,13 @@ default-package-overrides:
   - incremental-parser ==0.2.5.2
   - indentation-core ==0.0.0.1
   - indentation-parsec ==0.0.0.1
-  - indents ==0.4.0.0
+  - indents ==0.4.0.1
   - inflections ==0.4.0.0
   - influxdb ==1.2.2.2
   - ini ==0.3.5
   - inline-c ==0.6.0.5
   - inline-c-cpp ==0.2.1.0
-  - inline-java ==0.7.1
+  - inline-java ==0.7.2
   - inline-r ==0.9.0.2
   - insert-ordered-containers ==0.2.1.0
   - inspection-testing ==0.1.2
@@ -1297,8 +1297,8 @@ default-package-overrides:
   - intern ==0.9.1.4
   - interpolate ==0.1.1
   - interpolatedstring-perl6 ==1.0.0
-  - Interpolation ==0.3.0
   - interpolation ==0.1.0.2
+  - Interpolation ==0.3.0
   - IntervalMap ==0.5.3.1
   - intervals ==0.8.1
   - intro ==0.3.0.1
@@ -1338,7 +1338,7 @@ default-package-overrides:
   - jmacro-rpc ==0.3.2
   - jmacro-rpc-happstack ==0.3.2
   - jmacro-rpc-snap ==0.3
-  - jni ==0.5.0
+  - jni ==0.5.1
   - jose ==0.6.0.3
   - jose-jwt ==0.7.8
   - jsaddle ==0.9.4.0
@@ -1348,14 +1348,14 @@ default-package-overrides:
   - json ==0.9.1
   - json-autotype ==1.0.18
   - json-builder ==0.3
-  - json-rpc-generic ==0.2.1.2
+  - json-rpc-generic ==0.2.1.3
   - json-schema ==0.7.4.1
   - json-stream ==0.4.1.5
-  - JuicyPixels ==3.2.9.1
+  - JuicyPixels ==3.2.9.2
   - JuicyPixels-extra ==0.2.2
   - JuicyPixels-scale-dct ==0.1.1.2
   - justified-containers ==0.2.0.1
-  - jvm ==0.4.0.1
+  - jvm ==0.4.1
   - jwt ==0.7.2
   - kan-extensions ==5.0.2
   - kanji ==3.0.2
@@ -1493,7 +1493,7 @@ default-package-overrides:
   - median-stream ==0.7.0.0
   - med-module ==0.1.1
   - megaparsec ==6.3.0
-  - mega-sdist ==0.3.0.5
+  - mega-sdist ==0.3.0.6
   - memory ==0.14.11
   - MemoTrie ==0.6.8
   - mercury-api ==0.1.0.1
@@ -1532,7 +1532,7 @@ default-package-overrides:
   - mixed-types-num ==0.3.1.4
   - mltool ==0.1.0.2
   - mmap ==0.5.9
-  - mmark ==0.0.3.2
+  - mmark ==0.0.4.0
   - mmark-ext ==0.0.1.1
   - mmorph ==1.1.0
   - mnist-idx ==0.1.2.8
@@ -1575,12 +1575,12 @@ default-package-overrides:
   - monad-time ==0.2
   - monad-unlift ==0.2.0
   - monad-unlift-ref ==0.2.1
-  - mongoDB ==2.3.0
+  - mongoDB ==2.3.0.1
   - monoidal-containers ==0.3.0.2
   - monoid-extras ==0.4.2
   - monoid-subclasses ==0.4.4
   - monoid-transformer ==0.0.3
-  - mono-traversable ==1.0.6.0
+  - mono-traversable ==1.0.7.0
   - mono-traversable-instances ==0.1.0.0
   - morte ==1.6.13
   - mountpoints ==1.0.2
@@ -1663,8 +1663,8 @@ default-package-overrides:
   - numbers ==3000.2.0.1
   - numeric-extras ==0.1
   - numeric-prelude ==0.4.2
-  - numhask ==0.1.3
-  - numhask-range ==0.1.2
+  - numhask ==0.1.4.0
+  - numhask-range ==0.1.3.0
   - NumInstances ==1.4
   - numtype-dk ==0.5.0.1
   - nvim-hs ==0.2.4
@@ -1679,7 +1679,7 @@ default-package-overrides:
   - old-locale ==1.0.0.7
   - old-time ==1.1.0.3
   - once ==0.2
-  - one-liner ==0.9.1
+  - one-liner ==0.9.2
   - OneTuple ==0.2.1
   - online ==0.2.0
   - Only ==0.1
@@ -1710,8 +1710,8 @@ default-package-overrides:
   - pagerduty ==0.0.8
   - pagination ==0.2.1
   - palette ==0.1.0.5
-  - pandoc ==2.0.5
-  - pandoc-citeproc ==0.12.2
+  - pandoc ==2.0.6
+  - pandoc-citeproc ==0.12.2.2
   - pandoc-types ==1.17.3
   - pango ==0.13.4.0
   - papillon ==0.1.0.5
@@ -1722,7 +1722,7 @@ default-package-overrides:
   - parsec-numeric ==0.1.0.0
   - ParsecTools ==0.0.2.0
   - parser-combinators ==0.2.1
-  - parsers ==0.12.7
+  - parsers ==0.12.8
   - partial-handler ==1.0.2
   - partial-isomorphisms ==0.2.2.1
   - partial-order ==0.1.2.1
@@ -1842,7 +1842,7 @@ default-package-overrides:
   - product-isomorphic ==0.0.3.1
   - product-profunctors ==0.8.0.3
   - profiterole ==0.1
-  - profiteur ==0.4.3.0
+  - profiteur ==0.4.4.0
   - profunctor-extras ==4.0
   - profunctors ==5.2.1
   - projectroot ==0.2.0.1
@@ -1872,7 +1872,7 @@ default-package-overrides:
   - pure-io ==0.2.1
   - pureMD5 ==2.1.3
   - purescript-bridge ==0.11.1.2
-  - pusher-http-haskell ==1.5.0.1
+  - pusher-http-haskell ==1.5.1.0
   - pwstore-fast ==2.4.4
   - qchas ==1.0.1.0
   - qm-interpolated-string ==0.2.1.0
@@ -2244,7 +2244,7 @@ default-package-overrides:
   - tasty-program ==1.0.5
   - tasty-quickcheck ==0.9.1
   - tasty-rerun ==1.1.8
-  - tasty-silver ==3.1.10
+  - tasty-silver ==3.1.11
   - tasty-smallcheck ==0.8.1
   - tasty-stats ==0.2.0.3
   - tasty-tap ==0.0.4
@@ -2286,7 +2286,7 @@ default-package-overrides:
   - text-printer ==0.5
   - text-region ==0.3.0.0
   - text-short ==0.1.1
-  - text-show ==3.7
+  - text-show ==3.7.1
   - text-show-instances ==3.6.2
   - text-zipper ==0.10.1
   - tfp ==1.0.0.2
@@ -2295,7 +2295,7 @@ default-package-overrides:
   - th-data-compat ==0.0.2.5
   - th-desugar ==1.7
   - these ==0.7.4
-  - th-expand-syns ==0.4.3.0
+  - th-expand-syns ==0.4.4.0
   - th-extras ==0.0.0.4
   - th-lift ==0.7.7
   - th-lift-instances ==0.1.11
@@ -2381,7 +2381,7 @@ default-package-overrides:
   - type-level-kv-list ==1.1.0
   - type-level-numbers ==0.1.1.1
   - typelits-witnesses ==0.2.3.0
-  - type-of-html ==1.3.0.1
+  - type-of-html ==1.3.2.0
   - type-operators ==0.1.0.4
   - type-spec ==0.3.0.1
   - typography-geometry ==1.0.0.1
@@ -2408,7 +2408,7 @@ default-package-overrides:
   - Unique ==0.4.7.1
   - unique ==0
   - unit-constraint ==0.0.0
-  - units-parser ==0.1.1
+  - units-parser ==0.1.1.2
   - universe ==1.0
   - universe-base ==1.0.2.1
   - universe-instances-base ==1.0
@@ -2419,7 +2419,7 @@ default-package-overrides:
   - unix-bytestring ==0.3.7.3
   - unix-compat ==0.5.0.1
   - unix-time ==0.3.7
-  - unliftio ==0.2.1.0
+  - unliftio ==0.2.2.0
   - unliftio-core ==0.1.0.0
   - unlit ==0.4.0.0
   - unordered-containers ==0.2.8.0
@@ -2491,7 +2491,7 @@ default-package-overrides:
   - wai-eventsource ==3.0.0
   - wai-extra ==3.0.21.0
   - wai-handler-launch ==3.0.2.3
-  - wai-logger ==2.3.0
+  - wai-logger ==2.3.1
   - wai-middleware-auth ==0.1.2.1
   - wai-middleware-caching ==0.1.0.2
   - wai-middleware-caching-lru ==0.1.0.0
@@ -2530,7 +2530,7 @@ default-package-overrides:
   - websockets-rpc ==0.6.0
   - websockets-simple ==0.0.6.3
   - websockets-snap ==0.10.2.4
-  - weeder ==0.1.9
+  - weeder ==0.1.11
   - weigh ==0.0.7
   - wide-word ==0.1.0.5
   - wikicfp-scraper ==0.1.0.9
@@ -2603,7 +2603,7 @@ default-package-overrides:
   - xturtle ==0.2.0.0
   - xxhash ==0.0.2
   - xxhash-ffi ==0.2.0.0
-  - yaml ==0.8.25
+  - yaml ==0.8.25.1
   - Yampa ==0.10.7
   - YampaSynth ==0.2
   - yeshql ==3.0.1.3
@@ -2630,7 +2630,7 @@ default-package-overrides:
   - yesod-static ==1.5.3.1
   - yesod-static-angular ==0.1.8
   - yesod-table ==2.0.3
-  - yesod-test ==1.5.8
+  - yesod-test ==1.5.9.1
   - yesod-websockets ==0.2.6
   - yes-precure5-command ==5.5.3
   - yi-core ==0.17.1

From ca84a2dd1aa76366eb26782e4ff36e7197ae9a62 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Jan 2018 02:30:33 +0100
Subject: [PATCH 22/23] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.7.1-1-gc1b61fc from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/5dc3be17123e381d9a430db7f0abb7ab43b7d8c9.
---
 .../haskell-modules/hackage-packages.nix      | 1364 ++++-------------
 1 file changed, 327 insertions(+), 1037 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 5aa31e7e948c..3094d3bbc87d 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -753,6 +753,8 @@ self: {
        pname = "Agda";
        version = "2.5.3";
        sha256 = "0r80vw7vnvbgq47y50v050malv7zvv2p2kg6f47i04r0b2ix855a";
+       revision = "2";
+       editedCabalFile = "1vh1v5410wji5r8445rf9h0qd94kz7dkq4pmqcrk3ra75klp4sc9";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -4706,6 +4708,23 @@ self: {
        license = "unknown";
      }) {};
 
+  "EdisonCore_1_3_2" = callPackage
+    ({ mkDerivation, array, base, containers, EdisonAPI, mtl
+     , QuickCheck
+     }:
+     mkDerivation {
+       pname = "EdisonCore";
+       version = "1.3.2";
+       sha256 = "03ra7xsgdyy7nmy6dlspbzddzfpx1cqv75pn0qk6hdxwnabvnbl1";
+       libraryHaskellDepends = [
+         array base containers EdisonAPI mtl QuickCheck
+       ];
+       homepage = "http://rwd.rdockins.name/edison/home/";
+       description = "A library of efficient, purely-functional data structures (Core Implementations)";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "EditTimeReport" = callPackage
     ({ mkDerivation, array, base, containers, csv, directory, editline
      , filepath, haskell98, html, pretty, xhtml
@@ -10657,25 +10676,6 @@ self: {
      }) {};
 
   "JuicyPixels" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers, deepseq, mtl
-     , primitive, transformers, vector, zlib
-     }:
-     mkDerivation {
-       pname = "JuicyPixels";
-       version = "3.2.9.1";
-       sha256 = "1g31zgsg7gq5ac9r5aizghvrg7jwn1a0qs4qwnfillqn4wkw6y5b";
-       revision = "1";
-       editedCabalFile = "04llw8m0s7bqz1d1vymhnzr51y9y6r9vwn4acwch1a10kq02kkpg";
-       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_2" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, deepseq, mtl
      , primitive, transformers, vector, zlib
      }:
@@ -10690,7 +10690,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-canvas" = callPackage
@@ -26099,19 +26098,6 @@ self: {
      }) {};
 
   "ansigraph" = callPackage
-    ({ mkDerivation, ansi-terminal, base, hspec, QuickCheck }:
-     mkDerivation {
-       pname = "ansigraph";
-       version = "0.3.0.4";
-       sha256 = "0gyim5a4b0gc4z45hsbxwl3gn3xcad3068xwcgwh8gc4ikannki9";
-       libraryHaskellDepends = [ ansi-terminal base ];
-       testHaskellDepends = [ base hspec QuickCheck ];
-       homepage = "https://github.com/BlackBrane/ansigraph";
-       description = "Terminal-based graphing via ANSI and Unicode";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "ansigraph_0_3_0_5" = callPackage
     ({ mkDerivation, ansi-terminal, base, hspec, QuickCheck }:
      mkDerivation {
        pname = "ansigraph";
@@ -26122,7 +26108,6 @@ self: {
        homepage = "https://github.com/BlackBrane/ansigraph";
        description = "Terminal-based graphing via ANSI and Unicode";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "antagonist" = callPackage
@@ -29049,8 +29034,8 @@ self: {
      }:
      mkDerivation {
        pname = "ats-format";
-       version = "0.1.0.10";
-       sha256 = "0q74j2mn85siix4msqjx0w0bly9f8dxjpbd0cwcyag8jj2gd6i62";
+       version = "0.1.0.14";
+       sha256 = "020gbvh8wj5xnldmc1l2dib26bwinqdq66pn4z3xdpl3zf4zj1in";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -31962,6 +31947,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bcrypt_0_0_11" = callPackage
+    ({ mkDerivation, base, bytestring, data-default, entropy, memory }:
+     mkDerivation {
+       pname = "bcrypt";
+       version = "0.0.11";
+       sha256 = "1vzwf9g6mvn4v1cn1m0axjyi2l0glnvv8c49v1j51dm7xn41fcz4";
+       libraryHaskellDepends = [
+         base bytestring data-default entropy memory
+       ];
+       description = "Haskell bindings to the bcrypt password hash";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "bdd" = callPackage
     ({ mkDerivation, base, directory, HUnit, mtl, process
      , test-framework, test-framework-hunit, transformers
@@ -38802,8 +38801,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-bounds";
-       version = "1.3.0";
-       sha256 = "0cv4j4x5zwnddi6nsnl78i1b1pisg6fwpdpy2iv8ndyw3h2msmys";
+       version = "1.5.0";
+       sha256 = "0qkrrbv8b0ij4hrqzlzzkn2rislz77kbvqb67mh0pnlfrn77kwy7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -39210,8 +39209,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-lenses";
-       version = "0.6.0";
-       sha256 = "0wj6plxg19mfaycw6glrn7b5g2rsvvflkar63qn01c86vzkj7ynd";
+       version = "0.7.0";
+       sha256 = "07xyn4sy2snj8a5983p6g6w9pwklzmd3w9wzj02ig4pdnz7682ls";
        libraryHaskellDepends = [
          base Cabal either lens strict system-fileio system-filepath text
          transformers unordered-containers
@@ -39857,23 +39856,6 @@ self: {
      }) {cabocha = null;};
 
   "cache" = callPackage
-    ({ mkDerivation, base, clock, hashable, hspec, stm, transformers
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "cache";
-       version = "0.1.0.0";
-       sha256 = "1l7vn3fnspbnm3qrrxai7ldcy63wkppa4amspxhpqaajch5f97hl";
-       libraryHaskellDepends = [
-         base clock hashable stm transformers unordered-containers
-       ];
-       testHaskellDepends = [ base clock hspec stm transformers ];
-       homepage = "https://github.com/hverr/haskell-cache";
-       description = "An in-memory key/value store with expiration support";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "cache_0_1_0_1" = callPackage
     ({ mkDerivation, base, clock, hashable, hspec, stm, transformers
      , unordered-containers
      }:
@@ -39888,7 +39870,6 @@ self: {
        homepage = "https://github.com/hverr/haskell-cache";
        description = "An in-memory key/value store with expiration support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cached-io" = callPackage
@@ -42271,8 +42252,8 @@ self: {
      }:
      mkDerivation {
        pname = "cgrep";
-       version = "6.6.17";
-       sha256 = "18si8gmgkfzky9rd53llz489j2wgzaw2b7hgr1djlc9yvp5h7482";
+       version = "6.6.22";
+       sha256 = "0nh8smbhwkqygxdv61yd82n26q6d4sdh4zzixcq5pczzacfzp8j9";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -42476,33 +42457,6 @@ self: {
      }) {};
 
   "chart-unit" = callPackage
-    ({ mkDerivation, base, colour, containers, data-default
-     , diagrams-lib, diagrams-svg, foldl, formatting, lens, linear
-     , mwc-probability, mwc-random, numhask, numhask-range, palette
-     , primitive, protolude, SVGFonts, tasty, tasty-hspec, tdigest, text
-     }:
-     mkDerivation {
-       pname = "chart-unit";
-       version = "0.5.4";
-       sha256 = "1zyfh713sr8bhyn6v2la52xzyq7frg0igwxhfl8ym8l7nhxrrby7";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base colour data-default diagrams-lib diagrams-svg foldl formatting
-         lens linear numhask numhask-range palette SVGFonts text
-       ];
-       executableHaskellDepends = [
-         base containers diagrams-lib diagrams-svg foldl formatting lens
-         mwc-probability mwc-random numhask primitive protolude tdigest text
-       ];
-       testHaskellDepends = [ base numhask tasty tasty-hspec text ];
-       homepage = "https://github.com/tonyday567/chart-unit";
-       description = "Native haskell charts";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "chart-unit_0_5_5_0" = callPackage
     ({ mkDerivation, base, colour, containers, data-default
      , diagrams-lib, diagrams-svg, foldl, formatting, lens, linear
      , mwc-probability, mwc-random, numhask, numhask-range, palette
@@ -43095,6 +43049,8 @@ self: {
        pname = "chr-core";
        version = "0.1.0.0";
        sha256 = "19sihdl4fld1f7aq0gydpy6vhag98fp8kg1qla0yzzx2qaz8bnw7";
+       revision = "1";
+       editedCabalFile = "1x81fd0a25rplkml0hkf0l5916kivy0jl9z3vr9q95yx4iw9kfzr";
        libraryHaskellDepends = [
          base chr-data chr-pretty containers hashable logict-state mtl
          pqueue unordered-containers
@@ -43114,6 +43070,8 @@ self: {
        pname = "chr-data";
        version = "0.1.0.0";
        sha256 = "0igcqrqbxy3l26b3girh6qpmls5z2jcgzywxid2qq348jan88bgh";
+       revision = "1";
+       editedCabalFile = "1wzhcwzaskbl28plgs0z26jh3mj99mf2rbkn75n75yr6gf8fqs44";
        libraryHaskellDepends = [
          array base chr-pretty containers fclabels hashable microlens
          microlens-mtl microlens-th mtl template-haskell
@@ -43132,8 +43090,8 @@ self: {
        pname = "chr-lang";
        version = "0.1.0.0";
        sha256 = "0rn2hv1a8jxzyg4qkbz0m9h0id3q353yg2j85pik49s00hnmqh3p";
-       revision = "1";
-       editedCabalFile = "0kcj8l96cb4drsiz57mxggc75mlabp5rsl01l743cadh7zyx0g95";
+       revision = "2";
+       editedCabalFile = "1zmr4a6gqdai3p4sw1nv0jsm617sv6crdpjgpxq2zwrwbsbm3zxq";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -43153,6 +43111,8 @@ self: {
        pname = "chr-parse";
        version = "0.1.0.0";
        sha256 = "00jlfpanzkawiz0fh5gc4czda9ip5r203pnjwllcqhmy9w04ip9k";
+       revision = "1";
+       editedCabalFile = "0h3qyn306sxqsvxmz9hfba169nkc3hx7ygkxr5j2sz033fvi31jc";
        libraryHaskellDepends = [ base containers uulib ];
        homepage = "https://github.com/atzedijkstra/chr";
        description = "Parsing for chr library";
@@ -43165,6 +43125,8 @@ self: {
        pname = "chr-pretty";
        version = "0.1.0.0";
        sha256 = "0flm7phvi5x84m8vbkvhd3xq3dwnj1vxwi27fw78ikbzx91q376n";
+       revision = "1";
+       editedCabalFile = "15v5bv7azi7qw33rg849wggpy07ingd8fp24dm0azwgwsqd05mb9";
        libraryHaskellDepends = [ base containers ];
        homepage = "https://github.com/atzedijkstra/chr";
        description = "Pretty printing for chr library";
@@ -48405,37 +48367,6 @@ self: {
      }) {};
 
   "conduit-extra" = callPackage
-    ({ mkDerivation, async, attoparsec, base, blaze-builder, bytestring
-     , bytestring-builder, conduit, criterion, directory, exceptions
-     , filepath, hspec, monad-control, network, primitive, process
-     , QuickCheck, resourcet, stm, streaming-commons, text, transformers
-     , transformers-base, typed-process, unliftio-core
-     }:
-     mkDerivation {
-       pname = "conduit-extra";
-       version = "1.2.3";
-       sha256 = "1ca18kjfcbbcd345rxhpvdhnc0gma6408vpl0hasspb6k7yjsabk";
-       libraryHaskellDepends = [
-         async attoparsec base blaze-builder bytestring conduit directory
-         exceptions filepath monad-control network primitive process
-         resourcet stm streaming-commons text transformers transformers-base
-         typed-process unliftio-core
-       ];
-       testHaskellDepends = [
-         async attoparsec base blaze-builder bytestring bytestring-builder
-         conduit directory exceptions hspec process QuickCheck resourcet stm
-         streaming-commons text transformers transformers-base
-       ];
-       benchmarkHaskellDepends = [
-         base blaze-builder bytestring bytestring-builder conduit criterion
-         transformers
-       ];
-       homepage = "http://github.com/snoyberg/conduit";
-       description = "Batteries included conduit: adapters for common libraries";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "conduit-extra_1_2_3_1" = callPackage
     ({ mkDerivation, async, attoparsec, base, blaze-builder, bytestring
      , bytestring-builder, conduit, criterion, directory, exceptions
      , filepath, hspec, monad-control, network, primitive, process
@@ -48464,7 +48395,6 @@ self: {
        homepage = "http://github.com/snoyberg/conduit";
        description = "Batteries included conduit: adapters for common libraries";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "conduit-find" = callPackage
@@ -51923,23 +51853,6 @@ self: {
      }) {};
 
   "crypto-enigma" = callPackage
-    ({ mkDerivation, base, containers, HUnit, MissingH, mtl, QuickCheck
-     , split
-     }:
-     mkDerivation {
-       pname = "crypto-enigma";
-       version = "0.0.2.9";
-       sha256 = "18nc5gqsy4dsm22van6iz96lqq45f7jqik4fljczgp6n1knyig9z";
-       revision = "1";
-       editedCabalFile = "1hbcnj3w5z7cmlrmfih7mv27n75bpcpbiq66wsfgrrvaiycrb58n";
-       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_10" = callPackage
     ({ mkDerivation, base, containers, HUnit, MissingH, mtl, QuickCheck
      , split
      }:
@@ -51952,7 +51865,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
@@ -53044,6 +52956,8 @@ self: {
        pname = "cue-sheet";
        version = "1.0.0";
        sha256 = "05fj4iqg0ixrs8076p9jcl5my0qx4hgzcprnaymfkkr0n9x06sz1";
+       revision = "1";
+       editedCabalFile = "15d4wbkh99w27g6bd5h0g0nc2h34ysianlpmnw8pvbvng7srhq5s";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base bytestring containers data-default-class exceptions megaparsec
@@ -53058,6 +52972,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "cue-sheet_1_0_1" = callPackage
+    ({ mkDerivation, base, bytestring, containers, data-default-class
+     , exceptions, hspec, hspec-megaparsec, megaparsec, mtl, QuickCheck
+     , text
+     }:
+     mkDerivation {
+       pname = "cue-sheet";
+       version = "1.0.1";
+       sha256 = "13vzay3i385k8i2k56bl9rr9sy7mnhas4b35xc8q7744gbl5hji1";
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base bytestring containers data-default-class exceptions megaparsec
+         mtl QuickCheck text
+       ];
+       testHaskellDepends = [
+         base bytestring exceptions hspec hspec-megaparsec megaparsec
+         QuickCheck text
+       ];
+       homepage = "https://github.com/mrkkrp/cue-sheet";
+       description = "Support for construction, rendering, and parsing of CUE sheets";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cufft" = callPackage
     ({ mkDerivation, base, c2hs, Cabal, cuda, directory, filepath
      , template-haskell
@@ -55091,8 +55029,8 @@ self: {
      }:
      mkDerivation {
        pname = "data-lens";
-       version = "2.11.1";
-       sha256 = "0ciwqxm79a8zdfi7wymy9hhan6362hlhd6n8sz79pyjlsyvhpgpv";
+       version = "2.11.2";
+       sha256 = "123rxp37qjg0rkwz0521s5181qcm4v9gk94ny2j86vw7311kd0ax";
        libraryHaskellDepends = [
          base comonad containers semigroupoids transformers
        ];
@@ -56247,25 +56185,26 @@ self: {
      }) {};
 
   "dbus" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, chell, chell-quickcheck
-     , containers, criterion, deepseq, directory, filepath, libxml-sax
-     , network, parsec, process, QuickCheck, random, text, transformers
-     , unix, vector, xml-types
+    ({ mkDerivation, base, bytestring, cereal, containers, criterion
+     , deepseq, directory, extra, filepath, libxml-sax, network, parsec
+     , process, QuickCheck, random, resourcet, tasty, tasty-hunit
+     , tasty-quickcheck, text, transformers, unix, vector, xml-types
      }:
      mkDerivation {
        pname = "dbus";
-       version = "0.10.13";
-       sha256 = "1jksgv3c2bhi9d3kshllx6j1znyqmx189j6yml7j9gm0m3xsx55a";
+       version = "0.10.14";
+       sha256 = "13x1b3qzgsrksaqmrrlpvn5ivq4s4yzhwa8nl833pcvybzzxjb9n";
        libraryHaskellDepends = [
-         base bytestring cereal containers libxml-sax network parsec random
-         text transformers unix vector xml-types
+         base bytestring cereal containers deepseq libxml-sax network parsec
+         random text transformers unix vector xml-types
        ];
        testHaskellDepends = [
-         base bytestring cereal chell chell-quickcheck containers directory
-         filepath libxml-sax network parsec process QuickCheck random text
-         transformers unix vector xml-types
+         base bytestring cereal containers directory extra filepath
+         libxml-sax network parsec process QuickCheck random resourcet tasty
+         tasty-hunit tasty-quickcheck text transformers unix vector
+         xml-types
        ];
-       benchmarkHaskellDepends = [ base criterion deepseq ];
+       benchmarkHaskellDepends = [ base criterion ];
        doCheck = false;
        homepage = "https://github.com/rblaze/haskell-dbus#readme";
        description = "A client library for the D-Bus IPC system";
@@ -61863,36 +61802,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.0";
-       sha256 = "1w3jq6jr5n53rwgjcwmbhhba3nfc073sc9ff6f8672jwsscvlnc1";
-       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_1" = callPackage
     ({ mkDerivation, base, base-compat, directory, exceptions, hspec
      , hspec-megaparsec, megaparsec, optparse-applicative, process, text
      , transformers, yaml
@@ -65763,6 +65672,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "entropy_0_4" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, directory, filepath
+     , process, unix
+     }:
+     mkDerivation {
+       pname = "entropy";
+       version = "0.4";
+       sha256 = "0h8icprikafidq4x88crz5phfgp6zgmxq4awam2dhs0z2fswd9wc";
+       revision = "1";
+       editedCabalFile = "1hx5yxzypi708zlg1almqhfasfgmaisrv44fr0i8ldvvqxf5slza";
+       setupHaskellDepends = [ base Cabal directory filepath process ];
+       libraryHaskellDepends = [ base bytestring unix ];
+       homepage = "https://github.com/TomMD/entropy";
+       description = "A platform independent entropy source";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "enumerable" = callPackage
     ({ mkDerivation, base, control-monad-omega, tagged }:
      mkDerivation {
@@ -68643,18 +68570,16 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "extensible-effects_2_2_1_0" = callPackage
+  "extensible-effects_2_3_0_1" = callPackage
     ({ mkDerivation, base, criterion, directory, HUnit, mtl, QuickCheck
      , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , test-framework-th, transformers, transformers-base, type-aligned
+     , test-framework-th, transformers, transformers-base
      }:
      mkDerivation {
        pname = "extensible-effects";
-       version = "2.2.1.0";
-       sha256 = "1x21y5ilv5hka4cx7il53gr89hpap577pacfg8v23zbravi270zr";
-       libraryHaskellDepends = [
-         base transformers transformers-base type-aligned
-       ];
+       version = "2.3.0.1";
+       sha256 = "1mznv07wz8wq42ww54w867x38xq9zr23jf54h6bqyrqjwyl7lavw";
+       libraryHaskellDepends = [ base transformers transformers-base ];
        testHaskellDepends = [
          base directory HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 test-framework-th
@@ -69145,20 +69070,19 @@ self: {
      }) {};
 
   "fast-combinatorics" = callPackage
-    ({ mkDerivation, arithmoi, base, Cabal, combinatorics
-     , composition-prelude, criterion, directory, hspec, http-client
-     , http-client-tls, tar, zlib
+    ({ mkDerivation, base, Cabal, composition-prelude, criterion
+     , directory, hspec, http-client, http-client-tls, tar, zlib
      }:
      mkDerivation {
        pname = "fast-combinatorics";
-       version = "0.1.0.3";
-       sha256 = "1ch6lg4br3yk9n59rf5dcxbwlh0gi27zkqd2cbnkm1p33ik7bvdf";
+       version = "0.1.0.6";
+       sha256 = "1bkrdqlqhccp0scz7ww7xp08sjx2fjrsgdhmk8n1l2qxnvag0wpm";
        setupHaskellDepends = [
          base Cabal directory http-client http-client-tls tar zlib
        ];
        libraryHaskellDepends = [ base composition-prelude ];
-       testHaskellDepends = [ arithmoi base combinatorics hspec ];
-       benchmarkHaskellDepends = [ base combinatorics criterion ];
+       testHaskellDepends = [ base hspec ];
+       benchmarkHaskellDepends = [ base criterion ];
        homepage = "https://github.com//fast-combinatorics#readme";
        description = "Fast combinatorics";
        license = stdenv.lib.licenses.bsd3;
@@ -72623,18 +72547,6 @@ self: {
      }) {};
 
   "fmlist" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "fmlist";
-       version = "0.9";
-       sha256 = "1gzwmsrbxk22v7syf8zfvxphm23dmjzfpysz6qww3qvib8wm64aq";
-       libraryHaskellDepends = [ base ];
-       homepage = "https://github.com/sjoerdvisscher/fmlist";
-       description = "FoldMap lists";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "fmlist_0_9_1" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "fmlist";
@@ -72644,7 +72556,6 @@ self: {
        homepage = "https://github.com/sjoerdvisscher/fmlist";
        description = "FoldMap lists";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fmt" = callPackage
@@ -75513,27 +75424,6 @@ self: {
      }) {};
 
   "fuzzyset" = callPackage
-    ({ mkDerivation, base, base-unicode-symbols, data-default, hspec
-     , ieee754, lens, text, text-metrics, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "fuzzyset";
-       version = "0.1.0.2";
-       sha256 = "1gpx8qw9vxlardjxncgkbbk3zvq8zjrc6nhjk80va7d7ix5zpdhz";
-       libraryHaskellDepends = [
-         base base-unicode-symbols data-default lens text text-metrics
-         unordered-containers vector
-       ];
-       testHaskellDepends = [
-         base base-unicode-symbols hspec ieee754 lens text
-         unordered-containers
-       ];
-       homepage = "https://github.com/laserpants/fuzzyset-haskell";
-       description = "Fuzzy set for approximate string matching";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "fuzzyset_0_1_0_3" = callPackage
     ({ mkDerivation, base, base-unicode-symbols, data-default, hspec
      , ieee754, lens, text, text-metrics, unordered-containers, vector
      }:
@@ -75552,7 +75442,6 @@ self: {
        homepage = "https://github.com/laserpants/fuzzyset-haskell";
        description = "Fuzzy set for approximate string matching";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fuzzytime" = callPackage
@@ -76592,24 +76481,6 @@ self: {
      }) {};
 
   "generic-lens" = callPackage
-    ({ mkDerivation, base, criterion, deepseq, doctest
-     , inspection-testing, lens, profunctors, QuickCheck, tagged
-     }:
-     mkDerivation {
-       pname = "generic-lens";
-       version = "0.5.0.0";
-       sha256 = "0jp6qy45j7cg251pxq5x4ygg6m7gc6v57nd8ky26r18g9wn9f7w3";
-       libraryHaskellDepends = [ base profunctors tagged ];
-       testHaskellDepends = [ base doctest inspection-testing ];
-       benchmarkHaskellDepends = [
-         base criterion deepseq lens QuickCheck
-       ];
-       homepage = "https://github.com/kcsongor/generic-lens";
-       description = "Generic data-structure operations exposed as lenses";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "generic-lens_0_5_1_0" = callPackage
     ({ mkDerivation, base, criterion, deepseq, doctest
      , inspection-testing, lens, profunctors, QuickCheck, tagged
      }:
@@ -76625,7 +76496,6 @@ self: {
        homepage = "https://github.com/kcsongor/generic-lens";
        description = "Generic data-structure operations exposed as lenses";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "generic-lucid-scaffold" = callPackage
@@ -89440,32 +89310,6 @@ self: {
      }) {};
 
   "hapistrano" = callPackage
-    ({ mkDerivation, aeson, async, base, directory, filepath, hspec
-     , mtl, optparse-applicative, path, path-io, process, stm, temporary
-     , time, transformers, yaml
-     }:
-     mkDerivation {
-       pname = "hapistrano";
-       version = "0.3.5.0";
-       sha256 = "15cjssws55awwq8j0xz8f4dd0y826f99zdv6mpxfxq97fah7zlcc";
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       libraryHaskellDepends = [
-         base filepath mtl path process time transformers
-       ];
-       executableHaskellDepends = [
-         aeson async base optparse-applicative path path-io stm yaml
-       ];
-       testHaskellDepends = [
-         base directory filepath hspec mtl path path-io process temporary
-       ];
-       homepage = "https://github.com/stackbuilders/hapistrano";
-       description = "A deployment library for Haskell applications";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hapistrano_0_3_5_1" = callPackage
     ({ mkDerivation, aeson, async, base, directory, filepath
      , formatting, gitrev, hspec, mtl, optparse-applicative, path
      , path-io, process, stm, temporary, time, transformers, yaml
@@ -89490,7 +89334,6 @@ self: {
        homepage = "https://github.com/stackbuilders/hapistrano";
        description = "A deployment library for Haskell applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happindicator" = callPackage
@@ -91900,37 +91743,6 @@ self: {
      }) {};
 
   "haskell-lsp" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, data-default
-     , directory, filepath, hashable, hslogger, hspec, lens, mtl, parsec
-     , sorted-list, stm, text, time, transformers, unordered-containers
-     , vector, yi-rope
-     }:
-     mkDerivation {
-       pname = "haskell-lsp";
-       version = "0.2.0.0";
-       sha256 = "1hvqimg580hbanlhim2kxni3wk6rfwsd93agkfjhy216lb8bd9h8";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring containers data-default directory filepath
-         hashable hslogger lens mtl parsec sorted-list stm text time
-         unordered-containers yi-rope
-       ];
-       executableHaskellDepends = [
-         aeson base bytestring containers data-default directory filepath
-         hslogger lens mtl parsec stm text time transformers
-         unordered-containers vector yi-rope
-       ];
-       testHaskellDepends = [
-         aeson base containers directory hashable hspec lens sorted-list
-         text yi-rope
-       ];
-       homepage = "https://github.com/alanz/haskell-lsp";
-       description = "Haskell library for the Microsoft Language Server Protocol";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "haskell-lsp_0_2_0_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, data-default
      , directory, filepath, hashable, hslogger, hspec, lens, mtl, parsec
      , sorted-list, stm, text, time, transformers, unordered-containers
@@ -91959,31 +91771,9 @@ self: {
        homepage = "https://github.com/alanz/haskell-lsp";
        description = "Haskell library for the Microsoft Language Server Protocol";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-lsp-client" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, directory
-     , haskell-lsp, lens, process, text, unix
-     }:
-     mkDerivation {
-       pname = "haskell-lsp-client";
-       version = "1.0.0.0";
-       sha256 = "1c4zjq5vh46gxw3jrfh1f3hk1cbjqg8j2dlz6axb75ir14kxgky1";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring containers haskell-lsp lens process text
-       ];
-       executableHaskellDepends = [
-         base directory haskell-lsp lens process text unix
-       ];
-       homepage = "https://github.com/noughtmare/haskell-lsp-client#readme";
-       description = "A haskell package to build your own Language Server client";
-       license = stdenv.lib.licenses.gpl2;
-     }) {};
-
-  "haskell-lsp-client_1_0_0_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, directory
      , haskell-lsp, lens, process, text, unix
      }:
@@ -92002,7 +91792,6 @@ self: {
        homepage = "https://github.com/noughtmare/haskell-lsp-client#readme";
        description = "A haskell package to build your own Language Server client";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-menu" = callPackage
@@ -98419,19 +98208,6 @@ self: {
      }) {systemd = null;};
 
   "hidden-char" = callPackage
-    ({ mkDerivation, base, hspec }:
-     mkDerivation {
-       pname = "hidden-char";
-       version = "0.1.0.1";
-       sha256 = "17g9wbk34x8gkgrlvj3barhirq0jkshysqrxhs8nxp60hb2zpxip";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base hspec ];
-       homepage = "https://github.com/rcook/hidden-char#readme";
-       description = "Provides getHiddenChar function";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "hidden-char_0_1_0_2" = callPackage
     ({ mkDerivation, base, hspec }:
      mkDerivation {
        pname = "hidden-char";
@@ -98444,7 +98220,6 @@ self: {
        homepage = "https://github.com/rcook/hidden-char#readme";
        description = "Provides cross-platform getHiddenChar function";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hieraclus" = callPackage
@@ -99804,7 +99579,7 @@ self: {
 
   "hledger" = callPackage
     ({ mkDerivation, ansi-terminal, base, base-compat, bytestring
-     , cmdargs, containers, criterion, csv, data-default, Diff
+     , cmdargs, containers, criterion, csv, data-default, Decimal, Diff
      , directory, file-embed, filepath, hashable, haskeline, here
      , hledger-lib, html, HUnit, megaparsec, mtl, mtl-compat, old-time
      , parsec, pretty-show, process, regex-tdfa, safe, shakespeare
@@ -99814,24 +99589,22 @@ self: {
      }:
      mkDerivation {
        pname = "hledger";
-       version = "1.4";
-       sha256 = "146llzlpijcai3cfqcd4l4dcyjq6j6wd6pinkllja73vpx7wyi75";
-       revision = "2";
-       editedCabalFile = "0yksk4ckbr84s3ksvhx9miy8r5w7v0b0kmxj688f5gd1857n6vrx";
+       version = "1.5";
+       sha256 = "0mmgjahdlyka2mi1271kawrvkvnw8bgd3a08r8bykskj9b9f5181";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          ansi-terminal base base-compat bytestring cmdargs containers csv
-         data-default Diff directory file-embed filepath hashable haskeline
-         here hledger-lib HUnit megaparsec mtl mtl-compat old-time
+         data-default Decimal Diff directory file-embed filepath hashable
+         haskeline here hledger-lib HUnit megaparsec mtl mtl-compat old-time
          pretty-show process regex-tdfa safe shakespeare split tabular
          temporary terminfo text time transformers unordered-containers
          utf8-string utility-ht wizards
        ];
        executableHaskellDepends = [
          ansi-terminal base base-compat bytestring cmdargs containers csv
-         data-default directory file-embed filepath haskeline here
+         data-default Decimal directory file-embed filepath haskeline here
          hledger-lib HUnit mtl mtl-compat old-time parsec pretty-show
          process regex-tdfa safe shakespeare split tabular temporary
          terminfo text time unordered-containers utf8-string utility-ht
@@ -99839,7 +99612,7 @@ self: {
        ];
        testHaskellDepends = [
          ansi-terminal base base-compat bytestring cmdargs containers csv
-         data-default directory file-embed filepath haskeline here
+         data-default Decimal directory file-embed filepath haskeline here
          hledger-lib HUnit mtl mtl-compat old-time parsec pretty-show
          process regex-tdfa safe shakespeare split tabular temporary
          terminfo test-framework test-framework-hunit text time
@@ -99864,10 +99637,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-api";
-       version = "1.4";
-       sha256 = "00vpl1ch1v80f37y8yn2psdzm7ccxpfn3jp93xqxbasksxfawfa7";
-       revision = "1";
-       editedCabalFile = "1q3fvasxg32xza2pgf725x0j5dsz4rklng3blyw0kq70bccgdaka";
+       version = "1.5";
+       sha256 = "1wanah469danp0ljjxr258gdcd9lb175chz2jlq0y604wksaaj19";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -99974,8 +99745,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-irr";
-       version = "0.1.1.12";
-       sha256 = "1mk8yq601l5hljdmzj68q10wcvkl0l4li1h4aqcj04ygp0sg7471";
+       version = "0.1.1.13";
+       sha256 = "16y195h5wjs8vrccs18dx65kz3xrcifcwy1ggrsblf0kgml0cj7l";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -99988,22 +99759,20 @@ self: {
   "hledger-lib" = callPackage
     ({ mkDerivation, ansi-terminal, array, base, base-compat
      , blaze-markup, bytestring, cmdargs, containers, csv, data-default
-     , Decimal, deepseq, directory, doctest, filepath, Glob, hashtables
-     , HUnit, megaparsec, mtl, mtl-compat, old-time, parsec, pretty-show
-     , regex-tdfa, safe, semigroups, split, test-framework
+     , Decimal, deepseq, directory, doctest, extra, filepath, Glob
+     , hashtables, HUnit, megaparsec, mtl, mtl-compat, old-time, parsec
+     , pretty-show, regex-tdfa, safe, semigroups, split, test-framework
      , test-framework-hunit, text, time, transformers, uglymemo
      , utf8-string
      }:
      mkDerivation {
        pname = "hledger-lib";
-       version = "1.4";
-       sha256 = "15hyrpn0ifwx4x22hggjdm1xz0jyk8p5wnrynzxy9ali0wci1qxq";
-       revision = "2";
-       editedCabalFile = "1ckwjx3k4xfwj1vdrp5hsf1m0bpyax3nr1xyiyn8745w89vqrf0q";
+       version = "1.5";
+       sha256 = "00k0wqib3hadi4rcnldr14q2va57b09whfbwzd14pz824x7pnfd7";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          ansi-terminal array base base-compat blaze-markup bytestring
-         cmdargs containers csv data-default Decimal deepseq directory
+         cmdargs containers csv data-default Decimal deepseq directory extra
          filepath hashtables HUnit megaparsec mtl mtl-compat old-time parsec
          pretty-show regex-tdfa safe semigroups split text time transformers
          uglymemo utf8-string
@@ -100011,10 +99780,10 @@ self: {
        testHaskellDepends = [
          ansi-terminal array base base-compat blaze-markup bytestring
          cmdargs containers csv data-default Decimal deepseq directory
-         doctest filepath Glob hashtables HUnit megaparsec mtl mtl-compat
-         old-time parsec pretty-show regex-tdfa safe semigroups split
-         test-framework test-framework-hunit text time transformers uglymemo
-         utf8-string
+         doctest extra filepath Glob hashtables HUnit megaparsec mtl
+         mtl-compat old-time parsec pretty-show regex-tdfa safe semigroups
+         split test-framework test-framework-hunit text time transformers
+         uglymemo utf8-string
        ];
        homepage = "http://hledger.org";
        description = "Core data types, parsers and functionality for the hledger accounting tools";
@@ -100030,10 +99799,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-ui";
-       version = "1.4";
-       sha256 = "0rm6091nlpijhi6k74dg35g38a7ly22mqfnb0mvjp8pyxb4phq33";
-       revision = "8";
-       editedCabalFile = "0xk0iqjy5vr674xl565wip8h2hfkxpfymw3jlfgc984a5vjwan44";
+       version = "1.5";
+       sha256 = "104vjyqpddwv8g9mfbaw174nl4lb41zwl14i8225m6v1gxvs5w6x";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -100079,10 +99846,8 @@ self: {
      }:
      mkDerivation {
        pname = "hledger-web";
-       version = "1.4";
-       sha256 = "1l5mxvhgvn3q1ds9qmqkdmrs82619nvs13gmjsynr0vbbx52zw7h";
-       revision = "3";
-       editedCabalFile = "1xvycx1s54pz6rmjip9lxsg7p6anksi1pjqfjjs94yw977dcwm46";
+       version = "1.5";
+       sha256 = "10ar6ic9snrbwi60sz1729dshff01s3knmb7d7kwfk9svmilxq6f";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -103460,8 +103225,8 @@ self: {
      }:
      mkDerivation {
        pname = "hruby";
-       version = "0.3.5";
-       sha256 = "0ngl6irnbkrjs7mq8gz3v6gh98l724595vyibw5chzikjl183fj8";
+       version = "0.3.5.1";
+       sha256 = "0gzg7yhkrzgqaip5fd1lbd15j1274w28kqv0k6ls6sfk52gq56wn";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring scientific stm text
          unordered-containers vector
@@ -113282,19 +113047,6 @@ self: {
      }) {};
 
   "indents" = callPackage
-    ({ mkDerivation, base, mtl, parsec, tasty, tasty-hunit }:
-     mkDerivation {
-       pname = "indents";
-       version = "0.4.0.0";
-       sha256 = "15flb4wb5d2pwzqqnh5szzd82nr9gxrc89b2qpzi5m2dxbwd6y4l";
-       libraryHaskellDepends = [ base mtl parsec ];
-       testHaskellDepends = [ base mtl parsec tasty tasty-hunit ];
-       homepage = "http://github.com/jaspervdj/indents";
-       description = "indentation sensitive parser-combinators for parsec";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "indents_0_4_0_1" = callPackage
     ({ mkDerivation, base, mtl, parsec, tasty, tasty-hunit }:
      mkDerivation {
        pname = "indents";
@@ -113305,7 +113057,6 @@ self: {
        homepage = "http://github.com/jaspervdj/indents";
        description = "indentation sensitive parser-combinators for parsec";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "index-core" = callPackage
@@ -113766,25 +113517,6 @@ self: {
      }) {};
 
   "inline-java" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, directory, filepath, ghc
-     , hspec, jni, jvm, language-java, mtl, process, template-haskell
-     , temporary, text
-     }:
-     mkDerivation {
-       pname = "inline-java";
-       version = "0.7.1";
-       sha256 = "000qzhjg2qah379dlhshgxqzm4mslcv6d5cwqycvx8q3hxginv08";
-       libraryHaskellDepends = [
-         base bytestring Cabal directory filepath ghc jni jvm language-java
-         mtl process template-haskell temporary text
-       ];
-       testHaskellDepends = [ base hspec jni jvm text ];
-       homepage = "http://github.com/tweag/inline-java#readme";
-       description = "Java interop via inline Java code in Haskell modules";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "inline-java_0_7_2" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, directory, filepath, ghc
      , hspec, jni, jvm, language-java, mtl, process, template-haskell
      , temporary, text
@@ -113801,7 +113533,6 @@ self: {
        homepage = "http://github.com/tweag/inline-java#readme";
        description = "Java interop via inline Java code in Haskell modules";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "inline-r" = callPackage
@@ -117067,25 +116798,6 @@ self: {
      }) {};
 
   "jni" = callPackage
-    ({ mkDerivation, base, bytestring, choice, constraints, containers
-     , cpphs, deepseq, inline-c, jdk, singletons
-     }:
-     mkDerivation {
-       pname = "jni";
-       version = "0.5.0";
-       sha256 = "0sjyhf9pdzm1rvsw8lhxap293kgb72ihag1kcwdp5lq1qjkf9y1j";
-       libraryHaskellDepends = [
-         base bytestring choice constraints containers deepseq inline-c
-         singletons
-       ];
-       librarySystemDepends = [ jdk ];
-       libraryToolDepends = [ cpphs ];
-       homepage = "https://github.com/tweag/inline-java/tree/master/jni#readme";
-       description = "Complete JNI raw bindings";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) jdk;};
-
-  "jni_0_5_1" = callPackage
     ({ mkDerivation, base, bytestring, choice, constraints, containers
      , cpphs, deepseq, inline-c, jdk, singletons
      }:
@@ -117102,7 +116814,6 @@ self: {
        homepage = "https://github.com/tweag/inline-java/tree/master/jni#readme";
        description = "Complete JNI raw bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) jdk;};
 
   "jobqueue" = callPackage
@@ -117967,27 +117678,6 @@ self: {
      }) {};
 
   "json-rpc-generic" = callPackage
-    ({ mkDerivation, aeson, aeson-generic-compat, base, bytestring
-     , containers, dlist, QuickCheck, quickcheck-simple, scientific
-     , text, transformers, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "json-rpc-generic";
-       version = "0.2.1.2";
-       sha256 = "1nhd3k7ji5fqdqbc23072ayzylwz987a458jc11skil9nwl5yswl";
-       libraryHaskellDepends = [
-         aeson aeson-generic-compat base bytestring containers dlist
-         scientific text transformers unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson base QuickCheck quickcheck-simple text
-       ];
-       homepage = "http://github.com/khibino/haskell-json-rpc-generic";
-       description = "Generic encoder and decode for JSON-RPC";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "json-rpc-generic_0_2_1_3" = callPackage
     ({ mkDerivation, aeson, aeson-generic-compat, base, bytestring
      , containers, dlist, QuickCheck, quickcheck-simple, scientific
      , text, transformers, unordered-containers, vector
@@ -118006,7 +117696,6 @@ self: {
        homepage = "http://github.com/khibino/haskell-json-rpc-generic";
        description = "Generic encoder and decode for JSON-RPC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "json-rpc-server" = callPackage
@@ -118594,28 +118283,6 @@ self: {
      }) {};
 
   "jvm" = callPackage
-    ({ mkDerivation, base, bytestring, choice, constraints, criterion
-     , deepseq, distributed-closure, exceptions, hspec, jni, singletons
-     , text, vector
-     }:
-     mkDerivation {
-       pname = "jvm";
-       version = "0.4.0.1";
-       sha256 = "0zazz893fxzh8hdc2k2irg0l5ic2v2h7z2cb60ngiarvrr07hpvl";
-       libraryHaskellDepends = [
-         base bytestring choice constraints distributed-closure exceptions
-         jni singletons text vector
-       ];
-       testHaskellDepends = [ base bytestring hspec jni text ];
-       benchmarkHaskellDepends = [
-         base criterion deepseq jni singletons
-       ];
-       homepage = "http://github.com/tweag/inline-java/tree/master/jvm#readme";
-       description = "Call JVM methods from Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "jvm_0_4_1" = callPackage
     ({ mkDerivation, base, bytestring, choice, constraints, criterion
      , deepseq, distributed-closure, exceptions, hspec, jni, singletons
      , text, vector
@@ -118635,7 +118302,6 @@ self: {
        homepage = "http://github.com/tweag/inline-java/tree/master/jvm#readme";
        description = "Call JVM methods from Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jvm-binary" = callPackage
@@ -132376,27 +132042,6 @@ self: {
      }) {};
 
   "mega-sdist" = callPackage
-    ({ mkDerivation, base, bytestring, classy-prelude-conduit
-     , conduit-extra, directory, filepath, http-conduit, optparse-simple
-     , tar-conduit, temporary, text, typed-process, yaml
-     }:
-     mkDerivation {
-       pname = "mega-sdist";
-       version = "0.3.0.5";
-       sha256 = "1rdx74bxiwrcp0k8h8028b65nbcmgcbpg7jnzli91y8nzr2qql6c";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         base bytestring classy-prelude-conduit conduit-extra directory
-         filepath http-conduit optparse-simple tar-conduit temporary text
-         typed-process yaml
-       ];
-       homepage = "https://github.com/snoyberg/mega-sdist#readme";
-       description = "Handles uploading to Hackage from mega repos";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "mega-sdist_0_3_0_6" = callPackage
     ({ mkDerivation, base, bytestring, classy-prelude-conduit
      , conduit-extra, directory, filepath, http-conduit, optparse-simple
      , tar-conduit, temporary, text, typed-process, yaml
@@ -132415,7 +132060,6 @@ self: {
        homepage = "https://github.com/snoyberg/mega-sdist#readme";
        description = "Handles uploading to Hackage from mega repos";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "megaparsec" = callPackage
@@ -132444,6 +132088,31 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "megaparsec_6_4_0" = callPackage
+    ({ mkDerivation, base, bytestring, case-insensitive, containers
+     , criterion, deepseq, hspec, hspec-expectations, mtl
+     , parser-combinators, QuickCheck, scientific, text, transformers
+     , weigh
+     }:
+     mkDerivation {
+       pname = "megaparsec";
+       version = "6.4.0";
+       sha256 = "0h9azhs0dfrc359vrbd1jljrg3yfdbwd4p62cxqkn7mnh8913jpd";
+       libraryHaskellDepends = [
+         base bytestring case-insensitive containers deepseq mtl
+         parser-combinators scientific text transformers
+       ];
+       testHaskellDepends = [
+         base bytestring containers hspec hspec-expectations mtl QuickCheck
+         scientific text transformers
+       ];
+       benchmarkHaskellDepends = [ base criterion deepseq text weigh ];
+       homepage = "https://github.com/mrkkrp/megaparsec";
+       description = "Monadic parser combinators";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "meldable-heap" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -134634,8 +134303,10 @@ self: {
      }:
      mkDerivation {
        pname = "mmark";
-       version = "0.0.3.2";
-       sha256 = "0z3dgdq0x4brr56gcrjwssbxlwpaycrz1f5cxdnh2nzpz2dw9s2i";
+       version = "0.0.4.0";
+       sha256 = "05dslarsdfcp2im9w80ks52wzqcqq8ma23b69wdl8nyfbkmaj5ch";
+       revision = "1";
+       editedCabalFile = "1syr3bynam607wj4nkz9cijkdkz9szpk3x9pnxm76mv0sxk7iq2f";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base case-insensitive containers data-default-class deepseq
@@ -134653,7 +134324,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "mmark_0_0_4_0" = callPackage
+  "mmark_0_0_4_1" = callPackage
     ({ mkDerivation, aeson, base, case-insensitive, containers
      , criterion, data-default-class, deepseq, dlist, email-validate
      , foldl, hashable, hspec, hspec-megaparsec, html-entity-map, lucid
@@ -134663,8 +134334,8 @@ self: {
      }:
      mkDerivation {
        pname = "mmark";
-       version = "0.0.4.0";
-       sha256 = "05dslarsdfcp2im9w80ks52wzqcqq8ma23b69wdl8nyfbkmaj5ch";
+       version = "0.0.4.1";
+       sha256 = "0m2naq38ijmxnd9kdr77qb5h5z1bnfsbvy1g1mz54yj1y44jr4ra";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson base case-insensitive containers data-default-class deepseq
@@ -134874,6 +134545,8 @@ self: {
        pname = "modern-uri";
        version = "0.1.2.0";
        sha256 = "0n8ihy43mc3m0j70nbr86bd1kgzbkcb0dx9g3ql40v66i66kfb29";
+       revision = "1";
+       editedCabalFile = "1rhqvbnaxfkib42ppakfcpfsm0a8ggfv09zq938q69ybg7k5n89k";
        libraryHaskellDepends = [
          base bytestring containers contravariant deepseq exceptions
          megaparsec profunctors QuickCheck template-haskell text
@@ -134889,6 +134562,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "modern-uri_0_1_2_1" = callPackage
+    ({ mkDerivation, base, bytestring, containers, contravariant
+     , criterion, deepseq, exceptions, hspec, hspec-megaparsec
+     , megaparsec, profunctors, QuickCheck, template-haskell, text
+     , weigh
+     }:
+     mkDerivation {
+       pname = "modern-uri";
+       version = "0.1.2.1";
+       sha256 = "10y3ppcd4d987khk9jxaa0clkjssmvip2kpq63z8xcigvdiil91h";
+       libraryHaskellDepends = [
+         base bytestring containers contravariant deepseq exceptions
+         megaparsec profunctors QuickCheck template-haskell text
+       ];
+       testHaskellDepends = [
+         base bytestring hspec hspec-megaparsec megaparsec QuickCheck text
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion deepseq megaparsec text weigh
+       ];
+       homepage = "https://github.com/mrkkrp/modern-uri";
+       description = "Modern library for working with URIs";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "modify-fasta" = callPackage
     ({ mkDerivation, base, containers, fasta, mtl, optparse-applicative
      , pipes, pipes-text, regex-tdfa, regex-tdfa-text, semigroups, split
@@ -136591,37 +136290,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";
-       sha256 = "024w6183nnaq30r9jnfiy5pjv422mnnkawqdgzgzafngi7sad322";
-       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 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_1" = callPackage
     ({ mkDerivation, array, base, base16-bytestring, base64-bytestring
      , binary, bson, bytestring, conduit, conduit-extra, containers
      , criterion, cryptohash, data-default-class, hashtables, hspec
@@ -136650,7 +136318,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
@@ -136744,30 +136411,6 @@ self: {
      }) {};
 
   "mono-traversable" = callPackage
-    ({ mkDerivation, base, bytestring, containers, criterion, foldl
-     , hashable, hspec, HUnit, mwc-random, QuickCheck, semigroups, split
-     , text, transformers, unordered-containers, vector
-     , vector-algorithms
-     }:
-     mkDerivation {
-       pname = "mono-traversable";
-       version = "1.0.6.0";
-       sha256 = "1as3s9aj9pc4hmi588lard2r1p716hbr18arjzlh3442z8z0610m";
-       libraryHaskellDepends = [
-         base bytestring containers hashable split text transformers
-         unordered-containers vector vector-algorithms
-       ];
-       testHaskellDepends = [
-         base bytestring containers foldl hspec HUnit QuickCheck semigroups
-         text transformers unordered-containers vector
-       ];
-       benchmarkHaskellDepends = [ base criterion mwc-random vector ];
-       homepage = "https://github.com/snoyberg/mono-traversable#readme";
-       description = "Type classes for mapping, folding, and traversing monomorphic containers";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "mono-traversable_1_0_7_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, criterion, foldl
      , hashable, hspec, HUnit, mwc-random, QuickCheck, semigroups, split
      , text, transformers, unordered-containers, vector
@@ -136789,7 +136432,6 @@ self: {
        homepage = "https://github.com/snoyberg/mono-traversable#readme";
        description = "Type classes for mapping, folding, and traversing monomorphic containers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mono-traversable-instances" = callPackage
@@ -137342,21 +136984,21 @@ self: {
 
   "movie-monad" = callPackage
     ({ mkDerivation, base, filepath, gi-gdk, gi-gdkpixbuf, gi-glib
-     , gi-gobject, gi-gst, gi-gstvideo, gi-gtk, haskell-gi-base
-     , MissingH, network-uri, process, system-fileio, system-filepath
-     , text, time
+     , gi-gobject, gi-gst, gi-gstvideo, gi-gtk, haskell-gi
+     , haskell-gi-base, MissingH, network-uri, process, system-fileio
+     , system-filepath, text, time
      }:
      mkDerivation {
        pname = "movie-monad";
-       version = "0.0.3.0";
-       sha256 = "1dwkf378bq0xkf60h3gxaq431m4gxr6wk17549yc6bbc4zx2q7vq";
+       version = "0.0.4.0";
+       sha256 = "0wdnf8gm3h7ykdmnwc7jw1y0rs27izzh1kz2gkgi3g2dyllh7sq3";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
        executableHaskellDepends = [
          base filepath gi-gdk gi-gdkpixbuf gi-glib gi-gobject gi-gst
-         gi-gstvideo gi-gtk haskell-gi-base MissingH network-uri process
-         system-fileio system-filepath text time
+         gi-gstvideo gi-gtk haskell-gi haskell-gi-base MissingH network-uri
+         process system-fileio system-filepath text time
        ];
        homepage = "https://github.com/lettier/movie-monad";
        description = "Plays videos using GStreamer and GTK+";
@@ -144042,26 +143684,6 @@ self: {
      }) {};
 
   "numhask" = callPackage
-    ({ mkDerivation, base, doctest, protolude, QuickCheck, tasty
-     , tasty-quickcheck
-     }:
-     mkDerivation {
-       pname = "numhask";
-       version = "0.1.3";
-       sha256 = "1jycpcdidhc8zh64j67pb87drggmwdmja5klwm1wbdcvnsw4nzm6";
-       libraryHaskellDepends = [
-         base protolude QuickCheck tasty tasty-quickcheck
-       ];
-       testHaskellDepends = [
-         base doctest protolude QuickCheck tasty tasty-quickcheck
-       ];
-       homepage = "https://github.com/tonyday567/numhask#readme";
-       description = "A numeric prelude";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "numhask_0_1_4_0" = callPackage
     ({ mkDerivation, base, doctest, protolude, QuickCheck, tasty
      , tasty-quickcheck
      }:
@@ -144101,28 +143723,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "numhask-range" = callPackage
-    ({ mkDerivation, adjunctions, base, distributive, doctest, numhask
-     , protolude, QuickCheck, semigroupoids, tasty, tasty-quickcheck
+  "numhask-histogram" = callPackage
+    ({ mkDerivation, base, containers, doctest, foldl, HUnit, numhask
+     , numhask-range, protolude, QuickCheck, tasty, tasty-hunit
+     , tasty-quickcheck, tdigest
      }:
      mkDerivation {
-       pname = "numhask-range";
-       version = "0.1.2";
-       sha256 = "0rz2h4glfrc0h26f5idfv7966b95fm96bai1iwzkz0f3xmfvy8a0";
+       pname = "numhask-histogram";
+       version = "0.0.0.1";
+       sha256 = "1a7kd8va59rzsfsxin5m785ihpka3al53kfv16cz9p7kw9bjpanf";
        libraryHaskellDepends = [
-         adjunctions base distributive numhask protolude QuickCheck
-         semigroupoids
+         base containers foldl numhask numhask-range protolude tdigest
        ];
        testHaskellDepends = [
-         base doctest numhask tasty tasty-quickcheck
+         base doctest HUnit protolude QuickCheck tasty tasty-hunit
+         tasty-quickcheck
        ];
-       homepage = "https://github.com/tonyday567/numhask-range#readme";
-       description = "Numbers that are range representations";
+       homepage = "https://github.com/tonyday567/numhask-histogram#readme";
+       description = "See readme.md";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "numhask-range_0_1_3_0" = callPackage
+  "numhask-range" = callPackage
     ({ mkDerivation, adjunctions, base, distributive, doctest, numhask
      , protolude, QuickCheck, semigroupoids, tasty
      }:
@@ -145110,24 +144732,6 @@ self: {
      }) {};
 
   "one-liner" = callPackage
-    ({ mkDerivation, base, bifunctors, contravariant, ghc-prim, HUnit
-     , profunctors, tagged, transformers
-     }:
-     mkDerivation {
-       pname = "one-liner";
-       version = "0.9.1";
-       sha256 = "18jys0qvywd7il4yzyf2yb22md7apzhxvnzr067d90srqdva7cpf";
-       libraryHaskellDepends = [
-         base bifunctors contravariant ghc-prim profunctors tagged
-         transformers
-       ];
-       testHaskellDepends = [ base contravariant HUnit ];
-       homepage = "https://github.com/sjoerdvisscher/one-liner";
-       description = "Constraint-based generics";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "one-liner_0_9_2" = callPackage
     ({ mkDerivation, base, bifunctors, contravariant, ghc-prim, HUnit
      , profunctors, tagged, transformers
      }:
@@ -145143,7 +144747,6 @@ self: {
        homepage = "https://github.com/sjoerdvisscher/one-liner";
        description = "Constraint-based generics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "one-time-password" = callPackage
@@ -147580,54 +147183,6 @@ self: {
      }) {};
 
   "pandoc" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring
-     , binary, blaze-html, blaze-markup, bytestring, Cabal
-     , case-insensitive, cmark-gfm, containers, criterion, data-default
-     , deepseq, Diff, directory, doctemplates, 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, xml
-     , yaml, zip-archive, zlib
-     }:
-     mkDerivation {
-       pname = "pandoc";
-       version = "2.0.5";
-       sha256 = "0670fzvlgzcw9prswjyms49nlgbwbd2bj4xvhlr8had3yklml94i";
-       configureFlags = [ "-fhttps" "-f-trypandoc" ];
-       isLibrary = true;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       setupHaskellDepends = [ base Cabal ];
-       libraryHaskellDepends = [
-         aeson aeson-pretty base base64-bytestring binary blaze-html
-         blaze-markup bytestring case-insensitive cmark-gfm containers
-         data-default deepseq directory doctemplates 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 ];
-       testHaskellDepends = [
-         base bytestring containers Diff directory executable-path filepath
-         hslua pandoc-types process QuickCheck tasty tasty-golden
-         tasty-hunit tasty-quickcheck temporary text zip-archive
-       ];
-       benchmarkHaskellDepends = [
-         base bytestring containers criterion text time
-       ];
-       doCheck = false;
-       homepage = "http://pandoc.org";
-       description = "Conversion between markup formats";
-       license = "GPL";
-       maintainers = with stdenv.lib.maintainers; [ peti ];
-     }) {};
-
-  "pandoc_2_0_6" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring
      , binary, blaze-html, blaze-markup, bytestring, Cabal
      , case-insensitive, cmark-gfm, containers, criterion, data-default
@@ -147673,47 +147228,10 @@ self: {
        homepage = "http://pandoc.org";
        description = "Conversion between markup formats";
        license = "GPL";
-       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
-     , 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.12.2";
-       sha256 = "003hk7xp2r85bb3kziffr3xk4zjn178kzvfy6rh25r5p54vq9749";
-       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 containers directory
-         filepath mtl pandoc pandoc-types process syb temporary text vector
-         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;
-     }) {};
-
-  "pandoc-citeproc_0_12_2_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
@@ -147747,7 +147265,6 @@ self: {
        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
@@ -149313,30 +148830,6 @@ self: {
      }) {};
 
   "parsers" = callPackage
-    ({ mkDerivation, attoparsec, base, base-orphans, bytestring, Cabal
-     , cabal-doctest, charset, containers, directory, doctest, filepath
-     , mtl, parsec, QuickCheck, quickcheck-instances, scientific
-     , semigroups, text, transformers, unordered-containers
-     }:
-     mkDerivation {
-       pname = "parsers";
-       version = "0.12.7";
-       sha256 = "032dgh0ydy4cbvnjhgp0krnqnvlibphvm30gvmqvpxk9l4pmn435";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         attoparsec base base-orphans charset containers mtl parsec
-         scientific semigroups text transformers unordered-containers
-       ];
-       testHaskellDepends = [
-         attoparsec base bytestring containers directory doctest filepath
-         parsec QuickCheck quickcheck-instances
-       ];
-       homepage = "http://github.com/ekmett/parsers/";
-       description = "Parsing combinators";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "parsers_0_12_8" = callPackage
     ({ mkDerivation, attoparsec, base, base-orphans, bytestring
      , charset, containers, mtl, parsec, QuickCheck
      , quickcheck-instances, scientific, semigroups, text, transformers
@@ -149356,7 +148849,6 @@ self: {
        homepage = "http://github.com/ekmett/parsers/";
        description = "Parsing combinators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "parsestar" = callPackage
@@ -152140,8 +151632,8 @@ self: {
      }:
      mkDerivation {
        pname = "phoityne-vscode";
-       version = "0.0.19.0";
-       sha256 = "1lm4fjgha582vi88bz483p6g282zh72j31qk743rv4nm2faksi00";
+       version = "0.0.20.0";
+       sha256 = "1k9vh2xyk2nwck1g86lxvbrab7ap5p8p9vhh7pj98a56wkvxmv7y";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -152150,7 +151642,7 @@ self: {
          mtl parsec process resourcet safe split text transformers
        ];
        homepage = "https://github.com/phoityne/phoityne-vscode";
-       description = "ghci debug viewer on Visual Studio Code";
+       description = "Haskell Debug Adapter for Visual Studio Code";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -154357,8 +153849,8 @@ self: {
      }:
      mkDerivation {
        pname = "ploton";
-       version = "1.1.0.0";
-       sha256 = "0czykw9rcmj1vci9vach4h62kbvcqrswj14d8f5nn6m75cq6swdj";
+       version = "1.1.1.0";
+       sha256 = "1gxzfhzylk7i5cjnzgn4jicvbrv67w2v6fwb2x067q9c2g0b0npy";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -158430,27 +157922,6 @@ self: {
      }) {};
 
   "profiteur" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, filepath
-     , ghc-prof, js-jquery, scientific, text, unordered-containers
-     , vector
-     }:
-     mkDerivation {
-       pname = "profiteur";
-       version = "0.4.3.0";
-       sha256 = "1swsy006axh06f1nwvfbvs3rsd1y1733n6b3xyncnc6vifnf7gz2";
-       isLibrary = false;
-       isExecutable = true;
-       enableSeparateDataOutput = true;
-       executableHaskellDepends = [
-         aeson base bytestring containers filepath ghc-prof js-jquery
-         scientific text unordered-containers vector
-       ];
-       homepage = "http://github.com/jaspervdj/profiteur";
-       description = "Treemap visualiser for GHC prof files";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "profiteur_0_4_4_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, filepath
      , ghc-prof, js-jquery, scientific, text, unordered-containers
      , vector
@@ -158469,7 +157940,6 @@ self: {
        homepage = "http://github.com/jaspervdj/profiteur";
        description = "Treemap visualiser for GHC prof files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "profunctor-extras" = callPackage
@@ -160429,32 +159899,6 @@ self: {
      }) {};
 
   "pusher-http-haskell" = callPackage
-    ({ mkDerivation, aeson, base, base16-bytestring, bytestring
-     , containers, cryptonite, hashable, hspec, HTTP, http-client
-     , http-types, memory, network-uri, QuickCheck, scientific, text
-     , time, transformers, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "pusher-http-haskell";
-       version = "1.5.0.1";
-       sha256 = "08fgyvm1lp1yr9p9a6fr111x78rlzhr02gbsd6q6hjxnlffya4vf";
-       libraryHaskellDepends = [
-         aeson base base16-bytestring bytestring containers cryptonite
-         hashable HTTP http-client http-types memory text time transformers
-         unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson base base16-bytestring bytestring cryptonite hspec HTTP
-         http-client http-types memory network-uri 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;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "pusher-http-haskell_1_5_1_0" = callPackage
     ({ mkDerivation, aeson, base, base16-bytestring, bytestring
      , cryptonite, hashable, hspec, http-client, http-types, memory
      , QuickCheck, scientific, text, time, transformers
@@ -160510,8 +159954,8 @@ self: {
      }:
      mkDerivation {
        pname = "pushme";
-       version = "2.0.2";
-       sha256 = "12gd31fbsm3adxmcwkikx4zwq5a7snv8mc0jd73crqfy46spm6zw";
+       version = "2.1.1";
+       sha256 = "1adgdbnifilzpxgkzdv0wxd475s7kl0ib8qqpd8ifx1cnm1zggjw";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -160521,7 +159965,7 @@ self: {
          system-fileio system-filepath temporary text text-format time
          transformers unix unordered-containers yaml
        ];
-       homepage = "https://github.com/jwiegley/pushme";
+       homepage = "https://github.com/jwiegley/pushme#readme";
        description = "Tool to synchronize directories with rsync, zfs or git-annex";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -176716,6 +176160,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "setop" = callPackage
+    ({ mkDerivation, base, containers, doctest, hlint, hspec
+     , optparse-applicative, protolude, text
+     }:
+     mkDerivation {
+       pname = "setop";
+       version = "0.1.0.1";
+       sha256 = "0rgx5dn9xj9mpbb0rickncb9xd93sgqsz0s058zqyg08pjafrp31";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base containers protolude ];
+       executableHaskellDepends = [
+         base optparse-applicative protolude text
+       ];
+       testHaskellDepends = [
+         base containers doctest hlint hspec protolude
+       ];
+       homepage = "https://github.com/fmind/setop";
+       description = "Perform set operations on files";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "setops" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
@@ -185510,8 +184976,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "star";
-       version = "0.0.0.2";
-       sha256 = "1xg1gfdkskhkvd1a2nlaxc9942xi1j406p58i4ycb15lqcz8nz27";
+       version = "0.0.1.0";
+       sha256 = "03lk46s8v3pgxgk4ddyf382rspqvkf61v9bffhym0pd4didnz9d5";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/chessai/star#readme";
        description = "*-semirings";
@@ -188632,8 +188098,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "successors";
-       version = "0.1";
-       sha256 = "0mkb9wsmd1q6d9qll15xf0fxp2hlyp5hsj7j7wv60a32si3cjvk3";
+       version = "0.1.0.1";
+       sha256 = "1m5flnn2rswc3380dccnfnhmyjp1dqr23dljd0515jxawbgjkzmg";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/nomeata/haskell-successors";
        description = "An applicative functor to manage successors";
@@ -192293,30 +191759,6 @@ self: {
      }) {};
 
   "tasty-silver" = callPackage
-    ({ mkDerivation, ansi-terminal, async, base, bytestring, containers
-     , deepseq, directory, filepath, mtl, optparse-applicative, process
-     , process-extras, regex-tdfa, stm, tagged, tasty, tasty-hunit
-     , temporary, text, transformers
-     }:
-     mkDerivation {
-       pname = "tasty-silver";
-       version = "3.1.10";
-       sha256 = "1yvfkl1dkp2bmcaa0bjamw13ky007rhn4wci3cia97glpy9nv24f";
-       libraryHaskellDepends = [
-         ansi-terminal async base bytestring containers deepseq directory
-         filepath mtl optparse-applicative process process-extras regex-tdfa
-         stm tagged tasty temporary text
-       ];
-       testHaskellDepends = [
-         base directory filepath process tasty tasty-hunit temporary
-         transformers
-       ];
-       homepage = "https://github.com/phile314/tasty-silver";
-       description = "A fancy test runner, including support for golden tests";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "tasty-silver_3_1_11" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, bytestring, containers
      , deepseq, directory, filepath, mtl, optparse-applicative, process
      , process-extras, regex-tdfa, semigroups, stm, tagged, tasty
@@ -192338,7 +191780,6 @@ self: {
        homepage = "https://github.com/phile314/tasty-silver";
        description = "A fancy test runner, including support for golden tests";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tasty-smallcheck" = callPackage
@@ -194282,8 +193723,8 @@ self: {
      }:
      mkDerivation {
        pname = "texbuilder";
-       version = "0.1.2.0";
-       sha256 = "076im75jx1g37cvhvfc6a7my6m81rcgdww6y97p0ldwjbv88gsk3";
+       version = "0.1.3.0";
+       sha256 = "1ixhlqk5hgmkhhq0png7d2f6ryp84hdzwzzxi184lzzcyqqgxdya";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -194988,42 +194429,6 @@ self: {
      }) {};
 
   "text-show" = callPackage
-    ({ mkDerivation, array, base, base-compat, base-orphans, bifunctors
-     , bytestring, bytestring-builder, containers, contravariant
-     , criterion, deepseq, deriving-compat, generic-deriving
-     , ghc-boot-th, ghc-prim, hspec, integer-gmp, nats, QuickCheck
-     , quickcheck-instances, semigroups, tagged, template-haskell, text
-     , th-abstraction, th-lift, transformers, transformers-compat, void
-     }:
-     mkDerivation {
-       pname = "text-show";
-       version = "3.7";
-       sha256 = "11wnvnc87rrzg949b00vbx3pbcxskrapdy9dklh6szq6pcc38irr";
-       libraryHaskellDepends = [
-         array base base-compat bifunctors bytestring bytestring-builder
-         containers contravariant generic-deriving ghc-boot-th ghc-prim
-         integer-gmp nats semigroups tagged template-haskell text
-         th-abstraction th-lift transformers transformers-compat void
-       ];
-       testHaskellDepends = [
-         array base base-compat base-orphans bifunctors bytestring
-         bytestring-builder containers contravariant deriving-compat
-         generic-deriving ghc-boot-th ghc-prim hspec integer-gmp nats
-         QuickCheck quickcheck-instances semigroups tagged template-haskell
-         text th-lift transformers transformers-compat void
-       ];
-       benchmarkHaskellDepends = [
-         array base base-compat bifunctors bytestring bytestring-builder
-         containers contravariant criterion deepseq generic-deriving
-         ghc-boot-th ghc-prim integer-gmp nats semigroups tagged
-         template-haskell text th-lift transformers transformers-compat void
-       ];
-       homepage = "https://github.com/RyanGlScott/text-show";
-       description = "Efficient conversion of values into Text";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "text-show_3_7_1" = callPackage
     ({ mkDerivation, array, base, base-compat, base-orphans, bifunctors
      , bytestring, bytestring-builder, containers, contravariant
      , criterion, deepseq, deriving-compat, generic-deriving
@@ -195059,7 +194464,6 @@ self: {
        homepage = "https://github.com/RyanGlScott/text-show";
        description = "Efficient conversion of values into Text";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-show-instances" = callPackage
@@ -195546,19 +194950,6 @@ self: {
      }) {};
 
   "th-expand-syns" = callPackage
-    ({ mkDerivation, base, containers, syb, template-haskell }:
-     mkDerivation {
-       pname = "th-expand-syns";
-       version = "0.4.3.0";
-       sha256 = "17b73q0d5r8xixhvdp0hv4ap96l7s3f2y0j5cknp81b1hyinivlz";
-       libraryHaskellDepends = [ base containers syb template-haskell ];
-       testHaskellDepends = [ base template-haskell ];
-       homepage = "https://github.com/DanielSchuessler/th-expand-syns";
-       description = "Expands type synonyms in Template Haskell ASTs";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "th-expand-syns_0_4_4_0" = callPackage
     ({ mkDerivation, base, containers, syb, template-haskell }:
      mkDerivation {
        pname = "th-expand-syns";
@@ -195569,7 +194960,6 @@ self: {
        homepage = "https://github.com/DanielSchuessler/th-expand-syns";
        description = "Expands type synonyms in Template Haskell ASTs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "th-extras" = callPackage
@@ -201681,26 +201071,6 @@ self: {
      }) {};
 
   "type-of-html" = callPackage
-    ({ mkDerivation, base, blaze-html, bytestring, criterion
-     , double-conversion, ghc-prim, hspec, QuickCheck, text
-     }:
-     mkDerivation {
-       pname = "type-of-html";
-       version = "1.3.0.1";
-       sha256 = "1f6np6m3bqiigwq2859j7d4fiyzkmlyxv5gg11f53lx92f1qfaz2";
-       libraryHaskellDepends = [
-         base bytestring double-conversion ghc-prim text
-       ];
-       testHaskellDepends = [ base hspec QuickCheck ];
-       benchmarkHaskellDepends = [
-         base blaze-html bytestring criterion QuickCheck text
-       ];
-       homepage = "https://github.com/knupfer/type-of-html";
-       description = "High performance type driven html generation";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "type-of-html_1_3_2_0" = callPackage
     ({ mkDerivation, base, blaze-html, bytestring, criterion
      , double-conversion, ghc-prim, hspec, QuickCheck, text
      }:
@@ -201718,7 +201088,6 @@ self: {
        homepage = "https://github.com/knupfer/type-of-html";
        description = "High performance type driven html generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "type-operators" = callPackage
@@ -202733,6 +202102,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "unagi-chan_0_4_1_0" = callPackage
+    ({ mkDerivation, async, atomic-primops, base, containers, criterion
+     , ghc-prim, primitive
+     }:
+     mkDerivation {
+       pname = "unagi-chan";
+       version = "0.4.1.0";
+       sha256 = "0nya6srsnj7f10jim3iqlmdi71n6fl8ly9sqpccgnivnd8i5iavb";
+       libraryHaskellDepends = [ atomic-primops base ghc-prim primitive ];
+       testHaskellDepends = [
+         atomic-primops base containers ghc-prim primitive
+       ];
+       benchmarkHaskellDepends = [ async base criterion ];
+       description = "Fast concurrent queues with a Chan-like API, and more";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "unagi-streams" = callPackage
     ({ mkDerivation, base, io-streams, unagi-chan }:
      mkDerivation {
@@ -203521,23 +202908,6 @@ self: {
      }) {};
 
   "units-parser" = callPackage
-    ({ mkDerivation, base, containers, mtl, multimap, parsec, syb
-     , tasty, tasty-hunit, template-haskell
-     }:
-     mkDerivation {
-       pname = "units-parser";
-       version = "0.1.1";
-       sha256 = "0d39r1vcwqs61529gjz3329a41fp4pwx0x4j4kw4xl2lza3wr164";
-       libraryHaskellDepends = [ base containers mtl multimap parsec ];
-       testHaskellDepends = [
-         base containers mtl multimap parsec syb tasty tasty-hunit
-         template-haskell
-       ];
-       description = "A parser for units of measure";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "units-parser_0_1_1_2" = callPackage
     ({ mkDerivation, base, containers, mtl, multimap, parsec, syb
      , tasty, tasty-hunit, template-haskell
      }:
@@ -203552,7 +202922,6 @@ self: {
        ];
        description = "A parser for units of measure";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unittyped" = callPackage
@@ -203969,23 +203338,6 @@ self: {
      }) {};
 
   "unliftio" = callPackage
-    ({ mkDerivation, async, base, deepseq, directory, filepath, stm
-     , transformers, unix, unliftio-core
-     }:
-     mkDerivation {
-       pname = "unliftio";
-       version = "0.2.1.0";
-       sha256 = "09i17ajszvr1cm4x31k157mlfinxsmrmkxmjsmlvsxvch58m2lgi";
-       libraryHaskellDepends = [
-         async base deepseq directory filepath 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_2_0" = callPackage
     ({ mkDerivation, async, base, deepseq, directory, filepath, hspec
      , stm, transformers, unix, unliftio-core
      }:
@@ -204004,7 +203356,6 @@ 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;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unliftio-core" = callPackage
@@ -208361,24 +207712,6 @@ self: {
      }) {};
 
   "wai-logger" = callPackage
-    ({ mkDerivation, base, blaze-builder, byteorder, bytestring
-     , case-insensitive, doctest, fast-logger, http-types, network, unix
-     , unix-time, wai
-     }:
-     mkDerivation {
-       pname = "wai-logger";
-       version = "2.3.0";
-       sha256 = "1w0b0vinsyqr37wciljkz8g5dcmfi2r210lq194a0wkycly9kkch";
-       libraryHaskellDepends = [
-         base blaze-builder byteorder bytestring case-insensitive
-         fast-logger http-types network unix unix-time wai
-       ];
-       testHaskellDepends = [ base doctest ];
-       description = "A logging system for WAI";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "wai-logger_2_3_1" = callPackage
     ({ mkDerivation, base, blaze-builder, byteorder, bytestring
      , case-insensitive, doctest, fast-logger, http-types, network, unix
      , unix-time, wai
@@ -208394,7 +207727,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "A logging system for WAI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-logger-prefork" = callPackage
@@ -209131,8 +208463,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-routes";
-       version = "0.10.0";
-       sha256 = "1yqd79gm0xl7p8ag2pii4kcn3vb90qkli54dq4jb619bia9lsfsy";
+       version = "0.10.1";
+       sha256 = "1ahlvyplg1mh3w2yxag0nk67w13k70rff77b96grgr48a8b9b82g";
        libraryHaskellDepends = [
          aeson base blaze-builder bytestring case-insensitive containers
          cookie data-default-class filepath http-types mime-types
@@ -210848,26 +210180,6 @@ self: {
      }) {};
 
   "weeder" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, cmdargs, deepseq
-     , directory, extra, filepath, foundation, hashable, process, text
-     , unordered-containers, vector, yaml
-     }:
-     mkDerivation {
-       pname = "weeder";
-       version = "0.1.9";
-       sha256 = "1k5q34zyw2ajy7k5imxygs86q0a245ax5ch4kgff12pfpyz0jmz7";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         aeson base bytestring cmdargs deepseq directory extra filepath
-         foundation hashable process text unordered-containers vector yaml
-       ];
-       homepage = "https://github.com/ndmitchell/weeder#readme";
-       description = "Detect dead code";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "weeder_0_1_11" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cmdargs, deepseq
      , directory, extra, filepath, foundation, hashable, process, text
      , unordered-containers, vector, yaml
@@ -210885,7 +210197,6 @@ self: {
        homepage = "https://github.com/ndmitchell/weeder#readme";
        description = "Detect dead code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "weigh" = callPackage
@@ -211270,14 +210581,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "wild-bind_0_1_1_0" = 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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wild-bind-indicator" = callPackage
     ({ mkDerivation, base, containers, gtk, text, transformers
      , wild-bind
      }:
      mkDerivation {
        pname = "wild-bind-indicator";
-       version = "0.1.0.1";
-       sha256 = "0lvhczw0ah8kb1hd9k7rnjcs1pmn0qg1i2v0szvhh2ji8iznjznm";
+       version = "0.2.0.0";
+       sha256 = "09p7x77ksh9qp4ir5cy470y978m4ln0sp44pffm0mld1apdam27x";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base containers gtk text transformers wild-bind
@@ -211293,8 +210622,8 @@ self: {
      }:
      mkDerivation {
        pname = "wild-bind-task-x11";
-       version = "0.1.0.1";
-       sha256 = "1hvsaa8655wl74sikp59qgmi94285sbdnifynllgxdjdvzm4g4yl";
+       version = "0.2.0.0";
+       sha256 = "1cm2vf9lc1q0rs1hl4gch58iklfk7dvplhflqcf8na6ncbp126g7";
        libraryHaskellDepends = [
          base text transformers wild-bind wild-bind-indicator wild-bind-x11
        ];
@@ -211321,6 +210650,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "wild-bind-x11_0_2_0_0" = callPackage
+    ({ mkDerivation, async, base, containers, fold-debounce, hspec, mtl
+     , semigroups, stm, text, time, transformers, wild-bind, X11
+     }:
+     mkDerivation {
+       pname = "wild-bind-x11";
+       version = "0.2.0.0";
+       sha256 = "0x7zy76x9zmh6pjv6yhkb53l6pkn4wh76x34adx538fyf6a8mk6b";
+       libraryHaskellDepends = [
+         base containers fold-debounce mtl semigroups stm text transformers
+         wild-bind X11
+       ];
+       testHaskellDepends = [
+         async base hspec text time transformers wild-bind X11
+       ];
+       homepage = "https://github.com/debug-ito/wild-bind";
+       description = "X11-specific implementation for WildBind";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "win-hp-path" = callPackage
     ({ mkDerivation, base, process, split }:
      mkDerivation {
@@ -215303,37 +214653,6 @@ self: {
      }) {};
 
   "yaml" = callPackage
-    ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat
-     , bytestring, conduit, containers, directory, filepath, hspec
-     , HUnit, libyaml, mockery, resourcet, scientific, semigroups
-     , template-haskell, temporary, text, transformers
-     , unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "yaml";
-       version = "0.8.25";
-       sha256 = "16bx7vkj455796wdklh8h13zm98h5m81dl8np0sjbx9hcsrfdbyp";
-       configureFlags = [ "-fsystem-libyaml" ];
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson attoparsec base bytestring conduit containers directory
-         filepath resourcet scientific semigroups template-haskell text
-         transformers unordered-containers vector
-       ];
-       libraryPkgconfigDepends = [ libyaml ];
-       executableHaskellDepends = [ aeson base bytestring ];
-       testHaskellDepends = [
-         aeson aeson-qq base base-compat bytestring conduit directory hspec
-         HUnit mockery resourcet temporary text transformers
-         unordered-containers vector
-       ];
-       homepage = "http://github.com/snoyberg/yaml/";
-       description = "Support for parsing and rendering YAML documents";
-       license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) libyaml;};
-
-  "yaml_0_8_25_1" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring
      , conduit, containers, directory, filepath, hspec, HUnit, libyaml
      , mockery, resourcet, scientific, semigroups, template-haskell
@@ -215361,7 +214680,6 @@ self: {
        homepage = "http://github.com/snoyberg/yaml/";
        description = "Support for parsing and rendering YAML documents";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libyaml;};
 
   "yaml-combinators" = callPackage
@@ -217699,33 +217017,6 @@ self: {
      }) {};
 
   "yesod-test" = callPackage
-    ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
-     , blaze-markup, bytestring, case-insensitive, containers, cookie
-     , hspec, hspec-core, html-conduit, http-types, HUnit, lifted-base
-     , monad-control, network, persistent, pretty-show, text, time
-     , transformers, wai, wai-extra, xml-conduit, xml-types, yesod-core
-     , yesod-form
-     }:
-     mkDerivation {
-       pname = "yesod-test";
-       version = "1.5.8";
-       sha256 = "0rvbvr8pa60b9rvhnsd1wcbs0x49s2rhqc76nqzv2i0qry5aym7h";
-       libraryHaskellDepends = [
-         attoparsec base blaze-builder blaze-html blaze-markup bytestring
-         case-insensitive containers cookie hspec-core html-conduit
-         http-types HUnit monad-control network persistent pretty-show text
-         time transformers wai wai-extra xml-conduit xml-types yesod-core
-       ];
-       testHaskellDepends = [
-         base bytestring containers hspec html-conduit http-types HUnit
-         lifted-base text wai xml-conduit yesod-core yesod-form
-       ];
-       homepage = "http://www.yesodweb.com";
-       description = "integration testing for WAI/Yesod Applications";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-test_1_5_9_1" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
      , blaze-markup, bytestring, case-insensitive, containers, cookie
      , hspec, hspec-core, html-conduit, http-types, HUnit, lifted-base
@@ -217750,7 +217041,6 @@ self: {
        homepage = "http://www.yesodweb.com";
        description = "integration testing for WAI/Yesod Applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-test-json" = callPackage

From f448a79770db137448f12236fc10719ef7389abd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 1 Jan 2018 15:39:54 +0100
Subject: [PATCH 23/23] haskell-JuicyPixels: disable failing Haddock phase

---
 pkgs/development/haskell-modules/configuration-common.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 3f6a2e55cb7b..3502dc60c5f0 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1020,4 +1020,7 @@ self: super: {
   # Jailbreak "unix-compat >=0.1.2 && <0.5".
   darcs = overrideCabal super.darcs (drv: { preConfigure = "sed -i -e 's/unix-compat .*,/unix-compat,/' darcs.cabal"; });
 
+  # https://github.com/Twinside/Juicy.Pixels/issues/149
+  JuicyPixels = dontHaddock super.JuicyPixels;
+
 }