summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--nixos/modules/services/hardware/thermald.nix36
-rw-r--r--pkgs/applications/audio/ir.lv2/default.nix6
-rw-r--r--pkgs/applications/audio/musescore/default.nix4
-rw-r--r--pkgs/applications/editors/neovim/default.nix4
-rw-r--r--pkgs/applications/editors/neovim/qt.nix19
-rw-r--r--pkgs/applications/graphics/xfig/default.nix5
-rw-r--r--pkgs/applications/networking/instant-messengers/quaternion/default.nix18
-rw-r--r--pkgs/applications/networking/instant-messengers/ring-daemon/default.nix4
-rw-r--r--pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix15
-rw-r--r--pkgs/applications/networking/owncloud-client/default.nix4
-rw-r--r--pkgs/applications/networking/resilio-sync/default.nix6
-rw-r--r--pkgs/applications/science/chemistry/molden/default.nix6
-rw-r--r--pkgs/applications/science/chemistry/molden/dont_register_file_types.patch29
-rw-r--r--pkgs/applications/science/chemistry/pymol/default.nix4
-rw-r--r--pkgs/data/documentation/man-pages/default.nix1
-rw-r--r--pkgs/data/fonts/noto-fonts/default.nix4
-rw-r--r--pkgs/data/misc/hackage/default.nix4
-rw-r--r--pkgs/development/haskell-modules/configuration-common.nix19
-rw-r--r--pkgs/development/haskell-modules/configuration-hackage2nix.yaml40
-rw-r--r--pkgs/development/haskell-modules/hackage-packages.nix2177
-rw-r--r--pkgs/development/interpreters/perl/default.nix1
-rw-r--r--pkgs/development/libraries/arrow-cpp/default.nix4
-rw-r--r--pkgs/development/libraries/fflas-ffpack/default.nix19
-rw-r--r--pkgs/development/libraries/gtk+/3.x.nix3
-rw-r--r--pkgs/development/libraries/libressl/default.nix1
-rw-r--r--pkgs/development/libraries/libtoxcore/default.nix4
-rw-r--r--pkgs/development/libraries/lmdbxx/default.nix26
-rw-r--r--pkgs/development/libraries/msgpack/default.nix (renamed from pkgs/development/libraries/libmsgpack/default.nix)0
-rw-r--r--pkgs/development/libraries/msgpack/generic.nix (renamed from pkgs/development/libraries/libmsgpack/generic.nix)2
-rw-r--r--pkgs/development/libraries/nss/default.nix5
-rw-r--r--pkgs/development/libraries/ntl/default.nix5
-rw-r--r--pkgs/development/libraries/opendht/default.nix4
-rw-r--r--pkgs/development/libraries/openldap/default.nix1
-rw-r--r--pkgs/development/libraries/openssl/default.nix7
-rw-r--r--pkgs/development/libraries/polkit/default.nix1
-rw-r--r--pkgs/development/libraries/science/math/blas/default.nix6
-rw-r--r--pkgs/development/libraries/science/math/openblas/default.nix6
-rw-r--r--pkgs/development/ruby-modules/gem-config/default.nix4
-rw-r--r--pkgs/development/tools/lattice-diamond/default.nix115
-rw-r--r--pkgs/development/tools/puppet/puppet-lint/Gemfile5
-rw-r--r--pkgs/development/tools/puppet/puppet-lint/Gemfile.lock13
-rw-r--r--pkgs/development/tools/puppet/puppet-lint/default.nix7
-rw-r--r--pkgs/development/tools/puppet/puppet-lint/gemset.nix10
-rw-r--r--pkgs/misc/vim-plugins/default.nix28
-rw-r--r--pkgs/misc/vim-plugins/vim-plugin-names2
-rw-r--r--pkgs/os-specific/linux/lsscsi/default.nix5
-rw-r--r--pkgs/os-specific/linux/lvm2/default.nix7
-rw-r--r--pkgs/os-specific/linux/mcelog/default.nix4
-rw-r--r--pkgs/os-specific/linux/mdadm/default.nix5
-rw-r--r--pkgs/os-specific/linux/mingetty/default.nix5
-rw-r--r--pkgs/os-specific/linux/nss_ldap/default.nix10
-rw-r--r--pkgs/os-specific/linux/shadow/default.nix7
-rw-r--r--pkgs/os-specific/linux/systemd/default.nix7
-rw-r--r--pkgs/servers/hydron/default.nix6
-rw-r--r--pkgs/servers/hydron/deps.nix4
-rw-r--r--pkgs/servers/memcached/default.nix4
-rw-r--r--pkgs/servers/search/groonga/default.nix4
-rw-r--r--pkgs/servers/sql/postgresql/pgroonga/default.nix4
-rw-r--r--pkgs/tools/misc/tmate/default.nix4
-rw-r--r--pkgs/tools/networking/ntp/default.nix4
-rw-r--r--pkgs/tools/networking/ppp/default.nix7
-rw-r--r--pkgs/tools/networking/pptp/default.nix6
-rw-r--r--pkgs/tools/security/lynis/default.nix4
-rw-r--r--pkgs/tools/security/mktemp/default.nix7
-rw-r--r--pkgs/tools/system/di/default.nix4
-rw-r--r--pkgs/top-level/aliases.nix1
-rw-r--r--pkgs/top-level/all-packages.nix17
67 files changed, 1983 insertions, 827 deletions
diff --git a/nixos/modules/services/hardware/thermald.nix b/nixos/modules/services/hardware/thermald.nix
index 88c3f99aed4..69577bbe018 100644
--- a/nixos/modules/services/hardware/thermald.nix
+++ b/nixos/modules/services/hardware/thermald.nix
@@ -6,16 +6,30 @@ let
   cfg = config.services.thermald;
 in {
   ###### interface
-  options = { 
-    services.thermald = { 
+  options = {
+    services.thermald = {
       enable = mkOption {
         default = false;
         description = ''
           Whether to enable thermald, the temperature management daemon.
-        ''; 
-      };  
-    };  
-  };  
+        '';
+      };
+
+      debug = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to enable debug logging.
+        '';
+      };
+
+      configFile = mkOption {
+        type = types.nullOr types.path;
+        default = null;
+        description = "the thermald manual configuration file.";
+      };
+    };
+  };
 
   ###### implementation
   config = mkIf cfg.enable {
@@ -24,7 +38,15 @@ in {
     systemd.services.thermald = {
       description = "Thermal Daemon Service";
       wantedBy = [ "multi-user.target" ];
-      script = "exec ${pkgs.thermald}/sbin/thermald --no-daemon --dbus-enable";
+      serviceConfig = {
+        ExecStart = ''
+          ${pkgs.thermald}/sbin/thermald \
+            --no-daemon \
+            ${optionalString cfg.debug "--loglevel=debug"} \
+            ${optionalString (cfg.configFile != null) "--config-file ${cfg.configFile}"} \
+            --dbus-enable
+        '';
+      };
     };
   };
 }
diff --git a/pkgs/applications/audio/ir.lv2/default.nix b/pkgs/applications/audio/ir.lv2/default.nix
index cc613541a25..84be6b866fa 100644
--- a/pkgs/applications/audio/ir.lv2/default.nix
+++ b/pkgs/applications/audio/ir.lv2/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "ir.lv2-${version}";
-  version = "1.2.3";
+  version = "1.2.4";
 
   src = fetchFromGitHub {
     owner = "tomszilagyi";
     repo = "ir.lv2";
     rev = "${version}";
-    sha256 = "16vy06qb0vgwg4yx15grzh5m2q3cbzm3jd0p37g2qb8rgvjhladg";
+    sha256 = "1p6makmgr898fakdxzl4agh48qqwgv1k1kwm8cgq187n0mhiknp6";
   };
 
   buildInputs = [ fftw gtk2 lv2 libsamplerate libsndfile zita-convolver ];
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     mkdir "$out/include"
     mkdir -p "$out/share/doc"
 
-    make PREFIX="$out" install
+    make PREFIX="$out" INSTDIR="$out/lib/lv2" install
     install -Dm755 convert4chan "$out/bin/convert4chan"
   '';
 
diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix
index a5c38a47741..28381fcfee6 100644
--- a/pkgs/applications/audio/musescore/default.nix
+++ b/pkgs/applications/audio/musescore/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   name = "musescore-${version}";
-  version = "2.3.1";
+  version = "2.3.2";
 
   src = fetchFromGitHub {
     owner  = "musescore";
     repo   = "MuseScore";
     rev    = "v${version}";
-    sha256 = "00inrw9g8g34g74bhg5gp0rr5nydhjraiyn7vpl7kaqi5yzmhawd";
+    sha256 = "0ncv0xfmq87plqa43cm0fpidlwzz1nq5s7h7139llrbc36yp3pr1";
   };
 
   cmakeFlags = [
diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix
index a0a14e89860..6690e4c9c1b 100644
--- a/pkgs/applications/editors/neovim/default.nix
+++ b/pkgs/applications/editors/neovim/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, gettext, libmsgpack, libtermkey, libiconv
+{ stdenv, fetchFromGitHub, cmake, gettext, msgpack, libtermkey, libiconv
 , libuv, luaPackages, ncurses, pkgconfig
 , unibilium, xsel, gperf
 , libvterm-neovim
@@ -25,7 +25,7 @@ let
     buildInputs = [
       libtermkey
       libuv
-      libmsgpack
+      msgpack
       ncurses
       libvterm-neovim
       unibilium
diff --git a/pkgs/applications/editors/neovim/qt.nix b/pkgs/applications/editors/neovim/qt.nix
index 48f7b29f407..d17d5c1e85d 100644
--- a/pkgs/applications/editors/neovim/qt.nix
+++ b/pkgs/applications/editors/neovim/qt.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, cmake, doxygen, makeWrapper
-, libmsgpack, neovim, pythonPackages, qtbase }:
+, msgpack, neovim, pythonPackages, qtbase }:
 
 stdenv.mkDerivation rec {
   name = "neovim-qt-${version}";
@@ -13,12 +13,11 @@ stdenv.mkDerivation rec {
   };
 
   cmakeFlags = [
-    "-DMSGPACK_INCLUDE_DIRS=${libmsgpack}/include"
-    "-DMSGPACK_LIBRARIES=${libmsgpack}/lib/libmsgpackc.so"
+    "-DUSE_SYSTEM_MSGPACK=1"
   ];
 
   buildInputs = with pythonPackages; [
-    neovim qtbase libmsgpack
+    neovim qtbase msgpack
   ] ++ (with pythonPackages; [
     jinja2 msgpack python
   ]);
@@ -28,13 +27,12 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   preConfigure = ''
-    # avoid cmake trying to download libmsgpack
-    echo "" > third-party/CMakeLists.txt
     # we rip out a number of tests that fail in the build env
     # the GUI tests will never work but the others should - they did before neovim 0.2.0
     # was released
     sed -i test/CMakeLists.txt \
       -e '/^add_xtest_gui/d' \
+      -e '/tst_neovimobject/d' \
       -e '/tst_neovimconnector/d' \
       -e '/tst_callallmethods/d' \
       -e '/tst_encoding/d'
@@ -42,7 +40,14 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  postInstall = ''
+  postInstall = if stdenv.isDarwin then ''
+    mkdir -p $out/Applications
+    mv $out/bin/nvim-qt.app $out/Applications
+    rmdir $out/bin || :
+
+    wrapProgram "$out/Applications/nvim-qt.app/Contents/MacOS/nvim-qt" \
+      --prefix PATH : "${neovim}/bin"
+  '' else ''
     wrapProgram "$out/bin/nvim-qt" \
       --prefix PATH : "${neovim}/bin"
   '';
diff --git a/pkgs/applications/graphics/xfig/default.nix b/pkgs/applications/graphics/xfig/default.nix
index 545675ab154..7e276aaf406 100644
--- a/pkgs/applications/graphics/xfig/default.nix
+++ b/pkgs/applications/graphics/xfig/default.nix
@@ -41,7 +41,10 @@ stdenv.mkDerivation {
 
   meta = {
     description = "An interactive drawing tool for X11";
-    homepage = http://xfig.org;
+    homepage = http://mcj.sourceforge.net/;
+    license = {
+      url = "http://mcj.sourceforge.net/authors.html#xfig";
+    };
     platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;         # arbitrary choice
   };
 }
diff --git a/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/pkgs/applications/networking/instant-messengers/quaternion/default.nix
index 2e2489870ed..983646fbad5 100644
--- a/pkgs/applications/networking/instant-messengers/quaternion/default.nix
+++ b/pkgs/applications/networking/instant-messengers/quaternion/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, qtbase, qtquickcontrols, cmake, libqmatrixclient }:
+{ stdenv, lib, fetchFromGitHub, fetchpatch, qtbase, qtquickcontrols, cmake, libqmatrixclient }:
 
 stdenv.mkDerivation rec {
   name = "quaternion-${version}";
@@ -11,10 +11,18 @@ stdenv.mkDerivation rec {
     sha256 = "0zrr4khbbdf5ziq65gi0cb1yb1d0y5rv18wld22w1x96f7fkmrib";
   };
 
-  buildInputs = [ qtbase qtquickcontrols libqmatrixclient ];
+  buildInputs = [ qtbase qtquickcontrols ];
 
   nativeBuildInputs = [ cmake ];
 
+  patches = [
+    # https://github.com/QMatrixClient/Quaternion/pull/400
+    (fetchpatch {
+      url = "https://github.com/QMatrixClient/Quaternion/commit/6cb29834efc343dc2bcf1db62cfad2dc4c121c54.patch";
+      sha256 = "0n7mgzzrvx9sa657rfb99i0mjh1k0sn5br344mknqy3wgqdr7s3x";
+    })
+  ];
+
   # libqmatrixclient is now compiled as a dynamic library but quarternion cannot use it yet
   # https://github.com/QMatrixClient/Quaternion/issues/239
   postPatch = ''
@@ -22,7 +30,11 @@ stdenv.mkDerivation rec {
     ln -s ${libqmatrixclient.src} lib
   '';
 
-  postInstall = ''
+  postInstall = if stdenv.isDarwin then ''
+    mkdir -p $out/Applications
+    mv $out/bin/quaternion.app $out/Applications
+    rmdir $out/bin || :
+  '' else ''
     substituteInPlace $out/share/applications/quaternion.desktop \
       --replace 'Exec=quaternion' "Exec=$out/bin/quaternion"
   '';
diff --git a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix
index f858bb38dd1..168719bf0e4 100644
--- a/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ring-daemon/default.nix
@@ -20,7 +20,7 @@
 , speex
 , boost
 , opendht
-, libmsgpack
+, msgpack
 , gnutls
 , zlib
 , jsoncpp
@@ -108,7 +108,7 @@ stdenv.mkDerivation rec {
     speex
     boost
     opendht
-    libmsgpack
+    msgpack
     gnutls
     zlib
     jsoncpp
diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
index 5899ca92eb0..9fe03b274cf 100644
--- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
+++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, dpkg, makeWrapper
+{ stdenv, fetchurl, dpkg
 , alsaLib, atk, cairo, cups, curl, dbus, expat, fontconfig, freetype, gdk_pixbuf, glib, glibc, gnome2, gnome3
-, gtk3, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, xorg }:
+, gtk3, libnotify, libpulseaudio, libsecret, libv4l, nspr, nss, pango, systemd, wrapGAppsHook, xorg }:
 
 let
 
@@ -68,7 +68,12 @@ in stdenv.mkDerivation {
 
   inherit src;
 
-  buildInputs = [ dpkg makeWrapper ];
+  nativeBuildInputs = [
+    wrapGAppsHook
+    glib # For setup hook populating GSETTINGS_SCHEMA_PATH
+  ];
+
+  buildInputs = [ dpkg ];
 
   unpackPhase = "true";
   installPhase = ''
@@ -78,6 +83,8 @@ in stdenv.mkDerivation {
     rm -rf $out/opt $out/usr
     rm $out/bin/skypeforlinux
 
+    ln -s "$out/share/skypeforlinux/skypeforlinux" "$out/bin/skypeforlinux"
+
     # Otherwise it looks "suspicious"
     chmod -R g-w $out
   '';
@@ -88,8 +95,6 @@ in stdenv.mkDerivation {
       patchelf --set-rpath ${rpath}:$out/share/skypeforlinux $file || true
     done
 
-    ln -s "$out/share/skypeforlinux/skypeforlinux" "$out/bin/skypeforlinux"
-
     # Fix the desktop link
     substituteInPlace $out/share/applications/skypeforlinux.desktop \
       --replace /usr/bin/ $out/bin/ \
diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix
index 9bb266665a6..c142661fd03 100644
--- a/pkgs/applications/networking/owncloud-client/default.nix
+++ b/pkgs/applications/networking/owncloud-client/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "owncloud-client-${version}";
-  version = "2.4.2";
+  version = "2.4.3";
 
   src = fetchurl {
     url = "https://download.owncloud.com/desktop/stable/owncloudclient-${version}.tar.xz";
-    sha256 = "0pxga45fi7iyayy278hgl8x099isz6d7x1jq57p2m9qlsvfx8ap5";
+    sha256 = "1gz6xg1vm054ksrsakzfkzxgpskm0xkhsqwq0fj3i2kas09zzczk";
   };
 
   patches = [ ./find-sql.patch ];
diff --git a/pkgs/applications/networking/resilio-sync/default.nix b/pkgs/applications/networking/resilio-sync/default.nix
index 46de1d532dd..0db18e77bfa 100644
--- a/pkgs/applications/networking/resilio-sync/default.nix
+++ b/pkgs/applications/networking/resilio-sync/default.nix
@@ -9,13 +9,13 @@ let
 
 in stdenv.mkDerivation rec {
   name = "resilio-sync-${version}";
-  version = "2.5.12";
+  version = "2.6.0";
 
   src = fetchurl {
     url = "https://download-cdn.resilio.com/${version}/linux-${arch}/resilio-sync_${arch}.tar.gz";
     sha256 = {
-      "x86_64-linux" = "176gf5704wh22kqig8n0gg83048w71grw7h37k2qvxjaf4vypnc7";
-      "i686-linux"   = "15m2s2cqrkpb7ladbwimbs9agqb4ww9jr4gf0ifjwzm2grv5ffnh";
+      "x86_64-linux" = "0041axi9carspkfaxvyirfvsa29zz55al01x90nh93nzxvpvywsz";
+      "i686-linux"   = "1ar36lp4f6a1z9i82g3gpak4q4ny09faqxdd59q1pvfzq25ypdhs";
     }.${stdenv.system};
   };
 
diff --git a/pkgs/applications/science/chemistry/molden/default.nix b/pkgs/applications/science/chemistry/molden/default.nix
index 1472b4b2af9..76a19d410ef 100644
--- a/pkgs/applications/science/chemistry/molden/default.nix
+++ b/pkgs/applications/science/chemistry/molden/default.nix
@@ -1,17 +1,19 @@
 { stdenv, fetchurl, which, gfortran, libGLU, xorg } :
 
 stdenv.mkDerivation rec {
-  version = "5.7";
+  version = "5.8.2";
   name = "molden-${version}";
 
   src = fetchurl {
     url = "ftp://ftp.cmbi.ru.nl/pub/molgraph/molden/molden${version}.tar.gz";
-    sha256 = "0gaq11gm09ax25lvgfrvxv9dxvi76hps116fp6k7sqgvdd68vf0s";
+    sha256 = "1lhjx8fa8xynnlk5g6ipvchhfnz6j5lgqxlsifx82pbbnbm6mps4";
   };
 
   nativeBuildInputs = [ which ];
   buildInputs = [ gfortran libGLU xorg.libX11 xorg.libXmu ];
 
+  patches = [ ./dont_register_file_types.patch ];
+
   postPatch = ''
      substituteInPlace ./makefile --replace '-L/usr/X11R6/lib'  "" \
                                   --replace '-I/usr/X11R6/include' "" \
diff --git a/pkgs/applications/science/chemistry/molden/dont_register_file_types.patch b/pkgs/applications/science/chemistry/molden/dont_register_file_types.patch
new file mode 100644
index 00000000000..75ce593ed29
--- /dev/null
+++ b/pkgs/applications/science/chemistry/molden/dont_register_file_types.patch
@@ -0,0 +1,29 @@
+diff --git a/makefile b/makefile
+index 58a9e74..64615b6 100644
+--- a/makefile
++++ b/makefile
+@@ -32,8 +32,6 @@ os :=
+ ifeq ($(uname), Linux)
+  os := $(shell head -n 1 /etc/issue | cut -d" " -f1)
+  ifeq ($(os), Ubuntu)
+-    EXTEN = exten
+-    EXTENZ = exten2
+     LIBSG = -L/usr/X11R6/lib -lGLU -lGL -lX11 -lm
+  endif
+  ifeq ($(os), Debian)
+@@ -278,7 +276,7 @@ LIBSOGL = -lglut -lGLU -lGL -lXmu -lX11 -lm
+ #
+ #LIBSG = -L/usr/X11R6/lib -Wl,-framework -Wl,GLUT -Wl,-framework -Wl,OpenGL -Wl,-framework -Wl,Cocoa -lGLU -lGL -lXmu -lX11 -lm
+ 
+-all:	molden gmolden ambfor/ambfor ambfor/ambmd surf/surf $(EXTEN)
++all:	molden gmolden ambfor/ambfor ambfor/ambmd surf/surf
+ xwin.o:	xwin.c rots.h
+ xwingl.o:	xwin.c rots.h
+ 
+@@ -344,5 +342,5 @@ exten:
+ exten2:
+ 	./register_extension.sh /usr/local/bin
+ 
+-install:	$(EXTENZ)
++install:
+ 	sudo install -t /usr/local/bin -m 755 molden gmolden ambfor/ambfor ambfor/ambmd surf/surf
diff --git a/pkgs/applications/science/chemistry/pymol/default.nix b/pkgs/applications/science/chemistry/pymol/default.nix
index e7dd04377be..7b482d82e2f 100644
--- a/pkgs/applications/science/chemistry/pymol/default.nix
+++ b/pkgs/applications/science/chemistry/pymol/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, makeDesktopItem
 , python3, python3Packages
-, glew, freeglut, libpng, libxml2, tk, freetype, libmsgpack }:
+, glew, freeglut, libpng, libxml2, tk, freetype, msgpack }:
 
 
 with stdenv.lib;
@@ -29,7 +29,7 @@ python3Packages.buildPythonApplication {
     sha256 = "1qpacd5w4r9a0nm5iqmkd92ym3ai00dp7v61cwd6jgakk6wfps3s";
   };
 
-  buildInputs = [ python3Packages.numpy glew freeglut libpng libxml2 tk freetype libmsgpack ];
+  buildInputs = [ python3Packages.numpy glew freeglut libpng libxml2 tk freetype msgpack ];
   NIX_CFLAGS_COMPILE = "-I ${libxml2.dev}/include/libxml2";
 
   installPhase = ''
diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix
index 244e00ec70a..6d657472e66 100644
--- a/pkgs/data/documentation/man-pages/default.nix
+++ b/pkgs/data/documentation/man-pages/default.nix
@@ -21,6 +21,7 @@ stdenv.mkDerivation rec {
     description = "Linux development manual pages";
     homepage = https://www.kernel.org/doc/man-pages/;
     repositories.git = http://git.kernel.org/pub/scm/docs/man-pages/man-pages;
+    license = licenses.gpl2Plus;
     platforms = with platforms; unix;
     priority = 30; # if a package comes with its own man page, prefer it
   };
diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix
index 0a086453244..5d633ccb7ce 100644
--- a/pkgs/data/fonts/noto-fonts/default.nix
+++ b/pkgs/data/fonts/noto-fonts/default.nix
@@ -86,14 +86,14 @@ rec {
       maintainers = with maintainers; [ mathnerd314 ];
     };
   };
-  noto-fonts-emoji = let version = "2017-09-13-design-refresh"; in stdenv.mkDerivation {
+  noto-fonts-emoji = let version = "2018-04-24-pistol-update"; in stdenv.mkDerivation {
     name = "noto-fonts-emoji-${version}";
 
     src = fetchFromGitHub {
       owner = "googlei18n";
       repo = "noto-emoji";
       rev = "v${version}";
-      sha256 = "1ixz03207kzh6jhmw8bpi77pxkfzq46dk26sr41m5kkvc14d14vl";
+      sha256 = "1f9k182j0619xvwk60gw2hng3lcd483sva2fabjdhznk8yf9f7jg";
     };
 
     buildInputs = [ cairo ];
diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix
index 63159726348..fce8f44bd3f 100644
--- a/pkgs/data/misc/hackage/default.nix
+++ b/pkgs/data/misc/hackage/default.nix
@@ -1,6 +1,6 @@
 { fetchurl }:
 
 fetchurl {
-  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/ed2029405786768b4c0f8bdbbd7aee8193394eb9.tar.gz";
-  sha256 = "0s6cbz7ylflpnqhxlpch48zb0l6xcp5501dj1qzvzldvwh46r8dc";
+  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/d5c89ad106556f7890c89c50a2b4d3fbdcea7616.tar.gz";
+  sha256 = "0j8r88wwf0qvqxcnwmcs6xcn4vi0189c9f5chfl80941ggxfbpxk";
 }
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 7999374a316..61c2da2b419 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -1073,16 +1073,15 @@ self: super: {
 
   # cabal2nix requires hpack >= 0.29.6 but the LTS has hpack-0.28.2.
   # Lets remove this once the LTS has upraded to 0.29.6.
-  hpack = super.hpack_0_29_6;
-
-  cabal2nix =
-    # The test suite does not know how to find the 'cabal2nix' binary.
-    overrideCabal super.cabal2nix (drv: {
-      preCheck = ''
-        export PATH="$PWD/dist/build/cabal2nix:$PATH"
-        export HOME="$TMPDIR/home"
-      '';
-    });
+  hpack = super.hpack_0_29_7;
+
+  # The test suite does not know how to find the 'cabal2nix' binary.
+  cabal2nix = overrideCabal super.cabal2nix (drv: {
+    preCheck = ''
+      export PATH="$PWD/dist/build/cabal2nix:$PATH"
+      export HOME="$TMPDIR/home"
+    '';
+  });
 
   # Break out of "aeson <1.3, temporary <1.3".
   stack = doJailbreak super.stack;
diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 4ab28169cf7..6057538125a 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -43,7 +43,7 @@ core-packages:
 default-package-overrides:
   # Newer versions require contravariant-1.5.*, which many builds refuse at the moment.
   - base-compat-batteries ==0.10.1
-  # LTS Haskell 12.5
+  # LTS Haskell 12.6
   - abstract-deque ==0.3
   - abstract-deque-tests ==0.3
   - abstract-par ==0.3.3
@@ -219,7 +219,7 @@ default-package-overrides:
   - auto ==0.4.3.1
   - autoexporter ==1.1.10
   - auto-update ==0.1.4
-  - avro ==0.3.3.1
+  - avro ==0.3.4.2
   - avwx ==0.3.0.2
   - backprop ==0.2.5.0
   - bank-holidays-england ==0.1.0.7
@@ -244,7 +244,7 @@ default-package-overrides:
   - bench ==1.0.11
   - bencode ==0.6.0.0
   - between ==0.11.0.0
-  - bhoogle ==0.1.3.2
+  - bhoogle ==0.1.3.4
   - bibtex ==0.1.0.6
   - bifunctors ==5.5.3
   - bimap ==0.3.3
@@ -351,7 +351,7 @@ default-package-overrides:
   - cast ==0.1.0.2
   - category ==0.2.0.1
   - cborg ==0.2.0.0
-  - cereal ==0.5.5.0
+  - cereal ==0.5.7.0
   - cereal-conduit ==0.8.0
   - cereal-text ==0.1.0.2
   - cereal-time ==0.1.0.0
@@ -364,7 +364,7 @@ default-package-overrides:
   - chart-unit ==0.7.0.0
   - chaselev-deque ==0.5.0.5
   - ChasingBottoms ==1.3.1.4
-  - chatwork ==0.1.3.4
+  - chatwork ==0.1.3.5
   - cheapskate ==0.1.1
   - cheapskate-highlight ==0.1.0.0
   - cheapskate-lucid ==0.1.0.0
@@ -586,7 +586,7 @@ default-package-overrides:
   - diagrams-rasterific ==1.4.1
   - diagrams-solve ==0.1.1
   - diagrams-svg ==1.4.2
-  - di-core ==1.0.2
+  - di-core ==1.0.3
   - dictionary-sharing ==0.1.0.0
   - di-df1 ==1.0.2
   - Diff ==0.3.4
@@ -787,7 +787,7 @@ default-package-overrides:
   - generic-aeson ==0.2.0.9
   - generic-arbitrary ==0.1.0
   - generic-deriving ==1.12.2
-  - generic-lens ==1.0.0.1
+  - generic-lens ==1.0.0.2
   - GenericPretty ==1.2.2
   - generic-random ==1.2.0.0
   - generics-eot ==0.4
@@ -944,7 +944,7 @@ default-package-overrides:
   - hebrew-time ==0.1.1
   - hedgehog ==0.6
   - hedgehog-corpus ==0.1.0
-  - hedis ==0.10.2
+  - hedis ==0.10.3
   - here ==1.2.13
   - heredoc ==0.2.0.0
   - heterocephalus ==1.0.5.2
@@ -954,7 +954,7 @@ default-package-overrides:
   - hexpat ==0.20.13
   - hexstring ==0.11.1
   - hfsevents ==0.1.6
-  - hidapi ==0.1.4
+  - hidapi ==0.1.5
   - hidden-char ==0.1.0.2
   - hierarchical-clustering ==0.4.6
   - hierarchy ==1.0.2
@@ -1064,7 +1064,7 @@ default-package-overrides:
   - hunit-dejafu ==1.2.0.6
   - hvect ==0.4.0.0
   - hvega ==0.1.0.3
-  - hw-balancedparens ==0.2.0.1
+  - hw-balancedparens ==0.2.0.2
   - hw-bits ==0.7.0.2
   - hw-conduit ==0.2.0.3
   - hw-diagnostics ==0.0.0.5
@@ -1098,7 +1098,7 @@ default-package-overrides:
   - hybrid-vectors ==0.2.2
   - hyperloglog ==0.4.2
   - hyphenation ==0.7.1
-  - hyraxAbif ==0.2.3.5
+  - hyraxAbif ==0.2.3.9
   - iconv ==0.4.1.3
   - identicon ==0.2.2
   - ieee754 ==0.8.0
@@ -1676,7 +1676,7 @@ default-package-overrides:
   - quicklz ==1.5.0.11
   - rainbow ==0.30.0.2
   - rainbox ==0.20.0.0
-  - rakuten ==0.1.1.4
+  - rakuten ==0.1.1.5
   - ramus ==0.1.2
   - random ==1.1
   - random-bytestring ==0.1.3.1
@@ -1729,7 +1729,7 @@ default-package-overrides:
   - relational-query-HDBC ==0.7.1.1
   - relational-record ==0.2.2.0
   - relational-schemas ==0.1.6.2
-  - relude ==0.1.0
+  - relude ==0.1.1
   - renderable ==0.2.0.1
   - repa ==3.4.1.3
   - repline ==0.1.7.0
@@ -1775,9 +1775,9 @@ default-package-overrides:
   - sandi ==0.4.2
   - sandman ==0.2.0.1
   - say ==0.1.0.0
-  - sbp ==2.3.16
-  - SCalendar ==1.1.0
+  - sbp ==2.3.17
   - scalendar ==1.2.0
+  - SCalendar ==1.1.0
   - scalpel ==0.5.1
   - scalpel-core ==0.5.1
   - scanner ==0.2
@@ -1942,7 +1942,7 @@ default-package-overrides:
   - store ==0.5.0
   - store-core ==0.4.4
   - Strafunski-StrategyLib ==5.0.1.0
-  - stratosphere ==0.24.3
+  - stratosphere ==0.24.4
   - streaming ==0.2.1.0
   - streaming-attoparsec ==1.0.0
   - streaming-bytestring ==0.1.6
@@ -2033,7 +2033,7 @@ default-package-overrides:
   - texmath ==0.11.0.1
   - text ==1.2.3.0
   - text-binary ==0.2.1.1
-  - text-builder ==0.5.1.1
+  - text-builder ==0.5.3
   - text-conversions ==0.3.0
   - text-icu ==0.7.0.1
   - text-latin1 ==0.3.1
@@ -2093,7 +2093,7 @@ default-package-overrides:
   - tmapchan ==0.0.3
   - tmapmvar ==0.0.4
   - tmp-postgres ==0.1.1.1
-  - tomland ==0.3
+  - tomland ==0.3.1
   - tostring ==0.2.1.1
   - transaction ==0.1.1.3
   - transformers-base ==0.4.5.2
@@ -2207,7 +2207,7 @@ default-package-overrides:
   - verbosity ==0.2.3.0
   - versions ==3.4.0.1
   - ViennaRNAParser ==1.3.3
-  - viewprof ==0.0.0.21
+  - viewprof ==0.0.0.22
   - vinyl ==0.8.1.1
   - vivid ==0.3.0.2
   - vivid-osc ==0.3.0.0
@@ -2344,7 +2344,7 @@ default-package-overrides:
   - yesod-static ==1.6.0
   - yesod-test ==1.6.5
   - yesod-text-markdown ==0.1.10
-  - yesod-websockets ==0.3.0
+  - yesod-websockets ==0.3.0.1
   - yes-precure5-command ==5.5.3
   - yi-language ==0.17.1
   - yi-rope ==0.11
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 21660cfb7d2..df117d1a554 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -5782,6 +5782,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "Frames-beam" = callPackage
+    ({ mkDerivation, base, beam-core, beam-migrate, beam-postgres
+     , bytestring, conduit, Frames, generics-sop, hspec, hspec-core
+     , monad-control, postgresql-simple, process, QuickCheck, scientific
+     , template-haskell, text, time, uuid-types, vinyl
+     }:
+     mkDerivation {
+       pname = "Frames-beam";
+       version = "0.1.0.1";
+       sha256 = "12n3pyr88ihgkfwynhvjx3m9fr1fbznpkgx9ihf7mqar9d8wnywj";
+       libraryHaskellDepends = [
+         base beam-core beam-migrate beam-postgres bytestring conduit Frames
+         generics-sop monad-control postgresql-simple process scientific
+         template-haskell text time uuid-types vinyl
+       ];
+       testHaskellDepends = [
+         base beam-core beam-migrate beam-postgres bytestring conduit Frames
+         generics-sop hspec hspec-core QuickCheck text vinyl
+       ];
+       description = "A library for accessing Postgres tables as in-memory data structures";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "Frank" = callPackage
     ({ mkDerivation, base, mtl, newtype, she, void }:
      mkDerivation {
@@ -9898,6 +9921,8 @@ self: {
        pname = "HsYAML";
        version = "0.1.1.2";
        sha256 = "1100yzyxbvin48q3dgmzpnhz1gbqaxnkpnwy7ywzj2wrvwrr8hjx";
+       revision = "1";
+       editedCabalFile = "1hnp2sqjvn524040m0dzvzyrr8kp4i49gdyrzwym66j71xi6ynkl";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -10559,14 +10584,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "JuicyPixels_3_3" = callPackage
+  "JuicyPixels_3_3_1" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, deepseq, mtl
      , primitive, transformers, vector, zlib
      }:
      mkDerivation {
        pname = "JuicyPixels";
-       version = "3.3";
-       sha256 = "1v2xfqi65qcw31021fjpdbaixp2ijq4kmixy5zzkykwc6ap53ln4";
+       version = "3.3.1";
+       sha256 = "0k60hc156pj7dj9qqcwi1v3vibfsszccll96fbmn4hrkcqgn1aza";
        libraryHaskellDepends = [
          base binary bytestring containers deepseq mtl primitive
          transformers vector zlib
@@ -12161,6 +12186,8 @@ self: {
        pname = "MissingH";
        version = "1.4.0.1";
        sha256 = "0wcvgrmav480w7nf4bl14yi0jq2yzanysxwzwas9hpb28vyjlgr8";
+       revision = "1";
+       editedCabalFile = "04syc14nz11fay6fm6nlixyflrfhpg4jiyxx6mnxrl6asd3cl989";
        libraryHaskellDepends = [
          array base containers directory filepath hslogger HUnit mtl network
          old-locale old-time parsec process random regex-compat time unix
@@ -13653,6 +13680,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) libGL;};
 
+  "OpenGLRaw_3_3_1_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, fixed, half, libGL
+     , text, transformers
+     }:
+     mkDerivation {
+       pname = "OpenGLRaw";
+       version = "3.3.1.0";
+       sha256 = "1x8w3x308jldj2c1xqcq3a3sc2jc06pdpgqkgjsmixi1skv4a1vb";
+       libraryHaskellDepends = [
+         base bytestring containers fixed half text transformers
+       ];
+       librarySystemDepends = [ libGL ];
+       description = "A raw binding for the OpenGL graphics system";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) libGL;};
+
   "OpenGLRaw21" = callPackage
     ({ mkDerivation, OpenGLRaw }:
      mkDerivation {
@@ -14471,6 +14515,8 @@ self: {
        pname = "PortMidi";
        version = "0.2.0.0";
        sha256 = "1jb722gwgx1fdyv64nj3by22970l3r04ibc3fa3hnp3k4l2jvk0f";
+       revision = "1";
+       editedCabalFile = "0h3gql271mdz3kh0jgimxv8ada34b0h4n8wnyf5i759fqxpf6w86";
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ alsaLib ];
        description = "A binding for PortMedia/PortMidi";
@@ -14717,12 +14763,12 @@ self: {
 
   "PyF" = callPackage
     ({ mkDerivation, base, containers, formatting, haskell-src-meta
-     , hspec, megaparsec, process, template-haskell, text
+     , hspec, megaparsec, process, python3, template-haskell, text
      }:
      mkDerivation {
        pname = "PyF";
-       version = "0.6.1.0";
-       sha256 = "1m24wk5i0xn8qfh446nlis7h81p5wgy09hskslrmx3z4brqqpy7y";
+       version = "0.6.1.1";
+       sha256 = "0pska6y3hvzlhlxjdvjr4lixmjq5yczf7ydqf0488hjdlc4hirll";
        libraryHaskellDepends = [
          base containers formatting haskell-src-meta megaparsec
          template-haskell text
@@ -14730,10 +14776,11 @@ self: {
        testHaskellDepends = [
          base formatting hspec process template-haskell text
        ];
+       testToolDepends = [ python3 ];
        description = "Quasiquotations for a python like interpolated string formater";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
+     }) {inherit (pkgs) python3;};
 
   "QIO" = callPackage
     ({ mkDerivation, base, containers, mtl, old-time, random }:
@@ -15002,18 +15049,16 @@ self: {
      }) {};
 
   "RFC1751" = callPackage
-    ({ mkDerivation, base, binary, bytestring, HUnit, QuickCheck
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
+    ({ mkDerivation, base, bytestring, cereal, hspec, QuickCheck
      , vector
      }:
      mkDerivation {
        pname = "RFC1751";
-       version = "0.3.1.0";
-       sha256 = "1j1p94yp4aaw3shzizfih05fdixbpvpl4r3l78s4av7740q8r7yi";
-       libraryHaskellDepends = [ base binary bytestring vector ];
+       version = "1.0.0";
+       sha256 = "1lj97jyw0pxq8rn0xg15x2xqm3vwqx4fy3qz8aimf193vgw2amah";
+       libraryHaskellDepends = [ base bytestring cereal vector ];
        testHaskellDepends = [
-         base binary bytestring HUnit QuickCheck test-framework
-         test-framework-hunit test-framework-quickcheck2 vector
+         base bytestring cereal hspec QuickCheck vector
        ];
        description = "RFC-1751 library for Haskell";
        license = stdenv.lib.licenses.publicDomain;
@@ -15362,6 +15407,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Rasterific_0_7_4" = callPackage
+    ({ mkDerivation, base, bytestring, containers, dlist, FontyFruity
+     , free, JuicyPixels, mtl, primitive, transformers, vector
+     , vector-algorithms
+     }:
+     mkDerivation {
+       pname = "Rasterific";
+       version = "0.7.4";
+       sha256 = "13f5ay9wmva9k15a6pk4imxz6rj80gwc1f16906m7a6rm9vgwvlq";
+       libraryHaskellDepends = [
+         base bytestring containers dlist FontyFruity free JuicyPixels mtl
+         primitive transformers vector vector-algorithms
+       ];
+       description = "A pure haskell drawing engine";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ReadArgs" = callPackage
     ({ mkDerivation, base, hspec, system-filepath, text }:
      mkDerivation {
@@ -17032,6 +17095,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "StateVar_1_1_1_1" = callPackage
+    ({ mkDerivation, base, stm, transformers }:
+     mkDerivation {
+       pname = "StateVar";
+       version = "1.1.1.1";
+       sha256 = "08r2iw0gdmfs4f6wraaq19vfmkjdbics3dbhw39y7mdjd98kcr7b";
+       libraryHaskellDepends = [ base stm transformers ];
+       description = "State variables";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "StateVar-transformer" = callPackage
     ({ mkDerivation, base, mtl, transformers }:
      mkDerivation {
@@ -17282,6 +17357,8 @@ self: {
        pname = "Sysmon";
        version = "0.1.2";
        sha256 = "1zyp333vicjarcmip2q52nzfv948yl2q6qr3k3glp4v4m8f75ap3";
+       revision = "1";
+       editedCabalFile = "0q8v52ldarrhgp73rnm81p2h3a43nap9q2036z6p28wn3ymrbgrx";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base ConfigFile filepath fingertree Glob MissingH mtl old-locale
@@ -19134,15 +19211,16 @@ self: {
      }) {inherit (pkgs.xorg) xinput;};
 
   "XML" = callPackage
-    ({ mkDerivation, base, base-unicode-symbols, smallcheck, tasty
-     , tasty-smallcheck, txt, util, vector
+    ({ mkDerivation, base, base-unicode-symbols, hs-functors
+     , multivector, smallcheck, tasty, tasty-smallcheck, txt, util
+     , vector
      }:
      mkDerivation {
        pname = "XML";
-       version = "0.0.0.0";
-       sha256 = "1arlnyzj3zdzqrsr9lhicx2y1ag00cgf6jzn6nyxa7d7avp42025";
+       version = "0.0.1.0";
+       sha256 = "1cix816q5q45gyw48634ar4x50wmmqqn4cwz94czvlb7v03qc8rv";
        libraryHaskellDepends = [
-         base base-unicode-symbols txt util vector
+         base base-unicode-symbols hs-functors multivector txt util vector
        ];
        testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
        description = "Extensible Markup Language";
@@ -19370,8 +19448,8 @@ self: {
     ({ mkDerivation, base, deepseq, random }:
      mkDerivation {
        pname = "Yampa";
-       version = "0.11";
-       sha256 = "0frybgsj73r57rd6ckv9pgd9ff1g72qrlad90plb13cf2s6jdp3f";
+       version = "0.11.1";
+       sha256 = "0zzhp0h9z9xz7ipiyd6ygnhb6h50dwh268zamx6qdf6zzpywsya1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base deepseq random ];
@@ -22845,6 +22923,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "alg_0_2_6_0" = callPackage
+    ({ mkDerivation, base, util }:
+     mkDerivation {
+       pname = "alg";
+       version = "0.2.6.0";
+       sha256 = "0y0qhhmyjzd8sf6v74066yx41nl1zsnsmk8scjvdym8j8k8mvrpk";
+       libraryHaskellDepends = [ base util ];
+       description = "Algebraic structures";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "alga" = callPackage
     ({ mkDerivation, aeson, base, containers, data-default, exceptions
      , file-embed, filepath, formatting, haskeline, hspec, hxt
@@ -23135,8 +23225,8 @@ self: {
      }:
      mkDerivation {
        pname = "alms";
-       version = "0.6.7";
-       sha256 = "1xickrpjx2dn2pa5zcbjsfm5j6mqn54hpyzi7c6sv5i20hs2gamp";
+       version = "0.6.9";
+       sha256 = "0p2lhwnprswvmg40w9inw963xywgfqprlap5s5ppxpfjj4bz9ksh";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -24703,16 +24793,17 @@ self: {
 
   "amazonka-iam-policy" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring
-     , bytestring, doctest, hspec, profunctors, scientific, text, time
+     , bytestring, doctest, hashable, hspec, profunctors, scientific
+     , text, time
      }:
      mkDerivation {
        pname = "amazonka-iam-policy";
-       version = "0.0.1";
-       sha256 = "1mjc5ym604n9bi9fl7b0581i5z7vy12ri99lz3imz1k3dhr6xwga";
+       version = "0.0.4";
+       sha256 = "0nm24ck11d3ppcvqpqmi73l6s9ry20c907v4017gi6rlybzra75j";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
-         aeson base base64-bytestring bytestring profunctors scientific text
-         time
+         aeson base base64-bytestring bytestring hashable profunctors
+         scientific text time
        ];
        testHaskellDepends = [
          aeson aeson-pretty base bytestring doctest hspec
@@ -28176,6 +28267,8 @@ self: {
        pname = "argon2";
        version = "1.3.0.1";
        sha256 = "1v0clf78hykdyhv81z8v3kwp86hjgqh6b8a7wfbjv0fyy55bwxry";
+       revision = "1";
+       editedCabalFile = "1bqzf2cfpd03sl3wq9dnrcxaysbs116ib33ja0v8zi4szddm33jv";
        libraryHaskellDepends = [ base bytestring deepseq text-short ];
        testHaskellDepends = [
          base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck
@@ -29860,23 +29953,23 @@ self: {
     ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring, bzlib
      , Cabal, cli-setup, composition-prelude, containers, cpphs
      , dependency, dhall, directory, file-embed, filemanip, filepath
-     , hashable, http-client, http-client-tls, lzma, microlens, mtl
+     , http-client, http-client-tls, lzma, microlens, mtl
      , optparse-applicative, parallel-io, process, shake, shake-ats
      , shake-c, shake-ext, tar, temporary, text, unix, zip-archive, zlib
      }:
      mkDerivation {
        pname = "ats-pkg";
-       version = "3.1.0.12";
-       sha256 = "09kd57f3yjs112r9r8266ds8xsv6cjkyizzmknqyldllamh7qpjx";
+       version = "3.2.1.8";
+       sha256 = "183gdyivl6kab2k3z0jm6dk0wh83qwz3zvai7ayfkq3rjc6lb8ms";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          ansi-wl-pprint base binary bytestring bzlib Cabal
          composition-prelude containers dependency dhall directory
-         file-embed filemanip filepath hashable http-client http-client-tls
-         lzma microlens mtl parallel-io process shake shake-ats shake-c
-         shake-ext tar text unix zip-archive zlib
+         file-embed filemanip filepath http-client http-client-tls lzma
+         microlens mtl parallel-io process shake shake-ats shake-c shake-ext
+         tar text unix zip-archive zlib
        ];
        libraryToolDepends = [ cpphs ];
        executableHaskellDepends = [
@@ -30140,6 +30233,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "attoparsec-ip_0_0_3" = callPackage
+    ({ mkDerivation, attoparsec, base, ip, QuickCheck, tasty
+     , tasty-quickcheck, text, vector
+     }:
+     mkDerivation {
+       pname = "attoparsec-ip";
+       version = "0.0.3";
+       sha256 = "02d66mm1rc00dswkl9ink4pxwy8h7lyi2k9zcqda6ywa7cllhgl0";
+       libraryHaskellDepends = [ attoparsec base ip vector ];
+       testHaskellDepends = [
+         attoparsec base ip QuickCheck tasty tasty-quickcheck text vector
+       ];
+       description = "Parse IP data types with attoparsec";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "attoparsec-iso8601" = callPackage
     ({ mkDerivation, attoparsec, base, base-compat, text, time }:
      mkDerivation {
@@ -30274,6 +30384,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "attoparsec-uri_0_0_6" = callPackage
+    ({ mkDerivation, attoparsec, attoparsec-ip, base, bytedump, ip
+     , QuickCheck, quickcheck-instances, strict, tasty, tasty-quickcheck
+     , text, vector
+     }:
+     mkDerivation {
+       pname = "attoparsec-uri";
+       version = "0.0.6";
+       sha256 = "046aq5c56p51nxyrazv3sv7m49c214gc673cwyic75vfykgbk20b";
+       libraryHaskellDepends = [
+         attoparsec attoparsec-ip base bytedump ip QuickCheck
+         quickcheck-instances strict text vector
+       ];
+       testHaskellDepends = [
+         attoparsec attoparsec-ip base bytedump ip QuickCheck
+         quickcheck-instances strict tasty tasty-quickcheck text vector
+       ];
+       description = "URI parser / printer using attoparsec";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "attoparsec-varword" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring
      , bytestring-builder-varword, hspec, QuickCheck
@@ -30883,34 +31015,8 @@ self: {
      }:
      mkDerivation {
        pname = "avro";
-       version = "0.3.3.1";
-       sha256 = "1im7qydz1m0dzv45x9x8i4xr5snhzc6819gzrnm525jr8j8l50dk";
-       libraryHaskellDepends = [
-         aeson array base base16-bytestring binary bytestring containers
-         data-binary-ieee754 entropy fail hashable mtl pure-zlib scientific
-         semigroups tagged template-haskell text unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson array base base16-bytestring binary bytestring containers
-         directory entropy extra fail hashable hspec lens lens-aeson mtl
-         pure-zlib QuickCheck scientific semigroups tagged template-haskell
-         text transformers unordered-containers vector
-       ];
-       description = "Avro serialization support for Haskell";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "avro_0_3_4_1" = callPackage
-    ({ mkDerivation, aeson, array, base, base16-bytestring, binary
-     , bytestring, containers, data-binary-ieee754, directory, entropy
-     , extra, fail, hashable, hspec, lens, lens-aeson, mtl, pure-zlib
-     , QuickCheck, scientific, semigroups, tagged, template-haskell
-     , text, transformers, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "avro";
-       version = "0.3.4.1";
-       sha256 = "1v6ixrm870182krvdj62waa701pwwq93ca2yjrmz00jkmblj9kxm";
+       version = "0.3.4.2";
+       sha256 = "0g6y8f6j38n52vqwj185lyqc666cqrmgd6pn3427cqlhcj927b7v";
        libraryHaskellDepends = [
          aeson array base base16-bytestring binary bytestring containers
          data-binary-ieee754 entropy fail hashable mtl pure-zlib scientific
@@ -30924,7 +31030,6 @@ self: {
        ];
        description = "Avro serialization support for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "avwx" = callPackage
@@ -31632,6 +31737,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "axel" = callPackage
+    ({ mkDerivation, base, directory, filepath, lens, lens-aeson
+     , monad-control, mtl, parsec, process, regex-pcre, split, strict
+     , text, typed-process, vector, yaml
+     }:
+     mkDerivation {
+       pname = "axel";
+       version = "0.0.4";
+       sha256 = "0gg1q7nfwsdh0wr5mqyrjcrfga4i87j8q2f4n9nvpq6hmwnphpc3";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       libraryHaskellDepends = [
+         base directory filepath lens lens-aeson monad-control mtl parsec
+         process regex-pcre split strict text typed-process vector yaml
+       ];
+       executableHaskellDepends = [ base directory ];
+       description = "The Axel programming language";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "axiom" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory
      , ghcjs-perch, mtl, transformers, transient, transient-universe
@@ -31783,8 +31909,8 @@ self: {
        pname = "b-tree";
        version = "0.1.3";
        sha256 = "0r1bgcjsykd9qzzr6chxw8bfnmvk32p9663j6h11wmq6nq7nrlkb";
-       revision = "1";
-       editedCabalFile = "0y569gdl9b79c98lkd2zff71svi0b1i64dihc5dmsjlmzkwfzzhw";
+       revision = "2";
+       editedCabalFile = "04is4fc308f1achbdxvqq9rg4v8c02f1w88wysp318dbhhmwgggh";
        libraryHaskellDepends = [
          base binary bytestring containers directory errors exceptions
          filepath lens mmap mtl pipes pipes-interleave transformers vector
@@ -33536,6 +33662,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bench_1_0_12" = callPackage
+    ({ mkDerivation, base, criterion, optparse-applicative, process
+     , silently, text, turtle
+     }:
+     mkDerivation {
+       pname = "bench";
+       version = "1.0.12";
+       sha256 = "1sy97qpv6paar2d5syppk6lc06wjx6qyz5aidsmh30jq853nydx6";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base criterion optparse-applicative process silently text turtle
+       ];
+       description = "Command-line benchmark tool";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "bench-graph" = callPackage
     ({ mkDerivation, base, Chart, Chart-diagrams, csv, directory
      , filepath, split, text, transformers
@@ -33594,15 +33738,16 @@ self: {
 
   "bencoding" = callPackage
     ({ mkDerivation, AttoBencode, attoparsec, base, bencode, bytestring
-     , containers, criterion, deepseq, ghc-prim, hspec, mtl, pretty
-     , QuickCheck, text
+     , containers, criterion, deepseq, ghc-prim, hspec, integer-gmp, mtl
+     , pretty, QuickCheck, text
      }:
      mkDerivation {
        pname = "bencoding";
-       version = "0.4.3.0";
-       sha256 = "0f6d3g88y7i4s5wa53771n0fbkbs4na8vpy51wk21b563smdcpcc";
+       version = "0.4.4.0";
+       sha256 = "088w5r0yz81b3iid3bc61lvm4d9f361kv2gq9jz7sbm43fkraxpp";
        libraryHaskellDepends = [
-         attoparsec base bytestring deepseq ghc-prim mtl pretty text
+         attoparsec base bytestring deepseq ghc-prim integer-gmp mtl pretty
+         text
        ];
        testHaskellDepends = [
          attoparsec base bytestring containers ghc-prim hspec QuickCheck
@@ -33849,8 +33994,8 @@ self: {
      }:
      mkDerivation {
        pname = "bhoogle";
-       version = "0.1.3.2";
-       sha256 = "0dll14zrlyxsqraivdilna7v7awg4f90xc5hqik7lxmb3c7rmzr8";
+       version = "0.1.3.4";
+       sha256 = "06b2fc8667axzk58hpgb5wdbxd0lj1xrgkxvygsksq4q9wdwc8qn";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -33861,15 +34006,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "bhoogle_0_1_3_3" = callPackage
+  "bhoogle_0_1_3_5" = callPackage
     ({ mkDerivation, base, brick, bytestring, containers, directory
      , filepath, hoogle, lens, process, protolude, text, time
      , typed-process, vector, vty
      }:
      mkDerivation {
        pname = "bhoogle";
-       version = "0.1.3.3";
-       sha256 = "0x4xdzm51ri4arcjhddv2s71wx1kiy1wp5iycahb9sq42r954k6n";
+       version = "0.1.3.5";
+       sha256 = "1gig9w1k1w2kw6y3wx6ckmc7kamwwzzq7mbaxil0rmb5ms0p1rf9";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -34915,7 +35060,7 @@ self: {
        description = "Very low-level FFI bindings for Codec2";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {codec2 = null;};
+     }) {inherit (pkgs) codec2;};
 
   "bindings-common" = callPackage
     ({ mkDerivation, base }:
@@ -38545,8 +38690,8 @@ self: {
      }:
      mkDerivation {
        pname = "brick-skylighting";
-       version = "0.2";
-       sha256 = "1x4kfjj4sa5gbxnbvh76b4isrmc6jr11py9b50jsyvs720plq778";
+       version = "0.3";
+       sha256 = "1wjl5ff9c7czg7azj2pi17b3kzbgb5rmwb4nkxdy86xn6d68adi1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -39610,8 +39755,8 @@ self: {
      }:
      mkDerivation {
        pname = "bv-sized";
-       version = "0.4.0";
-       sha256 = "18z4k076q0bk23di1i1hh8k0h319psh5hrh6jdv6446c7sg7v1c8";
+       version = "0.5.0";
+       sha256 = "08q4hg2kil8ahqpz0pmyxxnij3n3xhlfp5dr3ri3imgc1b2sn1m6";
        libraryHaskellDepends = [
          base containers lens mtl parameterized-utils prettyclass QuickCheck
          random
@@ -41532,6 +41677,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "cache_0_1_1_1" = callPackage
+    ({ mkDerivation, base, clock, hashable, hspec, stm, transformers
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "cache";
+       version = "0.1.1.1";
+       sha256 = "04azn2g1rndfpf6zl3sachzz471hhxykxh4clrz0vl5da8frja8h";
+       libraryHaskellDepends = [
+         base clock hashable stm transformers unordered-containers
+       ];
+       testHaskellDepends = [ base clock hspec stm transformers ];
+       description = "An in-memory key/value store with expiration support";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cached-io" = callPackage
     ({ mkDerivation, base, stm, time, transformers }:
      mkDerivation {
@@ -43725,25 +43887,6 @@ self: {
      }:
      mkDerivation {
        pname = "cereal";
-       version = "0.5.5.0";
-       sha256 = "08k8y6nf3n8h8gzw4a44mssy7rhgpmfj28lhczjz4vgszc7k55qb";
-       libraryHaskellDepends = [
-         array base bytestring containers ghc-prim
-       ];
-       testHaskellDepends = [
-         base bytestring QuickCheck test-framework
-         test-framework-quickcheck2
-       ];
-       description = "A binary serialization library";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "cereal_0_5_7_0" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, ghc-prim
-     , QuickCheck, test-framework, test-framework-quickcheck2
-     }:
-     mkDerivation {
-       pname = "cereal";
        version = "0.5.7.0";
        sha256 = "1j7imh2mzqcljld7sx0av69699955rpy3hzivi5723i6a9nszgbs";
        libraryHaskellDepends = [
@@ -43755,7 +43898,6 @@ self: {
        ];
        description = "A binary serialization library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cereal-conduit" = callPackage
@@ -43782,8 +43924,8 @@ self: {
     ({ mkDerivation, base, cereal, data-dword }:
      mkDerivation {
        pname = "cereal-data-dword";
-       version = "0.1";
-       sha256 = "0fyi8xfp5xkb5cwacfvmrn10n905sr6qxbph9axz1rybjb129l3x";
+       version = "0.1.1";
+       sha256 = "14z0h7hz170l1zhz7add01q9n0v2diijskdrwfzqhvcka7a69566";
        libraryHaskellDepends = [ base cereal data-dword ];
        description = "Integration of \"cereal\" and \"data-dword\"";
        license = stdenv.lib.licenses.mit;
@@ -44510,34 +44652,6 @@ self: {
      }:
      mkDerivation {
        pname = "chatwork";
-       version = "0.1.3.4";
-       sha256 = "16r8bfqw9dlzlzv4ydfn8ywjjly32b0ld5h9f1qrc7hdxb12qkv2";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson aeson-casing base bytestring connection data-default-class
-         http-api-data http-client http-client-tls http-types req text
-       ];
-       executableHaskellDepends = [
-         aeson aeson-casing base bytestring connection data-default-class
-         http-api-data http-client http-client-tls http-types req text
-       ];
-       testHaskellDepends = [
-         aeson aeson-casing base bytestring connection data-default-class
-         hspec http-api-data http-client http-client-tls http-types req
-         servant-server text warp
-       ];
-       description = "The ChatWork API in Haskell";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "chatwork_0_1_3_5" = callPackage
-    ({ mkDerivation, aeson, aeson-casing, base, bytestring, connection
-     , data-default-class, hspec, http-api-data, http-client
-     , http-client-tls, http-types, req, servant-server, text, warp
-     }:
-     mkDerivation {
-       pname = "chatwork";
        version = "0.1.3.5";
        sha256 = "0nb9xhzf8apllbl75883nd3bz50mvfpf5zzkpwjw7lyg7mk82pkm";
        isLibrary = true;
@@ -44557,7 +44671,6 @@ self: {
        ];
        description = "The ChatWork API in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cheapskate" = callPackage
@@ -44982,8 +45095,8 @@ self: {
      }:
      mkDerivation {
        pname = "chr-core";
-       version = "0.1.0.1";
-       sha256 = "07lc9h9k3zy1ylw5b5xv6kls7sj7ppr18gacvzfqz3ppys54kkja";
+       version = "0.1.0.4";
+       sha256 = "0kh8md0qw3x3b06lcl6v593dlh8a7m5j6w63j6fbwg2gmk290md9";
        libraryHaskellDepends = [
          base chr-data chr-pretty containers hashable logict-state mtl
          pqueue unordered-containers
@@ -45000,10 +45113,8 @@ self: {
      }:
      mkDerivation {
        pname = "chr-data";
-       version = "0.1.0.0";
-       sha256 = "0igcqrqbxy3l26b3girh6qpmls5z2jcgzywxid2qq348jan88bgh";
-       revision = "1";
-       editedCabalFile = "1wzhcwzaskbl28plgs0z26jh3mj99mf2rbkn75n75yr6gf8fqs44";
+       version = "0.1.0.1";
+       sha256 = "0w8nd6swl4k18rinvranqawf4zffdc4ixnn91a4h3ssf4kv47nsd";
        libraryHaskellDepends = [
          array base chr-pretty containers fclabels hashable microlens
          microlens-mtl microlens-th mtl template-haskell
@@ -45093,14 +45204,16 @@ self: {
 
   "chronos" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, clock
-     , hashable, HUnit, primitive, QuickCheck, semigroups
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , text, torsor, vector
+     , criterion, deepseq, hashable, HUnit, old-locale, primitive
+     , QuickCheck, semigroups, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, text, thyme, time, torsor, vector
      }:
      mkDerivation {
        pname = "chronos";
-       version = "1.0.3";
-       sha256 = "0xaw13qq3ifjk4x33q5vvbv2k1ydg673s0hsxrdi5kwl2rw0zi70";
+       version = "1.0.4";
+       sha256 = "1v9v237473d3fg45sqhx1ksmgvy7p144jdw0a4bvlma01fbzk09h";
+       revision = "1";
+       editedCabalFile = "0796ic47hmzard8bmgnj0kww32afp8lppx3l5c85nafk7dasykyn";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring clock hashable primitive
          semigroups text torsor vector
@@ -45109,6 +45222,10 @@ self: {
          attoparsec base bytestring HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 text
        ];
+       benchmarkHaskellDepends = [
+         attoparsec base bytestring criterion deepseq old-locale QuickCheck
+         thyme time vector
+       ];
        description = "A performant time library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -45668,8 +45785,8 @@ self: {
     ({ mkDerivation, base, criterion, QuickCheck, random }:
      mkDerivation {
        pname = "cl3";
-       version = "1.0.0.2";
-       sha256 = "1ibwjry5xmf8dr8wbfdw3mzq4cz9dy5kvxy4sqkshcc08kjm2kp5";
+       version = "1.0.0.3";
+       sha256 = "16jllcyqdd6i0gq730c88ls47d2334ywr317pm7q6d6vgrjc4gjj";
        libraryHaskellDepends = [ base random ];
        testHaskellDepends = [ base QuickCheck ];
        benchmarkHaskellDepends = [ base criterion ];
@@ -48259,6 +48376,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "colorful-monoids_0_2_1_2" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "colorful-monoids";
+       version = "0.2.1.2";
+       sha256 = "0y35f21n8xh1xq8i0anbfx034m5wnwhp2ka47vvi3w0iw13zyhhb";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
+       description = "Styled console text output using ANSI escape sequences";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "colorize-haskell" = callPackage
     ({ mkDerivation, ansi-terminal, base, haskell-lexer }:
      mkDerivation {
@@ -51656,12 +51786,12 @@ self: {
      }) {};
 
   "continued-fraction" = callPackage
-    ({ mkDerivation, base, criterion, hspec, recursion-schemes }:
+    ({ mkDerivation, base, criterion, hspec, recursion }:
      mkDerivation {
        pname = "continued-fraction";
-       version = "0.1.0.10";
-       sha256 = "1c9lp30q94ddgrmvy93psas5lbyczkhwhr5nijg02sxjkmvrj47v";
-       libraryHaskellDepends = [ base recursion-schemes ];
+       version = "0.1.0.11";
+       sha256 = "1kxakmm53003f41kskl7m2h9l6dlamv9bsxpgwi2w0fxacyqp076";
+       libraryHaskellDepends = [ base recursion ];
        testHaskellDepends = [ base hspec ];
        benchmarkHaskellDepends = [ base criterion ];
        description = "Types and functions for working with continued fractions in Haskell";
@@ -51755,6 +51885,20 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "control" = callPackage
+    ({ mkDerivation, base, basic, stm, template-haskell, transformers
+     }:
+     mkDerivation {
+       pname = "control";
+       version = "0.1.1.0";
+       sha256 = "1393w30mgzhgppfrzjsh62gdw9agbjfxw9ahxphjabf0zdf34xzg";
+       libraryHaskellDepends = [
+         base basic stm template-haskell transformers
+       ];
+       description = "Class of monad transformers which control operations can be lifted thru";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "control-bool" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -54865,6 +55009,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "css-syntax_0_0_8" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, directory, hspec
+     , scientific, text
+     }:
+     mkDerivation {
+       pname = "css-syntax";
+       version = "0.0.8";
+       sha256 = "1h9h606q9m9sxgwjxx3km9b30l4rmaygd2zfigf38wz45vqfqwa2";
+       libraryHaskellDepends = [
+         attoparsec base bytestring scientific text
+       ];
+       testHaskellDepends = [
+         attoparsec base bytestring directory hspec scientific text
+       ];
+       description = "This package implments a parser for the CSS syntax";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "css-text" = callPackage
     ({ mkDerivation, attoparsec, base, hspec, QuickCheck, text }:
      mkDerivation {
@@ -58132,10 +58295,10 @@ self: {
     ({ mkDerivation, base, base-unicode-symbols, parsec, syb, time }:
      mkDerivation {
        pname = "dates";
-       version = "0.2.2.1";
-       sha256 = "02cc1h1rb37bx79fz5s573g3ib0fnscphlsgmd0m6hr1m8c2mgbd";
+       version = "0.2.2.2";
+       sha256 = "1vsjd3wwvg90yvj7g9921dz1b4j48h539jxapix319wkp0krk5cl";
        revision = "1";
-       editedCabalFile = "1qp9zipvm2wk1mzl6b6cl1ynjgs2lascvgdridn4alx5l3qnxw6m";
+       editedCabalFile = "1rm3s52hnrq1dgbslvilc7543k6z6fv109rn4ixwfi1wqfs1id8w";
        libraryHaskellDepends = [
          base base-unicode-symbols parsec syb time
        ];
@@ -59442,8 +59605,8 @@ self: {
      }:
      mkDerivation {
        pname = "deferred-folds";
-       version = "0.6.11";
-       sha256 = "1xwdr5zlg09qnapqpsqvc77dx1avr73di5qd7ck2km5asfijdvj8";
+       version = "0.6.12";
+       sha256 = "1gvbm0dkmvjjz5wwg2a5p2ahyd2imz1g751sr8k536hnd377xzy8";
        libraryHaskellDepends = [
          base bytestring containers foldl primitive transformers
        ];
@@ -59823,15 +59986,14 @@ self: {
 
   "dependency" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, binary, containers
-     , criterion, deepseq, hspec, micro-recursion-schemes, microlens
+     , criterion, deepseq, hspec, microlens
      }:
      mkDerivation {
        pname = "dependency";
-       version = "1.2.0.1";
-       sha256 = "0qk5qd4dihgix6jhb9g0d56ba3rhsfswn0407a7p6al7mnd8kxxv";
+       version = "1.2.0.3";
+       sha256 = "1zwqbx9fd02jjb40clq2r6isafgphmfkd0ai1w60kygb4cib7nkx";
        libraryHaskellDepends = [
-         ansi-wl-pprint base binary containers deepseq
-         micro-recursion-schemes microlens
+         ansi-wl-pprint base binary containers deepseq microlens
        ];
        testHaskellDepends = [ base containers hspec ];
        benchmarkHaskellDepends = [ base containers criterion ];
@@ -60475,6 +60637,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "df1_0_2" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, containers
+     , QuickCheck, tasty, tasty-quickcheck, text, time
+     }:
+     mkDerivation {
+       pname = "df1";
+       version = "0.2";
+       sha256 = "11sd9d6izb3jrxxr27h058lajjij1p5wfsgg0pshjziqc9l426zs";
+       libraryHaskellDepends = [
+         attoparsec base bytestring containers text time
+       ];
+       testHaskellDepends = [
+         attoparsec base bytestring QuickCheck tasty tasty-quickcheck text
+         time
+       ];
+       description = "Type, render and parse the df1 hierarchical structured log format";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "dfinity-radix-tree" = callPackage
     ({ mkDerivation, aeson, base, base16-bytestring, bloomfilter
      , BoundedChan, bytestring, cmdargs, concurrent-extra, conduit
@@ -60765,8 +60947,8 @@ self: {
      }:
      mkDerivation {
        pname = "dhall-to-cabal";
-       version = "1.3.0.0";
-       sha256 = "0mb0hvdhwlis38snxdyk01lyykxgav98ank3qq5rsf00ggdbv485";
+       version = "1.3.0.1";
+       sha256 = "0sb7wipngmxwd2mgzggcmg9pkzyqa65gp7j789y5lgp1q8q8gv26";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -60839,25 +61021,6 @@ self: {
      }) {};
 
   "di-core" = callPackage
-    ({ mkDerivation, base, containers, exceptions, QuickCheck
-     , safe-exceptions, stm, tasty, tasty-hunit, tasty-quickcheck, time
-     }:
-     mkDerivation {
-       pname = "di-core";
-       version = "1.0.2";
-       sha256 = "0g6xr9cgqispal9s67l8iacdg0pg8ijaws5640fby6vv9jp42qn8";
-       libraryHaskellDepends = [
-         base containers exceptions safe-exceptions stm time
-       ];
-       testHaskellDepends = [
-         base exceptions QuickCheck stm tasty tasty-hunit tasty-quickcheck
-         time
-       ];
-       description = "Typeful hierarchical structured logging without monad towers";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "di-core_1_0_3" = callPackage
     ({ mkDerivation, base, containers, QuickCheck, safe-exceptions, stm
      , tasty, tasty-hunit, tasty-quickcheck, time
      }:
@@ -60874,7 +61037,6 @@ self: {
        ];
        description = "Typeful hierarchical structured logging without monad towers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "di-df1" = callPackage
@@ -62560,6 +62722,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "discord-haskell" = callPackage
+    ({ mkDerivation, aeson, async, base, bytestring, containers
+     , data-default, http-client, iso8601-time, MonadRandom, req
+     , safe-exceptions, text, time, unordered-containers, vector
+     , websockets, wuss
+     }:
+     mkDerivation {
+       pname = "discord-haskell";
+       version = "0.5.1";
+       sha256 = "0y4ha8zsds53bq330740a0m4wjxmsrdlnhf2fmhp5i3c7rjknka8";
+       libraryHaskellDepends = [
+         aeson async base bytestring containers data-default http-client
+         iso8601-time MonadRandom req safe-exceptions text time
+         unordered-containers vector websockets wuss
+       ];
+       description = "Write bots for Discord in Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "discord-hs" = callPackage
     ({ mkDerivation, base, discord-gateway, discord-rest, discord-types
      , hashable, mtl, url, websockets
@@ -66513,21 +66694,23 @@ self: {
      }) {};
 
   "edges" = callPackage
-    ({ mkDerivation, base, cereal, contravariant, deepseq
-     , deferred-folds, foldl, hashable, monad-par, pointed, potoki
-     , potoki-cereal, primitive, primitive-extras, profunctors
-     , QuickCheck, quickcheck-instances, rerebase, semigroupoids, tasty
-     , tasty-hunit, tasty-quickcheck, text, unordered-containers, vector
+    ({ mkDerivation, base, cereal, cereal-data-dword, cereal-vector
+     , contravariant, data-dword, deepseq, deferred-folds, foldl
+     , hashable, monad-par, pointed, potoki, potoki-cereal, primitive
+     , primitive-extras, profunctors, QuickCheck, quickcheck-instances
+     , rerebase, semigroupoids, tasty, tasty-hunit, tasty-quickcheck
+     , text, unordered-containers, vector, vector-th-unbox
      }:
      mkDerivation {
        pname = "edges";
-       version = "0.9.1.1";
-       sha256 = "12alvmgxp488sg1km1j7kjlsbdk8xh6kxdpyxbvz4js6v1z54y0p";
+       version = "0.11.0.1";
+       sha256 = "12bs1wlfhhq5cqb0xan34jvdpx1asr3rb2d2yiafxqpngwvd7nh8";
        libraryHaskellDepends = [
-         base cereal contravariant deepseq deferred-folds foldl hashable
-         monad-par pointed potoki potoki-cereal primitive primitive-extras
-         profunctors QuickCheck semigroupoids text unordered-containers
-         vector
+         base cereal cereal-data-dword cereal-vector contravariant
+         data-dword deepseq deferred-folds foldl hashable monad-par pointed
+         potoki potoki-cereal primitive primitive-extras profunctors
+         QuickCheck semigroupoids text unordered-containers vector
+         vector-th-unbox
        ];
        testHaskellDepends = [
          cereal foldl QuickCheck quickcheck-instances rerebase tasty
@@ -68028,18 +68211,18 @@ self: {
      }) {};
 
   "emd" = callPackage
-    ({ mkDerivation, base, containers, finite-typelits
-     , ghc-typelits-knownnat, ghc-typelits-natnormalise, HUnit
-     , transformers, typelits-witnesses, vector, vector-sized
+    ({ mkDerivation, base, binary, containers, data-default-class
+     , finite-typelits, ghc-typelits-knownnat, ghc-typelits-natnormalise
+     , HUnit, transformers, typelits-witnesses, vector, vector-sized
      }:
      mkDerivation {
        pname = "emd";
-       version = "0.1.2.1";
-       sha256 = "0lx2f4kxzpmpnhwsd9rd0jxx7n39b4f77vm5hnqzvyvdhvlcfr53";
+       version = "0.1.3.0";
+       sha256 = "0p8ww7bxdrv5xpy9gslzp1c25iqamsdy0rfm4y2n0p71l7w960rw";
        libraryHaskellDepends = [
-         base containers finite-typelits ghc-typelits-knownnat
-         ghc-typelits-natnormalise transformers typelits-witnesses vector
-         vector-sized
+         base binary containers data-default-class finite-typelits
+         ghc-typelits-knownnat ghc-typelits-natnormalise transformers
+         typelits-witnesses vector vector-sized
        ];
        testHaskellDepends = [ base containers HUnit ];
        description = "Empirical Mode Decomposition and Hilbert-Huang Transform";
@@ -68232,8 +68415,10 @@ self: {
      }:
      mkDerivation {
        pname = "engine-io";
-       version = "1.2.20";
-       sha256 = "1kx16zpfbish8mcpr6j5s7c63w277kyhcykvcfq2xgh1npg4p0z7";
+       version = "1.2.21";
+       sha256 = "0rqpxvw2d2m5hlgkc2a3794874dig84vph1wkqnlrv2vxixkqplw";
+       revision = "1";
+       editedCabalFile = "1n5l2fs0wn7wps2nr8irymrfac2qris75z3p73mmlxrdxmbjb2vr";
        libraryHaskellDepends = [
          aeson async attoparsec base base64-bytestring bytestring errors
          free monad-loops mwc-random stm stm-delay text transformers
@@ -68270,8 +68455,8 @@ self: {
      }:
      mkDerivation {
        pname = "engine-io-snap";
-       version = "1.0.6";
-       sha256 = "1lv9gzz61fcba2y0mqmcml1shk8qjxlw8c1fis4w7xs2xgrwbjbm";
+       version = "1.0.7";
+       sha256 = "0qvdsspv0q9fp93bifp03gqa1jbxcxrf4mhyrncwmy24my2nvq1z";
        libraryHaskellDepends = [
          base bytestring containers engine-io io-streams lifted-base
          snap-core unordered-containers websockets websockets-snap
@@ -69174,6 +69359,33 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "ersatz_0_4_4" = callPackage
+    ({ mkDerivation, array, attoparsec, base, bytestring, Cabal
+     , cabal-doctest, containers, data-default, directory, doctest
+     , filepath, lens, mtl, parsec, process, semigroups, temporary
+     , transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "ersatz";
+       version = "0.4.4";
+       sha256 = "06d0fc5s5yxk1q54fsbnnhmvf25m5g86fqdzb42f0ckc0h3sbp22";
+       isLibrary = true;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       setupHaskellDepends = [ base Cabal cabal-doctest ];
+       libraryHaskellDepends = [
+         array attoparsec base bytestring containers data-default lens mtl
+         process semigroups temporary transformers unordered-containers
+       ];
+       executableHaskellDepends = [
+         array base containers lens mtl parsec semigroups
+       ];
+       testHaskellDepends = [ array base directory doctest filepath mtl ];
+       description = "A monad for expressing SAT or QSAT problems using observable sharing";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ersatz-toysat" = callPackage
     ({ mkDerivation, array, base, containers, ersatz, toysolver
      , transformers
@@ -71832,8 +72044,8 @@ self: {
      }:
      mkDerivation {
        pname = "fast-arithmetic";
-       version = "0.6.0.7";
-       sha256 = "12ma6p4qy7wc22dd63dxqq3sq7spsx2hdzn82zf0w9y33y2jyaml";
+       version = "0.6.0.9";
+       sha256 = "1kpki7j8kz9xzzg8gl8l5g7wgq0v2s7r2lhr0mb4m67bkq61zmrs";
        libraryHaskellDepends = [ base composition-prelude gmpint ];
        testHaskellDepends = [
          arithmoi base combinat-compat hspec QuickCheck
@@ -72120,8 +72332,8 @@ self: {
      }:
      mkDerivation {
        pname = "fastparser";
-       version = "0.3.1";
-       sha256 = "0qs3i1cxcdgyi2595qcqalqflpfkqgg6krw7dmjq4kk4pmnm6yw4";
+       version = "0.3.1.1";
+       sha256 = "0wj50rpjr69sl4kkw6zybh2s9iq9ysv6sc83k50l5kq12p28yc5d";
        libraryHaskellDepends = [
          base bytestring bytestring-lexing containers kan-extensions
          microlens thyme transformers vector-space
@@ -74196,8 +74408,8 @@ self: {
      }:
      mkDerivation {
        pname = "fitspec";
-       version = "0.4.4";
-       sha256 = "15vmdipw3pz6x4x2c1ywf0h0jbiy14p557mx3hm2zhdpxn1bdwyr";
+       version = "0.4.5";
+       sha256 = "0s4rifky7rswajc5z7a0kmmqyws3q6ryqca2h7riyh7xzkbxqfvk";
        libraryHaskellDepends = [
          base cmdargs leancheck template-haskell
        ];
@@ -75629,6 +75841,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "foldable1" = callPackage
+    ({ mkDerivation, base, transformers, util }:
+     mkDerivation {
+       pname = "foldable1";
+       version = "0.1.0.0";
+       sha256 = "02p9wg0rcp7qvjp588y6r2szz7ja5x1idl04vn3hr7mbrbjq9ml5";
+       libraryHaskellDepends = [ base transformers util ];
+       description = "Foldable types with at least 1 element";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "foldl" = callPackage
     ({ mkDerivation, base, bytestring, comonad, containers
      , contravariant, criterion, hashable, mwc-random, primitive
@@ -76793,8 +77016,8 @@ self: {
      }:
      mkDerivation {
        pname = "free-algebras";
-       version = "0.0.3.0";
-       sha256 = "1qkgpmw2kv3x436f600cw73gdvfgjdl5i8nx80nh7q7dsg2ynl72";
+       version = "0.0.4.0";
+       sha256 = "1rfrdnwsb1kpdc0ha3a7yrykff6fi3ji6ljdxmijv2n4halmxnly";
        libraryHaskellDepends = [
          base constraints containers data-fix free groups kan-extensions mtl
          natural-numbers transformers
@@ -77427,15 +77650,15 @@ self: {
      }) {};
 
   "fromhtml" = callPackage
-    ({ mkDerivation, base, bytestring, process, text }:
+    ({ mkDerivation, base, bytestring, process-extras, text }:
      mkDerivation {
        pname = "fromhtml";
-       version = "1.0.0";
-       sha256 = "0idfjkwlg0g5vgv8x5m302ra4w23sgvq29gbbgyx99afrhxqh37l";
+       version = "1.0.1";
+       sha256 = "173rbbnn62mb7kxlv7g9r52gjqi07pj3kqd7h2qr8mhk4xlbbagy";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base bytestring process text ];
-       executableHaskellDepends = [ base bytestring process text ];
+       libraryHaskellDepends = [ base bytestring process-extras text ];
+       executableHaskellDepends = [ base bytestring process-extras text ];
        description = "Simple adapter for transformation of HTML to other formats";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -78281,8 +78504,8 @@ self: {
      }:
      mkDerivation {
        pname = "funflow";
-       version = "1.3.1";
-       sha256 = "04980fbz3nzr70aakc7ng9d7047vrzh5864iwxziiqbw1h57la71";
+       version = "1.3.2";
+       sha256 = "01r1l1r8qg6w7wfcbs7qwxy22b7rd1cdixds425ynp9h0246lrmf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -78427,6 +78650,17 @@ self: {
        license = stdenv.lib.licenses.lgpl3;
      }) {};
 
+  "futures" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "futures";
+       version = "0.1";
+       sha256 = "0dx484i5q58yw3h6j9qp42x546vkky3sc29cqbr9969sfilmbqz8";
+       libraryHaskellDepends = [ base ];
+       description = "Simple and fast implementation of Future";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "fuzzcheck" = callPackage
     ({ mkDerivation, base, hspec, hspec-expectations, HUnit
      , lifted-base, monad-control, QuickCheck, random, transformers
@@ -78800,6 +79034,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "gas" = callPackage
+    ({ mkDerivation, base, free, transformers }:
+     mkDerivation {
+       pname = "gas";
+       version = "0.0.0.1";
+       sha256 = "1khapcq5yfx46pmc3y5nax8p5v5ckbis8v4f53jng6j59cd27c3f";
+       libraryHaskellDepends = [ base free transformers ];
+       description = "Limit how many steps a program may take";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "gasp" = callPackage
     ({ mkDerivation, base, binary, containers }:
      mkDerivation {
@@ -79582,26 +79827,6 @@ self: {
      }:
      mkDerivation {
        pname = "generic-lens";
-       version = "1.0.0.1";
-       sha256 = "0j83ynggqfaxp9g36lkjl9af57qixid9j1x1ljglny1zxqkgm888";
-       libraryHaskellDepends = [ base profunctors tagged ];
-       testHaskellDepends = [
-         base doctest HUnit inspection-testing lens profunctors
-       ];
-       benchmarkHaskellDepends = [
-         base criterion deepseq lens QuickCheck
-       ];
-       description = "Generically derive traversals, lenses and prisms";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "generic-lens_1_0_0_2" = callPackage
-    ({ mkDerivation, base, criterion, deepseq, doctest, HUnit
-     , inspection-testing, lens, profunctors, QuickCheck, tagged
-     }:
-     mkDerivation {
-       pname = "generic-lens";
        version = "1.0.0.2";
        sha256 = "0s21jfw0ndkkmx7di3q0b7xj7hws6yxxcsflal617c44iqc8lvsy";
        libraryHaskellDepends = [ base profunctors tagged ];
@@ -79810,6 +80035,8 @@ self: {
        pname = "generics-mrsop";
        version = "1.0.0.1";
        sha256 = "1spnsr127rhcpjwd7604pp7rpqp3q4rc8lb9msgl424hf62xbqq3";
+       revision = "1";
+       editedCabalFile = "1f3wg5sq8cm1bz210j4haxs511x786yq8wchfmdllw7cimhvw452";
        libraryHaskellDepends = [ base containers mtl template-haskell ];
        description = "Generic Programming with Mutually Recursive Sums of Products";
        license = stdenv.lib.licenses.mit;
@@ -81087,15 +81314,15 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "ghc-exactprint_0_5_7_0" = callPackage
+  "ghc-exactprint_0_5_7_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, Diff, directory
      , filemanip, filepath, free, ghc, ghc-boot, ghc-paths, HUnit, mtl
      , silently, syb
      }:
      mkDerivation {
        pname = "ghc-exactprint";
-       version = "0.5.7.0";
-       sha256 = "0r1cwjz96qrx0ww7snmwdh16xslzaqk6mlz3i9n4q779qf0y1n7m";
+       version = "0.5.7.1";
+       sha256 = "0w33vp4k2479xhq0b87ngznxwdklh43k19mzcb63dwh6cvh35kn4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -83855,8 +84082,8 @@ self: {
      }:
      mkDerivation {
        pname = "githud";
-       version = "2.0.2";
-       sha256 = "0nhik30c7xzn3aqj8d8b8rk05viqmhl8q9ymswxxn9ws2nkm7rk8";
+       version = "2.1.0";
+       sha256 = "19j0vy427n3rzi1nfmh7kjn8jj1ji3xrbrs957hyns9sy4wwrfly";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base mtl parsec process text unix ];
@@ -84587,10 +84814,8 @@ self: {
      }:
      mkDerivation {
        pname = "glirc";
-       version = "2.27";
-       sha256 = "0n7hh3020nsg034d2bdgdqf2glp6yaq9cp7cjlg3956zkrfi9jgw";
-       revision = "1";
-       editedCabalFile = "1d9v3bgzas23m13cr765n6dha6lsyw06wngjwb2rvaaj34sjl5hp";
+       version = "2.28";
+       sha256 = "17z3lhb7ngvp0678ry5zk0jl7pmjhzypk2l6x9mp43m427ick1nk";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal filepath ];
@@ -85129,7 +85354,8 @@ self: {
      }) {};
 
   "gnome-keyring" = callPackage
-    ({ mkDerivation, base, bytestring, c2hs, gnome-keyring, text, time
+    ({ mkDerivation, base, bytestring, c2hs, gnome-keyring
+     , libgnome_keyring, text, time
      }:
      mkDerivation {
        pname = "gnome-keyring";
@@ -85137,12 +85363,13 @@ self: {
        sha256 = "08fayi4ixqyzin7lxyx2s3yap377y6nrdf4fmv7bi895j2k642l8";
        libraryHaskellDepends = [ base bytestring text time ];
        librarySystemDepends = [ gnome-keyring ];
-       libraryPkgconfigDepends = [ gnome-keyring ];
+       libraryPkgconfigDepends = [ libgnome_keyring ];
        libraryToolDepends = [ c2hs ];
        description = "Bindings for libgnome-keyring";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs.gnome2) gnome-keyring;};
+     }) {inherit (pkgs.gnome3) gnome-keyring; 
+         inherit (pkgs) libgnome_keyring;};
 
   "gnomevfs" = callPackage
     ({ mkDerivation, array, base, containers, glib, gnome-vfs
@@ -88468,6 +88695,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "greskell_0_2_1_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, doctest, doctest-discover
+     , greskell-core, hint, hspec, semigroups, text, transformers
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "greskell";
+       version = "0.2.1.0";
+       sha256 = "03a3rgrzmhc3rh8hwz2pmq3w2q6yf8ypcfzbmqm8cwkix5xx1h8z";
+       libraryHaskellDepends = [
+         aeson base greskell-core semigroups text transformers
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring doctest doctest-discover greskell-core hint
+         hspec text unordered-containers
+       ];
+       description = "Haskell binding for Gremlin graph query language";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "greskell-core" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, doctest
      , doctest-discover, hashable, hspec, QuickCheck, scientific
@@ -88511,6 +88760,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "greskell-websocket_0_1_1_0" = callPackage
+    ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring
+     , greskell-core, hashtables, hspec, safe-exceptions, stm, text
+     , unordered-containers, uuid, vector, websockets
+     }:
+     mkDerivation {
+       pname = "greskell-websocket";
+       version = "0.1.1.0";
+       sha256 = "1c3n222ihaqb2gls0c9f4zc8pgbwgan7j1n4h5p7xhp7csg34p13";
+       libraryHaskellDepends = [
+         aeson async base base64-bytestring bytestring greskell-core
+         hashtables safe-exceptions stm text unordered-containers uuid
+         vector websockets
+       ];
+       testHaskellDepends = [
+         aeson base bytestring greskell-core hspec unordered-containers uuid
+         vector
+       ];
+       description = "Haskell client for Gremlin Server using WebSocket serializer";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "grid" = callPackage
     ({ mkDerivation, base, cereal, containers, QuickCheck
      , test-framework, test-framework-quickcheck2
@@ -91509,8 +91781,8 @@ self: {
      }:
      mkDerivation {
        pname = "hadolint";
-       version = "1.10.4";
-       sha256 = "09sczm8l93lmkjz0c5l9al9jp8jpqcmk2zbxbbbq4g2jrsb3v30y";
+       version = "1.11.1";
+       sha256 = "07mgv88whga78x6sa7c1iw8l6k6p5yb0b38wpvy6cs3rzk4x2dx2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -92473,6 +92745,8 @@ self: {
        pname = "halves";
        version = "0.1.0.0";
        sha256 = "06axsxkfja0p7vki4cnrf3rf3k255f5mk573pzn0zvzi4f8mmadn";
+       revision = "1";
+       editedCabalFile = "0hwp6fgnfmms2ckg0bzriklnshn7m39dxvj2vjrzm19spnf55fdn";
        libraryHaskellDepends = [ base lens ];
        testHaskellDepends = [ base hedgehog lens ];
        description = "Splitting/combining data structures to/from halves, quarters, eighths";
@@ -94206,6 +94480,8 @@ self: {
        pname = "hashable";
        version = "1.2.7.0";
        sha256 = "1gra8gq3kb7b2sd845h55yxlrfqx3ii004c6vjhga8v0b30fzdgc";
+       revision = "1";
+       editedCabalFile = "197063dpl0wn67dp7a06yc2hxp81n24ykk7klbjx0fndm5n87dh3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -95173,6 +95449,34 @@ self: {
      }) {inherit (pkgs) glib; 
          inherit (pkgs.gnome3) gobjectIntrospection;};
 
+  "haskell-gi_0_21_4" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, Cabal, containers
+     , directory, doctest, filepath, glib, gobjectIntrospection
+     , haskell-gi-base, mtl, pretty-show, process, regex-tdfa, safe
+     , text, transformers, xdg-basedir, xml-conduit
+     }:
+     mkDerivation {
+       pname = "haskell-gi";
+       version = "0.21.4";
+       sha256 = "0rjb7pg8v0kjx115n0bksw705g6yg9vn8krxrakhvds5hvmb9caw";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         attoparsec base bytestring Cabal containers directory filepath
+         haskell-gi-base mtl pretty-show process regex-tdfa safe text
+         transformers xdg-basedir xml-conduit
+       ];
+       libraryPkgconfigDepends = [ glib gobjectIntrospection ];
+       executableHaskellDepends = [
+         base containers directory filepath haskell-gi-base pretty-show text
+       ];
+       testHaskellDepends = [ base doctest process ];
+       description = "Generate Haskell bindings for GObject Introspection capable libraries";
+       license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) glib; 
+         inherit (pkgs.gnome3) gobjectIntrospection;};
+
   "haskell-gi-base" = callPackage
     ({ mkDerivation, base, bytestring, containers, glib, text }:
      mkDerivation {
@@ -95349,6 +95653,8 @@ self: {
        pname = "haskell-lsp";
        version = "0.2.2.0";
        sha256 = "1h3ibwd0i0z2c35fxw0m0gyd6dj45pf17x9hc5cgf3sql4qr5yxd";
+       revision = "1";
+       editedCabalFile = "0bdgpj5cj4qwp31glmilp1gqdm8c3fkqvgw18aqv8pz2wg39x23y";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -95369,7 +95675,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "haskell-lsp_0_6_0_0" = callPackage
+  "haskell-lsp_0_7_0_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, data-default
      , directory, filepath, hashable, haskell-lsp-types, hslogger, hspec
      , lens, mtl, network-uri, parsec, sorted-list, stm, text, time
@@ -95377,8 +95683,10 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-lsp";
-       version = "0.6.0.0";
-       sha256 = "1z5iy5m88zwbv5lrzg5ypmb4bcn4lg1xczq6nzkdlmkgc2l2w1c0";
+       version = "0.7.0.0";
+       sha256 = "1v67yj0ndd5wra2rnmdqcamivml82yn4lwhnm04nz6spsq2mqgkv";
+       revision = "1";
+       editedCabalFile = "1j33y61hwarfm5p54b682sd3rfhxf82lchr1jnnvv1h8xs56ryln";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -95392,8 +95700,8 @@ self: {
          unordered-containers vector yi-rope
        ];
        testHaskellDepends = [
-         aeson base containers directory filepath hashable hspec lens
-         network-uri sorted-list text yi-rope
+         aeson base bytestring containers data-default directory filepath
+         hashable hspec lens network-uri sorted-list stm text yi-rope
        ];
        description = "Haskell library for the Microsoft Language Server Protocol";
        license = stdenv.lib.licenses.mit;
@@ -95437,15 +95745,15 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "haskell-lsp-types_0_6_0_0" = callPackage
+  "haskell-lsp-types_0_7_0_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, data-default, filepath
      , hashable, lens, network-uri, scientific, text
      , unordered-containers
      }:
      mkDerivation {
        pname = "haskell-lsp-types";
-       version = "0.6.0.0";
-       sha256 = "1cy8l7qzqa0iy4bqdfy2znih4vv5z8krmxdyb3bm66imykvn0w4q";
+       version = "0.7.0.0";
+       sha256 = "1iisadmi3v3wshpwi5cbn2p8p4qr9rh5xnlbhjymzxhj9k09cmcb";
        libraryHaskellDepends = [
          aeson base bytestring data-default filepath hashable lens
          network-uri scientific text unordered-containers
@@ -95728,6 +96036,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "haskell-postal" = callPackage
+    ({ mkDerivation, base, bytestring, hspec, inline-c, libpostal, text
+     }:
+     mkDerivation {
+       pname = "haskell-postal";
+       version = "0.2.1.2";
+       sha256 = "158c7f7bj17xw9kjldrvq00ipghfa8cz5364qs4jnv6ibh6cx1fs";
+       libraryHaskellDepends = [ base bytestring inline-c text ];
+       libraryPkgconfigDepends = [ libpostal ];
+       testHaskellDepends = [ base bytestring hspec inline-c text ];
+       testPkgconfigDepends = [ libpostal ];
+       description = "Haskell binding for the libpostal library";
+       license = stdenv.lib.licenses.mit;
+     }) {libpostal = null;};
+
   "haskell-proxy-list" = callPackage
     ({ mkDerivation, base, base64-string, bytestring, lens, random
      , regex-base, regex-posix, text, wreq
@@ -95881,6 +96204,8 @@ self: {
        pname = "haskell-src-exts";
        version = "1.20.2";
        sha256 = "1sm3z4v1p5yffg01ldgavz71s3bvfhjfa13k428rk14bpkl8crlz";
+       revision = "1";
+       editedCabalFile = "0gxpxs3p4qvky6m8g3fjj09hx7nkg28b9a4999ca7afz359si3r9";
        libraryHaskellDepends = [ array base cpphs ghc-prim pretty ];
        libraryToolDepends = [ happy ];
        testHaskellDepends = [
@@ -97170,6 +97495,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "haskoin-bitcoind" = callPackage
+    ({ mkDerivation, base, base16-bytestring, bytestring, cereal
+     , haskoin-core, monad-control, mtl, network-bitcoin, text
+     , transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "haskoin-bitcoind";
+       version = "0.3.0";
+       sha256 = "1b46mhjna32n41bj16ca58cijypls1n74aqhk785vla9v9ib9828";
+       libraryHaskellDepends = [
+         base base16-bytestring bytestring cereal haskoin-core monad-control
+         mtl network-bitcoin text transformers transformers-base
+       ];
+       description = "An adapter for haskoin to network-bitcoin";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "haskoin-core" = callPackage
     ({ mkDerivation, aeson, base, base16-bytestring, binary, byteable
      , bytestring, cereal, conduit, containers, cryptohash, deepseq
@@ -99878,31 +100220,6 @@ self: {
      }:
      mkDerivation {
        pname = "hedis";
-       version = "0.10.2";
-       sha256 = "05bnma4ssdg4zx39xrwx14xys47zdxxkk9iyi8d29p1vb90vv68w";
-       libraryHaskellDepends = [
-         async base bytestring bytestring-lexing deepseq errors HTTP mtl
-         network network-uri resource-pool scanner stm text time tls
-         unordered-containers vector
-       ];
-       testHaskellDepends = [
-         async base bytestring doctest HUnit mtl slave-thread stm
-         test-framework test-framework-hunit text time
-       ];
-       benchmarkHaskellDepends = [ base mtl time ];
-       description = "Client library for the Redis datastore: supports full command set, pipelining";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hedis_0_10_3" = callPackage
-    ({ mkDerivation, async, base, bytestring, bytestring-lexing
-     , deepseq, doctest, errors, HTTP, HUnit, mtl, network, network-uri
-     , resource-pool, scanner, slave-thread, stm, test-framework
-     , test-framework-hunit, text, time, tls, unordered-containers
-     , vector
-     }:
-     mkDerivation {
-       pname = "hedis";
        version = "0.10.3";
        sha256 = "0wapsg0amlmzayphchng67ih3ivp0mk3vgi8x1mzrkd1xrlgav3v";
        libraryHaskellDepends = [
@@ -99917,7 +100234,6 @@ self: {
        benchmarkHaskellDepends = [ base mtl time ];
        description = "Client library for the Redis datastore: supports full command set, pipelining";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hedis-config" = callPackage
@@ -101956,22 +102272,6 @@ self: {
      }:
      mkDerivation {
        pname = "hidapi";
-       version = "0.1.4";
-       sha256 = "0xbar7a0krfdj9aks9yqwv930ndikd0n6r6sm1ci97qg69cflh7w";
-       libraryHaskellDepends = [
-         base bytestring deepseq deepseq-generics
-       ];
-       librarySystemDepends = [ systemd ];
-       description = "Haskell bindings to HIDAPI";
-       license = stdenv.lib.licenses.mit;
-     }) {inherit (pkgs) systemd;};
-
-  "hidapi_0_1_5" = callPackage
-    ({ mkDerivation, base, bytestring, deepseq, deepseq-generics
-     , systemd
-     }:
-     mkDerivation {
-       pname = "hidapi";
        version = "0.1.5";
        sha256 = "0pjrrm8rpcwwsc5ck36p0zyk5rr5jri8c79436whk8xxpnyf09ip";
        libraryHaskellDepends = [
@@ -101980,7 +102280,6 @@ self: {
        librarySystemDepends = [ systemd ];
        description = "Haskell bindings to HIDAPI";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) systemd;};
 
   "hidden-char" = callPackage
@@ -102535,6 +102834,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hinfo" = callPackage
+    ({ mkDerivation, aeson, base, optparse-applicative, text, yaml }:
+     mkDerivation {
+       pname = "hinfo";
+       version = "0.0.3.0";
+       sha256 = "04q4camvpfhgqmph4xpilwin9z5ig2v2mwhz2gz8wmgzyqxfbklv";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base optparse-applicative text yaml
+       ];
+       executableHaskellDepends = [
+         aeson base optparse-applicative text yaml
+       ];
+       testHaskellDepends = [ aeson base optparse-applicative text yaml ];
+       description = "Command Line App With Info on your Haskell App";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hinotify_0_3_9" = callPackage
     ({ mkDerivation, async, base, containers, directory, unix }:
      mkDerivation {
@@ -103730,8 +104048,8 @@ self: {
      }:
      mkDerivation {
        pname = "hlint";
-       version = "2.1.9";
-       sha256 = "0q7acb636gzkp7qq1cyx04xjjw1ndpcxc49brmg61rbl0z1cxqsx";
+       version = "2.1.10";
+       sha256 = "19as2m9g75cr6n1agzvsij0cvqhb0wbjlk31w4y5d5mns87dki0w";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -104173,25 +104491,27 @@ self: {
   "hmatrix-sundials" = callPackage
     ({ mkDerivation, base, containers, diagrams-lib
      , diagrams-rasterific, hmatrix, hspec, inline-c, lens, plots
-     , sundials_arkode, template-haskell, vector
+     , sundials_arkode, sundials_cvode, template-haskell, vector
      }:
      mkDerivation {
        pname = "hmatrix-sundials";
-       version = "0.19.0.0";
-       sha256 = "03pil8zkkixlgv2m07zyiyribpkphhl75ixvazb36c6rznvkg6nd";
+       version = "0.19.1.0";
+       sha256 = "1vbpx8661nnj15vrg177qwaylfvlp0fxdnpzncwkm4ka81v65hb5";
+       revision = "1";
+       editedCabalFile = "0vl85crf6zpbjpvrkydi5qk7ziaxcwr3bpm15cbxw6k94a3y9lvx";
        libraryHaskellDepends = [
          base containers hmatrix inline-c template-haskell vector
        ];
-       librarySystemDepends = [ sundials_arkode ];
+       librarySystemDepends = [ sundials_arkode sundials_cvode ];
        testHaskellDepends = [
          base containers diagrams-lib diagrams-rasterific hmatrix hspec
          inline-c lens plots template-haskell vector
        ];
-       testSystemDepends = [ sundials_arkode ];
+       testSystemDepends = [ sundials_arkode sundials_cvode ];
        description = "hmatrix interface to sundials";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {sundials_arkode = null;};
+     }) {sundials_arkode = null; sundials_cvode = null;};
 
   "hmatrix-svdlibc" = callPackage
     ({ mkDerivation, base, criterion, hmatrix, hspec, QuickCheck
@@ -104450,6 +104770,8 @@ self: {
        pname = "hmt";
        version = "0.16";
        sha256 = "1s6fjyphq57wh15vryj6y493ikaqa3g14x6hj9lg2h6wf6g8042h";
+       revision = "1";
+       editedCabalFile = "0ng1z7s5alciw1r3r0ch8bakabqlind29pssrih09rbnqbqwbmcj";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          aeson array base bytestring colour containers data-ordlist
@@ -104664,10 +104986,8 @@ self: {
      }:
      mkDerivation {
        pname = "ho-rewriting";
-       version = "0.2";
-       sha256 = "1kasg0wbpi3x40f25z1akp1x90fb6l5hg0f7qzxkp577np1f6qn9";
-       revision = "1";
-       editedCabalFile = "0342zsigabmra9634vya1iyhpkcfhdym2wjix0h481c1gs2rci2n";
+       version = "0.2.1";
+       sha256 = "1hnbsgbrynng5zhi2p6794g70h99rdx1bcnqwvk4ibzfk8snd09x";
        libraryHaskellDepends = [
          base compdata containers mtl patch-combinators
        ];
@@ -105575,6 +105895,8 @@ self: {
        pname = "hookup";
        version = "0.2.2";
        sha256 = "1q9w8j4g8j9ijfvwpng4i3k2b8pkf4ln27bcdaalnp9yyidmxlqf";
+       revision = "1";
+       editedCabalFile = "1ag338856kxlywgcizqij566iaqicv4jb3kmd017k7qflq8vmwb3";
        libraryHaskellDepends = [
          attoparsec base bytestring HsOpenSSL HsOpenSSL-x509-system network
        ];
@@ -105896,18 +106218,17 @@ self: {
      }) {};
 
   "hora" = callPackage
-    ({ mkDerivation, base, binary, hspec, QuickCheck, time
+    ({ mkDerivation, base, binary, bytestring, hspec, QuickCheck, time
      , timezone-olson, timezone-series
      }:
      mkDerivation {
        pname = "hora";
-       version = "2.0.2";
-       sha256 = "09xsvbr28macq5vkjd9b36ppi50yvpyibrv80w3gfwdzi4gypnd2";
-       revision = "1";
-       editedCabalFile = "18a1rw679vy46pqscpcb5hxphkim0z6pw7cyhsk2il30pg43hzms";
+       version = "2.2.0";
+       sha256 = "13i3z71xkyisgjms6g48hzgyva3dp83lk9m139ivysscgyr1a1pq";
        libraryHaskellDepends = [ base binary time timezone-series ];
        testHaskellDepends = [
-         base binary hspec QuickCheck time timezone-olson timezone-series
+         base binary bytestring hspec QuickCheck time timezone-olson
+         timezone-series
        ];
        description = "date time";
        license = stdenv.lib.licenses.publicDomain;
@@ -105954,6 +106275,8 @@ self: {
        pname = "hosc";
        version = "0.16";
        sha256 = "1xj5kkpkzzwfi26n28s0gkr9vzkmvp276n9jb75j2ccbr8q79vbj";
+       revision = "1";
+       editedCabalFile = "0n9ra6qhy5wighwa3zn5496473kdarhdgzsvmhnlp14s6sgw8akb";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          base binary blaze-builder bytestring data-binary-ieee754 network
@@ -106299,7 +106622,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hpack_0_29_6" = callPackage
+  "hpack_0_29_7" = callPackage
     ({ mkDerivation, aeson, base, bifunctors, bytestring, Cabal
      , containers, cryptonite, deepseq, directory, filepath, Glob, hspec
      , http-client, http-client-tls, http-types, HUnit, infer-license
@@ -106309,8 +106632,8 @@ self: {
      }:
      mkDerivation {
        pname = "hpack";
-       version = "0.29.6";
-       sha256 = "12alv7wx7zfysc8fdn8v971kw7k73w973h3jrwffkgfi1ld41mah";
+       version = "0.29.7";
+       sha256 = "07a9dar92qmgxfkf783rlwpkl49f242ygd50wrc22g4xllgrm2y9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -107110,23 +107433,26 @@ self: {
 
   "hriemann" = callPackage
     ({ mkDerivation, aeson, base, binary, bytestring, containers
-     , criterion, hostname, kazura-queue, network, protocol-buffers
-     , protocol-buffers-descriptor, scientific, text, time, unagi-chan
+     , criterion, hostname, hspec, hspec-core, HUnit, kazura-queue, mtl
+     , network, protocol-buffers, protocol-buffers-descriptor
+     , QuickCheck, scientific, text, time, unagi-chan
      }:
      mkDerivation {
        pname = "hriemann";
-       version = "0.3.1.0";
-       sha256 = "1n4awdyb25zqjaplv3alvqq48gp1wjzkhhhajsfqkxmsh2wd5wlv";
+       version = "0.3.2.0";
+       sha256 = "1b0vyxkyz8qqzvdrb0nyni6x490rxqh5zlydjrn9pbqc6npz7m8p";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base binary bytestring containers criterion hostname
-         kazura-queue network protocol-buffers protocol-buffers-descriptor
-         scientific text time unagi-chan
+         kazura-queue mtl network protocol-buffers
+         protocol-buffers-descriptor scientific text time unagi-chan
        ];
        executableHaskellDepends = [ base ];
-       testHaskellDepends = [ base ];
-       description = "Initial project template from stack";
+       testHaskellDepends = [
+         base containers hspec hspec-core HUnit kazura-queue QuickCheck
+       ];
+       description = "A Riemann Client for Haskell";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -107413,6 +107739,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hs-functors_0_1_3_0" = callPackage
+    ({ mkDerivation, base, transformers }:
+     mkDerivation {
+       pname = "hs-functors";
+       version = "0.1.3.0";
+       sha256 = "1j7g5s82f8c1j4hans28m63bwi612j8kfrb7n9cdqqzlc1r804ik";
+       libraryHaskellDepends = [ base transformers ];
+       description = "Functors from products of Haskell and its dual to Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hs-gchart" = callPackage
     ({ mkDerivation, base, mtl }:
      mkDerivation {
@@ -109188,6 +109526,8 @@ self: {
        pname = "hslogger";
        version = "1.2.10";
        sha256 = "0as5gvlh6pi2gflakp695qnlizyyp059dqrhvjl4gjxalja6xjnp";
+       revision = "1";
+       editedCabalFile = "04vhwv9qidwan7fbkgvx8z5hnybjaf6wq2951fx4qw3nqsys9250";
        libraryHaskellDepends = [
          base containers directory mtl network old-locale process time unix
        ];
@@ -112727,28 +113067,39 @@ self: {
      }) {};
 
   "http2-client" = callPackage
-    ({ mkDerivation, async, base, bytestring, containers
-     , data-default-class, deepseq, http2, network, optparse-applicative
-     , stm, time, tls
+    ({ mkDerivation, async, base, bytestring, containers, deepseq
+     , http2, network, stm, time, tls
      }:
      mkDerivation {
        pname = "http2-client";
-       version = "0.8.0.0";
-       sha256 = "1c9nn6b9fs30prrkalx7n7i4a4a5ss53ky4x2nba4vcq4rgipch3";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.8.0.1";
+       sha256 = "055x0cscrd0idfda4ak48dagkmqkgj1zg29mz4yxrdj9vp2n0xd3";
        libraryHaskellDepends = [
          async base bytestring containers deepseq http2 network stm time tls
        ];
-       executableHaskellDepends = [
-         async base bytestring data-default-class http2 optparse-applicative
-         time tls
-       ];
        testHaskellDepends = [ base ];
        description = "A native HTTP2 client library";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "http2-client-exe" = callPackage
+    ({ mkDerivation, async, base, bytestring, data-default-class, http2
+     , http2-client, optparse-applicative, time, tls
+     }:
+     mkDerivation {
+       pname = "http2-client-exe";
+       version = "0.1.0.0";
+       sha256 = "0i8rnq01dlnj7yzf64b7g7cshzsbxc668m9fhc97x3hbdr7b0iad";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         async base bytestring data-default-class http2 http2-client
+         optparse-applicative time tls
+       ];
+       description = "A command-line http2 client";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "http2-client-grpc" = callPackage
     ({ mkDerivation, base, binary, bytestring, data-default-class
      , http2, http2-client, proto-lens, proto-lens-protoc, text, zlib
@@ -113479,28 +113830,6 @@ self: {
 
   "hw-balancedparens" = callPackage
     ({ mkDerivation, base, criterion, hspec, hw-bits, hw-excess
-     , hw-prim, hw-rankselect-base, QuickCheck, storable-tuple, vector
-     }:
-     mkDerivation {
-       pname = "hw-balancedparens";
-       version = "0.2.0.1";
-       sha256 = "1kg8nl2dvd8xyc37v11bf0pw9pvcbzpv31y8vjzm1z5iyphn9lcr";
-       libraryHaskellDepends = [
-         base hw-bits hw-excess hw-prim hw-rankselect-base storable-tuple
-         vector
-       ];
-       testHaskellDepends = [
-         base hspec hw-bits hw-prim hw-rankselect-base QuickCheck vector
-       ];
-       benchmarkHaskellDepends = [
-         base criterion hw-bits hw-prim vector
-       ];
-       description = "Balanced parentheses";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "hw-balancedparens_0_2_0_2" = callPackage
-    ({ mkDerivation, base, criterion, hspec, hw-bits, hw-excess
      , hw-prim, hw-rankselect-base, QuickCheck, vector
      }:
      mkDerivation {
@@ -113518,7 +113847,6 @@ self: {
        ];
        description = "Balanced parentheses";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-bits" = callPackage
@@ -113542,6 +113870,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hw-bits_0_7_0_3" = callPackage
+    ({ mkDerivation, base, bytestring, criterion, hspec, hw-int
+     , hw-prim, hw-string-parse, QuickCheck, safe, vector
+     }:
+     mkDerivation {
+       pname = "hw-bits";
+       version = "0.7.0.3";
+       sha256 = "1z6h8ljws92jdchzbkv7siig859b21ck04xnp2fka2j8p97d437w";
+       libraryHaskellDepends = [
+         base bytestring hw-int hw-prim hw-string-parse safe vector
+       ];
+       testHaskellDepends = [
+         base bytestring hspec hw-prim QuickCheck vector
+       ];
+       benchmarkHaskellDepends = [ base criterion hw-prim vector ];
+       description = "Bit manipulation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hw-conduit" = callPackage
     ({ mkDerivation, array, base, bytestring, conduit
      , conduit-combinators, criterion, hspec, mmap, time, vector, word8
@@ -113989,6 +114337,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hw-prim_0_6_2_12" = callPackage
+    ({ mkDerivation, base, bytestring, criterion, directory, exceptions
+     , hedgehog, hspec, hw-hspec-hedgehog, mmap, QuickCheck, semigroups
+     , transformers, vector
+     }:
+     mkDerivation {
+       pname = "hw-prim";
+       version = "0.6.2.12";
+       sha256 = "10nbmpq8zm5j1jmn45w379rrmjvcssl213pmwh9p4zbnas71ba67";
+       libraryHaskellDepends = [
+         base bytestring mmap semigroups transformers vector
+       ];
+       testHaskellDepends = [
+         base bytestring directory exceptions hedgehog hspec
+         hw-hspec-hedgehog mmap QuickCheck semigroups transformers vector
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion mmap semigroups transformers vector
+       ];
+       description = "Primitive functions and data types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hw-prim-bits" = callPackage
     ({ mkDerivation, base, criterion, hedgehog, hspec, hw-hedgehog
      , hw-hspec-hedgehog, QuickCheck, vector
@@ -114107,8 +114479,8 @@ self: {
      }:
      mkDerivation {
        pname = "hw-simd";
-       version = "0.1.0.0";
-       sha256 = "1j1cwd5nxv0rc72mkkmyw28xvns100ksn4nclg1701wxbzh2vyaq";
+       version = "0.1.1.1";
+       sha256 = "1mcingwc7z6ybsn32c3g66r4j9sfwpm4jkqvwh8cbbbd97lhalmq";
        libraryHaskellDepends = [
          base bits-extra bytestring deepseq hw-bits hw-prim hw-rankselect
          hw-rankselect-base vector
@@ -115315,8 +115687,8 @@ self: {
      }:
      mkDerivation {
        pname = "hyraxAbif";
-       version = "0.2.3.5";
-       sha256 = "09csc3bm2il2hwglc1vvbz1pik4di5d7xwl9vfl5ahjkqdjlczzk";
+       version = "0.2.3.9";
+       sha256 = "0y9n5mz5hkbbdkw2h979y274x6y45pa9cw9wzbfnfczsjqgxgxs1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -115332,14 +115704,14 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "hyraxAbif_0_2_3_8" = callPackage
+  "hyraxAbif_0_2_3_10" = callPackage
     ({ mkDerivation, base, binary, bytestring, directory, filepath
      , hedgehog, hscolour, pretty-show, protolude, text
      }:
      mkDerivation {
        pname = "hyraxAbif";
-       version = "0.2.3.8";
-       sha256 = "0n2hl623icgz8h2cjnll80c73117sa3fp7fa5zc0khd4x4jz2zan";
+       version = "0.2.3.10";
+       sha256 = "1x800gx7l3wj0xphip8fhzh9pbhc374p2pgjdvhw5qq5wbxc7r3b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -115391,8 +115763,8 @@ self: {
      }:
      mkDerivation {
        pname = "hzenity";
-       version = "0.2";
-       sha256 = "1ckc95a9hn8blv8yqdgpcs41wdk1j3mydy5pj41cl73jkir18a0f";
+       version = "0.3";
+       sha256 = "1kggc8xfdc5ychbciyzipyv6skfvyhrgjcb805vrpkz3l2b8h0g8";
        libraryHaskellDepends = [
          base containers data-default process process-extras text time
        ];
@@ -117383,16 +117755,16 @@ self: {
 
   "indexation" = callPackage
     ({ mkDerivation, base, bytestring, cereal, deferred-folds, focus
-     , hashable, potoki, potoki-cereal, profunctors, stm-containers
+     , hashable, hashtables, mmorph, potoki, potoki-cereal, profunctors
      , text, transformers, unordered-containers, vector
      }:
      mkDerivation {
        pname = "indexation";
-       version = "0.4.2";
-       sha256 = "1ag30a4xlzii1pwl2dpgc7ydigfh3nw16xwjj2vp2qj54fh0rd1p";
+       version = "0.5.0.1";
+       sha256 = "036azy4bnz5xaf0m6dg18yfhi6sljiz9pmap2i8xs8gfbrrl3xsr";
        libraryHaskellDepends = [
-         base bytestring cereal deferred-folds focus hashable potoki
-         potoki-cereal profunctors stm-containers text transformers
+         base bytestring cereal deferred-folds focus hashable hashtables
+         mmorph potoki potoki-cereal profunctors text transformers
          unordered-containers vector
        ];
        description = "Tools for entity indexation";
@@ -118797,6 +119169,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "intro_0_3_2_0" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, deepseq
+     , dlist, extra, hashable, lens, mtl, QuickCheck, safe, text
+     , transformers, unordered-containers, writer-cps-mtl
+     }:
+     mkDerivation {
+       pname = "intro";
+       version = "0.3.2.0";
+       sha256 = "0nffkv59ws5ls8smafsvbgnpfhs6bbf6balwn23za1dlb5982ky3";
+       libraryHaskellDepends = [
+         base binary bytestring containers deepseq dlist extra hashable mtl
+         safe text transformers unordered-containers writer-cps-mtl
+       ];
+       testHaskellDepends = [
+         base binary bytestring containers deepseq dlist extra hashable lens
+         mtl QuickCheck safe text transformers unordered-containers
+         writer-cps-mtl
+       ];
+       description = "\"Fixed Prelude\" - Mostly total and safe, provides Text and Monad transformers";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "intro-prelude" = callPackage
     ({ mkDerivation, intro }:
      mkDerivation {
@@ -119604,8 +119999,8 @@ self: {
      }:
      mkDerivation {
        pname = "irc-core";
-       version = "2.4.0";
-       sha256 = "1ld3bkbn0y57jk86ls4gdxmfpm0yhm23wq3vidqb2l5hfbn80d0y";
+       version = "2.5.0";
+       sha256 = "124zfp6s8hj7z3m873145bnr0z8xlkbr1qgj2hvasd2qs2zrb8y8";
        libraryHaskellDepends = [
          attoparsec base base64-bytestring bytestring hashable primitive
          text time vector
@@ -121437,8 +121832,8 @@ self: {
     ({ mkDerivation, base, haskeline, hspec, HUnit }:
      mkDerivation {
        pname = "jord";
-       version = "0.2.0.0";
-       sha256 = "0akf6jjijwgn4jsvlzvj7mh9fx9wx0p05gf7bara6hiqj58y6k65";
+       version = "0.3.1.0";
+       sha256 = "09wf9yzf9jzh4w2iqs0r33hi80ralbriipydbqpb0gx0i2sgwqay";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -122190,24 +122585,30 @@ self: {
 
   "json-rpc" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, conduit
-     , conduit-extra, deepseq, hashable, lifted-async, monad-control
-     , monad-logger, mtl, QuickCheck, stm, stm-conduit, test-framework
-     , test-framework-quickcheck2, text, transformers
+     , conduit-extra, deepseq, hashable, hspec, monad-logger, mtl
+     , QuickCheck, stm-conduit, text, time, unliftio
      , unordered-containers, vector
      }:
      mkDerivation {
        pname = "json-rpc";
-       version = "0.7.1.1";
-       sha256 = "0izjkzs4szh7kcxsjhnpyvss96cizzwii1zjm8kyxz6v9cm7wn77";
+       version = "1.0.0";
+       sha256 = "0npqwq39w8r5q7s86gm79ldmnnn1klwn4lys207qdn6bph7g3cbk";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          aeson attoparsec base bytestring conduit conduit-extra deepseq
-         hashable lifted-async monad-control monad-logger mtl QuickCheck stm
-         stm-conduit text transformers unordered-containers vector
+         hashable monad-logger mtl QuickCheck stm-conduit text time unliftio
+         unordered-containers vector
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring conduit conduit-extra monad-logger mtl
+         QuickCheck stm-conduit text time unliftio unordered-containers
+         vector
        ];
        testHaskellDepends = [
-         aeson base bytestring conduit lifted-async monad-logger mtl
-         QuickCheck stm stm-conduit test-framework
-         test-framework-quickcheck2 text transformers unordered-containers
+         aeson base bytestring conduit conduit-extra hspec monad-logger mtl
+         QuickCheck stm-conduit text time unliftio unordered-containers
+         vector
        ];
        description = "Fully-featured JSON-RPC 2.0 library";
        license = stdenv.lib.licenses.publicDomain;
@@ -122772,8 +123173,8 @@ self: {
      }:
      mkDerivation {
        pname = "jukebox";
-       version = "0.3.7";
-       sha256 = "1m9za59bgvgzjd7fn11l322aq8j0xb6zsn94ycm0j5z3dwxv0l46";
+       version = "0.4.1";
+       sha256 = "1vpd5j71x85ni6wmvmifb5fw8h3y77l67a3dsngsdcs22jilbbgw";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -124783,8 +125184,8 @@ self: {
        pname = "kqueue";
        version = "0.2";
        sha256 = "0sbkyq17i41kln7scrfc9kdzsbyb787z33kzpkdz2vrziapns33h";
-       revision = "1";
-       editedCabalFile = "0l4qgfjim0g1x9zs7w9mkvrj0dl13km8wximkn7ksczwp174k9ff";
+       revision = "2";
+       editedCabalFile = "1c7xskqgv45xsiwa2djfia0mq9f0p6gbb0dwlj5sd8swi3msbsfz";
        libraryHaskellDepends = [ base directory filepath mtl time unix ];
        libraryToolDepends = [ c2hs ];
        description = "A binding to the kqueue event library";
@@ -125936,17 +126337,19 @@ self: {
   "language-ats" = callPackage
     ({ mkDerivation, alex, ansi-wl-pprint, array, base
      , composition-prelude, containers, cpphs, criterion, deepseq, happy
-     , hspec, hspec-dirstream, microlens, recursion-schemes
-     , system-filepath, transformers
+     , hspec, hspec-dirstream, microlens, recursion, system-filepath
+     , transformers
      }:
      mkDerivation {
        pname = "language-ats";
-       version = "1.5.0.0";
-       sha256 = "1rh5dmgqw1r6k9cc81spd7rzl3nhaijiyf4s2dvfshbaayn2v10r";
+       version = "1.7.0.2";
+       sha256 = "1x5nm59nx2dwjxqrz8r0f6wg5szxcsvidqd9pjzh1znlxbzy3s6i";
+       revision = "1";
+       editedCabalFile = "0dzijl82zynk73ahd3rzkv7x86qpbn36hp558vwmcvd84qq0hbqf";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          ansi-wl-pprint array base composition-prelude containers deepseq
-         microlens recursion-schemes transformers
+         microlens recursion transformers
        ];
        libraryToolDepends = [ alex cpphs happy ];
        testHaskellDepends = [
@@ -128551,8 +128954,8 @@ self: {
        pname = "lenz-template";
        version = "0.2.0.0";
        sha256 = "0g073wfh8522hvmy80dp8an5jr6qjnkfj3119ms3sir7dkfzljqn";
-       revision = "1";
-       editedCabalFile = "05rgdgqk2yb92wlfs13844bdh7a2k2rddnxf9fcnz1c3qq4wkyi5";
+       revision = "2";
+       editedCabalFile = "0vd1xir15fizd2j575lgbr99gdm83n998w645cr0pzv3li6a56jq";
        libraryHaskellDepends = [
          base base-unicode-symbols containers lenz template-haskell
        ];
@@ -129173,6 +129576,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "libnix" = callPackage
+    ({ mkDerivation, aeson, base, directory, errors, filepath, process
+     , protolude, tasty, tasty-hunit, text
+     }:
+     mkDerivation {
+       pname = "libnix";
+       version = "0.2.0.1";
+       sha256 = "1a2j2pg9j65k34dxmkl1lqjj2q28j99dcadkwfhwwj6sy70v7gvg";
+       libraryHaskellDepends = [
+         aeson base errors filepath process protolude text
+       ];
+       testHaskellDepends = [
+         base directory errors protolude tasty tasty-hunit text
+       ];
+       description = "Bindings to the nix package manager";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "libnotify" = callPackage
     ({ mkDerivation, base, bytestring, glib, gtk, libnotify }:
      mkDerivation {
@@ -129683,6 +130104,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lifted-base-tf" = callPackage
+    ({ mkDerivation, base, basic, control, criterion, HUnit
+     , lifted-base, monad-control, monad-peel, test-framework
+     , test-framework-hunit, transformers, transformers-compat
+     }:
+     mkDerivation {
+       pname = "lifted-base-tf";
+       version = "0.1.0.0";
+       sha256 = "1g3h86b6qrwq9sb5ppnpp4vygnfq4c77mhvzkk87yi56vvd6acix";
+       libraryHaskellDepends = [ base basic control ];
+       testHaskellDepends = [
+         base basic control HUnit lifted-base test-framework
+         test-framework-hunit transformers transformers-compat
+       ];
+       benchmarkHaskellDepends = [
+         base criterion lifted-base monad-control monad-peel transformers
+       ];
+       description = "lifted IO operations from the base library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "lifted-protolude" = callPackage
     ({ mkDerivation, async, base, bytestring, containers, deepseq
      , exceptions, ghc-prim, lifted-async, lifted-base, mtl, safe, stm
@@ -130957,6 +131399,8 @@ self: {
        pname = "list-t";
        version = "1.0.1";
        sha256 = "0wv78c3fg4g98pwdamsaasfnww4mdyffp4fhvb685s12kpg8shy3";
+       revision = "1";
+       editedCabalFile = "0jv0wxxr6rpw9mi3n6jbjqlk403wzycyafrc26vcwkdjaw63ckxb";
        libraryHaskellDepends = [
          base mmorph monad-control mtl transformers transformers-base
        ];
@@ -131154,6 +131598,32 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "liszt" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, deepseq
+     , directory, exceptions, filepath, fsnotify, network, reflection
+     , scientific, sendfile, stm, stm-delay, text, transformers
+     , unordered-containers, winery
+     }:
+     mkDerivation {
+       pname = "liszt";
+       version = "0.1";
+       sha256 = "0ffqpplasb6d0kbj6n50811a5qawaghv9s9vfszm6z2dw27zkjwd";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base binary bytestring containers deepseq directory exceptions
+         filepath fsnotify network reflection scientific sendfile stm
+         stm-delay text transformers unordered-containers winery
+       ];
+       executableHaskellDepends = [
+         base binary bytestring containers deepseq directory exceptions
+         filepath fsnotify network reflection scientific sendfile stm
+         stm-delay text transformers unordered-containers winery
+       ];
+       description = "Append only key-list database";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "lit" = callPackage
     ({ mkDerivation, base, blaze-html, blaze-markup, cheapskate
      , directory, filepath, highlighting-kate, parsec, text, time
@@ -132584,8 +133054,8 @@ self: {
     ({ mkDerivation, base, logict, mtl, transformers }:
      mkDerivation {
        pname = "logict-state";
-       version = "0.1.0.4";
-       sha256 = "0mkwggh97c3x96v7a4y7i4scdvr38d49an3617i9zgj328xkr6w9";
+       version = "0.1.0.5";
+       sha256 = "17rx8rj6m4jny52zh4daw6ac9pyp0yns470nm0bf2z9y69mfr63g";
        libraryHaskellDepends = [ base logict mtl transformers ];
        description = "Library for logic programming based on haskell package logict";
        license = stdenv.lib.licenses.bsd3;
@@ -133253,8 +133723,8 @@ self: {
      }:
      mkDerivation {
        pname = "lsp-test";
-       version = "0.2.0.0";
-       sha256 = "1zrzl132r8zfypqp38ni9sh7dgwmnysdxgr0b2jq3b69gz33nzs7";
+       version = "0.2.1.0";
+       sha256 = "1nd3nn5lyn9cwviijzfhqybj38zg10nf7ypb76ifaax91vj2hrkw";
        libraryHaskellDepends = [
          aeson aeson-pretty ansi-terminal base bytestring conduit
          conduit-parse containers data-default Diff directory filepath
@@ -134288,21 +134758,21 @@ self: {
     ({ mkDerivation, ansi-wl-pprint, base, binary, Cabal, cli-setup
      , composition-prelude, containers, criterion, directory, file-embed
      , hspec, hspec-megaparsec, http-client, http-client-tls, megaparsec
-     , MonadRandom, mtl, optparse-applicative, random-shuffle
-     , recursion-schemes, tar, template-haskell, text, th-lift-instances
-     , titlecase, zip-archive, zlib
+     , MonadRandom, mtl, optparse-applicative, random-shuffle, recursion
+     , tar, template-haskell, text, th-lift-instances, titlecase
+     , zip-archive, zlib
      }:
      mkDerivation {
        pname = "madlang";
-       version = "4.0.2.8";
-       sha256 = "11rz46jn396nr0gn75qvgmp98zv39l0g8gx36683fkhwfdlbr2iw";
+       version = "4.0.2.11";
+       sha256 = "1s924yvbk89xsl0zlm1shpc942q6nzi7fqqki8mlhj3ymqrgsv1k";
        isLibrary = true;
        isExecutable = true;
        setupHaskellDepends = [ base Cabal cli-setup ];
        libraryHaskellDepends = [
          ansi-wl-pprint base binary composition-prelude containers directory
-         file-embed megaparsec MonadRandom mtl random-shuffle
-         recursion-schemes template-haskell text th-lift-instances titlecase
+         file-embed megaparsec MonadRandom mtl random-shuffle recursion
+         template-haskell text th-lift-instances titlecase
        ];
        executableHaskellDepends = [
          base directory http-client http-client-tls megaparsec
@@ -137041,8 +137511,8 @@ self: {
        pname = "megaparsec";
        version = "6.5.0";
        sha256 = "12iggy7qpf8x93jm64zf0g215xwy779bqyfyjk2bhmxqqr1yzgdy";
-       revision = "2";
-       editedCabalFile = "0ahvqr29ym3g46yv2jxniccyn1ng1yqicqdbamkzm89gjnxd9n25";
+       revision = "3";
+       editedCabalFile = "137ap53bgvnc0bdhkyv84290i3fzngryijsv33h7fb0q9k6dmb6h";
        libraryHaskellDepends = [
          base bytestring case-insensitive containers deepseq mtl
          parser-combinators scientific text transformers
@@ -137403,6 +137873,8 @@ self: {
        pname = "memory";
        version = "0.14.16";
        sha256 = "03rbszi5d4z9rlbfv8ydrl1xf84xsh8z57g07f7j9qccn9587c3v";
+       revision = "1";
+       editedCabalFile = "10j8737fm287ii0nm4hqnhf87apls3xjczkzdw9qqkb4a2dybsbx";
        libraryHaskellDepends = [
          base basement bytestring deepseq foundation ghc-prim
        ];
@@ -137594,6 +138066,8 @@ self: {
        pname = "mersenne-random-pure64";
        version = "0.2.2.0";
        sha256 = "1lbmdnlk21qqbzw1g7jph6d21dg3vf5saca3inwv1byxq7fh057g";
+       revision = "1";
+       editedCabalFile = "0pxq0xz42x60993rl4pr4pia80jv1xcqh6njvjzfvn75018j4gw5";
        libraryHaskellDepends = [ base random time ];
        description = "Generate high quality pseudorandom numbers purely using a Mersenne Twister";
        license = stdenv.lib.licenses.bsd3;
@@ -139497,6 +139971,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "modern-uri_0_2_2_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, contravariant
+     , criterion, deepseq, exceptions, hspec, hspec-discover
+     , hspec-megaparsec, megaparsec, mtl, profunctors, QuickCheck
+     , reflection, tagged, template-haskell, text, weigh
+     }:
+     mkDerivation {
+       pname = "modern-uri";
+       version = "0.2.2.0";
+       sha256 = "1ldl2i34fl7srv72bjxnrbihafq8m8mmk5xca6lhcqwdpx8yakxb";
+       libraryHaskellDepends = [
+         base bytestring containers contravariant deepseq exceptions
+         megaparsec mtl profunctors QuickCheck reflection tagged
+         template-haskell text
+       ];
+       testHaskellDepends = [
+         base bytestring hspec hspec-megaparsec megaparsec QuickCheck text
+       ];
+       testToolDepends = [ hspec-discover ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion deepseq megaparsec text weigh
+       ];
+       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
@@ -142872,6 +143373,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "multipart_0_1_3" = callPackage
+    ({ mkDerivation, base, bytestring, parsec, stringsearch }:
+     mkDerivation {
+       pname = "multipart";
+       version = "0.1.3";
+       sha256 = "1x4n4yyva22dhfr1pg5ki112qvvzb4hyd7bwpm189iq4gcp52q4z";
+       libraryHaskellDepends = [ base bytestring parsec stringsearch ];
+       description = "HTTP multipart split out of the cgi package";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "multipart-names" = callPackage
     ({ mkDerivation, base, case-insensitive, HUnit, lens, parsec
      , test-framework, test-framework-hunit
@@ -144588,8 +145101,8 @@ self: {
     ({ mkDerivation, base, containers, monoid-extras }:
      mkDerivation {
        pname = "namespace";
-       version = "0.1.3.0";
-       sha256 = "01iar2sj5819bzc9swn051qmiz190qa34rmh00gcnwpbhs1wxfdz";
+       version = "0.1.4.0";
+       sha256 = "12v2mk4wcqsdcwym6dbwkwcamr04l4vncdwfj0bsnxzvf4mjzx7p";
        libraryHaskellDepends = [ base containers monoid-extras ];
        testHaskellDepends = [ base ];
        description = "A Generic Haskell library for managing namespaces";
@@ -144946,14 +145459,15 @@ self: {
      }) {};
 
   "natural" = callPackage
-    ({ mkDerivation, base, checkers, hedgehog, lens, QuickCheck, tasty
-     , tasty-hedgehog, tasty-hunit, tasty-quickcheck, transformers
+    ({ mkDerivation, base, checkers, hedgehog, lens, QuickCheck
+     , semigroupoids, tasty, tasty-hedgehog, tasty-hunit
+     , tasty-quickcheck, transformers
      }:
      mkDerivation {
        pname = "natural";
-       version = "0.1.0.2";
-       sha256 = "1wjnhmcl057ahslki7yl9f73w60nzn23a6mj7mvvqhxy3q509wf5";
-       libraryHaskellDepends = [ base lens ];
+       version = "0.3.0.2";
+       sha256 = "1haabwh41lyfhdd4mkfj7slhrwxhsxa6plii8jaza5z4bnydr7bd";
+       libraryHaskellDepends = [ base lens semigroupoids ];
        testHaskellDepends = [
          base checkers hedgehog lens QuickCheck tasty tasty-hedgehog
          tasty-hunit tasty-quickcheck transformers
@@ -145511,6 +146025,8 @@ self: {
        pname = "netclock";
        version = "0.6";
        sha256 = "0vskyczfhv9bszl2hnr6j9cvhkfampja5s41kh6i9wk8j9kpf9p8";
+       revision = "1";
+       editedCabalFile = "00wqr9nnjn8hm0r8xa5qrgqva5r0pcf32hlksrqhkzy12yl2kv08";
        libraryHaskellDepends = [ base bytestring hosc network ];
        description = "Netclock protocol";
        license = stdenv.lib.licenses.gpl3;
@@ -146090,20 +146606,18 @@ self: {
 
   "network-bitcoin" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, cookie, HTTP
-     , http-client, http-types, network, QuickCheck, text, time
-     , unordered-containers, vector
+     , http-client, http-types, network, network-uri, QuickCheck, text
+     , time, unordered-containers, vector
      }:
      mkDerivation {
        pname = "network-bitcoin";
-       version = "1.8.1";
-       sha256 = "0gw04wh24j4vpyvx0wy0bdhh3dkwdxrg2laq7vsvwlpzwgcny99h";
-       isLibrary = true;
-       isExecutable = true;
+       version = "1.8.3";
+       sha256 = "1pllz4il53j9sf6xlxjl3ci3r1n348y6mg0vdy19xy19zy1rjz1q";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring cookie HTTP http-client http-types
-         network text time unordered-containers vector
+         network network-uri text time unordered-containers vector
        ];
-       executableHaskellDepends = [
+       testHaskellDepends = [
          aeson attoparsec base bytestring cookie HTTP http-client http-types
          network QuickCheck text time unordered-containers vector
        ];
@@ -148376,21 +148890,19 @@ self: {
      }) {};
 
   "nqe" = callPackage
-    ({ mkDerivation, async, base, bytestring, conduit, conduit-extra
-     , containers, exceptions, hspec, lifted-async, lifted-base
-     , monad-control, stm, stm-conduit, text, transformers-base
+    ({ mkDerivation, base, bytestring, conduit, conduit-extra
+     , containers, exceptions, hspec, stm, stm-conduit, text, unliftio
      }:
      mkDerivation {
        pname = "nqe";
-       version = "0.1.0.0";
-       sha256 = "1cg9f0bjf8sar3scln73ij0av4jwwv8ki44fdh1dbhcy1c9fn5d4";
+       version = "0.3.0.0";
+       sha256 = "1ggss61zym8ramf3yavmsgn013nlcv40kp6r2v1ax7ccdqyzjh98";
        libraryHaskellDepends = [
-         async base bytestring conduit conduit-extra containers lifted-async
-         lifted-base monad-control stm transformers-base
+         base bytestring conduit conduit-extra containers stm unliftio
        ];
        testHaskellDepends = [
-         async base bytestring conduit conduit-extra exceptions hspec stm
-         stm-conduit text
+         base bytestring conduit conduit-extra exceptions hspec stm
+         stm-conduit text unliftio
        ];
        description = "Concurrency library in the style of Erlang/OTP";
        license = stdenv.lib.licenses.publicDomain;
@@ -149377,12 +149889,12 @@ self: {
      }) {};
 
   "observable" = callPackage
-    ({ mkDerivation, base, transformers }:
+    ({ mkDerivation, async, base, transformers }:
      mkDerivation {
        pname = "observable";
-       version = "0.1.0";
-       sha256 = "1y4rm73dqhdp5nvlqn68v1pkc9lg9wbhd1dx7nn3ckp8m5fv2kh0";
-       libraryHaskellDepends = [ base transformers ];
+       version = "0.1.1";
+       sha256 = "1mcjmna0fra3xcxxxq4a7rzndrmh752ps0ykim1ikcjrgh2r0cpp";
+       libraryHaskellDepends = [ async base transformers ];
        description = "Make your action to be observable and listen events from them";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -150222,6 +150734,8 @@ self: {
        pname = "opaleye-trans";
        version = "0.5.0";
        sha256 = "18y9qcs771647g5xy7209rq32w7fqflcr313mdw1fv0m2ak65wb2";
+       revision = "2";
+       editedCabalFile = "1p51w0q74f8by2yw2hs1z9pfh6jxnlizf4jffjmj6j2kpm9hh3md";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -150502,6 +151016,24 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "openexr-write_0_1_0_2" = callPackage
+    ({ mkDerivation, base, binary, bytestring, data-binary-ieee754
+     , deepseq, directory, hspec, split, vector, vector-split, zlib
+     }:
+     mkDerivation {
+       pname = "openexr-write";
+       version = "0.1.0.2";
+       sha256 = "1qh5kb3gj746y6s2jggccjgp8qyzdydz016z62854vg39sk5a1ib";
+       libraryHaskellDepends = [
+         base binary bytestring data-binary-ieee754 deepseq split vector
+         vector-split zlib
+       ];
+       testHaskellDepends = [ base bytestring directory hspec vector ];
+       description = "Library for writing images in OpenEXR HDR file format";
+       license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "openflow" = callPackage
     ({ mkDerivation, aeson, base, bimap, binary, bytestring, containers
      , deepseq, deepseq-generics, hashable, network
@@ -150763,6 +151295,8 @@ self: {
        pname = "openssl-streams";
        version = "1.2.1.3";
        sha256 = "0pwghr7ygv59k572xsj1j97rilkbjz66qaiyj0ra2wfg6pl70wfw";
+       revision = "1";
+       editedCabalFile = "0kvbb0sgli3h1yw229cllfrs2w1maapmvj1i472ywhpsgpz83362";
        libraryHaskellDepends = [
          base bytestring HsOpenSSL io-streams network
        ];
@@ -151142,6 +151676,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "optima" = callPackage
+    ({ mkDerivation, attoparsec, attoparsec-data, base
+     , optparse-applicative, rerebase, text, text-builder
+     }:
+     mkDerivation {
+       pname = "optima";
+       version = "0.3.0.1";
+       sha256 = "10xacn6myg486hk3i4a586xnwsjqjd1r29pyw1plgmb7yjp75z85";
+       libraryHaskellDepends = [
+         attoparsec attoparsec-data base optparse-applicative text
+         text-builder
+       ];
+       testHaskellDepends = [ attoparsec-data rerebase ];
+       description = "Simple command line interface arguments parser";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "optimal-blocks" = callPackage
     ({ mkDerivation, base, bytestring, bytestring-arbitrary, criterion
      , cryptohash, deepseq, hex, QuickCheck, vector
@@ -153600,8 +154151,8 @@ self: {
      }:
      mkDerivation {
        pname = "parameterized-utils";
-       version = "1.0.0";
-       sha256 = "0x1h38j61rwk6biz6nfqx252q1qy4wjrm7g4yv2bb9rddn131vaw";
+       version = "1.0.1";
+       sha256 = "0pcn1jiv5rhdm5nk6lg1xcr7cx7vsbl25n8slpf257khq23fjp6m";
        libraryHaskellDepends = [
          base containers deepseq ghc-prim hashable hashtables lens mtl
          template-haskell text th-abstraction vector
@@ -153811,8 +154362,8 @@ self: {
        pname = "parsec";
        version = "3.1.13.0";
        sha256 = "1wc09pyn70p8z6llink10c8pqbh6ikyk554911yfwxv1g91swqbq";
-       revision = "1";
-       editedCabalFile = "1dpr1wfpykkl6kayp4wnyn0n1zv7pvqksax2i54dhdgjijj8qynd";
+       revision = "2";
+       editedCabalFile = "032sizm03m2vdqshkv4sdviyka05gqf8gs6r4hqf9did177i0qnm";
        libraryHaskellDepends = [ base bytestring mtl text ];
        testHaskellDepends = [
          base HUnit mtl test-framework test-framework-hunit
@@ -158595,8 +159146,8 @@ self: {
        pname = "pipes-s3";
        version = "0.3.0.3";
        sha256 = "16gm7xjc8vbbajwmq91fj1l5cgd6difrz5g30b8czac4gdgqfppa";
-       revision = "2";
-       editedCabalFile = "1sm1s8paqyh4d05179lfbjix5irc6j7ryrir5s29xpjxslanl01x";
+       revision = "3";
+       editedCabalFile = "14cz2sfyz0q0jrpjwj9a25flvcm7mhjhihg4pr356niyvnx1b01p";
        libraryHaskellDepends = [
          aws base bytestring http-client http-client-tls http-types pipes
          pipes-bytestring pipes-safe resourcet text transformers
@@ -159025,8 +159576,8 @@ self: {
      }:
      mkDerivation {
        pname = "plan-applicative";
-       version = "2.0.0.1";
-       sha256 = "0n6pm7arzgw7aq1bg00gjrnay3gjk6mhi8a70xzxa5sn64ndfl7k";
+       version = "2.0.1.0";
+       sha256 = "13pm9p7k74irz1rsgq5s6lksz86i82wddjapnqgm8xfg28fr8hmy";
        libraryHaskellDepends = [
          base bifunctors comonad containers profunctors streaming
          transformers
@@ -160142,6 +160693,8 @@ self: {
        pname = "polyparse";
        version = "1.12";
        sha256 = "05dya1vdvq29hkhkdlsglzhw7bdn51rvs1javs0q75nf99c66k7m";
+       revision = "1";
+       editedCabalFile = "18daiyj3009wx0bhr87fbgy7xfh68ss9qzn6k3lgmh1z9dfsryrd";
        libraryHaskellDepends = [ base bytestring text ];
        description = "A variety of alternative parser combinator libraries";
        license = "LGPL";
@@ -161531,8 +162084,8 @@ self: {
     ({ mkDerivation, potoki-core }:
      mkDerivation {
        pname = "potoki";
-       version = "2.0.3";
-       sha256 = "14rkg6mdbbg4m59rjb0pig9wv2lk0rm6a3l6sd042w5q8qy2rbdq";
+       version = "2.0.5";
+       sha256 = "1ik30rjpz5hr0n83nq0xdc381lrwir7z1iqcjmlwp3zan9hrnbk2";
        libraryHaskellDepends = [ potoki-core ];
        description = "Simple streaming in IO";
        license = stdenv.lib.licenses.mit;
@@ -161564,18 +162117,18 @@ self: {
 
   "potoki-core" = callPackage
     ({ mkDerivation, acquire, attoparsec, base, bytestring, directory
-     , foldl, hashable, ilist, profunctors, ptr, QuickCheck
-     , quickcheck-instances, random, rerebase, stm, tasty, tasty-hunit
-     , tasty-quickcheck, text, transformers, unagi-chan
+     , foldl, hashable, ilist, primitive, profunctors, ptr, QuickCheck
+     , quickcheck-instances, random, rerebase, scanner, stm, tasty
+     , tasty-hunit, tasty-quickcheck, text, transformers
      , unordered-containers, vector
      }:
      mkDerivation {
        pname = "potoki-core";
-       version = "2.2.5";
-       sha256 = "0qd4y3xjqr93cyxycrnplqmf81yr0488l3rif4c2q7fhwh0kx3zb";
+       version = "2.2.7";
+       sha256 = "0pb20brgfc427gig317iyq6ln9z565aqanfm3cmkvgrzbvl9gf9q";
        libraryHaskellDepends = [
          acquire attoparsec base bytestring directory foldl hashable
-         profunctors ptr stm text transformers unagi-chan
+         primitive profunctors ptr scanner stm text transformers
          unordered-containers vector
        ];
        testHaskellDepends = [
@@ -162236,6 +162789,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "preludeplus" = callPackage
+    ({ mkDerivation, base, containers }:
+     mkDerivation {
+       pname = "preludeplus";
+       version = "0.1.0.3";
+       sha256 = "0fbxydbkf8j7v0gb6an5p1phd637xpzipiyq4nwlzdlpkdbpkaav";
+       libraryHaskellDepends = [ base containers ];
+       description = "Generalizes List functions and replaces partials with NonEmpty equivalents";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "preprocess-haskell" = callPackage
     ({ mkDerivation, base, base-unicode-symbols, basic-prelude
      , bytestring, Cabal, containers, cpphs, deepseq, directory
@@ -162914,15 +163478,16 @@ self: {
 
   "primitive-extras" = callPackage
     ({ mkDerivation, base, bytestring, cereal, deferred-folds, focus
-     , foldl, primitive, profunctors, QuickCheck, quickcheck-instances
-     , rerebase, tasty, tasty-hunit, tasty-quickcheck, vector
+     , foldl, list-t, primitive, profunctors, QuickCheck
+     , quickcheck-instances, rerebase, tasty, tasty-hunit
+     , tasty-quickcheck, vector
      }:
      mkDerivation {
        pname = "primitive-extras";
-       version = "0.6.4.1";
-       sha256 = "1b0q2qsd3ma6hg1av63fg0dqya6s61vv7giish9vh14cbz00zr66";
+       version = "0.6.7";
+       sha256 = "0kh2cccy1pmvvsrl9sjvcar4l1i3igk9vf8lxxxlwypj43nm32ny";
        libraryHaskellDepends = [
-         base bytestring cereal deferred-folds focus foldl primitive
+         base bytestring cereal deferred-folds focus foldl list-t primitive
          profunctors vector
        ];
        testHaskellDepends = [
@@ -163842,13 +164407,13 @@ self: {
     ({ mkDerivation, aeson, attoparsec, base, base64-bytestring, binary
      , blaze-html, bytestring, Cabal, cassava, conduit, containers
      , criterion, cryptohash-sha256, data-interval, deepseq
-     , deepseq-generics, directory, distributed-process
+     , deepseq-generics, deferred-folds, directory, distributed-process
      , distributed-process-async, distributed-process-client-server
      , distributed-process-extras, either, exceptions, extended-reals
-     , filepath, ghc, ghc-boot, ghc-paths, ghci, Glob, gnuplot, hashable
-     , hashable-time, haskeline, http-api-data, http-types, HUnit
-     , list-t, megaparsec, monad-parallel, MonadRandom, mtl, network
-     , network-transport, network-transport-tcp, old-locale
+     , filepath, foldl, ghc, ghc-boot, ghc-paths, ghci, Glob, gnuplot
+     , hashable, hashable-time, haskeline, http-api-data, http-types
+     , HUnit, list-t, megaparsec, monad-parallel, MonadRandom, mtl
+     , network, network-transport, network-transport-tcp, old-locale
      , optparse-applicative, parallel, path-pieces, QuickCheck, random
      , random-shuffle, resourcet, rset, scotty, semigroups, stm
      , stm-containers, template-haskell, temporary, text, time
@@ -163857,22 +164422,23 @@ self: {
      }:
      mkDerivation {
        pname = "project-m36";
-       version = "0.4";
-       sha256 = "0lp0vrvvplyav0dp418kx12y4qrf7y7xp3vxwsv5jjb3sc7aqyq9";
+       version = "0.5";
+       sha256 = "0k9px4f4yn6fgzc7zaig33w4nqnjgrmizbmmq11yg76gk08f7mv1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring binary bytestring cassava
          conduit containers cryptohash-sha256 data-interval deepseq
-         deepseq-generics directory distributed-process
+         deepseq-generics deferred-folds directory distributed-process
          distributed-process-async distributed-process-client-server
          distributed-process-extras either exceptions extended-reals
-         filepath ghc ghc-boot ghc-paths ghci Glob gnuplot hashable
+         filepath foldl ghc ghc-boot ghc-paths ghci Glob gnuplot hashable
          hashable-time haskeline http-api-data list-t monad-parallel
          MonadRandom mtl network-transport network-transport-tcp old-locale
          optparse-applicative parallel path-pieces QuickCheck random-shuffle
-         resourcet rset stm stm-containers temporary text time transformers
-         unix unordered-containers uuid vector vector-binary-instances zlib
+         resourcet rset semigroups stm stm-containers temporary text time
+         transformers unix unordered-containers uuid vector
+         vector-binary-instances zlib
        ];
        executableHaskellDepends = [
          aeson attoparsec base base64-bytestring binary blaze-html
@@ -164087,6 +164653,33 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "prometheus-client_1_0_0" = callPackage
+    ({ mkDerivation, atomic-primops, base, bytestring, clock
+     , containers, criterion, deepseq, doctest, exceptions, hspec, mtl
+     , QuickCheck, random, random-shuffle, stm, text, transformers
+     , transformers-compat, utf8-string
+     }:
+     mkDerivation {
+       pname = "prometheus-client";
+       version = "1.0.0";
+       sha256 = "0i1kbc9hxqnqiqkvfygc6h5fmqmrqwlq1wbslq65md5d41bl37i7";
+       libraryHaskellDepends = [
+         atomic-primops base bytestring clock containers deepseq exceptions
+         mtl stm text transformers transformers-compat utf8-string
+       ];
+       testHaskellDepends = [
+         atomic-primops base bytestring clock containers deepseq doctest
+         exceptions hspec mtl QuickCheck random-shuffle stm text
+         transformers transformers-compat utf8-string
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion random text utf8-string
+       ];
+       description = "Haskell client library for http://prometheus.io.";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "prometheus-effect" = callPackage
     ({ mkDerivation, base, bytestring, clock, criterion, hashable
      , http-types, mtl, random, retry, safe-exceptions, streaming
@@ -164116,12 +164709,16 @@ self: {
      }) {};
 
   "prometheus-metrics-ghc" = callPackage
-    ({ mkDerivation, base, doctest, prometheus-client, utf8-string }:
+    ({ mkDerivation, base, doctest, prometheus-client, text
+     , utf8-string
+     }:
      mkDerivation {
        pname = "prometheus-metrics-ghc";
-       version = "0.3.0";
-       sha256 = "0cgcgzd7f39fhi0hxwjawif55a3i5mnnv7afxrrbk7gnhqb589nx";
-       libraryHaskellDepends = [ base prometheus-client utf8-string ];
+       version = "1.0.0";
+       sha256 = "15zzj9dy9kfvkcypgnvh8xa6xsx0489ck8f30bm8958qp0za145z";
+       libraryHaskellDepends = [
+         base prometheus-client text utf8-string
+       ];
        testHaskellDepends = [ base doctest prometheus-client ];
        description = "Metrics exposing GHC runtime information for use with prometheus-client";
        license = stdenv.lib.licenses.asl20;
@@ -167927,30 +168524,6 @@ self: {
      }:
      mkDerivation {
        pname = "rakuten";
-       version = "0.1.1.4";
-       sha256 = "010vfpnh4bhcdabrc6yl29q381fz8v5cx65s6vbh9hvilbsw2k09";
-       libraryHaskellDepends = [
-         aeson base bytestring connection constraints data-default-class
-         extensible http-api-data http-client http-client-tls http-types
-         lens req text
-       ];
-       testHaskellDepends = [
-         aeson base bytestring connection constraints data-default-class
-         extensible hspec http-api-data http-client http-client-tls
-         http-types lens req servant-server text warp
-       ];
-       description = "The Rakuten API in Haskell";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "rakuten_0_1_1_5" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, connection, constraints
-     , data-default-class, extensible, hspec, http-api-data, http-client
-     , http-client-tls, http-types, lens, req, servant-server, text
-     , warp
-     }:
-     mkDerivation {
-       pname = "rakuten";
        version = "0.1.1.5";
        sha256 = "04qr5rbg0w56nlkama95bavalq3zj24pblbi655vq0vli5ggxgza";
        libraryHaskellDepends = [
@@ -167965,7 +168538,6 @@ self: {
        ];
        description = "The Rakuten API in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ralist" = callPackage
@@ -168197,6 +168769,8 @@ self: {
        pname = "random-fu-multivariate";
        version = "0.1.2.0";
        sha256 = "11hss3d1aa917g7w7k76zcakk82ras3046vb768yh5kayrb6a347";
+       revision = "2";
+       editedCabalFile = "13frafm1fdlgir64qsqy97158mv5chx98y23pdzdqiannf10w4by";
        libraryHaskellDepends = [ base hmatrix mtl random-fu ];
        testHaskellDepends = [ base ];
        description = "Multivariate distributions for random-fu";
@@ -170070,6 +170644,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "recursion" = callPackage
+    ({ mkDerivation, base, composition-prelude }:
+     mkDerivation {
+       pname = "recursion";
+       version = "1.1.0.0";
+       sha256 = "02ibnagyll2zgr4v472rbmaj9vsp1amvhvd9pvd8d76nj99xwr9j";
+       libraryHaskellDepends = [ base composition-prelude ];
+       description = "A recursion schemes library for GHC";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "recursion-schemes" = callPackage
     ({ mkDerivation, base, base-orphans, comonad, free, HUnit
      , template-haskell, th-abstraction, transformers
@@ -172037,8 +172622,8 @@ self: {
      }:
      mkDerivation {
        pname = "relude";
-       version = "0.1.0";
-       sha256 = "16q9mh35c989pmy4xz602svfz57x2kbl8v82mjsapigmnxa41r8x";
+       version = "0.1.1";
+       sha256 = "034hldd9rsqqhhxmnpfabh6v2by47qc5kx1qv77bl8k73fybf9a0";
        libraryHaskellDepends = [
          base bytestring containers deepseq ghc-prim hashable mtl stm text
          transformers unordered-containers utf8-string
@@ -172054,7 +172639,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "relude_0_1_1" = callPackage
+  "relude_0_2_0" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, doctest
      , gauge, ghc-prim, Glob, hashable, hedgehog, mtl, stm, tasty
      , tasty-hedgehog, text, transformers, unordered-containers
@@ -172062,8 +172647,8 @@ self: {
      }:
      mkDerivation {
        pname = "relude";
-       version = "0.1.1";
-       sha256 = "034hldd9rsqqhhxmnpfabh6v2by47qc5kx1qv77bl8k73fybf9a0";
+       version = "0.2.0";
+       sha256 = "097kiflrwvkb3mxpkydh6a6x84azv4xla9nlm5qscacl4kn5z3q5";
        libraryHaskellDepends = [
          base bytestring containers deepseq ghc-prim hashable mtl stm text
          transformers unordered-containers utf8-string
@@ -173755,6 +174340,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "retry_0_7_6_3" = callPackage
+    ({ mkDerivation, base, data-default-class, exceptions, ghc-prim
+     , hedgehog, HUnit, mtl, random, stm, tasty, tasty-hedgehog
+     , tasty-hunit, time, transformers
+     }:
+     mkDerivation {
+       pname = "retry";
+       version = "0.7.6.3";
+       sha256 = "19h3y5j2wim32cail0pix11vjhfbj3xiivlw2kyz1iqv4fxx8mby";
+       libraryHaskellDepends = [
+         base data-default-class exceptions ghc-prim random transformers
+       ];
+       testHaskellDepends = [
+         base data-default-class exceptions ghc-prim hedgehog HUnit mtl
+         random stm tasty tasty-hedgehog tasty-hunit time transformers
+       ];
+       description = "Retry combinators for monadic actions that may fail";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "retryer" = callPackage
     ({ mkDerivation, base, optparse-applicative, process }:
      mkDerivation {
@@ -174468,6 +175074,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "risc-v" = callPackage
+    ({ mkDerivation, base, base-unicode-symbols, criterion, smallcheck
+     , tasty, tasty-smallcheck, util
+     }:
+     mkDerivation {
+       pname = "risc-v";
+       version = "0.0.0.0";
+       sha256 = "0d1pb2h34ngr6pxmbizvka0ihaidhd7hkkmk74h51hh5mzp4zm04";
+       libraryHaskellDepends = [ base base-unicode-symbols util ];
+       testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
+       benchmarkHaskellDepends = [ base criterion ];
+       doHaddock = false;
+       description = "RISC-V";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "risc386" = callPackage
     ({ mkDerivation, alex, array, base, containers, happy, mtl, pretty
      }:
@@ -175592,8 +176214,8 @@ self: {
      }:
      mkDerivation {
        pname = "rpmbuild-order";
-       version = "0.1";
-       sha256 = "13hn4g2yh1llj7c661a9v25y3c5d3llsy3x4pk310ig08rzypvmi";
+       version = "0.2.1";
+       sha256 = "10m0lqakkdmhqcnl959d0nhair8p1zxq400yryzc59idx1w60vdn";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -176107,6 +176729,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "rv" = callPackage
+    ({ mkDerivation, base, base-unicode-symbols, criterion, smallcheck
+     , tasty, tasty-smallcheck, util
+     }:
+     mkDerivation {
+       pname = "rv";
+       version = "0.0.0.0";
+       sha256 = "17f9l2nixbnzmvhj9hb4lpc1aa80v4y5dlahahb370728a18jxjn";
+       libraryHaskellDepends = [ base base-unicode-symbols util ];
+       testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
+       benchmarkHaskellDepends = [ base criterion ];
+       doHaddock = false;
+       description = "RISC-V";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "rvar" = callPackage
     ({ mkDerivation, base, MonadPrompt, mtl, random-source
      , transformers
@@ -177261,33 +177899,27 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "sbp" = callPackage
-    ({ mkDerivation, aeson, array, base, base64-bytestring
-     , basic-prelude, binary, binary-conduit, bytestring, conduit
-     , conduit-extra, data-binary-ieee754, lens, lens-aeson, monad-loops
-     , resourcet, tasty, tasty-hunit, template-haskell, text, time, yaml
+  "say_0_1_0_1" = callPackage
+    ({ mkDerivation, base, bytestring, gauge, hspec, text, transformers
+     , unliftio
      }:
      mkDerivation {
-       pname = "sbp";
-       version = "2.3.16";
-       sha256 = "0m8i5n47bzlifp5pq6hkal7zbjga5j305sfccgjyrbiwpp1sxfg3";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson array base base64-bytestring basic-prelude binary bytestring
-         data-binary-ieee754 lens lens-aeson monad-loops template-haskell
-         text
+       pname = "say";
+       version = "0.1.0.1";
+       sha256 = "1r5kffjfwpas45g74sip8glrj1m9nygrnxjm7xgw898rq9pnafgn";
+       libraryHaskellDepends = [ base bytestring text transformers ];
+       testHaskellDepends = [
+         base bytestring hspec text transformers unliftio
        ];
-       executableHaskellDepends = [
-         aeson base basic-prelude binary-conduit bytestring conduit
-         conduit-extra resourcet time yaml
+       benchmarkHaskellDepends = [
+         base bytestring gauge text transformers unliftio
        ];
-       testHaskellDepends = [ base basic-prelude tasty tasty-hunit ];
-       description = "SwiftNav's SBP Library";
-       license = stdenv.lib.licenses.lgpl3;
+       description = "Send textual messages to a Handle in a thread-friendly way";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "sbp_2_3_17" = callPackage
+  "sbp" = callPackage
     ({ mkDerivation, aeson, array, base, base64-bytestring
      , basic-prelude, binary, binary-conduit, bytestring, conduit
      , conduit-extra, data-binary-ieee754, lens, lens-aeson, monad-loops
@@ -177311,7 +177943,6 @@ self: {
        testHaskellDepends = [ base basic-prelude tasty tasty-hunit ];
        description = "SwiftNav's SBP Library";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sbp2udp" = callPackage
@@ -177575,6 +178206,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "scanner_0_3" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, cereal, criterion
+     , hspec, text
+     }:
+     mkDerivation {
+       pname = "scanner";
+       version = "0.3";
+       sha256 = "0yshznbp784d4gk2qz5jlw5ikc1s1h58h7vck2yksi4ynm3m3y57";
+       libraryHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [ base bytestring hspec ];
+       benchmarkHaskellDepends = [
+         attoparsec base bytestring cereal criterion text
+       ];
+       description = "Fast non-backtracking incremental combinator parsing for bytestrings";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "scanner-attoparsec" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, hspec, scanner }:
      mkDerivation {
@@ -179326,8 +179975,8 @@ self: {
      }:
      mkDerivation {
        pname = "self-extract";
-       version = "0.3.3";
-       sha256 = "0i2b4mxwa2m2p9xks18wna0p84732kbjvjiz3cy0pd9jfmc92vbm";
+       version = "0.3.4";
+       sha256 = "11v5d4sjbax5dncirmhgbvcj3a2ynnvlq34x4yamx0d9pm9b1idm";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -179530,8 +180179,8 @@ self: {
      }:
      mkDerivation {
        pname = "semilattices";
-       version = "0.0.0.1";
-       sha256 = "0yqqww2mqspbhgkmzrkvljjkwfyi8iqndy8bm1c4sfmrza1h1byx";
+       version = "0.0.0.2";
+       sha256 = "1f4xy2kl8mqvlrzv8y0qs2i3c095iprbzpa4j424sifsmms3ya89";
        libraryHaskellDepends = [
          base containers hashable unordered-containers
        ];
@@ -179677,8 +180326,8 @@ self: {
      }:
      mkDerivation {
        pname = "sendgrid-v3";
-       version = "0.1.0.0";
-       sha256 = "0sn1a47155d13w15jjbcbcl5sqnl286mf8q7k39qhir98qlq045s";
+       version = "0.1.1.0";
+       sha256 = "1f8kxg6v6804qq7kl22ycff26kq6nh5n7kpkvbdx36pf54a6632w";
        libraryHaskellDepends = [ aeson base lens semigroups text wreq ];
        testHaskellDepends = [ base semigroups tasty tasty-hunit text ];
        description = "Sendgrid v3 API library";
@@ -181706,6 +182355,8 @@ self: {
        pname = "servant-snap";
        version = "0.8.2";
        sha256 = "0iyiifr9przbayqjs7ydwbzwad5m79379ypmmfiyvcw9m14syhyk";
+       revision = "1";
+       editedCabalFile = "1lycc0iagcc2yd4hq778g2mkqh5fig6vcd3fv4s48wjgw4nic9qf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -182197,7 +182848,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "serverless-haskell_0_7_4" = callPackage
+  "serverless-haskell_0_7_5" = callPackage
     ({ mkDerivation, aeson, aeson-casing, aeson-extra, amazonka-core
      , amazonka-kinesis, amazonka-s3, base, bytestring, case-insensitive
      , hspec, hspec-discover, http-types, iproute, lens, raw-strings-qq
@@ -182205,8 +182856,8 @@ self: {
      }:
      mkDerivation {
        pname = "serverless-haskell";
-       version = "0.7.4";
-       sha256 = "1ymkg2gsj2r5913hax0hi2l7asrqxnbik2lhiqk9fpd4nhgqmp3y";
+       version = "0.7.5";
+       sha256 = "13l5day4dlwyykwx17v2znyh0ck1paaxjzzawnjklcjzk1rzj0i3";
        libraryHaskellDepends = [
          aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis
          amazonka-s3 base bytestring case-insensitive http-types iproute
@@ -183082,19 +183733,17 @@ self: {
      }) {};
 
   "shake-ats" = callPackage
-    ({ mkDerivation, base, binary, dependency, directory, hashable
-     , hs2ats, language-ats, microlens, shake, shake-c, shake-cabal
-     , shake-ext, text
+    ({ mkDerivation, base, binary, dependency, directory, hs2ats
+     , language-ats, microlens, shake, shake-c, shake-cabal, shake-ext
+     , text
      }:
      mkDerivation {
        pname = "shake-ats";
-       version = "1.9.0.2";
-       sha256 = "0ximikdjf03qr4xzb68z3knbg2g1xdl3kzmm7fnq03sz7jczf6j3";
-       revision = "1";
-       editedCabalFile = "03ihwl13qfkmplpxh8zpcndg119kwrc8f4504wrpg4sjm7gv5q5m";
+       version = "1.9.0.3";
+       sha256 = "1c1vphg9vv4lizcsg681wxq5dmvg5fkhp6x15738j7sfbd0k87ja";
        libraryHaskellDepends = [
-         base binary dependency directory hashable hs2ats language-ats
-         microlens shake shake-c shake-cabal shake-ext text
+         base binary dependency directory hs2ats language-ats microlens
+         shake shake-c shake-cabal shake-ext text
        ];
        description = "Utilities for building ATS projects with shake";
        license = stdenv.lib.licenses.bsd3;
@@ -188667,8 +189316,8 @@ self: {
      }:
      mkDerivation {
        pname = "socket";
-       version = "0.8.0.1";
-       sha256 = "18h9mf153j2mcymnlfqvspgb90iwffdqp4a6sqd357i9y8g6spvl";
+       version = "0.8.1.0";
+       sha256 = "1sbxcs1fmd7x95yk7sqv3q6gg2azn77l6sngiiv692966a0bxba0";
        libraryHaskellDepends = [ base bytestring ];
        testHaskellDepends = [
          async base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck
@@ -188707,8 +189356,8 @@ self: {
      }:
      mkDerivation {
        pname = "socket-io";
-       version = "1.3.9";
-       sha256 = "1bn0x8l288rgq1x04a6xlaky8zwzqzs5zpbv80fvnnzqb4810035";
+       version = "1.3.10";
+       sha256 = "0kq4xk1slgp2c7ik1gvpxwb0kxpwmxy943hxiq4g6bn5a1g3qis2";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring engine-io mtl stm text
          transformers unordered-containers vector
@@ -189710,6 +190359,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "speculate_0_3_3" = callPackage
+    ({ mkDerivation, base, cmdargs, containers, leancheck }:
+     mkDerivation {
+       pname = "speculate";
+       version = "0.3.3";
+       sha256 = "1x0vikgx09j842h1q4gzmndq16yr5514np17qaqfrc8578g9wfkf";
+       libraryHaskellDepends = [ base cmdargs containers leancheck ];
+       testHaskellDepends = [ base leancheck ];
+       benchmarkHaskellDepends = [ base leancheck ];
+       description = "discovery of properties about Haskell functions";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "speculation" = callPackage
     ({ mkDerivation, base, ghc-prim, stm, transformers }:
      mkDerivation {
@@ -192743,19 +193406,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "stm-containers_1_0_0_1" = callPackage
+  "stm-containers_1_0_1_1" = callPackage
     ({ mkDerivation, base, deferred-folds, focus, foldl, free, hashable
-     , HTF, QuickCheck, rerebase, stm-hamt, transformers
+     , HTF, list-t, QuickCheck, quickcheck-text, rerebase, stm-hamt
+     , transformers
      }:
      mkDerivation {
        pname = "stm-containers";
-       version = "1.0.0.1";
-       sha256 = "0avwwabfsscpwn84xhr6vi38y6w49wsikyysjv4j55ax3bcvlks7";
+       version = "1.0.1.1";
+       sha256 = "16yds93abv9nmrbd5dcwbvmrq2ag0hdprs01khvnn9qg0nqs3lfn";
        libraryHaskellDepends = [
-         base deferred-folds focus hashable stm-hamt transformers
+         base deferred-folds focus hashable list-t stm-hamt transformers
        ];
        testHaskellDepends = [
-         deferred-folds focus foldl free HTF QuickCheck rerebase
+         deferred-folds focus foldl free HTF QuickCheck quickcheck-text
+         rerebase
        ];
        description = "Containers for STM";
        license = stdenv.lib.licenses.mit;
@@ -192808,14 +193473,15 @@ self: {
     ({ mkDerivation, async, base, criterion, deferred-folds, focus
      , free, hashable, list-t, mwc-random, mwc-random-monad, primitive
      , primitive-extras, QuickCheck, quickcheck-instances, rebase
-     , rerebase, tasty, tasty-hunit, tasty-quickcheck
+     , rerebase, tasty, tasty-hunit, tasty-quickcheck, transformers
      }:
      mkDerivation {
        pname = "stm-hamt";
-       version = "1.1.0.1";
-       sha256 = "0152dl9mqxp410fc3h3mry4fsdf6yf39zf0mpn30zrgn5pvqbqwf";
+       version = "1.1.2.1";
+       sha256 = "1xbd1kcmiq1qah8hc3bkzf9wlhwrnf2qlh8rah8dyln0dcwapi6q";
        libraryHaskellDepends = [
-         base deferred-folds focus hashable primitive primitive-extras
+         base deferred-folds focus hashable list-t primitive
+         primitive-extras transformers
        ];
        testHaskellDepends = [
          deferred-folds focus QuickCheck quickcheck-instances rerebase tasty
@@ -193319,8 +193985,8 @@ self: {
      }:
      mkDerivation {
        pname = "stratosphere";
-       version = "0.24.3";
-       sha256 = "1dvac89fzciklhkkagmhq93sk7mscnp3k4nw9izbfr5gyfdmvvdz";
+       version = "0.24.4";
+       sha256 = "0n4gry4vgqb64vy9ncyz3hcsjv31a869al5kbwgzi7pd7rp61zla";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -193493,8 +194159,8 @@ self: {
     ({ mkDerivation, base, bytestring, hidapi, mtl }:
      mkDerivation {
        pname = "streamdeck";
-       version = "0.0.2";
-       sha256 = "0kvzm7995c8wlxgksdhvv612iik944lm6fizvh8wzjbjavgwhwy6";
+       version = "0.0.3";
+       sha256 = "1cjvdf9ld55pv7n9cx2c4rsczqjxkrx1mkci8aziz59bs2ipqhak";
        libraryHaskellDepends = [ base bytestring hidapi mtl ];
        description = "Control library for the Elgato Stream Deck";
        license = stdenv.lib.licenses.bsd3;
@@ -194074,8 +194740,8 @@ self: {
      }:
      mkDerivation {
        pname = "strelka-core";
-       version = "0.3";
-       sha256 = "0g0cnd3j3xk84kihc7bbn2shy983yz5h2v15y2xhfx2anjl4qycl";
+       version = "0.3.0.1";
+       sha256 = "0hksf6p2pjvlvpgyndrcza16n0zyjaykqxzwy0igvylkwg1684qy";
        libraryHaskellDepends = [
          base base-prelude bifunctors bytestring hashable mtl semigroups
          text transformers unordered-containers
@@ -195749,8 +196415,8 @@ self: {
      }:
      mkDerivation {
        pname = "sv";
-       version = "1.1";
-       sha256 = "1xj4kyij566vzgw4qqvzrszp9apzlfljsm9m7706xf4in209pl00";
+       version = "1.1.1";
+       sha256 = "1d4f7l2k8vpskwf6iywfj7ivmfhdk2b10c9k8qrk6lms2mx0mwmh";
        libraryHaskellDepends = [
          attoparsec base bifunctors bytestring contravariant hw-dsv
          semigroupoids sv-core transformers utf8-string validation
@@ -195796,8 +196462,8 @@ self: {
      }:
      mkDerivation {
        pname = "sv-core";
-       version = "0.2";
-       sha256 = "00h4m6xljjjmahmybrwfh7kyjklvy47qvnhrq063dhdinknip71d";
+       version = "0.2.1";
+       sha256 = "00xzsx7ssii7i8h7m2g99vq54q8xb1191vi0sn8cg6a2bdfl74hd";
        libraryHaskellDepends = [
          attoparsec base bifunctors bytestring containers contravariant
          deepseq lens mtl parsec profunctors readable semigroupoids
@@ -196690,8 +197356,8 @@ self: {
      }:
      mkDerivation {
        pname = "syntactic";
-       version = "3.7";
-       sha256 = "1x6hl048247d3h8bi3b94kqmgsmcc0d751n2mdyxim26cg1vnwzf";
+       version = "3.7.1";
+       sha256 = "06k2n84dn9rp59rcv29hqkrm5mri6hyhh0hdbh7qfqxa7m06sl6w";
        libraryHaskellDepends = [
          base constraints containers data-hash deepseq mtl syb
          template-haskell tree-view
@@ -199942,8 +200608,8 @@ self: {
      }:
      mkDerivation {
        pname = "temporary-resourcet";
-       version = "0.1.0.0";
-       sha256 = "1nxl8ivp5sd250w7pwm4f1kas5g1ikij3z39px717ys1xvk1r81h";
+       version = "0.1.0.1";
+       sha256 = "0wgfra7lkb5abnhk295l3vfcna79b8m309wp1cxgl3v96il6yh70";
        libraryHaskellDepends = [
          base directory exceptions filepath resourcet transformers unix
        ];
@@ -200522,6 +201188,8 @@ self: {
        pname = "test-framework";
        version = "0.8.2.0";
        sha256 = "1hhacrzam6b8f10hyldmjw8pb7frdxh04rfg3farxcxwbnhwgbpm";
+       revision = "1";
+       editedCabalFile = "1af61pnf2vrkvs3hcqla5ddsrd0hd2pylv6l545yn3dcvl665rcc";
        libraryHaskellDepends = [
          ansi-terminal ansi-wl-pprint base containers hostname old-locale
          random regex-posix time xml
@@ -201207,8 +201875,30 @@ self: {
      }:
      mkDerivation {
        pname = "text-builder";
-       version = "0.5.1.1";
-       sha256 = "02h27jb5m5yz5ai1q7x5w41vh8imnkhd2fp7l65mwxp96khsa7ql";
+       version = "0.5.3";
+       sha256 = "0488dy3x2gvwvnsmjs7g35pra9m1yqvqzw0klkhijsiaxnc4x95f";
+       libraryHaskellDepends = [
+         base base-prelude bytestring semigroups text
+       ];
+       testHaskellDepends = [
+         QuickCheck quickcheck-instances rerebase tasty tasty-hunit
+         tasty-quickcheck
+       ];
+       benchmarkHaskellDepends = [ criterion rerebase ];
+       description = "An efficient strict text builder";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "text-builder_0_5_3_1" = callPackage
+    ({ mkDerivation, base, base-prelude, bytestring, criterion
+     , QuickCheck, quickcheck-instances, rerebase, semigroups, tasty
+     , tasty-hunit, tasty-quickcheck, text
+     }:
+     mkDerivation {
+       pname = "text-builder";
+       version = "0.5.3.1";
+       sha256 = "04vqh30m4vi9d4b4g311fb861qijbmf9zmn9ldsrdb1rrgjk2y9q";
        libraryHaskellDepends = [
          base base-prelude bytestring semigroups text
        ];
@@ -201231,6 +201921,8 @@ self: {
        pname = "text-containers";
        version = "0.1.0.0";
        sha256 = "0dsaqzh2hy6w9mzpsk22vmgmhx54l12il21n49f9g3cbr9kc9cv1";
+       revision = "2";
+       editedCabalFile = "0qssaccfhhk60855dy8ykrih3a597gqa9b88dxay6p5faxq9gczx";
        libraryHaskellDepends = [
          base bytestring containers deepseq ghc-prim hashable text-short
        ];
@@ -201721,6 +202413,8 @@ self: {
        pname = "text-short";
        version = "0.1.2";
        sha256 = "0rqiwgjkgyfy8596swl0s0x2jqk6ddh2h02qxa32az2cs5kviwmk";
+       revision = "1";
+       editedCabalFile = "00w77idkh44m88vivkqsys0y1bbxrflh06yq66liq0wgjhhzdppj";
        libraryHaskellDepends = [
          base binary bytestring deepseq ghc-prim hashable text
        ];
@@ -201777,6 +202471,8 @@ self: {
        pname = "text-show-instances";
        version = "3.6.5";
        sha256 = "0hljqh31m3199w8ppcihggcya8cj4zmrav5z6fvcn6xn2hzz1cql";
+       revision = "1";
+       editedCabalFile = "12k3hmn36w2mffhxjb5bx1g1gh3y0y4fync9hvk4gklh1w6dbs0a";
        libraryHaskellDepends = [
          base base-compat-batteries bifunctors binary containers directory
          ghc-boot-th haskeline hoopl hpc old-locale old-time pretty random
@@ -201858,6 +202554,8 @@ self: {
        pname = "text-utf8";
        version = "1.2.3.0";
        sha256 = "17xgi57wnjq06k0zllyj0k7jqfxridhczc1dzrg65vdrmzf8x31a";
+       revision = "1";
+       editedCabalFile = "05h8y5zw48w4sjmqxwn5vc1l7sh4kg3l4bbg0daac8bgjbdiz4jw";
        libraryHaskellDepends = [
          array base binary bytestring deepseq ghc-prim integer-gmp
        ];
@@ -202486,6 +203184,27 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "th-printf_0_6_0" = callPackage
+    ({ mkDerivation, base, charset, containers, hspec, HUnit
+     , microlens-platform, mtl, parsec, QuickCheck, semigroups
+     , template-haskell, th-lift, transformers
+     }:
+     mkDerivation {
+       pname = "th-printf";
+       version = "0.6.0";
+       sha256 = "1mqfbzx85c49q24yppkxgcd0h4s557b468qlnz2adbyba9wfsn62";
+       libraryHaskellDepends = [
+         base charset containers microlens-platform mtl parsec semigroups
+         template-haskell th-lift transformers
+       ];
+       testHaskellDepends = [
+         base hspec HUnit QuickCheck template-haskell
+       ];
+       description = "Quasiquoters for printf";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "th-reify-compat" = callPackage
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
@@ -203149,8 +203868,8 @@ self: {
     ({ mkDerivation, async, base, stm }:
      mkDerivation {
        pname = "throttled";
-       version = "1.0.0";
-       sha256 = "09fwklq8c4vpxx3pqhdnjqpag3k632c4ya47khkdn6q54vrybj9m";
+       version = "1.1.0";
+       sha256 = "0grzdhgpba5wjylr3ci4xp1cx6d26jhh0r018n4l3fzi1zivwagg";
        libraryHaskellDepends = [ async base stm ];
        description = "Concurrent processing of a Foldable, throttled by CPU count";
        license = stdenv.lib.licenses.bsd3;
@@ -203411,6 +204130,8 @@ self: {
        pname = "tidal-midi";
        version = "0.9.10";
        sha256 = "0d59s9vq2jmlb8b1bbay6n5911fjm9j04c9545p4i5visniv61b4";
+       revision = "1";
+       editedCabalFile = "11wkj909j2jlq19ls7q5293av648vc2k6f2064hyrqwcd68mksnj";
        libraryHaskellDepends = [
          base containers PortMidi tidal time transformers
        ];
@@ -204998,8 +205719,8 @@ self: {
        pname = "token-bucket";
        version = "0.1.0.1";
        sha256 = "1l3axqdkrjf28pxhrvdvlpf9wi79czsfvhi33w4v2wbj0g00j9ii";
-       revision = "3";
-       editedCabalFile = "1gqlxy3rwrgag4qbjkh1f2kya4gcy1x5ic9xn997nzc6yi334v7m";
+       revision = "4";
+       editedCabalFile = "19kxi77aqyra00m02751sdfm6qy6mx4mlh7bhqv4wyaggwga707g";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base time ];
        description = "Rate limiter using lazy bucket algorithm";
@@ -205147,31 +205868,6 @@ self: {
   "tomland" = callPackage
     ({ mkDerivation, base, hashable, hedgehog, hspec-megaparsec
      , megaparsec, mtl, parser-combinators, tasty, tasty-discover
-     , tasty-hedgehog, tasty-hspec, text, time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "tomland";
-       version = "0.3";
-       sha256 = "0crwapvykd26b50bmh22vxpcv44f1jv88r0ifvr3hjmvv0v43lwh";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base hashable megaparsec mtl parser-combinators text time
-         unordered-containers
-       ];
-       executableHaskellDepends = [ base text time unordered-containers ];
-       testHaskellDepends = [
-         base hedgehog hspec-megaparsec megaparsec tasty tasty-hedgehog
-         tasty-hspec text time unordered-containers
-       ];
-       testToolDepends = [ tasty-discover ];
-       description = "TOML parser";
-       license = stdenv.lib.licenses.mpl20;
-     }) {};
-
-  "tomland_0_3_1" = callPackage
-    ({ mkDerivation, base, hashable, hedgehog, hspec-megaparsec
-     , megaparsec, mtl, parser-combinators, tasty, tasty-discover
      , tasty-hedgehog, tasty-hspec, text, time, transformers
      , unordered-containers
      }:
@@ -205193,7 +205889,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "TOML parser";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tomlcheck" = callPackage
@@ -205406,23 +206101,28 @@ self: {
      }) {};
 
   "toxcore" = callPackage
-    ({ mkDerivation, base, bytestring, bytestring-arbitrary
-     , data-default-class, hspec, QuickCheck, saltine, toxcore
+    ({ mkDerivation, base, base16-bytestring, bytestring
+     , bytestring-arbitrary, data-default-class, directory, hspec
+     , QuickCheck, saltine, toxcore
      }:
      mkDerivation {
        pname = "toxcore";
-       version = "0.0.2";
-       sha256 = "0wks3n93kyzpwyq0qk18qgrif8hjcm8rv2l6n41bhkvifrygz7l5";
-       libraryHaskellDepends = [
-         base bytestring bytestring-arbitrary data-default-class QuickCheck
-         saltine
-       ];
+       version = "0.2.0";
+       sha256 = "01pnl2x86zjs26cbp0m7ayx827s8l5ad2pgx7n48ziqrjyldp1f1";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base bytestring data-default-class ];
        librarySystemDepends = [ toxcore ];
+       executableHaskellDepends = [
+         base base16-bytestring bytestring directory
+       ];
+       executableSystemDepends = [ toxcore ];
        testHaskellDepends = [
-         base data-default-class hspec QuickCheck saltine
+         base base16-bytestring bytestring bytestring-arbitrary
+         data-default-class hspec QuickCheck saltine
        ];
        description = "Haskell bindings to the C reference implementation of Tox";
-       license = stdenv.lib.licenses.agpl3;
+       license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {toxcore = null;};
 
@@ -207512,6 +208212,8 @@ self: {
        pname = "twee";
        version = "2.1.5";
        sha256 = "1v94hf1fd7n01drd6hx37zrplpzlskfmd3l8lmkb5kzy618x0cnb";
+       revision = "1";
+       editedCabalFile = "00dkqm778qn9zg562vbcydr0xqglcg9l3i1irvcwshj4q0larwv4";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -208835,6 +209537,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "typed-process_0_2_3_0" = callPackage
+    ({ mkDerivation, async, base, base64-bytestring, bytestring, hspec
+     , process, stm, temporary, transformers
+     }:
+     mkDerivation {
+       pname = "typed-process";
+       version = "0.2.3.0";
+       sha256 = "0j36vrc9w841m5qbwqra1lwiznx31xfnhin1sm8x2c2739csbpn0";
+       libraryHaskellDepends = [
+         async base bytestring process stm transformers
+       ];
+       testHaskellDepends = [
+         async base base64-bytestring bytestring hspec process stm temporary
+         transformers
+       ];
+       description = "Run external processes, with strong typing of streams";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "typed-spreadsheet" = callPackage
     ({ mkDerivation, async, base, diagrams-cairo, diagrams-gtk
      , diagrams-lib, foldl, gtk, microlens, stm, text, transformers
@@ -210685,6 +211407,33 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "universum_1_3_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, deepseq, doctest
+     , gauge, ghc-prim, Glob, hashable, hedgehog, microlens
+     , microlens-mtl, mtl, safe-exceptions, stm, tasty, tasty-hedgehog
+     , text, transformers, unordered-containers, utf8-string, vector
+     }:
+     mkDerivation {
+       pname = "universum";
+       version = "1.3.0";
+       sha256 = "17ggcbkfympmj0y99ycdvck2iliqscz4hp1wz6qgl0gmb3ywx0gp";
+       libraryHaskellDepends = [
+         base bytestring containers deepseq ghc-prim hashable microlens
+         microlens-mtl mtl safe-exceptions stm text transformers
+         unordered-containers utf8-string vector
+       ];
+       testHaskellDepends = [
+         base bytestring doctest Glob hedgehog tasty tasty-hedgehog text
+         utf8-string
+       ];
+       benchmarkHaskellDepends = [
+         base containers gauge unordered-containers
+       ];
+       description = "Custom prelude used in Serokell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "unix_2_7_2_2" = callPackage
     ({ mkDerivation, base, bytestring, time }:
      mkDerivation {
@@ -212101,12 +212850,12 @@ self: {
      }) {};
 
   "util-exception" = callPackage
-    ({ mkDerivation, base, lifted-base, monad-control, util }:
+    ({ mkDerivation, base, basic, control, lifted-base-tf, util }:
      mkDerivation {
        pname = "util-exception";
-       version = "0.1.0.0";
-       sha256 = "0y1d1y421sx8imibi235zc2f3cpjgg9pl6wkmigrxn4q4nwigkbr";
-       libraryHaskellDepends = [ base lifted-base monad-control util ];
+       version = "0.2.0.0";
+       sha256 = "0dx617saxbz8ij78kspm4j9zibf77d2hpjbci1c3ag7dhxagvjbx";
+       libraryHaskellDepends = [ base basic control lifted-base-tf util ];
        description = "Exceptional utilities";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -213096,6 +213845,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "vault-trans" = callPackage
+    ({ mkDerivation, aeson, base, containers, postgresql-simple, text
+     , transformers, unordered-containers, vault-tool
+     }:
+     mkDerivation {
+       pname = "vault-trans";
+       version = "0.1.0.1";
+       sha256 = "0vw66vgpwgnfihgjlngcjf2a288nbnbzb07zxisfxks0mj2vn4cc";
+       libraryHaskellDepends = [
+         aeson base containers postgresql-simple text transformers
+         unordered-containers vault-tool
+       ];
+       description = "A monad transformer for vault-tool";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "vaultaire-common" = callPackage
     ({ mkDerivation, async, attoparsec, base, blaze-builder, bytestring
      , cereal, containers, hashable, hslogger, hspec, locators, mtl
@@ -213388,8 +214153,8 @@ self: {
        pname = "vector-algorithms";
        version = "0.7.0.1";
        sha256 = "0w4hf598lpxfg58rnimcqxrbnpqq2jmpjx82qa5md3q6r90hlipd";
-       revision = "1";
-       editedCabalFile = "1996aj239vasr4hd5c0pi9i0bd08r6clzr76nqvf3hc5kjs7vml2";
+       revision = "2";
+       editedCabalFile = "186nxwg02m16v68gi186f0z99cafp4g87flhfccnzlrvshlfb83m";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring primitive vector ];
@@ -214073,24 +214838,6 @@ self: {
      }:
      mkDerivation {
        pname = "viewprof";
-       version = "0.0.0.21";
-       sha256 = "1zms53c7kym2ln0w5hdnnacch5g6m2clj4zp053w1v7g0qggglnq";
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         base brick containers directory ghc-prof lens scientific text
-         vector vector-algorithms vty
-       ];
-       description = "Text-based interactive GHC .prof viewer";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "viewprof_0_0_0_22" = callPackage
-    ({ mkDerivation, base, brick, containers, directory, ghc-prof, lens
-     , scientific, text, vector, vector-algorithms, vty
-     }:
-     mkDerivation {
-       pname = "viewprof";
        version = "0.0.0.22";
        sha256 = "07sa15nrwdjyzqmzvrdvl0nggdx5ca6w7qijhv7na9ivr0p2h495";
        isLibrary = false;
@@ -214101,7 +214848,6 @@ self: {
        ];
        description = "Text-based interactive GHC .prof viewer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "views" = callPackage
@@ -215221,6 +215967,37 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "wai-extra_3_0_24_1" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring
+     , bytestring, case-insensitive, containers, cookie
+     , data-default-class, deepseq, directory, fast-logger, hspec
+     , http-types, HUnit, iproute, lifted-base, network, old-locale
+     , resourcet, streaming-commons, stringsearch, text, time
+     , transformers, unix, unix-compat, vault, void, wai, wai-logger
+     , word8, zlib
+     }:
+     mkDerivation {
+       pname = "wai-extra";
+       version = "3.0.24.1";
+       sha256 = "0bb6837cgq4p9sn3mkaf6p9kf57k0mvkdjcc1vsnj87nvphls604";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson ansi-terminal base base64-bytestring bytestring
+         case-insensitive containers cookie data-default-class deepseq
+         directory fast-logger http-types iproute lifted-base network
+         old-locale resourcet streaming-commons stringsearch text time
+         transformers unix unix-compat vault void wai wai-logger word8 zlib
+       ];
+       testHaskellDepends = [
+         base bytestring case-insensitive cookie fast-logger hspec
+         http-types HUnit resourcet text time transformers wai zlib
+       ];
+       description = "Provides some basic WAI handlers and middleware";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wai-frontend-monadcgi" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, cgi
      , containers, http-types, transformers, wai
@@ -215969,8 +216746,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-middleware-prometheus";
-       version = "0.3.0";
-       sha256 = "04ymaaby1pk60gg3bnz1a3mz0r7bl4p41kksbn40nvj5ahz41i6f";
+       version = "1.0.0";
+       sha256 = "0c04cq7q3ck394d7n92mwm0k9qh2dmyn9bsf1n20yzrwrnr9fgkl";
        libraryHaskellDepends = [
          base bytestring clock data-default http-types prometheus-client
          text wai
@@ -218563,13 +219340,14 @@ self: {
   "winery" = callPackage
     ({ mkDerivation, aeson, base, binary, bytestring, cassava
      , containers, cpu, deepseq, directory, gauge, hashable, megaparsec
-     , mtl, prettyprinter, prettyprinter-ansi-terminal, scientific
-     , serialise, text, transformers, unordered-containers, vector
+     , mtl, prettyprinter, prettyprinter-ansi-terminal, QuickCheck
+     , scientific, serialise, text, transformers, unordered-containers
+     , vector
      }:
      mkDerivation {
        pname = "winery";
-       version = "0.2";
-       sha256 = "07bx9lc2l1kpf4a20gyygi2yb5kzfldf6fi69fwgi06qp1wc03vx";
+       version = "0.2.1";
+       sha256 = "09j7s44j5v6754g1v10yvmb7l9azn2p738x3c4p1iv6qlwghilbj";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -218584,8 +219362,8 @@ self: {
        ];
        testHaskellDepends = [
          aeson base bytestring containers cpu hashable megaparsec mtl
-         prettyprinter prettyprinter-ansi-terminal scientific text
-         transformers unordered-containers vector
+         prettyprinter prettyprinter-ansi-terminal QuickCheck scientific
+         text transformers unordered-containers vector
        ];
        benchmarkHaskellDepends = [
          aeson base binary bytestring cassava containers cpu deepseq
@@ -218664,8 +219442,8 @@ self: {
      }:
      mkDerivation {
        pname = "wiring";
-       version = "0.5.0";
-       sha256 = "1a01za9lg9ndyqgcdbx7zw3r4mi3v0qyyng4i7157xggbd6vyhn4";
+       version = "0.5.1";
+       sha256 = "1xzm68pydfbq5dmnap94hwmxk2sl44q15jvap3cqavlagcq7xqsl";
        libraryHaskellDepends = [ base mtl template-haskell transformers ];
        testHaskellDepends = [
          base hspec mtl QuickCheck template-haskell transformers
@@ -218844,6 +219622,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "wl-pprint-annotated_0_1_0_1" = callPackage
+    ({ mkDerivation, base, containers, deepseq, tasty, tasty-hunit
+     , text
+     }:
+     mkDerivation {
+       pname = "wl-pprint-annotated";
+       version = "0.1.0.1";
+       sha256 = "1br7qyf27iza213inwhf9bm2k6in0zbmfw6w4clqlc9f9cj2nrkb";
+       libraryHaskellDepends = [ base containers deepseq text ];
+       testHaskellDepends = [
+         base containers deepseq tasty tasty-hunit text
+       ];
+       description = "Pretty printer with annotation support";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wl-pprint-ansiterm" = callPackage
     ({ mkDerivation, ansi-terminal, base, bytestring, containers, mtl
      , nats, semigroups, text, transformers, wl-pprint-extras
@@ -218878,6 +219673,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "wl-pprint-console_0_1_0_2" = callPackage
+    ({ mkDerivation, base, bytestring, colorful-monoids, text
+     , wl-pprint-annotated
+     }:
+     mkDerivation {
+       pname = "wl-pprint-console";
+       version = "0.1.0.2";
+       sha256 = "05dq90zh2ywmaz0z9vr7114f4c6gacp7b7hlbl3sx31km92v8xnb";
+       libraryHaskellDepends = [
+         base bytestring colorful-monoids text wl-pprint-annotated
+       ];
+       description = "Wadler/Leijen pretty printer supporting colorful console output";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wl-pprint-extras" = callPackage
     ({ mkDerivation, base, containers, HUnit, nats, semigroupoids
      , semigroups, test-framework, test-framework-hunit, text
@@ -219754,6 +220565,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "writer-cps-mtl_0_1_1_5" = callPackage
+    ({ mkDerivation, base, mtl, transformers, writer-cps-transformers
+     }:
+     mkDerivation {
+       pname = "writer-cps-mtl";
+       version = "0.1.1.5";
+       sha256 = "09snvqwwhp39vmiiz3jpnfyjfhvpcj8ykbnhmii0yclxxsjgamqm";
+       libraryHaskellDepends = [
+         base mtl transformers writer-cps-transformers
+       ];
+       description = "MonadWriter orphan instances for writer-cps-transformers";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "writer-cps-transformers" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
@@ -219765,6 +220591,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "writer-cps-transformers_0_1_1_4" = callPackage
+    ({ mkDerivation, base, transformers }:
+     mkDerivation {
+       pname = "writer-cps-transformers";
+       version = "0.1.1.4";
+       sha256 = "1zc5048spzf52gvski34ffvapw5s5yfdj7znv29yr71r4178pw6n";
+       libraryHaskellDepends = [ base transformers ];
+       description = "WriteT and RWST monad transformers";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wryte" = callPackage
     ({ mkDerivation, base, mtl, text }:
      mkDerivation {
@@ -221670,6 +222508,8 @@ self: {
        pname = "xmlhtml";
        version = "0.2.5.2";
        sha256 = "1p2v1cj9jjwbqyb0fyv2201zd7ljz5d46qg5kwy7rz2bchbqd0b4";
+       revision = "1";
+       editedCabalFile = "15lvbvdcagnqr62wfs3zz9xlcv553jr4ixbl50fsaxhkvlnymk45";
        libraryHaskellDepends = [
          base blaze-builder blaze-html blaze-markup bytestring
          bytestring-builder containers parsec text unordered-containers
@@ -221787,6 +222627,8 @@ self: {
        pname = "xmonad";
        version = "0.14";
        sha256 = "0lq3k0ap7jxrrswpd954mqa6h8diccbif5srcgbmr39y6y8x0mm4";
+       revision = "1";
+       editedCabalFile = "0jkqbbm8allsaa412h8kdb6v64qcwqnpr2p6qxy21zy0jqdkhkp5";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -225348,22 +226190,6 @@ self: {
      }) {};
 
   "yesod-websockets" = callPackage
-    ({ mkDerivation, base, conduit, mtl, transformers, unliftio, wai
-     , wai-websockets, websockets, yesod-core
-     }:
-     mkDerivation {
-       pname = "yesod-websockets";
-       version = "0.3.0";
-       sha256 = "0ip4fjjxhz79fj1gm0wl23jkkb64hqn9rwn0vaqy69wy4212jr2a";
-       libraryHaskellDepends = [
-         base conduit mtl transformers unliftio wai wai-websockets
-         websockets yesod-core
-       ];
-       description = "WebSockets support for Yesod";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "yesod-websockets_0_3_0_1" = callPackage
     ({ mkDerivation, base, conduit, mtl, transformers, unliftio
      , wai-websockets, websockets, yesod-core
      }:
@@ -225377,7 +226203,6 @@ self: {
        ];
        description = "WebSockets support for Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-websockets-extra" = callPackage
diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix
index 40a70623dcb..765487fc650 100644
--- a/pkgs/development/interpreters/perl/default.nix
+++ b/pkgs/development/interpreters/perl/default.nix
@@ -152,6 +152,7 @@ let
     meta = {
       homepage = https://www.perl.org/;
       description = "The standard implementation of the Perl 5 programmming language";
+      license = licenses.artistic1;
       maintainers = [ maintainers.eelco ];
       platforms = platforms.all;
     };
diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix
index 952f7435c06..8e89aeb21a2 100644
--- a/pkgs/development/libraries/arrow-cpp/default.nix
+++ b/pkgs/development/libraries/arrow-cpp/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "arrow-cpp-${version}";
-  version = "0.9.0";
+  version = "0.10.0";
 
   src = fetchurl {
     url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz";
-    sha256 = "16l91fixb5dgx3v6xc73ipn1w1hjgbmijyvs81j7ywzpna2cdcdy";
+    sha256 = "0bc4krapz1kzdm16npzmgdz7zvg9lip6rnqbwph8vfn7zji0fcll";
   };
 
   sourceRoot = "apache-arrow-${version}/cpp";
diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix
index 5f99f35a159..bf7630608f7 100644
--- a/pkgs/development/libraries/fflas-ffpack/default.nix
+++ b/pkgs/development/libraries/fflas-ffpack/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, givaro, pkgconfig, openblas
+{ stdenv, fetchFromGitHub, autoreconfHook, givaro, pkgconfig, blas
 , gmpxx
 , optimize ? false # impure
 }:
@@ -6,23 +6,30 @@ stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "fflas-ffpack";
   version = "2.3.2";
+
   src = fetchFromGitHub {
     owner = "linbox-team";
     repo = "${pname}";
     rev = "v${version}";
     sha256 = "1cqhassj2dny3gx0iywvmnpq8ca0d6m82xl5rz4mb8gaxr2kwddl";
   };
+
   checkInputs = [
     gmpxx
   ];
+
+  enableParallelBuilding = true;
+
   nativeBuildInputs = [
     autoreconfHook
     pkgconfig
   ] ++ stdenv.lib.optionals doCheck checkInputs;
-  buildInputs = [ givaro openblas];
+
+  buildInputs = [ givaro blas ];
+
   configureFlags = [
-    "--with-blas-libs=-lopenblas"
-    "--with-lapack-libs=-lopenblas"
+    "--with-blas-libs=-l${blas.linkName}"
+    "--with-lapack-libs=-l${blas.linkName}"
   ] ++ stdenv.lib.optionals (!optimize) [
     # disable SIMD instructions (which are enabled *when available* by default)
     "--disable-sse"
@@ -36,13 +43,15 @@ stdenv.mkDerivation rec {
     "--disable-fma"
     "--disable-fma4"
   ];
+
   doCheck = true;
+
   meta = {
     inherit version;
     description = ''Finite Field Linear Algebra Subroutines'';
     license = stdenv.lib.licenses.lgpl21Plus;
     maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
     homepage = https://linbox-team.github.io/fflas-ffpack/;
   };
 }
diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix
index 22e48c8ba7a..27052d1922f 100644
--- a/pkgs/development/libraries/gtk+/3.x.nix
+++ b/pkgs/development/libraries/gtk+/3.x.nix
@@ -38,10 +38,11 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [ libxkbcommon epoxy json-glib ]
-    ++ optionals stdenv.isDarwin [ AppKit Cocoa ];
+    ++ optional stdenv.isDarwin AppKit;
   propagatedBuildInputs = with xorg; with stdenv.lib;
     [ expat glib cairo pango gdk_pixbuf atk at-spi2-atk gnome3.gsettings-desktop-schemas
       libXrandr libXrender libXcomposite libXi libXcursor libSM libICE ]
+    ++ optional stdenv.isDarwin Cocoa  # explicitly propagated, always needed
     ++ optionals waylandSupport [ mesa_noglu wayland wayland-protocols ]
     ++ optional xineramaSupport libXinerama
     ++ optional cupsSupport cups;
diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix
index 91d2851df2b..e30f2b0af5d 100644
--- a/pkgs/development/libraries/libressl/default.nix
+++ b/pkgs/development/libraries/libressl/default.nix
@@ -27,6 +27,7 @@ let
     meta = with lib; {
       description = "Free TLS/SSL implementation";
       homepage    = "https://www.libressl.org";
+      license = with licenses; [ publicDomain bsdOriginal bsd0 bsd3 gpl3 isc ];
       platforms   = platforms.all;
       maintainers = with maintainers; [ thoughtpolice wkennington fpletz globin ];
     };
diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix
index a005c8b3746..e588944490b 100644
--- a/pkgs/development/libraries/libtoxcore/default.nix
+++ b/pkgs/development/libraries/libtoxcore/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, libsodium, ncurses, libopus, libmsgpack
+{ stdenv, fetchFromGitHub, cmake, libsodium, ncurses, libopus, msgpack
 , libvpx, check, libconfig, pkgconfig }:
 
 let
@@ -20,7 +20,7 @@ let
     ];
 
     buildInputs = [
-      libsodium libmsgpack ncurses libconfig
+      libsodium msgpack ncurses libconfig
     ] ++ stdenv.lib.optionals (!stdenv.isAarch32) [
       libopus libvpx
     ];
diff --git a/pkgs/development/libraries/lmdbxx/default.nix b/pkgs/development/libraries/lmdbxx/default.nix
new file mode 100644
index 00000000000..34dfe26ad70
--- /dev/null
+++ b/pkgs/development/libraries/lmdbxx/default.nix
@@ -0,0 +1,26 @@
+{ stdenv
+, fetchFromGitHub
+, lmdb }:
+
+stdenv.mkDerivation rec {
+  name = "lmdbxx-${version}";
+  version = "0.9.14.0";
+
+  src = fetchFromGitHub {
+    owner = "bendiken";
+    repo = "lmdbxx";
+    rev = "${version}";
+    sha256 = "1jmb9wg2iqag6ps3z71bh72ymbcjrb6clwlkgrqf1sy80qwvlsn6";
+  };
+
+  buildInputs = [ lmdb ];
+  makeFlags = [ "PREFIX=$(out)" ];
+
+  meta = {
+    homepage = "https://github.com/bendiken/lmdbxx#readme";
+    description = "C++11 wrapper for the LMDB embedded B+ tree database library";
+    license = stdenv.lib.licenses.unlicense;
+    maintainers = with stdenv.lib.maintainers; [ fgaz ];
+  };
+}
+
diff --git a/pkgs/development/libraries/libmsgpack/default.nix b/pkgs/development/libraries/msgpack/default.nix
index bf51f895402..bf51f895402 100644
--- a/pkgs/development/libraries/libmsgpack/default.nix
+++ b/pkgs/development/libraries/msgpack/default.nix
diff --git a/pkgs/development/libraries/libmsgpack/generic.nix b/pkgs/development/libraries/msgpack/generic.nix
index 947960d2359..67418b6666d 100644
--- a/pkgs/development/libraries/libmsgpack/generic.nix
+++ b/pkgs/development/libraries/msgpack/generic.nix
@@ -5,7 +5,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "libmsgpack-${version}";
+  name = "msgpack-${version}";
 
   inherit src patches;
 
diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index 5387272a2f0..fd9730cc218 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -108,9 +108,10 @@ in stdenv.mkDerivation rec {
     rm -f "$out"/lib/*.a
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://developer.mozilla.org/en-US/docs/NSS;
     description = "A set of libraries for development of security-enabled client and server applications";
-    platforms = stdenv.lib.platforms.all;
+    license = licenses.mpl20;
+    platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/ntl/default.nix b/pkgs/development/libraries/ntl/default.nix
index ad153c862af..63a51a90ccd 100644
--- a/pkgs/development/libraries/ntl/default.nix
+++ b/pkgs/development/libraries/ntl/default.nix
@@ -21,10 +21,6 @@ stdenv.mkDerivation rec {
     sha256 = "1pcib3vz1sdqlk0n561wbf7fwq44jm5cpx710w4vqljxgrjd7q1s";
   };
 
-  patchPhase = stdenv.lib.optionalString stdenv.isDarwin ''
-    substituteInPlace DoConfig --replace g++ c++
-  '';
-
   buildInputs = [
     gmp
   ];
@@ -52,6 +48,7 @@ stdenv.mkDerivation rec {
       else
         "generic" # "chooses options that should be OK for most platforms"
     }"
+    "CXX=c++"
   ] ++ lib.optionals withGf2x [
     "NTL_GF2X_LIB=on"
     "GF2X_PREFIX=${gf2x}"
diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix
index 2bb82efb24c..bd7d252e1a0 100644
--- a/pkgs/development/libraries/opendht/default.nix
+++ b/pkgs/development/libraries/opendht/default.nix
@@ -6,7 +6,7 @@
 , pkgconfig
 , nettle
 , gnutls
-, libmsgpack
+, msgpack
 , readline
 , libargon2
 }:
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     pkgconfig
     nettle
     gnutls
-    libmsgpack
+    msgpack
     readline
     libargon2
   ];
diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix
index 9ed555053e2..16e00e9f2b9 100644
--- a/pkgs/development/libraries/openldap/default.nix
+++ b/pkgs/development/libraries/openldap/default.nix
@@ -51,6 +51,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage    = http://www.openldap.org/;
     description = "An open source implementation of the Lightweight Directory Access Protocol";
+    license = licenses.openldap;
     maintainers = with maintainers; [ lovek323 ];
     platforms   = platforms.unix;
   };
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index b09809f8924..c36f141d421 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -107,11 +107,12 @@ let
       fi
     '';
 
-    meta = {
+    meta = with stdenv.lib; {
       homepage = https://www.openssl.org/;
       description = "A cryptographic library that implements the SSL and TLS protocols";
-      platforms = stdenv.lib.platforms.all;
-      maintainers = [ stdenv.lib.maintainers.peti ];
+      license = licenses.openssl;
+      platforms = platforms.all;
+      maintainers = [ maintainers.peti ];
       priority = 10; # resolves collision with ‘man-pages’
     };
   };
diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix
index 82927664b4c..6675bbf9183 100644
--- a/pkgs/development/libraries/polkit/default.nix
+++ b/pkgs/development/libraries/polkit/default.nix
@@ -83,6 +83,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = http://www.freedesktop.org/wiki/Software/polkit;
     description = "A toolkit for defining and handling the policy that allows unprivileged processes to speak to privileged processes";
+    license = licenses.gpl2;
     platforms = platforms.unix;
     maintainers = [ ];
   };
diff --git a/pkgs/development/libraries/science/math/blas/default.nix b/pkgs/development/libraries/science/math/blas/default.nix
index 9955af04659..286be260052 100644
--- a/pkgs/development/libraries/science/math/blas/default.nix
+++ b/pkgs/development/libraries/science/math/blas/default.nix
@@ -59,4 +59,10 @@ stdenv.mkDerivation rec {
     homepage = http://www.netlib.org/blas/;
     platforms = stdenv.lib.platforms.unix;
   };
+
+  # We use linkName to pass a different name to --with-blas-libs for
+  # fflas-ffpack and linbox, because we use blas on darwin but openblas
+  # elsewhere.
+  # See see https://github.com/NixOS/nixpkgs/pull/45013.
+  passthru.linkName = "blas";
 }
diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index e00a5ca9f8d..18483f9e327 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -143,4 +143,10 @@ stdenv.mkDerivation rec {
     platforms = platforms.unix;
     maintainers = with maintainers; [ ttuegel ];
   };
+
+  # We use linkName to pass a different name to --with-blas-libs for
+  # fflas-ffpack and linbox, because we use blas on darwin but openblas
+  # elsewhere.
+  # See see https://github.com/NixOS/nixpkgs/pull/45013.
+  passthru.linkName = "openblas";
 }
diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix
index 1e1ee8bc797..eb9be9ed18c 100644
--- a/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/pkgs/development/ruby-modules/gem-config/default.nix
@@ -21,7 +21,7 @@
 , libiconv, postgresql, v8_3_16_14, clang, sqlite, zlib, imagemagick
 , pkgconfig , ncurses, xapian_1_2_22, gpgme, utillinux, fetchpatch, tzdata, icu, libffi
 , cmake, libssh2, openssl, mysql, darwin, git, perl, pcre, gecode_3, curl
-, libmsgpack, qt48, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem
+, msgpack, qt48, libsodium, snappy, libossp_uuid, lxc, libpcap, xorg, gtk2, buildRubyGem
 , cairo, re2, rake, gobjectIntrospection, gdk_pixbuf, zeromq, graphicsmagick, libcxx
 }@args:
 
@@ -219,7 +219,7 @@ in
   };
 
   msgpack = attrs: {
-    buildInputs = [ libmsgpack ];
+    buildInputs = [ msgpack ];
   };
 
   mysql = attrs: {
diff --git a/pkgs/development/tools/lattice-diamond/default.nix b/pkgs/development/tools/lattice-diamond/default.nix
new file mode 100644
index 00000000000..1691f09e6e4
--- /dev/null
+++ b/pkgs/development/tools/lattice-diamond/default.nix
@@ -0,0 +1,115 @@
+{ stdenv, rpmextract, patchelf, makeWrapper, file, requireFile, glib, zlib, 
+    freetype, fontconfig, xorg }:
+
+stdenv.mkDerivation rec {
+  name = "diamond-3.10";
+
+  nativeBuildInputs = [ rpmextract patchelf makeWrapper file ];
+
+  src = requireFile {
+    name = "diamond_3_10-base_x64-111-2-x86_64-linux.rpm";
+    url = "http://www.latticesemi.com/view_document?document_id=52180";
+    sha256 = "ec0b370cf8bd55831eeed7c5eadcabacbd6e63ac657c20209d672119a07a5c0f";
+  };
+
+  buildCommand = ''
+    origprefix=usr/local/diamond/3.10_x64
+    prefix=diamond
+    
+    echo "Unpacking $src..."
+    rpmextract $src
+    
+    # Move $pwd/usr/local/diamond/VERS to $out/diamond, cd.
+    mkdir -p $out/$prefix
+    rmdir $out/$prefix
+    mv $origprefix $out/$prefix
+    
+    cd $out
+    
+    # Extract all tarballs.
+    for tb in \
+        cae_library/cae_library.tar.gz \
+        embedded_source/embedded_source.tar.gz \
+        ispfpga/ispfpga.tar.gz \
+        synpbase/synpbase.tar.gz \
+        tcltk/tcltk.tar.gz \
+        bin/bin.tar.gz \
+        examples/examples.tar.gz \
+        data/data.tar.gz ; do
+    
+        echo "Extracting tarball $prefix/$tb"
+        cd $out/$prefix/$(dirname $tb)
+        tar xf $(basename $tb)
+        rm $(basename $tb)
+    done
+    
+    # Patch shebangs in start scripts .
+    cd $out/$prefix/bin/lin64
+    for tool in \
+        programmer \
+        pgrcmd \
+        diamond_env \
+        powercal \
+        model300 \
+        update \
+        diamond \
+        debugger \
+        ddtcmd \
+        cableserver \
+        revealrva \
+        ipexpress \
+        fileutility \
+        diamond ; do
+        
+        echo "Patching script $prefix/bin/lin64/$tool..."
+        patchShebangs $tool
+    done
+    
+    # Patch executable ELFs.
+    for path in bin/lin64 ispfpga/bin/lin64; do
+        cd $out/$prefix/$path
+        for f in *; do
+            if ! file $f | grep -q "ELF 64-bit LSB executable" ; then
+                continue
+            fi
+            echo "Patching ELF $prefix/$path/$f..."
+            # We force RPATH otherwise libraries from LD_LIBRARY_PATH (which the
+            # tools mangle by themselves) will not be able to find their
+            # dependencies from nix.
+            patchelf \
+                --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+                --set-rpath "$libPath" --force-rpath \
+                $f
+        done
+    done
+    
+    # Remove 32-bit libz.
+    rm $out/$prefix/bin/lin64/libz.{so,so.1}
+    
+    # Make wrappers (should these target more than the 'diamond' tool?).
+    # The purpose of these is just to call the target program using its
+    # absolute path - otherwise, it will crash.
+    mkdir -p bin
+    for tool in diamond ; do
+        makeWrapper $out/$prefix/bin/lin64/$tool $out/bin/$tool
+    done
+  '';
+
+  libPath = stdenv.lib.makeLibraryPath [
+    glib zlib freetype fontconfig
+    xorg.libSM xorg.libICE xorg.libXrender xorg.libXext xorg.libX11 xorg.libXt
+  ];
+
+  meta = {
+    description = "Vendor development tools for Lattice FPGA devices";
+    longDescription = ''
+      Lattice Diamond software is the leading-edge software design environment
+      for cost- sensitive, low-power Lattice FPGA architectures. It is the
+      next-generation replacement for ispLEVER.
+    '';
+    homepage = "http://www.latticesemi.com/latticediamond";
+    license = stdenv.lib.licenses.unfree;
+    maintainers = with stdenv.lib.maintainers; [ q3k ];
+    platforms = [ "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/development/tools/puppet/puppet-lint/Gemfile b/pkgs/development/tools/puppet/puppet-lint/Gemfile
new file mode 100644
index 00000000000..10504981912
--- /dev/null
+++ b/pkgs/development/tools/puppet/puppet-lint/Gemfile
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+gem "puppet-lint"
diff --git a/pkgs/development/tools/puppet/puppet-lint/Gemfile.lock b/pkgs/development/tools/puppet/puppet-lint/Gemfile.lock
new file mode 100644
index 00000000000..8c5d369fb37
--- /dev/null
+++ b/pkgs/development/tools/puppet/puppet-lint/Gemfile.lock
@@ -0,0 +1,13 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    puppet-lint (2.3.6)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  puppet-lint
+
+BUNDLED WITH
+   1.16.3
diff --git a/pkgs/development/tools/puppet/puppet-lint/default.nix b/pkgs/development/tools/puppet/puppet-lint/default.nix
new file mode 100644
index 00000000000..2940605b1b0
--- /dev/null
+++ b/pkgs/development/tools/puppet/puppet-lint/default.nix
@@ -0,0 +1,7 @@
+{ bundlerApp }:
+
+bundlerApp {
+  pname = "puppet-lint";
+  gemdir = ./.;
+  exes = [ "puppet-lint" ];
+}
diff --git a/pkgs/development/tools/puppet/puppet-lint/gemset.nix b/pkgs/development/tools/puppet/puppet-lint/gemset.nix
new file mode 100644
index 00000000000..86d18b0c554
--- /dev/null
+++ b/pkgs/development/tools/puppet/puppet-lint/gemset.nix
@@ -0,0 +1,10 @@
+{
+  puppet-lint = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1wyk2l440d96ps3x127r52n51kqpqi2nzb3xlg92qn6aksqhnkis";
+      type = "gem";
+    };
+    version = "2.3.6";
+  };
+}
\ No newline at end of file
diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index b3dfed3d265..5944dfc991d 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -192,11 +192,11 @@ self = rec {
   };
 
   vim-nix = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-nix-2018-07-01";
+    name = "vim-nix-2018-08-19";
     src = fetchgit {
       url = "https://github.com/LnL7/vim-nix";
-      rev = "7d71026ba7c2d0a4bdb915e884c4ac8dbdc45bf0";
-      sha256 = "084vs1p0qpkc4cx049v3mkyylj1n1yvd45i1sc9qafgp4x5va457";
+      rev = "ab3c4d52d08e9e8d2a0919e38f98ba25a2b8ad18";
+      sha256 = "1waan5vgba8qx3107hdrnmbnq5kr1n49q43p7m2g7wmj81v050yb";
     };
     dependencies = [];
 
@@ -1029,6 +1029,17 @@ self = rec {
 
   };
 
+  vim-lastplace = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-lastplace-2017-06-13";
+    src = fetchgit {
+      url = "https://github.com/farmergreg/vim-lastplace";
+      rev = "102b68348eff0d639ce88c5094dab0fdbe4f7c55";
+      sha256 = "1d0mjjyissjvl80wgmn7z1gsjs3fhk0vnmx84l9q7g04ql4l9pja";
+    };
+    dependencies = [];
+
+  };
+
   vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-go-2018-07-22";
     src = fetchgit {
@@ -2085,6 +2096,17 @@ self = rec {
 
   };
 
+  vim-qml = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-qml-2018-07-22";
+    src = fetchgit {
+      url = "https://github.com/peterhoeg/vim-qml";
+      rev = "8af43da6950ce5483704bb97f5b24471d8ffda1a";
+      sha256 = "1y1xvbfr1ffxyyk3zzf50xn87a85i1zszj4fqlq5ka8zhgdrnhvc";
+    };
+    dependencies = [];
+
+  };
+
   vim-markdown = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-markdown-2018-06-05";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 4d0e85e153c..32a9a621601 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -50,6 +50,7 @@
 "github:ensime/ensime-vim"
 "github:ervandew/supertab"
 "github:esneider/YUNOcommit.vim"
+"github:farmergreg/vim-lastplace"
 "github:fatih/vim-go"
 "github:FelikZ/ctrlp-py-matcher"
 "github:fisadev/vim-isort"
@@ -168,6 +169,7 @@
 "github:osyo-manga/vim-textobj-multiblock"
 "github:osyo-manga/vim-watchdogs"
 "github:pangloss/vim-javascript"
+"github:peterhoeg/vim-qml"
 "github:plasticboy/vim-markdown"
 "github:python-mode/python-mode"
 "github:Quramy/tsuquyomi"
diff --git a/pkgs/os-specific/linux/lsscsi/default.nix b/pkgs/os-specific/linux/lsscsi/default.nix
index 96b84c00a5f..aba907039ac 100644
--- a/pkgs/os-specific/linux/lsscsi/default.nix
+++ b/pkgs/os-specific/linux/lsscsi/default.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation {
     substituteInPlace Makefile.in --replace /usr "$out"
   '';
 
-  meta = {
-    platforms = stdenv.lib.platforms.linux;
+  meta = with stdenv.lib; {
+    license = licenses.gpl2;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix
index a24024112c9..096eefe8a68 100644
--- a/pkgs/os-specific/linux/lvm2/default.nix
+++ b/pkgs/os-specific/linux/lvm2/default.nix
@@ -78,11 +78,12 @@ stdenv.mkDerivation {
       cp scripts/lvm2_activation_generator_systemd_red_hat $out/lib/systemd/system-generators
     '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://sourceware.org/lvm2/;
     description = "Tools to support Logical Volume Management (LVM) on Linux";
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [raskin];
+    platforms = platforms.linux;
+    license = with licenses; [ gpl2 bsd2 lgpl21 ];
+    maintainers = with maintainers; [raskin];
     inherit version;
     downloadPage = "ftp://sources.redhat.com/pub/lvm2/";
   };
diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix
index e5ee5e20294..642653259c3 100644
--- a/pkgs/os-specific/linux/mcelog/default.nix
+++ b/pkgs/os-specific/linux/mcelog/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "mcelog-${version}";
-  version = "159";
+  version = "160";
 
   src = fetchFromGitHub {
     owner  = "andikleen";
     repo   = "mcelog";
     rev    = "v${version}";
-    sha256 = "1w8y4igxi48r2d9s6g9fm1bgmsga94gfz6x0xaln6rhvbgi318xg";
+    sha256 = "1m985wvdykl3003967lp1i7707qhwdj3h13cl8g1afjaip9ccd48";
   };
 
   postPatch = ''
diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix
index b6fdae75bac..6de666630bb 100644
--- a/pkgs/os-specific/linux/mdadm/default.nix
+++ b/pkgs/os-specific/linux/mdadm/default.nix
@@ -44,9 +44,10 @@ stdenv.mkDerivation rec {
         -e 's@/usr/sbin/sendmail@${sendmail-script}@' -i Makefile
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Programs for managing RAID arrays under Linux";
     homepage = http://neil.brown.name/blog/mdadm;
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/os-specific/linux/mingetty/default.nix b/pkgs/os-specific/linux/mingetty/default.nix
index d3654445332..a29a0373424 100644
--- a/pkgs/os-specific/linux/mingetty/default.nix
+++ b/pkgs/os-specific/linux/mingetty/default.nix
@@ -13,8 +13,9 @@ stdenv.mkDerivation {
     makeFlagsArray=(SBINDIR=$out/sbin MANDIR=$out/share/man/man8)
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://sourceforge.net/projects/mingetty;
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/os-specific/linux/nss_ldap/default.nix b/pkgs/os-specific/linux/nss_ldap/default.nix
index 70cbae88d69..ef0bdc4f126 100644
--- a/pkgs/os-specific/linux/nss_ldap/default.nix
+++ b/pkgs/os-specific/linux/nss_ldap/default.nix
@@ -1,8 +1,8 @@
 {stdenv, fetchurl, openldap, perl}:
-   
+
 stdenv.mkDerivation {
   name = "nss_ldap-265";
-   
+
   src = fetchurl {
     url = http://www.padl.com/download/nss_ldap-265.tar.gz;
     sha256 = "1a16q9p97d2blrj0h6vl1xr7dg7i4s8x8namipr79mshby84vdbp";
@@ -29,7 +29,9 @@ stdenv.mkDerivation {
 
   buildInputs = [ openldap perl ];
 
-  meta = {
-    platforms = stdenv.lib.platforms.linux;
+  meta = with stdenv.lib; {
+    description = "LDAP module for the Solaris Nameservice Switch (NSS)";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix
index 25ba60b58ee..885ea3421f6 100644
--- a/pkgs/os-specific/linux/shadow/default.nix
+++ b/pkgs/os-specific/linux/shadow/default.nix
@@ -81,10 +81,11 @@ stdenv.mkDerivation rec {
       mv $out/bin/su $su/bin
     '';
 
-  meta = {
-    homepage = http://pkg-shadow.alioth.debian.org/;
+  meta = with stdenv.lib; {
+    homepage = https://github.com/shadow-maint;
     description = "Suite containing authentication-related tools such as passwd and su";
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.bsd3;
+    platforms = platforms.linux;
   };
 
   passthru = {
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 015aabbacfe..912ba5b5e0e 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -198,10 +198,11 @@ in stdenv.mkDerivation rec {
   # runtime; otherwise we can't and we need to reboot.
   passthru.interfaceVersion = 2;
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://www.freedesktop.org/wiki/Software/systemd;
     description = "A system and service manager for Linux";
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.eelco ];
+    license = licenses.lgpl21Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.eelco ];
   };
 }
diff --git a/pkgs/servers/hydron/default.nix b/pkgs/servers/hydron/default.nix
index 400f15565ef..03fdf7908cc 100644
--- a/pkgs/servers/hydron/default.nix
+++ b/pkgs/servers/hydron/default.nix
@@ -3,15 +3,15 @@
 
 buildGoPackage rec {
   name = "hydron-unstable-${version}";
-  version = "2018-08-15";
+  version = "2018-08-18";
   goPackagePath = "github.com/bakape/hydron";
   goDeps = ./deps.nix;
 
   src = fetchFromGitHub {
     owner = "bakape";
     repo = "hydron";
-    rev = "4c219dc016f18e11a50e52485cbeb28135921386";
-    sha256 = "0xj705wdyajzli66p0cxvl47gx6z7nx9cbzm7lbbqn51qxw71p64";
+    rev = "78257f1c1f34cdad1931531601163071f7f29aa9";
+    sha256 = "0rpvbayx48xncy70vzbxn3cs0lslza0i3hxmywlngyl17da97bf0";
   };
 
   enableParallelBuilding = true;
diff --git a/pkgs/servers/hydron/deps.nix b/pkgs/servers/hydron/deps.nix
index 9b0890d36f4..c5d584f1bcd 100644
--- a/pkgs/servers/hydron/deps.nix
+++ b/pkgs/servers/hydron/deps.nix
@@ -104,8 +104,8 @@
     fetch = {
       type = "git";
       url = "https://go.googlesource.com/net";
-      rev = "c39426892332e1bb5ec0a434a079bf82f5d30c54";
-      sha256 = "1w26avkg623xilnwnad0cq6768cfbs4mxk875382xh0da6ai50s3";
+      rev = "aaf60122140d3fcf75376d319f0554393160eb50";
+      sha256 = "03i6ij7jcf5mp9dc8ps8b63g1k843z7c823qyzn5a276gpxvxlvv";
     };
   }
 ]
diff --git a/pkgs/servers/memcached/default.nix b/pkgs/servers/memcached/default.nix
index a9d8714476c..9790df9ce76 100644
--- a/pkgs/servers/memcached/default.nix
+++ b/pkgs/servers/memcached/default.nix
@@ -1,12 +1,12 @@
 {stdenv, fetchurl, cyrus_sasl, libevent}:
 
 stdenv.mkDerivation rec {
-  version = "1.5.9";
+  version = "1.5.10";
   name = "memcached-${version}";
 
   src = fetchurl {
     url = "https://memcached.org/files/${name}.tar.gz";
-    sha256 = "01hx4hs8lgmjzpqj1iv5fpdwv1ymrii6bp4nh1s0mjvipxymgwsa";
+    sha256 = "0jqw3z0408yx0lzc6ykn4d29n02dk31kqnmq9b3ldmcnpl6hck29";
   };
 
   buildInputs = [cyrus_sasl libevent];
diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix
index a609476c41a..439acd927e3 100644
--- a/pkgs/servers/search/groonga/default.nix
+++ b/pkgs/servers/search/groonga/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, mecab, kytea, libedit, pkgconfig
-, suggestSupport ? false, zeromq, libevent, libmsgpack
+, suggestSupport ? false, zeromq, libevent, msgpack
 , lz4Support  ? false, lz4
 , zlibSupport ? false, zlib
 }:
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
      [ pkgconfig mecab kytea libedit ]
     ++ optional lz4Support lz4
     ++ optional zlibSupport zlib
-    ++ optionals suggestSupport [ zeromq libevent libmsgpack ];
+    ++ optionals suggestSupport [ zeromq libevent msgpack ];
 
   configureFlags = with stdenv.lib;
        optional zlibSupport "--with-zlib"
diff --git a/pkgs/servers/sql/postgresql/pgroonga/default.nix b/pkgs/servers/sql/postgresql/pgroonga/default.nix
index a27f0ef0824..c8ef00b279e 100644
--- a/pkgs/servers/sql/postgresql/pgroonga/default.nix
+++ b/pkgs/servers/sql/postgresql/pgroonga/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, postgresql, libmsgpack, groonga }:
+{ stdenv, fetchurl, pkgconfig, postgresql, msgpack, groonga }:
 
 stdenv.mkDerivation rec {
   name = "pgroonga-${version}";
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ postgresql libmsgpack groonga ];
+  buildInputs = [ postgresql msgpack groonga ];
 
   makeFlags = [ "HAVE_MSGPACK=1" ];
 
diff --git a/pkgs/tools/misc/tmate/default.nix b/pkgs/tools/misc/tmate/default.nix
index de6c1612396..f5e1d69a039 100644
--- a/pkgs/tools/misc/tmate/default.nix
+++ b/pkgs/tools/misc/tmate/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, autoreconfHook, cmake, libtool, pkgconfig
-, zlib, openssl, libevent, ncurses, ruby, libmsgpack, libssh }:
+, zlib, openssl, libevent, ncurses, ruby, msgpack, libssh }:
 
 stdenv.mkDerivation rec {
   name = "tmate-${version}";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   dontUseCmakeConfigure = true;
 
-  buildInputs = [ libtool zlib openssl libevent ncurses ruby libmsgpack libssh ];
+  buildInputs = [ libtool zlib openssl libevent ncurses ruby msgpack libssh ];
   nativeBuildInputs = [ autoreconfHook cmake pkgconfig ];
   enableParallelBuilding = true;
 
diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix
index 467b17e468a..19a90e2c13c 100644
--- a/pkgs/tools/networking/ntp/default.nix
+++ b/pkgs/tools/networking/ntp/default.nix
@@ -41,6 +41,10 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = http://www.ntp.org/;
     description = "An implementation of the Network Time Protocol";
+    license = {
+      # very close to isc and bsd2
+      url = https://www.eecis.udel.edu/~mills/ntp/html/copyright.html;
+    };
     maintainers = [ maintainers.eelco ];
     platforms = platforms.linux;
   };
diff --git a/pkgs/tools/networking/ppp/default.nix b/pkgs/tools/networking/ppp/default.nix
index 96016ee7b4f..cea8a3f133f 100644
--- a/pkgs/tools/networking/ppp/default.nix
+++ b/pkgs/tools/networking/ppp/default.nix
@@ -55,10 +55,11 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://ppp.samba.org/;
     description = "Point-to-point implementation for Linux and Solaris";
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.falsifian ];
+    license = with licenses; [ bsdOriginal publicDomain gpl2 lgpl2 ];
+    platforms = platforms.linux;
+    maintainers = [ maintainers.falsifian ];
   };
 }
diff --git a/pkgs/tools/networking/pptp/default.nix b/pkgs/tools/networking/pptp/default.nix
index d8a633f0332..03270ce8788 100644
--- a/pkgs/tools/networking/pptp/default.nix
+++ b/pkgs/tools/networking/pptp/default.nix
@@ -22,10 +22,10 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ perl which ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "PPTP client for Linux";
     homepage = http://pptpclient.sourceforge.net/;
-    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ ];
+    license = licenses.gpl2;
+    platforms = platforms.linux;
   };
 }
diff --git a/pkgs/tools/security/lynis/default.nix b/pkgs/tools/security/lynis/default.nix
index 4b25e944510..bb7a6a0e772 100644
--- a/pkgs/tools/security/lynis/default.nix
+++ b/pkgs/tools/security/lynis/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   pname = "lynis";
-  version = "2.6.6";
+  version = "2.6.7";
   name = "${pname}-${version}";
 
   src = fetchFromGitHub {
     owner = "CISOfy";
     repo = "${pname}";
     rev = "${version}";
-    sha256 = "02d8nwy78gy07c32c7dk3sl93h1z0gav0h4j7xp85m6xj852lb5a";
+    sha256 = "0ayil5bzxqaksmr79x0gxy60k8djzg0bs60jfg8qi6128q6srhar";
   };
 
   nativeBuildInputs = [ makeWrapper perl ];
diff --git a/pkgs/tools/security/mktemp/default.nix b/pkgs/tools/security/mktemp/default.nix
index a2a4f82f652..71bdd3af55d 100644
--- a/pkgs/tools/security/mktemp/default.nix
+++ b/pkgs/tools/security/mktemp/default.nix
@@ -16,7 +16,10 @@ stdenv.mkDerivation {
     sha256 = "0x969152znxxjbj7387xb38waslr4yv6bnj5jmhb4rpqxphvk54f";
   };
 
-  meta = {
-    platforms = stdenv.lib.platforms.unix;
+  meta = with stdenv.lib; {
+    description = "Simple tool to make temporary file handling in shells scripts safe and simple";
+    homepage = https://www.mktemp.org;
+    license = licenses.isc;
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/tools/system/di/default.nix b/pkgs/tools/system/di/default.nix
index b9fcb502124..135436e8f11 100644
--- a/pkgs/tools/system/di/default.nix
+++ b/pkgs/tools/system/di/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "di-${version}";
-  version = "4.46";
+  version = "4.47";
 
   src = fetchurl {
     url = "http://gentoo.com/di/${name}.tar.gz";
-    sha256 = "0cskiqywiqkw44zdg4q78bjns6jjp1dz5lzdxrhpnpldc6075irw";
+    sha256 = "0zlapxlzjizwzwa8xwrwibhcbkh0wx7n74gvjpp6wlwq7cgiq0xm";
   };
 
   makeFlags = [ "INSTALL_DIR=$(out)" ];
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index ece6c03e168..634a3e4c17e 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -173,6 +173,7 @@ mapAliases ({
   module_init_tools = kmod; # added 2016-04-22
   mpich2 = mpich;  # added 2018-08-06
   msf = metasploit; # added 2018-04-25
+  libmsgpack = msgpack; # added 2018-08-17
   mssys = ms-sys; # added 2015-12-13
   multipath_tools = multipath-tools;  # added 2016-01-21
   mupen64plus1_5 = mupen64plus; # added 2016-02-12
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4d539d5cb97..d65691ba2b7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8104,6 +8104,8 @@ with pkgs;
 
   ddd = callPackage ../development/tools/misc/ddd { };
 
+  lattice-diamond = callPackage ../development/tools/lattice-diamond { };
+
   distcc = callPackage ../development/tools/misc/distcc { };
 
   # distccWrapper: wrapper that works as gcc or g++
@@ -8501,6 +8503,8 @@ with pkgs;
 
   pup = callPackage ../development/tools/pup { };
 
+  puppet-lint = callPackage ../development/tools/puppet/puppet-lint { };
+
   pyrseas = callPackage ../development/tools/database/pyrseas { };
 
   qtcreator = libsForQt5.callPackage ../development/tools/qtcreator { };
@@ -9191,7 +9195,12 @@ with pkgs;
 
   ffcast = callPackage ../tools/X11/ffcast { };
 
-  fflas-ffpack = callPackage ../development/libraries/fflas-ffpack {};
+  fflas-ffpack = callPackage ../development/libraries/fflas-ffpack {
+    # We need to use blas instead of openblas on darwin,
+    # see https://github.com/NixOS/nixpkgs/pull/45013.
+    blas = if stdenv.isDarwin then blas else openblas;
+  };
+
   fflas-ffpack_1 = callPackage ../development/libraries/fflas-ffpack/1.nix {};
   linbox = callPackage ../development/libraries/linbox {};
 
@@ -9964,6 +9973,8 @@ with pkgs;
 
   lmdb = callPackage ../development/libraries/lmdb { };
 
+  lmdbxx = callPackage ../development/libraries/lmdbxx { };
+
   levmar = callPackage ../development/libraries/levmar { };
 
   leptonica = callPackage ../development/libraries/leptonica { };
@@ -10437,8 +10448,6 @@ with pkgs;
 
   libmtp = callPackage ../development/libraries/libmtp { };
 
-  libmsgpack = callPackage ../development/libraries/libmsgpack { };
-
   libmypaint = callPackage ../development/libraries/libmypaint { };
 
   libmysofa = callPackage ../development/libraries/audio/libmysofa { };
@@ -11118,6 +11127,8 @@ with pkgs;
 
   mqtt-bench = callPackage ../applications/misc/mqtt-bench {};
 
+  msgpack = callPackage ../development/libraries/msgpack { };
+
   msilbc = callPackage ../development/libraries/msilbc { };
 
   mp4v2 = callPackage ../development/libraries/mp4v2 { };