From c5fbcb76c69a1acf37d239b99d57172ea942ff3b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 17:29:12 -0800
Subject: [PATCH 001/274] gparted: 0.32.0 -> 0.33.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/gparted/versions
---
 pkgs/tools/misc/gparted/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix
index a3c30c15e5f7..c2d1a231c0a5 100644
--- a/pkgs/tools/misc/gparted/default.nix
+++ b/pkgs/tools/misc/gparted/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gparted-0.32.0";
+  name = "gparted-0.33.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/gparted/${name}.tar.gz";
-    sha256 = "1fjp4c8jc0kjbbih1x1vs9v40d9lncma642kflnmy0bixxnvh7df";
+    sha256 = "1ml1ky3s75lbxr91p608q3prsdh9x899mw7nbgk252pqhg4vh8sh";
   };
 
   configureFlags = [ "--disable-doc" ];

From 2b02350d39cd3d99661fe0ba42e17975eb884a93 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Thu, 20 Dec 2018 21:13:06 -0500
Subject: [PATCH 002/274] linux_hardkernel_4_14: 4.14.85-152 -> 4.14.87-153

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

diff --git a/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix b/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix
index 863455f29ab0..6655845efe5d 100644
--- a/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-hardkernel-4.14.nix
@@ -1,10 +1,10 @@
 { stdenv, buildPackages, fetchFromGitHub, perl, buildLinux, libelf, utillinux, ... } @ args:
 
 buildLinux (args // rec {
-  version = "4.14.85-152";
+  version = "4.14.87-153";
 
   # modDirVersion needs to be x.y.z.
-  modDirVersion = "4.14.85";
+  modDirVersion = "4.14.87";
 
   # branchVersion needs to be x.y.
   extraMeta.branch = "4.14";
@@ -13,7 +13,7 @@ buildLinux (args // rec {
     owner = "hardkernel";
     repo = "linux";
     rev = version;
-    sha256 = "1bpsxrbsdygnk2414ajf2za7rnb6xxnjngkzrg060c4i3bcrwrzf";
+    sha256 = "1aj3l8pf3nl0mm4m5z4z4iqd72b0nqip4cajmhpfjmq8vkygcw5c";
   };
 
   defconfig = "odroidxu4_defconfig";

From 37b1a8eea8e06c33bee1a650d97d3f225ee0673a Mon Sep 17 00:00:00 2001
From: blargg <tomjankauski@gmail.com>
Date: Fri, 21 Dec 2018 06:08:50 +0000
Subject: [PATCH 003/274] yadm: install bash and zsh completions

---
 pkgs/applications/version-management/yadm/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/applications/version-management/yadm/default.nix b/pkgs/applications/version-management/yadm/default.nix
index 0553b60fde71..6baeb5279c26 100644
--- a/pkgs/applications/version-management/yadm/default.nix
+++ b/pkgs/applications/version-management/yadm/default.nix
@@ -14,9 +14,13 @@ stdenv.mkDerivation {
   buildCommand = ''
     mkdir -p $out/bin
     mkdir -p $out/share/man/man1
+    mkdir -p $out/share/zsh/site-functions
+    mkdir -p $out/share/bash-completion/completions
     sed -e 's:/bin/bash:/usr/bin/env bash:' $src/yadm > $out/bin/yadm
     chmod 755 $out/bin/yadm
     install -m 644 $src/yadm.1 $out/share/man/man1/yadm.1
+    install -m644 $src/completion/yadm.zsh_completion $out/share/zsh/site-functions/_yadm
+    install -m644 $src/completion/yadm.bash_completion $out/share/bash-completion/completions/yadm.bash
   '';
 
   meta = {

From 6b44841cd6f04c2778040f55c8ae19515f165d28 Mon Sep 17 00:00:00 2001
From: Edmund Wu <fangkazuto@gmail.com>
Date: Mon, 24 Dec 2018 10:56:28 -0500
Subject: [PATCH 004/274] electron: 3.0.5 -> 4.0.0

---
 pkgs/development/tools/electron/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix
index 8d0f85e24847..5a00a883f512 100644
--- a/pkgs/development/tools/electron/default.nix
+++ b/pkgs/development/tools/electron/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv, gtk2, at-spi2-atk }:
+{ stdenv, libXScrnSaver, makeWrapper, fetchurl, unzip, atomEnv, libuuid, at-spi2-atk }:
 
 let
-  version = "3.0.5";
+  version = "4.0.0";
   name = "electron-${version}";
 
   throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
@@ -20,19 +20,19 @@ let
     src = {
       i686-linux = fetchurl {
         url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-ia32.zip";
-        sha256 = "1jrvvjx9q1aklp09fk9g5yg0qnq2gx8837d45aaig2ycy0srhdif";
+        sha256 = "0yv2f7yf6ingjysswpnpnvqsjkdkp2rd4laawhziifzbfjda4yws";
       };
       x86_64-linux = fetchurl {
         url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-x64.zip";
-        sha256 = "1bgi980zwarmxmp98nwdlfy9qnid4y65aadl66n6wwvb6hs4zjmz";
+        sha256 = "1kh2jds7jra9f1vcn2z1193cxcyvfxkldim4b9ij7chj9xzxwgln";
       };
       armv7l-linux = fetchurl {
         url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-armv7l.zip";
-        sha256 = "1ayfcy7jm7mymmbdq08id9wpjj6cja2cyix1sw2r3m8gpn4l6ih2";
+        sha256 = "1v492qfdgnj3fks2hrfc9lmsx5a5xk957rvismlpc2mjkjrwx2dq";
       };
       aarch64-linux = fetchurl {
         url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-linux-arm64.zip";
-        sha256 = "18cqg9zb98c0rfrdg7ri26dvhjwrwzj41jn8dfra9131xc84nl3i";
+        sha256 = "18vpqif5grvhrkx6h64yzw1pf9013811gzq2qxaj8pzr6lck3irf";
       };
     }.${stdenv.hostPlatform.system} or throwSystem;
 
@@ -47,7 +47,7 @@ let
 
       patchelf \
         --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-        --set-rpath "${atomEnv.libPath}:${gtk2}/lib:${at-spi2-atk}/lib:$out/lib/electron" \
+        --set-rpath "${atomEnv.libPath}:${stdenv.lib.makeLibraryPath [ libuuid at-spi2-atk ]}:$out/lib/electron" \
         $out/lib/electron/electron
 
       wrapProgram $out/lib/electron/electron \
@@ -60,7 +60,7 @@ let
 
     src = fetchurl {
       url = "https://github.com/electron/electron/releases/download/v${version}/electron-v${version}-darwin-x64.zip";
-      sha256 = "18sjgb93hs73bx8wa0i8r64wdh927jdwpcsxd6pfq68lfw38g2ks";
+      sha256 = "08n3xzgncb2hf645zn8b0rb1izq9pqh3726hf2g4nvrgfllivlg1";
     };
 
     buildInputs = [ unzip ];

From 2f0c495c316caa82d3035eedc55a2dcc3af5fe8f Mon Sep 17 00:00:00 2001
From: Alexander Krupenkin <mail@akru.me>
Date: Mon, 24 Dec 2018 12:20:46 +0300
Subject: [PATCH 005/274] lib/make-ext4-fs: more efficient store maker

---
 nixos/lib/make-ext4-fs.nix | 61 +++++++-------------------------------
 1 file changed, 10 insertions(+), 51 deletions(-)

diff --git a/nixos/lib/make-ext4-fs.nix b/nixos/lib/make-ext4-fs.nix
index 694142a5123a..47c6374c81ad 100644
--- a/nixos/lib/make-ext4-fs.nix
+++ b/nixos/lib/make-ext4-fs.nix
@@ -9,6 +9,7 @@
 , e2fsprogs
 , libfaketime
 , perl
+, lkl
 }:
 
 let
@@ -18,16 +19,13 @@ in
 pkgs.stdenv.mkDerivation {
   name = "ext4-fs.img";
 
-  nativeBuildInputs = [e2fsprogs.bin libfaketime perl];
+  nativeBuildInputs = [e2fsprogs.bin libfaketime perl lkl];
 
   buildCommand =
     ''
       # Add the closures of the top-level store objects.
       storePaths=$(cat ${sdClosureInfo}/store-paths)
 
-      # Also include a manifest of the closures in a format suitable for nix-store --load-db.
-      cp ${sdClosureInfo}/registration nix-path-registration
-
       # Make a crude approximation of the size of the target image.
       # If the script starts failing, increase the fudge factors here.
       numInodes=$(find $storePaths | wc -l)
@@ -38,55 +36,16 @@ pkgs.stdenv.mkDerivation {
       truncate -s $bytes $out
       faketime -f "1970-01-01 00:00:01" mkfs.ext4 -L ${volumeLabel} -U ${uuid} $out
 
-      # Populate the image contents by piping a bunch of commands to the `debugfs` tool from e2fsprogs.
-      # For example, to copy /nix/store/abcd...efg-coreutils-8.23/bin/sleep:
-      #   cd /nix/store/abcd...efg-coreutils-8.23/bin
-      #   write /nix/store/abcd...efg-coreutils-8.23/bin/sleep sleep
-      #   sif sleep mode 040555
-      #   sif sleep gid 30000
-      # In particular, debugfs doesn't handle absolute target paths; you have to 'cd' in the virtual
-      # filesystem first. Likewise the intermediate directories must already exist (using `find`
-      # handles that for us). And when setting the file's permissions, the inode type flags (__S_IFDIR,
-      # __S_IFREG) need to be set as well.
-      (
-        echo write nix-path-registration nix-path-registration
-        echo mkdir nix
-        echo cd /nix
-        echo mkdir store
+      # Also include a manifest of the closures in a format suitable for nix-store --load-db.
+      cp ${sdClosureInfo}/registration nix-path-registration
+      cptofs -t ext4 -i $out nix-path-registration /
 
-        # XXX: This explodes in exciting ways if anything in /nix/store has a space in it.
-        find $storePaths -printf '%y %f %h %m\n'| while read -r type file dir perms; do
-          # echo "TYPE=$type DIR=$dir FILE=$file PERMS=$perms" >&2
+      # Create nix/store before copying paths
+      faketime -f "1970-01-01 00:00:01" mkdir -p nix/store
+      cptofs -t ext4 -i $out nix /
 
-          echo "cd $dir"
-          case $type in
-            d)
-              echo "mkdir $file"
-              echo sif $file mode $((040000 | 0$perms)) # magic constant is __S_IFDIR
-              ;;
-            f)
-              echo "write $dir/$file $file"
-              echo sif $file mode $((0100000 | 0$perms)) # magic constant is __S_IFREG
-              ;;
-            l)
-              echo "symlink $file $(readlink "$dir/$file")"
-              ;;
-            *)
-              echo "Unknown entry: $type $dir $file $perms" >&2
-              exit 1
-              ;;
-          esac
-
-          echo sif $file gid 30000 # chgrp to nixbld
-        done
-      ) | faketime -f "1970-01-01 00:00:01" debugfs -w $out -f /dev/stdin > errorlog 2>&1
-
-      # The debugfs tool doesn't terminate on error nor exit with a non-zero status. Check manually.
-      if egrep -q 'Could not allocate|File not found' errorlog; then
-        cat errorlog
-        echo "--- Failed to create EXT4 image of $bytes bytes (numInodes=$numInodes, numDataBlocks=$numDataBlocks) ---"
-        return 1
-      fi
+      echo "copying store paths to image..."
+      cptofs -t ext4 -i $out $storePaths /nix/store/
 
       # I have ended up with corrupted images sometimes, I suspect that happens when the build machine's disk gets full during the build.
       if ! fsck.ext4 -n -f $out; then

From 0e42733b26bb72521f72f1fb0cbeb48315c3b21d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 24 Dec 2018 20:12:31 -0800
Subject: [PATCH 006/274] polygraph: 4.12.0 -> 4.13.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/polygraph/versions
---
 pkgs/tools/networking/polygraph/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/polygraph/default.nix b/pkgs/tools/networking/polygraph/default.nix
index 0b679bc60b53..bdc6e7b67f7d 100644
--- a/pkgs/tools/networking/polygraph/default.nix
+++ b/pkgs/tools/networking/polygraph/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, openssl, zlib, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "polygraph-4.12.0";
+  name = "polygraph-4.13.0";
 
   src = fetchurl {
     url = "http://www.web-polygraph.org/downloads/srcs/${name}-src.tgz";
-    sha256 = "1anrdc30yi9pb67642flmn7w82q37cnc45r9bh15mpbc66yk3kzz";
+    sha256 = "1rwzci3n7q33hw3spd79adnclzwgwlxcisc9szzjmcjqhbkcpj1a";
   };
 
   buildInputs = [ openssl zlib ncurses ];

From a07b8c056ae812ea6b7dfff1813b1c92c47d6b13 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Mon, 24 Dec 2018 21:08:50 -0800
Subject: [PATCH 007/274] profile-sync-daemon: 6.33 -> 6.34

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/profile-sync-daemon/versions
---
 pkgs/tools/misc/profile-sync-daemon/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/profile-sync-daemon/default.nix b/pkgs/tools/misc/profile-sync-daemon/default.nix
index cfc13b0e108e..5140fc312cba 100644
--- a/pkgs/tools/misc/profile-sync-daemon/default.nix
+++ b/pkgs/tools/misc/profile-sync-daemon/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, utillinux}:
 
 stdenv.mkDerivation rec {
-  version = "6.33";
+  version = "6.34";
   name = "profile-sync-daemon-${version}";
 
   src = fetchurl {
     url = "http://github.com/graysky2/profile-sync-daemon/archive/v${version}.tar.gz";
-    sha256 = "0dzs51xbszzmcg82n2dil6nljj4gn0aw9rqjmhyi4a5frc8g6xmb";
+    sha256 = "0v6yzgfwv3mhf1q2fp6abrvr15p9b1c1gahj3mdh5b4bfcsg3n5a";
   };
 
   installPhase = ''

From 7dfd2015a1947118612746e60680c26a6a51a645 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 25 Dec 2018 05:16:10 -0800
Subject: [PATCH 008/274] omniorb: 4.2.2 -> 4.2.3

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/omniorb/versions
---
 pkgs/development/tools/omniorb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/omniorb/default.nix b/pkgs/development/tools/omniorb/default.nix
index cdd599c451f8..725219c3d7c7 100644
--- a/pkgs/development/tools/omniorb/default.nix
+++ b/pkgs/development/tools/omniorb/default.nix
@@ -3,11 +3,11 @@ stdenv.mkDerivation rec {
 
   name = "omniorb-${version}";
 
-  version = "4.2.2";
+  version = "4.2.3";
 
   src = fetchurl rec {
     url = "mirror://sourceforge/project/omniorb/omniORB/omniORB-${version}/omniORB-${version}.tar.bz2";
-    sha256 = "1klf6ivhsisdnqxcbf161jxva0xzmfgmwypnxfzf4jq16770knfx";
+    sha256 = "1jlb0wps6311dmhnphn64gv46z0bl8grch4fd9dcx5dlib02lh96";
   };
 
   buildInputs = [ python2 ];

From 9c2c51a8e212279f14cb2c05c24730bb6195f1ac Mon Sep 17 00:00:00 2001
From: Roman Volosatovs <rvolosatovs@riseup.net>
Date: Sun, 23 Dec 2018 19:32:26 +0100
Subject: [PATCH 009/274] ioquake: 2018-02-23 -> 2018-12-14

---
 pkgs/games/quake3/ioquake/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/games/quake3/ioquake/default.nix b/pkgs/games/quake3/ioquake/default.nix
index 4e3a50b37b9a..0a3256976755 100644
--- a/pkgs/games/quake3/ioquake/default.nix
+++ b/pkgs/games/quake3/ioquake/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "ioquake3-git-${version}";
-  version = "2018-02-23";
+  version = "2018-12-14";
 
   src = fetchFromGitHub {
     owner = "ioquake";
     repo = "ioq3";
-    rev = "0d6edd227a13f1447938da1d1b020303c2545eb2";
-    sha256 = "1nsagyzrai8cxhabcv2my8bbwmwckvri288j6x4qi5bmp78xl4hx";
+    rev = "b0d2b141e702aafc3dcf77a026e12757f00e45ed";
+    sha256 = "17qkqi22f2fyh6bnfcf1zz2lycgv08d6aw52sf0hqw7r3qq86d08";
   };
 
   nativeBuildInputs = [ which pkgconfig ];
@@ -36,6 +36,6 @@ stdenv.mkDerivation rec {
     description = "First person shooter engine based on the Quake 3: Arena and Quake 3: Team Arena";
     license = licenses.gpl2;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ eelco abbradar ];
+    maintainers = with maintainers; [ rvolosatovs eelco abbradar ];
   };
 }

From 7b07ed4987eda9b7185c02323c35fb1bc2e57990 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 25 Dec 2018 17:18:02 -0800
Subject: [PATCH 010/274] hitch: 1.4.8 -> 1.5.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/hitch/versions
---
 pkgs/servers/hitch/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/hitch/default.nix b/pkgs/servers/hitch/default.nix
index 366934829b86..58033edb07d7 100644
--- a/pkgs/servers/hitch/default.nix
+++ b/pkgs/servers/hitch/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, docutils, libev, openssl, pkgconfig }:
 stdenv.mkDerivation rec {
-  version = "1.4.8";
+  version = "1.5.0";
   name = "hitch-${version}";
 
   src = fetchurl {
     url = "https://hitch-tls.org/source/${name}.tar.gz";
-    sha256 = "1hqs5p69gr1lb3xldbrgq7d6d0vk4za0wpizlzybn98cv68acaym";
+    sha256 = "02sd2p3jsbnqmldsjwzk5qcjc45k9n1x4ygjkx0kxxwjj9lm9hhf";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From b3e56b05330e0647f1c2bb4c59159a1cd7e98298 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D1=83=D1=85=D0=B0=D1=80=D0=B8=D0=BA?=
 <suhr@i2pmail.org>
Date: Tue, 25 Dec 2018 17:09:36 +0300
Subject: [PATCH 011/274] musescore: 2.3.2 -> 3.0

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

diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix
index 28381fcfee62..32e121547cbe 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.2";
+  version = "3.0";
 
   src = fetchFromGitHub {
     owner  = "musescore";
     repo   = "MuseScore";
     rev    = "v${version}";
-    sha256 = "0ncv0xfmq87plqa43cm0fpidlwzz1nq5s7h7139llrbc36yp3pr1";
+    sha256 = "0g8n8xpw5d6wh8bwbvy12sinl9i0ir009sr28i4izr28lr4x8v50";
   };
 
   cmakeFlags = [

From 987fdea1a8f8c0e1c0052646cfacf463e8a80e28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6gler?= <ck3d@gmx.de>
Date: Wed, 26 Dec 2018 22:10:04 +0100
Subject: [PATCH 012/274] nixos vdr: introduce option enableLirc

also introduce option socket for lirc, to have access to socket path
---
 nixos/modules/services/hardware/lirc.nix | 10 ++++++++--
 nixos/modules/services/hardware/vdr.nix  | 14 ++++++++++++--
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/hardware/lirc.nix b/nixos/modules/services/hardware/lirc.nix
index 0072406a438c..ece38bd1e1cd 100644
--- a/nixos/modules/services/hardware/lirc.nix
+++ b/nixos/modules/services/hardware/lirc.nix
@@ -33,6 +33,13 @@ in {
         description = "Extra arguments to lircd.";
       };
 
+      socket = mkOption {
+        type = types.path;
+        # default search path of many applications
+        default = "/run/lirc/lircd";
+        description = "Socket path";
+      };
+
     };
   };
 
@@ -49,8 +56,7 @@ in {
       description = "LIRC daemon socket";
       wantedBy = [ "sockets.target" ];
       socketConfig = {
-        # default search path
-        ListenStream = "/run/lirc/lircd";
+        ListenStream = cfg.socket;
         SocketUser = "lirc";
         SocketMode = "0660";
       };
diff --git a/nixos/modules/services/hardware/vdr.nix b/nixos/modules/services/hardware/vdr.nix
index 75136a2f7964..695f0cbab1fc 100644
--- a/nixos/modules/services/hardware/vdr.nix
+++ b/nixos/modules/services/hardware/vdr.nix
@@ -33,12 +33,14 @@ in {
         default = [];
         description = "Additional command line arguments to pass to VDR.";
       };
+
+      enableLirc = mkEnableOption "enable LIRC";
     };
   };
 
   ###### implementation
 
-  config = mkIf cfg.enable {
+  config = mkIf cfg.enable (mkMerge [{
     systemd.tmpfiles.rules = [
       "d ${cfg.videoDir} 0755 vdr vdr -"
       "Z ${cfg.videoDir} - vdr vdr -"
@@ -67,5 +69,13 @@ in {
     };
 
     users.groups.vdr = {};
-  };
+  }
+
+  (mkIf cfg.enableLirc {
+    services.lirc.enable = true;
+    users.users.vdr.extraGroups = [ "lirc" ];
+    services.vdr.extraArguments = [
+      "--lirc=${config.services.lirc.socket}"
+    ];
+  })]);
 }

From 3ff636fb2e756ac57d7f0007dc2c6c2425401997 Mon Sep 17 00:00:00 2001
From: Thomas Mader <thomas.mader@gmail.com>
Date: Sat, 22 Dec 2018 09:13:50 +0100
Subject: [PATCH 013/274] ldc: 1.11.0 -> 1.12.0

Additional various cleanups here and there
---
 pkgs/development/compilers/ldc/default.nix | 143 +++++++--------------
 1 file changed, 48 insertions(+), 95 deletions(-)

diff --git a/pkgs/development/compilers/ldc/default.nix b/pkgs/development/compilers/ldc/default.nix
index e39d6ae8e206..80ccb0dbbd30 100644
--- a/pkgs/development/compilers/ldc/default.nix
+++ b/pkgs/development/compilers/ldc/default.nix
@@ -2,19 +2,18 @@
 , python, libconfig, lit, gdb, unzip, darwin, bash
 , callPackage, makeWrapper, targetPackages
 , bootstrapVersion ? false
-, version ? "1.11.0"
-, ldcSha256 ? "0w4z261gzji31hn1xdnmi9dfkbyydpy6rz8aj4456q5w8yp4yil5"
+, version ? "1.12.0"
+, ldcSha256 ? "1fdma1w8j37wkr0pqdar11slkk36qymamxnk6d9k8ybhjmxaaawm"
 }:
 
 let
-
   bootstrapLdc = if !bootstrapVersion then
     # LDC 0.17.x is the last version which doesn't need a working D compiler to
     # build so we use that version to bootstrap the actual build.
     callPackage ./default.nix {
       bootstrapVersion = true;
-      version = "0.17.5";
-      ldcSha256 = "0200r5y8hs5yv2cx24csgyh00dlg18877b9cfblixypr6nhl19bs";
+      version = "0.17.6";
+      ldcSha256 = "0qf5kbxddgmg3kqzi0kf4bgv8vdrnv16y07hcpm0cwv9mc3qr2w6";
     }
   else
     "";
@@ -31,97 +30,52 @@ let
 
     postUnpack = ''
         patchShebangs .
+    ''
+
+    + stdenv.lib.optionalString (!bootstrapVersion && stdenv.hostPlatform.isDarwin) ''
+        # http://forum.dlang.org/thread/xtbbqthxutdoyhnxjhxl@forum.dlang.org
+        rm -r ldc-${version}-src/tests/dynamiccompile
+
+        # https://github.com/NixOS/nixpkgs/issues/34817
+        rm -r ldc-${version}-src/tests/plugins/addFuncEntryCall
+
+        # https://github.com/NixOS/nixpkgs/pull/36378#issuecomment-385034818
+        rm -r ldc-${version}-src/tests/debuginfo/classtypes_gdb.d
+        rm -r ldc-${version}-src/tests/debuginfo/nested_gdb.d
+
+        rm ldc-${version}-src/tests/d2/dmd-testsuite/runnable/test16096.sh
+        rm ldc-${version}-src/tests/d2/dmd-testsuite/compilable/ldc_output_filenames.sh
+        rm ldc-${version}-src/tests/d2/dmd-testsuite/compilable/crlf.sh
+        rm ldc-${version}-src/tests/d2/dmd-testsuite/compilable/issue15574.sh
+        rm ldc-${version}-src/tests/d2/dmd-testsuite/compilable/test6461.sh
+    ''
+
+    + stdenv.lib.optionalString (!bootstrapVersion) ''
+        echo ${tzdata}/share/zoneinfo/ > ldc-${version}-src/TZDatabaseDirFile
 
         # Remove cppa test for now because it doesn't work.
         rm ldc-${version}-src/tests/d2/dmd-testsuite/runnable/cppa.d
         rm ldc-${version}-src/tests/d2/dmd-testsuite/runnable/extra-files/cppb.cpp
-    ''
-
-    + stdenv.lib.optionalString (bootstrapVersion) ''
-        # ... runnable/variadic.d            ()
-        #Test failed.  The logged output:
-        #/tmp/nix-build-ldcBuild-0.17.5.drv-0/ldc-0.17.5-src/build/bin/ldmd2 -conf= -m64 -Irunnable   -od/tmp/nix-build-ldcBuild-0.17.5.drv-0/ldc-0.17.5-src/build/dmd-testsuite/runnable -of/tmp/nix-build-ldcBuild-0.17.5.drv-0/ldc-0.17.5-src/build/dmd-testsuite/runnable/variadic_0 runnable/variadic.d
-        #Error: integer constant expression expected instead of <cant>
-        #Error: integer constant expression expected instead of <cant>
-        #Error: integer constant expression expected instead of <cant>
-        #Error: integer constant expression expected instead of <cant>
-        #Error: integer constant expression expected instead of <cant>
-        #runnable/variadic.d(84): Error: template instance variadic.Foo3!(int, int, int) error instantiating
-        #
-        #
-        #==============================
-        #Test failed: expected rc == 0, exited with rc == 1
-        rm ldc-${version}-src/tests/d2/dmd-testsuite/runnable/variadic.d
-    ''
-
-    + stdenv.lib.optionalString (!bootstrapVersion) ''
-	    # http://forum.dlang.org/thread/xtbbqthxutdoyhnxjhxl@forum.dlang.org
-	    rm -r ldc-${version}-src/tests/dynamiccompile
-
-            # https://github.com/NixOS/nixpkgs/issues/34817
-	    rm -r ldc-${version}-src/tests/plugins/addFuncEntryCall
     '';
 
-    ROOT_HOME_DIR = "$(echo ~root)";
-
     datetimePath = if bootstrapVersion then
       "phobos/std/datetime.d"
     else
       "phobos/std/datetime/timezone.d";
 
     postPatch = ''
-        substituteInPlace runtime/${datetimePath} \
-            --replace "import core.time;" "import core.time;import std.path;"
-
-        substituteInPlace runtime/${datetimePath} \
-            --replace "tzName == \"leapseconds\"" "baseName(tzName) == \"leapseconds\""
-
+        # https://issues.dlang.org/show_bug.cgi?id=15391
         substituteInPlace runtime/phobos/std/net/curl.d \
             --replace libcurl.so ${curl.out}/lib/libcurl.so
 
-        # Ugly hack to fix the hardcoded path to zoneinfo in the source file.
-        # https://issues.dlang.org/show_bug.cgi?id=15391
-        substituteInPlace runtime/${datetimePath} \
-            --replace /usr/share/zoneinfo/ ${tzdata}/share/zoneinfo/
-
         substituteInPlace tests/d2/dmd-testsuite/Makefile \
             --replace "SHELL=/bin/bash" "SHELL=${bash}/bin/bash"
     ''
 
-    + stdenv.lib.optionalString stdenv.hostPlatform.isLinux ''
-        # See https://github.com/NixOS/nixpkgs/issues/29443
-        substituteInPlace runtime/phobos/std/path.d \
-            --replace "\"/root" "\"${ROOT_HOME_DIR}"
-
-        # Can be remove with front end version >= 2.078.0
-        substituteInPlace runtime/druntime/src/core/memory.d \
-            --replace "assert(z is null);" "//assert(z is null);"
-    ''
-
     + stdenv.lib.optionalString (bootstrapVersion && stdenv.hostPlatform.isDarwin) ''
-        # https://github.com/ldc-developers/ldc/pull/2306
-        # Can be removed on bootstrap version > 0.17.5
-        substituteInPlace gen/programs.cpp \
-            --replace "gcc" "clang"
-
         # Was not able to compile on darwin due to "__inline_isnanl"
         # being undefined.
         substituteInPlace dmd2/root/port.c --replace __inline_isnanl __inline_isnan
-    ''
-
-    + stdenv.lib.optionalString (!bootstrapVersion) ''
-        # TODO Can be removed with the next ldc version > 1.7.0
-        # https://github.com/ldc-developers/ldc/issues/2493
-        substituteInPlace tests/d2/dmd-testsuite/Makefile \
-            --replace "# disable tests based on arch" "DISABLED_TESTS += test_cdvecfill"
-    ''
-
-    + stdenv.lib.optionalString (bootstrapVersion) ''
-        substituteInPlace runtime/${datetimePath} \
-            --replace "import std.traits;" "import std.traits;import std.path;"
-
-        substituteInPlace runtime/${datetimePath} \
-            --replace "tzName == \"+VERSION\"" "baseName(tzName) == \"leapseconds\" || tzName == \"+VERSION\""
     '';
 
     nativeBuildInputs = [ cmake makeWrapper llvm bootstrapLdc python lit gdb unzip ]
@@ -137,17 +91,24 @@ let
 
     buildInputs = [ curl tzdata ];
 
-    preConfigure = ''
-      cmakeFlagsArray=("-DINCLUDE_INSTALL_DIR=$out/include/dlang/ldc"
-                       "-DCMAKE_BUILD_TYPE=Release"
-                       "-DCMAKE_SKIP_RPATH=ON"
-                       "-DBUILD_SHARED_LIBS=OFF"
-                       "-DLDC_WITH_LLD=OFF"
-                       # Xcode 9.0.1 fixes that bug according to ldc release notes
-                       "-DRT_ARCHIVE_WITH_LDC=OFF"
-                      )
+    #"-DINCLUDE_INSTALL_DIR=$out/include/dlang/ldc"
+    # Xcode 9.0.1 fixes that bug according to ldc release notes
+    #"-DRT_ARCHIVE_WITH_LDC=OFF"
+      #"-DD_FLAGS=TZ_DATABASE_DIR=${tzdata}/share/zoneinfo/"
+      #"-DCMAKE_BUILD_TYPE=Release"
+      #"-DCMAKE_SKIP_RPATH=ON"
+
+      #-DINCLUDE_INSTALL_DIR=$out/include/dlang/ldc
+      #
+    cmakeFlagsString = stdenv.lib.optionalString (!bootstrapVersion) ''
+      "-DD_FLAGS=-d-version=TZDatabaseDir;-J$PWD"
     '';
 
+    preConfigure = stdenv.lib.optionalString (!bootstrapVersion) ''
+      cmakeFlagsArray=(
+        ${cmakeFlagsString}
+      )
+    '';
 
     postConfigure = ''
       export DMD=$PWD/bin/ldmd2
@@ -155,10 +116,7 @@ let
 
     makeFlags = [ "DMD=$DMD" ];
 
-    # Disable tests on Darwin for now because of
-    # https://github.com/NixOS/nixpkgs/issues/41099
-    # https://github.com/NixOS/nixpkgs/pull/36378#issuecomment-385034818
-    doCheck = !bootstrapVersion && !stdenv.hostPlatform.isDarwin;
+    doCheck = !bootstrapVersion;
 
     checkPhase = ''
       # Build and run LDC D unittests.
@@ -216,15 +174,10 @@ let
       buildInputs = ldcBuild.buildInputs;
 
       preConfigure = ''
-        cmakeFlagsArray=( "-DINCLUDE_INSTALL_DIR=$out/include/dlang/ldc"
-                          "-DCMAKE_BUILD_TYPE=Release"
-                          "-DCMAKE_SKIP_RPATH=ON"
-                          "-DBUILD_SHARED_LIBS=OFF"
-                          "-DLDC_WITH_LLD=OFF"
-                          # Xcode 9.0.1 fixes that bug according to ldc release notes
-                          "-DRT_ARCHIVE_WITH_LDC=OFF"
-                          "-DD_COMPILER=${ldcBuild.out}/bin/ldmd2"
-                        )
+        cmakeFlagsArray=(
+          ${ldcBuild.cmakeFlagsString}
+          "-DD_COMPILER=${ldcBuild.out}/bin/ldmd2"
+        )
       '';
 
       postConfigure = ldcBuild.postConfigure;

From 50e450cc2ddedfad4673cacb0582b72cce2043a7 Mon Sep 17 00:00:00 2001
From: Thomas Mader <thomas.mader@gmail.com>
Date: Sat, 22 Dec 2018 18:07:50 +0100
Subject: [PATCH 014/274] dmd: 2.081.2 -> 2.083.1

---
 pkgs/development/compilers/dmd/default.nix | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/compilers/dmd/default.nix b/pkgs/development/compilers/dmd/default.nix
index 90e5cfe74119..8d68a6d4d3f9 100644
--- a/pkgs/development/compilers/dmd/default.nix
+++ b/pkgs/development/compilers/dmd/default.nix
@@ -2,10 +2,10 @@
 , makeWrapper, unzip, which
 , curl, tzdata, gdb, darwin
 , callPackage, targetPackages, ldc
-, version ? "2.081.2"
-, dmdSha256 ? "1wwk4shqldvgyczv1ihmljpfj3yidq7mxcj69i9kjl7jqx54hw62"
-, druntimeSha256 ? "0dqfsy34q2q7mk2gsi4ix3vgqg7szg3m067fghgx53vnvrzlpsc0"
-, phobosSha256 ? "1dan59lc4wggsrv5aax7jsxnzg7fz37xah84k1cbwjb3xxhhkd9n"
+, version ? "2.083.1"
+, dmdSha256 ? "0b52yq7slgbrawb22kib9bk2x9xjiy6axwz1317fck5axl093d90"
+, druntimeSha256 ? "1hm9p59ih21yv8x7cqjhkyy94677q4f8wk9fs9i1rybx8x19njyn"
+, phobosSha256 ? "1zmz0f1wj0dgxy2cy63ljjc1sl2sgb7ij8bamlxw9nxrchwi3l43"
 }:
 
 let
@@ -48,12 +48,15 @@ let
         # Remove cppa test for now because it doesn't work.
         rm dmd/test/runnable/cppa.d
         rm dmd/test/runnable/extra-files/cppb.cpp
+    ''
+
+    + stdenv.lib.optionalString (stdenv.hostPlatform.isDarwin) ''
+        rm dmd/test/runnable/test16096.sh
     '';
 
     # Compile with PIC to prevent colliding modules with binutils 2.28.
     # https://issues.dlang.org/show_bug.cgi?id=17375
     usePIC = "-fPIC";
-    ROOT_HOME_DIR = "$(echo ~root)";
 
     phobosPatches = ''
         # Ugly hack so the dlopen call has a chance to succeed.
@@ -105,13 +108,14 @@ let
         cd ../druntime
         make -j$NIX_BUILD_CORES -f posix.mak BUILD=release ENABLE_RELEASE=1 PIC=1 INSTALL_DIR=$out DMD=${pathToDmd}
         cd ../phobos
-        make -j$NIX_BUILD_CORES -f posix.mak BUILD=release ENABLE_RELEASE=1 PIC=1 INSTALL_DIR=$out DMD=${pathToDmd} TZ_DATABASE_DIR=${tzdata}/share/zoneinfo/
+        echo ${tzdata}/share/zoneinfo/ > TZDatabaseDirFile
+        make -j$NIX_BUILD_CORES -f posix.mak BUILD=release ENABLE_RELEASE=1 PIC=1 INSTALL_DIR=$out DMD=${pathToDmd} DFLAGS="-version=TZDatabaseDir -J$(pwd)"
         cd ..
     '';
 
     # Disable tests on Darwin for now because of
     # https://github.com/NixOS/nixpkgs/issues/41099
-    doCheck = !stdenv.hostPlatform.isDarwin;
+    doCheck = true;
 
     checkPhase = ''
         cd dmd
@@ -197,7 +201,8 @@ let
 
       buildPhase = ''
           cd phobos
-          make -j$NIX_BUILD_CORES -f posix.mak unittest BUILD=release ENABLE_RELEASE=1 PIC=1 DMD=${dmdBuild}/bin/dmd TZ_DATABASE_DIR=${tzdata}/share/zoneinfo/
+          echo ${tzdata}/share/zoneinfo/ > TZDatabaseDirFile
+          make -j$NIX_BUILD_CORES -f posix.mak unittest BUILD=release ENABLE_RELEASE=1 PIC=1 DMD=${dmdBuild}/bin/dmd DFLAGS="-version=TZDatabaseDir -J$(pwd)"
       '';
 
       installPhase = ''

From 42e5ebb9c6a6601a027dbf6dd754f60427fa1f25 Mon Sep 17 00:00:00 2001
From: Thomas Mader <thomas.mader@gmail.com>
Date: Thu, 27 Dec 2018 13:23:57 +0100
Subject: [PATCH 015/274] dtools: 2.081.2 -> 2.083.1

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

diff --git a/pkgs/development/tools/dtools/default.nix b/pkgs/development/tools/dtools/default.nix
index b1703cd45dd5..9fc1a682c60a 100644
--- a/pkgs/development/tools/dtools/default.nix
+++ b/pkgs/development/tools/dtools/default.nix
@@ -2,21 +2,21 @@
 
 stdenv.mkDerivation rec {
   name = "dtools-${version}";
-  version = "2.081.2";
+  version = "2.083.1";
 
   srcs = [
     (fetchFromGitHub {
       owner = "dlang";
       repo = "dmd";
       rev = "v${version}";
-      sha256 = "1wwk4shqldvgyczv1ihmljpfj3yidq7mxcj69i9kjl7jqx54hw62";
+      sha256 = "0b52yq7slgbrawb22kib9bk2x9xjiy6axwz1317fck5axl093d90";
       name = "dmd";
     })
     (fetchFromGitHub {
       owner = "dlang";
       repo = "tools";
       rev = "v${version}";
-      sha256 = "1sbcfj8r1nvy7ynh9dy55q9bvfvxwf1z3llpxckvi8p6yvf35qn2";
+      sha256 = "0z3xkv9s1pdx8zdhsb92mwax2q5xhwjgh6g3iv53xip1nsxygn48";
       name = "dtools";
     })
   ];

From 0bee7282c11c9bb812433531bf8ad18d62d3117e Mon Sep 17 00:00:00 2001
From: Thomas Mader <thomas.mader@gmail.com>
Date: Thu, 27 Dec 2018 13:40:51 +0100
Subject: [PATCH 016/274] dub: 1.10.0 -> 1.12.1

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

diff --git a/pkgs/development/tools/build-managers/dub/default.nix b/pkgs/development/tools/build-managers/dub/default.nix
index 11461fc69522..cce34b17040e 100644
--- a/pkgs/development/tools/build-managers/dub/default.nix
+++ b/pkgs/development/tools/build-managers/dub/default.nix
@@ -4,7 +4,7 @@ let
 
   dubBuild = stdenv.mkDerivation rec {
     name = "dubBuild-${version}";
-    version = "1.10.0";
+    version = "1.12.1";
 
     enableParallelBuilding = true;
 
@@ -12,7 +12,7 @@ let
       owner = "dlang";
       repo = "dub";
       rev = "v${version}";
-      sha256 = "02xxpfcjs427jqbwz0vh5vl3bh62ys65zmi9gpa3svzqffyx13n4";
+      sha256 = "0q4968vxgfxhq6ywhdvj6sqddwf7aadqmmpfqc6nl65r7jyga52a";
     };
 
     postUnpack = ''

From 2cf4b84aff90927b4921ad3a2589dbc4784724b0 Mon Sep 17 00:00:00 2001
From: Thomas Mader <thomas.mader@gmail.com>
Date: Thu, 27 Dec 2018 13:41:58 +0100
Subject: [PATCH 017/274] Literate: 2018-08-20 -> 2018-12-23

---
 .../tools/literate-programming/Literate/default.nix         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/literate-programming/Literate/default.nix b/pkgs/development/tools/literate-programming/Literate/default.nix
index 8fbbcdb6e5f7..d8afdf54a933 100644
--- a/pkgs/development/tools/literate-programming/Literate/default.nix
+++ b/pkgs/development/tools/literate-programming/Literate/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchgit, dmd, dub }:
 
 stdenv.mkDerivation {
-  name = "Literate-2018-08-20";
+  name = "Literate-2018-12-23";
 
   src = fetchgit {
     url = "https://github.com/zyedidia/Literate.git";
-    rev = "737567e49c9e12ac56222c147191da58ea1521e2";
-    sha256 = "19v8v66lv8ayg3irqkbk7ln5lkmgwpx4wgz8h3yr81arl40bbzqs";
+    rev = "99a0b7dd1ac451c2386094be06364df9386c3862";
+    sha256 = "0jvciajr33iz049m0yal41mz9p8nxmwkpq2mrfhg1ysx2zv3q3pm";
   };
 
   buildInputs = [ dmd dub ];

From 8cb8b2be91c4dc73c866b5ecb2ce441bc3a054dc Mon Sep 17 00:00:00 2001
From: Fritz Otlinghaus <fritz@otlinghaus.it>
Date: Fri, 21 Dec 2018 11:07:51 +0800
Subject: [PATCH 018/274] amazon-ecs-cli: init at 1.12.1

---
 .../virtualization/amazon-ecs-cli/default.nix | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/tools/virtualization/amazon-ecs-cli/default.nix

diff --git a/pkgs/tools/virtualization/amazon-ecs-cli/default.nix b/pkgs/tools/virtualization/amazon-ecs-cli/default.nix
new file mode 100644
index 000000000000..33937c7c53b4
--- /dev/null
+++ b/pkgs/tools/virtualization/amazon-ecs-cli/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl}:
+
+stdenv.mkDerivation rec {
+  name = "amazon-ecs-cli-${version}";
+  version = "1.12.1";
+
+  src = fetchurl {
+    url = "https://s3.amazonaws.com/amazon-ecs-cli/ecs-cli-linux-amd64-v${version}";
+    sha256 = "100iv4cchnxl1s02higga5v3hvawi4c7sqva97x34qigr4r7fxwm";
+  };
+
+  unpackPhase = ":";
+
+  installPhase =
+    ''
+      mkdir -p $out/bin
+      cp $src $out/bin/ecs-cli
+      chmod +x $out/bin/ecs-cli
+    '';  # */
+
+  meta = with stdenv.lib; {
+    homepage = https://docs.aws.amazon.com/AmazonECS/latest/developerguide/ECS_CLI.html;
+    description = "The Amazon ECS command line interface";
+    longDescription = "The Amazon Elastic Container Service (Amazon ECS) command line interface (CLI) provides high-level commands to simplify creating, updating, and monitoring clusters and tasks from a local development environment.";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ Scriptkiddi ];
+    platforms = [ "x86_64-linux" ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7082c1ff536a..a406082a7d53 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -528,6 +528,8 @@ in
     inherit (darwin.apple_sdk.frameworks) AppKit CoreFoundation CoreGraphics CoreServices CoreText Foundation OpenGL;
   };
 
+  amazon-ecs-cli = callPackage ../tools/virtualization/amazon-ecs-cli { };
+
   amazon-glacier-cmd-interface = callPackage ../tools/backup/amazon-glacier-cmd-interface { };
 
   ammonite = callPackage ../development/tools/ammonite {};

From 4fb9712a83656f0d6d35260052734f155131df8d Mon Sep 17 00:00:00 2001
From: Trolli Schmittlauch <t.schmittlauch+nixos@orlives.de>
Date: Sat, 29 Dec 2018 20:28:32 +0100
Subject: [PATCH 019/274] add myself to maintainers list

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 48474b21235d..dd5ff76d2d1e 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3906,6 +3906,10 @@
     github = "fkz";
     name = "Fabian Schmitthenner";
   };
+  schmittlauch = {
+    email = "t.schmittlauch+nixos@orlives.de";
+    github = "schmittlauch";
+  };
   schneefux = {
     email = "schneefux+nixos_pkg@schneefux.xyz";
     github = "schneefux";

From 3daf90e63e980799a60a29c44e123e74f286aa77 Mon Sep 17 00:00:00 2001
From: Jorge Acereda <jacereda@gmail.com>
Date: Sat, 22 Dec 2018 22:22:55 +0100
Subject: [PATCH 020/274] sfml: fix build on Darwin

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

diff --git a/pkgs/development/libraries/sfml/default.nix b/pkgs/development/libraries/sfml/default.nix
index 37ef0ce75271..29ca0f171eba 100644
--- a/pkgs/development/libraries/sfml/default.nix
+++ b/pkgs/development/libraries/sfml/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchzip, cmake, libX11, freetype, libjpeg, openal, flac, libvorbis
 , glew, libXrandr, libXrender, udev, xcbutilimage
-, IOKit, Foundation, AppKit, OpenAL
+, darwin, IOKit, Foundation, AppKit, OpenAL
 }:
 
 let
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ libX11 freetype libjpeg openal flac libvorbis glew
                   libXrandr libXrender xcbutilimage
                 ] ++ stdenv.lib.optional stdenv.isLinux udev
-                  ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit Foundation AppKit OpenAL ];
+                  ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit Foundation AppKit OpenAL darwin.cf-private ];
 
   cmakeFlags = [ "-DSFML_INSTALL_PKGCONFIG_FILES=yes"
                  "-DSFML_MISC_INSTALL_PREFIX=share/SFML"

From c9677e38be7ec1649324eb66560f3616ea36db0b Mon Sep 17 00:00:00 2001
From: Jorge Acereda <jacereda@gmail.com>
Date: Sat, 22 Dec 2018 23:51:50 +0100
Subject: [PATCH 021/274] sfml: relax Darwin dependencies

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

diff --git a/pkgs/development/libraries/sfml/default.nix b/pkgs/development/libraries/sfml/default.nix
index 29ca0f171eba..435a9e030a0a 100644
--- a/pkgs/development/libraries/sfml/default.nix
+++ b/pkgs/development/libraries/sfml/default.nix
@@ -16,10 +16,10 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ cmake ];
-  buildInputs = [ libX11 freetype libjpeg openal flac libvorbis glew
-                  libXrandr libXrender xcbutilimage
-                ] ++ stdenv.lib.optional stdenv.isLinux udev
-                  ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit Foundation AppKit OpenAL darwin.cf-private ];
+  buildInputs = [ freetype libjpeg openal flac libvorbis glew ]
+    ++ stdenv.lib.optional stdenv.isLinux udev
+    ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXrandr libXrender xcbutilimage ]
+    ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit Foundation AppKit OpenAL darwin.cf-private ];
 
   cmakeFlags = [ "-DSFML_INSTALL_PKGCONFIG_FILES=yes"
                  "-DSFML_MISC_INSTALL_PREFIX=share/SFML"

From 104d37c7a2aec3247a684562860621874c4d60eb Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sun, 30 Dec 2018 16:20:50 -0600
Subject: [PATCH 022/274] trilium: init at 0.26.1

---
 pkgs/applications/office/trilium/default.nix | 58 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 +
 2 files changed, 60 insertions(+)
 create mode 100644 pkgs/applications/office/trilium/default.nix

diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix
new file mode 100644
index 000000000000..c274ef0440d7
--- /dev/null
+++ b/pkgs/applications/office/trilium/default.nix
@@ -0,0 +1,58 @@
+{ stdenv, fetchurl, p7zip, autoPatchelfHook, atomEnv, makeWrapper, makeDesktopItem }:
+
+let
+  description = "Trilium Notes is a hierarchical note taking application with focus on building large personal knowledge bases.";
+  desktopItem = makeDesktopItem {
+    name = "Trilium";
+    exec = "trilium";
+    icon = "trilium";
+    comment = description;
+    desktopName = "Trilium Notes";
+    categories = "Office";
+  };
+
+in stdenv.mkDerivation rec {
+  name = "trilium-${version}";
+  version = "0.26.1";
+
+  src = fetchurl {
+    url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.7z";
+    sha256 = "184b0b0s8q32h1mpkrin8x1q0kjvard7r7xqrclziwwxg4khp3cz";
+  };
+
+  nativeBuildInputs = [
+    p7zip /* for unpacking */
+    autoPatchelfHook
+    makeWrapper
+  ];
+
+  buildInputs = atomEnv.packages;
+
+  installPhase = ''
+    mkdir -p $out/bin
+    mkdir -p $out/share/trilium
+    mkdir -p $out/share/{applications,icons/hicolor/scalable/apps}
+
+    cp -r ./* $out/share/trilium
+    ln -s $out/share/trilium/trilium $out/bin/trilium
+
+    ln -s $out/share/trilium/resources/app/src/public/images/trilium.svg $out/share/icons/hicolor/scalable/apps/trilium.svg
+    cp ${desktopItem}/share/applications/* $out/share/applications
+  '';
+
+
+  # This "shouldn't" be needed, remove when possible :)
+  preFixup = ''
+    wrapProgram $out/bin/trilium --prefix LD_LIBRARY_PATH : "${atomEnv.libPath}"
+  '';
+
+  dontStrip = true;
+
+  meta = with stdenv.lib; {
+    inherit description;
+    homepage = https://github.com/zadam/trilium;
+    license = licenses.agpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ emmanuelrosa dtzWill ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 03fa56c02138..bda5d4d42ff8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5874,6 +5874,8 @@ in
 
   triggerhappy = callPackage ../tools/inputmethods/triggerhappy {};
 
+  trilium = callPackage ../applications/office/trilium { };
+
   trousers = callPackage ../tools/security/trousers { };
 
   tryton = callPackage ../applications/office/tryton { };

From d1d5c3098c345540ca7078ff3f3cd18795174cb7 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Sun, 30 Dec 2018 13:07:27 -0600
Subject: [PATCH 023/274] pysnmp: add missing dep on pycryptodome, fix build

pycrypto is no longer needed, so remove.
---
 pkgs/development/python-modules/pysnmp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pysnmp/default.nix b/pkgs/development/python-modules/pysnmp/default.nix
index d2a47cfbca48..d5363a8c4c26 100644
--- a/pkgs/development/python-modules/pysnmp/default.nix
+++ b/pkgs/development/python-modules/pysnmp/default.nix
@@ -2,7 +2,7 @@
 , buildPythonPackage
 , fetchPypi
 , pyasn1
-, pycrypto
+, pycryptodomex
 , pysmi
 }:
 
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   # NameError: name 'mibBuilder' is not defined
   doCheck = false;
 
-  propagatedBuildInputs = [ pyasn1 pycrypto pysmi ];
+  propagatedBuildInputs = [ pyasn1 pycryptodomex pysmi ];
 
   meta = with stdenv.lib; {
     homepage = http://pysnmp.sf.net;

From d15425f81653e13cae44c259932c10bf34b6708e Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Tue, 1 Jan 2019 10:45:26 +0300
Subject: [PATCH 024/274] nixos/sway: Improve the wrapper

Port a change by @primeos from sway-beta module to sway module.

https://github.com/NixOS/nixpkgs/pull/51316
---
 nixos/modules/programs/sway.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/programs/sway.nix b/nixos/modules/programs/sway.nix
index 0eaaf6b85b99..b3847db8cd9c 100644
--- a/nixos/modules/programs/sway.nix
+++ b/nixos/modules/programs/sway.nix
@@ -7,11 +7,18 @@ let
   swayPackage = pkgs.sway;
 
   swayWrapped = pkgs.writeShellScriptBin "sway" ''
-    if [[ "$#" -ge 1 ]]; then
+    set -o errexit
+
+    if [ ! "$_SWAY_WRAPPER_ALREADY_EXECUTED" ]; then
+      export _SWAY_WRAPPER_ALREADY_EXECUTED=1
+      ${cfg.extraSessionCommands}
+    fi
+
+    if [ "$DBUS_SESSION_BUS_ADDRESS" ]; then
+      export DBUS_SESSION_BUS_ADDRESS
       exec sway-setcap "$@"
     else
-      ${cfg.extraSessionCommands}
-      exec ${pkgs.dbus.dbus-launch} --exit-with-session sway-setcap
+      exec ${pkgs.dbus}/bin/dbus-run-session sway-setcap "$@"
     fi
   '';
   swayJoined = pkgs.symlinkJoin {

From b0f10d2d531ebac8130c8f111570311ac758da8e Mon Sep 17 00:00:00 2001
From: "(cdep)illabout" <cdep.illabout@gmail.com>
Date: Sat, 29 Dec 2018 22:09:47 +0900
Subject: [PATCH 025/274] cpufreq: add option for setting the cpu max and min
 frequencies

This adds a NixOS option for setting the CPU max and min frequencies
with `cpufreq`.  The two options that have been added are:

- `powerManagement.cpufreq.max`
- `powerManagement.cpufreq.min`

It also adds an alias to the `powerManagement.cpuFreqGovernor` option as
`powerManagement.cpufreq.governor`.  This updates the installer to use
the new option name.  It also updates the manual with a note about
the new name.
---
 nixos/doc/manual/release-notes/rl-1903.xml    | 10 +++
 .../installer/tools/nixos-generate-config.pl  |  2 +-
 nixos/modules/rename.nix                      |  3 +
 nixos/modules/services/hardware/tlp.nix       |  4 +-
 nixos/modules/tasks/cpu-freq.nix              | 71 ++++++++++++++-----
 5 files changed, 69 insertions(+), 21 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml
index 89d9f48aedd3..65761c12c6a4 100644
--- a/nixos/doc/manual/release-notes/rl-1903.xml
+++ b/nixos/doc/manual/release-notes/rl-1903.xml
@@ -408,6 +408,16 @@
        from nixpkgs due to the lack of maintainers.
      </para>
    </listitem>
+   <listitem>
+    <para>
+       The <option>powerManagement.cpuFreqGovernor</option> option has been
+       aliased to <option>powerManagement.cpufreq.governor</option>.  On laptops,
+       <option>powerManagement.cpuFreqGovernor</option> is sometimes set in
+       <literal>/etc/nixos/hardware-configuration.nix</literal>, so you can
+       rename it to the new name, or run
+       <literal>nixos-generate-config</literal> again.
+    </para>
+   </listitem>
   </itemizedlist>
  </section>
 </section>
diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index 52a129b39bcd..fa01dc7bbaf0 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -104,7 +104,7 @@ if (-e "/sys/devices/system/cpu/cpu0/cpufreq/scaling_available_governors") {
 
     foreach $e (@desired_governors) {
         if (index($governors, $e) != -1) {
-            last if (push @attrs, "powerManagement.cpuFreqGovernor = lib.mkDefault \"$e\";");
+            last if (push @attrs, "powerManagement.cpufreq.governor = lib.mkDefault \"$e\";");
         }
     }
 }
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index dc0a175d5bb8..0ed0f4ac209a 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -286,6 +286,9 @@ with lib;
     (mkRenamedOptionModule [ "hardware" "ckb" "enable" ] [ "hardware" "ckb-next" "enable" ])
     (mkRenamedOptionModule [ "hardware" "ckb" "package" ] [ "hardware" "ckb-next" "package" ])
 
+    # cpufeq
+    (mkAliasOptionModule [ "powerManagement" "cpuFreqGovernor" ] [ "powerManagement" "cpufreq" "governor" ])
+
   ] ++ (flip map [ "blackboxExporter" "collectdExporter" "fritzboxExporter"
                    "jsonExporter" "minioExporter" "nginxExporter" "nodeExporter"
                    "snmpExporter" "unifiExporter" "varnishExporter" ]
diff --git a/nixos/modules/services/hardware/tlp.nix b/nixos/modules/services/hardware/tlp.nix
index 68425822a884..bbc5b5b80a08 100644
--- a/nixos/modules/services/hardware/tlp.nix
+++ b/nixos/modules/services/hardware/tlp.nix
@@ -55,7 +55,9 @@ in
   config = mkIf cfg.enable {
 
     powerManagement.scsiLinkPolicy = null;
-    powerManagement.cpuFreqGovernor = null;
+    powerManagement.cpufreq.governor = null;
+    powerManagement.cpufreq.max = null;
+    powerManagement.cpufreq.min = null;
 
     systemd.sockets."systemd-rfkill".enable = false;
 
diff --git a/nixos/modules/tasks/cpu-freq.nix b/nixos/modules/tasks/cpu-freq.nix
index 5f8b5df52acf..684c43a1e903 100644
--- a/nixos/modules/tasks/cpu-freq.nix
+++ b/nixos/modules/tasks/cpu-freq.nix
@@ -4,22 +4,43 @@ with lib;
 
 let
   cpupower = config.boot.kernelPackages.cpupower;
-  cfg = config.powerManagement;
+  cfg = config.powerManagement.cpufreq;
 in
 
 {
   ###### interface
 
-  options = {
+  options.powerManagement.cpufreq = {
 
-    powerManagement.cpuFreqGovernor = mkOption {
+    governor = mkOption {
       type = types.nullOr types.str;
       default = null;
       example = "ondemand";
       description = ''
         Configure the governor used to regulate the frequence of the
         available CPUs. By default, the kernel configures the
-        performance governor.
+        performance governor, although this may be overwriten in your
+        hardware-configuration.nix file.
+
+        Often used values: "ondemand", "powersave", "performance"
+      '';
+    };
+
+    max = mkOption {
+      type = types.nullOr types.ints.unsigned;
+      default = null;
+      example = 2200000;
+      description = ''
+        The maximum frequency the CPU will use.  Defaults to the maximum possible.
+      '';
+    };
+
+    min = mkOption {
+      type = types.nullOr types.ints.unsigned;
+      default = null;
+      example = 800000;
+      description = ''
+        The minimum frequency the CPU will use.
       '';
     };
 
@@ -28,25 +49,37 @@ in
 
   ###### implementation
 
-  config = mkIf (!config.boot.isContainer && config.powerManagement.cpuFreqGovernor != null) {
+  config =
+    let
+      governorEnable = cfg.governor != null;
+      maxEnable = cfg.max != null;
+      minEnable = cfg.min != null;
+      enable =
+        !config.boot.isContainer &&
+        (governorEnable || maxEnable || minEnable);
+    in
+    mkIf enable {
 
-    boot.kernelModules = [ "cpufreq_${cfg.cpuFreqGovernor}" ];
+      boot.kernelModules = optional governorEnable "cpufreq_${cfg.governor}";
 
-    environment.systemPackages = [ cpupower ];
+      environment.systemPackages = [ cpupower ];
 
-    systemd.services.cpufreq = {
-      description = "CPU Frequency Governor Setup";
-      after = [ "systemd-modules-load.service" ];
-      wantedBy = [ "multi-user.target" ];
-      path = [ cpupower pkgs.kmod ];
-      unitConfig.ConditionVirtualization = false;
-      serviceConfig = {
-        Type = "oneshot";
-        RemainAfterExit = "yes";
-        ExecStart = "${cpupower}/bin/cpupower frequency-set -g ${cfg.cpuFreqGovernor}";
-        SuccessExitStatus = "0 237";
+      systemd.services.cpufreq = {
+        description = "CPU Frequency Setup";
+        after = [ "systemd-modules-load.service" ];
+        wantedBy = [ "multi-user.target" ];
+        path = [ cpupower pkgs.kmod ];
+        unitConfig.ConditionVirtualization = false;
+        serviceConfig = {
+          Type = "oneshot";
+          RemainAfterExit = "yes";
+          ExecStart = "${cpupower}/bin/cpupower frequency-set " +
+            optionalString governorEnable "--governor ${cfg.governor} " +
+            optionalString maxEnable "--max ${toString cfg.max} " +
+            optionalString minEnable "--min ${toString cfg.min} ";
+          SuccessExitStatus = "0 237";
+        };
       };
-    };
 
   };
 }

From f14d6ab0f68563d2001dee9536b3c1dc30c4dccf Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Tue, 1 Jan 2019 13:36:53 +0300
Subject: [PATCH 026/274] pythonPackage.psutil: fix disk io counters fails on
 Linux kernel 4.18+

---
 pkgs/development/python-modules/psutil/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix
index 53c534e8a4db..eccca8ca3e6f 100644
--- a/pkgs/development/python-modules/psutil/default.nix
+++ b/pkgs/development/python-modules/psutil/default.nix
@@ -1,6 +1,6 @@
 { stdenv
 , buildPythonPackage
-, fetchPypi
+, fetchPypi, fetchpatch
 , darwin
 }:
 
@@ -13,6 +13,14 @@ buildPythonPackage rec {
     sha256 = "6e265c8f3da00b015d24b842bfeb111f856b13d24f2c57036582568dc650d6c3";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "disk_io_counters_fails.patch";
+      url = "https://github.com/giampaolo/psutil/commit/8f99f3782663959062ee868bbfdbc336307a3a4d.diff";
+      sha256 = "0j7wdgq8y20k27wcpmbgc1chd0vmbkxy8j0zwni1s4i7hyk64hmk";
+    })
+  ];
+
   # No tests in archive
   doCheck = false;
 

From c5c2ac4f45959727b043b3478f28829fac36fffb Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 1 Jan 2019 17:19:07 +0100
Subject: [PATCH 027/274] qrencode: merge with libqrencode

---
 pkgs/applications/altcoins/namecoin.nix       |  4 +--
 pkgs/applications/audio/faust/faustlive.nix   |  4 +--
 .../misc/digitalbitbox/default.nix            |  4 +--
 pkgs/applications/misc/pwsafe/default.nix     |  4 +--
 .../instant-messengers/toxic/default.nix      |  4 +--
 .../haskell-modules/hackage-packages.nix      |  6 ++--
 .../libraries/libqrencode/default.nix         | 35 -------------------
 .../libraries/qrencode/default.nix            | 33 +++++++++++++++++
 .../linux/google-authenticator/default.nix    |  2 +-
 pkgs/tools/graphics/qrencode/default.nix      | 21 -----------
 .../asc-key-to-qr-code-gif/default.nix        |  6 ++--
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  4 +--
 13 files changed, 52 insertions(+), 76 deletions(-)
 delete mode 100644 pkgs/development/libraries/libqrencode/default.nix
 create mode 100644 pkgs/development/libraries/qrencode/default.nix
 delete mode 100644 pkgs/tools/graphics/qrencode/default.nix

diff --git a/pkgs/applications/altcoins/namecoin.nix b/pkgs/applications/altcoins/namecoin.nix
index 93f9faf833a1..4b8dc5525dc4 100644
--- a/pkgs/applications/altcoins/namecoin.nix
+++ b/pkgs/applications/altcoins/namecoin.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, openssl, boost, libevent, autoreconfHook, db4, miniupnpc, eject, pkgconfig, qt4, protobuf, libqrencode, hexdump
+{ stdenv, fetchFromGitHub, openssl, boost, libevent, autoreconfHook, db4, miniupnpc, eject, pkgconfig, qt4, protobuf, qrencode, hexdump
 , withGui }:
 
 with stdenv.lib;
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   ] ++ optionals withGui [
     qt4
     protobuf
-    libqrencode
+    qrencode
   ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/applications/audio/faust/faustlive.nix b/pkgs/applications/audio/faust/faustlive.nix
index b8ff73f2cb32..754c48070603 100644
--- a/pkgs/applications/audio/faust/faustlive.nix
+++ b/pkgs/applications/audio/faust/faustlive.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub
-, llvm, qt48Full, libqrencode, libmicrohttpd, libjack2, alsaLib, faust, curl
+, llvm, qt48Full, qrencode, libmicrohttpd, libjack2, alsaLib, faust, curl
 , bc, coreutils, which
 }:
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    llvm qt48Full libqrencode libmicrohttpd libjack2 alsaLib faust curl
+    llvm qt48Full qrencode libmicrohttpd libjack2 alsaLib faust curl
     bc coreutils which
   ];
 
diff --git a/pkgs/applications/misc/digitalbitbox/default.nix b/pkgs/applications/misc/digitalbitbox/default.nix
index 3e6a6ab53f77..939e2e9fc166 100644
--- a/pkgs/applications/misc/digitalbitbox/default.nix
+++ b/pkgs/applications/misc/digitalbitbox/default.nix
@@ -6,7 +6,7 @@
 , libcap
 , libevent
 , libtool
-, libqrencode
+, qrencode
 , udev
 , libusb
 , makeWrapper
@@ -74,7 +74,7 @@ in stdenv.mkDerivation rec {
     libtool
     udev
     libusb
-    libqrencode
+    qrencode
 
     qtbase
     qtwebsockets
diff --git a/pkgs/applications/misc/pwsafe/default.nix b/pkgs/applications/misc/pwsafe/default.nix
index 7b0e299924cb..a0b702fa1451 100644
--- a/pkgs/applications/misc/pwsafe/default.nix
+++ b/pkgs/applications/misc/pwsafe/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, cmake, pkgconfig, zip, gettext, perl
 , wxGTK31, libXi, libXt, libXtst, xercesc, xextproto
-, libqrencode, libuuid, libyubikey, yubikey-personalization
+, qrencode, libuuid, libyubikey, yubikey-personalization
 }:
 
 stdenv.mkDerivation rec {
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake pkgconfig zip ];
   buildInputs = [
-    gettext perl libqrencode libuuid
+    gettext perl qrencode libuuid
     libXi libXt libXtst wxGTK31 xercesc xextproto
     libyubikey yubikey-personalization
   ];
diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix
index cbf2dd7d99a2..c8cd91f07277 100644
--- a/pkgs/applications/networking/instant-messengers/toxic/default.nix
+++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, libsodium, ncurses, curl
 , libtoxcore, openal, libvpx, freealut, libconfig, pkgconfig, libopus
-, libqrencode, gdk_pixbuf, libnotify }:
+, qrencode, gdk_pixbuf, libnotify }:
 
 stdenv.mkDerivation rec {
   name = "toxic-${version}";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     libtoxcore libsodium ncurses curl gdk_pixbuf libnotify
   ] ++ stdenv.lib.optionals (!stdenv.isAarch32) [
-    openal libopus libvpx freealut libqrencode
+    openal libopus libvpx freealut qrencode
   ];
   nativeBuildInputs = [ pkgconfig libconfig ];
 
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index a6deacf70157..574c29f76da3 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -171338,7 +171338,7 @@ self: {
 
   "qr-imager" = callPackage
     ({ mkDerivation, base, binary, bytestring, cryptonite, directory
-     , haskell-qrencode, hspec, jose-jwt, JuicyPixels, libqrencode
+     , haskell-qrencode, hspec, jose-jwt, JuicyPixels, qrencode
      , microlens, process, split, vector
      }:
      mkDerivation {
@@ -171349,12 +171349,12 @@ self: {
          base binary bytestring cryptonite directory haskell-qrencode
          jose-jwt JuicyPixels microlens process split vector
        ];
-       libraryPkgconfigDepends = [ libqrencode ];
+       libraryPkgconfigDepends = [ qrencode ];
        testHaskellDepends = [ base hspec ];
        description = "Library to generate images";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) libqrencode;};
+     }) {inherit (pkgs) qrencode;};
 
   "qr-repa" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cryptonite, directory
diff --git a/pkgs/development/libraries/libqrencode/default.nix b/pkgs/development/libraries/libqrencode/default.nix
deleted file mode 100644
index 7c1844bf281e..000000000000
--- a/pkgs/development/libraries/libqrencode/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ stdenv, fetchurl, autoconf, automake, pkgconfig,
-  libtool, SDL2, libpng }:
-
-stdenv.mkDerivation rec {
-  name = "libqrencode-${version}";
-  version = "4.0.0";
-
-  src = fetchurl {
-    url = "https://fukuchi.org/works/qrencode/qrencode-${version}.tar.gz";
-    sha1 = "644054a76c8b593acb66a8c8b7dcf1b987c3d0b2";
-    sha256 = "10da4q5pym7pzxcv21w2kc2rxmq7sp1rg58zdklwfr0jjci1nqjv";
-  };
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ autoconf automake libtool SDL2 libpng ];
-
-  propagatedBuildInputs = [ SDL2 libpng ];
-
-  doCheck = true;
-
-  meta = with stdenv.lib; {
-    homepage = https://fukuchi.org/works/qrencode/;
-    description = "A C library for encoding data in a QR Code symbol";
-
-    longDescription = ''
-      Libqrencode is a C library for encoding data in a QR Code symbol,
-      a kind of 2D symbology that can be scanned by handy terminals
-      such as a mobile phone with CCD.
-    '';
-
-    license = licenses.gpl2Plus;
-    maintainers = [ maintainers.adolfogc ];
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/development/libraries/qrencode/default.nix b/pkgs/development/libraries/qrencode/default.nix
new file mode 100644
index 000000000000..7e6b20599aff
--- /dev/null
+++ b/pkgs/development/libraries/qrencode/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, pkgconfig, SDL2, libpng }:
+
+stdenv.mkDerivation rec {
+  pname = "qrencode";
+  version = "4.0.2";
+
+  outputs = [ "bin" "out" "man" "dev" ];
+
+  src = fetchurl {
+    url = "https://fukuchi.org/works/qrencode/qrencode-${version}.tar.gz";
+    sha256 = "079v3a15ydpr67zdi3xbgvic8n2kxvi0m32dyz8jaik10yffgayv";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ SDL2 libpng ];
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    homepage = https://fukuchi.org/works/qrencode/;
+    description = "C library for encoding data in a QR Code symbol";
+
+    longDescription = ''
+      Libqrencode is a C library for encoding data in a QR Code symbol,
+      a kind of 2D symbology that can be scanned by handy terminals
+      such as a mobile phone with CCD.
+    '';
+
+    license = licenses.lgpl21Plus;
+    maintainers = with maintainers; [ adolfogc yegortimoshenko ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/os-specific/linux/google-authenticator/default.nix b/pkgs/os-specific/linux/google-authenticator/default.nix
index 4e04c16d70bd..8ae5785eea8b 100644
--- a/pkgs/os-specific/linux/google-authenticator/default.nix
+++ b/pkgs/os-specific/linux/google-authenticator/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ pam ];
 
   preConfigure = ''
-    sed -i "s|libqrencode.so.4|${qrencode}/lib/libqrencode.so.4|" src/google-authenticator.c
+    sed -i "s|libqrencode.so.4|${qrencode.out}/lib/libqrencode.so.4|" src/google-authenticator.c
   '';
 
   installPhase = ''
diff --git a/pkgs/tools/graphics/qrencode/default.nix b/pkgs/tools/graphics/qrencode/default.nix
deleted file mode 100644
index 7c5aed9b4e23..000000000000
--- a/pkgs/tools/graphics/qrencode/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, libpng, pkgconfig }:
-
-stdenv.mkDerivation rec {
-  name = "qrencode-4.0.2";
-
-  src = fetchurl {
-    url = "${meta.homepage}/${name}.tar.bz2";
-    sha256 = "1d2q5d3v8g3hsi3h5jq4n177bjhf3kawms09immw7p187f6jgjy9";
-  };
-
-  buildInputs = [ libpng ];
-  nativeBuildInputs = [ pkgconfig ];
-
-  meta = with stdenv.lib; {
-    homepage = https://fukuchi.org/works/qrencode/;
-    description = "QR code encoder";
-    platforms = platforms.all;
-    license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ yegortimoshenko ];
-  };
-}
diff --git a/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix b/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix
index e04b41557482..ca2ea67e7881 100644
--- a/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix
+++ b/pkgs/tools/security/asc-key-to-qr-code-gif/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, imagemagick, libqrencode
+{ stdenv, fetchFromGitHub, imagemagick, qrencode
 , testQR ? false, zbar ? null
 }:
 
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     sha256 = "0yrc302a2fhbzryb10718ky4fymfcps3lk67ivis1qab5kbp6z8r";
   };
 
-  buildInputs = [ imagemagick libqrencode ] ++ stdenv.lib.optional testQR zbar;
+  buildInputs = [ imagemagick qrencode ] ++ stdenv.lib.optional testQR zbar;
   dontBuild = true;
   dontStrip = true;
   dontPatchELF = true;
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   preInstall = ''
     substituteInPlace asc-to-gif.sh \
       --replace "convert" "${imagemagick}/bin/convert" \
-      --replace "qrencode" "${libqrencode}/bin/qrencode"
+      --replace "qrencode" "${qrencode.bin}/bin/qrencode"
   '';
 
   installPhase = ''
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 51916f3146eb..90136f86acaf 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -171,6 +171,7 @@ mapAliases ({
   libjson_rpc_cpp = libjson-rpc-cpp; # added 2017-02-28
   liblapackWithoutAtlas = liblapack; # added 2018-11-05
   libmysql = mysql.connector-c; # added # 2017-12-28, this was a misnomer refering to libmysqlclient
+  libqrencode = qrencode;  # added 2019-01-01
   librecad2 = librecad;  # backwards compatibility alias, added 2015-10
   libsysfs = sysfsutils; # added 2018-04-25
   libtidy = html-tidy;  # added 2014-12-21
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c29d384a77fa..fda0fcc95892 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3992,8 +3992,6 @@ in
 
   libqmi = callPackage ../development/libraries/libqmi { };
 
-  libqrencode = callPackage ../development/libraries/libqrencode { };
-
   libmbim = callPackage ../development/libraries/libmbim { };
 
   libmongo-client = callPackage ../development/libraries/libmongo-client { };
@@ -17429,7 +17427,7 @@ in
     java = if stdenv.isLinux then jre else jdk;
   };
 
-  qrencode = callPackage ../tools/graphics/qrencode { };
+  qrencode = callPackage ../development/libraries/qrencode { };
 
   geeqie = callPackage ../applications/graphics/geeqie { };
 

From 317249e5aec33c4995ee53ee11513ddd571e3b53 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 1 Jan 2019 17:38:11 +0100
Subject: [PATCH 028/274] qrencode: fix tests

---
 pkgs/development/libraries/qrencode/default.nix | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/pkgs/development/libraries/qrencode/default.nix b/pkgs/development/libraries/qrencode/default.nix
index 7e6b20599aff..1cbdf1ffdf8a 100644
--- a/pkgs/development/libraries/qrencode/default.nix
+++ b/pkgs/development/libraries/qrencode/default.nix
@@ -14,8 +14,22 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ SDL2 libpng ];
 
+  configureFlags = [
+    "--with-tests"
+  ];
+
   doCheck = true;
 
+  checkPhase = ''
+    runHook preCheck
+
+    pushd tests
+    ./test_basic.sh
+    popd
+
+    runHook postCheck
+  '';
+
   meta = with stdenv.lib; {
     homepage = https://fukuchi.org/works/qrencode/;
     description = "C library for encoding data in a QR Code symbol";

From ce4d1da8bf03fb298f8b1932c0b5447ad7f6a158 Mon Sep 17 00:00:00 2001
From: Yurii Rashkovskii <yrashk@gmail.com>
Date: Wed, 2 Jan 2019 00:46:51 +0700
Subject: [PATCH 029/274] eaglemode: 0.86.0 -> 0.94.0

The build is no longer breaking so this derivation is no longer marked
broken.
---
 pkgs/applications/misc/eaglemode/default.nix | 24 ++++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/applications/misc/eaglemode/default.nix
index 0404ef8ce220..255396a79502 100644
--- a/pkgs/applications/misc/eaglemode/default.nix
+++ b/pkgs/applications/misc/eaglemode/default.nix
@@ -1,35 +1,36 @@
-{ stdenv, fetchurl, perl, libX11, libjpeg, libpng, libtiff, pkgconfig,
-librsvg, glib, gtk2, libXext, libXxf86vm, poppler, xineLib }:
+{ stdenv, fetchurl, perl, libX11, libXinerama, libjpeg, libpng, libtiff, pkgconfig,
+librsvg, glib, gtk2, libXext, libXxf86vm, poppler, xineLib, ghostscript, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "eaglemode-0.86.0";
+  name = "eaglemode-${version}";
+  version = "0.94.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/eaglemode/${name}.tar.bz2";
-    sha256 = "1a2hzyck95g740qg4p4wd4fjwsmlknh75i9sbx5r5v9pyr4i3m4f";
+    sha256 = "1sr3bd9y9j2svqvdwhrak29yy9cxf92w9vq2cim7a8hzwi9qfy9k";
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ perl libX11 libjpeg libpng libtiff
-    librsvg glib gtk2 libXxf86vm libXext poppler xineLib ];
+  buildInputs = [ perl libX11 libXinerama libjpeg libpng libtiff
+    librsvg glib gtk2 libXxf86vm libXext poppler xineLib ghostscript makeWrapper ];
 
-  # The program tries to dlopen both Xxf86vm and Xext, so we use the
+  # The program tries to dlopen Xxf86vm, Xext and Xinerama, so we use the
   # trick on NIX_LDFLAGS and dontPatchELF to make it find them.
   # I use 'yes y' to skip a build error linking with xineLib,
   # because xine stopped exporting "_x_vo_new_port"
   #  https://sourceforge.net/projects/eaglemode/forums/forum/808824/topic/5115261
   buildPhase = ''
-    export NIX_LDFLAGS="$NIX_LDFLAGS -lXxf86vm -lXext"
+    export NIX_LDFLAGS="$NIX_LDFLAGS -lXxf86vm -lXext -lXinerama"
     perl make.pl build
   '';
 
   dontPatchELF = true;
+  # eaglemode expects doc to be in the root directory
+  forceShare = [ "man" "info" ];
 
   installPhase = ''
     perl make.pl install dir=$out
-    # I don't like this... but it seems the way they plan to run it by now.
-    # Run 'eaglemode.sh', not 'eaglemode'.
-    ln -s $out/eaglemode.sh $out/bin/eaglemode.sh
+    wrapProgram $out/bin/eaglemode --set EM_DIR "$out" --prefix LD_LIBRARY_PATH : "$out/lib" --prefix PATH : "${ghostscript}/bin"
   '';
 
   meta = with stdenv.lib; {
@@ -38,6 +39,5 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3;
     maintainers = with maintainers; [ ];
     platforms = platforms.linux;
-    broken = true;
   };
 }

From e0d8f387d97580e3e9217c594709fc5dc7cc1fc7 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Tue, 1 Jan 2019 14:39:16 -0600
Subject: [PATCH 030/274] rofi: 1.5.1 -> 1.5.2

https://github.com/DaveDavenport/rofi/releases/tag/1.5.2
---
 pkgs/applications/misc/rofi/config.patch | 54 ------------------------
 pkgs/applications/misc/rofi/default.nix  | 12 +-----
 2 files changed, 2 insertions(+), 64 deletions(-)
 delete mode 100644 pkgs/applications/misc/rofi/config.patch

diff --git a/pkgs/applications/misc/rofi/config.patch b/pkgs/applications/misc/rofi/config.patch
deleted file mode 100644
index 46982d51e00c..000000000000
--- a/pkgs/applications/misc/rofi/config.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff --git a/script/rofi-theme-selector b/script/rofi-theme-selector
-index 0646e4bc..f827dbfe 100755
---- a/script/rofi-theme-selector
-+++ b/script/rofi-theme-selector
-@@ -42,34 +42,7 @@ function find_themes()
-     DIRS=${XDG_DATA_DIRS}
-     OLDIFS=${IFS}
-     IFS=:
--    if [ -z "${XDG_DATA_DIRS}" ]
--    then
--        echo "XDG_DATA_DIRS needs to be set for this script to function correctly."
--        echo -n "Using dirs from \$PATH: "
--        DIRS=
--        # Iterate over items in $PATH
--        for p in ${PATH}; do
--            # Remove trailing / if exists.
--            x=${p%/}
--            # remove both /bin and /sbin and /games from end
--            x=${x%/bin}
--            x=${x%/sbin}
--            x=${x%/games}
--            # Add /share
--            x=${x}/share
--            # Check if entry exists Prepend : so :${x}: matches nicely
--            case ":${DIRS}" in
--                *$x:*);;
--                *) DIRS+="$x:";;
--            esac
--        done
--        # Remove trailing :
--        DIRS=${DIRS%:}
--        echo "${DIRS}"
--    fi
--    # Add user dir.
--    DIRS+=":${HOME}/.local/share/"
--    DIRS+=":${HOME}/.config/"
-+    DIRS+=":%ROFIOUT%/"
-     for p in ${DIRS}; do 
-     	p=${p%/}
-         TD=${p}/rofi/themes
-@@ -164,7 +137,12 @@ Current theme: <b>${CUR}</b>"""
- ###
- function set_theme()
- {
--    CDIR="${HOME}/.config/rofi/"
-+    if [ -d "${XDG_CONFIG_HOME}" ]; then
-+      CDIR="${XDG_CONFIG_HOME}/rofi/"
-+    else
-+      CDIR="${HOME}/.config/rofi/"
-+    fi
-+
-     if [ ! -d "${CDIR}" ]
-     then
-         mkdir -p ${CDIR}
diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix
index 63b047976b3d..0edcde12e341 100644
--- a/pkgs/applications/misc/rofi/default.nix
+++ b/pkgs/applications/misc/rofi/default.nix
@@ -4,28 +4,20 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.5.1";
+  version = "1.5.2";
   name = "rofi-unwrapped-${version}";
 
   src = fetchurl {
     url = "https://github.com/DaveDavenport/rofi/releases/download/${version}/rofi-${version}.tar.gz";
-    sha256 = "1dc33zf33z38jcxb0lxpyd31waalpf6d4cd9z5f9m5qphdk1g679";
+    sha256 = "1rczxz6l32vnclarzga1sm1d5iq9rfscb9j7f8ih185n59hf0517";
   };
 
-  # config.patch may be removed in the future - https://github.com/DaveDavenport/rofi/pull/781
-  patches = [ ./config.patch ];
-
   preConfigure = ''
     patchShebangs "script"
     # root not present in build /etc/passwd
     sed -i 's/~root/~nobody/g' test/helper-expand.c
   '';
 
-  postFixup = ''
-    substituteInPlace "$out"/bin/rofi-theme-selector \
-        --replace "%ROFIOUT%" "$out/share"
-  '';
-
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
   buildInputs = [ libxkbcommon pango cairo git bison flex librsvg check
     libstartup_notification libxcb xcbutil xcbutilwm xcbutilxrm which

From c923094039a5b3d736d1d96995f3da4dcc81d8e1 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 30 Dec 2018 19:00:00 -0500
Subject: [PATCH 031/274] cooper-hewitt: init at 2014-06-09

---
 pkgs/data/fonts/cooper-hewitt/default.nix | 22 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/data/fonts/cooper-hewitt/default.nix

diff --git a/pkgs/data/fonts/cooper-hewitt/default.nix b/pkgs/data/fonts/cooper-hewitt/default.nix
new file mode 100644
index 000000000000..1fa5cff76048
--- /dev/null
+++ b/pkgs/data/fonts/cooper-hewitt/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchzip }:
+
+fetchzip rec {
+  name = "cooper-hewitt-2014-06-09";
+
+  url = https://www.cooperhewitt.org/wp-content/uploads/fonts/CooperHewitt-OTF-public.zip;
+
+  postFetch = ''
+    mkdir -p $out/share/fonts/opentype
+    unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype/
+  '';
+
+  sha256 = "01iwqmjvqkc6fmc2r0486vk06s6f51n9wxzl1pf9z48n0igj4gqd";
+
+  meta = with stdenv.lib; {
+    homepage = https://www.cooperhewitt.org/open-source-at-cooper-hewitt/cooper-hewitt-the-typeface-by-chester-jenkins/;
+    description = "A contemporary sans serif, with characters composed of modified-geometric curves and arches";
+    license = licenses.ofl;
+    platforms = platforms.all;
+    maintainers = [ maintainers.marsam ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c29d384a77fa..50e56ca92dc9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15465,6 +15465,8 @@ in
 
   conway_polynomials = callPackage ../data/misc/conway_polynomials { };
 
+  cooper-hewitt = callPackage ../data/fonts/cooper-hewitt { };
+
   dosis = callPackage ../data/fonts/dosis { };
 
   dosemu_fonts = callPackage ../data/fonts/dosemu-fonts { };

From 046f90d2510978c4ac38caf0e199f90d8b2da8e4 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 30 Dec 2018 19:01:00 -0500
Subject: [PATCH 032/274] inter-ui: 3.0 -> 3.1

---
 pkgs/data/fonts/inter-ui/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/inter-ui/default.nix b/pkgs/data/fonts/inter-ui/default.nix
index dcce90aaef5f..4d9973aa2a25 100644
--- a/pkgs/data/fonts/inter-ui/default.nix
+++ b/pkgs/data/fonts/inter-ui/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip }:
 
 let
-  version = "3.0";
+  version = "3.1";
 in fetchzip {
   name = "inter-ui-${version}";
 
@@ -12,7 +12,7 @@ in fetchzip {
     unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype
   '';
 
-  sha256 = "16qmb8farkh41i56f0vvbxcg32rbg7my64amwz5y8gyy73i3320q";
+  sha256 = "0cdjpwylynwmab0x5z5lw43k39vis74xj1ciqg8nw12ccprbmj60";
 
   meta = with stdenv.lib; {
     homepage = https://rsms.me/inter/;

From aa538809de5005d165ea3d2ecf722149343935c6 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 30 Dec 2018 19:02:00 -0500
Subject: [PATCH 033/274] cantarell-fonts: 0.110 -> 0.111

---
 pkgs/data/fonts/cantarell-fonts/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/fonts/cantarell-fonts/default.nix b/pkgs/data/fonts/cantarell-fonts/default.nix
index 03d2e85d6af9..4403d690a16d 100644
--- a/pkgs/data/fonts/cantarell-fonts/default.nix
+++ b/pkgs/data/fonts/cantarell-fonts/default.nix
@@ -2,13 +2,13 @@
 
 let
   pname = "cantarell-fonts";
-  version = "0.110";
+  version = "0.111";
 in stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "19rll0h4xjn83lqm0zc4088y0vkrx1wxg8jz9imvgd8snmfxfm54";
+    sha256 = "05hpnhihwm9sxlq1qn993g03pwkmpjbn0dvnba71r1gfjv0jp2w5";
   };
 
   nativeBuildInputs = [ meson ninja gettext appstream-glib ];
@@ -21,7 +21,7 @@ in stdenv.mkDerivation rec {
 
   outputHashAlgo = "sha256";
   outputHashMode = "recursive";
-  outputHash = "052nxmhw2j8yvcj90r8xhjf0mzim8h6syip7winxb28vavj6jnba";
+  outputHash = "12ps2gjv1lmzbmkv16vgjmaahl3ayadpniyrx0z31sqn443r57hq";
 
   passthru = {
     updateScript = gnome3.updateScript {

From 70f06b3b61e419bad6a5acb71c9ea9f051689962 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 30 Dec 2018 19:03:00 -0500
Subject: [PATCH 034/274] font-droid: drop

deprecated in favor of noto https://github.com/google/fonts/issues/1223
---
 pkgs/data/fonts/droid/default.nix | 64 -------------------------------
 pkgs/top-level/all-packages.nix   |  2 -
 2 files changed, 66 deletions(-)
 delete mode 100644 pkgs/data/fonts/droid/default.nix

diff --git a/pkgs/data/fonts/droid/default.nix b/pkgs/data/fonts/droid/default.nix
deleted file mode 100644
index c2a4868a091c..000000000000
--- a/pkgs/data/fonts/droid/default.nix
+++ /dev/null
@@ -1,64 +0,0 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
-  name = "font-droid-${version}";
-  version = "2015-12-09";
-  at = "2776afefa9e0829076cd15fdc41e7950e2ffab82";
-
-  srcs = [
-    (fetchurl {
-      url = "https://github.com/google/fonts/raw/${at}/apache/droidsans/DroidSans.ttf";
-      sha256 = "1yml18dm86rrkihb2zz0ng8b1j2bb14hxc1d3hp0998vsr9s1w4h";
-    })
-    (fetchurl {
-      url = "https://github.com/google/fonts/raw/${at}/apache/droidsans/DroidSans-Bold.ttf";
-      sha256 = "1z61hz92d3l1pawmbc6iwi689v8rr0xlkx59pl89m1g9aampdrmh";
-    })
-    (fetchurl {
-      url = "https://github.com/google/fonts/raw/${at}/apache/droidsansmono/DroidSansMono.ttf";
-      sha256 = "0rzspxg457q4f4cp2wz93py13lbnqbhf12q4mzgy6j30njnjwl9h";
-    })
-    (fetchurl {
-      url = "https://github.com/google/fonts/raw/${at}/apache/droidserif/DroidSerif.ttf";
-      sha256 = "1y7jzi7dz8j1yp8dxbmbvd6dpsck2grk3q1kd5rl7f31vlq5prj1";
-    })
-    (fetchurl {
-      url = "https://github.com/google/fonts/raw/${at}/apache/droidserif/DroidSerif-Bold.ttf";
-      sha256 = "1c61b423sn5nnr2966jdzq6fy8pw4kg79cr3nbby83jsly389f9b";
-    })
-    (fetchurl {
-      url = "https://github.com/google/fonts/raw/${at}/apache/droidserif/DroidSerif-Italic.ttf";
-      sha256 = "1bvrilgi0s72hiiv32hlxnzazslh3rbz8wgmsln0i9mnk7jr9bs0";
-    })
-    (fetchurl {
-      url = "https://github.com/google/fonts/raw/${at}/apache/droidserif/DroidSerif-BoldItalic.ttf";
-      sha256 = "052vlkmhy9c5nyk4byvhzya3y57fb09lqxd6spar6adf9ajbylgi";
-    })
-  ];
-
-  phases = [ "unpackPhase" "installPhase" ];
-
-  sourceRoot = "./";
-
-  unpackCmd = ''
-    ttfName=$(basename $(stripHash $curSrc))
-    cp $curSrc ./$ttfName
-  '';
-
-  installPhase = ''
-    mkdir -p $out/share/fonts/droid
-    cp *.ttf $out/share/fonts/droid
-  '';
-
-  outputHashAlgo = "sha256";
-  outputHashMode = "recursive";
-  outputHash = "1l3lqfdr9pm05b1py9yr3cf65gi1my7jrrlvikqpqg2zr066n6c3";
-
-  meta = {
-    description = "Droid Family fonts by Google Android";
-    homepage = https://github.com/google/fonts;
-    license = stdenv.lib.licenses.asl20;
-    platforms = stdenv.lib.platforms.all;
-    maintainers = [];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 50e56ca92dc9..41d3d16cddd7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15515,8 +15515,6 @@ in
 
   freefont_ttf = callPackage ../data/fonts/freefont-ttf { };
 
-  font-droid = callPackage ../data/fonts/droid { };
-
   freepats = callPackage ../data/misc/freepats { };
 
   gentium = callPackage ../data/fonts/gentium {};

From b6b9e016fc2cf0e9085c7d305dba4113eb4b02bf Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 30 Dec 2018 19:04:00 -0500
Subject: [PATCH 035/274] font-awesome_5: 5.5.0 -> 5.6.3

---
 pkgs/data/fonts/font-awesome-5/default.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/data/fonts/font-awesome-5/default.nix b/pkgs/data/fonts/font-awesome-5/default.nix
index aea809c04ecd..c1eda7e6a56a 100644
--- a/pkgs/data/fonts/font-awesome-5/default.nix
+++ b/pkgs/data/fonts/font-awesome-5/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip }:
 
 let
-  version = "5.5.0";
+  version = "5.6.3";
 in fetchzip rec {
   name = "font-awesome-${version}";
 
@@ -9,12 +9,10 @@ in fetchzip rec {
 
   postFetch = ''
     mkdir -p $out/share/fonts
-    unzip -j $downloadedFile "Font-Awesome-${version}/use-on-desktop/Font Awesome 5 Brands-Regular-400.otf" -d $out/share/fonts/opentype
-    unzip -j $downloadedFile "Font-Awesome-${version}/use-on-desktop/Font Awesome 5 Free-Regular-400.otf" -d $out/share/fonts/opentype
-    unzip -j $downloadedFile "Font-Awesome-${version}/use-on-desktop/Font Awesome 5 Free-Solid-900.otf" -d $out/share/fonts/opentype
+    unzip -j $downloadedFile "Font-Awesome-${version}/otfs/*.otf" -d $out/share/fonts/opentype
   '';
 
-  sha256 = "1drjc40glfqhwmfn3s4gz8hz1x0ncrwdr9n1i25m1l7pvsk26f5f";
+  sha256 = "0y3zar7hyx5pj8rpyk2kz3sx6zgrfif2ka2h4rg0b8h8qbja0al6";
 
   meta = with stdenv.lib; {
     description = "Font Awesome - OTF font";

From 43fdf78b8df81fefdc252088ae6ecefb26a02eba Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 30 Dec 2018 19:05:00 -0500
Subject: [PATCH 036/274] material-design-icons: 3.2.89 -> 3.3.92

---
 pkgs/data/fonts/material-design-icons/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/material-design-icons/default.nix b/pkgs/data/fonts/material-design-icons/default.nix
index c6e48cccb8ca..432bbaa78db7 100644
--- a/pkgs/data/fonts/material-design-icons/default.nix
+++ b/pkgs/data/fonts/material-design-icons/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "material-design-icons-${version}";
-  version = "3.2.89";
+  version = "3.3.92";
 
   src = fetchFromGitHub {
     owner  = "Templarian";
     repo   = "MaterialDesign-Webfont";
     rev    = "v${version}";
-    sha256 = "1rxaiiij96kqncsrlkyp109m36v28cgxild7z04k4jh79fvmhjvn";
+    sha256 = "0k8pv2nsp3al4i4awx5mv7cscpm8akjn567jl9dwzangcsai0l53";
   };
 
   installPhase = ''

From 38ca0c674d4135a7ecb6e40202b8284bb69350c8 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sun, 30 Dec 2018 19:06:00 -0500
Subject: [PATCH 037/274] iosevka: 2.0.1 -> 2.0.2

---
 pkgs/data/fonts/iosevka/bin.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix
index 9bf5b40a78de..529a727d6c0f 100644
--- a/pkgs/data/fonts/iosevka/bin.nix
+++ b/pkgs/data/fonts/iosevka/bin.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchzip }:
 
 let
-  version = "2.0.1";
+  version = "2.0.2";
 in fetchzip rec {
   name = "iosevka-bin-${version}";
 
@@ -12,7 +12,7 @@ in fetchzip rec {
     unzip -j $downloadedFile \*.ttc -d $out/share/fonts/iosevka
   '';
 
-  sha256 = "1i21ja348k22rlf8z9jp90cidpmcnwqsw12vdrmm556sdwdkrkpc";
+  sha256 = "0jr9d02dk4zbq3kyhpfs6gyynwss60210pc1dfxn0qbw3j9ch2l4";
 
   meta = with stdenv.lib; {
     homepage = https://be5invis.github.io/Iosevka/;

From ec0eaca0f4453ddcd20684cafd5abf6fb21a84d1 Mon Sep 17 00:00:00 2001
From: Trolli Schmittlauch <t.schmittlauch+nixos@orlives.de>
Date: Sun, 30 Dec 2018 03:12:43 +0100
Subject: [PATCH 038/274] kcharselect: init at 18.12.0

Packaging `kcharselect` because a KDE tool for inserting special
characters is very useful.
---
 pkgs/applications/kde/default.nix     |  1 +
 pkgs/applications/kde/kcharselect.nix | 19 +++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  6 +++---
 3 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/applications/kde/kcharselect.nix

diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix
index 43974e027a2f..c062db9e254a 100644
--- a/pkgs/applications/kde/default.nix
+++ b/pkgs/applications/kde/default.nix
@@ -93,6 +93,7 @@ let
       kcalc = callPackage ./kcalc.nix {};
       kcalcore = callPackage ./kcalcore.nix {};
       kcalutils = callPackage ./kcalutils.nix {};
+      kcharselect = callPackage ./kcharselect.nix {};
       kcolorchooser = callPackage ./kcolorchooser.nix {};
       kcontacts = callPackage ./kcontacts.nix {};
       kdav = callPackage ./kdav.nix {};
diff --git a/pkgs/applications/kde/kcharselect.nix b/pkgs/applications/kde/kcharselect.nix
new file mode 100644
index 000000000000..4af712b1d5a5
--- /dev/null
+++ b/pkgs/applications/kde/kcharselect.nix
@@ -0,0 +1,19 @@
+{
+  mkDerivation, lib,
+  extra-cmake-modules, kdoctools,
+  kbookmarks, kconfig, kconfigwidgets, kcrash, kcoreaddons, ki18n, kwidgetsaddons, kxmlgui
+}:
+
+mkDerivation {
+  name = "kcharselect";
+  meta = {
+    license = lib.licenses.gpl2Plus;
+    maintainers = [ lib.maintainers.schmittlauch ];
+    description = "A tool to select special characters from all installed fonts and copy them into the clipboard";
+  };
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [
+    kbookmarks kconfig kconfigwidgets kcoreaddons kcrash ki18n kwidgetsaddons kxmlgui
+  ];
+  enableParallelBuilding = true;
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6675f6a3905d..2ecc098df639 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17825,9 +17825,9 @@ in
 
   inherit (kdeApplications)
     akonadi akregator ark dolphin dragon ffmpegthumbs filelight gwenview k3b
-    kaddressbook kate kcachegrind kcalc kcolorchooser kcontacts kdenlive kdf kdialog keditbookmarks
-    kget kgpg khelpcenter kig kleopatra kmail kmix kolourpaint kompare konsole kpkpass kitinerary
-    kontact korganizer krdc krfb ksystemlog kwalletmanager marble minuet okular spectacle;
+    kaddressbook kate kcachegrind kcalc kcharselect kcolorchooser kcontacts kdenlive kdf kdialog
+    keditbookmarks kget kgpg khelpcenter kig kleopatra kmail kmix kolourpaint kompare konsole
+    kpkpass kitinerary kontact korganizer krdc krfb ksystemlog kwalletmanager marble minuet okular spectacle;
 
   okteta = libsForQt5.callPackage ../applications/editors/okteta { };
 

From 370d08f0d2b2a14bcde66e985888ec4150d7bb44 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 1 Jan 2019 23:50:02 +0100
Subject: [PATCH 039/274] gnucash2{4,6}: drop

---
 pkgs/applications/office/gnucash/2.4.nix |  91 ------------------
 pkgs/applications/office/gnucash/2.6.nix | 116 -----------------------
 pkgs/top-level/all-packages.nix          |  19 ----
 3 files changed, 226 deletions(-)
 delete mode 100644 pkgs/applications/office/gnucash/2.4.nix
 delete mode 100644 pkgs/applications/office/gnucash/2.6.nix

diff --git a/pkgs/applications/office/gnucash/2.4.nix b/pkgs/applications/office/gnucash/2.4.nix
deleted file mode 100644
index 40c91d6488d6..000000000000
--- a/pkgs/applications/office/gnucash/2.4.nix
+++ /dev/null
@@ -1,91 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, libxml2, gconf, glib, gtk2, libgnomeui, libofx
-, libgtkhtml, gtkhtml, libgnomeprint, goffice, enchant, gettext, libbonoboui
-, intltool, perl, guile, slibGuile, swig, isocodes, bzip2, makeWrapper, libglade
-, libgsf, libart_lgpl, perlPackages, aqbanking, gwenhywfar, hicolor-icon-theme
-, pcre
-}:
-
-/* If you experience GConf errors when running GnuCash on NixOS, see
- * http://wiki.nixos.org/wiki/Solve_GConf_errors_when_running_GNOME_applications
- * for a possible solution.
- */
-
-stdenv.mkDerivation rec {
-  name = "gnucash-2.4.15";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/gnucash/${name}.tar.bz2";
-    sha256 = "058mgfwic6a2g7jq6iip5hv45md1qaxy25dj4lvlzjjr141wm4gx";
-  };
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [
-    libxml2 gconf glib gtk2 libgnomeui libgtkhtml gtkhtml
-    libgnomeprint goffice enchant gettext intltool perl guile slibGuile
-    swig isocodes bzip2 makeWrapper libofx libglade libgsf libart_lgpl
-    perlPackages.DateManip perlPackages.FinanceQuote aqbanking gwenhywfar
-    hicolor-icon-theme pcre
-  ];
-  propagatedUserEnvPkgs = [ gconf ];
-
-  configureFlags = [
-    "CFLAGS=-O3"
-    "CXXFLAGS=-O3"
-    "--disable-dbi"
-    "--enable-ofx"
-    "--enable-aqbanking"
-  ];
-
-  postInstall = ''
-    # Auto-updaters don't make sense in Nix.
-    rm $out/bin/gnc-fq-update
-
-    sed -i $out/bin/update-gnucash-gconf \
-       -e 's|--config-source=[^ ]* --install-schema-file|--makefile-install-rule|'
-
-    for prog in $(echo "$out/bin/"*)
-    do
-      # Don't wrap the gnc-fq-* scripts, since gnucash calls them as
-      # "perl <script>', i.e. they must be Perl scripts.
-      if [[ $prog =~ gnc-fq ]]; then continue; fi
-      wrapProgram "$prog"                                               \
-        --set SCHEME_LIBRARY_PATH "$SCHEME_LIBRARY_PATH"                \
-        --prefix GUILE_LOAD_PATH ":" "$GUILE_LOAD_PATH"                 \
-        --prefix LD_LIBRARY_PATH ":" "${libgnomeui}/lib/libglade/2.0"   \
-        --prefix LD_LIBRARY_PATH ":" "${libbonoboui}/lib/libglade/2.0"  \
-        --prefix PERL5LIB ":" "$PERL5LIB"                               \
-        --set GCONF_CONFIG_SOURCE 'xml::~/.gconf'                       \
-        --prefix PATH ":" "$out/bin:${stdenv.lib.makeBinPath [ perl gconf ]}"
-    done
-  '';
-
-  # The following settings fix failures in the test suite. It's not required otherwise.
-  NIX_LDFLAGS = "-rpath=${guile}/lib -rpath=${glib.out}/lib";
-  preCheck = "export GNC_DOT_DIR=$PWD/dot-gnucash";
-
-  doCheck = false;      # https://github.com/NixOS/nixpkgs/issues/11084
-
-  enableParallelBuilding = true;
-
-  meta = {
-    description = "Personal and small-business financial-accounting application";
-
-    longDescription = ''
-      GnuCash is personal and small-business financial-accounting software,
-      freely licensed under the GNU GPL and available for GNU/Linux, BSD,
-      Solaris, macOS and Microsoft Windows.
-
-      Designed to be easy to use, yet powerful and flexible, GnuCash allows
-      you to track bank accounts, stocks, income and expenses.  As quick and
-      intuitive to use as a checkbook register, it is based on professional
-      accounting principles to ensure balanced books and accurate reports.
-    '';
-
-    license = stdenv.lib.licenses.gpl2Plus;
-
-    homepage = http://www.gnucash.org/;
-
-    maintainers = [ stdenv.lib.maintainers.peti stdenv.lib.maintainers.domenkozar ];
-    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/applications/office/gnucash/2.6.nix b/pkgs/applications/office/gnucash/2.6.nix
deleted file mode 100644
index 471d2d757d96..000000000000
--- a/pkgs/applications/office/gnucash/2.6.nix
+++ /dev/null
@@ -1,116 +0,0 @@
-{ fetchurl, fetchpatch, stdenv, intltool, pkgconfig, file, makeWrapper
-, libxml2, libxslt, perl, perlPackages, gconf, guile
-, glib, gtk2, libofx, aqbanking, gwenhywfar, libgnomecanvas, goffice
-, webkit, glibcLocales, gsettings-desktop-schemas, dconf
-, gettext, swig, slibGuile, enchant, bzip2, isocodes, libdbi, libdbiDrivers
-, pango, gdk_pixbuf, hicolor-icon-theme
-}:
-
-/*
-Two cave-ats right now:
-  1. HTML reports are broken
-  2. You need to have dconf installed (GNOME3 should have it automatically,
-     otherwise put it in environment.systemPackages), for settings
-*/
-
-stdenv.mkDerivation rec {
-  name = "gnucash-2.6.18-1";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/gnucash/${name}.tar.bz2";
-    sha256 = "1794qi7lkn1kbnhzk08wawacfcphbln3ngdl3q0qax5drv7hnwv8";
-  };
-
-  patches = [
-    (fetchpatch {
-     sha256 = "11nlf9j7jm1i37mfcmmnkplxr3nlf257fxd01095vd65i2rn1m8h";
-     name = "fix-brittle-test.patch";
-     url = "https://github.com/Gnucash/gnucash/commit/42ac55e03a1a84739f4a5b7a247c31d91c0adc4a.patch";
-    })
-  ];
-
-  nativeBuildInputs = [ intltool pkgconfig file makeWrapper ];
-
-  buildInputs = [
-    # general
-    libxml2 libxslt glibcLocales gettext swig enchant
-    bzip2 isocodes
-    # glib, gtk...
-    glib gtk2 goffice webkit hicolor-icon-theme
-    # gnome...
-    dconf gconf libgnomecanvas gsettings-desktop-schemas
-    # financial
-    libofx aqbanking gwenhywfar
-    # perl
-    perl perlPackages.FinanceQuote perlPackages.DateManip
-    # guile
-    guile slibGuile
-    # database backends
-    libdbi libdbiDrivers
-  ];
-
-  postPatch = ''
-    patchShebangs ./src
-  '';
-
-  configureFlags = [
-    "CFLAGS=-O3"
-    "CXXFLAGS=-O3"
-    "--enable-dbi"
-    "--with-dbi-dbd-dir=${libdbiDrivers}/lib/dbd/"
-    "--enable-ofx"
-    "--enable-aqbanking"
-  ];
-
-  postInstall = ''
-    # Auto-updaters don't make sense in Nix.
-    rm $out/bin/gnc-fq-update
-
-    #sed -i $out/bin/update-gnucash-gconf \
-    #   -e 's|--config-source=[^ ]* --install-schema-file|--makefile-install-rule|'
-
-    for prog in $(echo "$out/bin/"*)
-    do
-      # Don't wrap the gnc-fq-* scripts, since gnucash calls them as
-      # "perl <script>', i.e. they must be Perl scripts.
-      if [[ $prog =~ gnc-fq ]]; then continue; fi
-      wrapProgram "$prog"                                               \
-        --set SCHEME_LIBRARY_PATH "$SCHEME_LIBRARY_PATH"                \
-        --prefix GUILE_LOAD_PATH ":" "$GUILE_LOAD_PATH"                 \
-        --prefix PERL5LIB ":" "$PERL5LIB"                               \
-        --set GCONF_CONFIG_SOURCE 'xml::~/.gconf'                       \
-        --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share/gsettings-schemas/${name}" \
-        --prefix GIO_EXTRA_MODULES : "${stdenv.lib.getLib dconf}/lib/gio/modules"  \
-        --prefix PATH ":" "$out/bin:${stdenv.lib.makeBinPath [ perl gconf ]}"
-    done
-  '';
-
-  # The following settings fix failures in the test suite. It's not required otherwise.
-  LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ guile glib gtk2 pango gdk_pixbuf ];
-  preCheck = "export GNC_DOT_DIR=$PWD/dot-gnucash";
-  doCheck = true;
-
-  enableParallelBuilding = true;
-
-  meta = {
-    description = "Personal and small-business financial-accounting application";
-
-    longDescription = ''
-      GnuCash is personal and small-business financial-accounting software,
-      freely licensed under the GNU GPL and available for GNU/Linux, BSD,
-      Solaris, macOS and Microsoft Windows.
-
-      Designed to be easy to use, yet powerful and flexible, GnuCash allows
-      you to track bank accounts, stocks, income and expenses.  As quick and
-      intuitive to use as a checkbook register, it is based on professional
-      accounting principles to ensure balanced books and accurate reports.
-    '';
-
-    license = stdenv.lib.licenses.gpl2Plus;
-
-    homepage = http://www.gnucash.org/;
-
-    maintainers = [ stdenv.lib.maintainers.peti stdenv.lib.maintainers.domenkozar ];
-    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 41d3d16cddd7..48e36ac6bc0f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17322,25 +17322,6 @@ in
     inherit (gnome3) dconf;
   };
 
-  gnucash24 = callPackage ../applications/office/gnucash/2.4.nix {
-    inherit (gnome2) libgnomeui libgtkhtml gtkhtml libbonoboui libgnomeprint libglade libart_lgpl;
-    gconf = gnome2.GConf;
-    guile = guile_1_8;
-    slibGuile = slibGuile.override { scheme = guile_1_8; };
-    goffice = goffice_0_8;
-  };
-
-  gnucash26 = lowPrio (callPackage ../applications/office/gnucash/2.6.nix {
-    inherit (gnome2) libgnomecanvas;
-    inherit (gnome3) dconf;
-    gconf = gnome2.GConf;
-    goffice = goffice_0_8;
-    webkit = webkitgtk24x-gtk2;
-    guile = guile_1_8;
-    slibGuile = slibGuile.override { scheme = guile_1_8; };
-    glib = glib;
-  });
-
   goffice = callPackage ../development/libraries/goffice { };
 
   goffice_0_8 = callPackage ../development/libraries/goffice/0.8.nix {

From de6d70f52e2acbc08d1e9db8c0f9af0a671d2137 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 1 Jan 2019 23:52:22 +0100
Subject: [PATCH 040/274] goffice_0_8: drop

---
 pkgs/development/libraries/goffice/0.8.nix    | 38 -------------------
 .../libraries/goffice/pcre_info.patch         | 13 -------
 pkgs/top-level/all-packages.nix               |  6 ---
 3 files changed, 57 deletions(-)
 delete mode 100644 pkgs/development/libraries/goffice/0.8.nix
 delete mode 100644 pkgs/development/libraries/goffice/pcre_info.patch

diff --git a/pkgs/development/libraries/goffice/0.8.nix b/pkgs/development/libraries/goffice/0.8.nix
deleted file mode 100644
index e050a615dd17..000000000000
--- a/pkgs/development/libraries/goffice/0.8.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, glib, gtk2, libglade, bzip2
-, pango, libgsf, libxml2, libart, intltool, gettext
-, cairo, gconf, libgnomeui, pcre, goffice/*just meta*/ }:
-
-stdenv.mkDerivation rec {
-  name = "goffice-0.8.17";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/goffice/0.8/${name}.tar.xz";
-    sha256 = "165070beb67b84580afe80a8a100b674a81d553ab791acd72ac0c655f4fadb15";
-  };
-
-  # fix linking error: undefined reference to pcre_info
-  patches = [ ./pcre_info.patch ]; # inspired by https://bugs.php.net/bug.php?id=60986
-
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [
-    libglade bzip2 libart intltool gettext
-    gconf libgnomeui pcre
-  ];
-
-  propagatedBuildInputs = [
-    # All these are in the "Requires:" field of `libgoffice-0.6.pc'.
-    glib libgsf libxml2 gtk2 libglade libart cairo pango
-  ];
-
-  postInstall =
-    ''
-      # Get GnuCash to build.  Might be unnecessary if we upgrade pkgconfig.
-      substituteInPlace $out/lib/pkgconfig/libgoffice-*.pc --replace Requires.private Requires
-    '';
-
-  doCheck = true;
-
-  meta = goffice.meta // {
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/development/libraries/goffice/pcre_info.patch b/pkgs/development/libraries/goffice/pcre_info.patch
deleted file mode 100644
index cd4ef3c9fed7..000000000000
--- a/pkgs/development/libraries/goffice/pcre_info.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/goffice/utils/regutf8.c b/goffice/utils/regutf8.c
-index bc4aae4..3adb696 100644
---- a/goffice/utils/regutf8.c
-+++ b/goffice/utils/regutf8.c
-@@ -155,7 +155,7 @@ go_regcomp (GORegexp *gor, const char *pat, int cflags)
- 		default: return GO_REG_BADPAT;
- 		}
- 	} else {
--		gor->re_nsub = pcre_info (r, NULL, NULL);
-+		gor->re_nsub = pcre_fullinfo (r, NULL, NULL, NULL);
- 		gor->nosub = (cflags & GO_REG_NOSUB) != 0;
- 		return 0;
- 	}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 48e36ac6bc0f..992f578c211c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -17324,12 +17324,6 @@ in
 
   goffice = callPackage ../development/libraries/goffice { };
 
-  goffice_0_8 = callPackage ../development/libraries/goffice/0.8.nix {
-    inherit (pkgs.gnome2) libglade libgnomeui;
-    gconf = pkgs.gnome2.GConf;
-    libart = pkgs.gnome2.libart_lgpl;
-  };
-
   jetbrains = (recurseIntoAttrs (callPackages ../applications/editors/jetbrains {
     jdk = jetbrains.jdk;
   }) // {

From 01a6191107ef67c32e749edf8857271cd0cba60b Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 2 Jan 2019 01:14:08 +0100
Subject: [PATCH 041/274] =?UTF-8?q?gssdp:=201.0.2=20=E2=86=92=201.1.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/libraries/gssdp/default.nix | 23 +++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix
index ed1e5b6faabb..460c4f2b8aca 100644
--- a/pkgs/development/libraries/gssdp/default.nix
+++ b/pkgs/development/libraries/gssdp/default.nix
@@ -1,26 +1,33 @@
-{ stdenv, fetchurl, pkgconfig, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, libsoup, gtk3, glib }:
+{ stdenv, fetchurl, meson, ninja, pkgconfig, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, libsoup, gtk3, glib, gnome3 }:
 
 stdenv.mkDerivation rec {
-  name = "gssdp-${version}";
-  version = "1.0.2";
+  pname = "gssdp";
+  version = "1.1.1";
 
   outputs = [ "out" "bin" "dev" "devdoc" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gssdp/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "1p1m2m3ndzr2whipqw4vfb6s6ia0g7rnzzc4pnq8b8g1qw4prqd1";
+    url = "mirror://gnome/sources/gssdp/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    sha256 = "0xwykd2ks3nyy67kirxbcl0xplj7mdjx5m3pqvgja129k0b1kf99";
   };
 
-  nativeBuildInputs = [ pkgconfig gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_412 ];
+  nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_412 ];
   buildInputs = [ libsoup gtk3 ];
   propagatedBuildInputs = [ glib ];
 
-  configureFlags = [
-    "--enable-gtk-doc"
+  mesonFlags = [
+    "-Dgtk_doc=true"
   ];
 
   doCheck = true;
 
+  passthru = {
+    updateScript = gnome3.updateScript {
+      packageName = pname;
+      versionPolicy = "none";
+    };
+  };
+
   meta = with stdenv.lib; {
     description = "GObject-based API for handling resource discovery and announcement over SSDP";
     homepage = http://www.gupnp.org/;

From 5c753f53d8bc74fe03c975db9e43570faf5ebc95 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 2 Jan 2019 01:24:08 +0100
Subject: [PATCH 042/274] =?UTF-8?q?Revert=20"gssdp:=201.0.2=20=E2=86=92=20?=
 =?UTF-8?q?1.1.1"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 01a6191107ef67c32e749edf8857271cd0cba60b.
---
 pkgs/development/libraries/gssdp/default.nix | 23 +++++++-------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/libraries/gssdp/default.nix b/pkgs/development/libraries/gssdp/default.nix
index 460c4f2b8aca..ed1e5b6faabb 100644
--- a/pkgs/development/libraries/gssdp/default.nix
+++ b/pkgs/development/libraries/gssdp/default.nix
@@ -1,33 +1,26 @@
-{ stdenv, fetchurl, meson, ninja, pkgconfig, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, libsoup, gtk3, glib, gnome3 }:
+{ stdenv, fetchurl, pkgconfig, gobject-introspection, vala, gtk-doc, docbook_xsl, docbook_xml_dtd_412, libsoup, gtk3, glib }:
 
 stdenv.mkDerivation rec {
-  pname = "gssdp";
-  version = "1.1.1";
+  name = "gssdp-${version}";
+  version = "1.0.2";
 
   outputs = [ "out" "bin" "dev" "devdoc" ];
 
   src = fetchurl {
-    url = "mirror://gnome/sources/gssdp/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0xwykd2ks3nyy67kirxbcl0xplj7mdjx5m3pqvgja129k0b1kf99";
+    url = "mirror://gnome/sources/gssdp/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
+    sha256 = "1p1m2m3ndzr2whipqw4vfb6s6ia0g7rnzzc4pnq8b8g1qw4prqd1";
   };
 
-  nativeBuildInputs = [ meson ninja pkgconfig gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_412 ];
+  nativeBuildInputs = [ pkgconfig gobject-introspection vala gtk-doc docbook_xsl docbook_xml_dtd_412 ];
   buildInputs = [ libsoup gtk3 ];
   propagatedBuildInputs = [ glib ];
 
-  mesonFlags = [
-    "-Dgtk_doc=true"
+  configureFlags = [
+    "--enable-gtk-doc"
   ];
 
   doCheck = true;
 
-  passthru = {
-    updateScript = gnome3.updateScript {
-      packageName = pname;
-      versionPolicy = "none";
-    };
-  };
-
   meta = with stdenv.lib; {
     description = "GObject-based API for handling resource discovery and announcement over SSDP";
     homepage = http://www.gupnp.org/;

From 5b6ac828890a44803f3a6aa8f68955acaf8489f3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 1 Jan 2019 17:29:45 -0800
Subject: [PATCH 043/274] xdaliclock: 2.43 -> 2.44

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/xdaliclock/versions
---
 pkgs/tools/misc/xdaliclock/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/xdaliclock/default.nix b/pkgs/tools/misc/xdaliclock/default.nix
index dd3cbb33c1b1..b97b562b3064 100644
--- a/pkgs/tools/misc/xdaliclock/default.nix
+++ b/pkgs/tools/misc/xdaliclock/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "xdaliclock-${version}";
-  version = "2.43";
+  version = "2.44";
 
   src = fetchurl {
     url="https://www.jwz.org/xdaliclock/${name}.tar.gz";
-    sha256 = "194zzp1a989k2v8qzfr81gdknr8xiz16d6fdl63jx9r3mj5klmvb";
+    sha256 = "1gsgnsm6ql0mcg9zpdkhws3g23r3a92bc3rpg4qbgbmd02nvj3c0";
   };
 
   # Note: don't change this to set sourceRoot, or updateAutotoolsGnuConfigScriptsHook

From bbea4663b9e0048f0d42a6f0a16d7593e3c9bf31 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 1 Jan 2019 18:17:43 -0800
Subject: [PATCH 044/274] urh: 2.5.1 -> 2.5.3

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/urh/versions
---
 pkgs/applications/misc/urh/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/urh/default.nix b/pkgs/applications/misc/urh/default.nix
index 4dc8d5cfa3e7..54648efaaaf7 100644
--- a/pkgs/applications/misc/urh/default.nix
+++ b/pkgs/applications/misc/urh/default.nix
@@ -3,13 +3,13 @@
 
 python3Packages.buildPythonApplication rec {
   name = "urh-${version}";
-  version = "2.5.1";
+  version = "2.5.3";
 
   src = fetchFromGitHub {
     owner = "jopohl";
     repo = "urh";
     rev = "v${version}";
-    sha256 = "01n4swm2q2i10qvhfw1q04wxf48xwqlddfg7842ff98i2d9yxy13";
+    sha256 = "050c7vhxxwvmkahdhwdk371qhfnmass5bs9zxr8yj4mqfnihcmi8";
   };
 
   buildInputs = [ hackrf rtl-sdr airspy limesuite ];

From 7cdb77b76f7c57a66d6513174f92ab5b15e0f923 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 1 Jan 2019 18:50:15 -0800
Subject: [PATCH 045/274] woeusb: 3.2.10 -> 3.2.12

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/woeusb/versions
---
 pkgs/tools/misc/woeusb/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/woeusb/default.nix b/pkgs/tools/misc/woeusb/default.nix
index f73aa4547993..c50543825074 100644
--- a/pkgs/tools/misc/woeusb/default.nix
+++ b/pkgs/tools/misc/woeusb/default.nix
@@ -3,14 +3,14 @@
 , wxGTK30 }:
 
 stdenv.mkDerivation rec {
-  version = "3.2.10";
+  version = "3.2.12";
   name = "woeusb-${version}";
 
   src = fetchFromGitHub {
     owner = "slacka";
     repo = "WoeUSB";
     rev = "v${version}";
-    sha256 = "0jzgwh9xv92yns5yi5zpl49zbp3csh6m6iclgq070awpjpsqlqi0";
+    sha256 = "14arz0g95favbl5vsngxm3xznva223x67a9as5n2mpf5bbkd9zx5";
   };
 
   nativeBuildInputs = [ autoreconfHook makeWrapper ];

From df1e972cd4fbef57cb67655b94de003834c3ec11 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 1 Jan 2019 19:46:40 -0800
Subject: [PATCH 046/274] visidata: 1.5 -> 1.5.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/visidata/versions
---
 pkgs/applications/misc/visidata/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/visidata/default.nix b/pkgs/applications/misc/visidata/default.nix
index 20e3c3daccb0..68e3de4b3417 100644
--- a/pkgs/applications/misc/visidata/default.nix
+++ b/pkgs/applications/misc/visidata/default.nix
@@ -4,13 +4,13 @@
 buildPythonApplication rec {
   name = "${pname}-${version}";
   pname = "visidata";
-  version = "1.5";
+  version = "1.5.1";
 
   src = fetchFromGitHub {
     owner = "saulpw";
     repo = "visidata";
     rev = "v${version}";
-    sha256 = "0schpfksxddbsv0s54pv1jrf151nw9kr51m41fp0ycnw7z2jqirm";
+    sha256 = "1pflv7nnv9nyfhynrdbh5pgvjxzj53hgqd972dis9rwwwkla26ng";
   };
 
   propagatedBuildInputs = [dateutil pyyaml openpyxl xlrd h5py fonttools

From 8726301d33b404437e2c04f39e33493db164870e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 1 Jan 2019 20:43:27 -0800
Subject: [PATCH 047/274] sc-controller: 0.4.6 -> 0.4.6.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/sc-controller/versions
---
 pkgs/misc/drivers/sc-controller/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/drivers/sc-controller/default.nix b/pkgs/misc/drivers/sc-controller/default.nix
index c0f471c8e201..764e60ac13ba 100644
--- a/pkgs/misc/drivers/sc-controller/default.nix
+++ b/pkgs/misc/drivers/sc-controller/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonApplication rec {
   pname = "sc-controller";
-  version = "0.4.6";
+  version = "0.4.6.1";
 
   src = fetchFromGitHub {
     owner  = "kozec";
     repo   = pname;
     rev    = "v${version}";
-    sha256 = "0527igjgc5jf60ldsrc4xv3k8gw2480pmqyp6nv5xcrm5j0ah4q5";
+    sha256 = "1kcqsnrlwl4s94j6ahgkz3w4sy9hsr95y624zab6g10w0fl5sqrc";
   };
 
   nativeBuildInputs = [ wrapGAppsHook ];

From 94c83eea02639a40c786849a1bbcdf28a9875d71 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 1 Jan 2019 21:09:45 -0800
Subject: [PATCH 048/274] sqlcipher: 4.0.0 -> 4.0.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/sqlcipher/versions
---
 pkgs/development/libraries/sqlcipher/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/sqlcipher/default.nix b/pkgs/development/libraries/sqlcipher/default.nix
index 0d31b294e1c4..46c006df9357 100644
--- a/pkgs/development/libraries/sqlcipher/default.nix
+++ b/pkgs/development/libraries/sqlcipher/default.nix
@@ -4,13 +4,13 @@ assert readline != null -> ncurses != null;
 
 stdenv.mkDerivation rec {
   name = "sqlcipher-${version}";
-  version = "4.0.0";
+  version = "4.0.1";
 
   src = fetchFromGitHub {
     owner = "sqlcipher";
     repo = "sqlcipher";
     rev = "v${version}";
-    sha256 = "0faadjr4qnm1pvm5yx37jfqqxqwii02nzlmmi2h91z6371888m7g";
+    sha256 = "08iqj80qlcsnid2s3m6gcryhvcfc0f136frv0md2gp3rz9g3l63d";
   };
 
   buildInputs = [ readline ncurses openssl tcl ];

From b1f04fe156fda0abd16c193a27c6e818aacae391 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 1 Jan 2019 22:30:41 -0800
Subject: [PATCH 049/274] tcpreplay: 4.3.0 -> 4.3.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/tcpreplay/versions
---
 pkgs/tools/networking/tcpreplay/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/tcpreplay/default.nix b/pkgs/tools/networking/tcpreplay/default.nix
index 23f061445021..a977a83e23f0 100644
--- a/pkgs/tools/networking/tcpreplay/default.nix
+++ b/pkgs/tools/networking/tcpreplay/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "tcpreplay-${version}";
-  version = "4.3.0";
+  version = "4.3.1";
 
   src = fetchurl {
     url = "https://github.com/appneta/tcpreplay/releases/download/v${version}/tcpreplay-${version}.tar.gz";
-    sha256 = "17y7ga2r9pc0xi2lwg82r4xlmhg5gdn5n1ddlpazzw59hda9yp4k";
+    sha256 = "0d2ywaxq0iaa1kfhgsfhsk1c4w4lakxafsw90dn4m6k82486dflm";
   };
 
   buildInputs = [ libpcap ];

From 10889b111a24f3526f23dc2164faf8e7f4e93724 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 1 Jan 2019 23:23:12 -0800
Subject: [PATCH 050/274] sundials: 4.0.0 -> 4.0.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/sundials/versions
---
 pkgs/development/libraries/sundials/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/sundials/default.nix b/pkgs/development/libraries/sundials/default.nix
index 2a5acc313826..8fe2431d142b 100644
--- a/pkgs/development/libraries/sundials/default.nix
+++ b/pkgs/development/libraries/sundials/default.nix
@@ -3,12 +3,12 @@
 stdenv.mkDerivation rec {
 
   pname = "sundials";
-  version = "4.0.0";
+  version = "4.0.1";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://computation.llnl.gov/projects/${pname}/download/${pname}-${version}.tar.gz";
-    sha256 = "06cspmhx9qn7x722lmy9q2jr80hnnv2h7n54da7y5m951p1xfgcm";
+    sha256 = "1m5f2glxmgc6imjr0yqqp448r8q3kvsfp8dxxn83k00fcb40kr19";
   };
 
   preConfigure = ''

From f2043898139198bf024f0d8207cbcb5f383b73a8 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 1 Jan 2019 23:52:52 -0800
Subject: [PATCH 051/274] translate-shell: 0.9.6.8 -> 0.9.6.9

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/translate-shell/versions
---
 pkgs/applications/misc/translate-shell/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/translate-shell/default.nix b/pkgs/applications/misc/translate-shell/default.nix
index 15c4b8185a22..5d50238a9f00 100644
--- a/pkgs/applications/misc/translate-shell/default.nix
+++ b/pkgs/applications/misc/translate-shell/default.nix
@@ -3,13 +3,13 @@
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
   pname = "translate-shell";
-  version = "0.9.6.8";
+  version = "0.9.6.9";
 
   src = fetchFromGitHub {
     owner = "soimort";
     repo = "translate-shell";
     rev = "v${version}";
-    sha256 = "17fc5nlc594lvmihx39h4ddmi8ja3qqsyswzxadbaz7l3zm356b8";
+    sha256 = "1xyf0vdxmbgqcgsr1gvgwh1q4fh080h68radkim6pfcwzffliszm";
   };
 
   buildInputs = [ makeWrapper ];

From 67a26e5f784bda477d3b8be3c57e165ddcae5408 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 2 Jan 2019 00:17:29 -0800
Subject: [PATCH 052/274] xterm: 339 -> 341 (#53160)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/xterm/versions
---
 pkgs/applications/misc/xterm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/xterm/default.nix b/pkgs/applications/misc/xterm/default.nix
index 3a3025e7d692..e29bdd46e26a 100644
--- a/pkgs/applications/misc/xterm/default.nix
+++ b/pkgs/applications/misc/xterm/default.nix
@@ -3,14 +3,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "xterm-339";
+  name = "xterm-341";
 
   src = fetchurl {
     urls = [
      "ftp://ftp.invisible-island.net/xterm/${name}.tgz"
      "https://invisible-mirror.net/archives/xterm/${name}.tgz"
    ];
-    sha256 = "1kigkl4va1jxycqcf5dkg4d74j1fgrxhfbp8ib367crn6fqnprk5";
+    sha256 = "0i6b6gpr5qzbgv3jfl86q8d47bgppxr5gq503ng1ll2x5gx7v833";
   };
 
   buildInputs =

From d8e907ba18dfd49bb3fc0afe16bff7bd08ad8b0c Mon Sep 17 00:00:00 2001
From: David Guibert <david.guibert@gmail.com>
Date: Wed, 2 Jan 2019 09:54:22 +0100
Subject: [PATCH 053/274] conky: 1.11.0 -> 1.11.1 (#53157)

This fixes #52797.
---
 pkgs/os-specific/linux/conky/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix
index 34a3e0a12872..654e565140d1 100644
--- a/pkgs/os-specific/linux/conky/default.nix
+++ b/pkgs/os-specific/linux/conky/default.nix
@@ -66,13 +66,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "conky-${version}";
-  version = "1.11.0";
+  version = "1.11.1";
 
   src = fetchFromGitHub {
     owner = "brndnmtthws";
     repo = "conky";
     rev = "v${version}";
-    sha256 = "164xa6s90zakkvwivl296z6v7w8xchgxap7ib6yx4g1bxa0143mi";
+    sha256 = "00ghxzg78mp7w2y9cxhsdmkab2n7vfg76p6zihiglb2x3h2gjm5x";
   };
 
   postPatch = ''

From 8065fe8b8ee15df9aa9d33f76a56f91c8c6ba246 Mon Sep 17 00:00:00 2001
From: Lorenzo <lorenzo@mailbox.org>
Date: Wed, 2 Jan 2019 09:58:53 +0100
Subject: [PATCH 054/274] anki: 2.1.6-beta2 -> 2.1.7 (#53154)

---
 pkgs/games/anki/default.nix | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix
index 3f837886116c..b662b5b8e3bd 100644
--- a/pkgs/games/anki/default.nix
+++ b/pkgs/games/anki/default.nix
@@ -26,17 +26,17 @@
 }:
 
 buildPythonApplication rec {
-    version = "2.1.6-beta2";
+    version = "2.1.7";
     name = "anki-${version}";
 
     src = fetchurl {
       urls = [
-        "https://apps.ankiweb.net/downloads/beta/${name}-source.tgz"
+        "https://apps.ankiweb.net/downloads/current/${name}-source.tgz"
         # "https://apps.ankiweb.net/downloads/current/${name}-source.tgz"
         # "http://ankisrs.net/download/mirror/${name}.tgz"
         # "http://ankisrs.net/download/mirror/archive/${name}.tgz"
       ];
-      sha256 = "0h71s1j1269x0b8481z8xf019caqglcjs32xlpzk72087ps169fa";
+      sha256 = "0cvlimfxb7kficlf20hg7a345pahvr093b7yqvssww15h4y4va9d";
     };
 
     propagatedBuildInputs = [ pyqt5 sqlalchemy
@@ -54,16 +54,6 @@ buildPythonApplication rec {
     patches = [
       # Disable updated version check.
       ./no-version-check.patch
-
-      # This is needed to fix python 3.7 compatibilty, where the
-      # behaviour of `re.escape()` was changed in a way that it no
-      # longer escapes `%`. This patch detects this difference at
-      # runtime and makes anki work with any python version.
-      # Upstream PR: https://github.com/dae/anki/pull/266
-      (fetchpatch {
-        url = "https://github.com/dae/anki/commit/3d69aa9ce454a151ba75deafd7de117af2c7307d.patch";
-        sha256 = "0kf9gajhy0wcajp24xfia71z6gn1mc4vl37svvq4sqbhj3gigd0h";
-      })
     ];
 
     buildPhase = ''

From 108588b75b689c209be74039bda5490c8be96c52 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Wed, 2 Jan 2019 11:47:16 +0100
Subject: [PATCH 055/274] frogatto: init at 0.0.2018-12-09 (#52989)

---
 maintainers/maintainer-list.nix |  5 ++++
 pkgs/games/frogatto/data.nix    | 26 +++++++++++++++++
 pkgs/games/frogatto/default.nix | 43 ++++++++++++++++++++++++++++
 pkgs/games/frogatto/engine.nix  | 50 +++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 5 files changed, 126 insertions(+)
 create mode 100644 pkgs/games/frogatto/data.nix
 create mode 100644 pkgs/games/frogatto/default.nix
 create mode 100644 pkgs/games/frogatto/engine.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index e7750bfc47f5..71422e4ed5a6 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -391,6 +391,11 @@
     github = "asppsa";
     name = "Alastair Pharo";
   };
+  astro = {
+    email = "astro@spaceboyz.net";
+    github = "astro";
+    name = "Astro";
+  };
   astsmtl = {
     email = "astsmtl@yandex.ru";
     github = "astsmtl";
diff --git a/pkgs/games/frogatto/data.nix b/pkgs/games/frogatto/data.nix
new file mode 100644
index 000000000000..ec2cb9416661
--- /dev/null
+++ b/pkgs/games/frogatto/data.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub }:
+  
+stdenv.mkDerivation rec {
+  pname = "frogatto-data";
+  version = "unstable-2018-12-18";
+  
+  src = fetchFromGitHub {
+    owner = "frogatto";
+    repo = "frogatto";
+    # master branch as of 2018-12-18
+    rev = "8f261b5d3fca3c88e6a534316a28378cf687d3e5";
+    sha256 = "0nyfwfyy5gxp61ydna299nq9p5wra9mk0bf1drdngg6bwws1hrqx";
+  };
+
+  installPhase = ''
+    mkdir -p $out/share/frogatto/modules
+    cp -ar . $out/share/frogatto/modules/frogatto
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/frogatto/frogatto;
+    description = "Data files to the frogatto game";
+    license = with licenses; [ cc-by-30 unfree ];
+    maintainers = with maintainers; [ astro ];
+  };
+}
diff --git a/pkgs/games/frogatto/default.nix b/pkgs/games/frogatto/default.nix
new file mode 100644
index 000000000000..53be638e753a
--- /dev/null
+++ b/pkgs/games/frogatto/default.nix
@@ -0,0 +1,43 @@
+{ lib, buildEnv, stdenv, callPackage, makeWrapper, makeDesktopItem }:
+
+let
+  description = "Action-adventure game, starring a certain quixotic frog";
+  engine = callPackage ./engine.nix { };
+  data = callPackage ./data.nix { };
+  desktopItem = makeDesktopItem {
+    name = "frogatto";
+    exec = "frogatto";
+    startupNotify = "true";
+    icon = "${data}/share/frogatto/modules/frogatto/images/os/frogatto-icon.png";
+    comment = description;
+    desktopName = "Frogatto";
+    genericName = "frogatto";
+    categories = "Application;Game;ArcadeGame;";
+  };
+  version = "unstable-2018-12-18";
+in buildEnv rec {
+  name = "frogatto-${version}";
+
+  buildInputs = [ makeWrapper ];
+  paths = [ engine data desktopItem ];
+  pathsToLink = [
+    "/bin"
+    "/share/frogatto/data"
+    "/share/frogatto/images"
+    "/share/frogatto/modules"
+    "/share/applications"
+  ];
+
+  postBuild = ''
+    wrapProgram $out/bin/frogatto \
+      --run "cd $out/share/frogatto"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://frogatto.com;
+    description = description;
+    license = with licenses; [ cc-by-30 unfree ];
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ astro ];
+  };
+}
diff --git a/pkgs/games/frogatto/engine.nix b/pkgs/games/frogatto/engine.nix
new file mode 100644
index 000000000000..b49224d258d8
--- /dev/null
+++ b/pkgs/games/frogatto/engine.nix
@@ -0,0 +1,50 @@
+{ stdenv, fetchFromGitHub, bash, which
+, boost, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf
+, glew, zlib, icu, pkgconfig, cairo, libvpx }:
+
+stdenv.mkDerivation rec {
+  pname = "anura-engine";
+  version = "unstable-2018-11-28";
+
+  src = fetchFromGitHub {
+    owner = "anura-engine";
+    repo = "anura";
+    # trunk branch as of 2018-11-28
+    rev = "8070111467802dc772c0a6c7806ecd16b0bcdaa9";
+    sha256 = "0xbqwfmws69n7iiz17n93h4jiw39cwyf7hxw0qi2c8cccr37b1nr";
+    fetchSubmodules = true;
+  };
+
+  nativeBuildInputs = [
+    which pkgconfig
+  ];
+
+  buildInputs = [
+    boost
+    SDL2
+    SDL2_image
+    SDL2_mixer
+    SDL2_ttf
+    glew
+    zlib
+    icu
+    cairo
+    libvpx
+  ];
+
+  enableParallelBuilding = true;
+
+  installPhase = ''
+    mkdir -p $out/bin $out/share/frogatto
+    cp -ar data images modules $out/share/frogatto/
+    cp -a anura $out/bin/frogatto
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/anura-engine/anura;
+    description = "Game engine used by Frogatto";
+    license = licenses.zlib;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ astro ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3960c659bb35..8c652ad936df 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20628,6 +20628,8 @@ in
 
   frotz = callPackage ../games/frotz { };
 
+  frogatto = callPackage ../games/frogatto { };
+
   fsg = callPackage ../games/fsg {
     wxGTK = wxGTK28.override { unicode = false; };
   };

From 355bf44362c60b057304c8123315d3eb1c07737f Mon Sep 17 00:00:00 2001
From: elseym <elseym@me.com>
Date: Tue, 1 Jan 2019 23:08:33 +0100
Subject: [PATCH 056/274] pythonPackages.pytado: init at 0.2.7

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

diff --git a/pkgs/development/python-modules/pytado/default.nix b/pkgs/development/python-modules/pytado/default.nix
new file mode 100644
index 000000000000..2e597f01e882
--- /dev/null
+++ b/pkgs/development/python-modules/pytado/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, buildPythonPackage, fetchFromGitHub }:
+
+buildPythonPackage rec {
+  pname = "PyTado";
+  version = "0.2.7";
+
+  src = fetchFromGitHub {
+    owner = "wmalgadey";
+    repo = pname;
+    rev = "79a5dfdf75cd9a3e1a1ee8a8ff0d08923aebda7b";
+    sha256 = "14xdfw4913g4j4h576hjbigm7fiw8k0dc8s98gh2ag9xrc2ifgr0";
+  };
+
+  meta = with stdenv.lib; {
+    description = "Python binding for Tado web API. Pythonize your central heating!";
+    homepage = https://github.com/wmalgadey/PyTado;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ elseym ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4196663b4138..7656498e9758 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5147,6 +5147,8 @@ in {
 
   pybotvac = callPackage ../development/python-modules/pybotvac { };
 
+  pytado = callPackage ../development/python-modules/pytado { };
+
 });
 
 in fix' (extends overrides packages)

From 10d5af050fa533feaec4b4ca6ab3b48fd1840984 Mon Sep 17 00:00:00 2001
From: elseym <elseym@me.com>
Date: Tue, 1 Jan 2019 23:09:15 +0100
Subject: [PATCH 057/274] home-assistant: add tado dependency pytado

---
 pkgs/servers/home-assistant/component-packages.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index 2281ac57ed52..c9f0c4964cc2 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -251,7 +251,7 @@
     "climate.radiotherm" = ps: with ps; [  ];
     "climate.sensibo" = ps: with ps; [  ];
     "climate.spider" = ps: with ps; [  ];
-    "climate.tado" = ps: with ps; [  ];
+    "climate.tado" = ps: with ps; [ pytado ];
     "climate.tesla" = ps: with ps; [  ];
     "climate.toon" = ps: with ps; [  ];
     "climate.touchline" = ps: with ps; [  ];
@@ -375,7 +375,7 @@
     "device_tracker.sky_hub" = ps: with ps; [  ];
     "device_tracker.snmp" = ps: with ps; [ pysnmp ];
     "device_tracker.swisscom" = ps: with ps; [  ];
-    "device_tracker.tado" = ps: with ps; [  ];
+    "device_tracker.tado" = ps: with ps; [ pytado ];
     "device_tracker.tesla" = ps: with ps; [  ];
     "device_tracker.thomson" = ps: with ps; [  ];
     "device_tracker.tile" = ps: with ps; [  ];
@@ -1124,7 +1124,7 @@
     "sensor.synologydsm" = ps: with ps; [  ];
     "sensor.systemmonitor" = ps: with ps; [ psutil ];
     "sensor.sytadin" = ps: with ps; [ beautifulsoup4 ];
-    "sensor.tado" = ps: with ps; [  ];
+    "sensor.tado" = ps: with ps; [ pytado ];
     "sensor.tahoma" = ps: with ps; [  ];
     "sensor.tank_utility" = ps: with ps; [  ];
     "sensor.tautulli" = ps: with ps; [  ];
@@ -1321,7 +1321,7 @@
     "switch.zoneminder" = ps: with ps; [  ];
     "switch.zwave" = ps: with ps; [  ];
     "system_log" = ps: with ps; [ aiohttp-cors ];
-    "tado" = ps: with ps; [  ];
+    "tado" = ps: with ps; [ pytado ];
     "tahoma" = ps: with ps; [  ];
     "telegram_bot" = ps: with ps; [ python-telegram-bot ];
     "telegram_bot.broadcast" = ps: with ps; [  ];

From 9acc5d9b4528b6ce3e965ceec781339927e3a319 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Wed, 2 Jan 2019 11:37:28 +0000
Subject: [PATCH 058/274] emacs-packages: Drop custom weechat package

It's several years out of date and we can instead rely on
autogenerated packages
---
 pkgs/top-level/emacs-packages.nix | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index a83c3baaa4a0..9cd38e066d38 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -361,28 +361,6 @@ let
 
   tramp = callPackage ../applications/editors/emacs-modes/tramp { };
 
-  weechat = melpaBuild rec {
-    pname   = "weechat.el";
-    version = "0.2.2";
-    src = fetchFromGitHub {
-      owner  = "the-kenny";
-      repo   = pname;
-      rev    = version;
-      sha256 = "0f90m2s40jish4wjwfpmbgw024r7n2l5b9q9wr6rd3vdcwks3mcl";
-    };
-    postPatch = lib.optionalString (!stdenv.isLinux) ''
-      rm weechat-sauron.el weechat-secrets.el
-    '';
-    packageRequires = [ s ];
-    recipe = writeText "recipe" ''
-      (weechat :repo "the-kenny/weechat" :fetcher github)
-    '';
-    meta = {
-      description = "A weechat IRC client frontend for Emacs";
-      license = gpl3Plus;
-    };
-  };
-
   yaoddmuse = callPackage ../applications/editors/emacs-modes/yaoddmuse { };
 
   zeitgeist = callPackage ../applications/editors/emacs-modes/zeitgeist { };

From 13e9a017ebfc9cda61a0b796c13e008f8f3cbe4f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 2 Jan 2019 02:49:55 -0800
Subject: [PATCH 059/274] python37Packages.stem: 1.7.0 -> 1.7.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-stem/versions
---
 pkgs/development/python-modules/stem/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/stem/default.nix b/pkgs/development/python-modules/stem/default.nix
index d867f94a310b..69931a46007f 100644
--- a/pkgs/development/python-modules/stem/default.nix
+++ b/pkgs/development/python-modules/stem/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "stem";
-  version = "1.7.0";
+  version = "1.7.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1awiglfiajnx2hva9aqpj3fmdvdb4qg7cwnlfyih827m68y3cq8v";
+    sha256 = "18lc95pmc7i089nlsb06dsxyjl5wbhxfqgdxbjcia35ndh8z7sn9";
   };
 
   postPatch = ''

From 36f376777d6484eb125778ce2c0dc50e29059a54 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 2 Jan 2019 03:58:02 -0800
Subject: [PATCH 060/274] python37Packages.zodbpickle: 1.0.2 -> 1.0.3

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-zodbpickle/versions
---
 pkgs/development/python-modules/zodbpickle/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/zodbpickle/default.nix b/pkgs/development/python-modules/zodbpickle/default.nix
index 746099368fba..a9d99274afe0 100644
--- a/pkgs/development/python-modules/zodbpickle/default.nix
+++ b/pkgs/development/python-modules/zodbpickle/default.nix
@@ -5,12 +5,12 @@
 
 buildPythonPackage rec {
   pname = "zodbpickle";
-  version = "1.0.2";
+  version = "1.0.3";
   disabled = isPyPy; # https://github.com/zopefoundation/zodbpickle/issues/10
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f26e6eba6550ff1575ef2f2831fc8bc0b465f17f9757d0b6c7db55fab5702061";
+    sha256 = "0avr63rka9lrqngjfmny7hdds4klmg1nriwc7n3kgyrp44z2lk7c";
   };
 
   # fails..

From 3678ff868eb83e0f26a294b60574bbe3f44d5511 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 1 Jan 2019 19:11:36 -0800
Subject: [PATCH 061/274] wolfssl: 3.15.3 -> 3.15.7

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/wolfssl/versions
---
 pkgs/development/libraries/wolfssl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix
index 8f57a0bf1b71..8f3808bffcbc 100644
--- a/pkgs/development/libraries/wolfssl/default.nix
+++ b/pkgs/development/libraries/wolfssl/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "wolfssl-${version}";
-  version = "3.15.3";
+  version = "3.15.7";
 
   src = fetchFromGitHub {
     owner = "wolfSSL";
     repo = "wolfssl";
     rev = "v${version}-stable";
-    sha256 = "00mpq1z8j37a873dbk9knb835m3qlwqnd1rslirqkc44hpz1i64j";
+    sha256 = "128z1f7nry278kdjzq950cr81bml8p17fgdchmpvy0awhh7r20y9";
   };
 
   configureFlags = [ "--enable-all" ];

From d2499b137fc75540467280b232896a485bea453a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Tue, 1 Jan 2019 21:53:51 -0800
Subject: [PATCH 062/274] spoofer: 1.4.0 -> 1.4.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/spoofer/versions
---
 pkgs/tools/networking/spoofer/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/spoofer/default.nix b/pkgs/tools/networking/spoofer/default.nix
index 1043007e1dd2..8893c5e37fe0 100644
--- a/pkgs/tools/networking/spoofer/default.nix
+++ b/pkgs/tools/networking/spoofer/default.nix
@@ -6,12 +6,12 @@ in
 
 stdenv.mkDerivation rec {
   pname = "spoofer";
-  version = "1.4.0";
+  version = "1.4.2";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://www.caida.org/projects/spoofer/downloads/${name}.tar.gz";
-    sha256 = "0d745w7cy83hw7j950dah4h5qzclcibj16dik2gpsjnw1zq63cna";
+    sha256 = "041piwc2r4fig5b4apm2ibq1wyd11ic8p3xv3ss2hrbn5d8inza1";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 18a3815a8e39b8076422241d2a037e070b97aed7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 2 Jan 2019 06:27:09 -0800
Subject: [PATCH 063/274] python37Packages.channels: 2.1.5 -> 2.1.6

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-channels/versions
---
 pkgs/development/python-modules/channels/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/channels/default.nix b/pkgs/development/python-modules/channels/default.nix
index 74994154f2e7..6719c6669029 100644
--- a/pkgs/development/python-modules/channels/default.nix
+++ b/pkgs/development/python-modules/channels/default.nix
@@ -3,11 +3,11 @@
 }:
 buildPythonPackage rec {
   pname = "channels";
-  version = "2.1.5";
+  version = "2.1.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "48f97f1801e0a8da6d01430d16d4ed8bd460d4ec3130c66075fb94b12bb30a67";
+    sha256 = "15qmwkpmia9y32amg7dqx3ph81b6m3fa0pawhq8gshvdfjdvhfjd";
   };
 
   # Files are missing in the distribution

From cea9a2c9dfaf3f9034935a60f9b1bdeb86788501 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 2 Jan 2019 16:26:06 +0100
Subject: [PATCH 064/274] cproto: 4.6 -> 4.7o

The package seems rather abandoned (here in nixpkgs).
The bump fixes some problems, but it's probably still not suitable
for my use cases, though let me push the improvements anyway.
---
 .../development/tools/misc/cproto/default.nix | 32 +++++++++++++------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/tools/misc/cproto/default.nix b/pkgs/development/tools/misc/cproto/default.nix
index e79326eeba4d..8a0cb095d445 100644
--- a/pkgs/development/tools/misc/cproto/default.nix
+++ b/pkgs/development/tools/misc/cproto/default.nix
@@ -1,22 +1,34 @@
 { stdenv, fetchurl, flex, bison }:
 
-stdenv.mkDerivation {
-  name = "cproto-4.6";
+stdenv.mkDerivation rec {
+  name = "cproto-${version}";
+  version = "4.7o";
 
   src = fetchurl {
-    url = mirror://sourceforge/cproto/cproto-4.6.tar.gz;
-    sha256 = "0ilhkx9iwc5bh65q47mf68p39iyk07d52fv00z431nl6qcb9hp9j";
+    urls = [
+      "mirror://debian/pool/main/c/cproto/cproto_${version}.orig.tar.gz"
+      # No version listings and apparently no versioned tarball over http(s).
+      "ftp://ftp.invisible-island.net/cproto/cproto-${version}.tgz"
+    ];
+    sha256 = "0kxlrhhgm84v2q6n3wp7bb77g7wjxkb7azdvb6a70naf0rr0nsy7";
   };
 
-  buildInputs = [flex bison];
-
   # patch made by Joe Khoobyar copied from gentoo bugs
   patches = ./cproto_patch;
 
-  meta = {
+  nativeBuildInputs = [ flex bison ];
+
+  doCheck = true;
+
+  doInstallCheck = true;
+  installCheckPhase = ''
+    [ "$("$out/bin/cproto" -V 2>&1)" = '${version}' ]
+  '';
+
+  meta = with stdenv.lib; {
     description = "Tool to generate C function prototypes from C source code";
-    homepage = http://cproto.sourceforge.net/;
-    license = stdenv.lib.licenses.publicDomain;
-    platforms = stdenv.lib.platforms.linux;
+    homepage = https://invisible-island.net/cproto/;
+    license = licenses.publicDomain;
+    platforms = platforms.linux;
   };
 }

From a9c3035bd12e27a0e476f0dfb9350f5ed260cde9 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Wed, 2 Jan 2019 17:29:56 +0300
Subject: [PATCH 065/274] zsh-command-time: enable work with options customPkgs

---
 pkgs/shells/zsh/zsh-command-time/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/zsh/zsh-command-time/default.nix b/pkgs/shells/zsh/zsh-command-time/default.nix
index c82b455200a9..c81c1ea46c5f 100644
--- a/pkgs/shells/zsh/zsh-command-time/default.nix
+++ b/pkgs/shells/zsh/zsh-command-time/default.nix
@@ -2,7 +2,8 @@
 
 # To make use of this plugin, need to add
 #   programs.zsh.interactiveShellInit = ''
-#     source ${pkgs.zsh-command-time}/share/zsh-command-time/command-time.plugin.zsh
+#     source ${pkgs.zsh-command-time}/share/zsh/plugins/command-time/command-time.plugin.zsh
+#     ZSH_COMMAND_TIME_COLOR="yellow"
 #     ZSH_COMMAND_TIME_MIN_SECONDS=3
 #     ZSH_COMMAND_TIME_ECHO=1
 #   '';
@@ -21,7 +22,7 @@ stdenv.mkDerivation rec {
   phases = [ "installPhase" ];
 
   installPhase = ''
-    install -Dm444 $src/command-time.plugin.zsh --target-directory=$out/share/zsh-command-time
+    install -Dm0444 $src/command-time.plugin.zsh --target-directory=$out/share/zsh/plugins/command-time
   '';
 
   meta = with stdenv.lib; {

From f0c41f0bbf36b90b05349e5d4e13e7f33196ab17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 2 Jan 2019 16:57:50 +0100
Subject: [PATCH 066/274] doxygen: change URL

The homepage was 301 Moved Permanently.  Note: https won't work.
---
 pkgs/development/tools/documentation/doxygen/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix
index d25f00276f62..5ce4d12c85f8 100644
--- a/pkgs/development/tools/documentation/doxygen/default.nix
+++ b/pkgs/development/tools/documentation/doxygen/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "doxygen-1.8.14";
 
   src = fetchurl {
-    url = "ftp://ftp.stack.nl/pub/users/dimitri/${name}.src.tar.gz";
+    url = "http://doxygen.nl/files/${name}.src.tar.gz";
     sha256 = "d1757e02755ef6f56fd45f1f4398598b920381948d6fcfa58f5ca6aa56f59d4d";
   };
 
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     license = stdenv.lib.licenses.gpl2Plus;
-    homepage = http://doxygen.org/;
+    homepage = http://doxygen.nl/;
     description = "Source code documentation generator tool";
 
     longDescription = ''

From de96413bbfc3deae4e81b48d7d973f836985c39c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 2 Jan 2019 17:06:20 +0100
Subject: [PATCH 067/274] doxygen: add sourceforge as mirror

It turns out the upstream URL is very slow (for me at least).
We get caching through nixos.org, but this shouldn't hurt anyway.
---
 pkgs/development/tools/documentation/doxygen/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix
index 5ce4d12c85f8..f590c3e5988a 100644
--- a/pkgs/development/tools/documentation/doxygen/default.nix
+++ b/pkgs/development/tools/documentation/doxygen/default.nix
@@ -5,7 +5,10 @@ stdenv.mkDerivation rec {
   name = "doxygen-1.8.14";
 
   src = fetchurl {
-    url = "http://doxygen.nl/files/${name}.src.tar.gz";
+    urls = [
+      "mirror://sourceforge/doxygen/${name}.src.tar.gz" # faster, with https, etc.
+      "http://doxygen.nl/files/${name}.src.tar.gz"
+    ];
     sha256 = "d1757e02755ef6f56fd45f1f4398598b920381948d6fcfa58f5ca6aa56f59d4d";
   };
 

From af34745862d86a9dbc8151030f49704ad80d7344 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 2 Jan 2019 17:08:43 +0100
Subject: [PATCH 068/274] fsv: fix typo: callPackages -> callPackage

Fixes nixpkgs eval warning:

  $ nix-env -f . -qa '*' --meta --xml --drv-path --show-trace
  derivation 'fsv-0.9-1' has invalid meta attribute 'override'
  derivation 'fsv-0.9-1' has invalid meta attribute 'overrideDerivation'
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8c652ad936df..2752d623feb8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16985,7 +16985,7 @@ in
 
   fritzing = libsForQt5.callPackage ../applications/science/electronics/fritzing { };
 
-  fsv = callPackages ../applications/misc/fsv { };
+  fsv = callPackage ../applications/misc/fsv { };
 
   fvwm = callPackage ../applications/window-managers/fvwm { };
 

From ac43ec96dbcde6d313a067bc41822b0825bf1ee4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 2 Jan 2019 08:17:50 -0800
Subject: [PATCH 069/274] python37Packages.distributed: 1.24.2 -> 1.25.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-distributed/versions
---
 pkgs/development/python-modules/distributed/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix
index 48bed16ad962..5c39811516ce 100644
--- a/pkgs/development/python-modules/distributed/default.nix
+++ b/pkgs/development/python-modules/distributed/default.nix
@@ -26,12 +26,12 @@
 
 buildPythonPackage rec {
   pname = "distributed";
-  version = "1.24.2";
+  version = "1.25.1";
 
   # get full repository need conftest.py to run tests
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8ab24f0ea634dab7b6667c32b18c98794141f3ef3b081293dfea1943498ce987";
+    sha256 = "1qay94amxs0k6lmwhy07bq54m5zms0rjmnp7a66fldipjla6w8lg";
   };
 
   checkInputs = [ pytest pytest-repeat pytest-faulthandler pytest-timeout mock joblib ];

From 8efe3df7955a873ba89e7bdd675ac2e96f528f91 Mon Sep 17 00:00:00 2001
From: Andrew Dunham <andrew@du.nham.ca>
Date: Wed, 2 Jan 2019 12:19:25 -0500
Subject: [PATCH 070/274] stdenv/native: add missing argument

---
 pkgs/stdenv/native/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix
index 810cf16301f4..ba53a6f1d142 100644
--- a/pkgs/stdenv/native/default.nix
+++ b/pkgs/stdenv/native/default.nix
@@ -1,5 +1,5 @@
 { lib
-, localSystem, crossSystem, config, overlays
+, localSystem, crossSystem, config, overlays, crossOverlays ? []
 }:
 
 assert crossSystem == localSystem;

From 3c7bc0e95b0c20906f04085dd683008722c9fb3f Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 2 Jan 2019 19:08:05 +0100
Subject: [PATCH 071/274] pythonPackages.pytado: comment on missing tag

---
 pkgs/development/python-modules/pytado/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/pytado/default.nix b/pkgs/development/python-modules/pytado/default.nix
index 2e597f01e882..a1c70b4c2052 100644
--- a/pkgs/development/python-modules/pytado/default.nix
+++ b/pkgs/development/python-modules/pytado/default.nix
@@ -7,6 +7,7 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "wmalgadey";
     repo = pname;
+    # Upstream hasn't tagged this release yet. This commit fixes the build.
     rev = "79a5dfdf75cd9a3e1a1ee8a8ff0d08923aebda7b";
     sha256 = "14xdfw4913g4j4h576hjbigm7fiw8k0dc8s98gh2ag9xrc2ifgr0";
   };

From 0ea65cd96c8dc747d2e29efbeb51bca42946db6b Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 2 Jan 2019 19:07:33 +0100
Subject: [PATCH 072/274] shairport-sync service: fix default arguments

---
 nixos/modules/services/networking/shairport-sync.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/shairport-sync.nix b/nixos/modules/services/networking/shairport-sync.nix
index 90c0689dc7bf..68e005ab81da 100644
--- a/nixos/modules/services/networking/shairport-sync.nix
+++ b/nixos/modules/services/networking/shairport-sync.nix
@@ -27,7 +27,7 @@ in
       };
 
       arguments = mkOption {
-        default = "-v pulse";
+        default = "-v -o pa";
         description = ''
           Arguments to pass to the daemon. Defaults to a local pulseaudio
           server.

From 325e314aaeb1c78a96288cf331b517397a1fa52b Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Sat, 29 Dec 2018 18:26:53 +0100
Subject: [PATCH 073/274] sshd: Add restartTrigger for sshd_config

Co-Authored-By: Franz Pletz <fpletz@fnordicwalking.de>
---
 nixos/modules/services/networking/ssh/sshd.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index 5fab79f1b3d7..90d08ca31316 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -352,6 +352,10 @@ in
             path = [ cfgc.package pkgs.gawk ];
             environment.LD_LIBRARY_PATH = nssModulesPath;
 
+            restartTriggers = optionals (!cfg.startWhenNeeded) [
+              config.environment.etc."ssh/sshd_config".source
+            ];
+
             preStart =
               ''
                 # Make sure we don't write to stdout, since in case of
@@ -387,6 +391,7 @@ in
                 Restart = "always";
                 Type = "simple";
               });
+
           };
       in
 

From 53a0bff01fce3a8ff72e95c4ed0b92581fe2ba5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 2 Jan 2019 08:11:28 +0100
Subject: [PATCH 074/274] pythonPackages.blockdiagcontrib-cisco: init at 0.1.8

blockdiagcontrib-cisco is a noderenderer plugin for blockdiag containing
Cisco networking symbols.
---
 .../blockdiagcontrib-cisco/default.nix        | 25 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/python-modules/blockdiagcontrib-cisco/default.nix

diff --git a/pkgs/development/python-modules/blockdiagcontrib-cisco/default.nix b/pkgs/development/python-modules/blockdiagcontrib-cisco/default.nix
new file mode 100644
index 000000000000..6190adcba5f0
--- /dev/null
+++ b/pkgs/development/python-modules/blockdiagcontrib-cisco/default.nix
@@ -0,0 +1,25 @@
+{ stdenv
+, buildPythonPackage
+, fetchPypi
+, blockdiag
+}:
+
+buildPythonPackage rec {
+  pname = "blockdiagcontrib-cisco";
+  version = "0.1.8";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "06iw3q1w4g3lbgcmyz8m93rv0pfnk2gp8k83rs9ir671ym99gwr2";
+  };
+
+  buildInputs = [ blockdiag ];
+
+  meta = with stdenv.lib; {
+    description = "Noderenderer plugin for blockdiag containing Cisco networking symbols";
+    homepage = "https://bitbucket.org/blockdiag/blockdiag-contrib/";
+    maintainers = [ maintainers.bjornfor ];
+    license = licenses.psfl;
+  };
+
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7656498e9758..0fe295de9731 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1129,6 +1129,8 @@ in {
 
   blockdiag = callPackage ../development/python-modules/blockdiag { };
 
+  blockdiagcontrib-cisco = callPackage ../development/python-modules/blockdiagcontrib-cisco { };
+
   bpython = callPackage ../development/python-modules/bpython {};
 
   bsddb3 = callPackage ../development/python-modules/bsddb3 { };

From 7afded82cab8174778dc54c48be0537ed413254c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 2 Jan 2019 11:40:08 -0800
Subject: [PATCH 075/274] python37Packages.gym: 0.9.6 -> 0.10.9

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-gym/versions
---
 pkgs/development/python-modules/gym/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/gym/default.nix b/pkgs/development/python-modules/gym/default.nix
index 61b74ad69285..2e4b58ae3ff1 100644
--- a/pkgs/development/python-modules/gym/default.nix
+++ b/pkgs/development/python-modules/gym/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "gym";
-  version = "0.9.6";
+  version = "0.10.9";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0llbhn3zdlsz2crd5grd1yygg8zp2shsclc24iqix5gw5f65clx5";
+    sha256 = "1id2xyyypks8bjdayb19av809w0838ghymyngmyhdbbsk588q7q0";
   };
 
   propagatedBuildInputs = [

From a32af78389f566516fcd6cea5e7698d30c5420ee Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 2 Jan 2019 11:57:30 -0800
Subject: [PATCH 076/274] python37Packages.pyodbc: 4.0.24 -> 4.0.25

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-pyodbc/versions
---
 pkgs/development/python-modules/pyodbc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyodbc/default.nix b/pkgs/development/python-modules/pyodbc/default.nix
index 45ba2a2e307e..c0e3fb51920e 100644
--- a/pkgs/development/python-modules/pyodbc/default.nix
+++ b/pkgs/development/python-modules/pyodbc/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "pyodbc";
-  version = "4.0.24";
+  version = "4.0.25";
   disabled = isPyPy;  # use pypypdbc instead
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4326abb737dec36156998d52324921673d30f575e1e0998f0c5edd7de20e61d4";
+    sha256 = "1bbwrb812w5i0x56jfn0l86mxc2ck904hl8y87mziay96znwia0f";
   };
 
   buildInputs = [ unixODBC ];

From 45779f013c885b5c0da6852c0c01ec1c50670c5b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 15 Dec 2018 18:33:15 -0800
Subject: [PATCH 077/274] grails: 3.3.8 -> 3.3.9

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/grails/versions
---
 pkgs/development/web/grails/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/grails/default.nix b/pkgs/development/web/grails/default.nix
index 1e665c847b4e..b4d78ef08501 100644
--- a/pkgs/development/web/grails/default.nix
+++ b/pkgs/development/web/grails/default.nix
@@ -11,11 +11,11 @@ let
 in
 stdenv.mkDerivation rec {
   name = "grails-${version}";
-  version = "3.3.8";
+  version = "3.3.9";
 
   src = fetchurl {
     url = "https://github.com/grails/grails-core/releases/download/v${version}/grails-${version}.zip";
-    sha256 = "1hfqlaiv29im6pyqi7irl28ws7nn2jc4g4718gysfmm1gvlprpn0";
+    sha256 = "0xnwi9m9l8rz4wdwjp2i3yfzsq1szz37z886nc6lbfxd5mj19hnn";
   };
 
   buildInputs = [ unzip ];

From 143ce1d1dd56b1851c88ec04dd676256727c871c Mon Sep 17 00:00:00 2001
From: Alex Branham <alex.branham@gmail.com>
Date: Wed, 2 Jan 2019 14:39:06 -0600
Subject: [PATCH 078/274] * syncthing: 0.14.52 -> 1.0.0

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

diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix
index b084e4af972a..9dfa7f9a0ab0 100644
--- a/pkgs/applications/networking/syncthing/default.nix
+++ b/pkgs/applications/networking/syncthing/default.nix
@@ -3,24 +3,20 @@
 let
   common = { stname, target, postInstall ? "" }:
     buildGoPackage rec {
-      version = "0.14.54";
+      version = "1.0.0";
       name = "${stname}-${version}";
 
       src = fetchFromGitHub {
         owner  = "syncthing";
         repo   = "syncthing";
         rev    = "v${version}";
-        sha256 = "0l73ka71l6gxv46wmlyzj8zhfpfj3vf6nv6x3x0z25ymr3wa2fza";
+        sha256 = "1qkjnij9jw3d4pjkdr6npz5ps604qg6g36jnsng0k1r2qnrydnwh";
       };
 
       goPackagePath = "github.com/syncthing/syncthing";
 
       patches = [
         ./add-stcli-target.patch
-        (fetchpatch {
-          url = "https://github.com/syncthing/syncthing/commit/e7072feeb7669948c3e43f55d21aec15481c33ba.patch";
-          sha256 = "1pcybww2vdx45zhd1sd53v7fp40vfgkwqgy8flv7hxw2paq8hxd4";
-        })
       ];
       BUILD_USER="nix";
       BUILD_HOST="nix";

From d3d64d0ea1c2fecc19186067337b962f6ac7a474 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 2 Jan 2019 04:51:10 -0800
Subject: [PATCH 079/274] quodlibet: 4.2.0 -> 4.2.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/quodlibet/versions

Also remove intltool and start running tests, changes missed in 4.2.0 update.

Also do not collect TReplayGain for variants without gst-plugins-good.
---
 pkgs/applications/audio/quodlibet/default.nix | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix
index 6c930ceb05a5..a1d85ac91e85 100644
--- a/pkgs/applications/audio/quodlibet/default.nix
+++ b/pkgs/applications/audio/quodlibet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python3, wrapGAppsHook, gettext, intltool, libsoup, gnome3, gtk3, gdk_pixbuf,
+{ stdenv, fetchurl, python3, wrapGAppsHook, gettext, libsoup, gnome3, gtk3, gdk_pixbuf,
   tag ? "", xvfb_run, dbus, glibcLocales, glib, glib-networking, gobject-introspection,
   gst_all_1, withGstPlugins ? true,
   xineBackend ? false, xineLib,
@@ -9,18 +9,14 @@
 let optionals = stdenv.lib.optionals; in
 python3.pkgs.buildPythonApplication rec {
   pname = "quodlibet${tag}";
-  version = "4.2.0";
-
-  # XXX, tests fail
-  # https://github.com/quodlibet/quodlibet/issues/2820
-  doCheck = false;
+  version = "4.2.1";
 
   src = fetchurl {
     url = "https://github.com/quodlibet/quodlibet/releases/download/release-${version}/quodlibet-${version}.tar.gz";
-    sha256 = "0w64i999ipzgjb4c4lzw7jp792amd6km46wahx7m3bpzly55r3f6";
+    sha256 = "0b1rvr4hqs2bjmhayms7vxxkn3d92k9v7p1269rjhf11hpk122l7";
   };
 
-  nativeBuildInputs = [ wrapGAppsHook gettext intltool ];
+  nativeBuildInputs = [ wrapGAppsHook gettext ];
 
   checkInputs = with python3.pkgs; [ pytest pytest_xdist pyflakes pycodestyle polib xvfb_run dbus.daemon glibcLocales ];
 
@@ -39,13 +35,11 @@ python3.pkgs.buildPythonApplication rec {
 
   checkPhase = ''
     runHook preCheck
-    checkHomeDir=$(mktemp -d)
-    mkdir -p $checkHomeDir/.cache/thumbnails/normal # Required by TThumb.test_recreate_broken_cache_file
     env XDG_DATA_DIRS="$out/share:${gtk3}/share/gsettings-schemas/${gtk3.name}:$XDG_DATA_DIRS" \
-      HOME=$checkHomeDir \
+      HOME=$(mktemp -d) \
       xvfb-run -s '-screen 0 800x600x24' dbus-run-session \
         --config-file=${dbus.daemon}/share/dbus-1/session.conf \
-        py.test
+        py.test${stdenv.lib.optionalString (xineBackend || !withGstPlugins) " --ignore=tests/plugin/test_replaygain.py"}
     runHook postCheck
   '';
 

From 2e7f260e3593b1eb02a781e8946878de227eeec2 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 2 Jan 2019 15:07:20 -0600
Subject: [PATCH 080/274] terminus-font: 4.46 -> 4.47

http://terminus-font.sourceforge.net/

Also cleanup/modernize a bit.
Replace homepage (dead?) with SF url.
---
 pkgs/data/fonts/terminus-font/default.nix | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/pkgs/data/fonts/terminus-font/default.nix b/pkgs/data/fonts/terminus-font/default.nix
index c1ee2250c9a2..adbce5c8cf9b 100644
--- a/pkgs/data/fonts/terminus-font/default.nix
+++ b/pkgs/data/fonts/terminus-font/default.nix
@@ -1,26 +1,22 @@
 { stdenv, fetchurl, python3, bdftopcf, mkfontdir, mkfontscale }:
 
 stdenv.mkDerivation rec {
-  name = "terminus-font-4.46";
+  name = "terminus-font-4.47";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/terminus-font/${name}/${name}.tar.gz";
-    sha256 = "1kavqw38aarz0vpwz4b7l6l8xkyc5096zaf9ypqnvdwraqz46aaf";
+    sha256 = "15qjcpalcxjiwsjgjg5k88vkwp56cs2nnx4ghya6mqp4i1c206qg";
   };
 
-  buildInputs = [ python3 bdftopcf mkfontdir mkfontscale ];
+  nativeBuildInputs = [ python3 bdftopcf mkfontdir mkfontscale ];
 
   patchPhase = ''
     substituteInPlace Makefile --replace 'fc-cache' '#fc-cache'
   '';
 
-  configurePhase = ''
-    sh ./configure --prefix=$out
-  '';
+  enableParallelBuilding = true;
 
-  installPhase = ''
-    make install fontdir
-  '';
+  installTargets = [ "install" "fontdir" ];
 
   meta = with stdenv.lib; {
     description = "A clean fixed width font";
@@ -36,7 +32,7 @@ stdenv.mkDerivation rec {
       16x32. The styles are normal and bold (except for 6x12), plus
       EGA/VGA-bold for 8x14 and 8x16.
     '';
-    homepage = http://www.is-vn.bg/hamster/;
+    homepage = http://terminus-font.sourceforge.net/;
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ astsmtl ];
     platforms = platforms.linux;

From f38363387e2e9290293a3db620aee6d198becac3 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Wed, 2 Jan 2019 22:12:27 +0100
Subject: [PATCH 081/274] vimUtils: apply pluginToDrv recursively

This is necessary to handle plugin dependencies which also may be
strings.
---
 pkgs/misc/vim-plugins/vim-utils.nix | 33 ++++++++++++++---------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix
index 6e867dfc9661..437cff52f82b 100644
--- a/pkgs/misc/vim-plugins/vim-utils.nix
+++ b/pkgs/misc/vim-plugins/vim-utils.nix
@@ -152,15 +152,21 @@ vim_with_plugins can be installed like any other application within Nix.
 let
   inherit (stdenv) lib;
 
-  # make sure a plugin is a derivation. If plugin already is a derivation, this
-  # is a no-op. If it is a string, it is looked up in knownPlugins.
+  # make sure a plugin is a derivation and its dependencies are derivations. If
+  # plugin already is a derivation, this is a no-op. If it is a string, it is
+  # looked up in knownPlugins.
   pluginToDrv = knownPlugins: plugin:
-    if builtins.isString plugin then
-      # make sure `pname` is set to that we are able to convert the derivation
-      # back to a string.
-      ( knownPlugins.${plugin} // { pname = plugin; })
-    else
-      plugin;
+  let
+    drv =
+      if builtins.isString plugin then
+        # make sure `pname` is set to that we are able to convert the derivation
+        # back to a string.
+        ( knownPlugins.${plugin} // { pname = plugin; })
+      else
+        plugin;
+  in
+    # make sure all the dependencies of the plugin are also derivations
+    drv // { dependencies = map (pluginToDrv knownPlugins) (drv.dependencies or []); };
 
   # transitive closure of plugin dependencies (plugin needs to be a derivation)
   transitiveClosure = plugin:
@@ -170,14 +176,6 @@ let
 
   findDependenciesRecursively = plugins: lib.concatMap transitiveClosure plugins;
 
-  attrnamesToPlugins = { knownPlugins, names }:
-    map (name: if builtins.isString name then knownPlugins.${name} else name) knownPlugins;
-
-  pluginToAttrname = plugin:
-    plugin.pname;
-
-  pluginsToAttrnames = plugins: map pluginToAttrname plugins;
-
   vamDictToNames = x:
       if builtins.isString x then [x]
       else (lib.optional (x ? name) x.name)
@@ -482,7 +480,8 @@ rec {
             rev = "4c596548216b7c19971f8fc94e38ef1a2b55fee6";
             sha256 = "0f1cpnp1nxb4i5hgymjn2yn3k1jwkqmlgw1g02sq270lavp2dzs9";
           };
-          dependencies = [];
+          # make sure string dependencies are handled
+          dependencies = [ "vim-nix" ];
         };
       });
     vimrcConfig.vam.pluginDictionaries = [ { names = [ "vim-trailing-whitespace" ]; } ];

From 49481e5a65a8bdec1d6a390ddaf7d48740fbbec1 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 2 Jan 2019 22:22:06 +0100
Subject: [PATCH 082/274] pythonPackages.casttube: init at 0.2.0

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

diff --git a/pkgs/development/python-modules/casttube/default.nix b/pkgs/development/python-modules/casttube/default.nix
new file mode 100644
index 000000000000..60d9fe2aef1a
--- /dev/null
+++ b/pkgs/development/python-modules/casttube/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, buildPythonPackage, fetchPypi, requests }:
+
+buildPythonPackage rec {
+  pname = "casttube";
+  version = "0.2.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "0g7mksfl341vfsxqvw8h15ci2qwd1rczg41n4fb2hw7y9rikqnzj";
+  };
+
+  propagatedBuildInputs = [ requests ];
+
+  # no tests
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Interact with the Youtube Chromecast api";
+    homepage = http://github.com/ur1katz/casttube;
+    license = licenses.mit;
+    maintainers = with maintainers; [ fpletz ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0fe295de9731..e9743481a2e4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5151,6 +5151,8 @@ in {
 
   pytado = callPackage ../development/python-modules/pytado { };
 
+  casttube = callPackage ../development/python-modules/casttube { };
+
 });
 
 in fix' (extends overrides packages)

From 4b3481eb7b7c88bd2a03b4dcb3975106aaf75052 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 2 Jan 2019 22:22:39 +0100
Subject: [PATCH 083/274] pythonPackages.PyChromecast: dep on casttube to fix
 build

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

diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix
index 44f6bae58cb2..2494407766c7 100644
--- a/pkgs/development/python-modules/pychromecast/default.nix
+++ b/pkgs/development/python-modules/pychromecast/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchurl, buildPythonPackage, requests, six, zeroconf, protobuf }:
+{ lib, fetchurl, buildPythonPackage, requests, six, zeroconf, protobuf, casttube }:
 
 buildPythonPackage rec {
   pname = "PyChromecast";
@@ -10,7 +10,7 @@ buildPythonPackage rec {
     sha256 = "f385168e34d2ef47f976c8e41bad2f58f5ca004634c0ccb1a12623d8beb2fa38";
   };
 
-  propagatedBuildInputs = [ requests six zeroconf protobuf ];
+  propagatedBuildInputs = [ requests six zeroconf protobuf casttube ];
 
   meta = with lib; {
     description = "Library for Python 2 and 3 to communicate with the Google Chromecast";

From 5be962f5b791a7388cc2d751a9f6d18af4fd9836 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 2 Jan 2019 05:05:53 -0800
Subject: [PATCH 084/274] python37Packages.rasterio: 1.0.12 -> 1.0.13

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-rasterio/versions
---
 pkgs/development/python-modules/rasterio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix
index 6ca2610948f0..02848856eb1f 100644
--- a/pkgs/development/python-modules/rasterio/default.nix
+++ b/pkgs/development/python-modules/rasterio/default.nix
@@ -6,14 +6,14 @@
 
 buildPythonPackage rec {
   pname = "rasterio";
-  version = "1.0.12";
+  version = "1.0.13";
 
   # Pypi doesn't ship the tests, so we fetch directly from GitHub
   src = fetchFromGitHub {
     owner = "mapbox";
     repo = "rasterio";
     rev = version;
-    sha256 = "0mdm03yhlcsa9jwy1yzvqrzk4spmh1dzjaq9krsj958k7wkps672";
+    sha256 = "1l1ppclmcq4cmbqvplrpx9sscxfpjlba6w0114y1ma675w30bgfb";
   };
 
   checkInputs = [ boto3 pytest pytestcov packaging hypothesis ];

From 4fba00b70af44a9aecef5e81d2af8aa04945f70e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 2 Jan 2019 08:43:02 -0800
Subject: [PATCH 085/274] python37Packages.dropbox: 9.2.0 -> 9.3.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-dropbox/versions
---
 pkgs/development/python-modules/dropbox/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix
index 345cd120f074..173a1cb5dee8 100644
--- a/pkgs/development/python-modules/dropbox/default.nix
+++ b/pkgs/development/python-modules/dropbox/default.nix
@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "dropbox";
-  version = "9.2.0";
+  version = "9.3.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "121wn4l6f6r4vm7yq0y9d1xsn5y77l6a4vgakyy2yaz8wv6j9w7c";
+    sha256 = "1ckpbksdby70d70m58b904h8y8v7m82h12n3q3qk58r4yrqwvld5";
   };
 
   # Set DROPBOX_TOKEN environment variable to a valid token.

From 366bdd0a2ca5d08df2352d3cc6f105e921a29a79 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 2 Jan 2019 13:41:22 -0800
Subject: [PATCH 086/274] python37Packages.pymetar: 1.0 -> 1.1 (#53208)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-pymetar/versions
---
 pkgs/development/python-modules/pymetar/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pymetar/default.nix b/pkgs/development/python-modules/pymetar/default.nix
index 339ddcbc7910..2baf3181ac69 100644
--- a/pkgs/development/python-modules/pymetar/default.nix
+++ b/pkgs/development/python-modules/pymetar/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "pymetar";
-  version = "1.0";
+  version = "1.1";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1n4k5aic4sgp43ki6j3zdw9b21r3biqqws8ah57b77n44b8wzrap";
+    sha256 = "0y42l7mmp7jn4pzg66x3k57c6hqpxc22mgzgaqqpblkx2kzh42n9";
   };
 
   checkPhase = ''

From 6677b40c99908fb5d8e90b0b87fd57bf7a912a01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 2 Jan 2019 09:49:41 -0200
Subject: [PATCH 087/274] xkbmon: 0.1 -> 0.2

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

diff --git a/pkgs/applications/misc/xkbmon/default.nix b/pkgs/applications/misc/xkbmon/default.nix
index 38bda9a8f560..aa741a5c94f3 100644
--- a/pkgs/applications/misc/xkbmon/default.nix
+++ b/pkgs/applications/misc/xkbmon/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "xkbmon-${version}";
-  version = "0.1";
+  version = "0.2";
 
   src = fetchFromGitHub {
     owner = "xkbmon";
     repo = "xkbmon";
     rev = version;
-    sha256 = "1smyqsd9cpbzqaplm221a8mq0nham6rg6hjsm9g5gph94xmk6d67";
+    sha256 = "1x2xwak0yp0xkl63jzz3k1pf074mh9yxgppwwm96ms3zaslq44yp";
   };
 
   buildInputs = [ libX11 ];
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://github.com/xkbmon/xkbmon;
     description = "Command-line keyboard layout monitor for X11";
-    license = licenses.gpl3;
+    license = licenses.mit;
     platforms = platforms.linux;
     maintainers = [ maintainers.romildo ];
   };

From fe018e6d3ee991a8033deeb050fd28b39c36e6da Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 2 Jan 2019 03:14:12 -0800
Subject: [PATCH 088/274] python37Packages.twilio: 6.21.0 -> 6.22.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-twilio/versions
---
 pkgs/development/python-modules/twilio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix
index 02c260a9dfe1..607386ac16d8 100644
--- a/pkgs/development/python-modules/twilio/default.nix
+++ b/pkgs/development/python-modules/twilio/default.nix
@@ -3,13 +3,13 @@
 
 buildPythonPackage rec {
   pname = "twilio";
-  version = "6.21.0";
+  version = "6.22.0";
   # tests not included in PyPi, so fetch from github instead
   src = fetchFromGitHub {
     owner = "twilio";
     repo = "twilio-python";
     rev = version;
-    sha256 = "1xinj2vyfasi1j3g7kk7xkmp6w8yawaqi3dz7mvibf9ywsi4dhc9";
+    sha256 = "1kh2hcjm1qyisqqjyjnilkyj3vv6l5flpjyqkq27pwxvc461aapp";
   };
 
   buildInputs = [ nose mock ];

From d4fa0d00f348693300a8ed38a111c0612fd28107 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 2 Jan 2019 11:48:01 -0800
Subject: [PATCH 089/274] python37Packages.pymysql: 0.9.2 -> 0.9.3

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-pymysql/versions
---
 pkgs/development/python-modules/pymysql/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pymysql/default.nix b/pkgs/development/python-modules/pymysql/default.nix
index b440df309977..4529a736f13b 100644
--- a/pkgs/development/python-modules/pymysql/default.nix
+++ b/pkgs/development/python-modules/pymysql/default.nix
@@ -6,11 +6,11 @@
 
 buildPythonPackage rec {
   pname = "PyMySQL";
-  version = "0.9.2";
+  version = "0.9.3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0gvi63f1zq1bbd30x28kqyx351hal1yc323ckp0mihainb5n1iwy";
+    sha256 = "1ry8lxgdc1p3k7gbw20r405jqi5lvhi5wk83kxdbiv8xv3f5kh6q";
   };
 
   propagatedBuildInputs = [ cryptography ];

From b1313ff94e6469132ae44e15e4b884c5c4d3630c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 2 Jan 2019 11:26:43 -0800
Subject: [PATCH 090/274] python37Packages.flask-api: 1.0 -> 1.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-flask-api/versions
---
 pkgs/development/python-modules/flask-api/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/flask-api/default.nix b/pkgs/development/python-modules/flask-api/default.nix
index cee93a759200..b0f9682ed854 100644
--- a/pkgs/development/python-modules/flask-api/default.nix
+++ b/pkgs/development/python-modules/flask-api/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "Flask-API";
-  version = "1.0";
+  version = "1.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0dffcy2hdkajbvl2wkz9dam49v05x9d87cf2mh2cyvza2c5ah47w";
+    sha256 = "0r23pdlaz6ibz9vml3m7v6v3firvykbrsi1zzxkdhls0zi9jq560";
   };
 
   propagatedBuildInputs = [ flask markdown ];

From 3fd911cf769b993b0f965e0d14b960440602a7e3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 2 Jan 2019 10:53:33 -0800
Subject: [PATCH 091/274] python37Packages.daphne: 2.2.3 -> 2.2.4

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-daphne/versions
---
 pkgs/development/python-modules/daphne/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/daphne/default.nix b/pkgs/development/python-modules/daphne/default.nix
index e797cbda8bd3..772ca350f132 100644
--- a/pkgs/development/python-modules/daphne/default.nix
+++ b/pkgs/development/python-modules/daphne/default.nix
@@ -4,7 +4,7 @@
 }:
 buildPythonPackage rec {
   pname = "daphne";
-  version = "2.2.3";
+  version = "2.2.4";
 
   disabled = !isPy3k;
 
@@ -12,7 +12,7 @@ buildPythonPackage rec {
     owner = "django";
     repo = pname;
     rev = version;
-    sha256 = "0v3krlqdv39y021dcyf6fl9zys0z1dpw5mqfmkryna5ngxwzlkwd";
+    sha256 = "0mpn2xbpx2r67bj5crfvxfwlznxlp7rcfbb2xly6ad3d0c7djkdi";
   };
 
   nativeBuildInputs = [ pytestrunner ];

From fe92e5fb93753e82d4a7dd9364efc23e894a6d25 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 2 Jan 2019 11:32:10 -0800
Subject: [PATCH 092/274] python37Packages.fido2: 0.4.0 -> 0.5.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-fido2/versions
---
 pkgs/development/python-modules/fido2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/fido2/default.nix b/pkgs/development/python-modules/fido2/default.nix
index 809871b50de0..26cb12db7219 100644
--- a/pkgs/development/python-modules/fido2/default.nix
+++ b/pkgs/development/python-modules/fido2/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "fido2";
-  version = "0.4.0";
+  version = "0.5.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "12245b16czsgq4a251jqlk5qs3sldlcryfcganswzk2lbgplmn7q";
+    sha256 = "1pl8d2pr6jzqj4y9qiaddhjgnl92kikjxy0bgzm2jshkzzic8mp3";
   };
 
   # The pypi package does not include tests

From 801a54818387b0e44c3d1fc354c2828f5505f948 Mon Sep 17 00:00:00 2001
From: Timo Kaufmann <timokau@zoho.com>
Date: Wed, 2 Jan 2019 22:59:19 +0100
Subject: [PATCH 093/274] vimUtils: fix map parentheses

---
 pkgs/misc/vim-plugins/vim-utils.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix
index 437cff52f82b..cf5eeaec3e33 100644
--- a/pkgs/misc/vim-plugins/vim-utils.nix
+++ b/pkgs/misc/vim-plugins/vim-utils.nix
@@ -427,7 +427,7 @@ rec {
                      if vam != null && vam ? knownPlugins then vam.knownPlugins else
                      if pathogen != null && pathogen ? knownPlugins then pathogen.knownPlugins else
                      vimPlugins;
-      pathogenPlugins = findDependenciesRecursively ((map pluginToDrv knownPlugins) pathogen.pluginNames);
+      pathogenPlugins = findDependenciesRecursively (map (pluginToDrv knownPlugins) pathogen.pluginNames);
       vamPlugins = findDependenciesRecursively (map (pluginToDrv knownPlugins) (lib.concatMap vamDictToNames vam.pluginDictionaries));
       nonNativePlugins = (lib.optionals (pathogen != null) pathogenPlugins)
                       ++ (lib.optionals (vam != null) vamPlugins)

From 3d61b5602b4a7c585ba3ae72897d794e2b94b75e Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 2 Jan 2019 10:18:32 -0800
Subject: [PATCH 094/274] python37Packages.pylibmc: 1.5.2 -> 1.6.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-pylibmc/versions
---
 pkgs/development/python-modules/pylibmc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pylibmc/default.nix b/pkgs/development/python-modules/pylibmc/default.nix
index 4f286cc5c419..9d21cacef9ad 100644
--- a/pkgs/development/python-modules/pylibmc/default.nix
+++ b/pkgs/development/python-modules/pylibmc/default.nix
@@ -1,12 +1,12 @@
 { buildPythonPackage, fetchPypi, stdenv, libmemcached, zlib, cyrus_sasl }:
 
 buildPythonPackage rec {
-  version = "1.5.2";
+  version = "1.6.0";
   pname = "pylibmc";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "fc54e28a9f1b5b2ec0c030da29c7ad8a15c2755bd98aaa4142eaf419d5fabb33";
+    sha256 = "1n6nvvhl0g52gpzzwdj1my6049xljkfwyxxygnwda9smrbj7pyay";
   };
 
   buildInputs = [ libmemcached zlib cyrus_sasl ];

From 928b86424ab25370f4e4f0e8d5f633f346a37e2c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 2 Jan 2019 13:27:37 -0800
Subject: [PATCH 095/274] python37Packages.kubernetes: 8.0.0 -> 8.0.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-kubernetes/versions
---
 pkgs/development/python-modules/kubernetes/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/kubernetes/default.nix b/pkgs/development/python-modules/kubernetes/default.nix
index 680ff29710e8..51e387270be6 100644
--- a/pkgs/development/python-modules/kubernetes/default.nix
+++ b/pkgs/development/python-modules/kubernetes/default.nix
@@ -4,7 +4,7 @@
 
 buildPythonPackage rec {
   pname = "kubernetes";
-  version = "8.0.0";
+  version = "8.0.1";
 
   prePatch = ''
     sed -e 's/sphinx>=1.2.1,!=1.3b1,<1.4 # BSD/sphinx/' -i test-requirements.txt
@@ -23,7 +23,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "54f8e7bb1dd9a55cf416dff76a63c4ae441764280942d9913f2243676f29d02c";
+    sha256 = "0y0aygnd7kpflwdm3zxrmsgws0frk4qwq3lnq92zsiyxcxh8r4i5";
   };
 
   checkInputs = [ isort coverage pytest mock sphinx autopep8 pep8 codecov recommonmark nose ];

From 69bd65aca304711aa42e9bc5c6b6e2aae51e3853 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 2 Jan 2019 13:08:37 -0800
Subject: [PATCH 096/274] python37Packages.daemonize: 2.4.7 -> 2.5.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-daemonize/versions
---
 pkgs/development/python-modules/daemonize/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/daemonize/default.nix b/pkgs/development/python-modules/daemonize/default.nix
index 89c89bcbe7a4..2f7992e860ff 100644
--- a/pkgs/development/python-modules/daemonize/default.nix
+++ b/pkgs/development/python-modules/daemonize/default.nix
@@ -5,11 +5,11 @@
 
 buildPythonPackage rec {
   pname = "daemonize";
-  version = "2.4.7";
+  version = "2.5.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "c0194e861826be456c7c69985825ac7b79632d8ac7ad4cde8e12fee7971468c8";
+    sha256 = "1hwbl3gf9fdds9sc14zgjyjisjvxidrvqc11xlbb0b6jz17nw0nx";
   };
 
   meta = with stdenv.lib; {

From 9bc216ffba7e99b7f3ad695d7e466a6e8c71093b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 2 Jan 2019 07:52:31 -0800
Subject: [PATCH 097/274] python37Packages.pgspecial: 1.11.3 -> 1.11.5

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-pgspecial/versions
---
 pkgs/development/python-modules/pgspecial/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pgspecial/default.nix b/pkgs/development/python-modules/pgspecial/default.nix
index 513ae254217e..b2ce1fb8f98b 100644
--- a/pkgs/development/python-modules/pgspecial/default.nix
+++ b/pkgs/development/python-modules/pgspecial/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "pgspecial";
-  version = "1.11.3";
+  version = "1.11.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "f183da55c37128f7a74fe5b28e997991156f19961e59a1ad0f400ffc9535faba";
+    sha256 = "0yvlxv9vy0hbfgf0xcwl7wh5hg6cl86arsv1ip3kvn9znn6x8kgl";
   };
 
   buildInputs = [ pytest psycopg2 ];

From d86e2daa7d5dc37b09011b52f078b83fc3f15d83 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 2 Jan 2019 14:15:33 -0800
Subject: [PATCH 098/274] live555: 2018.11.26 -> 2018.12.14 (#52842)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/live555/versions
---
 pkgs/development/libraries/live555/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/live555/default.nix b/pkgs/development/libraries/live555/default.nix
index 6463f83d282b..31056d0a4ed6 100644
--- a/pkgs/development/libraries/live555/default.nix
+++ b/pkgs/development/libraries/live555/default.nix
@@ -3,14 +3,14 @@
 # Based on https://projects.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD
 stdenv.mkDerivation rec {
   name = "live555-${version}";
-  version = "2018.11.26";
+  version = "2018.12.14";
 
   src = fetchurl { # the upstream doesn't provide a stable URL
     urls = [
       "mirror://sourceforge/slackbuildsdirectlinks/live.${version}.tar.gz"
       "https://download.videolan.org/contrib/live555/live.${version}.tar.gz"
     ];
-    sha256 = "0izvy50xmyycrl7aj43kj1w9k8lcsmdqwwqk1cdizmc4wmj56f5k";
+    sha256 = "0irafygp23m2xmjv06qgs1sccymbwqvn51wggk0c60lnj1v1zhwd";
   };
 
   postPatch = ''

From cc8ef483bbb7092958d34af9a5e530379d3a6a89 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 2 Jan 2019 14:17:43 -0800
Subject: [PATCH 099/274] xpad: 5.2.0 -> 5.3.0 (#53161)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/xpad/versions
---
 pkgs/applications/misc/xpad/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/xpad/default.nix b/pkgs/applications/misc/xpad/default.nix
index f066876f5730..8588f0fb2fe6 100644
--- a/pkgs/applications/misc/xpad/default.nix
+++ b/pkgs/applications/misc/xpad/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "xpad-${version}";
-  version = "5.2.0";
+  version = "5.3.0";
 
   src = fetchurl {
     url = "https://launchpad.net/xpad/trunk/${version}/+download/xpad-${version}.tar.bz2";
-    sha256 = "1ab33vg3fz57lz19jjwa3vp3vnln4pnh60hwlkq59la53s8lyijk";
+    sha256 = "0gv9indihr2kbv9iqdqq4mfj6l6qgzwc06jm08gmg10f262sni34";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig wrapGAppsHook ];

From 1ac1f2b59ab6d106ef8979913eff18303e53e9aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 2 Jan 2019 20:23:49 -0200
Subject: [PATCH 100/274] mojave-gtk-theme: init at 2019-01-02 (#53197)

---
 pkgs/data/themes/mojave/default.nix | 31 +++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  6 ++++--
 2 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/data/themes/mojave/default.nix

diff --git a/pkgs/data/themes/mojave/default.nix b/pkgs/data/themes/mojave/default.nix
new file mode 100644
index 000000000000..7c3c852e6afd
--- /dev/null
+++ b/pkgs/data/themes/mojave/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, gtk_engines, gtk-engine-murrine }:
+
+stdenv.mkDerivation rec {
+  pname = "mojave-gtk-theme";
+  version = "2019-01-02";
+
+  src = fetchFromGitHub {
+    owner = "vinceliuice";
+    repo = pname;
+    rev = version;
+    sha256 = "053bfc5pslwpqhn05dzznh236g1z4cnn2dzwvb914f6m855fbxfg";
+  };
+
+  buildInputs = [ gtk_engines ];
+
+  propagatedUserEnvPkgs = [ gtk-engine-murrine ];
+
+  installPhase = ''
+    patchShebangs .
+    mkdir -p $out/share/themes
+    name= ./install.sh -d $out/share/themes
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Mac OSX Mojave like theme for GTK based desktop environments";
+    homepage = https://github.com/vinceliuice/Mojave-gtk-theme;
+    license = licenses.gpl3;
+    platforms = platforms.unix;
+    maintainers = [ maintainers.romildo ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ae595dc04261..2a7290ffb2ce 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15653,12 +15653,14 @@ in
 
   mobile-broadband-provider-info = callPackage ../data/misc/mobile-broadband-provider-info { };
 
+  mojave-gtk-theme = callPackage ../data/themes/mojave { };
+
+  moka-icon-theme = callPackage ../data/icons/moka-icon-theme { };
+
   monoid = callPackage ../data/fonts/monoid { };
 
   mononoki = callPackage ../data/fonts/mononoki { };
 
-  moka-icon-theme = callPackage ../data/icons/moka-icon-theme { };
-
   montserrat = callPackage ../data/fonts/montserrat { };
 
   mph_2b_damase = callPackage ../data/fonts/mph-2b-damase { };

From f648f84c39a3a3cdf7a9135712b846d740084b79 Mon Sep 17 00:00:00 2001
From: Ivan Kozik <ivan@ludios.org>
Date: Wed, 2 Jan 2019 15:36:48 +0000
Subject: [PATCH 101/274] xfce4-13.xfce4-panel: 4.13.3 -> 4.13.4

---
 pkgs/desktops/xfce4-13/xfce4-panel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce4-13/xfce4-panel/default.nix b/pkgs/desktops/xfce4-13/xfce4-panel/default.nix
index 2b52b515c04e..27c8e1e58c71 100644
--- a/pkgs/desktops/xfce4-13/xfce4-panel/default.nix
+++ b/pkgs/desktops/xfce4-13/xfce4-panel/default.nix
@@ -3,9 +3,9 @@
 mkXfceDerivation rec {
   category = "xfce";
   pname = "xfce4-panel";
-  version = "4.13.3";
+  version = "4.13.4";
 
-  sha256 = "00b2b16wqwzdbh1vsnpl2kasa7f9i1hr1wkkjmvzmy2v7bmkygr0";
+  sha256 = "13hnzh31d2b1331lnsbfaxg4fqhqa7hmdwkiqsl9hyr8pqimjb2g";
 
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ exo garcon gtk2 gtk3 libxfce4ui libxfce4util libwnck3 xfconf ];

From 3bb175f483da4cf720c5797aa461bfa9ab7b93dd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 2 Jan 2019 13:46:06 -0800
Subject: [PATCH 102/274] python37Packages.av: 6.0.0 -> 6.1.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-av/versions
---
 pkgs/development/python-modules/av/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/av/default.nix b/pkgs/development/python-modules/av/default.nix
index a3ebb3641a86..f736b9f8623f 100644
--- a/pkgs/development/python-modules/av/default.nix
+++ b/pkgs/development/python-modules/av/default.nix
@@ -12,11 +12,11 @@
 
 buildPythonPackage rec {
   pname = "av";
-  version = "6.0.0";
+  version = "6.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "9037d73d7a812c3dc75d9cc27d03215483c9e782eae63a07142c0725c6bd2df0";
+    sha256 = "0h5d6yy6mjaflzh9z8fv3j1rjwijmzqfrpz88zxk0qfmbprdc91z";
   };
 
   buildInputs = [ nose pillow numpy ffmpeg_4 git pkgconfig ];

From d5dc90c1e1f59abe8ba6ede0d36cf17f00b00123 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Wed, 2 Jan 2019 18:56:56 -0600
Subject: [PATCH 103/274] terminus-font: set version, pname, kinda

---
 pkgs/data/fonts/terminus-font/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/terminus-font/default.nix b/pkgs/data/fonts/terminus-font/default.nix
index adbce5c8cf9b..2221f6bc6f5f 100644
--- a/pkgs/data/fonts/terminus-font/default.nix
+++ b/pkgs/data/fonts/terminus-font/default.nix
@@ -1,10 +1,12 @@
 { stdenv, fetchurl, python3, bdftopcf, mkfontdir, mkfontscale }:
 
 stdenv.mkDerivation rec {
-  name = "terminus-font-4.47";
+  pname = "terminus-font";
+  version = "4.47";
+  name = "${pname}-${version}"; # set here for use in URL below
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/terminus-font/${name}/${name}.tar.gz";
+    url = "mirror://sourceforge/project/${pname}/${name}/${name}.tar.gz";
     sha256 = "15qjcpalcxjiwsjgjg5k88vkwp56cs2nnx4ghya6mqp4i1c206qg";
   };
 

From c9cfff872313389c3954a67eed072f5638d06499 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 2 Jan 2019 18:10:54 -0800
Subject: [PATCH 104/274] parallel: 20181122 -> 20181222

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/parallel/versions
---
 pkgs/tools/misc/parallel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix
index 22a032a4a46e..4697c0a09f06 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, perl, makeWrapper, procps }:
 
 stdenv.mkDerivation rec {
-  name = "parallel-20181122";
+  name = "parallel-20181222";
 
   src = fetchurl {
     url = "mirror://gnu/parallel/${name}.tar.bz2";
-    sha256 = "1mcqymf6vg8jhnjv71sswcz5xrwpq2h2ishi8m1hz8rwhc65h1ig";
+    sha256 = "0sd39nzgff3rpyzfwkffb5yxbdm5r6amrkslbgpjlrcrymy9z305";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 181623548ce7d18d73e6d715ec6fcda2367c7b88 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 2 Jan 2019 18:33:10 -0800
Subject: [PATCH 105/274] kdeApplications.okteta: 0.25.4 -> 0.25.5

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/okteta/versions
---
 pkgs/applications/editors/okteta/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/okteta/default.nix b/pkgs/applications/editors/okteta/default.nix
index b14065429152..3cc3b9143894 100644
--- a/pkgs/applications/editors/okteta/default.nix
+++ b/pkgs/applications/editors/okteta/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "okteta-${version}";
-  version = "0.25.4";
+  version = "0.25.5";
 
   src = fetchurl {
     url = "mirror://kde/stable/okteta/${version}/src/${name}.tar.xz";
-    sha256 = "0liar1xbns6mr6j320nyxqfii82i4ysp62hf3j6jg1112v874amf";
+    sha256 = "1680hx4n36msz86gyjsdr5v7nf8rpybvzrvfw8y98l95hfq3l6g9";
   };
 
   nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ];

From 88a82a4dc9ea13b4159c80faf4336ff2da522e95 Mon Sep 17 00:00:00 2001
From: wedens <kirill.wedens@gmail.com>
Date: Wed, 2 Jan 2019 23:09:15 +0700
Subject: [PATCH 106/274] xkb-switch: 1.3.1 -> 1.5.0, rename from xkb_switch

---
 pkgs/misc/vim-plugins/overrides.nix   |  6 +++---
 pkgs/tools/X11/xkb-switch/default.nix | 18 +++++++++---------
 pkgs/top-level/all-packages.nix       |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix
index 307681111ac2..febdd94e1198 100644
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@@ -1,7 +1,7 @@
 { lib, stdenv
 , python, cmake, vim, ruby
 , which, fetchgit, llvmPackages, rustPlatform
-, xkb_switch, fzf, skim
+, xkb-switch, fzf, skim
 , python3, boost, icu, ncurses
 , ycmd, rake
 , substituteAll
@@ -308,9 +308,9 @@ self: super: {
   vim-xkbswitch = super.vim-xkbswitch.overrideAttrs(old: {
     patchPhase = ''
       substituteInPlace plugin/xkbswitch.vim \
-        --replace /usr/local/lib/libxkbswitch.so ${xkb_switch}/lib/libxkbswitch.so
+        --replace /usr/local/lib/libxkbswitch.so ${xkb-switch}/lib/libxkbswitch.so
     '';
-    buildInputs = [ xkb_switch ];
+    buildInputs = [ xkb-switch ];
   });
 
   vim-yapf = super.vim-yapf.overrideAttrs(old: {
diff --git a/pkgs/tools/X11/xkb-switch/default.nix b/pkgs/tools/X11/xkb-switch/default.nix
index 4afa56f7fe27..e3bbd5990757 100644
--- a/pkgs/tools/X11/xkb-switch/default.nix
+++ b/pkgs/tools/X11/xkb-switch/default.nix
@@ -1,24 +1,24 @@
-{ stdenv, fetchgit, cmake, libX11 }:
+{ stdenv, fetchFromGitHub, cmake, libX11, libxkbfile }:
 
 stdenv.mkDerivation rec {
   name = "xkb-switch-${version}";
-  version = "1.3.1";
+  version = "1.5.0";
 
-  src = fetchgit {
-    url = https://github.com/ierton/xkb-switch.git;
-    rev = "351c84370ad0fa4aaaab9a32817859b1d5fb2a11";
-    sha256 = "0ilj3amwidi7imjvi8hr62y7j8zl809r5xhs7kv816773x32gpxq";
+  src = fetchFromGitHub {
+    owner = "ierton";
+    repo = "xkb-switch";
+    rev = version;
+    sha256 = "03wk2gg3py97kx0kjzbjrikld1sa55i6mgi398jbcbiyx2gjna78";
   };
 
-  buildInputs = [ cmake libX11 ];
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ libX11 libxkbfile ];
 
   meta = with stdenv.lib; {
     description = "Switch your X keyboard layouts from the command line";
-
     homepage = https://github.com/ierton/xkb-switch;
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ smironov ];
     platforms = platforms.linux;
   };
 }
-
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2a7290ffb2ce..2bcb2803c0eb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20240,7 +20240,7 @@ in
 
   xpointerbarrier = callPackage ../tools/X11/xpointerbarrier {};
 
-  xkb_switch = callPackage ../tools/X11/xkb-switch { };
+  xkb-switch = callPackage ../tools/X11/xkb-switch { };
 
   xkblayout-state = callPackage ../applications/misc/xkblayout-state { };
 

From 812a89f46e1a020768980be88071d4e0f025264f Mon Sep 17 00:00:00 2001
From: wedens <kirill.wedens@gmail.com>
Date: Wed, 2 Jan 2019 22:27:32 +0700
Subject: [PATCH 107/274] kbdd: unstable-2015-01-26 -> unstable-2017-01-29

`unstable-2015-01-26` wasn't the actual version of the derivation
but instead was discerned from the date of the previous commit used
for the fetch.
---
 pkgs/applications/window-managers/kbdd/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/window-managers/kbdd/default.nix b/pkgs/applications/window-managers/kbdd/default.nix
index 7aa604690f9a..08b79927d21e 100644
--- a/pkgs/applications/window-managers/kbdd/default.nix
+++ b/pkgs/applications/window-managers/kbdd/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, fetchgit, pkgconfig, dbus-glib, autoreconfHook, xorg }:
+{ stdenv, fetchFromGitHub, pkgconfig, dbus-glib, autoreconfHook, xorg }:
 
 stdenv.mkDerivation rec {
-  name = "kbdd";
+  pname = "kbdd";
+  version = "unstable-2017-01-29";
 
-  src = fetchgit {
-    url = https://github.com/qnikst/kbdd;
-    rev = "47dee0232f157cd865e43d92005a2ba107f6fd75";
-    sha256 = "1ys9w1lncsfg266g9sfnm95an2add3g51mryg0hnrzcqa4knz809";
+  src = fetchFromGitHub {
+    owner = "qnikst";
+    repo = "kbdd";
+    rev = "0e1056f066ab6e3c74fd0db0c9710a9a2b2538c3";
+    sha256 = "068iqkqxh7928xlmz2pvnykszn9bcq2qgkkiwf37k1vm8fdmgzlj";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From 1fb390b52a79e3679e2338fd375099581c8f2834 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 2 Jan 2019 19:54:20 -0800
Subject: [PATCH 108/274] openorienteering-mapper: 0.8.3 -> 0.8.4

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/openorienteering-mapper/versions
---
 pkgs/applications/gis/openorienteering-mapper/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/gis/openorienteering-mapper/default.nix b/pkgs/applications/gis/openorienteering-mapper/default.nix
index 3517351090d7..a5a0492ab876 100644
--- a/pkgs/applications/gis/openorienteering-mapper/default.nix
+++ b/pkgs/applications/gis/openorienteering-mapper/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   name = "OpenOrienteering-Mapper-${version}";
-  version = "0.8.3";
+  version = "0.8.4";
 
   buildInputs = [ gdal qtbase qttools qtlocation qtimageformats
                   qtsensors clipper zlib proj doxygen cups];
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     owner = "OpenOrienteering";
     repo = "mapper";
     rev = "v${version}";
-    sha256 = "0pnqwvmg97mgc2ci3abmx07l0njxcrbljh75w8ym31g0jq76pgr9";
+    sha256 = "0rw34kp2vd1la97vnk9plwvis6lvyib2bvs7lgkhpnm4p5l7dp1g";
   };
 
   cmakeFlags =

From b0f40b7851309ed20524f0b05bd4b1dda13d4ea4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 2 Jan 2019 19:14:50 -0800
Subject: [PATCH 109/274] offlineimap: 7.2.1 -> 7.2.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/offlineimap/versions
---
 pkgs/tools/networking/offlineimap/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix
index 13c195d64e88..50ed107bc20d 100644
--- a/pkgs/tools/networking/offlineimap/default.nix
+++ b/pkgs/tools/networking/offlineimap/default.nix
@@ -2,14 +2,14 @@
   asciidoc, libxml2, libxslt, docbook_xsl }:
 
 python2Packages.buildPythonApplication rec {
-  version = "7.2.1";
+  version = "7.2.2";
   pname = "offlineimap";
 
   src = fetchFromGitHub {
     owner = "OfflineIMAP";
     repo = "offlineimap";
     rev = "v${version}";
-    sha256 = "1m5i74baazwazqp98ssma968rnwzfl1nywb7icf0swc8447ps97q";
+    sha256 = "11nj7y9fa7v6vcxk3wr8smfgm3mxxnmq3l8q69rrjxlfzcv7dl8m";
   };
 
   postPatch = ''

From 54de63113d778a42858dddfa4977a2072100849a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 2 Jan 2019 20:34:58 -0800
Subject: [PATCH 110/274] osrm-backend: 5.20.0 -> 5.21.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/osrm-backend/versions
---
 pkgs/servers/osrm-backend/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/osrm-backend/default.nix b/pkgs/servers/osrm-backend/default.nix
index 4e43fffb1966..47c1bf3d77ae 100644
--- a/pkgs/servers/osrm-backend/default.nix
+++ b/pkgs/servers/osrm-backend/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "osrm-backend-${version}";
-  version = "5.20.0";
+  version = "5.21.0";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner  = "Project-OSRM";
     repo   = "osrm-backend";
-    sha256 = "0frq16p4wms8zfb6mhn7xbxrvf81f1wn37lqlf5p1yjly5fbljhc";
+    sha256 = "18v2lwx5iyn73b5bfh2r898cwps7m9pwym197dl8lg0jy88m129m";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];

From 34ea243e4278e0518cb793844b59c54450e95ded Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 2 Jan 2019 23:33:54 -0500
Subject: [PATCH 111/274] qrencode: fix darwin build

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

diff --git a/pkgs/development/libraries/qrencode/default.nix b/pkgs/development/libraries/qrencode/default.nix
index 1cbdf1ffdf8a..9e8d9ce239bf 100644
--- a/pkgs/development/libraries/qrencode/default.nix
+++ b/pkgs/development/libraries/qrencode/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, SDL2, libpng }:
+{ stdenv, fetchurl, pkgconfig, SDL2, libpng, libiconv }:
 
 stdenv.mkDerivation rec {
   pname = "qrencode";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ SDL2 libpng ];
+  buildInputs = [ SDL2 libpng ] ++ stdenv.lib.optionals stdenv.isDarwin [ libiconv ];
 
   configureFlags = [
     "--with-tests"

From 4345715025d618689edeb66dfa1f33557d426a20 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Cugnet <jean-philippe@cugnet.eu>
Date: Wed, 26 Dec 2018 16:09:12 +0100
Subject: [PATCH 112/274] elixir_1_8: init at 1.8.0-rc.1

---
 pkgs/development/beam-modules/default.nix    | 5 +++++
 pkgs/development/interpreters/elixir/1.8.nix | 7 +++++++
 pkgs/top-level/all-packages.nix              | 2 +-
 pkgs/top-level/beam-packages.nix             | 3 ++-
 4 files changed, 15 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/interpreters/elixir/1.8.nix

diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix
index c5be1c78a55f..94ffa32a678d 100644
--- a/pkgs/development/beam-modules/default.nix
+++ b/pkgs/development/beam-modules/default.nix
@@ -44,6 +44,11 @@ let
         # BEAM-based languages.
         elixir = elixir_1_7;
 
+        elixir_1_8 = lib.callElixir ../interpreters/elixir/1.8.nix {
+          inherit rebar erlang;
+          debugInfo = true;
+        };
+
         elixir_1_7 = lib.callElixir ../interpreters/elixir/1.7.nix {
           inherit rebar erlang;
           debugInfo = true;
diff --git a/pkgs/development/interpreters/elixir/1.8.nix b/pkgs/development/interpreters/elixir/1.8.nix
new file mode 100644
index 000000000000..65c008f8ac6b
--- /dev/null
+++ b/pkgs/development/interpreters/elixir/1.8.nix
@@ -0,0 +1,7 @@
+{ mkDerivation }:
+
+mkDerivation rec {
+  version = "1.8.0-rc.1";
+  sha256 = "06k9q46cwn79ic6kw0b0mskf9rqlgm02jb8n1ajz55kmw134kq6m";
+  minimumOTPVersion = "20";
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2bcb2803c0eb..7917ccffd13e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7697,7 +7697,7 @@ in
   inherit (beam.interpreters)
     erlang erlangR18 erlangR19 erlangR20 erlangR21
     erlang_odbc erlang_javac erlang_odbc_javac erlang_nox erlang_basho_R16B02
-    elixir elixir_1_7 elixir_1_6 elixir_1_5 elixir_1_4 elixir_1_3
+    elixir elixir_1_8 elixir_1_7 elixir_1_6 elixir_1_5 elixir_1_4 elixir_1_3
     lfe lfe_1_2;
 
   inherit (beam.packages.erlang)
diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix
index 85bdc59e6dbd..8255a2223f96 100644
--- a/pkgs/top-level/beam-packages.nix
+++ b/pkgs/top-level/beam-packages.nix
@@ -61,7 +61,8 @@ rec {
     # Other Beam languages. These are built with `beam.interpreters.erlang`. To
     # access for example elixir built with different version of Erlang, use
     # `beam.packages.erlangR19.elixir`.
-    inherit (packages.erlang) elixir elixir_1_7 elixir_1_6 elixir_1_5 elixir_1_4 elixir_1_3;
+    inherit (packages.erlang)
+      elixir elixir_1_8 elixir_1_7 elixir_1_6 elixir_1_5 elixir_1_4 elixir_1_3;
 
     inherit (packages.erlang) lfe lfe_1_2;
   };

From fa86030ff4a9ce25fc664bc52a959d5f087bfa68 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 2 Jan 2019 21:42:24 -0800
Subject: [PATCH 113/274] notejot: 1.5.2 -> 1.5.3

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/notejot/versions
---
 pkgs/applications/misc/notejot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/notejot/default.nix b/pkgs/applications/misc/notejot/default.nix
index a687e1046050..9e2f4bf7f2e4 100644
--- a/pkgs/applications/misc/notejot/default.nix
+++ b/pkgs/applications/misc/notejot/default.nix
@@ -3,7 +3,7 @@
 
 stdenv.mkDerivation rec {
   pname = "notejot";
-  version = "1.5.2";
+  version = "1.5.3";
 
   name = "${pname}-${version}";
 
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     owner = "lainsce";
     repo = pname;
     rev = version;
-    sha256 = "17rqyckq7z5cxj3mbfrar1zzgwbzhrx87ps7mm6bf798hwflm9qk";
+    sha256 = "1n41sg9a38p9qp8pz3lx9rnb8kc069vkbwf963zzpzs2745h6s9v";
   };
 
   nativeBuildInputs = [

From fd31903bc52c81b88dbd779d52cbbec3e3902161 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 2 Jan 2019 22:11:21 -0800
Subject: [PATCH 114/274] mc: 4.8.21 -> 4.8.22

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mc/versions
---
 pkgs/tools/misc/mc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/mc/default.nix b/pkgs/tools/misc/mc/default.nix
index bdae1e0cf848..a86b7fecc436 100644
--- a/pkgs/tools/misc/mc/default.nix
+++ b/pkgs/tools/misc/mc/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "mc-${version}";
-  version = "4.8.21";
+  version = "4.8.22";
 
   src = fetchurl {
     url = "http://www.midnight-commander.org/downloads/${name}.tar.xz";
-    sha256 = "130lzrcmazinznnnpf00lcizdlmjdhfiqfx00g1cjcbwmi3fadwg";
+    sha256 = "060kh3dmk8fmmsibn1l815qjazzfxzbhgqggrhncz604pbbnhy7f";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From a285cead446ea6a14e0a1c090ec81180eb88afd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D1=83=D1=85=D0=B0=D1=80=D0=B8=D0=BA?=
 <suhr@i2pmail.org>
Date: Thu, 3 Jan 2019 09:38:36 +0300
Subject: [PATCH 115/274] nixos/display-managers: allow pure wayland sessions

---
 nixos/modules/services/x11/display-managers/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index 047321bd9495..0e87e6adbab8 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -191,7 +191,9 @@ let
       '') names}
 
       ${concatMapStrings (pkg: ''
-        ${xorg.lndir}/bin/lndir ${pkg}/share/xsessions $out/share/xsessions
+        if test -d ${pkg}/share/xsessions; then
+          ${xorg.lndir}/bin/lndir ${pkg}/share/xsessions $out/share/xsessions
+        fi
       '') cfg.displayManager.extraSessionFilePackages}
 
       

From e131824ca9a655c4dd593ad37e1a4cec86f9e3e1 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 2 Jan 2019 17:08:53 -0800
Subject: [PATCH 116/274] python37Packages.bokeh: 1.0.1 -> 1.0.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-bokeh/versions
---
 pkgs/development/python-modules/bokeh/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/bokeh/default.nix b/pkgs/development/python-modules/bokeh/default.nix
index 67dbe0fa9d12..4d55aec60589 100644
--- a/pkgs/development/python-modules/bokeh/default.nix
+++ b/pkgs/development/python-modules/bokeh/default.nix
@@ -33,11 +33,11 @@
 
 buildPythonPackage rec {
   pname = "bokeh";
-  version = "1.0.1";
+  version = "1.0.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "43aa8b867f2db99c0cf3178149d2533e9e954a8355d6161381d0b8765c90db5e";
+    sha256 = "07rczl2xkkqzpm45m0rlb2hki48b6w1k912gmwacf5aisnc0a0rw";
   };
 
   disabled = isPyPy;

From 4f6af19e6981d28898c94dd3040e94812113c088 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 2 Jan 2019 15:13:35 -0800
Subject: [PATCH 117/274] python37Packages.astroquery: 0.3.8 -> 0.3.9

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-astroquery/versions
---
 pkgs/development/python-modules/astroquery/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/astroquery/default.nix b/pkgs/development/python-modules/astroquery/default.nix
index 50312d5e343a..b2771505a663 100644
--- a/pkgs/development/python-modules/astroquery/default.nix
+++ b/pkgs/development/python-modules/astroquery/default.nix
@@ -10,13 +10,13 @@
 
 buildPythonPackage rec {
   pname = "astroquery";
-  version = "0.3.8";
+  version = "0.3.9";
 
   doCheck = false; # Tests require the pytest-astropy package
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "800d9730c9e2bd299f14c29b4d709d1605c82833223a2e4f784fea7ad805c168";
+    sha256 = "0zw3xp2rfc6h2v569iqsyvzhfnzp7bfjb7jrj61is1hrqw1cqjrb";
   };
 
   propagatedBuildInputs = [ astropy requests keyring beautifulsoup4 html5lib ];

From 37baac21b4408fa8e1db8beeb396d9066decea70 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 2 Jan 2019 16:30:49 -0800
Subject: [PATCH 118/274] playonlinux: 4.3.3 -> 4.3.4

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/playonlinux/versions
---
 pkgs/applications/misc/playonlinux/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/playonlinux/default.nix b/pkgs/applications/misc/playonlinux/default.nix
index e1b6b7fcc464..c31d442d2d67 100644
--- a/pkgs/applications/misc/playonlinux/default.nix
+++ b/pkgs/applications/misc/playonlinux/default.nix
@@ -22,7 +22,7 @@
 }:
 
 let
-  version = "4.3.3";
+  version = "4.3.4";
 
   binpath = stdenv.lib.makeBinPath
     [ cabextract
@@ -55,7 +55,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.playonlinux.com/script_files/PlayOnLinux/${version}/PlayOnLinux_${version}.tar.gz";
-    sha256 = "117xivwa87i2w66klplmwd5q7pfxcbrj2rjm11wl8iy5h3xpqkak";
+    sha256 = "019dvb55zqrhlbx73p6913807ql866rm0j011ix5mkk2g79dzhqp";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 4b2670cc261fe53569b575422e5b2f0d04368e66 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 2 Jan 2019 23:37:09 -0800
Subject: [PATCH 119/274] mediainfo: 18.08.1 -> 18.12

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mediainfo/versions
---
 pkgs/applications/misc/mediainfo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix
index 69e33fbfc184..a3320a16ee91 100644
--- a/pkgs/applications/misc/mediainfo/default.nix
+++ b/pkgs/applications/misc/mediainfo/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, autoreconfHook, pkgconfig, libzen, libmediainfo, zlib }:
 
 stdenv.mkDerivation rec {
-  version = "18.08.1";
+  version = "18.12";
   name = "mediainfo-${version}";
   src = fetchurl {
     url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
-    sha256 = "0rq2dczjq26g5i0ac8px7xmxjvqq4h0rzd97fy5824yb2c5ksxs9";
+    sha256 = "01pk57ff297lifm3g2hrbmfmchgyy5rir8103n2j3l0dkn2i0g3d";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From c00dbcb7c49ad99c602624c2c4e5f769208c75a9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 2 Jan 2019 14:12:47 -0800
Subject: [PATCH 120/274] picard-tools: 2.18.20 -> 2.18.21

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/picard-tools/versions
---
 pkgs/applications/science/biology/picard-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/biology/picard-tools/default.nix b/pkgs/applications/science/biology/picard-tools/default.nix
index ad37a3a7dabf..6203ed0a8192 100644
--- a/pkgs/applications/science/biology/picard-tools/default.nix
+++ b/pkgs/applications/science/biology/picard-tools/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "picard-tools-${version}";
-  version = "2.18.20";
+  version = "2.18.21";
 
   src = fetchurl {
     url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar";
-    sha256 = "0dx6fxn6d7mawkah242fdi9wm8pdzmm4m004fb9ak2fsvrs2m5pk";
+    sha256 = "0p1na79p0kz1x1nd88100487s4f306p8k4m7dq5r4m2kdsc1dqin";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From d65a3efc3f680f6229883778f1e77c1ae3f15709 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 3 Jan 2019 08:45:58 +0100
Subject: [PATCH 121/274] pythonPackages.python-jose: fix build for python 3.6"

---
 pkgs/development/python-modules/python-jose/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/python-jose/default.nix b/pkgs/development/python-modules/python-jose/default.nix
index 4eb2daaf26dc..14daecab4db8 100644
--- a/pkgs/development/python-modules/python-jose/default.nix
+++ b/pkgs/development/python-modules/python-jose/default.nix
@@ -25,6 +25,11 @@ buildPythonPackage rec {
     py.test
   '';
 
+  postPatch = ''
+    # File says it's utf-8 so instead of relying on the environment, fix the decoding when reading.
+    substituteInPlace setup.py --replace "open('README.md')" "open('README.md',encoding='utf-8')"
+  '';
+
   propagatedBuildInputs = [ future six ecdsa rsa ];
 
   meta = with stdenv.lib; {

From 8e492b733fba89ebf608a96c5fdfc0a29ec5ce49 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 3 Jan 2019 00:48:55 -0800
Subject: [PATCH 122/274] mopidy: 2.2.1 -> 2.2.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mopidy/versions
---
 pkgs/applications/audio/mopidy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix
index 81b14a694534..9015a8c749a8 100644
--- a/pkgs/applications/audio/mopidy/default.nix
+++ b/pkgs/applications/audio/mopidy/default.nix
@@ -4,13 +4,13 @@
 
 pythonPackages.buildPythonApplication rec {
   pname = "mopidy";
-  version = "2.2.1";
+  version = "2.2.2";
 
   src = fetchFromGitHub {
     owner = "mopidy";
     repo = "mopidy";
     rev = "v${version}";
-    sha256 = "012gg6x6d27adbfnwd4a607dl49bzk74az6h9djfvl2w0rbxzhhr";
+    sha256 = "01vl162c7ssf69b0m65ys9fxnsqnfa1whwbprnc063lkcnrnlkr1";
   };
 
   nativeBuildInputs = [ wrapGAppsHook ];

From d58d2e2aa750309cf1f2ab4624c43f914b9cbd00 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 3 Jan 2019 09:50:01 +0100
Subject: [PATCH 123/274] julia: update to 1.0.3

(cherry picked from commit 438b6df1b121f3472ab8042944d4d007d43e97c0)
---
 pkgs/development/compilers/julia/1.0.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/julia/1.0.nix b/pkgs/development/compilers/julia/1.0.nix
index 528a0d26d056..d120742d37ca 100644
--- a/pkgs/development/compilers/julia/1.0.nix
+++ b/pkgs/development/compilers/julia/1.0.nix
@@ -1,6 +1,6 @@
 import ./shared.nix {
   majorVersion = "1";
   minorVersion = "0";
-  maintenanceVersion = "1";
-  src_sha256 = "0bqb5c63c7jnb753nplqj5v4k9pvh792k8y4b1n5pq8jiibr86i0";
+  maintenanceVersion = "3";
+  src_sha256 = "0sjyvzdiizibljq0b3b5681mmyyzd5zicvygaavr0k0na9ndzsdz";
 }

From d4180547aaeb7f24308cedcb04d857f7b5f91ebb Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 3 Jan 2019 00:51:35 -0800
Subject: [PATCH 124/274] nnn: 2.1 -> 2.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/nnn/versions
---
 pkgs/applications/misc/nnn/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/nnn/default.nix b/pkgs/applications/misc/nnn/default.nix
index 0e60c2bfa16e..1c1fd292e5d9 100644
--- a/pkgs/applications/misc/nnn/default.nix
+++ b/pkgs/applications/misc/nnn/default.nix
@@ -4,13 +4,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "nnn-${version}";
-  version = "2.1";
+  version = "2.2";
 
   src = fetchFromGitHub {
     owner = "jarun";
     repo = "nnn";
     rev = "v${version}";
-    sha256 = "1vkrhsdwgacln335rjywdf7nj7fg1x55szmm8xrvwda8y2qjqhc4";
+    sha256 = "01y2vkw1wakpnpzhzia3d44iir060i8vma3b3ww5wgwg7bfpzs4b";
   };
 
   configFile = optionalString (conf!=null) (builtins.toFile "nnn.h" conf);

From 9496a0e3af7e6c3306d754a5d8528bb1b6361325 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 3 Jan 2019 00:57:03 -0800
Subject: [PATCH 125/274] mosquitto: 1.5.4 -> 1.5.5

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mosquitto/versions
---
 pkgs/servers/mqtt/mosquitto/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/servers/mqtt/mosquitto/default.nix
index c5ece477ced6..a8203ce1b168 100644
--- a/pkgs/servers/mqtt/mosquitto/default.nix
+++ b/pkgs/servers/mqtt/mosquitto/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "mosquitto-${version}";
-  version = "1.5.4";
+  version = "1.5.5";
 
   src = fetchFromGitHub {
     owner  = "eclipse";
     repo   = "mosquitto";
     rev    = "v${version}";
-    sha256 = "0pb38y6m682xqrkzhp41mj54x5ic43761xzschgnw055mzksbgk2";
+    sha256 = "1sfwmvrglfy5gqfk004kvbjldqr36dqz6xmppbgfhr47j5zs66xc";
   };
 
   postPatch = ''

From 0755e8f6295d593d0540284fd1399ac206d99d82 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 3 Jan 2019 01:19:21 -0800
Subject: [PATCH 126/274] now-cli: 12.1.12 -> 12.1.14

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/now-cli/versions
---
 pkgs/development/web/now-cli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/now-cli/default.nix b/pkgs/development/web/now-cli/default.nix
index 1057a987cbc5..c82566a17408 100644
--- a/pkgs/development/web/now-cli/default.nix
+++ b/pkgs/development/web/now-cli/default.nix
@@ -1,12 +1,12 @@
 { stdenv, lib, fetchurl }:
 stdenv.mkDerivation rec {
   name = "now-cli-${version}";
-  version = "12.1.12";
+  version = "12.1.14";
 
   # TODO: switch to building from source, if possible
   src = fetchurl {
     url = "https://github.com/zeit/now-cli/releases/download/${version}/now-linux.gz";
-    sha256 = "019lbysfwax69mmgia6h6kbljd7adbh319g3ky2s8djy7n6js4dz";
+    sha256 = "1nmwhb75bqlw7166vr2mwv88mhs940a9lhgw257449d5kgxwqfd1";
   };
 
   sourceRoot = ".";

From 810b779f0528d7d6e240258f9451225258c5f506 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Thu, 3 Jan 2019 10:20:03 +0100
Subject: [PATCH 127/274] sequeler: 0.6.5 -> 0.6.7

Changelog: https://github.com/Alecaddd/sequeler/releases/tag/v0.6.7
Changelog: https://github.com/Alecaddd/sequeler/releases/tag/v0.6.6
---
 pkgs/applications/misc/sequeler/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/misc/sequeler/default.nix b/pkgs/applications/misc/sequeler/default.nix
index 670e2be47164..72a1465a2c83 100644
--- a/pkgs/applications/misc/sequeler/default.nix
+++ b/pkgs/applications/misc/sequeler/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchFromGitHub
 , meson, ninja, pkgconfig, vala, gobject-introspection, gettext, wrapGAppsHook, python3, desktop-file-utils
-, gtk3, glib, granite, libgee, libgda, gtksourceview, libxml2, libsecret }:
+, gtk3, glib, granite, libgee, libgda, gtksourceview, libxml2, libsecret, libfixposix, libssh2 }:
 
 
 let
-  version = "0.6.5";
+  version = "0.6.7";
   sqlGda = libgda.override {
     mysqlSupport = true;
     postgresSupport = true;
@@ -17,16 +17,16 @@ in stdenv.mkDerivation rec {
     owner = "Alecaddd";
     repo = "sequeler";
     rev = "v${version}";
-    sha256 = "18d0dwrsn69fx1lwm6ihhk2r4996pxiy4hfv608gc1kl4s4f4sqp";
+    sha256 = "0sxmky27pl0aqnh857xb54rnfg1kbr2smdzyrzw67cbv00f6d30p";
   };
 
   nativeBuildInputs = [ meson ninja pkgconfig vala gobject-introspection gettext wrapGAppsHook python3 desktop-file-utils ];
 
-  buildInputs = [ gtk3 glib granite libgee sqlGda gtksourceview libxml2 libsecret ];
+  buildInputs = [ gtk3 glib granite libgee sqlGda gtksourceview libxml2 libsecret libfixposix libssh2 ];
 
   postPatch = ''
-    chmod +x meson/post_install.py
-    patchShebangs meson/post_install.py
+    chmod +x build-aux/meson_post_install.py
+    patchShebangs build-aux/meson_post_install.py
   '';
 
   meta = with stdenv.lib; {

From 4dc18cb059f6c7092cb4f3818aaf53d44884cad4 Mon Sep 17 00:00:00 2001
From: Falco Peijnenburg <fpeijnenburg@gmail.com>
Date: Thu, 3 Jan 2019 10:41:15 +0100
Subject: [PATCH 128/274] Wordpress: 4.9.1 -> 5.0.2

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

diff --git a/pkgs/servers/web-apps/wordpress/default.nix b/pkgs/servers/web-apps/wordpress/default.nix
index 57254713f4b0..3a721b733907 100644
--- a/pkgs/servers/web-apps/wordpress/default.nix
+++ b/pkgs/servers/web-apps/wordpress/default.nix
@@ -2,8 +2,8 @@
 { fetchFromGitHub, lib } : fetchFromGitHub {
   owner = "WordPress";
   repo = "WordPress";
-  rev = "4.9.1";
-  sha256 = "0d931mv6wbgnc7f15nisnn5al0ffi19zya2iwdzw98s4klpaq955";
+  rev = "5.0.2";
+  sha256 = "1r8y62mdv6ji82hcn94gngi68mwilxh69gpx8r83k0cy08s99sln";
   meta = {
     homepage = https://wordpress.org;
     description = "WordPress is open source software you can use to create a beautiful website, blog, or app.";

From 46ecec8239bb540f9031fde63e475905de77e5a1 Mon Sep 17 00:00:00 2001
From: "(cdep)illabout" <cdep.illabout@gmail.com>
Date: Thu, 3 Jan 2019 20:57:49 +0900
Subject: [PATCH 129/274] nixos/cpufreq: Remove the alias to set the cpu
 frequency governor

This PR temporarily fixes the issue with PR 53041 as explained
here:

https://github.com/NixOS/nixpkgs/pull/53041#commitcomment-31825338

The alias `powerManagement.cpufreq.governor` to
`powerManagement.cpuFreqGovernor` has been removed.
---
 nixos/doc/manual/release-notes/rl-1903.xml    | 10 ----
 .../installer/tools/nixos-generate-config.pl  |  2 +-
 nixos/modules/rename.nix                      |  3 -
 nixos/modules/services/hardware/tlp.nix       |  2 +-
 nixos/modules/tasks/cpu-freq.nix              | 57 ++++++++++---------
 5 files changed, 33 insertions(+), 41 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-1903.xml b/nixos/doc/manual/release-notes/rl-1903.xml
index 65761c12c6a4..89d9f48aedd3 100644
--- a/nixos/doc/manual/release-notes/rl-1903.xml
+++ b/nixos/doc/manual/release-notes/rl-1903.xml
@@ -408,16 +408,6 @@
        from nixpkgs due to the lack of maintainers.
      </para>
    </listitem>
-   <listitem>
-    <para>
-       The <option>powerManagement.cpuFreqGovernor</option> option has been
-       aliased to <option>powerManagement.cpufreq.governor</option>.  On laptops,
-       <option>powerManagement.cpuFreqGovernor</option> is sometimes set in
-       <literal>/etc/nixos/hardware-configuration.nix</literal>, so you can
-       rename it to the new name, or run
-       <literal>nixos-generate-config</literal> again.
-    </para>
-   </listitem>
   </itemizedlist>
  </section>
 </section>
diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index fa01dc7bbaf0..52a129b39bcd 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -104,7 +104,7 @@ if (-e "/sys/devices/system/cpu/cpu0/cpufreq/scaling_available_governors") {
 
     foreach $e (@desired_governors) {
         if (index($governors, $e) != -1) {
-            last if (push @attrs, "powerManagement.cpufreq.governor = lib.mkDefault \"$e\";");
+            last if (push @attrs, "powerManagement.cpuFreqGovernor = lib.mkDefault \"$e\";");
         }
     }
 }
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 0ed0f4ac209a..dc0a175d5bb8 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -286,9 +286,6 @@ with lib;
     (mkRenamedOptionModule [ "hardware" "ckb" "enable" ] [ "hardware" "ckb-next" "enable" ])
     (mkRenamedOptionModule [ "hardware" "ckb" "package" ] [ "hardware" "ckb-next" "package" ])
 
-    # cpufeq
-    (mkAliasOptionModule [ "powerManagement" "cpuFreqGovernor" ] [ "powerManagement" "cpufreq" "governor" ])
-
   ] ++ (flip map [ "blackboxExporter" "collectdExporter" "fritzboxExporter"
                    "jsonExporter" "minioExporter" "nginxExporter" "nodeExporter"
                    "snmpExporter" "unifiExporter" "varnishExporter" ]
diff --git a/nixos/modules/services/hardware/tlp.nix b/nixos/modules/services/hardware/tlp.nix
index bbc5b5b80a08..b894025c0fd5 100644
--- a/nixos/modules/services/hardware/tlp.nix
+++ b/nixos/modules/services/hardware/tlp.nix
@@ -55,7 +55,7 @@ in
   config = mkIf cfg.enable {
 
     powerManagement.scsiLinkPolicy = null;
-    powerManagement.cpufreq.governor = null;
+    powerManagement.cpuFreqGovernor = null;
     powerManagement.cpufreq.max = null;
     powerManagement.cpufreq.min = null;
 
diff --git a/nixos/modules/tasks/cpu-freq.nix b/nixos/modules/tasks/cpu-freq.nix
index 684c43a1e903..513382936e47 100644
--- a/nixos/modules/tasks/cpu-freq.nix
+++ b/nixos/modules/tasks/cpu-freq.nix
@@ -4,44 +4,49 @@ with lib;
 
 let
   cpupower = config.boot.kernelPackages.cpupower;
-  cfg = config.powerManagement.cpufreq;
+  cfg = config.powerManagement;
 in
 
 {
   ###### interface
 
-  options.powerManagement.cpufreq = {
+  options.powerManagement = {
 
-    governor = mkOption {
+    # TODO: This should be aliased to powerManagement.cpufreq.governor.
+    # https://github.com/NixOS/nixpkgs/pull/53041#commitcomment-31825338
+    cpuFreqGovernor = mkOption {
       type = types.nullOr types.str;
       default = null;
       example = "ondemand";
       description = ''
         Configure the governor used to regulate the frequence of the
         available CPUs. By default, the kernel configures the
-        performance governor, although this may be overwriten in your
+        performance governor, although this may be overwritten in your
         hardware-configuration.nix file.
 
         Often used values: "ondemand", "powersave", "performance"
       '';
     };
 
-    max = mkOption {
-      type = types.nullOr types.ints.unsigned;
-      default = null;
-      example = 2200000;
-      description = ''
-        The maximum frequency the CPU will use.  Defaults to the maximum possible.
-      '';
-    };
+    cpufreq = {
 
-    min = mkOption {
-      type = types.nullOr types.ints.unsigned;
-      default = null;
-      example = 800000;
-      description = ''
-        The minimum frequency the CPU will use.
-      '';
+      max = mkOption {
+        type = types.nullOr types.ints.unsigned;
+        default = null;
+        example = 2200000;
+        description = ''
+          The maximum frequency the CPU will use.  Defaults to the maximum possible.
+        '';
+      };
+
+      min = mkOption {
+        type = types.nullOr types.ints.unsigned;
+        default = null;
+        example = 800000;
+        description = ''
+          The minimum frequency the CPU will use.
+        '';
+      };
     };
 
   };
@@ -51,16 +56,16 @@ in
 
   config =
     let
-      governorEnable = cfg.governor != null;
-      maxEnable = cfg.max != null;
-      minEnable = cfg.min != null;
+      governorEnable = cfg.cpuFreqGovernor != null;
+      maxEnable = cfg.cpufreq.max != null;
+      minEnable = cfg.cpufreq.min != null;
       enable =
         !config.boot.isContainer &&
         (governorEnable || maxEnable || minEnable);
     in
     mkIf enable {
 
-      boot.kernelModules = optional governorEnable "cpufreq_${cfg.governor}";
+      boot.kernelModules = optional governorEnable "cpufreq_${cfg.cpuFreqGovernor}";
 
       environment.systemPackages = [ cpupower ];
 
@@ -74,9 +79,9 @@ in
           Type = "oneshot";
           RemainAfterExit = "yes";
           ExecStart = "${cpupower}/bin/cpupower frequency-set " +
-            optionalString governorEnable "--governor ${cfg.governor} " +
-            optionalString maxEnable "--max ${toString cfg.max} " +
-            optionalString minEnable "--min ${toString cfg.min} ";
+            optionalString governorEnable "--governor ${cfg.cpuFreqGovernor} " +
+            optionalString maxEnable "--max ${toString cfg.cpufreq.max} " +
+            optionalString minEnable "--min ${toString cfg.cpufreq.min} ";
           SuccessExitStatus = "0 237";
         };
       };

From 3f24867c0936843273ba4a559c39eb1bd0fbed1e Mon Sep 17 00:00:00 2001
From: siraben <bensiraphob@hotmail.co.uk>
Date: Thu, 3 Jan 2019 19:18:13 +0700
Subject: [PATCH 130/274] Update version of Powder Toy.

---
 pkgs/games/the-powder-toy/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/the-powder-toy/default.nix b/pkgs/games/the-powder-toy/default.nix
index 6d10b8e2072f..d49d4392c4f1 100644
--- a/pkgs/games/the-powder-toy/default.nix
+++ b/pkgs/games/the-powder-toy/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "the-powder-toy-${version}";
-  version = "92.5";
+  version = "93.3";
 
   src = fetchFromGitHub {
     owner = "simtr";

From 6ccc6c7cd11534c6a5f3e83e6c31b6cbdc07114f Mon Sep 17 00:00:00 2001
From: Nikita Uvarov <uv.nikita@gmail.com>
Date: Tue, 4 Dec 2018 00:07:28 +0100
Subject: [PATCH 131/274] ddclient: 3.8.3 -> 3.9.0

This release fixes cloudflare protocol usage by switching to a new api
version. See release notes: https://sourceforge.net/p/ddclient/news/2018/08/ddclient-390-released.
Partially fixes #26691.
---
 .../ddclient-line-buffer-stdout.patch         | 20 -------------------
 pkgs/tools/networking/ddclient/default.nix    |  8 +++-----
 2 files changed, 3 insertions(+), 25 deletions(-)
 delete mode 100644 pkgs/tools/networking/ddclient/ddclient-line-buffer-stdout.patch

diff --git a/pkgs/tools/networking/ddclient/ddclient-line-buffer-stdout.patch b/pkgs/tools/networking/ddclient/ddclient-line-buffer-stdout.patch
deleted file mode 100644
index d1ef9e024d2a..000000000000
--- a/pkgs/tools/networking/ddclient/ddclient-line-buffer-stdout.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -u ddclient-3.8.1/ddclient ddclient-3.8.1.patched/ddclient
---- ddclient-3.8.1/ddclient	2011-07-11 23:04:21.000000000 +0200
-+++ ddclient-3.8.1.patched/ddclient	2012-11-08 11:52:31.930647236 +0100
-@@ -19,6 +19,7 @@ use strict;
- use Getopt::Long;
- use Sys::Hostname;
- use IO::Socket;
-+use IO::Handle qw( );
- 
- my ($VERSION) = q$Revision: 157 $ =~ /(\d+)/;
- 
-@@ -675,7 +676,7 @@ $SIG{'TERM'}   = sub { $caught_term = 1; };
- $SIG{'KILL'}   = sub { $caught_kill = 1; };
- # don't fork() if foreground or force is on
- if (opt('foreground') || opt('force')) {
--    ;
-+    STDOUT->autoflush(1);
- } elsif (opt('daemon')) {
-     $SIG{'CHLD'}   = 'IGNORE';
-     my $pid = fork;
diff --git a/pkgs/tools/networking/ddclient/default.nix b/pkgs/tools/networking/ddclient/default.nix
index 14de1fea4790..0a44adbbec2d 100644
--- a/pkgs/tools/networking/ddclient/default.nix
+++ b/pkgs/tools/networking/ddclient/default.nix
@@ -2,19 +2,17 @@
 
 perlPackages.buildPerlPackage rec {
   name = "ddclient-${version}";
-  version = "3.8.3";
+  version = "3.9.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/ddclient/${name}.tar.gz";
-    sha256 = "1j8zdn7fy7i0bjk3jf0hxnbnshc2yf054vxq64imxdpfd7n5zgfy";
+    sha256 = "0fwyhab8yga2yi1kdfkbqxa83wxhwpagmj1w1mwkg2iffh1fjjlw";
   };
 
   # perl packages by default get devdoc which isn't present
   outputs = [ "out" ];
 
-  buildInputs = with perlPackages; [ IOSocketSSL DigestSHA1 ];
-
-  patches = [ ./ddclient-line-buffer-stdout.patch ];
+  buildInputs = with perlPackages; [ IOSocketSSL DigestSHA1 DataValidateIP JSONPP ];
 
   # Use iproute2 instead of ifconfig
   preConfigure = ''

From bd353166816387d83d8f7cc3cbfa2d8fc67416fd Mon Sep 17 00:00:00 2001
From: siraben <bensiraphob@hotmail.co.uk>
Date: Thu, 3 Jan 2019 19:36:24 +0700
Subject: [PATCH 132/274] Fix powder toy build breaking and change source
 repository.

---
 pkgs/games/the-powder-toy/default.nix | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/games/the-powder-toy/default.nix b/pkgs/games/the-powder-toy/default.nix
index d49d4392c4f1..c9637436bcfe 100644
--- a/pkgs/games/the-powder-toy/default.nix
+++ b/pkgs/games/the-powder-toy/default.nix
@@ -5,18 +5,12 @@ stdenv.mkDerivation rec {
   version = "93.3";
 
   src = fetchFromGitHub {
-    owner = "simtr";
+    owner = "ThePowderToy";
     repo = "The-Powder-Toy";
     rev = "v${version}";
-    sha256 = "1n15kgl4qnz55b32ddgmhrv64cl3awbds8arycn7mkf7akwdg1g6";
+    sha256 = "1bg1y13kpqxx4mpncxvmg8w02dyqyd9hl43rwnys3sqrjdm9k02j";
   };
 
-  patches = [ ./fix-env.patch ];
-
-  postPatch = ''
-    sed -i 's,lua5.1,lua,g' SConscript
-  '';
-
   nativeBuildInputs = [ scons pkgconfig ];
 
   buildInputs = [ SDL lua fftwFloat zlib bzip2 ];

From 7731621c81b5cd601a176c2109b44c5295049f20 Mon Sep 17 00:00:00 2001
From: Raphael Borun Das Gupta <git@raphael.dasgupta.ch>
Date: Thu, 3 Jan 2019 13:37:03 +0100
Subject: [PATCH 133/274] davmail: fix homepage domain name

sourcefor**c**e.net is for sale. This project's website resides on a sourcefor**g**e.net subdomain.
---
 pkgs/applications/networking/davmail/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/davmail/default.nix b/pkgs/applications/networking/davmail/default.nix
index b491f287e701..0f05105c596f 100644
--- a/pkgs/applications/networking/davmail/default.nix
+++ b/pkgs/applications/networking/davmail/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://davmail.sourceforce.net/;
+    homepage = http://davmail.sourceforge.net/;
     description = "A Java application which presents a Microsoft Exchange server as local CALDAV, IMAP and SMTP servers";
     maintainers = [ maintainers.hinton ];
     platforms = platforms.all;

From 9fc6345a91b21b48a8f9705c891d87b616100110 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6gler?= <ck3d@gmx.de>
Date: Mon, 31 Dec 2018 14:03:28 +0100
Subject: [PATCH 134/274] cudatoolkit: fix nvprof

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

diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix
index 6fdbde242f32..fb01740232fc 100644
--- a/pkgs/development/compilers/cudatoolkit/default.nix
+++ b/pkgs/development/compilers/cudatoolkit/default.nix
@@ -112,6 +112,10 @@ let
         # Set compiler for NVCC.
         wrapProgram $out/bin/nvcc \
           --prefix PATH : ${gcc}/bin
+
+        # nvprof do not find any program to profile if LD_LIBRARY_PATH is not set
+        wrapProgram $out/bin/nvprof \
+          --prefix LD_LIBRARY_PATH : $out/lib
       '' + lib.optionalString (lib.versionOlder version "8.0") ''
         # Hack to fix building against recent Glibc/GCC.
         echo "NIX_CFLAGS_COMPILE+=' -D_FORCE_INLINES'" >> $out/nix-support/setup-hook

From 344fd2319bd28222ce9873154b2277875712d3ac Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 3 Jan 2019 05:58:09 -0800
Subject: [PATCH 135/274] gromacs: 2018.4 -> 2019

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/gromacs/versions
---
 .../science/molecular-dynamics/gromacs/default.nix          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
index 5f7b15f82d23..a682d59ab23a 100644
--- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
+++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
@@ -8,11 +8,11 @@
 
 
 stdenv.mkDerivation {
-  name = "gromacs-2018.4";
+  name = "gromacs-2019";
 
   src = fetchurl {
-    url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2018.4.tar.gz";
-    sha256 = "14d8mbck1lrmz97vvy322irk557wxh0zdd6n962lm69hqxcf8bkg";
+    url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-2019.tar.gz";
+    sha256 = "02qd27pgc5kwkk68m8hwarkbb1b9z5rdrm67yjqyxd5my2jq3cn5";
   };
 
   buildInputs = [cmake fftw]

From 8c984714581a509f4bf8daf598ca5aeaf16ba1fe Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 3 Jan 2019 06:19:03 -0800
Subject: [PATCH 136/274] josm: 14460 -> 14620

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/josm/versions
---
 pkgs/applications/misc/josm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix
index 847ac3e299c2..7304ad7141a9 100644
--- a/pkgs/applications/misc/josm/default.nix
+++ b/pkgs/applications/misc/josm/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "josm-${version}";
-  version = "14460";
+  version = "14620";
 
   src = fetchurl {
     url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
-    sha256 = "1j95319dvj4cwi1af94n1p8m1z1191j1jx6x06l4vz8bcjxaaqf5";
+    sha256 = "0ypn2awmclxsx4i7mmghs5blz2j5srdayzcxcqn5b4p1r57072bn";
   };
 
   buildInputs = [ jdk11 makeWrapper ];

From 1cf9c63af1cc05f32f79e5f5234eed56662fd973 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 3 Jan 2019 06:47:10 -0800
Subject: [PATCH 137/274] imagemagick7: 7.0.8-14 -> 7.0.8-22

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/imagemagick/versions
---
 pkgs/applications/graphics/ImageMagick/7.0.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix
index 8fb21e65c951..10cc55d3d2bb 100644
--- a/pkgs/applications/graphics/ImageMagick/7.0.nix
+++ b/pkgs/applications/graphics/ImageMagick/7.0.nix
@@ -13,8 +13,8 @@ let
     else throw "ImageMagick is not supported on this platform.";
 
   cfg = {
-    version = "7.0.8-14";
-    sha256 = "0pbrmzsjc8l4klfsz739rnmw61m712r82ryjl8ycvbxdzxwnwm9v";
+    version = "7.0.8-22";
+    sha256 = "1ivljgf192xh7pq1apdic923pvcb3aq74mx8d4hi65hhc9748gv7";
     patches = [];
   };
 in

From 0bb53c3e8a8ed9464e910c381b8e9d74fb415644 Mon Sep 17 00:00:00 2001
From: Jorge Acereda <jacereda@gmail.com>
Date: Thu, 3 Jan 2019 16:13:12 +0100
Subject: [PATCH 138/274] sfml: comment the cf-private workaround

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

diff --git a/pkgs/development/libraries/sfml/default.nix b/pkgs/development/libraries/sfml/default.nix
index 435a9e030a0a..ff59bdcdf92e 100644
--- a/pkgs/development/libraries/sfml/default.nix
+++ b/pkgs/development/libraries/sfml/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchzip, cmake, libX11, freetype, libjpeg, openal, flac, libvorbis
 , glew, libXrandr, libXrender, udev, xcbutilimage
-, darwin, IOKit, Foundation, AppKit, OpenAL
+, cf-private, IOKit, Foundation, AppKit, OpenAL
 }:
 
 let
@@ -19,7 +19,10 @@ stdenv.mkDerivation rec {
   buildInputs = [ freetype libjpeg openal flac libvorbis glew ]
     ++ stdenv.lib.optional stdenv.isLinux udev
     ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXrandr libXrender xcbutilimage ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit Foundation AppKit OpenAL darwin.cf-private ];
+    ++ stdenv.lib.optionals stdenv.isDarwin [ IOKit Foundation AppKit OpenAL
+    # Needed for _NSDefaultRunLoopMode, _OBJC_CLASS_$_NSArray, _OBJC_CLASS_$_NSDate
+    cf-private
+    ];
 
   cmakeFlags = [ "-DSFML_INSTALL_PKGCONFIG_FILES=yes"
                  "-DSFML_MISC_INSTALL_PREFIX=share/SFML"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e8f8cb564bd9..8ba097478135 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12491,6 +12491,7 @@ in
 
   sfml = callPackage ../development/libraries/sfml {
     inherit (darwin.apple_sdk.frameworks) IOKit Foundation AppKit OpenAL;
+    inherit (darwin) cf-private;
   };
   csfml = callPackage ../development/libraries/csfml { };
 

From c81af4dcebf4dd71f58bc11421e29de8268591ef Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 3 Jan 2019 07:44:09 -0800
Subject: [PATCH 139/274] gzdoom: 3.6.0 -> 3.7.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/gzdoom/versions
---
 pkgs/games/gzdoom/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix
index 5563e7836cca..2d1aa91dc3a3 100644
--- a/pkgs/games/gzdoom/default.nix
+++ b/pkgs/games/gzdoom/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "gzdoom-${version}";
-  version = "3.6.0";
+  version = "3.7.1";
 
   src = fetchFromGitHub {
     owner = "coelckers";
     repo = "gzdoom";
     rev = "g${version}";
-    sha256 = "03yklhdppncaswy6l3fcvy8l8v1icfnm9f0jlszvibcm5ba7z0j1";
+    sha256 = "1c9zd4f7zalkmv0gvsavbydkmi6jw5pyf3q62456yvb6vjwg1xvd";
   };
 
   nativeBuildInputs = [ cmake makeWrapper ];

From 28a484d49d77d677696b1f9903005e73a416668f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 3 Jan 2019 07:47:24 -0800
Subject: [PATCH 140/274] khard: 0.12.2 -> 0.13.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/khard/versions
---
 pkgs/applications/misc/khard/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix
index 8ec4e7f06d16..bac0eaaaba6d 100644
--- a/pkgs/applications/misc/khard/default.nix
+++ b/pkgs/applications/misc/khard/default.nix
@@ -17,13 +17,13 @@ let
   };
 
 in with python.pkgs; buildPythonApplication rec {
-  version = "0.12.2";
+  version = "0.13.0";
   name = "khard-${version}";
   namePrefix = "";
 
   src = fetchurl {
     url = "https://github.com/scheibler/khard/archive/v${version}.tar.gz";
-    sha256 = "0lxcvzmafpvqcifgq2xjh1ca07z0vhihn5jnw8zrpmsqdc9p6b4j";
+    sha256 = "06b9xcdg1na6mxa2pnlh0wfsk02k2h6hlki089aaikbg8k8ykj8f";
   };
 
   # setup.py reads the UTF-8 encoded readme.

From 1e5c28f2b94f6ad377d175f94d7813733a080cf7 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Fri, 16 Nov 2018 11:00:58 -0600
Subject: [PATCH 141/274] flatpak: 1.0.5 -> 1.1.2

---
 .../development/libraries/flatpak/default.nix | 27 +++++--------
 .../libraries/flatpak/fix-test-paths.patch    | 38 ++++++++++++++-----
 2 files changed, 38 insertions(+), 27 deletions(-)

diff --git a/pkgs/development/libraries/flatpak/default.nix b/pkgs/development/libraries/flatpak/default.nix
index 41ab930a30ed..39ff74681690 100644
--- a/pkgs/development/libraries/flatpak/default.nix
+++ b/pkgs/development/libraries/flatpak/default.nix
@@ -1,26 +1,24 @@
 { stdenv, fetchurl, autoreconfHook, docbook_xml_dtd_412, docbook_xml_dtd_42, docbook_xml_dtd_43, docbook_xsl, which, libxml2
 , gobject-introspection, gtk-doc, intltool, libxslt, pkgconfig, xmlto, appstream-glib, substituteAll, glibcLocales, yacc, xdg-dbus-proxy, p11-kit
-, bubblewrap, bzip2, dbus, glib, gpgme, json-glib, libarchive, libcap, libseccomp, coreutils, python2, hicolor-icon-theme
-, libsoup, lzma, ostree, polkit, python3, systemd, xorg, valgrind, glib-networking, makeWrapper, gnome3 }:
+, bubblewrap, bzip2, dbus, glib, gpgme, json-glib, libarchive, libcap, libseccomp, coreutils, gettext, python2, hicolor-icon-theme
+, libsoup, lzma, ostree, polkit, python3, systemd, xorg, valgrind, glib-networking, wrapGAppsHook, gnome3 }:
 
-let
-  version = "1.0.5";
-  desktop_schemas = gnome3.gsettings-desktop-schemas;
-in stdenv.mkDerivation rec {
-  name = "flatpak-${version}";
+stdenv.mkDerivation rec {
+  pname = "flatpak";
+  version = "1.1.2";
 
   # TODO: split out lib once we figure out what to do with triggerdir
   outputs = [ "out" "man" "doc" "installedTests" ];
 
   src = fetchurl {
-    url = "https://github.com/flatpak/flatpak/releases/download/${version}/${name}.tar.xz";
-    sha256 = "1wj88lp23bzz0c5n1i84nr2xff572i5cc10fqd9xh7qhj3ivk1w0";
+    url = "https://github.com/flatpak/flatpak/releases/download/${version}/${pname}-${version}.tar.xz";
+    sha256 = "01z7ybskxh6r58yh1m98z0z36fba4ljaxpqmh4y6kkaw8pyhhs6i";
   };
 
   patches = [
     (substituteAll {
       src = ./fix-test-paths.patch;
-      inherit coreutils glibcLocales;
+      inherit coreutils gettext glibcLocales;
       hicolorIconTheme = hicolor-icon-theme;
     })
     (substituteAll {
@@ -34,12 +32,13 @@ in stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     autoreconfHook libxml2 docbook_xml_dtd_412 docbook_xml_dtd_42 docbook_xml_dtd_43 docbook_xsl which gobject-introspection
-    gtk-doc intltool libxslt pkgconfig xmlto appstream-glib yacc makeWrapper
+    gtk-doc intltool libxslt pkgconfig xmlto appstream-glib yacc wrapGAppsHook
   ];
 
   buildInputs = [
     bubblewrap bzip2 dbus glib gpgme json-glib libarchive libcap libseccomp
     libsoup lzma ostree polkit python3 systemd xorg.libXau
+    gnome3.gsettings-desktop-schemas glib-networking
   ];
 
   checkInputs = [ valgrind ];
@@ -65,12 +64,6 @@ in stdenv.mkDerivation rec {
     patchShebangs tests
   '';
 
-  postFixup = ''
-    wrapProgram $out/bin/flatpak \
-      --prefix GIO_EXTRA_MODULES : "${glib-networking.out}/lib/gio/modules" \
-      --prefix XDG_DATA_DIRS : "${desktop_schemas}/share/gsettings-schemas/${desktop_schemas.name}"
-  '';
-
   meta = with stdenv.lib; {
     description = "Linux application sandboxing and distribution framework";
     homepage = https://flatpak.org/;
diff --git a/pkgs/development/libraries/flatpak/fix-test-paths.patch b/pkgs/development/libraries/flatpak/fix-test-paths.patch
index d00e4fa7f895..f987899e3bcb 100644
--- a/pkgs/development/libraries/flatpak/fix-test-paths.patch
+++ b/pkgs/development/libraries/flatpak/fix-test-paths.patch
@@ -1,14 +1,14 @@
 --- a/tests/libtest.sh
 +++ b/tests/libtest.sh
-@@ -296,7 +296,7 @@
-         # running installed-tests: assume we know what we're doing
-         :
-     elif ! "$FLATPAK_BWRAP" --unshare-ipc --unshare-net --unshare-pid \
--            --ro-bind / / /bin/true > bwrap-result 2>&1; then
-+            --ro-bind / / @coreutils@/bin/true > bwrap-result 2>&1; then
-         sed -e 's/^/# /' < bwrap-result
-         echo "1..0 # SKIP Cannot run bwrap"
-         exit 0
+@@ -328,7 +328,7 @@
+     # running installed-tests: assume we know what we're doing
+     _flatpak_bwrap_works=true
+ elif ! "$FLATPAK_BWRAP" --unshare-ipc --unshare-net --unshare-pid \
+-        --ro-bind / / /bin/true > bwrap-result 2>&1; then
++        --ro-bind / / @coreutils@/bin/true > bwrap-result 2>&1; then
+     _flatpak_bwrap_works=false
+ else
+     _flatpak_bwrap_works=true
 @@ -309,12 +309,12 @@
  export DBUS_SESSION_BUS_ADDRESS="$(cat dbus-session-bus-address)"
  DBUS_SESSION_BUS_PID="$(cat dbus-session-bus-pid)"
@@ -24,6 +24,24 @@
      gpg-connect-agent --homedir "${FL_GPG_HOMEDIR}" killagent /bye || true
      fusermount -u $XDG_RUNTIME_DIR/doc || :
      if test -n "${TEST_SKIP_CLEANUP:-}"; then
+--- a/tests/make-test-app.sh
++++ b/tests/make-test-app.sh
+@@ -114,13 +114,13 @@ msgid "Hello world"
+ msgstr "Hallo Welt"
+ EOF
+ mkdir -p ${DIR}/files/de/share/de/LC_MESSAGES
+-msgfmt --output-file ${DIR}/files/de/share/de/LC_MESSAGES/helloworld.mo de.po
++@gettext@/bin/msgfmt --output-file ${DIR}/files/de/share/de/LC_MESSAGES/helloworld.mo de.po
+ cat > fr.po <<EOF
+ msgid "Hello world"
+ msgstr "Bonjour le monde"
+ EOF
+ mkdir -p ${DIR}/files/fr/share/fr/LC_MESSAGES
+-msgfmt --output-file ${DIR}/files/fr/share/fr/LC_MESSAGES/helloworld.mo fr.po
++@gettext@/bin/msgfmt --output-file ${DIR}/files/fr/share/fr/LC_MESSAGES/helloworld.mo fr.po
+ 
+ flatpak build-finish ${DIR}
+ mkdir -p repos
 --- a/tests/make-test-runtime.sh
 +++ b/tests/make-test-runtime.sh
 @@ -26,6 +26,7 @@
@@ -61,7 +79,7 @@
 -    fi
 -}
 -
- for i in $@; do
+ for i in $@ bash ls cat echo readlink; do
 -    I=`which $i`
 -    add_bin $I
 -done

From a17933be4de6b3b10b04201d3a3d712661550bd6 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 24 Dec 2018 05:33:39 -0600
Subject: [PATCH 142/274] xdg-desktop-portal: 1.0.3 -> 1.1.0

Do not add geoclue dependency yet:

Complains it's not new enough, apparently wants
an untagged version (2.5.1 is latest tag)

checking for libgeoclue-2.0 >= 2.5.2... no
configure: error: Package requirements (libgeoclue-2.0 >= 2.5.2) were
not met:

Requested 'libgeoclue-2.0 >= 2.5.2' but version of Geoclue Client
Library is 2.5.1
---
 .../libraries/xdg-desktop-portal/default.nix  | 25 +++++++++++--------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix
index 9cdada9bf3b2..80699188fe2e 100644
--- a/pkgs/development/libraries/xdg-desktop-portal/default.nix
+++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix
@@ -1,30 +1,35 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libxml2, glib, pipewire, fuse }:
+{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, pkgconfig, libxml2, glib, pipewire, fontconfig, flatpak, acl, dbus, fuse, wrapGAppsHook, gnome3 }:
 
-let
-  version = "1.0.3";
-in stdenv.mkDerivation rec {
-  name = "xdg-desktop-portal-${version}";
+stdenv.mkDerivation rec {
+  pname = "xdg-desktop-portal";
+  version = "1.1.0";
 
   outputs = [ "out" "installedTests" ];
 
   src = fetchFromGitHub {
     owner = "flatpak";
-    repo = "xdg-desktop-portal";
+    repo = pname;
     rev = version;
-    sha256 = "113k5sr4l58rm8sgp4qbjrhyjg37c5ad54i58njsm98knb5r2ppv";
+    sha256 = "10dv628gci6vcs0rbyp4wb6yvigw2i1jj9x7ii6ckxjir5rff5dx";
   };
 
   patches = [
     ./respect-path-env-var.patch
+    # https://github.com/flatpak/xdg-desktop-portal/pull/263
+    (fetchpatch {
+      url = https://github.com/flatpak/xdg-desktop-portal/commit/5e5993b64ea43f7ba77335f98e3d6c5bf99a51b9.patch;
+      sha256 = "1i753q35dgihj6vp3961i0hn2sxy2pyfx0dbqa385z0y6wz8k9xq";
+    })
   ];
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig libxml2 ];
-  buildInputs = [ glib pipewire fuse ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig libxml2 wrapGAppsHook ];
+  buildInputs = [ glib pipewire fontconfig flatpak acl dbus fuse gnome3.gsettings-desktop-schemas ];
 
-  doCheck = true;
+  doCheck = true; # XXX: investigate!
 
   configureFlags = [
     "--enable-installed-tests"
+    "--disable-geoclue" # Requires 2.5.2, not released yet
   ];
 
   makeFlags = [

From ac91818071a04167015d2d707900abad0f6105e1 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 24 Dec 2018 05:37:10 -0600
Subject: [PATCH 143/274] xdg-desktop-portal-gtk: 1.0.2 -> 1.1.0

Lockdown requires gsettings-desktop-schemas
---
 .../xdg-desktop-portal-gtk/default.nix          | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix
index f81461b2ac8e..f48320148dac 100644
--- a/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix
+++ b/pkgs/development/libraries/xdg-desktop-portal-gtk/default.nix
@@ -1,19 +1,18 @@
-{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libxml2, xdg-desktop-portal, gtk3, glib }:
+{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, libxml2, xdg-desktop-portal, gtk3, glib, wrapGAppsHook, gnome3 }:
 
-let
-  version = "1.0.2";
-in stdenv.mkDerivation rec {
-  name = "xdg-desktop-portal-gtk-${version}";
+stdenv.mkDerivation rec {
+  pname = "xdg-desktop-portal-gtk";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "flatpak";
-    repo = "xdg-desktop-portal-gtk";
+    repo = pname;
     rev = version;
-    sha256 = "06dzh3vzq5nw3r89kb1qi3r2z8wjh9zmzc0hfnva4vnx7mwgm7ax";
+    sha256 = "1djgsp3n10w6lamwwjn64p9722lvxpalj26h19zscbspnhfldb4f";
   };
 
-  nativeBuildInputs = [ autoreconfHook pkgconfig libxml2 xdg-desktop-portal ];
-  buildInputs = [ glib gtk3 ];
+  nativeBuildInputs = [ autoreconfHook pkgconfig libxml2 xdg-desktop-portal wrapGAppsHook ];
+  buildInputs = [ glib gtk3 gnome3.gsettings-desktop-schemas ];
 
   meta = with stdenv.lib; {
     description = "Desktop integration portals for sandboxed apps";

From e9122540fed2afb6ae7acfab981519ce2e11d50d Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 3 Jan 2019 08:29:14 -0800
Subject: [PATCH 144/274] grpc: 1.17.0 -> 1.17.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/grpc/versions
---
 pkgs/development/libraries/grpc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix
index 559ef9622623..e81989c20937 100644
--- a/pkgs/development/libraries/grpc/default.nix
+++ b/pkgs/development/libraries/grpc/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags }:
 
 stdenv.mkDerivation rec {
-  version = "1.17.0";
+  version = "1.17.2";
   name = "grpc-${version}";
   src = fetchFromGitHub {
     owner = "grpc";
     repo = "grpc";
     rev = "v${version}";
-    sha256 = "17y8lhkx22qahjk89fa0bh76q76mk9vwza59wbwcpzmy0yhl2k23";
+    sha256 = "1rq20951h5in3dy0waa60dsqj27kmg6ylp2gdsxyfrq5jarlj89g";
   };
   nativeBuildInputs = [ cmake pkgconfig ];
   buildInputs = [ zlib c-ares c-ares.cmake-config openssl protobuf gflags ];

From 6da4584acf4478b04457d57f3881b3aca7d3f7b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 3 Jan 2019 16:31:00 +0000
Subject: [PATCH 145/274] Elm: automate packaging with elm2nix

- rewrite documentation
- automate whole process into update.sh
- remove all legacy snippets
---
 doc/package-notes.xml                         |  18 ++---
 pkgs/development/compilers/elm/README.md      |  24 +++++++
 pkgs/development/compilers/elm/default.nix    |  54 +--------------
 pkgs/development/compilers/elm/elm2nix.rb     |  26 --------
 .../compilers/elm/packages/elm-elm.nix        |  50 --------------
 .../compilers/elm/packages/elm-srcs.nix       |  62 ++++++++++++++++++
 .../compilers/elm/packages/elm.nix            |   1 +
 pkgs/development/compilers/elm/update.sh      |   9 ++-
 pkgs/development/compilers/elm/versions.dat   | Bin 83377 -> 94810 bytes
 9 files changed, 104 insertions(+), 140 deletions(-)
 create mode 100644 pkgs/development/compilers/elm/README.md
 delete mode 100755 pkgs/development/compilers/elm/elm2nix.rb
 delete mode 100644 pkgs/development/compilers/elm/packages/elm-elm.nix
 create mode 100644 pkgs/development/compilers/elm/packages/elm-srcs.nix

diff --git a/doc/package-notes.xml b/doc/package-notes.xml
index 803d343aa096..e23593107d8d 100644
--- a/doc/package-notes.xml
+++ b/doc/package-notes.xml
@@ -307,23 +307,19 @@ packageOverrides = pkgs: {
 </screen>
   </para>
  </section>
+
  <section xml:id="sec-elm">
   <title>Elm</title>
 
   <para>
-   The Nix expressions for Elm reside in
-   <filename>pkgs/development/compilers/elm</filename>. They are generated
-   automatically by <command>update-elm.rb</command> script. One should specify
-   versions of Elm packages inside the script, clear the
-   <filename>packages</filename> directory and run the script from inside it.
-   <literal>elm-reactor</literal> is special because it also has Elm package
-   dependencies. The process is not automated very much for now -- you should
-   get the <literal>elm-reactor</literal> source tree (e.g. with
-   <command>nix-shell</command>) and run <command>elm2nix.rb</command> inside
-   it. Place the resulting <filename>package.nix</filename> file into
-   <filename>packages/elm-reactor-elm.nix</filename>.
+   To update Elm compiler, see <filename>nixpkgs/pkgs/development/compilers/elm/README.md</filename>.
+  </para>
+
+  <para>
+   To package Elm applications, <link xlink:href="https://github.com/hercules-ci/elm2nix#elm2nix">read about elm2nix</link>.
   </para>
  </section>
+
  <section xml:id="sec-shell-helpers">
   <title>Interactive shell helpers</title>
 
diff --git a/pkgs/development/compilers/elm/README.md b/pkgs/development/compilers/elm/README.md
new file mode 100644
index 000000000000..f0254d0f9547
--- /dev/null
+++ b/pkgs/development/compilers/elm/README.md
@@ -0,0 +1,24 @@
+# To update Elm:
+
+Modify revision in ./update.sh and run it
+
+# Notes about the build process:
+
+The elm binary embeds a piece of pre-compiled elm code, used by 'elm
+reactor'. This means that the build process for 'elm' effectively
+executes 'elm make'. that in turn expects to retrieve the elm
+dependencies of that code (elm/core, etc.) from
+package.elm-lang.org, as well as a cached bit of metadata
+(versions.dat).
+
+The makeDotElm function lets us retrieve these dependencies in the
+standard nix way. we have to copy them in (rather than symlink) and
+make them writable because the elm compiler writes other .dat files
+alongside the source code. versions.dat was produced during an
+impure build of this same code; the build complains that it can't
+update this cache, but continues past that warning.
+
+Finally, we set ELM_HOME to point to these pre-fetched artifacts so
+that the default of ~/.elm isn't used.
+
+More: https://blog.hercules-ci.com/elm/2019/01/03/elm2nix-0.1/
diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix
index 47a0d459a93d..3c8ae70981e6 100644
--- a/pkgs/development/compilers/elm/default.nix
+++ b/pkgs/development/compilers/elm/default.nix
@@ -2,54 +2,6 @@
 , haskell, nodejs
 , fetchurl, fetchpatch, makeWrapper, git }:
 
-# To update:
-
-# 1) Modify ./update.sh and run it
-
-# 2) to generate versions.dat:
-# 2.1) git clone https://github.com/elm/compiler.git
-# 2.2) cd compiler
-# 2.3) cabal2nix --shell . | sed 's/"default",/"ghc822",/' > shell.nix
-# 2.4) nix-shell
-# 2.5) mkdir .elm
-# 2.6) export ELM_HOME=$(pwd)/.elm
-# 2.7) cabal build
-# 2.8) cp .elm/0.19.0/package/versions.dat ...
-
-# 3) generate a template for elm-elm.nix with:
-# (
-#   echo "{";
-#   jq '.dependencies | .direct, .indirect | to_entries | .[] | { (.key) : { version : .value, sha256:  "" } } ' \
-#   < ui/browser/elm.json \
-#   | sed 's/:/ =/' \
-#   | sed 's/^[{}]//' \
-#   | sed -E 's/(["}]),?$/\1;/' \
-#   | sed -E 's/"(version|sha256)"/\1/' \
-#   | grep -v '^$';
-#   echo "}"
-# )
-#
-# ... then fill in the sha256s
-
-# Notes:
-
-# the elm binary embeds a piece of pre-compiled elm code, used by 'elm
-# reactor'. this means that the build process for 'elm' effectively
-# executes 'elm make'. that in turn expects to retrieve the elm
-# dependencies of that code (elm/core, etc.) from
-# package.elm-lang.org, as well as a cached bit of metadata
-# (versions.dat).
-
-# the makeDotElm function lets us retrieve these dependencies in the
-# standard nix way. we have to copy them in (rather than symlink) and
-# make them writable because the elm compiler writes other .dat files
-# alongside the source code. versions.dat was produced during an
-# impure build of this same code; the build complains that it can't
-# update this cache, but continues past that warning.
-
-# finally, we set ELM_HOME to point to these pre-fetched artifacts so
-# that the default of ~/.elm isn't used.
-
 let
   fetchElmDeps = import ./fetchElmDeps.nix { inherit stdenv lib fetchurl; };
   hsPkgs = haskell.packages.ghc822.override {
@@ -58,8 +10,8 @@ let
             elm = overrideCabal (self.callPackage ./packages/elm.nix { }) (drv: {
               # sadly with parallelism most of the time breaks compilation
               enableParallelBuilding = false;
-              preConfigure = fetchElmDeps {
-                elmPackages = (import ./packages/elm-elm.nix);
+              preConfigure = self.fetchElmDeps {
+                elmPackages = (import ./packages/elm-srcs.nix);
                 versionsDat = ./versions.dat;
               };
               buildTools = drv.buildTools or [] ++ [ makeWrapper ];
@@ -75,8 +27,6 @@ let
               '';
             });
 
-
-
             /*
             The elm-format expression is updated via a script in the https://github.com/avh4/elm-format repo:
             `pacakge/nix/build.sh`
diff --git a/pkgs/development/compilers/elm/elm2nix.rb b/pkgs/development/compilers/elm/elm2nix.rb
deleted file mode 100755
index fab5551ca158..000000000000
--- a/pkgs/development/compilers/elm/elm2nix.rb
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'json'
-
-system("elm-package install -y")
-depsSrc = JSON.parse(File.read("elm-stuff/exact-dependencies.json"))
-deps = Hash[ depsSrc.map { |pkg, ver|
-  url = "https://github.com/#{pkg}/archive/#{ver}.tar.gz"
-  sha256 = `nix-prefetch-url #{url}`
-
-  [ pkg, { version: ver,
-           sha256: sha256.strip
-         }
-  ]
-} ]
-
-File.open("package.nix", 'w') do |file|
-  file.puts "{"
-    for pkg, info in deps
-      file.puts "  \"#{pkg}\" = {"
-      file.puts "    version = \"#{info[:version]}\";"
-      file.puts "    sha256 = \"#{info[:sha256]}\";"
-      file.puts "  };"
-    end
-  file.puts "}"
-end
diff --git a/pkgs/development/compilers/elm/packages/elm-elm.nix b/pkgs/development/compilers/elm/packages/elm-elm.nix
deleted file mode 100644
index a38e21daa06d..000000000000
--- a/pkgs/development/compilers/elm/packages/elm-elm.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "elm/browser" = {
-    version = "1.0.0";
-    sha256 = "1apmvyax93nvmagwj00y16zx10kfv640cxpi64xgqbgy7d2wphy4";
-  };
-  "elm/core" = {
-    version = "1.0.0";
-    sha256 = "10kr86h4v5h4p0586q406a5wbl8xvr1jyrf6097zp2wb8sv21ylw";
-  };
-  "elm/html" = {
-    version = "1.0.0";
-    sha256 = "1n3gpzmpqqdsldys4ipgyl1zacn0kbpc3g4v3hdpiyfjlgh8bf3k";
-  };
-  "elm/http" = {
-    version = "1.0.0";
-    sha256 = "1igmm89ialzrjib1j8xagkxalq1x2gj4l0hfxcd66mpwmvg7psl8";
-  };
-  "elm/json" = {
-    version = "1.0.0";
-    sha256 = "1g0hafkqf2q633r7ir9wxpb1lnlzskhpsyi0h5bkzj0gl072zfnb";
-  };
-  "elm/project-metadata-utils" = {
-    version = "1.0.0";
-    sha256 = "1d4rd4grrnbdvj9gf00h7dr6hbkjzawgkzpizfrkp1z1pyr3mvq9";
-  };
-  "elm/svg" = {
-    version = "1.0.0";
-    sha256 = "08x0v8p9wm699jjmsnbq69pxv3jh60j4f6fg7y6hyr7xxj85y390";
-  };
-  "elm-explorations/markdown" = {
-    version = "1.0.0";
-    sha256 = "0k3110ixa4wwf3vkkdplagwah9ypr965qxr1y147rnsc1xsxmr6y";
-  };
-  "elm/parser" = {
-    version = "1.0.0";
-    sha256 = "0k4zlq30lrvawqvzwbvsl0hrmwf9s832mb41z7fdspm4549dj7wc";
-  };
-  "elm/time" = {
-    version = "1.0.0";
-    sha256 = "0vch7i86vn0x8b850w1p69vplll1bnbkp8s383z7pinyg94cm2z1";
-  };
-  "elm/url" = {
-    version = "1.0.0";
-    sha256 = "0av8x5syid40sgpl5vd7pry2rq0q4pga28b4yykn9gd9v12rs3l4";
-  };
-  "elm/virtual-dom" = {
-    version = "1.0.0";
-    sha256 = "0hm8g92h7z39km325dlnhk8n00nlyjkqp3r3jppr37k2k13md6aq";
-  };
-}
diff --git a/pkgs/development/compilers/elm/packages/elm-srcs.nix b/pkgs/development/compilers/elm/packages/elm-srcs.nix
new file mode 100644
index 000000000000..e1f941626dd7
--- /dev/null
+++ b/pkgs/development/compilers/elm/packages/elm-srcs.nix
@@ -0,0 +1,62 @@
+{
+
+      "elm-explorations/markdown" = {
+        sha256 = "0k3110ixa4wwf3vkkdplagwah9ypr965qxr1y147rnsc1xsxmr6y";
+        version = "1.0.0";
+      };
+
+      "elm/json" = {
+        sha256 = "1g0hafkqf2q633r7ir9wxpb1lnlzskhpsyi0h5bkzj0gl072zfnb";
+        version = "1.0.0";
+      };
+
+      "elm/html" = {
+        sha256 = "1n3gpzmpqqdsldys4ipgyl1zacn0kbpc3g4v3hdpiyfjlgh8bf3k";
+        version = "1.0.0";
+      };
+
+      "elm/svg" = {
+        sha256 = "08x0v8p9wm699jjmsnbq69pxv3jh60j4f6fg7y6hyr7xxj85y390";
+        version = "1.0.0";
+      };
+
+      "elm/project-metadata-utils" = {
+        sha256 = "1d4rd4grrnbdvj9gf00h7dr6hbkjzawgkzpizfrkp1z1pyr3mvq9";
+        version = "1.0.0";
+      };
+
+      "elm/browser" = {
+        sha256 = "1apmvyax93nvmagwj00y16zx10kfv640cxpi64xgqbgy7d2wphy4";
+        version = "1.0.0";
+      };
+
+      "elm/core" = {
+        sha256 = "10kr86h4v5h4p0586q406a5wbl8xvr1jyrf6097zp2wb8sv21ylw";
+        version = "1.0.0";
+      };
+
+      "elm/http" = {
+        sha256 = "1igmm89ialzrjib1j8xagkxalq1x2gj4l0hfxcd66mpwmvg7psl8";
+        version = "1.0.0";
+      };
+
+      "elm/parser" = {
+        sha256 = "0k4zlq30lrvawqvzwbvsl0hrmwf9s832mb41z7fdspm4549dj7wc";
+        version = "1.0.0";
+      };
+
+      "elm/url" = {
+        sha256 = "0av8x5syid40sgpl5vd7pry2rq0q4pga28b4yykn9gd9v12rs3l4";
+        version = "1.0.0";
+      };
+
+      "elm/time" = {
+        sha256 = "0vch7i86vn0x8b850w1p69vplll1bnbkp8s383z7pinyg94cm2z1";
+        version = "1.0.0";
+      };
+
+      "elm/virtual-dom" = {
+        sha256 = "0hm8g92h7z39km325dlnhk8n00nlyjkqp3r3jppr37k2k13md6aq";
+        version = "1.0.0";
+      };
+}
diff --git a/pkgs/development/compilers/elm/packages/elm.nix b/pkgs/development/compilers/elm/packages/elm.nix
index 41998f4c9b3d..67e63ea2b8e8 100644
--- a/pkgs/development/compilers/elm/packages/elm.nix
+++ b/pkgs/development/compilers/elm/packages/elm.nix
@@ -13,6 +13,7 @@ mkDerivation {
     url = "https://github.com/elm/compiler";
     sha256 = "13jks6c6i80z71mjjfg46ri570g5ini0k3xw3857v6z66zcl56x4";
     rev = "d5cbc41aac23da463236bbc250933d037da4055a";
+    fetchSubmodules = true;
   };
   isLibrary = false;
   isExecutable = true;
diff --git a/pkgs/development/compilers/elm/update.sh b/pkgs/development/compilers/elm/update.sh
index 2b5d85feeb28..920b95e5ad95 100755
--- a/pkgs/development/compilers/elm/update.sh
+++ b/pkgs/development/compilers/elm/update.sh
@@ -1 +1,8 @@
-cabal2nix https://github.com/elm/compiler --revision  32059a289d27e303fa1665e9ada0a52eb688f302 > packages/elm.nix
+#!/usr/bin/env nix-shell
+#!nix-shell -p cabal2nix elm2nix -i bash ../../..
+
+cabal2nix https://github.com/elm/compiler --revision d5cbc41aac23da463236bbc250933d037da4055a > packages/elm.nix
+elm2nix snapshot > versions.dat
+pushd "$(nix-build -A elmPackages.elm.src --no-out-link ../../../..)/ui/browser"
+  elm2nix convert > $OLDPWD/packages/elm-srcs.nix
+popd
diff --git a/pkgs/development/compilers/elm/versions.dat b/pkgs/development/compilers/elm/versions.dat
index 824ab383057f2138d4dcd431b52851a2e6b8b127..9dcfd8a2808f666b0cff1a54b79a6543e46451d9 100644
GIT binary patch
delta 11082
zcmdnk&3fwzs{jKS$c2C@1~%o10&0^r0tF|!^RY28Gcz%>OgtbtF^_lhjCS71N38`W
zPL&g2Wn^GrWMp7sU|<Fz#)${!O0b(}<frCkRzQql;7rZQ)lJSwEuOsbt?=YnMn_d{
z$CRSX#Jr%)q{MuvB0-R%l+>c6)S~=i-IT<V)XD$tr6*rz6q>w&@%`kV)A%Q^W>T8W
zAtK1c$Tayblf~o+4!+4xn1m)9G0RLYixin$%EG@nk6DcgEODJxX!1tZ8g3qtu?2}m
zC7H?78Lb$_Cxaw(*#sv`2=K8oGJ?$VWBWh3VvG1>a}I&YdF+{dDX9gic`2!RCAuZ4
z6(y4$PY6%eW#^xKja_VVm=7NZ6C)D?0}~^|WCIRy9<cGr#l^bmMVXWPx5`eo;NTY#
z1KF9GTaa3mSdv+ms#}m>R5JOXt?1+joC1@DIb0_P&xF`k#vw8}V-_FS=A|4;lV2Ng
zbAyADiGh)cfeB>8<c}Ptj69RoIpx?`7#UcYz}8NV;aojA^0pvYqbgSoBoaV+Kn`PK
zWSqQ?OJ}lZfY{^@Tx@L23`{Hx43occ=}i7p&Bw><Tv}9A8JwS1Ql40pIyu2yR+x>E
z0Th8uj0{YSjF4#Dtj5j4$i>Xa$iN5!Op^_HmQ3ExEi~DJSA6ns9x)AGWIaqw3{1=n
zOw5c-%uGxy3`{IgQ<y=X;4Pm#&6`gX9B$Ca=5Wg|O7TfdDu(j;K_OOLl31i$ln4$g
z86LNy#JudB%sl6e)I6vvc95!)#L~%*8-*vo<CoZcg?A4lBk$yi{3?v>lXLl$HecoU
zVVv&kz{ofGi~#RsOTn1QmV$hYmXi~OMJIO%DuDw#N|1N*A;GB0->pR^cL?%Mwi1d0
zr<gMWLX$TNc}_lYUT`vpupU?~hp^b>aA85Hm>35~VQFGsNoLyQz$)R%AjuwKe}66y
zM?YQ1U>9AN5U4}>3W_rGi!w_pbqh;VOH-ku%<vF{3SeqvE-Fr(ET|(oId40s5W7cy
zPHt&&HdHlRYR=??8IqH43$L8KJy(45RFUnBjQo>*#k80?85k!o6cd@;E#@%!#Cf5~
z9^%52--_Lz&Y{mJH2Jo;A}D)^vwP*|1?88+T*D3u%&hW~$&Pb{C%a1sOqP@Q!3WCB
z@SMytSz0pFffM3tW(Ecp5MpFyU|<6wMo^-GIE}-*D6t~HC=r(5!I>gAv7{)oLN{^p
zyEW32mq=QwaC(;(6{Y4G8W}@$F^FXArWEBDq~w?9=_cprl_X~7O>X26nS57rPCc7X
zW>QjVE>tBi$gSW^T#}g&OAS!Bf)Xt_^+DC5>I9c6MX4!CIf=>HB}J*JuoTAuDYih_
z43zdkG!p|e6UdVc3=EUYrFz);KuQ=GCp&hF@i8*6GBB_*LcKm&QhEzGecX_q0Zu#j
zWW**<l(_>6aKX*hvP_JkqM#D2Br`X)ATv2TwMaK7H9awTGGnj!<Ss>#$xU+A(<96n
z1t;H<6PUcq(|U5JqQGWpd3Q!JQIJ>D@{4j4OG;8xz$K8bp(VHwdauAQA&*76B(=C?
zIzK<7EXb6}NeXi&Ur=CU%gHZ6(l}XOnRWV6O-8}VD>b<%zf(|T6rL=gXvWAf`J$ZU
zWCJDE$w`W~laozErgO<Kf)of$o@^pN+2aJy<o62vlV>VQP5xmnIC+h#z~l=Gtn5Yk
zIXOv*MUyYQlLmQ#6I{X<Czhp7cI*N9kbm-DMeoVew~9^<m*=0nY=-P~dwoWZ$?p^d
zSiyzkWSdWtlQTW|z%DjWVw;?=6g2tAbm7VS<Yhrlo%}&bfAVz`X^@V|^2&4BL6ObK
z$S}EENn!E>Wno5}$zPObN`n$2BLf>FBO4<V8zVCtBMTcND;pyl8xzB1e|hoEOH?Wu
z1q47rmYkZClUQ1kpPN`RS#Y)3WInYBMybi^Y988<;tra4I06zAle1m((xH4lklw_c
z)S?pIq|}nh6M2MXuqr7oOV=$fDVluHR&4TiH4k<+kiN{6$p#+MlY`ZTCbOtN5YA1^
zb1lj%E`b`&oLZDKIZsh~vWJGy=FjSx%$)q$sg+6jiA5=s-_=V_j?m(t9HY(8$UQkn
zTaKBDfn#%*wm0Ks)q1JPZ*)K<7XM@wT@lvQyt1@RNX-_gt1!7#QIsPj*e$=fB(-R|
zoC%}YWOfaa$$`3}EX5g#hM;5wm!ABKUk;pz19e3w-!b790%d4MNF~C+2+mfUt8^2X
zxw$~~TV|eaYEJItkLD7S4;vUxHk%<b`LKcb<j)o2(^v8^@_{*$hO(2Z*dXi(LupQU
zfj4=#f&65*uVRx|8-itd`N}i%Qu51na})Ct(?OYj^G-t}#>wdcywhtn8971K79;cI
z|3)36?2t?dsd7Pa#mK<IF!`W~*yQ!bQlN5hvbYJ~=GVqOOpHR4E6j|UxfmEH&o>pH
ze8{X5<U2mz#H7r;#LC3t(v*zMqRA8IOHS4d<(V9At~NP>MPTy#U2K#6%_Sx;GB=+b
zWzNgT3(9-o;;1M;r+9LHr1a!4b3v$ZYEEiyYF<h4<aj$#4hAMjfdSIa%?;L;mYJH9
z0&3)JzH0u8X|jis;N(+QS)3e+IjI%8C5d^H|4osc{BJ)ul1ThDElIdMG-+_;<R_*i
zCgr3~p5G#xz{tSN$jA(8bbzJN6$=*R7nh_Lr52ZfDx0EAcnOD8K{GKhF)=bRF+mD(
zRt8Wp#?HXN&cMjdz%*IcT1Ew2!sezV>n7$DWF&$u0+)B7rX3>_10yp7Bg<qRYdc9U
zkYBR%i;@yy<uH3`W-=(ze$0@ZoMo+J!=9LvlbV-U05t@h-?NJI^K?^Elk-zjb(4zn
zv*A@b7btqciH?zpk&$V#<7e^7)2xNq*pd_T@(aM#>@;g(#<b~;@{Gch1C%&7PqY5Z
zJo)-h0cK_fhRKWVlP53UExuXG;Uc35G^v1^EKIQG%;ay5Rg+aR1X(gta|$LqZV;b*
z)mdnAsT2R?&Tx^*RxZ4g=R0khT>4Ge66{5oHbzFM>sb?v^2>dp9B|p3QIeaZTb@~x
z0Zt^K24WzG=;TRGLX(@F<N3i2nS#Wk;?yGDlGNhK0y<)#x_t6g=fKGtmjx!@_ve~y
z<&wz(u9s5sb0@EIk(oTzMGcfxCm(ZBW#pgCe^zWVldA|56XRx4S0|>)_dQsdlk;;X
z8y*pvEbYNFIo$ohWC<Pd$=)6TlR0e#Cv&^=Y~Je8#5nn@r{rWuPw~k+-*Qhj_v!^#
zMw2gjnX3yVB_<Uofug0PI5{IfKL_d`{><FO^i<uH%%arflKi5{phgX+cdrbn$_Ira
zBO@&8!Qlcb8ki=p^e*5Bm&TxmAqaz7<KB{!t$m~|Ff=kVGO~d6!orh*GbyRGC?&O|
z1lA5=E-uNL9LOQ6gdrnXQdy9iqMMwblarbZs`x=UYjUwq9y?o7YHnp>_GFo8$;n+D
z+>;;rluiygD6%=-mxXb1hA`jcGC$?X>C*)#FY&uS*>jbED5&@VJD-UW+D!qqOa+6a
zChznYo4h<yd~!ew>*Tr#?2{#egeNZuV4chu5FjiBD#epai%arzb)i{*asrnq6BEN^
zkk-HeF-F13wmalR85!9iHh>B!P-bCbW?%-ZSrCxV4Nep3srfni$&(MTicb!JSTX&z
z7^BE!jlgh5zR3-NqM|Ge%*bsFHU=g(s3GeEWxyq!M3Arm*f3CsLN~26FE2G`@`6aw
z$zD77CN~93O@1G^3Bxm2f?Ovrn;|t><1*j$J^YM3U>`~bi%q|%%qRlp1P8ZIULVM6
zT%MX#oS&SXTB4hrlbM<atEj+{3JN?1NUsF$M^L9iFi2|it>9fuj5d>}hUGg8Ffa%(
zG6*s-2r@DVF)#=*G6*p;3NtVWGcbxUFo=Q>qbLKDC?kUy1A`a?qZlKDI0J(O1A`<3
zgCrw^6a$0QWP@<2$ui-M%3MiBiN%>Ync47WpkQXPZb4#kae01Gif(pZe);5$0m75#
zhJOX;p1Bb>C;yzyJ9&XU*W`#u-pSJ=dnZ4eD!|0VyxAa%71U2Ki<aYL1C@E8l5cWI
zbPFd3D27v0D{{cC;QSbY$v2|?r-wT-3WGX^iLsKC{bR~t9Vr%219<ZN7z0?P1j-}u
zl7?w=Vyq+|AILyRx-BV6ovautG8ts5Nvy==9rt;;Ae|&oF+4dTR-KIroE$fI#U5p!
zJb$Ic<Z}l(H#?>tU<B9l66q%x`6oY2*J5U4V4BRGVa_N#**QatpNWBuiGiJofrE*G
zlZk<Ab8ZGJ<K!0~`1n9^1S;a0!6|TZcjg(%w9Mj+^!%I@XolxWN-Rz_Gto_|oLpEY
zA;p!Fn3s{5mr|4pEAhddg0%en$%@B>Cr9N7ZBEP5V;15}NzBVlEJ{vHf||oOJwc68
zbh?ciBll#fJpRdxbN!}&mtYi_+>jtTdHqH9$x?apASX@!_l%7L+^GZwXHcHG3TsMY
zadHOK7&b^j3FRSL3ypabVL=SaR<JC~!Z2Abe=$S`QDrbOGBGnUPj)B}+x#*=hjDV%
z2`*M}7iRK>LYc`cmI^a+PYx6k=4A!dprDXvU|?Yc$!#t#tY(Cn2C@efYz)lc_619E
z{^af4f|KitHK(7pVC0+pu9$!G!Qv}Syx_h~a#3bUYEdS*Z^O!xQeK$@>PAmqT~@8k
zk(!cHnUk0YE8f6mNLo&2fo@`6W^N+57&GvYnXF!3ES8g;4+{!jNKoiz=A}%&xJY!e
zeFfj<rRCRHCVOq*6J$=!f%Sw~lPW>gO7tD|$t!Ajn3F-J_H9WJn+etoTv1~Q&JU+*
zcvwL7?)3jsjM9_&Y9%Mnk>#6gR67yeV_8wdGx=6+=;W1O1t(k8Damp{x_O{14v8>u
zp9+-M85vkM$JH@2O}_q4WU^(0=;ZbW5k}t0a~f0_Stc7a$W6Y}AjHT&`F(>H6BEm1
z!v@*Ori~KQd({~ss<+Asf(ozAvm3pb8F?l@Yf)rm18Y-m6`IT;!pF?SzzpI~Zx>>e
zm|WS~#K<%GPpcx-Y|FMOjQo?&wP`VNFoMk%X&0J2D@A0od3)mIAJcicK#3g`Welt!
zLnfbU-#1x8K!AyfY4ZLC*~wcvyczi?b!tIPbL(_f1T~95gBqab8&Zh|X=Q=>f0J63
zC-3SMoVZzJvVMoy<WHUMT%1X%dC3{MiAC9<nrgCQm)>M^50S}=T@sUvy6mSbyD$oZ
zIBcxtsY&TMlM{PYH~;B+!wepx`PQd7dF3y@$y)s`GF+*-1tpbfIf=!vc;|$a6~$%g
zlOHY?+nnF8#ta^qST-qovh`#^DR$6kSTVfM%bQo4o0M9lTU?qpIe(hyX8y@0Ot4Nn
zxGZ5{nd~<;aq^4@B9p&Q;hTJJ>UBom$u(}$-0TcY><rB83@q#nliyDfn|yzo|77bg
zvYS1oS244Li^0s2$)Mi%x>;dzpu_+PBS;YkZksWIT1cP@eX`8#FT6Zysfi^SsYRK|
z`FX_?Wuzugogz3{dN$`|fjL^>@g$H=Q2PNI#*@9~WGV5dWu}#6=z?0Tr8$Z4CID}8
zer{4`ULvRsvi_~;<o>xbn=j1S%Q)F7M|^VIeBsGk=DC80xInoSRvJt`KTmS9{QLlM
zP){D5;Tb?_0X){l0&1-$&Xb-zV}2i~VKCWzf!gG2ntYSZ7YI&%CoDDDqnu}Q=7KIM
zaNP#-DX6IfY3wjDFo0Uylj9eNPgYzwg_{dhqUR<SB;{93p7=m|@{)yGj9in?FO+6x
zVqlp3YN4|<dwNP@ZWg>f3~owig2oRslP5ctiA>gAqzKMtk&7&3xYAQgic5<U^O9i&
z1lasy(9p!>%Zrp*l5+C%ColXeIeGUY1#m{)y@;C&+`TR-O3j1xD1{fxG4f3|TCBpx
z$il?P!aO-_vHIj+l3bGwT(~A5U(7#w?&9@~+>?Em$T6`nOy0j(W^&sS3r69|`<Lh%
zfa)*?M#xYiwBY4P&rD9uD=C7x2wcRKrKTt5WR|2(R=g|@Znb`1vRIENJwG!ir!*H7
zS1{F*pzujc%uB8W584(b=A}c&JSI<EFFyI)5?<&q>%@HF&C`~4G1~BCBxdL573CKf
zrzXKhe?b*bN`5lR=nSau0ZP=23@nhu1nMA2E`KJ)laW}Io0MOioRO1{Y=Ca+<PC2{
z<he5vi;60X6N?b}h8yI_<ow)%oYV@akGPdEm4Sx}G7^)sD|JirG7C#5FVqyC{C{~6
zqtNt1O-A9#sVl@MGn)xdZeAe^>fA}PW~3$;WkG|H8{9L1l;hw*FO8M_oA<6TVU$D}
z#^VMJ3Z>{KCnjg4PG{6-l$iW}rTpaAMgo%$oM2&MV4N(s>L|$Y$?B^`CNr(}oqU`F
zTz4@tO_pCRGr4@VHcVDR9OSF?)coAklA=o8f}+%-)ST4B;?&6(ABatUy;^wkk<}7V
z#gdcPF6W2z2zITK<jgG2*EKXSHZTScrM_P!%mYrf#U-f)y0CggVT}XG4Un;&(!9(P
zaPvE1P15AaYXl+L0+eZsDks}ZicYRe;9v#~S@*1wU<XB}ZgB=^pk?!+HRVjQ+?lyq
z`KcL+nR$rbX<}MtUY@R@ndxM~_hQ^!nRzLh$>1Tw$-B+uzyk%A>*E=PCkL8}PF}ZO
zV)_dmMqzfg%>0zpvf|17O;VF1t9T}#TdxQ%{vZ<&pnmFP`3;hrc{eaJPR^e%uE3L7
zoS2wgoLZTiUs?o>C;pVwf}+&qM9}csWPx(A$x0hR-7o&hT^ofbr*8}fmo#t#nHZQh
zAKbWw5fqM_n>W`pPe07eD8kK^m6@Jcl%8LlSTs5HfX-y$?Y^KE_GGIMJd?|}hk(aY
zAf*+kTg%AA%rH5ByV&Fp+Xdj=K=B<DgutzX%)H{%q7qPlUpG5-GGnjU<dxg`_`ng8
zn^>TmlA2VS4j#cS-_FMY4%?#C!pY|aMLEF3G@yR4zz(U&Yj!LH*ZZ+M!$7Tu$vr!H
zC!gLa01}ht%F0dGO({(*f|t2m=|%aa1-dzz(;2N9MJGSsDK8H#^+C=C8w{Td0FCT3
zFi*a}Q*^S%E`iA}wfQ%@?7GT~R?LH&4U<3a6`O3oFHe>$D?cwkF{vm&5!U$RO3u&C
zO)SYTPE7%gLruQ1kAL#seZ>l#S@}gNmAU!(u*}a=keQPPjV#cZpT_=clNC1cZRR{6
z!iY4cq;Sv#JZ+P4Pz5Q<KrI#q#>q1e+H!M&T0goa`T04;6BDIC5h#l!1hoJnQkIxg
znmYO5!BdRflY0(Hu!BlTMh2G2iw-r)aAcJhm!#+C!^Yvk5mTO;lv0#gHu=JTsmaQR
z<zZcBXxM=!LqIJ_$iU5HnZr_(6ArJQtbACQn+ufvbyF)!iV`O$OqT$O@$!Pis`B$v
zK_%$qI6JY)X{-1*b02YFWaOLdb5xNN)GuUUWMyF5oO{%RQ2?9<N)llSntSrYkHVAn
zlUO-H(=gzHp2>;Fr6zAXmdwJOky<fXP(Tz~1}7eubmq!UP0gzWRll(DdI3nY7-|b6
z11lpVD<cydXn+XRQ$lJwu(C6-u`{qwPCPETS@O6K^Yp1kjN+`|4$0)YQ+nWelIN%R
zCZ9MZ2yQ<=Kc&gb0vY0g1kL0Jr$i^~pB4u9Y(%H$3NZ5Ua56A(GB9#6FmN$2ZcaZP
z$H>S%`PdmbW+q1F$p&YoC;vaQov~u`_Oq#sj53q;&dN=;IDec`V$uaC7SQ<b<h2*Y
zCx>6CoX#fAC^C85MZU@JFStyO+$RoZ2VMNj$OCHs^RqHCvN14%#)_FhP62Cse}PpR
z)R}~)1<<etNDiEmK|PiQmsBJ{%?n0Q*NOo=B#JbAaQc!yxQ1rEtPJWh@=ZRogk!Sx
zWlhj*%jD9_+G5ZFDM;f4l%zm$$T0c+W%0?UE_Xvp<Af^}7MwYWB_)-h**K^}z@7Xw
z(3D7dYH@xptf~dM58)I>#?2S6crgmH<z(jP!4m^paq4tmb4KyaGS?ItCrkVin7m*g
z3kM^p-Nwksx;gB+3?ov$1x<j0<tCrMA+~wa4ShyMg~a6K)Z*gIq?}Y;aE%5T>nbkR
zElJHS08J?v?h>9n=eFSHgE#q*%K(U3ObiU0@7(cY1UHZ??ukzhx+gKY_Nw6IihG)q
zZ~hnDy#C%M#>rpTh-@x;@RSi=7+!xYw7K>X7bB!z0kyPC3#J!{FiK25r^Pe*`eUKV
z?T=SMhSf_mCmU`Sn|$N3;N(_SF-D=u9#4#!SQ#cid?Yn_$`eUOfywKh=o)~c4HBAM
zxv4q%dAd3IWw3Arw+7M^lXMdcG9hXhxF)ZABF)Usz%cpt6HQ2L3S4IeH}S-uP6ai|
zH}8GAnvs!fa^`bsW@bjF$t};5C-3^lJ()j<bMlYpA>iqet``E(K_gI6mzSbj03LJ$
z7kAn(_$Q~oaD$9ef@2YpE+#j=kYp5??r6p+4j#|i_hK?=dPrz<>`M)%$>{-n0t_sS
z44`f;sET7?U}l^g_*!c6uGimWIdV%f5>s+gE1@2NHerf0bc^y!C;yL=#83erq9`wd
zHu*Qaxda+f+&t~ABO|D<HaX(G#AN38xk7@V21aS7E~w>{p9dcKe)vIj^1o-?pwY>I
z_wkTucKaYU`Pv6lQI@>S3|M=NzaSOV{z}Z5e4$iwGWSRO$(JUJgR6D(kDy_LxR26o
z(6ZX#qtxWdAALb(iQx1uO-Am?-#(r<6aW<)42+<D87Sw0nt-6Z3F)MRNYEG?Ge{cL
zTn7ySJp80R{jUWh9}9b4e#t}$xygGSxhF?_7TB!*Ihu7c>rDYhmdO)-M4=T(Uw&wT
zx}mJ#G4jcJKb2uQ9#jf|3UQFl;3;s1$*+FOOm6rYKD}IoQ4pLkKmJr_<eDt`OL}sT
zGS}pfKSd`8{E~r1F~qr`7Ayk;^W>^ub0+^fEVx<mcLn2Q2_4?a(yO>+I0{mWsuJ_E
zVW9?2nV`}C%)Io;AHT>=Zu=`d`M@6$b}>+BFfvSDkR&?!!ynKv76Yg>V_=$G|5s|V
z#@}{E@5vkf-eVM)T>DpM@``^#kbw<&xdqCcphn2CfBujL9dtQ{$Y%EcT8xvUlKG~V
zG4f6IVzlDo$|xx*&@D+U&Yu2|g;8{>9V5@w7Dj=|8P5f{Ss38+pi}c0#kL+|WMrN^
z?IIr+BWUiFnVEr^dHMuqM%n3am>Gp&zMMXTnNf7QA`7GFWDg~w?M^I=mW<QOG#L3O
zS5D)ep2x}<3MxjopJQd*%{X~`E-xeV^eOC&dpS9ZGV{{Q@^ezAM+q{jPyU%9$j(-j
zSz&5mIC=gI74VGW^gs^A51@ewDfXfq-Rw;G#2vU-m6=zTnOZ*i;6btJ!JLfhpll79
zUz$FFi&1R)Tu#Q*)2BN!@=lIh!8N^}i&2n~b$TBcqb4Ko^c`G`DiEH;^iN!jBB0`I
zdLJhv|8zBOM*hiFC&Z^u=VIia9>L8h2Fg2N9xF>pQD!PA-nMV#W<0~h$UD7`k5Q2o
zROv8I7vN)*oxYoo@v<^+QGRY>QD%NlenDzgGBo3Yn-v+kiOIU)nYx45C8ziEGs=S;
zEzHcw$Ta;RKVujupr)VTXB33A0g{VhZ6=lJ&H{|d?EDN2{EQ3&(?9StN=@G<z<3y3
zD}r@QpDV~H%Lbm~W1Q^BCIS|mCdkM-dCp}1$uriAOwTuDWS!0_#K_MIuB)aW;AfQF
zZXm?Cka6;icHS6}Ab1)a>R`^I%EUa~;?z9YM34liv;Y+qnK`LNx~WA)`9-?L#mVrV
zE~v8&$rF%_kCd3EKNe;*0L9~U6%j@y$OsPebWah+ce0#CmH8!!24+SkP<wenGwZsb
z1p`I-lLe1TD;HH3RT@Ag!5Jv8G#4~50Tlwx<xDpaWpv^KCkjy0zZlf9o1QMps4JM8
zQCtG^0Jv*5x$d{*_KBj5kC-R__#(c&U6Qe$ak7~_A2+z3WMl-jBc|s_GfGa^k!Iv)
z6q;@$&1k?1ZY*ujmS(hJ1lQ}+x5_Z8gG&-fDGwf21Qp^eObjecjN4zzFn(s5eo2K<
zbn>qR?&;^`8RHqHr|T&&y7DjyFfa*%n;DD@)9V!(MW=TtFn$1yB~5QrWRw6+n}Zm9
zkY=N9N@j6MVqP-XM=KQ>MIqTcH8($NdLaj+@bs06jJmKA2~><Rf}1}KjLg#)C^E`T
zXH{a{&!{;4s1l=xG^jZRY9fJV)Y(C;KhX3bWYlOnuQFpQsQ#Y*RGCp=`UGW0M_8j9
zv~&Wzgkt(VWkyXwPzr;`GAN3t-%)0ioUW(BC^)(6xClglEQl9UDZs`EnwVss-l)Qu
zHo0=D$n+m7j0ubqlQ*6aot~%4sLKYK)t~O5#wb0RgHK}nIaS64=E=`9geLEN%QOA0
z1|#2eJx#{PlOK5rPyX?be>$@kqxSSS8lW^>nV6e1*->41y1o{pGPpwq>C}M|A85pI
zdZHGiDI~HowHSG)Z`5MEJ6%tUk(YzLATb9tLp52jT4s8`Hsd))j>-F%NK8-EWfY&@
zqQfZ2$US|U4x=113nL>$@U#x20I2>FnEqOakrPx7g2f?mk({5CKl$S{vFUSl83iB%
z$e^}<Zem^~s9QHZLzhutI=3#P)Z|_NL?Aq85HHh%53FT+g)XBwIR3#Z*XlA#f|{0$
zpg|FEdjOm=L4!JAOD9{l$v{l`pvx!*o~whVLD0a~^aNc-2@Z~u)I?p-1jRy4VX#_W
zo|24I-Qv`e65X7{w8@FjML<KS1qCA8Mf4ao7$-|H@=bTwXH1!XOp8%qazYB{Wc9NG
z(=X~Xra(d#Qqh3Bjm!+&T?`oYnN)a7@{5X6D-%nSGfPU~?GunaNub&4l+@(R-06%m
zj3U#EjTn^}xh6lf6y|1N1vRt5)z$QkMvNh#Zp3t9W5#es-s#!Kj4I5mOpMb7O&CR{
zFE(b329=I{lc6m&kT7`KZ@PpDBky#76GnGNP~S)t)LMabaab6puQOqs1};XwnlcKq
zu!ADup@7(Qe^bVEa2SJxWmwX4;LEnat#0tDJW$GEV4VKWlramI_~9W75|x-<WyZ)0
zHf5?A<2e=1varnTlKi3oA81ho?(S!07A1m;uRO@4YXX-jBh&V1bH)vf5*%fj#rdES
zVW@g=M=vEm7d(W&o!gR82h?KboorvsJ6*zxk!O0i6{8p<&-6SiMrlMRaeAi}qvmwb
zFvax4R*c%RoaL!WNg1WZsjwM6aQ6b-IZjEPEPqdC`a3Je`pFS2g3|@;8CkbCSTkN?
z65%M%&q+&6NriP1SxYi=KojWGgX|cqkh&1?ygog^o>64_TRX-#di;>q3P=hzTnnl_
z7(kQ3EDX$`(MLu`7DmuAK^8`q>CfyL?b+EX4KgYXGN#M$FzQTKbztn_02kLuMfsBr
zrNpK$abQ%O+_6Jw`V|L8Wzd-JbXG^kpvlW4`FO$Ox6p`SoSx&zsLd!aeTE~W7I?yL
z`bS4b@yQb2qSN0vGX4@}txC_&fc2cg;hS7s25ur~x-#-j|LVl}YciXI$aD=?M*ivi
uE{r1V(D<J&@60Ga-Pwil3aB>#lGg)8fGeXSGb;n*bVXN2ndwtp8D#;VZGr3n

delta 5238
zcmcchgmq&#s{jKSNd5v-46KC{1=J>orVC7T<DV!XGVuW`TXAwmYHs3m$6!VgHWmg3
z7Dk4N(^V%&%omv`&O7lz=j17jj+;f97#SzmJm#LP!mKR7%E-XL$jHFNz`(@F0FsDe
zwwTQC#65Wdv)=SfO-8}VKUnxDf6L(C#3If#`DGsW<XASL$>wY|lb^E*f^~zmGB84Q
zbF=@Sd@53C@@@|P$%Y)6lTUMqf)z0`GB7eSGBSY_PM*juKDmz5b#eul+~ilBB9ni1
za!*d+7MLu<r6kM-au3)=P**W9g4JhpnNH5I<(<5iOK9?D4)Mu%xK@Mpui&nk{G&o-
zvNezD<Qp#pCKvGVOb-ZQWS`v0qdNH~Klfxt-oNZj5bGy%@GY7Aqm*xQ2EXv+3w+Xy
zT$A7M$xTk=mzsQmk9D#Ue*_N;$a<(-CmRYWZk83;!^p@pnb$>vhmC=Oje(Jkfr*WQ
zc{8I>4kOs%D}|*ePZRc=EGi-j<?~K<6^WYuBY{zH@=9T$$wx&(!Qr-2n0K<NsNeL?
zFh;(~mSSR)SBXkY?pnePW<L`Zocw$@NIZ42nfS`dI~NOW{w}_ak&$omI!Ud`w<SZs
z(xp-&lS8ELPp;tNo9rU3G(C-rQE>7dX~D@`q<>8QQOZC0h)g^q$K;P|M48zb7$=v@
zI!t~qJ7+SFe3uwI$Y-EP0AYBXO+F~U1)LU|6=qCcxt)9RK1H#~_KJ6=OX@T7ZPrm@
zVw~)+$~rkuxf*PLrIx_vP!)H^$&zYwCX1*GG73#rQ#YIZSy_B?nYz<txi=z{wM6(P
z|J4zgJXu3<x+NDQ&*bwu{F4``uueX%;WpXAO>lC#n!w~mni11If*E;PKxuTcpqB6C
zPOZ7{z-MA$WS(58B{A7oTbR*!a-#Ok$wgY?n{{+587JS;^<<QouE57AG1*4XVDc5c
zfaz||j8c;itmK?5uFpHUS%2%~3kLj~D-1H3#n^L8i*iegj3L>DfeR7@lPA8C-|S`L
z!Z`Wa1@Xx%Ors`Ss_{%-X(qywk(yXAInhO8vy*uQ^W-a5Qj>RX;G5iRB|bUST6Xg8
z9&Rvuy0!G=PDbv@hpnwQo7osKPOiw~ot(?VIl0}oO$eHPK>^Ijz|6qF%s5%e&S3I#
zXOYQTc6^)5?RuCP1t+sO8c()zTrhdg7w*YYPU_R6ycoGA@1M#wS;|Rpa=w%K<{;;1
zOw(7|GICG$bjzCj(%o!wpoh-n-yXu7?L1#GPZyA66rb$m8#8&atjOlAz84v%YZNky
zO#T_jJ9&eD%4FXFk;xp_`6u7-=b79Tuxav)zkFPb44~Y{%)rPp`D38y<VArglO2Ox
zCjW>LnS3&kck-H`n8{Yb5|b^r@k~w(R$=6u?EhA5@|<9i&6|TAnI_AGJpe0R5y~@J
zKHLSI7*>SxY;Fi|Vw`Ln**n=%fp7BCNP)?(Bh@GSMD;@QF*GAFFoLXQnEW-WVDgJV
z!O1nzI*{auEYHly$igr=F-Cl{RZQIE!!f1c9JJXdmW2_Nj<_es#VLa`*rd4olUGFZ
zO@7D0#sTsZ6B8rDWcw8P$y?(ECv#lkn{IE%$UFIYg7{>{gn-E#;#nupN)QB>9ea}a
zCtLsEn*1!GY4Y5}0ugYQ0GEBt3=E)@2nrm=RK>~RN#fw7>K89O`Dqd;{1hfXOAwxX
zHrW+yU|fpebPX9sp~=q^geK>wvQD0z(zH20br%z(>SV2q{K@w+W=>w4`4!}Dp2-`t
zZcIMmBr<tH_AGD;ha?Rqrp-P%tc>!|Gzk&}1rx{_tPBjS42-Oxa)x1YWp2x4%{>3<
z5r&L>leL35CwJxxPF|K*hFaK3<Oxm=%NK*B0+5O``4W>WBzQTPm>HOu8JQU-H|9$U
zu%_iFmli`a10xgTW{rZQ?3-mOHZe{PyDu^MW#w^3zR4S_v?kxHGH2wQELN>G{Vxk6
z`{c0df74kw8HJ~Ng)s6?F0VN{c}^Yw<oETgn>W^KGEe4djAi7WoYkl}*}hS1vV^$+
zNU;bjq&m6KXg=AvsS{jA-)x#a`PM3_$>GhylmAw7ZC=+L%Q#&si;-{g^H!0`$1e+R
zp5B_p2+2a=XaN-j;4CE8o)0c6r?qQ>%hGA>{G0EzUtyYDc3f=oudeFJo4ZRU>-TYQ
zPUyMDGQHZCk!SL~Nn9)}$@xW-4b_Av-<`xg`N~AS$(DTFV7Bxm9&mOBiMvhWgX@@_
zJE?8*&Mgo{Jd?vFYZ`J-E}pD3*;0*rvi}tE&6g%WW}JL_y4vJ>Q$-kgCV!r)GFf4+
z%w)4^LX3QqJ*R1bd6T9|OpYoLoP1}x=;q7QikKO>C%es31WUEe65>a#a+xL{oGLrL
z!k1BE^8Hy&a@?RY3gUT21|}v3Pz16tFo9D86Z_=E`3jR4&7Q)@H@QDmVzU1np~=Rx
zWjS*)i%WEi3vx0iZ(J-1vUc+BIX<Y#o0)-;nUR5Ivf*sG$u@KMfgJ%!bfB6W?1;&l
z^SnU@pAwtgJx^qE>U^2W`{ub$wp=g3%*4P1cE0<3!O3BB)h0L2_n5RmY;vUx_vF|G
z5|f=4*n^`5#9p<4ce3SV?#WS$1U6q?@P-*&S4~|aKKbPmA#j*;E_K;lw^W@OoWCdU
zToFB4W(nWskd-D(ldoioO!i*GH+k)9ugUDMg(mx~;hikG<~k$K<d17qCQGbMnSA($
z;PltwjGUWiuB~F8?6lEo`Zi-mzR5>72~A$L@y+Dxo3y5Tgfj9mF)&UR*_<_b!WNm$
z7dP)^oNPW%WHR@5p~>5~x`A!EwN+@c+O~k{9XyN@lc#T+4|0sq<ofLblcTqbvVfWk
zlOJvu1y|~pSA{0O+#bfrG1*~<1X#3S$CSy|J0&Nth!&h4FUZKs#t3Q`FitMs={))A
zPDOB{5#MDoxo(%tWKMm)$v1a#Pu{jm6dXi#y96e`VdDW8FROQPPZrrN%*ZoYW4FrW
zOS^<7r|cG;Y<X31^0D3gljrPS&&V~|XOG-ur9EPkS#}Cd@6Kc7p1fd>!esG%vXk%b
z5u9wXch%&Yed3dC_wa$jd~?mdD8|W=2LvZ;9XL06&cUGRZU&6vlUWamOg?;2WU}QU
zfyovR_$PB7=G#2?kO|{tmLsyDa)o#LeFa9Y$#zHffg`lzsK{i+qrQ{HE{IO<JZd+&
z!iR4%NKE&b#AJ)3>XY-2@lUomsx+DJxX$FP<4KcSPDpJIKM~6`S?+ZFWbu6hlNGLU
zO`d*QWb)(FnxJ}Ov+@~1#_8g|jG~j9&Z<t|;K#@_`OR73$tTYSgQO>KJu9-={oG7O
za5DIKzMdJ<?A(3X7vwldp?Bg6-(-U;Zs4XQDAj_?7A8if$p^29PM&u~0HjiU@`)=G
zCjY#;8kC#4CvUnI2Cgo|uFFpUDbL6=dHZ$V$#vI-roYT&6q&s3x*Vu<=HC41`ZZ=y
zk`bTGb(??k!`pe2SKJYp+;^vVvgX}$;G#hP9^Yo+du)u;`$0Kg`@Z&Mi&&A#x%X8-
z&FaZ3?wd_^d$5&}WAdK|5|aZS%1pL=m^_)|u`mluN@5AP@bP>kJX!tG>dn579T*w8
zC-*&3+`Qw72jgU~XDOQ<pZhQ~a!mg(%P7joG&%m2<m3ad#3%o9;h+5SmE80nmW=$9
zC0}by7PAnX{Nfeg<mA_&)UvTkbaKyY{>@8X$DvgqOrRoznTde~l&KjRK_T?;z072X
zx7!%YH-CSd$~gJqd+Etl?@us_O?Lj^G@0>}=;Q?-Dktw)DL6UuBj04}k1mscrU*{{
z`GIfpl8=8Uznsl246eHwSs55v86oMMk!|wF4`P#Ve-fA+WFRt`>9Z_2kK2FN02h;`
zpOrz?Fe?KK69dEKb)PjMt<=|_wIPiHP@N5G89^%C$qT-SPj>#&4Q>kE|5CAe+E-`B
zP2ZImr*AW66r7y;Q*iR{AH0*NS4mFJ{qc6P^*6!E$A9u~ZvLsyxcU1pKIX~llSC#*
z{NvlK`_GaQoU5w->x0wPuK$|g%4PGH|C<;=?T+oc7#W{3f|@bY%~=?Qwx4EZ<YJsI
z#>%*A`a4!eF-F1ZtZa<N(+yY{C8vk5F-kJ>PtRjx)Sdp4jZt%QPYB0kfh%mF#s$xG
zeRjsa$tSl8PXEcy$h-X>JL5dY=@qJs0@LLs7};4F8JHOvr_bhOOa_-K(}lShgF!iK
z`Wi0AFi^WeaC#6o<K)TSn%vvJaWiT%O}_DhcXItQHV#nI2DJjV+ww6AFizjX&v*&!
z+zbIm-tDUd7)=;K4aw;{1Q{i!^9nKMZa*i)Xb<-F^d-WKV$;n<7)__o5@EETE-1<<
zJbkeyqc|%lNia^|FTyA_JwcSwce;f&qX-id!}OD)jOQ6Sr_U5)l%9T4j8S{?2{oSW
z2I7oatkbu<F!C}pGcZiglVOyceoThZ9+Uv5KbK+T1@Xit-+ajps@|Cxru)k>f@7P7
zfrXKAdV(CI?DXZbjNy|td<CXUaWZmE&yZsjoo*n<C?vxPs@Y&YJ8)kR+~tJ0FHw%s
zVzP&*`1EaZjFUkflI>CQj1`c`I;F@cG2L2`k)Kg`y0;>u<#YjMMyct`6&c$Zy{79c
zG2R0S=uG}mAv!%unbB?gX=O$k#_7Lf7<s0jR$=6w{QZ~2bZJ#arRf=}i~<rI5NCjb
z8r(o<0kyUmSQ)oZR%H}to}O;WC^DTxlTmc~eGNt-P{IcBw7{X`qRD8<IDLs0qX#IV
zZ~vvmxEm57XLK01O#h<G_+fI?Gr{RU^ceZ4o9Q!3g5&O=0VDtPYJJAjjJ%T*d4#7&
z88C`WFEn6OXXKea(|}P0#1@-=&45t^RPs-+04e7+WaJ0+2}GuYbvqd{iXqIZGi2nM
zoGBo(eW4-a874;V>3JrMiqjcQ7-c433YVDN<HR-nvI*nH>HAF?6()0B5twX~!Zkh8
zj8SkpuNkA=<d=Co)6ZKl3QW&3W8`O4oL*(dm^^)vC8Naje`bt_CwDSJrJtEI%7UYP
zr6r@_bO&=r*2#ZQ^MgDQCOkdNf>8vlX?uqS<3dJoUyc=&p&6&!SusjZUv0$*Zb47K
zX2qy9{htjZ&-Ck7jC|7-tr@RRkFsI3p1#+HQE5AmE#rM=P~&(zlOtn2BPcIV=Wt>a
z5@1iw$<@s&FM+mI1*RW%Vl<e}=)@?wUC5bHi4oM@nC|Mrs6P4oYLV?dE{t!OrZ016
z3}h6a{==Qob^1hiM$zeU9*iHr5jex0k#BmgCnFcA+cy1)C!;Q;B!YB57@0t6fq`-Q
zT~9`t$!T)pppaj|C^4Pco6%!>nm1!AxEPtf)rV1F`WtUXM_$+<0TXE0WcoTEM)Bz(
zK8!*vpoZP_g))r7Ahm*=MXAN9C5cHnsgn!2#HMfaVN{shSH!^$>4-5gGBPnuf8)cL
zHu+|-;Pf<K#)Qcc4!qMZ`!bqMZ}el7-mc}xSiwB~Tp;7)=?{Y#Wv6$AF!D|}3}zIc
zZl1`<$Hd408s`w1o*&Gp01l3Dko?+U#=FyZg)p9<eA1I|@`e{&(`SS+@=xCx$|%Ul
zHT`rbqulffVT|G;9EqhR8M>)CxzG>><%-FL4x-Z+g))jyUmnIN1@Sa*IHSPyr(ujz
zpyu~<`3OdV>9XOB;*+_L@l6NIg@!Xqf?Dj1pf(e@z0L^g$xUA$&Zr0KJ#SBoVANm)
zm37nSL^7sKZrLa}`F|M)E2u(Yo30qem;)+q_!t>MY{~6Aq8P=PrnAK|Dlu|`YsKmJ
z#Tj|0`^7T)f<|tpuZd+0XXKgA633`AeM20h$aMQS#%NG=11Xrd$1%!)dcM<l#4++r
z{}{*U4$kk82nLlj49uXK5yYAv8P7NkoEx|j83m?WCNPFgezBN;`oDNa0aljuoYK_E
zf%B!Ob0#thPJf!f7zEA>U|xJ8BQK~SHN7s8@$B~AB*qnt+cQ!abr>h_JR~xGT`Jh^
z7gHIfr+-algw%f1jnWvkr%y{`tcRpLa52cl0ICL=85y=~r!!t+ny!(>ST%WynaK1#
zS&Tm?H>ZhAf0fN>F+DVgv1d9@E~5xIEqCWI@=dqTWfTKDHY=AgaB@YSFsMMkmdmKk
z$TyuSk5Oy8Q68fT<Mf<DM*ivj`Ha6nwcm7|0!IGnYYG@eAXShJNb*?$;}uXPB{*H9
Zh*5O<<3dJBM(*i<3mFxsD;6<Y0sy@1jt~F<


From 9daa3b96ac328b0d113f8edc47e1f14dc81f6624 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 3 Jan 2019 09:14:59 -0800
Subject: [PATCH 146/274] insomnia: 6.2.3 -> 6.3.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/insomnia/versions
---
 pkgs/development/web/insomnia/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix
index 6f0de3932b5d..fe47880f0cbe 100644
--- a/pkgs/development/web/insomnia/default.nix
+++ b/pkgs/development/web/insomnia/default.nix
@@ -17,11 +17,11 @@ let
   ];
 in stdenv.mkDerivation rec {
   name = "insomnia-${version}";
-  version = "6.2.3";
+  version = "6.3.2";
 
   src = fetchurl {
     url = "https://github.com/getinsomnia/insomnia/releases/download/v${version}/insomnia_${version}_amd64.deb";
-    sha256 = "1pq5y0w4yx2inyk6djcd1sb4c1m3awmn3mvr3smngwx9lsszn84i";
+    sha256 = "15zf5nmsmz3ajb4xmhm3gynn36qp0ark0gah8qd0hqq76n9jmjnp";
   };
 
   nativeBuildInputs = [ 

From 2cf7cae450dc88b89cd8b0312422f43515edb47c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 3 Jan 2019 09:26:03 -0800
Subject: [PATCH 147/274] groonga: 8.0.9 -> 8.1.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/groonga/versions
---
 pkgs/servers/search/groonga/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix
index fd14a214be50..b86077a53f56 100644
--- a/pkgs/servers/search/groonga/default.nix
+++ b/pkgs/servers/search/groonga/default.nix
@@ -7,11 +7,11 @@
 stdenv.mkDerivation rec {
 
   name    = "groonga-${version}";
-  version = "8.0.9";
+  version = "8.1.0";
 
   src = fetchurl {
     url    = "https://packages.groonga.org/source/groonga/${name}.tar.gz";
-    sha256 = "1fd5smhqchnjv0injj3x0zsqzffw1r4gq625znqljg6chny3cq08";
+    sha256 = "1qwrzw0rvzkkmpgbk0rd5slj6h7jj53f0g685f5gwhg2dpxk52br";
   };
 
   buildInputs = with stdenv.lib;

From bfc49b1f19eaf53216e75ccc3717f92fe9ed7162 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 3 Jan 2019 09:37:23 -0800
Subject: [PATCH 148/274] haproxy: 1.8.15 -> 1.9.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/haproxy/versions
---
 pkgs/tools/networking/haproxy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/haproxy/default.nix b/pkgs/tools/networking/haproxy/default.nix
index 785c22ff4f8d..993dc49a61b7 100644
--- a/pkgs/tools/networking/haproxy/default.nix
+++ b/pkgs/tools/networking/haproxy/default.nix
@@ -9,12 +9,12 @@ assert usePcre -> pcre != null;
 
 stdenv.mkDerivation rec {
   pname = "haproxy";
-  version = "1.8.15";
+  version = "1.9.0";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://www.haproxy.org/download/${stdenv.lib.versions.majorMinor version}/src/${name}.tar.gz";
-    sha256 = "0cm008i7cz4gq0j7wxmpyzvwfcrmmck5ix34is5xxms624pqc4vi";
+    sha256 = "0zc10ghcwj7hpi90yh2gsciq6q87sqkdik52s55xw1jn2xk9wqhn";
   };
 
   buildInputs = [ openssl zlib ]

From 7e9720559d577e18df0ac827474f992e39762e59 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 3 Jan 2019 07:18:32 -0800
Subject: [PATCH 149/274] grml-zsh-config: 0.15.2 -> 0.15.3

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/grml-zsh-config/versions
---
 pkgs/shells/zsh/grml-zsh-config/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/zsh/grml-zsh-config/default.nix b/pkgs/shells/zsh/grml-zsh-config/default.nix
index b52255cc5949..f3e387d8211d 100644
--- a/pkgs/shells/zsh/grml-zsh-config/default.nix
+++ b/pkgs/shells/zsh/grml-zsh-config/default.nix
@@ -5,13 +5,13 @@ with lib;
 
 stdenv.mkDerivation rec {
   name = "grml-zsh-config-${version}";
-  version = "0.15.2";
+  version = "0.15.3";
 
   src = fetchFromGitHub {
     owner = "grml";
     repo = "grml-etc-core";
     rev = "v${version}";
-    sha256 = "15cr8pv1idshhq5d9sq4smgfl00iz55ji5mrxclsl3a35wg0djnw";
+    sha256 = "1g3hbn1ibrrafa9z26pzyn4lb8mfc5zipr1i1j3w2av872zh0y35";
   };
 
   buildInputs = [ zsh coreutils txt2tags procps ]

From 39c376b6f533757898f65be9a259771f4a5d82ea Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 3 Jan 2019 09:52:39 -0800
Subject: [PATCH 150/274] groovy: 2.5.4 -> 2.5.5

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/groovy/versions
---
 pkgs/development/interpreters/groovy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix
index dccba8ebb0e4..6b55f006cd2a 100644
--- a/pkgs/development/interpreters/groovy/default.nix
+++ b/pkgs/development/interpreters/groovy/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "groovy-${version}";
-  version = "2.5.4";
+  version = "2.5.5";
 
   src = fetchurl {
     url = "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${version}.zip";
-    sha256 = "1s661d5kwiafv5i1pq2b7k8b2fd7m2zp3xwcrf4iv1iik033djdj";
+    sha256 = "16hj2v6r89s3qrgbnkinwwzv16mphb6jjw8ijgmmd9y2063nchc2";
   };
 
   buildInputs = [ unzip makeWrapper ];

From 6b9d96907c4e28e9fb4ed4c9466e5fae408e789b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 3 Jan 2019 10:08:18 -0800
Subject: [PATCH 151/274] ibus-engines.typing-booster-unwrapped: 2.3.3 -> 2.4.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/ibus-typing-booster/versions
---
 .../inputmethods/ibus-engines/ibus-typing-booster/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix
index 31d017de52b3..52beb9eb80cc 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix
@@ -13,13 +13,13 @@ in
 
 stdenv.mkDerivation rec {
   name = "ibus-typing-booster-${version}";
-  version = "2.3.3";
+  version = "2.4.1";
 
   src = fetchFromGitHub {
     owner = "mike-fabian";
     repo = "ibus-typing-booster";
     rev = version;
-    sha256 = "0vzfnbld1k1ig1qgka30srmw1x53090xfn3cga80g64v0kqkwb5w";
+    sha256 = "05nc9394lgpq3l8l3zpihcz3r9x5wmnbawip42l687p8vnbk8smb";
   };
 
   patches = [ ./hunspell-dirs.patch ];

From d69cd2441ab90d0fca09af5e6eda4816c76c8140 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 3 Jan 2019 10:13:34 -0800
Subject: [PATCH 152/274] jhead: 3.02 -> 3.03

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/jhead/versions
---
 pkgs/tools/graphics/jhead/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/jhead/default.nix b/pkgs/tools/graphics/jhead/default.nix
index ce1d26e062c2..e4405455097d 100644
--- a/pkgs/tools/graphics/jhead/default.nix
+++ b/pkgs/tools/graphics/jhead/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "jhead-${version}";
-  version = "3.02";
+  version = "3.03";
 
   src = fetchurl {
     url = "http://www.sentex.net/~mwandel/jhead/${name}.tar.gz";
-    sha256 = "0apdqxqzssnlgn3z9ykvd487dvnbfsgxw1vklr0b916c7my77jc5";
+    sha256 = "1hn0yqcicq3qa20h1g313l1a671r8mccpb9gz0w1056r500lw6c2";
   };
 
   buildInputs = [ libjpeg ];

From 60857d19261c2bcd53eb95ede873b46f8039ef39 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 3 Jan 2019 10:20:57 -0800
Subject: [PATCH 153/274] gpodder: 3.10.5 -> 3.10.6

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/gpodder/versions
---
 pkgs/applications/audio/gpodder/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix
index 342f495767db..2da60a8bfd8d 100644
--- a/pkgs/applications/audio/gpodder/default.nix
+++ b/pkgs/applications/audio/gpodder/default.nix
@@ -5,14 +5,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "gpodder";
-  version = "3.10.5";
+  version = "3.10.6";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "gpodder";
     repo = "gpodder";
     rev = version;
-    sha256 = "00lvma40d62h4haybabh15x1y7rnmd84whbjgjv773igwagkn9vw";
+    sha256 = "11nccsnlxrj8wwl8dyz9a0yrzma6ipx5gwj2lc7m308z60r8wvjs";
   };
 
   postPatch = with stdenv.lib; ''

From 189c2a4d8021916eafc8b6cc862da56c5e35db95 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 3 Jan 2019 10:28:29 -0800
Subject: [PATCH 154/274] latte-dock: 0.8.3 -> 0.8.4 (#53294)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/latte-dock/versions
---
 pkgs/applications/misc/latte-dock/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/latte-dock/default.nix b/pkgs/applications/misc/latte-dock/default.nix
index a00a85b7a81c..773030bcd60a 100644
--- a/pkgs/applications/misc/latte-dock/default.nix
+++ b/pkgs/applications/misc/latte-dock/default.nix
@@ -3,12 +3,12 @@
 
 mkDerivation rec {
   pname = "latte-dock";
-  version = "0.8.3";
+  version = "0.8.4";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://download.kde.org/stable/${pname}/${name}.tar.xz";
-    sha256 = "1jgg1ag8sxrkif1bqgz5pizn1xmiljas00rqcskszx10j0595mnk";
+    sha256 = "0zm2xckyaymd53a38mf1bh9in4bh2bshbr3z8z9gn6mp7c60jay3";
     name = "${name}.tar.xz";
   };
 

From daf3d7d49f6c966aa4e06dc6f8477b9f41c78d09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 3 Jan 2019 17:04:35 +0100
Subject: [PATCH 155/274] websocketd: init at 0.3.0

---
 .../networking/websocketd/default.nix         | 24 +++++++++++++++++++
 .../networking/websocketd/deps.nix            | 12 ++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 38 insertions(+)
 create mode 100644 pkgs/applications/networking/websocketd/default.nix
 create mode 100644 pkgs/applications/networking/websocketd/deps.nix

diff --git a/pkgs/applications/networking/websocketd/default.nix b/pkgs/applications/networking/websocketd/default.nix
new file mode 100644
index 000000000000..050358e4dcaa
--- /dev/null
+++ b/pkgs/applications/networking/websocketd/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildGoPackage, fetchgit }:
+
+buildGoPackage rec {
+  name = "websocketd-${version}";
+  version = "0.3.0";
+  rev = "729c67f052f8f16a0a0aa032816a57649c0ebed3";
+
+  goPackagePath = "github.com/joewalnes/websocketd";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/joewalnes/websocketd";
+    sha256 = "1n4fag75lpfxg1pm1pr5v0p44dijrxj59s6dn4aqxirhxkq91lzb";
+  };
+
+  goDeps = ./deps.nix;
+
+  meta = with stdenv.lib; {
+    description = "Turn any program that uses STDIN/STDOUT into a WebSocket server";
+    homepage = "http://websocketd.com/";
+    maintainers = [ maintainers.bjornfor ];
+    license = licenses.bsd2;
+  };
+}
diff --git a/pkgs/applications/networking/websocketd/deps.nix b/pkgs/applications/networking/websocketd/deps.nix
new file mode 100644
index 000000000000..1e610691f52a
--- /dev/null
+++ b/pkgs/applications/networking/websocketd/deps.nix
@@ -0,0 +1,12 @@
+# This file was generated by https://github.com/kamilchm/go2nix v1.2.1
+[
+  {
+    goPackagePath = "github.com/gorilla/websocket";
+    fetch = {
+      type = "git";
+      url = "https://github.com/gorilla/websocket";
+      rev = "95ba29eb981bbb27d92e1f70bf8a1949452d926b";
+      sha256 = "08lvc9l0qagyhyrjj6jkhpq3zapa5gqr966bm33nb4bc0pd38f48";
+    };
+  }
+]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2bcb2803c0eb..bd63744fd979 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22967,6 +22967,8 @@ in
 
   webfs = callPackage ../servers/http/webfs { };
 
+  websocketd = callPackage ../applications/networking/websocketd { };
+
   wikicurses = callPackage ../applications/misc/wikicurses {
     pythonPackages = python3Packages;
   };

From e6797f686d82d7e18b5f547a87cc46cc8655cd3b Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 3 Jan 2019 19:34:43 +0100
Subject: [PATCH 156/274] =?UTF-8?q?pulseeffects:=204.4.1=20=E2=86=92=204.4?=
 =?UTF-8?q?.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Now depends on libdbus for RealtimeKit.

- No longer needs to add custom GStreamer plug-in path to environment variable:

https://github.com/wwmm/pulseeffects/commit/4410f1ffc15e16ab7a002e3e86e91eaa26f83e5c
---
 pkgs/applications/audio/pulseeffects/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/audio/pulseeffects/default.nix b/pkgs/applications/audio/pulseeffects/default.nix
index 6b62faa51bd7..faee1c6cc7f2 100644
--- a/pkgs/applications/audio/pulseeffects/default.nix
+++ b/pkgs/applications/audio/pulseeffects/default.nix
@@ -24,6 +24,7 @@
 , libsndfile
 , libebur128
 , boost
+, dbus
 , fftwFloat
 , calf
 , zita-convolver
@@ -43,14 +44,14 @@ let
     zam-plugins # maximizer
   ];
 in stdenv.mkDerivation rec {
-  name = "pulseeffects-${version}";
-  version = "4.4.1";
+  pname = "pulseeffects";
+  version = "4.4.4";
 
   src = fetchFromGitHub {
     owner = "wwmm";
     repo = "pulseeffects";
     rev = "v${version}";
-    sha256 = "0hb575h9hdknhwvhn5lak89ddavn4v5c0nipnv8dsfnmjhfli5qm";
+    sha256 = "02h237c3l55ky7gl0mmd6qqp5zagbrqa39rii33s5pspvxi9rj3s";
   };
 
   nativeBuildInputs = [
@@ -80,6 +81,7 @@ in stdenv.mkDerivation rec {
     libsamplerate
     libsndfile
     boost
+    dbus
     fftwFloat
     zita-convolver
     hicolor-icon-theme
@@ -91,8 +93,6 @@ in stdenv.mkDerivation rec {
   '';
 
   preFixup = ''
-    addToSearchPath GST_PLUGIN_SYSTEM_PATH_1_0 $out/lib/gstreamer-1.0
-
     gappsWrapperArgs+=(
       --set LV2_PATH "${stdenv.lib.makeSearchPath "lib/lv2" lv2Plugins}"
       --set LADSPA_PATH "${stdenv.lib.makeSearchPath "lib/ladspa" ladspaPlugins}"

From 2a28248352b54a9dd7cb2e9b9bfb04f18d3d35bd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 3 Jan 2019 10:44:00 -0800
Subject: [PATCH 157/274] goxel: 0.8.1 -> 0.8.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/goxel/versions
---
 pkgs/applications/graphics/goxel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/goxel/default.nix b/pkgs/applications/graphics/goxel/default.nix
index 27dd37d1803a..c553b7cf60c4 100644
--- a/pkgs/applications/graphics/goxel/default.nix
+++ b/pkgs/applications/graphics/goxel/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "goxel-${version}";
-  version = "0.8.1";
+  version = "0.8.2";
 
   src = fetchFromGitHub {
     owner = "guillaumechereau";
     repo = "goxel";
     rev = "v${version}";
-    sha256 = "0g6jkihjmsx6lyfl301qrq26gwvq89sk7xkkba6vrpklfs2jafkb";
+    sha256 = "14rycn6sd3wp90c9ghpif1al3rv1fdgvhmpldmwap0pk790kfxs1";
   };
 
   patches = [ ./disable-imgui_ini.patch ];

From fad19e21e88877270df181e113a14ce30ecd86e3 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Thu, 3 Jan 2019 19:55:07 +0100
Subject: [PATCH 158/274] julia: fix hash for 1.0.3

(cherry picked from commit 995c78064ade5153d80169d20903fa7a70714bd2)
---
 pkgs/development/compilers/julia/1.0.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/julia/1.0.nix b/pkgs/development/compilers/julia/1.0.nix
index d120742d37ca..c65c2a6a3135 100644
--- a/pkgs/development/compilers/julia/1.0.nix
+++ b/pkgs/development/compilers/julia/1.0.nix
@@ -2,5 +2,5 @@ import ./shared.nix {
   majorVersion = "1";
   minorVersion = "0";
   maintenanceVersion = "3";
-  src_sha256 = "0sjyvzdiizibljq0b3b5681mmyyzd5zicvygaavr0k0na9ndzsdz";
+  src_sha256 = "0666chsc19wx02k5m1yilf6wbc9bw27ay8p1d00jkh8m0jkrpf7l";
 }

From 4b5b8850d81e11cb81855dbe58f4ce789d9e3893 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 2 Jan 2019 13:05:40 -0800
Subject: [PATCH 159/274] python37Packages.ldap3: 2.5.1 -> 2.5.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-ldap3/versions
---
 pkgs/development/python-modules/ldap3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ldap3/default.nix b/pkgs/development/python-modules/ldap3/default.nix
index 3735cbf58523..22d725fac617 100644
--- a/pkgs/development/python-modules/ldap3/default.nix
+++ b/pkgs/development/python-modules/ldap3/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchPypi, buildPythonPackage, gssapi, pyasn1 }:
 
 buildPythonPackage rec {
-  version = "2.5.1";
+  version = "2.5.2";
   pname = "ldap3";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "cc09951809678cfb693a13a6011dd2d48ada60a52bd80cb4bd7dcc55ee7c02fd";
+    sha256 = "063dacy01mphc3n7z2qc2avykjavqm1gllkbvy7xzw5ihlqwhrrz";
   };
 
   buildInputs = [ gssapi ];

From cb1e93b2c0aeba53f86fb5354d9191347ba1142a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Thu, 3 Jan 2019 12:11:18 -0200
Subject: [PATCH 160/274] vivaldi: 2.1.1337.51-1 -> 2.2.1388.37-1

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

diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix
index e3269f15ac63..a89932be2e08 100644
--- a/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -4,7 +4,7 @@
 , freetype, fontconfig, libXft, libXrender, libxcb, expat
 , libuuid
 , gstreamer, gst-plugins-base, libxml2
-, glib, gtk3, pango, gdk_pixbuf, cairo, atk, at-spi2-atk, gnome2
+, glib, gtk3, pango, gdk_pixbuf, cairo, atk, at-spi2-atk, at-spi2-core, gnome2
 , nss, nspr
 , patchelf, makeWrapper
 , proprietaryCodecs ? false, vivaldi-ffmpeg-codecs ? null
@@ -13,11 +13,11 @@
 stdenv.mkDerivation rec {
   name = "${product}-${version}";
   product = "vivaldi";
-  version = "2.1.1337.51-1";
+  version = "2.2.1388.37-1";
 
   src = fetchurl {
     url = "https://downloads.vivaldi.com/stable/${product}-stable_${version}_amd64.deb";
-    sha256 = "00rxp6rardxjg17g2b28y2rj8szqlainp4ga6c58z981zkxvdlls";
+    sha256 = "07q04lvwnjn5kprlwyndv9h2s25637ngchch26ka8lry1lxkdv55";
   };
 
   unpackPhase = ''
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     stdenv.cc.cc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libxcb
     libXi libXft libXcursor libXfixes libXScrnSaver libXcomposite libXdamage libXtst libXrandr
-    atk at-spi2-atk alsaLib dbus cups gtk3 gdk_pixbuf libexif ffmpeg systemd
+    atk at-spi2-atk at-spi2-core alsaLib dbus cups gtk3 gdk_pixbuf libexif ffmpeg systemd
     freetype fontconfig libXrender libuuid expat glib nss nspr
     gstreamer libxml2 gst-plugins-base pango cairo gnome2.GConf
   ] ++ stdenv.lib.optional proprietaryCodecs vivaldi-ffmpeg-codecs;

From 3e00845cf07676dab6440777ffe55ed379027eb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Thu, 3 Jan 2019 12:12:06 -0200
Subject: [PATCH 161/274] vivaldi-ffmpeg-codecs: 70.0.3538.77 -> 71.0.3578.98

---
 .../networking/browsers/vivaldi/ffmpeg-codecs.nix         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
index 349ef233ae21..88587d74d252 100644
--- a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
+++ b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix
@@ -1,23 +1,23 @@
 { stdenv, fetchurl
 , dbus-glib, gtk3, libexif, libXScrnSaver, ninja, nss
-, pciutils, pkgconfig, python2, xdg_utils, gn
+, pciutils, pkgconfig, python2, xdg_utils, gn, at-spi2-core
 }:
 
 stdenv.mkDerivation rec {
   name = "${product}-${version}";
   product = "vivaldi-ffmpeg-codecs";
-  version = "70.0.3538.77";
+  version = "71.0.3578.98";
 
   src = fetchurl {
     url = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${version}.tar.xz";
-    sha512 = "128hvkcbyw70j31dj4jviqqjrzyfx38689nb8v0kk5vi2zlgfy5ibz2gyrv4bvrb53ld262y9pvam51nbdmrx2vqd9xrs173py7v0a0";
+    sha512 = "3baldqqdm8jzrs37w756ijgzwpmvma73rqbpnfkf0j41rmikrjdl6w7ycll98jch8rhzpgz3yfb9nk0gmsgxs233wn441bcdkhr1syv";
   };
 
   buildInputs = [ ];
 
   nativeBuildInputs = [
     gtk3 libexif libXScrnSaver ninja nss pciutils python2 xdg_utils gn
-    pkgconfig dbus-glib
+    pkgconfig dbus-glib at-spi2-core.dev
   ];
 
   patches = [

From 31682848cb879610334c6b1c6903c74548d55d35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Thu, 3 Jan 2019 20:42:26 +0100
Subject: [PATCH 162/274] android-udev-rules: 20180112 -> 20181031

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

diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix
index 88e8a9665586..b428c1c0bf77 100644
--- a/pkgs/os-specific/linux/android-udev-rules/default.nix
+++ b/pkgs/os-specific/linux/android-udev-rules/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   name = "android-udev-rules-${version}";
-  version = "20180112";
+  version = "20181031";
 
   src = fetchFromGitHub {
     owner = "M0Rf30";
     repo = "android-udev-rules";
     rev = version;
-    sha256 = "13gj79nnd04szqlrrzzkdr6wi1fky08pi7x8xfbg0jj3d3v0giah";
+    sha256 = "175js0vimv6b92cxl0sc4ihdj1k8yq3jrpbjy0zsvrm2367z7xqp";
   };
 
   installPhase = ''

From c74054f1d17edb686e157d140b115f7551031da3 Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Thu, 3 Jan 2019 20:07:26 +0100
Subject: [PATCH 163/274] youtube-dl: 2018.12.17 -> 2019.01.02

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

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index fbf925516f35..1505fa37ea89 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -19,11 +19,11 @@ buildPythonPackage rec {
   # The websites youtube-dl deals with are a very moving target. That means that
   # downloads break constantly. Because of that, updates should always be backported
   # to the latest stable release.
-  version = "2018.12.17";
+  version = "2019.01.02";
 
   src = fetchurl {
     url = "https://yt-dl.org/downloads/${version}/${pname}-${version}.tar.gz";
-    sha256 = "1nd4zr3wd35vldm775m9wcgbzma2013yyj134lcz19ipjs38isrk";
+    sha256 = "0iw8cfzghhkx2q7m3rwnhm3xyyh88qd2553fb287shkxyg9kz96b";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 4f99f8d2cbad9b72b7ce116f13788d8feb4b35d0 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Braun <eon@patapon.info>
Date: Sun, 23 Dec 2018 15:03:12 +0100
Subject: [PATCH 164/274] nixos/prometheus-bind-exporter: add module

---
 .../monitoring/prometheus/exporters.nix       |  1 +
 .../monitoring/prometheus/exporters/bind.nix  | 55 +++++++++++++++++++
 nixos/tests/prometheus-exporters.nix          | 19 +++++++
 3 files changed, 75 insertions(+)
 create mode 100644 nixos/modules/services/monitoring/prometheus/exporters/bind.nix

diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix
index 5308c9c4ee08..0a084561002f 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters.nix
@@ -33,6 +33,7 @@ let
     tor       = import ./exporters/tor.nix       { inherit config lib pkgs; };
     unifi     = import ./exporters/unifi.nix     { inherit config lib pkgs; };
     varnish   = import ./exporters/varnish.nix   { inherit config lib pkgs; };
+    bind      = import ./exporters/bind.nix      { inherit config lib pkgs; };
   };
 
   mkExporterOpts = ({ name, port }: {
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/bind.nix b/nixos/modules/services/monitoring/prometheus/exporters/bind.nix
new file mode 100644
index 000000000000..a9746c4d65d5
--- /dev/null
+++ b/nixos/modules/services/monitoring/prometheus/exporters/bind.nix
@@ -0,0 +1,55 @@
+{ config, lib, pkgs }:
+
+with lib;
+
+let
+  cfg = config.services.prometheus.exporters.bind;
+in
+{
+  port = 9119;
+  extraOpts = {
+    bindURI = mkOption {
+      type = types.str;
+      default = "http://localhost:8053/";
+      description = ''
+        HTTP XML API address of an Bind server.
+      '';
+    };
+    bindTimeout = mkOption {
+      type = types.str;
+      default = "10s";
+      description = ''
+        Timeout for trying to get stats from Bind.
+      '';
+    };
+    bindVersion = mkOption {
+      type = types.enum [ "xml.v2" "xml.v3" "auto" ];
+      default = "auto";
+      description = ''
+        BIND statistics version. Can be detected automatically.
+      '';
+    };
+    bindGroups = mkOption {
+      type = types.listOf (types.enum [ "server" "view" "tasks" ]);
+      default = [ "server" "view" ];
+      description = ''
+        List of statistics to collect. Available: [server, view, tasks]
+      '';
+    };
+  };
+  serviceOpts = {
+    serviceConfig = {
+      DynamicUser = true;
+      ExecStart = ''
+        ${pkgs.prometheus-bind-exporter}/bin/bind_exporter \
+          -web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
+          -bind.pid-file /var/run/named/named.pid \
+          -bind.timeout ${toString cfg.bindTimeout} \
+          -bind.stats-url ${cfg.bindURI} \
+          -bind.stats-version ${cfg.bindVersion} \
+          -bind.stats-groups ${concatStringsSep "," cfg.bindGroups} \
+          ${concatStringsSep " \\\n  " cfg.extraFlags}
+      '';
+    };
+  };
+}
diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix
index 5d1e004c5dd1..140687a8182f 100644
--- a/nixos/tests/prometheus-exporters.nix
+++ b/nixos/tests/prometheus-exporters.nix
@@ -106,6 +106,25 @@ let
       '';
     };
 
+    bind = {
+      exporterConfig = {
+        enable = true;
+      };
+      metricProvider = {
+        services.bind.enable = true;
+        services.bind.extraConfig = ''
+          statistics-channels {
+            inet 127.0.0.1 port 8053 allow { localhost; };
+          };
+        '';
+      };
+      exporterTest = ''
+        waitForUnit("prometheus-bind-exporter.service");
+        waitForOpenPort(9119);
+        succeed("curl -sSf http://localhost:9119/metrics" | grep -q 'bind_query_recursions_total 0');
+      '';
+    };
+
     dovecot = {
       exporterConfig = {
         enable = true;

From e7f3b4d2844263aa0382ffece807a91daca28ebc Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Thu, 3 Jan 2019 21:26:45 +0100
Subject: [PATCH 165/274] libxslt: add libgcrypt to buildInputs for
 cryptoSupport

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

diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix
index 6dc40bd45a0a..8a847499c3f4 100644
--- a/pkgs/development/libraries/libxslt/default.nix
+++ b/pkgs/development/libraries/libxslt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libxml2, findXMLCatalogs, python2
+{ stdenv, fetchurl, libxml2, findXMLCatalogs, python2, libgcrypt
 , cryptoSupport ? false
 , pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform
 }:
@@ -28,7 +28,9 @@ stdenv.mkDerivation rec {
 
   outputs = [ "bin" "dev" "out" "man" "doc" ] ++ stdenv.lib.optional pythonSupport "py";
 
-  buildInputs = [ libxml2.dev ] ++ stdenv.lib.optionals pythonSupport [ libxml2.py python2 ];
+  buildInputs = [ libxml2.dev ]
+    ++ stdenv.lib.optionals pythonSupport [ libxml2.py python2 ]
+    ++ stdenv.lib.optionals cryptoSupport [ libgcrypt ];
 
   propagatedBuildInputs = [ findXMLCatalogs ];
 

From 7475db089b115a296acbb3e0137be48660fed83e Mon Sep 17 00:00:00 2001
From: Mikhail Klementev <jollheef@riseup.net>
Date: Thu, 3 Jan 2019 20:04:58 +0000
Subject: [PATCH 166/274] wire-desktop: 3.3.2872 -> 3.5.2881

---
 .../wire-desktop/default.nix                  | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
index c685a5b91c1e..d5dc3282a1c9 100644
--- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix
@@ -1,7 +1,8 @@
-{ stdenv, fetchurl, dpkg, makeDesktopItem, gnome2, gtk2, atk, cairo, pango, gdk_pixbuf, glib
-, freetype, fontconfig, dbus, libnotify, libX11, xorg, libXi, libXcursor, libXdamage
-, libXrandr, libXcomposite, libXext, libXfixes, libXrender, libXtst, libXScrnSaver
-, nss, nspr, alsaLib, cups, expat, udev, xdg_utils, hunspell, pulseaudio, pciutils
+{ stdenv, fetchurl, dpkg, makeDesktopItem, libuuid, gtk3, atk, cairo, pango
+, gdk_pixbuf, glib, freetype, fontconfig, dbus, libnotify, libX11, xorg, libXi
+, libXcursor, libXdamage, libXrandr, libXcomposite, libXext, libXfixes
+, libXrender, libXtst, libXScrnSaver, nss, nspr, alsaLib, cups, expat, udev
+, xdg_utils, hunspell, pulseaudio, pciutils, at-spi2-atk
 }:
 let
   rpath = stdenv.lib.makeLibraryPath [
@@ -15,9 +16,10 @@ let
     freetype
     gdk_pixbuf
     glib
-    gnome2.GConf
-    gtk2
+    gtk3
+    at-spi2-atk
     hunspell
+    libuuid
     libnotify
     libX11
     libXcomposite
@@ -41,7 +43,7 @@ let
     xorg.libxcb
   ];
 
-  version = "3.3.2872";
+  version = "3.5.2881";
 
   plat = {
     "i686-linux" = "i386";
@@ -49,8 +51,8 @@ let
   }.${stdenv.hostPlatform.system};
 
   sha256 = {
-    "i686-linux" = "16dw4ycajxviqrf4i32rkrhg1j1mdkmk252y8vjwr18xlyn958qb";
-    "x86_64-linux" = "04ysk91h2izyb41b243zki4j08bis9yzjq2va9bakp1lv6ywm8pw";
+    "i686-linux" = "0s5j6acsiymsikvah9f1ywandzvcdx5m8csrc7ymhv0gx2a9xm1d";
+    "x86_64-linux" = "17siis4xws27jmhf1gyb6cvip6clak27zxckyk0b312kkc4q363i";
   }.${stdenv.hostPlatform.system};
 
 in

From 13e614600cbc26f28c8e4b4b8e6db856975d5c5a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 3 Jan 2019 12:45:53 -0800
Subject: [PATCH 167/274] focuswriter: 1.7.0 -> 1.7.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/focuswriter/versions
---
 pkgs/applications/editors/focuswriter/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/focuswriter/default.nix b/pkgs/applications/editors/focuswriter/default.nix
index 2708c40d5091..f656f874151a 100644
--- a/pkgs/applications/editors/focuswriter/default.nix
+++ b/pkgs/applications/editors/focuswriter/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "focuswriter-${version}";
-  version = "1.7.0";
+  version = "1.7.1";
 
   src = fetchurl {
     url = "https://gottcode.org/focuswriter/focuswriter-${version}-src.tar.bz2";
-    sha256 = "0321wqhjfs020q113lgh959qq03zfamm72zk22mnqxf3ng3adc3g";
+    sha256 = "0ny0bri9yp6wcsj9s8vd0j4mzx44yw57axjx5piv44q2jgsgz401";
   };
 
   nativeBuildInputs = [ pkgconfig qmake qttools ];

From 28ebdf51a6c419e836a10d0357428983c42b83bf Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 3 Jan 2019 02:47:09 -0800
Subject: [PATCH 168/274] libcouchbase: 2.10.2 -> 2.10.3

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libcouchbase/versions
---
 pkgs/development/libraries/libcouchbase/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix
index 00e080d85842..77f495e32b84 100644
--- a/pkgs/development/libraries/libcouchbase/default.nix
+++ b/pkgs/development/libraries/libcouchbase/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "libcouchbase-${version}";
-  version = "2.10.2";
+  version = "2.10.3";
 
   src = fetchFromGitHub {
     owner = "couchbase";
     repo = "libcouchbase";
     rev = version;
-    sha256 = "1znhy99nhiv21j2jwsx9dsmg8br01wg0hsf1yfwsjny0myv13xkm";
+    sha256 = "0a3fin5rcwa3xwd980mrzrkr7dpjdwbri81mqwxw1fkppjqw23z4";
   };
 
   cmakeFlags = "-DLCB_NO_MOCK=ON";

From 973bc2f2aec328798de48f1d8a7659c96cfd1f85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 12 Dec 2018 14:11:17 +0000
Subject: [PATCH 169/274] clang-tools: 5 -> 7

Since this not typically used as build dependencies, just use the latest
and greatest.
---
 pkgs/development/tools/clang-tools/default.nix | 13 ++++++-------
 pkgs/top-level/all-packages.nix                |  2 ++
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/clang-tools/default.nix b/pkgs/development/tools/clang-tools/default.nix
index e09da0287c76..2ababe85d0c1 100644
--- a/pkgs/development/tools/clang-tools/default.nix
+++ b/pkgs/development/tools/clang-tools/default.nix
@@ -1,14 +1,15 @@
-{ stdenv, makeWrapper, writeScript, llvmPackages }:
+{ stdenv, writeScript, llvmPackages_latest }:
 
 let
-  clang = llvmPackages.clang-unwrapped;
+  clang = llvmPackages_latest.clang-unwrapped;
   version = stdenv.lib.getVersion clang;
 in
 
 stdenv.mkDerivation {
   name = "clang-tools-${version}";
-  builder = writeScript "builder" ''
-    source $stdenv/setup
+  unpackPhase = ":";
+  installPhase = ''
+    mkdir -p $out/bin
     for tool in \
       clang-apply-replacements \
       clang-check \
@@ -16,11 +17,9 @@ stdenv.mkDerivation {
       clang-rename \
       clang-tidy
     do
-      makeWrapper $clang/bin/$tool $out/bin/$tool --argv0 $tool
+      ln -s ${clang}/bin/$tool $out/bin/$tool
     done
   '';
-  buildInputs = [ makeWrapper ];
-  inherit clang;
   meta = clang.meta // {
     description = "Standalone command line tools for C++ development";
     maintainers = with stdenv.lib.maintainers; [ aherrmann ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8d00a87c336d..7dc57458a55b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7349,6 +7349,8 @@ in
     stdenv = overrideCC stdenv buildPackages.gcc6; # with gcc-7: undefined reference to `__divmoddi4'
   });
 
+  llvmPackages_latest = llvmPackages_7;
+
   manticore = callPackage ../development/compilers/manticore { };
 
   mercury = callPackage ../development/compilers/mercury { };

From eea4ff895df6ec9bb19ba3b283239310771b03f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 2 Jan 2019 19:34:32 +0100
Subject: [PATCH 170/274] python.pkgs.kajiki: fix tests

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

diff --git a/pkgs/development/python-modules/kajiki/default.nix b/pkgs/development/python-modules/kajiki/default.nix
index e9164d8bcf6e..ba71e03ce991 100644
--- a/pkgs/development/python-modules/kajiki/default.nix
+++ b/pkgs/development/python-modules/kajiki/default.nix
@@ -4,6 +4,7 @@
 , Babel
 , pytz
 , nine
+, nose
 }:
 
 buildPythonPackage rec {
@@ -16,6 +17,7 @@ buildPythonPackage rec {
   };
 
   propagatedBuildInputs = [ Babel pytz nine ];
+  checkInputs = [ nose ];
 
   meta = with stdenv.lib; {
     description = "Kajiki provides fast well-formed XML templates";

From 31a77f43310afc75c44181d02984606efd93c528 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 2 Jan 2019 19:31:14 +0100
Subject: [PATCH 171/274] cherrypy: re-enable python2 support

we need cherrypy for ceph -> sambaFull
---
 .../python-modules/cherrypy/default.nix        | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix
index cbb8774f55fe..1763ccbce855 100644
--- a/pkgs/development/python-modules/cherrypy/default.nix
+++ b/pkgs/development/python-modules/cherrypy/default.nix
@@ -5,15 +5,21 @@
 , backports_functools_lru_cache, requests_toolbelt
 }:
 
-buildPythonPackage rec {
+let
+  srcInfo = if isPy3k then {
+    version = "18.0.1";
+    sha256 = "3002fc47b982c3df4d08dbe5996b093fd73f85b650ab8df19e8b9b95f5c00520";
+  } else {
+    version = "17.4.1";
+    sha256 = "1kl17anzz535jgkn9qcy0c2m0zlafph0iv7ph3bb9mfrs2bgvagv";
+  };
+in buildPythonPackage rec {
   pname = "CherryPy";
-  version = "18.0.1";
-
-  disabled = !isPy3k;
+  inherit (srcInfo) version;
 
   src = fetchPypi {
-    inherit pname version;
-    sha256 = "3002fc47b982c3df4d08dbe5996b093fd73f85b650ab8df19e8b9b95f5c00520";
+    inherit pname;
+    inherit (srcInfo) version sha256;
   };
 
   propagatedBuildInputs = [ cheroot contextlib2 portend routes six zc_lockfile ];

From 17ef8c1c85b65b2dc6358e91931a91656fc5386e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Wed, 2 Jan 2019 19:40:35 +0100
Subject: [PATCH 172/274] python.pkgs.pecan: fix build

---
 pkgs/development/python-modules/pecan/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/python-modules/pecan/default.nix b/pkgs/development/python-modules/pecan/default.nix
index c6c5b99d9806..70d71ea51792 100644
--- a/pkgs/development/python-modules/pecan/default.nix
+++ b/pkgs/development/python-modules/pecan/default.nix
@@ -12,6 +12,7 @@
 , gunicorn
 , jinja2
 , virtualenv
+, mock
 }:
 
 buildPythonPackage rec {
@@ -28,6 +29,8 @@ buildPythonPackage rec {
     webtest Mako genshi Kajiki sqlalchemy gunicorn jinja2 virtualenv
   ];
 
+  checkInputs = [ mock ];
+
   meta = with stdenv.lib; {
     description = "Pecan";
     homepage = "https://github.com/pecan/pecan";

From 25a3b0b731c964437e7bb7b5697c4f01778a3214 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 2 Jan 2019 13:30:37 -0800
Subject: [PATCH 173/274] python37Packages.parver: 0.2.0 -> 0.2.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-parver/versions
---
 pkgs/development/python-modules/parver/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/parver/default.nix b/pkgs/development/python-modules/parver/default.nix
index a654e28c64ac..c71e39ca111a 100644
--- a/pkgs/development/python-modules/parver/default.nix
+++ b/pkgs/development/python-modules/parver/default.nix
@@ -11,11 +11,11 @@
 
 buildPythonPackage rec {
   pname = "parver";
-  version = "0.2.0";
+  version = "0.2.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1nylv880zxnm9waw32y8dmdc435jv5gjcajv8qahafm7v1prgcmq";
+    sha256 = "0jzyylcmjxb0agc4fpdnzdnv2ajvp99rs9pz7qcklnhlmy8scdqv";
   };
 
   propagatedBuildInputs = [ six attrs arpeggio ];

From 0b45aa93ca3218ae2849e2910f3509fedbd43790 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 2 Jan 2019 12:11:10 -0800
Subject: [PATCH 174/274] python37Packages.pyhomematic: 0.1.52 -> 0.1.53

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-pyhomematic/versions
---
 pkgs/development/python-modules/pyhomematic/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyhomematic/default.nix b/pkgs/development/python-modules/pyhomematic/default.nix
index 521d06cfdfff..abd8e6741886 100644
--- a/pkgs/development/python-modules/pyhomematic/default.nix
+++ b/pkgs/development/python-modules/pyhomematic/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "pyhomematic";
-  version = "0.1.52";
+  version = "0.1.53";
 
   disabled = !isPy3k;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "4947b75401245d3a69de698617bb81fcba1ed7fd56c15d339a5f3b2bbbc391f7";
+    sha256 = "1crqdqbv7yqw2pasydy51ps048phbdn7s37xaba9npd1xm8g7jvh";
   };
 
   # PyPI tarball does not include tests/ directory

From 18090a85deea469caf4d5af9dbfe1aa3436a4dc3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 2 Jan 2019 12:27:07 -0800
Subject: [PATCH 175/274] python37Packages.ofxparse: 0.19 -> 0.20

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-ofxparse/versions
---
 pkgs/development/python-modules/ofxparse/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ofxparse/default.nix b/pkgs/development/python-modules/ofxparse/default.nix
index 377138877c9c..fbdafc291dc5 100644
--- a/pkgs/development/python-modules/ofxparse/default.nix
+++ b/pkgs/development/python-modules/ofxparse/default.nix
@@ -8,11 +8,11 @@
 
 buildPythonPackage rec {
   pname = "ofxparse";
-  version = "0.19";
+  version = "0.20";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "d8c81fd5089332106da1a2e8919c412c7c677f08af04d557ca767701a04e0918";
+    sha256 = "0zn3grc6xhgzcc81qc3dxkkwk731cjjqqhb46smw12lk09cdnigb";
   };
 
   propagatedBuildInputs = [ six beautifulsoup4 lxml ];

From 9abdfa1c0e76bde49f9f43d53bed75be2b7dee3f Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 3 Jan 2019 11:24:26 -0800
Subject: [PATCH 176/274] gnucash: 3.3 -> 3.4

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/gnucash/versions
---
 pkgs/applications/office/gnucash/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix
index e3c03eef9b92..bd3425e282a6 100644
--- a/pkgs/applications/office/gnucash/default.nix
+++ b/pkgs/applications/office/gnucash/default.nix
@@ -25,11 +25,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "gnucash-${version}";
-  version = "3.3";
+  version = "3.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/gnucash/${name}.tar.bz2";
-    sha256 = "0grr5qi5rn1xvr7qx5d7mcxa2mcgycy2b325ry73bb485a6yv5l3";
+    sha256 = "1ms2wg4sh5gq3rpjmmnp85rh5nc9ahca1imxkvhz4d3yiwy8hm52";
   };
 
   nativeBuildInputs = [ pkgconfig makeWrapper cmake gtest ];

From b6aba6cc180d84d5b9892fb1b5810ad94801dd4c Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 3 Jan 2019 22:36:30 +0100
Subject: [PATCH 177/274] pythonPackages.pysnmp: 4.4.6 -> 4.4.8

The build was broken [0] due to an incorrect dependency (not sure why it
was working before, maybe the libraries where compatible).

[0]: https://hydra.nixos.org/build/86085666
---
 pkgs/development/python-modules/pysnmp/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/pysnmp/default.nix b/pkgs/development/python-modules/pysnmp/default.nix
index d2a47cfbca48..38ea31a19d47 100644
--- a/pkgs/development/python-modules/pysnmp/default.nix
+++ b/pkgs/development/python-modules/pysnmp/default.nix
@@ -2,23 +2,23 @@
 , buildPythonPackage
 , fetchPypi
 , pyasn1
-, pycrypto
+, pycryptodomex
 , pysmi
 }:
 
 buildPythonPackage rec {
-  version = "4.4.6";
+  version = "4.4.8";
   pname = "pysnmp";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e34ffa0dce5f69adabd478ff76c3e1b08e32ebb0767df8b178d0704f4a1ac406";
+    sha256 = "1c42qicrh56m49374kxna2s2nmdwna3yqgnz16frzj0dw7vxrrhk";
   };
 
   # NameError: name 'mibBuilder' is not defined
   doCheck = false;
 
-  propagatedBuildInputs = [ pyasn1 pycrypto pysmi ];
+  propagatedBuildInputs = [ pyasn1 pycryptodomex pysmi ];
 
   meta = with stdenv.lib; {
     homepage = http://pysnmp.sf.net;
@@ -26,5 +26,4 @@ buildPythonPackage rec {
     license = licenses.bsd2;
     maintainers = with maintainers; [ koral ];
   };
-
 }

From 7817aa364187249029f6ac9e36dfdf25596b933d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= <benno.fuenfstueck@gmail.com>
Date: Thu, 3 Jan 2019 22:42:14 +0100
Subject: [PATCH 178/274] linux-rpi: set correct hydraPlatforms (#53325)

---
 pkgs/os-specific/linux/kernel/linux-rpi.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-rpi.nix b/pkgs/os-specific/linux/kernel/linux-rpi.nix
index 2d0fe730451e..7077a70a7ab0 100644
--- a/pkgs/os-specific/linux/kernel/linux-rpi.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rpi.nix
@@ -25,7 +25,7 @@ lib.overrideDerivation (buildLinux (args // rec {
     efiBootStub = false;
   } // (args.features or {});
 
-  extraMeta.hydraPlatforms = with stdenv.lib.platforms; [ aarch64 ];
+  extraMeta.hydraPlatforms = [ "aarch64-linux" ];
 })) (oldAttrs: {
   postConfigure = ''
     # The v7 defconfig has this set to '-v7' which screws up our modDirVersion.

From c7afdaf5cd93bcf69f45e7136eb12d9eaf47d1e9 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 3 Jan 2019 06:58:05 -0800
Subject: [PATCH 179/274] gtkwave: 3.3.97 -> 3.3.98

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/gtkwave/versions
---
 pkgs/applications/science/electronics/gtkwave/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix
index 214a918fa348..e2ac4c4b44ce 100644
--- a/pkgs/applications/science/electronics/gtkwave/default.nix
+++ b/pkgs/applications/science/electronics/gtkwave/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "gtkwave-${version}";
-  version = "3.3.97";
+  version = "3.3.98";
 
   src = fetchurl {
     url    = "mirror://sourceforge/gtkwave/${name}.tar.gz";
-    sha256 = "0jy5qk0b0np9xsxgnvv8jjgyw81l170wrm5q04qs48wpw7d0rm3v";
+    sha256 = "1xi2b9yck8fagnjhnhhwrhz5rfvrs2h2m6m64m210m5xnfzbp9pg";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 51076b39608bb7d39609e4cda77098d4d83d5cba Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 3 Jan 2019 06:51:26 -0800
Subject: [PATCH 180/274] gtkdatabox: 0.9.3.0 -> 0.9.3.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/gtkdatabox/versions
---
 pkgs/development/libraries/gtkdatabox/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gtkdatabox/default.nix b/pkgs/development/libraries/gtkdatabox/default.nix
index d074f51d3ca0..1caac3914a58 100644
--- a/pkgs/development/libraries/gtkdatabox/default.nix
+++ b/pkgs/development/libraries/gtkdatabox/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, gtk2 }:
 
 stdenv.mkDerivation rec {
-  name = "gtkdatabox-0.9.3.0";
+  name = "gtkdatabox-0.9.3.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/gtkdatabox/${name}.tar.gz";
-    sha256 = "1wigd4bdlrz4pma2l2wd3z8sx7pqmsvq845nya5vma9ibi96nhhz";
+    sha256 = "1rdxnjgh6v3yjqgsfmamyzpfxckzchps4kqvvz88nifmd7ckhjfh";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From ca80c4209a4bd92f90818da65f807f35cbb1717a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 3 Jan 2019 08:46:23 -0800
Subject: [PATCH 181/274] jhiccup: 2.0.9 -> 2.0.10

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/jhiccup/versions
---
 pkgs/development/tools/java/jhiccup/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/java/jhiccup/default.nix b/pkgs/development/tools/java/jhiccup/default.nix
index 39b573023376..6fb34588cd0b 100644
--- a/pkgs/development/tools/java/jhiccup/default.nix
+++ b/pkgs/development/tools/java/jhiccup/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "jhiccup-${version}";
-  version = "2.0.9";
+  version = "2.0.10";
 
   src = fetchzip {
     url    = "https://www.azul.com/files/jHiccup-${version}-dist.zip";
-    sha256 = "1y089kzj191j3vclkma4vi1w66pw4jqrnm5z0qw264wqcn0hnq11";
+    sha256 = "1hsvi8wjh615fnjf75h7b5afp04chqcgvini30vfcn3m9a5icbgy";
   };
 
   configurePhase = ":";

From 704e5ba9570a90edb63b91c504459ea7cf1b9458 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 3 Jan 2019 04:30:21 -0800
Subject: [PATCH 182/274] libraw: 0.19.1 -> 0.19.2

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libraw/versions
---
 pkgs/development/libraries/libraw/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix
index e08cf3fe7a8a..1a998c044359 100644
--- a/pkgs/development/libraries/libraw/default.nix
+++ b/pkgs/development/libraries/libraw/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libraw-${version}";
-  version = "0.19.1";
+  version = "0.19.2";
 
   src = fetchurl {
     url = "https://www.libraw.org/data/LibRaw-${version}.tar.gz";
-    sha256 = "1xjyw4n9gfr2r637pjbpbi3h98h9mdjn61b0hsxwqynq2vdij452";
+    sha256 = "0i4nhjm5556xgn966x0i503ygk2wafq6z83kg0lisacjjab4f3a0";
   };
 
   outputs = [ "out" "lib" "dev" "doc" ];

From 403bd70214a032b446e958626cb96336baebf6fd Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 2 Jan 2019 22:30:12 -0800
Subject: [PATCH 183/274] mimeo: 2018.11 -> 2018.12

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/mimeo/versions
---
 pkgs/tools/misc/mimeo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/mimeo/default.nix b/pkgs/tools/misc/mimeo/default.nix
index 727732eb87bb..02637e4ea8fa 100644
--- a/pkgs/tools/misc/mimeo/default.nix
+++ b/pkgs/tools/misc/mimeo/default.nix
@@ -2,11 +2,11 @@
 
 python3Packages.buildPythonApplication rec {
   name = "mimeo-${version}";
-  version = "2018.11";
+  version = "2018.12";
 
   src = fetchurl {
     url = "https://xyne.archlinux.ca/projects/mimeo/src/${name}.tar.xz";
-    sha256 = "0qhsy6d1mg00s3mbykci7zk2n3qp2c27mh9nvjja9x8lx7xyfznm";
+    sha256 = "1bjhqwfi8rrf1m4fwwqvg0qzk035qcnxlmhh4kxrpm6rqhw48vk8";
   };
 
   buildInputs = [ file desktop-file-utils ];

From 22f0e9fb2763ecca6e1492874f29a6beea939959 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 3 Jan 2019 03:28:42 -0800
Subject: [PATCH 184/274] languagetool: 4.3 -> 4.4

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/languagetool/versions
---
 pkgs/tools/text/languagetool/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/languagetool/default.nix b/pkgs/tools/text/languagetool/default.nix
index 7e784b917b42..402bc17341e0 100644
--- a/pkgs/tools/text/languagetool/default.nix
+++ b/pkgs/tools/text/languagetool/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "LanguageTool-${version}";
-  version = "4.3";
+  version = "4.4";
 
   src = fetchzip {
     url = "https://www.languagetool.org/download/${name}.zip";
-    sha256 = "0zsz82jc39j5wjwynmjny7h82kjz7clyk37n6pxmi85ibbdm0zn4";
+    sha256 = "0cdrh59jcwrj5zp2lhbi9wp29pzabp35i8f7lbrs6z1wib6mgmp1";
   };
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ jre ];

From 1d41509599707376cf9462ca9a3602012e0337e3 Mon Sep 17 00:00:00 2001
From: Dmitry Bogatov <KAction@debian.org>
Date: Thu, 3 Jan 2019 22:35:21 +0000
Subject: [PATCH 185/274] vimPlugins.ansible-vim: init at 2.0

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

diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index 00d07ef9236b..c4772d65dbd7 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -81,6 +81,17 @@ let
     };
   };
 
+  ansible-vim = buildVimPluginFrom2Nix {
+    pname = "ansible-vim";
+    version = "2.0";
+    src = fetchFromGitHub {
+      owner = "pearofducks";
+      repo = "ansible-vim";
+      rev = "01d0e7d4b87936d9cfe5a6038a6c9cec409a3c15";
+      sha256 = "14x7lxwvfrvi27qmffh66fpc3fk21xkzfzps0vx6n3n7h56a7r2g";
+    };
+  };
+
   argtextobj-vim = buildVimPluginFrom2Nix {
     pname = "argtextobj-vim";
     version = "2010-10-18";
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 49a0230de934..3881ea0c5df7 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -218,6 +218,7 @@ osyo-manga/vim-textobj-multiblock
 osyo-manga/vim-watchdogs
 pangloss/vim-javascript
 parsonsmatt/intero-neovim
+pearofducks/ansible-vim
 peterhoeg/vim-qml
 phanviet/vim-monokai-pro
 plasticboy/vim-markdown

From d278db3cdfbac738ad9ca30ca893bb2162560930 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 3 Jan 2019 15:07:10 -0800
Subject: [PATCH 186/274] eid-mw: 4.4.11 -> 4.4.13

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/eid-mw/versions
---
 pkgs/tools/security/eid-mw/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix
index 3534115bdb02..6bdc8570982d 100644
--- a/pkgs/tools/security/eid-mw/default.nix
+++ b/pkgs/tools/security/eid-mw/default.nix
@@ -7,10 +7,10 @@
 
 stdenv.mkDerivation rec {
   name = "eid-mw-${version}";
-  version = "4.4.11";
+  version = "4.4.13";
 
   src = fetchFromGitHub {
-    sha256 = "13mhz23j2gp5bywdq2xiwkk0gnc354j31ry8x35pzlwrcn19by10"; 
+    sha256 = "14bgn2k0xbd6241qdghg787pgxy7k9rvcspaf74zwwyibaqknzyx"; 
     rev = "v${version}";
     repo = "eid-mw";
     owner = "Fedict";

From f3c9480b6d6832b39ad361f305ee3f571fb8132a Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 3 Jan 2019 15:18:08 -0800
Subject: [PATCH 187/274] dar: 2.5.18 -> 2.6.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/dar/versions
---
 pkgs/tools/backup/dar/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/backup/dar/default.nix b/pkgs/tools/backup/dar/default.nix
index 9a842c45f9c4..29d54eea4533 100644
--- a/pkgs/tools/backup/dar/default.nix
+++ b/pkgs/tools/backup/dar/default.nix
@@ -3,12 +3,12 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  version = "2.5.18";
+  version = "2.6.0";
   name = "dar-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/dar/${name}.tar.gz";
-    sha256 = "14002ai4xji0dczgiargxs3z8yylswj8z94higcsw09xk13izlkk";
+    sha256 = "0avaffkfrgj8vhvnpqi4s21bsrlxl0xafpyd3v9n3f9hs2gnm3wg";
   };
 
   buildInputs = [ zlib bzip2 openssl lzo libgcrypt gpgme xz ]

From eb84501ef97d7ca1ff9ee88bdf3b8529fefbd237 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 4 Jan 2019 01:15:56 +0100
Subject: [PATCH 188/274] python{2,3}Packages.Pweave: fix build

Version 0.30 was missing the Python dependencies `nbconvert` and `markdown`.

Also Python 2 isn't supported any more since 0.30
(https://github.com/mpastell/Pweave/blob/master/CHANGELOG.txt) and can
therefore be dropped.
---
 pkgs/development/python-modules/pweave/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pweave/default.nix b/pkgs/development/python-modules/pweave/default.nix
index 2208ec522669..13f237750deb 100644
--- a/pkgs/development/python-modules/pweave/default.nix
+++ b/pkgs/development/python-modules/pweave/default.nix
@@ -4,6 +4,9 @@
 , mock
 , matplotlib
 , pkgs
+, nbconvert
+, markdown
+, isPy3k
 }:
 
 buildPythonPackage rec {
@@ -15,8 +18,10 @@ buildPythonPackage rec {
     sha256 = "5e5298d90e06414a01f48e0d6aa4c36a70c5f223d929f2a9c7e2d388451c7357";
   };
 
+  disabled = !isPy3k;
+
   buildInputs = [ mock pkgs.glibcLocales ];
-  propagatedBuildInputs = [ matplotlib ];
+  propagatedBuildInputs = [ matplotlib nbconvert markdown ];
 
   # fails due to trying to run CSS as test
   doCheck = false;

From f7b0feaa2e72bab23870dd9b8a360bc4afd48ece Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Fri, 4 Jan 2019 02:11:50 +0100
Subject: [PATCH 189/274] =?UTF-8?q?pulseeffects:=204.4.4=20=E2=86=92=204.4?=
 =?UTF-8?q?.5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes crash on my crappy set-up.
---
 pkgs/applications/audio/pulseeffects/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/pulseeffects/default.nix b/pkgs/applications/audio/pulseeffects/default.nix
index faee1c6cc7f2..36215914838d 100644
--- a/pkgs/applications/audio/pulseeffects/default.nix
+++ b/pkgs/applications/audio/pulseeffects/default.nix
@@ -45,13 +45,13 @@ let
   ];
 in stdenv.mkDerivation rec {
   pname = "pulseeffects";
-  version = "4.4.4";
+  version = "4.4.5";
 
   src = fetchFromGitHub {
     owner = "wwmm";
     repo = "pulseeffects";
     rev = "v${version}";
-    sha256 = "02h237c3l55ky7gl0mmd6qqp5zagbrqa39rii33s5pspvxi9rj3s";
+    sha256 = "1dcly8rzbfnfqrl7biicbixdqgqazrwa4x8l3m3r8f4bf3sqpmhd";
   };
 
   nativeBuildInputs = [

From cc09a97be7858bc05d75803e97c68fd47fd01102 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 3 Jan 2019 17:17:42 -0800
Subject: [PATCH 190/274] checkstyle: 8.15 -> 8.16

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/checkstyle/versions
---
 pkgs/development/tools/analysis/checkstyle/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix
index 4149fb4233d2..749d35474739 100644
--- a/pkgs/development/tools/analysis/checkstyle/default.nix
+++ b/pkgs/development/tools/analysis/checkstyle/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, makeWrapper, jre }:
 
 stdenv.mkDerivation rec {
-  version = "8.15";
+  version = "8.16";
   name = "checkstyle-${version}";
 
   src = fetchurl {
     url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar";
-    sha256 = "0zl064vx5gc6kglpw9lvd43v5zsdykr1whzy61bhijbbgnsrh9vb";
+    sha256 = "1044imm1pmn4fb0bzg4k44qm1hwwsyf7l7lbnlrznbln7ymdy5ki";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 6197911c12a8c8be2eaaba013fd60d4da0a2c386 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 3 Jan 2019 17:41:10 -0800
Subject: [PATCH 191/274] copyq: 3.7.1 -> 3.7.2 (#53359)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/copyq/versions
---
 pkgs/applications/misc/copyq/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix
index fa5a9b466673..ebc0a8297746 100644
--- a/pkgs/applications/misc/copyq/default.nix
+++ b/pkgs/applications/misc/copyq/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   name = "CopyQ-${version}";
-  version = "3.7.1";
+  version = "3.7.2";
 
   src  = fetchFromGitHub {
     owner = "hluk";
     repo = "CopyQ";
     rev = "v${version}";
-    sha256 = "0b3lrhrffvq46n9xc0lzbxhhn1lzmq2lrijjdwizc52458d6h90y";
+    sha256 = "1f2q9lzs5z31rl689ai2hig4nrj8cg9g25hhsrj6r85q9vkwkqjs";
   };
 
   nativeBuildInputs = [ cmake ];

From bf511fe1e92080a2bcc7b0e025b2330167cf5b68 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Thu, 3 Jan 2019 20:11:06 -0500
Subject: [PATCH 192/274] lollypop: 0.9.908 -> 0.9.909

https://gitlab.gnome.org/World/lollypop/tags/0.9.909
---
 pkgs/applications/audio/lollypop/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/lollypop/default.nix b/pkgs/applications/audio/lollypop/default.nix
index 728e8b1d50e2..61586c6b2127 100644
--- a/pkgs/applications/audio/lollypop/default.nix
+++ b/pkgs/applications/audio/lollypop/default.nix
@@ -5,7 +5,7 @@
 
 python3.pkgs.buildPythonApplication rec  {
   pname = "lollypop";
-  version = "0.9.908";
+  version = "0.9.909";
 
   format = "other";
   doCheck = false;
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec  {
     url = "https://gitlab.gnome.org/World/lollypop";
     rev = "refs/tags/${version}";
     fetchSubmodules = true;
-    sha256 = "0sjhp0lw41qdp5jah9shq69ga43rkxi3vijm57x8w147nj87ch7c";
+    sha256 = "19d82dy0wprabg5kzcgs3ydmp9iz3h437n55cnlp20mbpya09k7n";
   };
 
   nativeBuildInputs = with python3.pkgs; [

From a452a8b103370f6bc8e988c2597ac77e2172ed80 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 3 Jan 2019 18:27:58 -0800
Subject: [PATCH 193/274] caf: 0.16.2 -> 0.16.3

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/actor-framework/versions
---
 pkgs/development/libraries/caf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/caf/default.nix b/pkgs/development/libraries/caf/default.nix
index f1cad37d438f..15744744067c 100644
--- a/pkgs/development/libraries/caf/default.nix
+++ b/pkgs/development/libraries/caf/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "actor-framework-${version}";
-  version = "0.16.2";
+  version = "0.16.3";
 
   src = fetchFromGitHub {
     owner = "actor-framework";
     repo = "actor-framework";
     rev = "${version}";
-    sha256 = "0sdr9mrrkrj9nfwqbznz3pkqfsnsi8kanfy99x01js1spqihy1s3";
+    sha256 = "0nqw1cv7wxbcn2qwm08qffb6k4n3kgvdiaphks5gjgm305jk4vnx";
   };
 
   nativeBuildInputs = [ cmake ];

From 6a0bff977a6b2052d3ce37cb3ea3858d5f69c6c9 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 3 Jan 2019 20:25:25 -0600
Subject: [PATCH 194/274] nnn: remove readline, not used since 1.9

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

diff --git a/pkgs/applications/misc/nnn/default.nix b/pkgs/applications/misc/nnn/default.nix
index 1c1fd292e5d9..34a365ab67f1 100644
--- a/pkgs/applications/misc/nnn/default.nix
+++ b/pkgs/applications/misc/nnn/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, ncurses, readline, conf ? null }:
+{ stdenv, fetchFromGitHub, pkgconfig, ncurses, conf ? null }:
 
 with stdenv.lib;
 
@@ -17,9 +17,9 @@ stdenv.mkDerivation rec {
   preBuild = optionalString (conf!=null) "cp ${configFile} nnn.h";
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ ncurses readline ];
+  buildInputs = [ ncurses ];
 
-  installFlags = [ "DESTDIR=$(out)" "PREFIX=" ];
+  makeFlags = [ "DESTDIR=${placeholder "out"}" "PREFIX=" ];
 
   meta = {
     description = "Small ncurses-based file browser forked from noice";

From e07488d2a0feb8e29e09249b9b885e56f29e5c2c Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 3 Jan 2019 20:32:23 -0600
Subject: [PATCH 195/274] nnn: install shell completions

---
 pkgs/applications/misc/nnn/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/applications/misc/nnn/default.nix b/pkgs/applications/misc/nnn/default.nix
index 34a365ab67f1..9eb5382cde9f 100644
--- a/pkgs/applications/misc/nnn/default.nix
+++ b/pkgs/applications/misc/nnn/default.nix
@@ -21,6 +21,13 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "DESTDIR=${placeholder "out"}" "PREFIX=" ];
 
+  # shell completions
+  postInstall = ''
+    install -Dm555 scripts/auto-completion/bash/nnn-completion.bash $out/share/bash-completion/completions/nnn.bash
+    install -Dm555 scripts/auto-completion/zsh/_nnn -t $out/share/zsh/site-functions
+    install -Dm555 scripts/auto-completion/fish/nnn.fish -t $out/share/fish/vendor_completions.d
+  '';
+
   meta = {
     description = "Small ncurses-based file browser forked from noice";
     homepage = https://github.com/jarun/nnn;

From 1031d9b4cae8786c5e45ce774b8f3f6ef14d7d03 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 3 Jan 2019 10:17:32 -0600
Subject: [PATCH 196/274] recutils: 1.7 -> 1.8

---
 pkgs/tools/misc/recutils/default.nix | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/misc/recutils/default.nix b/pkgs/tools/misc/recutils/default.nix
index df53235d0efb..8d648e293c5a 100644
--- a/pkgs/tools/misc/recutils/default.nix
+++ b/pkgs/tools/misc/recutils/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, emacs, curl, check, bc }:
 
 stdenv.mkDerivation rec {
-  name = "recutils-1.7";
+  name = "recutils-1.8";
 
   src = fetchurl {
     url = "mirror://gnu/recutils/${name}.tar.gz";
-    sha256 = "0cdwa4094x3yx7vn98xykvnlp9rngvd58d19vs3vh5hrvggccg93";
+    sha256 = "14xiln4immfsw8isnvwvq0h23f6z0wilpgsc4qzabnrzb5lsx3nz";
   };
 
   hardeningDisable = [ "format" ];
@@ -15,11 +15,6 @@ stdenv.mkDerivation rec {
   checkInputs = [ check bc ];
   doCheck = true;
 
-  # one file fails to compile with emacs 26
-  postInstall = ''
-    ${emacs}/bin/emacs -Q -batch -f batch-byte-compile $out/share/emacs/site-lisp/*.el || true
-  '';
-
   meta = {
     description = "Tools and libraries to access human-editable, text-based databases";
 

From 6e515fea7ef4c05be72bc53247d8b582b02c3ef5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 3 Jan 2019 19:44:17 -0800
Subject: [PATCH 197/274] closurecompiler: 20181125 -> 20181210

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/closure-compiler/versions
---
 pkgs/development/compilers/closure/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix
index b3ef4853c853..42214ee22dc2 100644
--- a/pkgs/development/compilers/closure/default.nix
+++ b/pkgs/development/compilers/closure/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "closure-compiler-${version}";
-  version = "20181125";
+  version = "20181210";
 
   src = fetchurl {
     url = "https://dl.google.com/closure-compiler/compiler-${version}.tar.gz";
-    sha256 = "1vg7cyya0r2sjrbcwf4pshg7jzgvb9ynpa0b41zkl4x1y0a16bkc";
+    sha256 = "0c79ki4lacfwks5f2q7kzcg6v3a65zs5srm14k09gh5k1hvvnayd";
   };
 
   sourceRoot = ".";

From ed814714398e6c8d1f34614ec3810e8a284ce434 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 3 Jan 2019 18:12:52 -0800
Subject: [PATCH 198/274] brave: 0.57.18 -> 0.58.18

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/brave/versions
---
 pkgs/applications/networking/browsers/brave/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix
index ec5b34da0a60..38bde0bec2f5 100644
--- a/pkgs/applications/networking/browsers/brave/default.nix
+++ b/pkgs/applications/networking/browsers/brave/default.nix
@@ -76,11 +76,11 @@ let rpath = lib.makeLibraryPath [
 
 in stdenv.mkDerivation rec {
     pname = "brave";
-    version = "0.57.18";
+    version = "0.58.18";
 
     src = fetchurl {
         url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-        sha256 = "0p5j3kkkalnyi6brgd9vfv43is00g2b6p1y3hajjr2vbm9iwpzg7";
+        sha256 = "0xybcgsxjmd8bxi4x4midzw71s23j8icpspqf5sadskhldvshzr3";
     };
 
     dontConfigure = true;

From 0f6cf5fefe7a126c4b577991083b1c487ea0436d Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 4 Jan 2019 00:56:45 +0100
Subject: [PATCH 199/274] python{2,3}Packages.pytest-repeat: fix build

Test suite and build environment had several issues with Pytest >3.6
which can be fixed by applying the (yet unreleased) upstream patch from
https://github.com/pytest-dev/pytest-repeat/commit/f94b6940e3651b7593aca5a7a987eb56abe04cb1.patch
---
 .../python-modules/pytest-repeat/default.nix           | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/development/python-modules/pytest-repeat/default.nix b/pkgs/development/python-modules/pytest-repeat/default.nix
index 1b30611eb9d6..0669c22f9211 100644
--- a/pkgs/development/python-modules/pytest-repeat/default.nix
+++ b/pkgs/development/python-modules/pytest-repeat/default.nix
@@ -3,6 +3,7 @@
 , fetchPypi
 , setuptools_scm
 , pytest
+, fetchpatch
 }:
 
 buildPythonPackage rec {
@@ -14,6 +15,15 @@ buildPythonPackage rec {
     sha256 = "0axbrpqal3cqw9zq6dakdbg49pnf5gvyvq6yn93hp1ayc7fnhzk3";
   };
 
+  # fixes support for pytest >3.6. Should be droppable during the
+  # next bump.
+  patches = [
+    (fetchpatch {
+      url = https://github.com/pytest-dev/pytest-repeat/commit/f94b6940e3651b7593aca5a7a987eb56abe04cb1.patch;
+      sha256 = "00da1gmpq9pslcmm8pw93jcbp8j2zymzqdsm6jq3xinkvjpsbmny";
+    })
+  ];
+
   buildInputs = [ setuptools_scm pytest ];
 
   checkPhase = ''

From 570c887c48399a61becf8e368d0b29e9395cb5c4 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 3 Jan 2019 20:29:19 -0800
Subject: [PATCH 200/274] cantata: 2.3.2 -> 2.3.3

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/cantata/versions
---
 pkgs/applications/audio/cantata/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix
index e379072b7e76..64e99768dedb 100644
--- a/pkgs/applications/audio/cantata/default.nix
+++ b/pkgs/applications/audio/cantata/default.nix
@@ -28,7 +28,7 @@ assert withOnlineServices -> withTaglib;
 assert withReplaygain -> withTaglib;
 
 let
-  version = "2.3.2";
+  version = "2.3.3";
   pname = "cantata";
   fstat = x: fn: "-DENABLE_" + fn + "=" + (if x then "ON" else "OFF");
   fstats = x: map (fstat x);
@@ -42,7 +42,7 @@ in stdenv.mkDerivation rec {
     owner  = "CDrummond";
     repo   = "cantata";
     rev    = "v${version}";
-    sha256 = "11hjday5vj0wzkc8yb5wbs05jwa8mvgxswd5qvhpci0zkl975yzn";
+    sha256 = "1m651fmdbnb50glym75kzma0bllvqbmrb2afp1g9g5cxm1898c0f";
   };
 
   buildInputs = [ vlc qtbase qtmultimedia qtsvg ]

From 9e638234cf2c47247ae2dd7cde1ed1639d4adc15 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 3 Jan 2019 20:42:23 -0800
Subject: [PATCH 201/274] abcmidi: 2018.12.01 -> 2018.12.21

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/abcmidi/versions
---
 pkgs/tools/audio/abcmidi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix
index 03e468a9b0a8..ba4b843bcd4d 100644
--- a/pkgs/tools/audio/abcmidi/default.nix
+++ b/pkgs/tools/audio/abcmidi/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "abcMIDI-${version}";
-  version = "2018.12.01";
+  version = "2018.12.21";
 
   src = fetchzip {
     url = "https://ifdo.ca/~seymour/runabc/${name}.zip";
-    sha256 = "133kdyin2lwidlnd8ivjyymrrb0rr1028apj2biyp6l0l5yrqw78";
+    sha256 = "1y2dwznbp4m7m6ddmqap2n411pdj1c1dirfw8lhyz0vpncx5fzai";
   };
 
   # There is also a file called "makefile" which seems to be preferred by the standard build phase

From f985ffd06a158a5165a3496fa3b7202da5ef28b3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 3 Jan 2019 20:54:24 -0800
Subject: [PATCH 202/274] angelscript: 2.32.0 -> 2.33.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/angelscript/versions
---
 pkgs/development/interpreters/angelscript/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/angelscript/default.nix b/pkgs/development/interpreters/angelscript/default.nix
index 01348c753484..adbfbaf48a43 100644
--- a/pkgs/development/interpreters/angelscript/default.nix
+++ b/pkgs/development/interpreters/angelscript/default.nix
@@ -3,10 +3,10 @@ let
   s = # Generated upstream information
   rec {
     baseName="angelscript";
-    version = "2.32.0";
+    version = "2.33.0";
     name="${baseName}-${version}";
     url="http://www.angelcode.com/angelscript/sdk/files/angelscript_${version}.zip";
-    sha256 = "0675hza06v3grxyqfy70gzm57idmbbm7qvi6bg5vf8m6mpw757dl";
+    sha256 = "18qywbi1k53xgnlr9v6ycin669j5v5qspq7lli4jhf6l4c5hk49n";
   };
   buildInputs = [
     unzip

From 2a2294298fcc0aa87baf5c01d9d4649e1f46c731 Mon Sep 17 00:00:00 2001
From: Izorkin <izorkin@elven.pw>
Date: Fri, 4 Jan 2019 10:14:12 +0300
Subject: [PATCH 203/274] luaPackages.luadbi: 0.6 -> 0.7.1

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

diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index 749a7e156119..ec2ced52eb4c 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -380,18 +380,18 @@ let
 
   luadbi = buildLuaPackage rec {
     name = "luadbi-${version}";
-    version = "0.6";
+    version = "0.7.1";
 
     src = fetchFromGitHub {
       owner = "mwild1";
       repo = "luadbi";
       rev = "v${version}";
-      sha256 = "1cpl84pl75wqd9zph3w4srd5lxij359p8xmmf7xpdbxz67695vah";
+      sha256 = "01i8018zb7w2bhaqglm7cnvbiirgd95b9d07irgz3sci91p08cwp";
     };
 
     MYSQL_INC="-I${mysql.connector-c}/include/mysql";
 
-    buildInputs = [ mysql postgresql sqlite ];
+    buildInputs = [ mysql.client mysql.connector-c postgresql sqlite ];
 
     preConfigure = stdenv.lib.optionalString stdenv.isDarwin ''
       substituteInPlace Makefile \

From 37da2302a682a916880a478aae91850087f6027f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 4 Jan 2019 08:32:39 +0100
Subject: [PATCH 204/274] gzdoom: limit to x86_64

---
 pkgs/games/gzdoom/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix
index 2d1aa91dc3a3..deb16bc35385 100644
--- a/pkgs/games/gzdoom/default.nix
+++ b/pkgs/games/gzdoom/default.nix
@@ -43,8 +43,7 @@ stdenv.mkDerivation rec {
     homepage = https://github.com/coelckers/gzdoom;
     description = "A Doom source port based on ZDoom. It features an OpenGL renderer and lots of new features";
     license = licenses.gpl3;
-    platforms = platforms.linux;
+    platforms = ["x86_64-linux"];
     maintainers = with maintainers; [ lassulus ];
   };
 }
-

From 8ae21a85cc90640dbb3ab7ccdd0deb58a7aa2e33 Mon Sep 17 00:00:00 2001
From: Wisut Hantanong <wizzup@users.noreply.github.com>
Date: Fri, 4 Jan 2019 15:13:36 +0700
Subject: [PATCH 205/274] haskellPackage.greenclip: add missing dependency
 (xdmcp) (#53388)

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

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index f0d629ad5e44..62f2782e8f77 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -322,6 +322,9 @@ self: super: builtins.intersectAttrs super {
   # https://github.com/bos/pcap/issues/5
   pcap = addExtraLibrary super.pcap pkgs.libpcap;
 
+  # https://github.com/NixOS/nixpkgs/issues/53336
+  greenclip = addExtraLibrary super.greenclip pkgs.xorg.libXdmcp;
+
   # The cabal files for these libraries do not list the required system dependencies.
   miniball = overrideCabal super.miniball (drv: {
     librarySystemDepends = [ pkgs.miniball ];

From 4a09853516c44c3ef72b45b2b332519cdccb7f72 Mon Sep 17 00:00:00 2001
From: Albert Safin <xzfcpw@gmail.com>
Date: Fri, 4 Jan 2019 15:55:58 +0700
Subject: [PATCH 206/274] xpointerbarrier: 17.11 -> 18.06

---
 pkgs/tools/X11/xpointerbarrier/default.nix | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/X11/xpointerbarrier/default.nix b/pkgs/tools/X11/xpointerbarrier/default.nix
index 50d0ac4f2b9a..435f2b2e9801 100644
--- a/pkgs/tools/X11/xpointerbarrier/default.nix
+++ b/pkgs/tools/X11/xpointerbarrier/default.nix
@@ -1,13 +1,11 @@
-{ stdenv, xorg, fetchFromGitHub }:
+{ stdenv, xorg, fetchgit }:
 stdenv.mkDerivation rec {
   name = "xpointerbarrier-${version}";
-  version = "17.11";
-
-  src = fetchFromGitHub {
-    owner = "vain";
-    repo = "xpointerbarrier";
+  version = "18.06";
+  src = fetchgit {
+    url = "https://www.uninformativ.de/git/xpointerbarrier.git";
     rev = "v${version}";
-    sha256 = "0s6bd58xjyc2nqzjq6aglx6z64x9xavda3i6p8vrmxqmcpik54nm";
+    sha256 = "1k7i641x18qhjm0llsaqn2h2g9k31kgv6p8sildllmbvgxyrgvq7";
   };
 
   buildInputs = [ xorg.libX11 xorg.libXfixes xorg.libXrandr ];
@@ -15,7 +13,7 @@ stdenv.mkDerivation rec {
   makeFlags = "prefix=$(out)";
 
   meta = {
-    homepage = https://github.com/vain/xpointerbarrier;
+    homepage = https://uninformativ.de/git/xpointerbarrier;
     description = "Create X11 pointer barriers around your working area";
     license = stdenv.lib.licenses.mit;
     maintainers = [ stdenv.lib.maintainers.xzfc ];

From 2463cd0a53234be9b23b3f3f7f792a395b126e8c Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 3 Jan 2019 20:15:15 -0800
Subject: [PATCH 207/274] bdf2psf: 1.187 -> 1.188

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/bdf2psf/versions
---
 pkgs/tools/misc/bdf2psf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix
index ac6f8c97c7b6..1b179d328702 100644
--- a/pkgs/tools/misc/bdf2psf/default.nix
+++ b/pkgs/tools/misc/bdf2psf/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "bdf2psf-${version}";
-  version = "1.187";
+  version = "1.188";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb";
-    sha256 = "05r5jg7n4hbdxcy3kc7038h1r0fkipwld6kd0d49nbkmywl2k1a8";
+    sha256 = "1g9i50a3x9p7kbyjg7z8xgxcknqxkxvzb0gg2jl2zgwjsyvjy5wn";
   };
 
   buildInputs = [ dpkg ];

From 0e0e9de95a9fe426cf3e0d4958dd78307bf0b0a7 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 3 Jan 2019 22:34:03 -0800
Subject: [PATCH 208/274] blueman: 2.0.6 -> 2.0.7

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/blueman/versions
---
 pkgs/tools/bluetooth/blueman/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix
index fe180e8abc9c..b40255866940 100644
--- a/pkgs/tools/bluetooth/blueman/default.nix
+++ b/pkgs/tools/bluetooth/blueman/default.nix
@@ -9,11 +9,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "blueman-${version}";
-  version = "2.0.6";
+  version = "2.0.7";
 
   src = fetchurl {
     url = "https://github.com/blueman-project/blueman/releases/download/${version}/${name}.tar.xz";
-    sha256 = "0bc1lfsjkbrg9f1jnw6mx7bp04x76ljy9g0rgx7n80vaj0hpz3bj";
+    sha256 = "15q253081ahmb8k3yaqy99pc7ppbq3pxrx35bg4q9jmn6xv2kj63";
   };
 
   nativeBuildInputs = [

From aa366da6c013dcd9b53a573163e89a922fecabc3 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 3 Jan 2019 17:37:12 -0800
Subject: [PATCH 209/274] ckbcomp: 1.187 -> 1.188

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/ckbcomp/versions
---
 pkgs/tools/X11/ckbcomp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/X11/ckbcomp/default.nix b/pkgs/tools/X11/ckbcomp/default.nix
index c8ade8db55fa..73ec20a57a3a 100644
--- a/pkgs/tools/X11/ckbcomp/default.nix
+++ b/pkgs/tools/X11/ckbcomp/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "ckbcomp-${version}";
-  version = "1.187";
+  version = "1.188";
 
   src = fetchFromGitLab {
     domain = "salsa.debian.org";
     owner = "installer-team";
     repo = "console-setup";
     rev = version;
-    sha256 = "1dcsgdai5lm1r0bhlcfwh01s9k11iwgnd0111gpgbv568rs5isqh";
+    sha256 = "1741mg2wc5wa63clkijmv04zd6jxhc7c6aq7mkhqw1r4dhfhih19";
   };
 
   buildInputs = [ perl ];

From ee0396c6b12578350f2289867211928eae681242 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 3 Jan 2019 17:07:30 -0800
Subject: [PATCH 210/274] ddcutil: 0.9.3 -> 0.9.4

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/ddcutil/versions
---
 pkgs/tools/misc/ddcutil/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/ddcutil/default.nix b/pkgs/tools/misc/ddcutil/default.nix
index ca006339d023..25028a93e277 100644
--- a/pkgs/tools/misc/ddcutil/default.nix
+++ b/pkgs/tools/misc/ddcutil/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "ddcutil-${version}";
-  version = "0.9.3";
+  version = "0.9.4";
 
   src = fetchFromGitHub {
     owner  = "rockowitz";
     repo   = "ddcutil";
     rev    = "v${version}";
-    sha256 = "02jl0mr5m3h839j3drrkdycnvlhji4xdmnjcqfglds0ir1q1yapi";
+    sha256 = "0ywrjp6r1z6jlwq1ycrr9qn3drjzbxvdf0v5f92rh68fwb06gn0y";
   };
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];

From 37ef1274ba0c02e93831875e4866e58c860ff4e5 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 3 Jan 2019 17:27:37 -0800
Subject: [PATCH 211/274] ansible: 2.7.4 -> 2.7.5

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python2.7-ansible/versions
---
 pkgs/tools/admin/ansible/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/admin/ansible/default.nix b/pkgs/tools/admin/ansible/default.nix
index 73d1929c703d..e3916b0f8a9e 100644
--- a/pkgs/tools/admin/ansible/default.nix
+++ b/pkgs/tools/admin/ansible/default.nix
@@ -63,8 +63,8 @@ in rec {
   };
 
   ansible_2_7 = generic {
-    version = "2.7.4";
-    sha256  = "0p1n6yyc632522fl2r247p0jg4mncc7z4hqngzbh1zxq3dcb12s9";
+    version = "2.7.5";
+    sha256  = "1fsif2jmkrrgiawsd8r6sxrqvh01fvrmdhas0p540a6i9fby3yda";
   };
 
   ansible2 = ansible_2_7;

From eab0c3258ff90ee1023b2488e2237b315d8d486b Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 3 Jan 2019 16:06:39 -0800
Subject: [PATCH 212/274] debootstrap: 1.0.111 -> 1.0.112

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/debootstrap/versions
---
 pkgs/tools/misc/debootstrap/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/debootstrap/default.nix b/pkgs/tools/misc/debootstrap/default.nix
index 222a29a0d9cb..df5a9e80f38a 100644
--- a/pkgs/tools/misc/debootstrap/default.nix
+++ b/pkgs/tools/misc/debootstrap/default.nix
@@ -15,13 +15,13 @@ let binPath = stdenv.lib.makeBinPath [
   ];
 in stdenv.mkDerivation rec {
   name = "debootstrap-${version}";
-  version = "1.0.111";
+  version = "1.0.112";
 
   src = fetchurl {
     # git clone git://git.debian.org/d-i/debootstrap.git
     # I'd like to use the source. However it's lacking the lanny script ? (still true?)
     url = "mirror://debian/pool/main/d/debootstrap/debootstrap_${version}.tar.gz";
-    sha256 = "1m2678y2cswd2z7pksknv1cwlv3ww1fmhz4kkhvxlhpmyyc4260w";
+    sha256 = "1p7skj8821dhwgjq3f2v1fplzv5y6xfma6bh9ai6f8ry6vz0hvha";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 0c99dac49735d3a7c20d231c4d7b1dc057bc81df Mon Sep 17 00:00:00 2001
From: Vincent Ambo <mail@tazj.in>
Date: Sun, 30 Dec 2018 01:10:19 +0100
Subject: [PATCH 213/274] doc: Add automatic generation of library function
 documentation

Modifies the build process of the manual to invoke nixdoc
automatically to generate XML files with function documentation.

Currently documentation is present for five of the files in `lib/`.

To add another file to the generated docs, both
`doc/functions/library.xml` and `doc/lib-function-docs.nix` must be
updated.
---
 doc/default.nix           |  5 +++--
 doc/functions/library.xml |  9 +++++++++
 doc/lib-function-docs.nix | 26 ++++++++++++++++++++++++++
 3 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 doc/lib-function-docs.nix

diff --git a/doc/default.nix b/doc/default.nix
index 98b4b92be524..7ceaec28af38 100644
--- a/doc/default.nix
+++ b/doc/default.nix
@@ -2,8 +2,8 @@
 let
   lib = pkgs.lib;
   locationsXml = import ./lib-function-locations.nix { inherit pkgs nixpkgs; };
-in
-pkgs.stdenv.mkDerivation {
+  functionDocs = import ./lib-function-docs.nix { inherit locationsXml pkgs; };
+in pkgs.stdenv.mkDerivation {
   name = "nixpkgs-manual";
 
   buildInputs = with pkgs; [ pandoc libxml2 libxslt zip jing  xmlformat ];
@@ -32,6 +32,7 @@ pkgs.stdenv.mkDerivation {
   postPatch = ''
     rm -rf ./functions/library/locations.xml
     ln -s ${locationsXml} ./functions/library/locations.xml
+    ln -s ${functionDocs} ./functions/library/generated
     echo ${lib.version} > .version
   '';
 
diff --git a/doc/functions/library.xml b/doc/functions/library.xml
index 901423c52a18..b01de3c6e413 100644
--- a/doc/functions/library.xml
+++ b/doc/functions/library.xml
@@ -12,4 +12,13 @@
  <xi:include href="./library/asserts.xml" />
 
  <xi:include href="./library/attrsets.xml" />
+
+ <!-- These docs are generated via nixdoc. To add another generated
+      library function file to this list, the file
+      `lib-function-docs.nix` must also be updated. -->
+ <xi:include href="./library/generated/strings.xml" />
+ <xi:include href="./library/generated/trivial.xml" />
+ <xi:include href="./library/generated/lists.xml" />
+ <xi:include href="./library/generated/debug.xml" />
+ <xi:include href="./library/generated/options.xml" />
 </section>
diff --git a/doc/lib-function-docs.nix b/doc/lib-function-docs.nix
new file mode 100644
index 000000000000..421f848d25ab
--- /dev/null
+++ b/doc/lib-function-docs.nix
@@ -0,0 +1,26 @@
+# Generates the documentation for library functons via nixdoc. To add
+# another library function file to this list, the include list in the
+# file `doc/functions/library.xml` must also be updated.
+
+{ pkgs ? import ./.. {}, locationsXml }:
+
+with pkgs; stdenv.mkDerivation {
+  name = "nixpkgs-lib-docs";
+  src = ./../lib;
+
+  buildInputs = [ nixdoc ];
+  installPhase = ''
+    function docgen {
+      nixdoc -c "$1" -d "$2" -f "../lib/$1.nix"  > "$out/$1.xml"
+    }
+
+    mkdir -p $out
+    ln -s ${locationsXml} $out/locations.xml
+
+    docgen strings 'String manipulation functions'
+    docgen trivial 'Miscellaneous functions'
+    docgen lists 'List manipulation functions'
+    docgen debug 'Debugging functions'
+    docgen options 'NixOS / nixpkgs option handling'
+  '';
+}

From 82e204382f79a363dd7c858cd5a4f50ade08f5b1 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 4 Jan 2019 11:31:44 +0100
Subject: [PATCH 214/274] androidStudioPackages.{dev,canary}: 3.4.0.8 ->
 3.4.0.9

---
 pkgs/applications/editors/android-studio/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index 96e39cdc6293..cab5b1f31e41 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -18,9 +18,9 @@ let
     sha256Hash = "1rql4kxjic4qjcd8zssw2mmi55cxpzd0wp5g0kzwk5wybsfdcqhy";
   };
   latestVersion = { # canary & dev
-    version = "3.4.0.8"; # "Android Studio 3.4 Canary 9"
-    build = "183.5186062";
-    sha256Hash = "04i7ys0qzj3039h41q4na6737gl55wpp6hiwfas2h6zwvj25a9z9";
+    version = "3.4.0.9"; # "Android Studio 3.4 Canary 10"
+    build = "183.5202479";
+    sha256Hash = "067mkf8n7bwv0f900d6d2hwxdhcgnp6dxqf6v81y1hf285ybymld";
   };
 in rec {
   # Old alias

From e4d4080db39749c9dde80c54b9ef486a8acf78a9 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 1 Jan 2019 20:14:16 +0100
Subject: [PATCH 215/274] LTS Haskell 13.1

---
 .../configuration-hackage2nix.yaml            | 67 ++++++++++---------
 1 file changed, 37 insertions(+), 30 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 66cc0808f653..e01c3355c11d 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -46,7 +46,7 @@ default-package-overrides:
   # Newer versions don't work in LTS-12.x
   - alsa-mixer < 0.3
   - cassava-megaparsec < 2
-  # LTS Haskell 13.0
+  # LTS Haskell 13.1
   - abstract-deque ==0.3
   - abstract-deque-tests ==0.3
   - abstract-par ==0.3.3
@@ -292,7 +292,7 @@ default-package-overrides:
   - bitcoin-tx ==0.13.1
   - bitcoin-types ==0.9.2
   - bits ==0.5.1
-  - bitset-word8 ==0.1.1.0
+  - bitset-word8 ==0.1.1.1
   - bits-extra ==0.0.1.3
   - bit-stream ==0.1.0.2
   - bitx-bitcoin ==0.12.0.0
@@ -364,7 +364,7 @@ default-package-overrides:
   - cassava-megaparsec ==2.0.0
   - cassava-records ==0.1.0.4
   - cast ==0.1.0.2
-  - category ==0.2.0.1
+  - category ==0.2.2.0
   - cayley-client ==0.4.8
   - cborg ==0.2.1.0
   - cborg-json ==0.2.1.0
@@ -396,7 +396,7 @@ default-package-overrides:
   - cipher-des ==0.0.6
   - cipher-rc4 ==0.1.4
   - circle-packing ==0.1.0.6
-  - cisco-spark-api ==0.1.0.3
+  - cisco-spark-api ==0.1.0.4
   - classyplate ==0.3.2.0
   - classy-prelude ==1.5.0
   - classy-prelude-conduit ==1.5.0
@@ -459,7 +459,7 @@ default-package-overrides:
   - connection ==0.2.8
   - connection-pool ==0.2.2
   - console-style ==0.0.2.1
-  - constraint ==0.1.1.1
+  - constraint ==0.1.3.0
   - constraints ==0.10.1
   - contravariant ==1.5
   - contravariant-extras ==0.3.4
@@ -578,9 +578,9 @@ default-package-overrides:
   - derulo ==1.0.5
   - detour-via-sci ==1.0.0
   - dhall ==1.19.1
-  - dhall-bash ==1.0.17
-  - dhall-json ==1.2.5
-  - dhall-text ==1.0.14
+  - dhall-bash ==1.0.18
+  - dhall-json ==1.2.6
+  - dhall-text ==1.0.15
   - diagrams ==1.4
   - diagrams-contrib ==1.4.3
   - diagrams-core ==1.4.1.1
@@ -644,6 +644,7 @@ default-package-overrides:
   - elerea ==2.9.0
   - elf ==0.29
   - eliminators ==0.5
+  - elm2nix ==0.1.0
   - elm-core-sources ==1.0.0
   - elm-export ==0.6.0.1
   - emacs-module ==0.1.1
@@ -692,15 +693,17 @@ default-package-overrides:
   - fail ==4.9.0.0
   - farmhash ==0.1.0.5
   - fast-digits ==0.2.1.0
-  - fast-logger ==2.4.12
+  - fast-logger ==2.4.13
   - fast-math ==1.0.2
   - fb ==1.2.1
   - fclabels ==2.0.3.3
   - feature-flags ==0.1.0.1
+  - fedora-dists ==1.0.0.2
   - fedora-haskell-tools ==0.6
   - feed ==1.0.1.0
   - FenwickTree ==0.1.2.1
   - fft ==0.1.8.6
+  - fgl ==5.7.0.1
   - filecache ==0.4.1
   - file-embed ==0.0.11
   - file-embed-lzma ==0
@@ -914,6 +917,7 @@ default-package-overrides:
   - heap ==1.0.4
   - heaps ==0.3.6
   - hebrew-time ==0.1.1
+  - hedgehog ==0.6.1
   - hedgehog-corpus ==0.1.0
   - hedis ==0.10.10
   - here ==1.2.13
@@ -969,8 +973,8 @@ default-package-overrides:
   - hsdns ==1.7.1
   - hsebaysdk ==0.4.0.0
   - hsemail ==2
-  - hset ==2.2.0
   - HSet ==0.0.1
+  - hset ==2.2.0
   - hsexif ==0.6.1.6
   - hs-functors ==0.1.3.0
   - hs-GeoIP ==0.3
@@ -1000,8 +1004,8 @@ default-package-overrides:
   - hspec-need-env ==0.1.0.2
   - hspec-pg-transact ==0.1.0.2
   - hspec-smallcheck ==0.5.2
-  - hspec-wai ==0.9.0
-  - hspec-wai-json ==0.9.0
+  - hspec-wai ==0.9.2
+  - hspec-wai-json ==0.9.2
   - hs-php-session ==0.0.9.3
   - hstatsd ==0.1
   - HStringTemplate ==0.8.7
@@ -1030,7 +1034,7 @@ default-package-overrides:
   - http-reverse-proxy ==0.6.0
   - http-streams ==0.8.6.1
   - http-types ==0.12.2
-  - human-readable-duration ==0.2.0.3
+  - human-readable-duration ==0.2.1.2
   - HUnit ==1.6.0.0
   - HUnit-approx ==1.1.1.1
   - hunit-dejafu ==1.2.0.6
@@ -1045,16 +1049,17 @@ default-package-overrides:
   - hw-eliasfano ==0.1.0.1
   - hw-excess ==0.2.0.2
   - hw-fingertree-strict ==0.1.1.1
+  - hw-hspec-hedgehog ==0.1.0.4
   - hw-int ==0.0.0.3
   - hw-ip ==2.0.0.0
   - hw-json ==0.9.0.1
-  - hw-mquery ==0.1.0.1
+  - hw-mquery ==0.1.0.3
   - hw-packed-vector ==0.0.0.1
   - hw-parser ==0.1.0.0
   - hw-prim ==0.6.2.22
   - hw-rankselect ==0.12.0.4
   - hw-rankselect-base ==0.3.2.1
-  - hw-streams ==0.0.0.8
+  - hw-streams ==0.0.0.9
   - hw-string-parse ==0.0.0.4
   - hw-succinct ==0.1.0.1
   - hxt ==9.3.1.16
@@ -1257,7 +1262,7 @@ default-package-overrides:
   - markdown ==0.1.17.4
   - markdown-unlit ==0.5.0
   - markov-chain ==0.0.3.4
-  - massiv ==0.2.5.0
+  - massiv ==0.2.6.0
   - massiv-io ==0.1.4.0
   - mathexpr ==0.3.0.0
   - math-functions ==0.3.1.0
@@ -1281,6 +1286,7 @@ default-package-overrides:
   - mersenne-random-pure64 ==0.2.2.0
   - metrics ==0.4.1.1
   - mfsolve ==0.3.2.0
+  - microbench ==0.1
   - microformats2-parser ==1.0.1.9
   - microlens ==0.4.10
   - microlens-aeson ==2.3.0
@@ -1296,7 +1302,7 @@ default-package-overrides:
   - mighty-metropolis ==1.2.0
   - mime-mail ==0.4.14
   - mime-mail-ses ==0.4.1
-  - mime-types ==0.1.0.8
+  - mime-types ==0.1.0.9
   - minimorph ==0.2.1.0
   - minio-hs ==1.2.0
   - miniutter ==0.5.0.0
@@ -1456,7 +1462,7 @@ default-package-overrides:
   - options ==1.2.1.1
   - optparse-applicative ==0.14.3.0
   - optparse-generic ==1.3.0
-  - optparse-simple ==0.1.0
+  - optparse-simple ==0.1.1
   - optparse-text ==0.1.1.0
   - overhang ==1.0.0
   - packcheck ==0.4.1
@@ -1507,9 +1513,9 @@ default-package-overrides:
   - persistent ==2.9.0
   - persistent-iproute ==0.2.3
   - persistent-mysql ==2.9.0
-  - persistent-mysql-haskell ==0.5.0
+  - persistent-mysql-haskell ==0.5.1
   - persistent-postgresql ==2.9.0
-  - persistent-sqlite ==2.9.1
+  - persistent-sqlite ==2.9.2
   - persistent-template ==2.5.4
   - pgp-wordlist ==0.1.0.2
   - pg-transact ==0.1.0.1
@@ -1569,7 +1575,7 @@ default-package-overrides:
   - prettyprinter-compat-annotated-wl-pprint ==1
   - prettyprinter-compat-ansi-wl-pprint ==1.0.1
   - prettyprinter-compat-wl-pprint ==1.0.0.1
-  - pretty-show ==1.9.4
+  - pretty-show ==1.9.5
   - pretty-simple ==2.2.0.1
   - pretty-sop ==0.2.0.2
   - pretty-types ==0.2.3.1
@@ -1701,7 +1707,7 @@ default-package-overrides:
   - rev-state ==0.1.2
   - rfc1751 ==0.1.2
   - rfc5051 ==0.1.0.4
-  - rio ==0.1.6.0
+  - rio ==0.1.8.0
   - rio-orphans ==0.1.1.0
   - rng-utils ==0.3.0
   - roc-id ==0.1.0.0
@@ -1711,12 +1717,13 @@ default-package-overrides:
   - rosezipper ==0.2
   - rot13 ==0.2.0.1
   - rounded ==0.1.0.1
+  - rpmbuild-order ==0.2.1
   - RSA ==2.3.0
   - runmemo ==1.0.0.1
   - rvar ==0.2.0.3
   - s3-signer ==0.5.0.0
   - safe ==0.3.17
-  - safecopy ==0.9.4.2
+  - safecopy ==0.9.4.3
   - safe-exceptions ==0.1.7.0
   - safe-exceptions-checked ==0.1.0
   - safe-foldable ==0.1.0.0
@@ -1793,7 +1800,7 @@ default-package-overrides:
   - servant-tracing ==0.1.0.2
   - servant-websockets ==1.1.0
   - servant-yaml ==0.1.0.1
-  - serverless-haskell ==0.8.4
+  - serverless-haskell ==0.8.5
   - serversession ==1.0.1
   - serversession-frontend-wai ==1.0
   - servius ==1.2.3.0
@@ -1830,7 +1837,7 @@ default-package-overrides:
   - sized-grid ==0.1.1.6
   - skein ==1.0.9.4
   - skews ==0.1.0.1
-  - skip-var ==0.1.0.0
+  - skip-var ==0.1.1.0
   - skylighting ==0.7.5
   - skylighting-core ==0.7.5
   - slack-web ==0.2.0.9
@@ -1972,7 +1979,7 @@ default-package-overrides:
   - temporary-rc ==1.2.0.3
   - temporary-resourcet ==0.1.0.1
   - tensorflow-test ==0.1.0.0
-  - tensors ==0.1.0
+  - tensors ==0.1.1
   - termbox ==0.1.0
   - terminal-size ==0.3.2.1
   - test-framework ==0.8.2.0
@@ -2011,7 +2018,7 @@ default-package-overrides:
   - th-lift-instances ==0.1.11
   - th-orphans ==0.13.6
   - th-printf ==0.6.0
-  - thread-hierarchy ==0.3.0.0
+  - thread-hierarchy ==0.3.0.1
   - thread-local-storage ==0.2
   - threads ==0.5.1.6
   - threepenny-gui ==0.8.3.0
@@ -2108,8 +2115,8 @@ default-package-overrides:
   - universum ==1.5.0
   - unix-bytestring ==0.3.7.3
   - unix-compat ==0.5.1
-  - unix-time ==0.4.3
-  - unliftio ==0.2.9.0
+  - unix-time ==0.4.4
+  - unliftio ==0.2.10
   - unliftio-core ==0.1.2.0
   - unlit ==0.4.0.0
   - unordered-containers ==0.2.9.0
@@ -2174,7 +2181,7 @@ default-package-overrides:
   - wai-eventsource ==3.0.0
   - wai-extra ==3.0.24.3
   - wai-handler-launch ==3.0.2.4
-  - wai-logger ==2.3.3
+  - wai-logger ==2.3.4
   - wai-middleware-auth ==0.1.2.1
   - wai-middleware-caching ==0.1.0.2
   - wai-middleware-crowd ==0.1.4.2

From e911f179f5731a234022bf20e92a6663e662973d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 3 Jan 2019 20:27:45 +0100
Subject: [PATCH 216/274] hackage2nix: update list of broken Hydra builds

---
 .../configuration-hackage2nix.yaml            | 1620 +++++++++--------
 1 file changed, 847 insertions(+), 773 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index e01c3355c11d..1a8113e61c17 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -2503,6 +2503,7 @@ dont-distribute-packages:
   bindings-yices:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   boolector:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ccelerate-cuda:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cplex-hs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   cublas:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   cufft:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   cusolver:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2570,13 +2571,13 @@ dont-distribute-packages:
   webkitgtk3-javascriptcore:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   webkitgtk3:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   websnap:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  XML:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
 
   # soft restrictions because of build errors
   3dmodels:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   4Blocks:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   a50:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   AAI:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  abacate:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   abcBridge:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   abcnotation:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   abeson:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2615,7 +2616,6 @@ dont-distribute-packages:
   acme-hq9plus:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   acme-http:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   acme-inator:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  acme-io:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   acme-kitchen-sink:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   acme-left-pad:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   acme-miscorder:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2633,6 +2633,7 @@ dont-distribute-packages:
   ActionKid:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   activehs-base:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   activehs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  activitypub:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   activitystreams-aeson:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   actor:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Adaptive-Blaisorblade:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2640,13 +2641,14 @@ dont-distribute-packages:
   adaptive-tuple:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   Adaptive:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   adb:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  adblock2privoxy:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   adhoc-network:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   adict:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   adobe-swatch-exchange:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   adp-multi-monadiccp:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   adp-multi:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ADPfusion:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ADPfusionForest:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ADPfusionSet:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   Advgame:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   AERN-Basics:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   AERN-Net:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2655,13 +2657,16 @@ dont-distribute-packages:
   AERN-Real:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   AERN-RnToRm-Plot:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   AERN-RnToRm:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  aern2-mp:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  aern2-real:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   aeson-applicative:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  aeson-bson:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  aeson-decode:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   aeson-diff-generic:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   aeson-extra:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   aeson-flowtyped:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   aeson-injector:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   aeson-native:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  aeson-options:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   aeson-prefix:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   aeson-schema:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   aeson-smart:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2670,24 +2675,26 @@ dont-distribute-packages:
   aeson-tiled:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   aeson-typescript:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   aeson-value-parser:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AesonBson:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   affection:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   affine-invariant-ensemble-mcmc:               [ i686-linux, x86_64-linux, x86_64-darwin ]
   afv:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   ag-pictgen:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Agata:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Agda-executable:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   agda-server:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   agda-snippets-hakyll:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   agda-snippets:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   agentx:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   AGI:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   AhoCorasick:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  aig:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   aip:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   air-th:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   airbrake:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   airship:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   airtable-api:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  aivika-distributed:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  aivika-experiment-cairo:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  aivika-experiment-chart:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   aivika-experiment-diagrams:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ajhc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   AlanDeniseEricLauren:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2697,7 +2704,7 @@ dont-distribute-packages:
   alfred:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   alga:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   algebra-sql:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  algebraic-graphs:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  algebra:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   algebraic-prelude:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   algebraic:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   algo-s:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2706,11 +2713,9 @@ dont-distribute-packages:
   AlgorithmW:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   align-text:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   AlignmentAlgorithms:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Allure:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   alms:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   alpha:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   alphachar:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  alpino-tools:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   alsa-gui:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   alsa-midi:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   alsa-pcm-tests:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2719,7 +2724,6 @@ dont-distribute-packages:
   altcomposition:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   alternative-extra:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   alternative-io:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  altfloat:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   alto:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   alure:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   amazon-emailer-client-snap:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2730,7 +2734,6 @@ dont-distribute-packages:
   AMI:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   ampersand:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   amqp-conduit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amqp-worker:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   analyze-client:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   analyze:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   anansi-pandoc:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2752,13 +2755,14 @@ dont-distribute-packages:
   Annotations:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   anonymous-sums-tests:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   anonymous-sums:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ansi-terminal-game:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   ansigraph:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   antagonist:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   antfarm:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   anticiv:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   antigate:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   antimirov:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  antiope-contract:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  antiope-contract:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   antiope-core:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   antiope-dynamodb:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   antiope-messages:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2766,6 +2770,7 @@ dont-distribute-packages:
   antiope-sns:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   antiope-sqs:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   antisplice:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  antlr-haskell:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   antlrc:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   anydbm:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   aosd:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2799,11 +2804,15 @@ dont-distribute-packages:
   applicative-parsec:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   applicative-quoters:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   applicative-splice:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  approx-rand-test:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   ApproxFun-hs:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   arb-fft:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   arbb-vm:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  arbor-postgres:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  arbor-datadog:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  arbor-lru-cache:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  arbor-monad-counter:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  arbor-monad-metric-datadog:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  arbor-monad-metric:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  arbor-postgres:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   arbtt:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   archiver:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   archlinux-web:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2812,38 +2821,38 @@ dont-distribute-packages:
   arena:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   arff:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   arghwxhaskell:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  argon2:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   argon:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  argon2:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   argparser:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   arguedit:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ariadne:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   arion:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   arith-encode:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  arithmoi:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   armada:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   armor:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   arpa:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   arpack:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   array-forth:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  arraylist:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  array-primops:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ArrayRef:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   arrow-improve:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  arrow-list:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   arrowapply-utils:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   arrowp-qq:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   arrowp:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ArrowVHDL:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   artery:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  artifact:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ascii-flatten:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ascii-string:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   ascii-table:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   ascii-vector-avc:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   ascii85-conduit:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ascii:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  asciidiagram:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   asic:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   asif:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   asil:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  asn1-codec:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   asn:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  asn1-codec:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   AspectAG:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   assert:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   assertions:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2856,11 +2865,15 @@ dont-distribute-packages:
   async-combinators:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   async-dejafu:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   async-manager:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  async-pool:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  async-timer:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   asynchronous-exceptions:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   aterm-utils:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   aterm:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   atlassian-connect-core:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   atmos-dimensional-tf:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  atmos-dimensional:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  atmos:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   atndapi:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   atom-conduit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   atom-msp430:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2869,14 +2882,11 @@ dont-distribute-packages:
   atomic-primops-vector:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   atomo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   ats-format:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ats-pkg:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ats-setup:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ats-storable:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   attic-schedule:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  atto-lisp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   AttoBencode:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   AttoJson:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  attoparsec-csv:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   attoparsec-data:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   attoparsec-enumerator:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   attoparsec-ip:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2903,7 +2913,6 @@ dont-distribute-packages:
   autom:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   autonix-deps-kf5:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   autonix-deps:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  avahi:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   avatar-generator:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   avers-api-docs:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   avers-api:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2919,7 +2928,6 @@ dont-distribute-packages:
   aws-configuration-tools:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   aws-dynamodb-conduit:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   aws-dynamodb-streams:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  aws-easy:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   aws-ec2-knownhosts:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   aws-ec2:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   aws-elastic-transcoder:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2937,14 +2945,12 @@ dont-distribute-packages:
   aws-sign4:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   aws-simple:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   aws-sns:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  axel:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   axiom:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   azubi:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   azure-service-api:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   azure-servicebus:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   azurify:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  b-tree:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  b9:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  b9:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   babylon:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   backdropper:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   backtracking-exceptions:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2967,19 +2973,17 @@ dont-distribute-packages:
   barchart:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   barcodes-code128:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   barecheck:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  barley:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Barracuda:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   barrie:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   barrier-monad:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   barrier:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  base-compat-migrate:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  base-compat-migrate:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   base-feature-macros:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   base-generics:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   base-io-access:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  base-noprelude:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  base64-bytestring-type:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   base64-conduit:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   baserock-schema:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  basic-sop:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   BASIC:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   baskell:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   batch:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2993,22 +2997,23 @@ dont-distribute-packages:
   BCMtools:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   bdcs-api:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   bdcs:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  beam-core:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  beam-migrate:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  beam-newtype-field:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  beam-postgres:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  beam-sqlite:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   beam-th:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   beam:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   beamable:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bearriver:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   beautifHOL:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bed-and-breakfast:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   beeminder-api:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   Befunge93:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   bein:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   belka:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   bench-graph:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bench-show:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bench-show:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   BenchmarkHistory:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  benchpress:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bencodex:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bencoding:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bencodex:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   berkeleydb:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   BerkeleyDBXML:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   BerlekampAlgorithm:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3016,12 +3021,16 @@ dont-distribute-packages:
   besout:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   bet:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   betacode:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  betris:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   bff:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bgmax:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   bgzf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bhoogle:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   bibdb:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   bidirectionalization-combined:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   bidispec-extras:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   bidispec:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bifunctor:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   BiGUL:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   billboard-parser:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   billeksah-forms:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3030,13 +3039,15 @@ dont-distribute-packages:
   billeksah-services:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   binary-communicator:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   binary-derive:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  binary-ext:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   binary-file:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   binary-indexed-tree:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  binary-parsers:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  binary-orphans:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   binary-protocol-zmq:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   binary-protocol:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   binary-streams:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   binary-strict:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  binary-tagged:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   binary-typed:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   bind-marshal:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   binding-gtk:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3045,7 +3056,6 @@ dont-distribute-packages:
   bindings-apr:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-bfd:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-cctools:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bindings-codec2:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-common:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-dc1394:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-eskit:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3058,21 +3068,21 @@ dont-distribute-packages:
   bindings-hamlib:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-hdf5:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-K8055:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bindings-levmar:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-libftdi:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-libg15:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-librrd:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-libstemmer:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-libv4l2:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bindings-lxc:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-monetdb-mapi:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-mpdecimal:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-portaudio:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-sc3:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-sipc:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-wlc:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bindynamic:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   binembed-example:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   binembed:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bins:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   bio-sequence:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   bio:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   bioace:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3080,19 +3090,22 @@ dont-distribute-packages:
   Biobase:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   BiobaseBlast:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   BiobaseDotP:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  BiobaseFasta:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  BiobaseEnsembl:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   BiobaseFR3D:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  BiobaseHTTP:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  BiobaseHTTPTools:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   BiobaseInfernal:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   BiobaseMAF:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  BiobaseNewick:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   BiobaseTrainingData:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   BiobaseTurner:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  BiobaseTypes:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   BiobaseVienna:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   BiobaseXNA:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   biocore:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   biofasta:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   biofastq:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   biohazard:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  BioHMM:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   bioinformatics-toolkit:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   biophd:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   biopsl:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3101,8 +3114,8 @@ dont-distribute-packages:
   bird:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   BirdPP:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   bisect-binary:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bishbosh:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   bit-array:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bit-stream:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   bitcoin-hs:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   bitcoin-rpc:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   bitly-cli:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3115,11 +3128,13 @@ dont-distribute-packages:
   BitStringRandomMonad:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   bittorrent:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   bitvec:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bizzlelude-js:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   bizzlelude:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   bkr:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   bla:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   blakesum-demo:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   blakesum:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  blank-canvas:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   blas-carray:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   blas-ffi:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   blas-hs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3145,6 +3160,8 @@ dont-distribute-packages:
   blogination:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   BlogLiterately-diagrams:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   BlogLiterately:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bloodhound-amazonka-auth:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bloodhound:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   bloomfilter-redis:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   blosum:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   blubber-server:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3152,12 +3169,10 @@ dont-distribute-packages:
   Blueprint:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   bluetile:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   bluetileutils:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  blunk-hask-tests:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  blunk-hask-tests:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   blunt:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   BNFC-meta:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  BNFC:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   bno055-haskell:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  board-games:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   bogre-banana:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   bolt:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   boltzmann-brain:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3167,22 +3182,23 @@ dont-distribute-packages:
   bookkeeper-permissions:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   bookkeeper:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Bookshelf:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  boolean-normal-forms:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   boolexpr:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   boombox:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   boomslang:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   borel:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   boring-window-switcher:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  boring:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   bot:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bound-extras:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bounded-array:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   bowntz:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   braid:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   brain-bleep:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  brainheck:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Bravo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   breakout:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   breve:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   brians-brain:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  brick-skylighting:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  brick-dropdownmenu:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   bricks-internal-test:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   bricks-internal:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   bricks-parsec:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3190,10 +3206,11 @@ dont-distribute-packages:
   bricks-syntax:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   bricks:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   brillig:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  brittany:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  broadcast-chan-conduit:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  broadcast-chan-pipes:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  broadcast-chan-tests:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  brittany:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  broadcast-chan-conduit:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  broadcast-chan-pipes:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  broadcast-chan-tests:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  broadcast-chan:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   broccoli:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   broker-haskell:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   bronyradiogermany-streaming:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3201,18 +3218,18 @@ dont-distribute-packages:
   bson-generic:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   bson-generics:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   btree-concurrent:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  btree:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   buchhaltung:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   buffer-builder-aeson:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   buffer:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  BufferedSocket:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   buffon:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bugsnag-haskell:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   bugzilla:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   build:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   buildable:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   buildbox-tools:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   buildwrapper:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   bullet:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bulletproofs:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   bumper:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   bunz:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   burnt-explorer:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3220,19 +3237,22 @@ dont-distribute-packages:
   bus-pirate:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   buster-gtk:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   buster-network:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Buster:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   buster:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bustle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Buster:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  butcher:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  butter:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   butterflies:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   bv-sized:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytable:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bytestring-arbitrary:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytestring-builder-varword:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytestring-class:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytestring-csv:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bytestring-encodings:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytestring-handle:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bytestring-plain:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytestring-read:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytestring-rematch:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bytestring-show:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytestring-time:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytestring-trie:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   bytestring-typenats:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3240,10 +3260,12 @@ dont-distribute-packages:
   bytestringreadp:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   c-dsl:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   c-io:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  c0check:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  c0parser:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   c2ats:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   c2hsc:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-audit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabal-cargs:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cabal-cargs:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-constraints:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-db:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-debian:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3260,11 +3282,9 @@ dont-distribute-packages:
   cabal-install-bundle:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-install-ghc72:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-install-ghc74:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabal-macosx:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-meta:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-mon:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-nirvana:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabal-plan:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-progdeps:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-query:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabal-setup:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3286,11 +3306,16 @@ dont-distribute-packages:
   cabalvchk:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabin:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   cabocha:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cachix-api:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   cachix:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cacophony:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   caffegraph:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cairo-appbase:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cairo-canvas:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cairo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cake:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   cake3:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   cakyrespa:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cal-layout:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   cal3d-examples:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   cal3d-opengl:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   cal3d:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3304,7 +3329,7 @@ dont-distribute-packages:
   campfire:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   canon:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   canonical-filepath:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  canonical-json:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  canonical-json:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   canteven-http:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   canteven-listen-http:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   canteven-log:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3313,13 +3338,17 @@ dont-distribute-packages:
   cao:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   cap:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   Capabilities:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  capability:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  capnp:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  capability:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  capataz:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  capnp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   capped-list:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   capri:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   car-pool:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  carbonara:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   carboncopy:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   carettah:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  CarneadesDSL:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  CarneadesIntoDung:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   carte:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   cartel:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Cartesian:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3333,23 +3362,14 @@ dont-distribute-packages:
   Cascade:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   cascading:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   cash:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  casr-logbook-html:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  casr-logbook-meta-html:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  casr-logbook-meta:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  casr-logbook-reports-html:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  casr-logbook-reports-meta-html:               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  casr-logbook-reports-meta:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  casr-logbook-reports:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  casr-logbook-types:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  casr-logbook:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   cassandra-cql:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cassandra-thrift:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   cassava-streams:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   Cassava:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   cassette:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   cassy:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   castle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   casui:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  catamorphism:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   Catana:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   catch-fd:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   categorical-algebra:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3357,9 +3377,8 @@ dont-distribute-packages:
   category-traced:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   category:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   catnplus:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cayene-lpp:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cautious-gen:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   cayley-client:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cblrepo:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   CBOR:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   CC-delcont-alt:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   CC-delcont-cxe:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3371,9 +3390,9 @@ dont-distribute-packages:
   ccnx:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   cctools-workqueue:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   cedict:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cef:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   cef3-raw:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   cef3-simple:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cef:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   ceilometer-common:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   cellrenderer-cairo:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   celtchar:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3383,6 +3402,7 @@ dont-distribute-packages:
   cereal-ieee754:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   cereal-io-streams:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   cereal-plus:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cereal-streams:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   certificate:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   cf:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   cfipu:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3390,29 +3410,34 @@ dont-distribute-packages:
   cfopu:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   cg:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   cgen:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cgi-undecidable:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   cgi-utils:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cgi:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   cgrep:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   chalkboard-viewer:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   chalkboard:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   charade:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Chart-cairo:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   Chart-diagrams:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Chart-gtk:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   chart-histogram:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   Chart-simple:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   chart-unit:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Chart:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   chatter:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   chatty-text:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  chatwork:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   cheapskate-terminal:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   check-pvp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Checked:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   checked:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Checked:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   checkmate:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   chell-hunit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   chell-quickcheck:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  chell:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   chevalier-common:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   chitauri:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Chitra:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  choose-exe:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  choose:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   chorale-geo:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   chorale:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   chp-mtl:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3421,16 +3446,14 @@ dont-distribute-packages:
   chp-transformers:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   chp:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   chr-core:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  chr-data:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   chr-lang:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   chr-parse:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ChristmasTree:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  chromatin:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   chronograph:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   chu2:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  chuchu:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   chunks:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   chunky:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  church:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   cielo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   cil:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   cinvoke:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3445,6 +3468,7 @@ dont-distribute-packages:
   clafer:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   claferIG:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   claferwiki:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  clang-compilation-database:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   clang-pure:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   clanki:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   clarifai:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3452,19 +3476,19 @@ dont-distribute-packages:
   clash-ghc:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   clash-lib:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   clash-multisignal:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  clash-prelude-quickcheck:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   clash-prelude:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   Clash-Royale-Hack-Cheats:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   clash-systemverilog:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   clash-verilog:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   clash-vhdl:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   clash:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  classify-frog:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  classify-frog:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ClassLaws:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   classy-miso:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   classy-parallel:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   classy-prelude-yesod:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   ClassyPrelude:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  clay:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   clckwrks-cli:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   clckwrks-dot-com:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   clckwrks-plugin-bugs:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3484,16 +3508,14 @@ dont-distribute-packages:
   cli-builder:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   CLI:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   cli:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  click-clack:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   clif:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   clifford:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  clifm:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   clingo:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   clippard:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   clipper:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   clippings:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  clist:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   clit:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cloben:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   clocked:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   clogparse:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   clone-all:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3501,11 +3523,10 @@ dont-distribute-packages:
   cloud-haskell:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   cloud-seeder:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   cloudfront-signer:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cloudi:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cloudyfs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   clr-inline:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   clua:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   cluss:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ClustalParser:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   clustering:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   clustertools:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   clutterhs:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3515,24 +3536,25 @@ dont-distribute-packages:
   CMCompare:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   cmd-item:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   cmdargs-browser:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cmdlib:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   cmdtheline:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   cmonad:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   cmph:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   CMQ:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   cmv:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   cnc-spec-compiler:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  co-log-sys:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  co-log:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  co-log-sys:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Coadjute:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   coalpit:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  code-builder:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   codec-beam:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   codec-libevent:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   codec-rpm:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   codecov-haskell:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   codemonitor:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   codepad:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  codeworld-api:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   codex:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cognimeta-utils:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   coin:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   coinbase-exchange:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   coincident-root-loci:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3540,8 +3562,8 @@ dont-distribute-packages:
   colchis:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   collada-output:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   collada-types:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  collapse-duplication:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   collapse-util:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  collection-json:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   collections-api:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   collections-base-instances:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   collections:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3560,7 +3582,6 @@ dont-distribute-packages:
   combinatorial-problems:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Combinatorrent:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   combobuffer:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  comfort-array:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   comic:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Command:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   commander:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3568,9 +3589,7 @@ dont-distribute-packages:
   commodities:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   commsec-keyexchange:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   commsec:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  commutative:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   comonad-extras:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  comonad-random:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   ComonadSheet:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   compact-map:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   compact-mutable:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3578,13 +3597,13 @@ dont-distribute-packages:
   compact-string-fix:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   compact-string:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   Compactable:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  compdata-automata:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  compactable:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   compdata-dags:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  compdata-param:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  compdata:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   competition:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   compilation:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   complexity:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  componentm-devel:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  componentm:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   compose-trans:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   composite-aeson-refined:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   composite-aeson:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3593,7 +3612,8 @@ dont-distribute-packages:
   composite-opaleye:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   composite-swagger:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   composition-tree:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  compression:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  compound-types:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  compressed:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   compstrat:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   comptrans:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   computational-algebra:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3603,12 +3623,14 @@ dont-distribute-packages:
   concraft:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   concrete-haskell-autogen:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   concrete-haskell:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  concrete-relaxng-parser:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   concrete-typerep:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  concurrency-benchmarks:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  concurrency-benchmarks:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   concurrent-buffer:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   Concurrent-Cache:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  concurrent-dns-cache:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  concurrent-machines:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   concurrent-state:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  concurrent-utilities:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   Concurrential:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ConcurrentUtils:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   Condor:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3627,16 +3649,15 @@ dont-distribute-packages:
   conduit-tokenize-attoparsec:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   conduit-zstd:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   conf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  confcrypt:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   conffmt:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   confide:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   config-parser:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   config-select:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  config-value-getopt:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   ConfigFileTH:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   Configger:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   configifier:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   Configurable:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  configuration:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   configurator-ng:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   congruence-relation:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   conjure:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3647,7 +3668,7 @@ dont-distribute-packages:
   consistent:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   console-program:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   const-math-ghc-plugin:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  constrained-categories:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  constrained-category:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   constrained-dynamic:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   constrained-monads:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   constraint-manip:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3655,25 +3676,26 @@ dont-distribute-packages:
   constraint:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ConstraintKinds:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   constraints-emerge:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  constraints-extras:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  constructible:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   constructive-algebra:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   consul-haskell:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   Consumer:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   consumers:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   containers-benchmark:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  containers-verified:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  containers-unicode-symbols:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ContArrow:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   content-store:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   context-free-grammar:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   context-stack:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ContextAlgebra:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  contiguous-checked:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  contiguous-fft:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  contiguous:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  contiguous-fft:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   continue:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   continuum-client:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   continuum:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Contract:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   control-event:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  control-iso:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   control-monad-attempt:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   control-monad-exception-monadsfd:             [ i686-linux, x86_64-linux, x86_64-darwin ]
   control-monad-exception-monadstf:             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3714,17 +3736,18 @@ dont-distribute-packages:
   couchdb-enumerator:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   CouchDB:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   countable-inflections:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  counter:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   courier:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   court:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   coverage:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   cparsing:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   CPBrainfuck:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   cpio-conduit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cplex-hs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   cplusplus-th:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   cprng-aes-effect:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   cpuperf:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cpython:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cpython:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cql-io-tinylog:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   cql-io:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   cqrs-core:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   cqrs-example:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3735,19 +3758,18 @@ dont-distribute-packages:
   cqrs-testkit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   cr:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   crack:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Craft3e:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   craft:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Craft3e:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   craftwerk-cairo:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   craftwerk-gtk:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   craftwerk:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   crawlchain:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   craze:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  crc16:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   crc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  crc16:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  crdt:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   creatur:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   credential-store:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  credentials-cli:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  credentials:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   crf-chain1-constrained:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   crf-chain1:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   crf-chain2-generic:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3760,11 +3782,13 @@ dont-distribute-packages:
   crjdt-haskell:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   crocodile:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   cron-compat:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cron:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   cruncher-types:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   crunghc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   crypto-cipher-benchmarks:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   crypto-classical:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   crypto-conduit:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  crypto-multihash:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   crypto-random-effect:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   crypto-simple:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   cryptocompare:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3774,7 +3798,9 @@ dont-distribute-packages:
   crystalfontz:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   cse-ghc-plugin:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   csg:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  csound-catalog:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   CSPM-cspm:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  CSPM-FiringRules:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   CSPM-Frontend:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   CSPM-Interpreter:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   CSPM-ToProlog:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3782,34 +3808,33 @@ dont-distribute-packages:
   cspretty:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   css:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   csv-enumerator:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  csv-nptools:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   ctemplate:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ctkl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   ctpl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   cube:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cubical:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cuboid:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cuboid:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   cudd:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  curl-runnings:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   currency-convert:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   curry-base:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   curry-frontend:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   CurryDB:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  curryrs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   cursedcsv:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cursor-gen:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cursor:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cursor-gen:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   curve25519:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   curves:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   custom-prelude:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   CV:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  cyclotomic:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   cypher:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   d-bus:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   d3js:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   DAG-Tournament:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   dag:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   Dangerous:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  danibot:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Dao:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   dao:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Dao:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   dapi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   darcs-benchmark:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   darcs-beta:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3818,6 +3843,7 @@ dont-distribute-packages:
   darcs-fastconvert:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   darcs-graph:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   darcs-monitor:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  darcs:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   darcs2dot:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   darcsden:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   DarcsHelpers:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3827,11 +3853,12 @@ dont-distribute-packages:
   darkplaces-rcon:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   darkplaces-text:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   dash-haskell:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  data-accessor-monadLib:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-accessor-monads-fd:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-accessor-monads-tf:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-base:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-basic:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  data-category:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  data-check:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-concurrent-queue:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-construction:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-cycle:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3844,12 +3871,14 @@ dont-distribute-packages:
   data-fin:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-flagset:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-forest:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  data-interval:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-ivar:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-kiln:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-layer:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-lens-fd:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-lens-ixset:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-lens-template:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  data-lens:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-map-multikey:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-named:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-nat:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3859,6 +3888,7 @@ dont-distribute-packages:
   data-pprint:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-quotientref:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-r-tree:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  data-reify-cse:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-repr:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-result:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-rev:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3867,10 +3897,12 @@ dont-distribute-packages:
   data-rtuple:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-size:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-spacepart:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  data-standards:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-store:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-stringmap:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-structure-inferrer:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-type:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  data-util:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   data-variant:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   database-study:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   datadog:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3883,8 +3915,10 @@ dont-distribute-packages:
   datetime-sb:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   datetime:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   dawdle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dawg-ord:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dawg:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   dbcleaner:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  DBFunctor:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  DBFunctor:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   dbjava:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   DBlimited:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   dbm:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3923,31 +3957,28 @@ dont-distribute-packages:
   debian:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   debug-me:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   debug-trace-var:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  debug:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  debug-tracy:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   decepticons:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   decimal-arithmetic:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   decimal-literals:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  DecisionTree:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  declarative:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   decoder-conduit:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   dedukti:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  DeepArrow:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   deepcontrol:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   deeplearning-hs:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   deepseq-bounded:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  deepseq-magic:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   deepseq-th:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   deepzoom:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   defargs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   DefendTheKing:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  deferred-folds:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  definitive-base:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  definitive-filesystem:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  definitive-graphics:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  definitive-parser:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  definitive-reactive:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  definitive-sound:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   deka-tests:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   deka:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   delaunay:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  delay:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   delicious:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  delimited-text:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   delimiter-separated:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   delta-h:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Delta-Lambda:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3955,12 +3986,15 @@ dont-distribute-packages:
   delude:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   demarcate:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   denominate:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dense-int-set:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dense-int-set:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   dependent-monoidal-map:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   dependent-state:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   dependent-sum-aeson-orphans:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   depends:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   dephd:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  deptrack-core:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  deptrack-devops:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  deptrack-dot:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   derangement:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   derivation-trees:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   derive-enumerable:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3969,20 +4003,22 @@ dont-distribute-packages:
   derive-monoid:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   derive-topdown:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   derive-trie:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  derive:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   derp-lib:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   descript-lang:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  DescriptiveKeys:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   deterministic-game-engine:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   detour-via-uom:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   deunicode:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   devil:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   dewdrop:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  df1:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dfinity-radix-tree:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   Dflow:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   dfsbuild:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   dgim:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   dgs:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   dhall-check:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dhall-lex:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dhall-nix:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   dhall-to-cabal:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   dhcp-lease-parser:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   di-df1:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3991,21 +4027,28 @@ dont-distribute-packages:
   dia-base:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   dia-functions:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams-boolean:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  diagrams-braille:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  diagrams-builder:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  diagrams-cairo:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  diagrams-canvas:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  diagrams-contrib:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  diagrams-graphviz:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  diagrams-gtk:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  diagrams-haddock:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams-hsqml:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  diagrams-html5:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams-pandoc:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams-pdf:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  diagrams-pgf:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  diagrams-postscript:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams-qrcode:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams-tikz:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   diagrams-wx:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  diagrams:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   dib:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   dice-entropy-conduit:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   dice2tex:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   dicom:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   dictionaries:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   dictparser:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  diet:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   diffcabal:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   difference-monoid:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   DifferenceLogic:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4015,10 +4058,12 @@ dont-distribute-packages:
   digestive-foundation-lucid:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   digestive-functors-heist:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   digestive-functors-hsp:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  digestive-functors-scotty:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   digitalocean-kzs:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   DigitalOcean:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   dimensional-codata:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   dimensional-tf:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dimensional:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   DimensionalHash:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   dingo-core:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   dingo-example:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4035,7 +4080,7 @@ dont-distribute-packages:
   dirfiles:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   discogs-haskell:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   discord-gateway:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  discord-haskell:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  discord-haskell:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   discord-hs:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   discord-rest:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   discord-types:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4046,31 +4091,40 @@ dont-distribute-packages:
   disjoint-set-stateful:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   disjoint-set:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   diskhash:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  disposable:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   dist-upload:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   Dist:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   distance:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   DisTract:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  distributed-closure:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   distributed-fork-aws-lambda:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  distributed-fork:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   distributed-process-async:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   distributed-process-azure:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   distributed-process-client-server:            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  distributed-process-ekg:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   distributed-process-execution:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   distributed-process-extras:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   distributed-process-fsm:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  distributed-process-lifted:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  distributed-process-monad-control:            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  distributed-process-p2p:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   distributed-process-platform:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   distributed-process-registry:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  distributed-process-simplelocalnet:           [ i686-linux, x86_64-linux, x86_64-darwin ]
   distributed-process-supervisor:               [ i686-linux, x86_64-linux, x86_64-darwin ]
   distributed-process-systest:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   distributed-process-task:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  distributed-process-tests:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   distributed-process-zookeeper:                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  distributed-process:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  distributed-static:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   distribution-plot:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   distribution:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   diversity:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   dixi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   djembe:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   djinn-th:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  djinn:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dmcc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   dmenu-pkill:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   dmenu-pmount:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   dmenu-search:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4083,15 +4137,20 @@ dont-distribute-packages:
   doc-review:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   doccheck:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   docidx:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  docker-build-cacher:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  docker-build-cacher:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  docker:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dockercook:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   doctest-discover-configurator:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   doctest-driver-gen:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  doctest-prop:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   DocTest:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  docusign-base:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  docusign-client:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  docusign-example:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  docusign-base-minimal:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  docusign-base:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  docusign-client:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  docusign-example:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   docvim:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   doi:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dom-lt:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   DOM:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   domain-auth:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   domplate:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4114,12 +4173,17 @@ dont-distribute-packages:
   dph-prim-seq:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   dpkg:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   DPM:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dpor:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dragen:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  drawille:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   drClickOn:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   dresdner-verkehrsbetriebe:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   DrHylo:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   DrIFT-cabalized:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   DrIFT:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   drifter-postgresql:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  drifter-sqlite:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  drifter:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   drmaa:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   dropbox-sdk:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   dropsolve:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4133,16 +4197,16 @@ dont-distribute-packages:
   dson:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   DSTM:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   dstring:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dtab:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   DTC:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   dtd-text:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dtd-types:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   dtd:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   dtw:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  dual-game:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   dual:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   dublincore-xml-conduit:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  duckling:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   dumb-cas:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dump-core:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Dung:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   duplo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Dust-crypto:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   Dust-tools-pcap:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4166,17 +4230,17 @@ dont-distribute-packages:
   DysFRP:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   dywapitchtrack:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   dzen-utils:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  eager-sockets:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   earclipper:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Earley:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ease:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   easy-api:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   easyjson:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   easyplot:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  easyrender:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  easytensor-vulkan:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  easytensor:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ebeats:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ebnf-bff:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ec2-unikernel:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   eccrypto:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ecdsa:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   ecma262:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ecu:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   eddie:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4186,25 +4250,24 @@ dont-distribute-packages:
   edge:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   edges:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   edit-lenses:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  edit:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   editable:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   editline:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   EditTimeReport:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   effect-handlers:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  effect-monad:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  effective-aspects-mzv:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  effective-aspects:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   effects-parser:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   effects:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   effin:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   egison-quote:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  egison-tutorial:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  egison-tutorial:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   ehaskell:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ehs:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   eibd-client-simple:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  eigen:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  eigen:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Eight-Ball-Pool-Hack-Cheats:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   either-list-functions:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   EitherT:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ekg-bosun:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ekg-elastic:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   ekg-elasticsearch:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   ekg-influxdb:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4215,34 +4278,33 @@ dont-distribute-packages:
   elevator:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   elision:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   elm-websocket:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  elocrypt:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   elsa:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   emacs-keys:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  email-header:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   email-postmark:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   email-validator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   email:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  emailaddress:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   emailparse:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   embeddock-example:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   embeddock:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   embroidery:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  emd:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   emgm:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   Emping:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   empty-monad:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   Empty:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  enchant:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   encoding-io:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   encoding:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   engine-io-growler:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   engine-io-snap:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   engine-io-wai:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   engine-io-yesod:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  engine-io:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   entangle:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   EntrezHTTP:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  entwine:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  entwine:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   EnumContainers:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   enumerate-function:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  enumerate:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   enumeration:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   enumerator-fd:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   enumerator-tf:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4251,8 +4313,9 @@ dont-distribute-packages:
   EnumMap:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   enummapmap:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   enummapset-th:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  enummapset:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   env-parser:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  envstatus:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  envstatus:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   epanet-haskell:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   epass:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   epic:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4261,6 +4324,8 @@ dont-distribute-packages:
   epubname:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Eq:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   EqualitySolver:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  equeue:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  equivalence:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   erd:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   erf-native:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   eros-client:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4271,6 +4336,7 @@ dont-distribute-packages:
   error-list:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   error-loc:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   error-message:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  errors-ext:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ersaconcat:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ersatz-toysat:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ersatz:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4280,6 +4346,7 @@ dont-distribute-packages:
   esotericbot:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   EsounD:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   espial:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  esqueleto:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ess:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   estimators:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   EstProgress:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4287,12 +4354,10 @@ dont-distribute-packages:
   Etage-Graph:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   Etage:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   EtaMOO:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  etcd:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Eternal10Seconds:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   eternal:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Eternal10Seconds:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   eternity-timestamped:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   eternity:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ether:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Etherbunny:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ethereum-analyzer-cli:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   ethereum-analyzer-webui:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4308,6 +4373,7 @@ dont-distribute-packages:
   eve:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   event-driven:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   event-monad:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  event:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   eventful-dynamodb:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   eventful-postgresql:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   eventloop:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4317,22 +4383,20 @@ dont-distribute-packages:
   every-bit-counts:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   ewe:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   exact-cover:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  exact-pi:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   exact-real-positional:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   exact-real:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  except-exceptions:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  exception-hierarchy:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   exception-monads-fd:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   exchangerates:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   execs:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   executor:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   exference:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  exhaustive:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   exherbo-cabal:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   exif:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  exinst-aeson:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  exinst-bytes:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  exinst-cereal:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   exinst-deepseq:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   exinst-hashable:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  exinst-serialise:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   exists:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   exitcode:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   expand:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4347,21 +4411,20 @@ dont-distribute-packages:
   explicit-sharing:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   explore:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   exposed-containers:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  expressions-z3:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  expressions:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  expressions-z3:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  expressions:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   extcore:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   extemp:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   extended-categories:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   extensible-data:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  extensible-effects-concurrent:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  extensible-effects-concurrent:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   Extra:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   extract-dependencies:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   extractelf:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ez-couch:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  f-ree-hack-cheats-free-v-bucks-generator:       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  f-ree-hack-cheats-free-v-bucks-generator:     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Facebook-Password-Hacker-Online-Latest-Version: [ i686-linux, x86_64-linux, x86_64-darwin ]
   faceted:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  factory:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Facts:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   factual-api:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   fadno-braids:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4372,16 +4435,16 @@ dont-distribute-packages:
   FailureT:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   fake-type:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   fake:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  faktory:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   falling-turnip:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   fallingblocks:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   family-tree:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   fast-arithmetic:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fast-builder:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   fast-combinatorics:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fast-downward:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   fast-nats:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   fasta:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   fastbayes:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fastcgi:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   fastedit:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   fastirc:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   fastly:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4400,6 +4463,7 @@ dont-distribute-packages:
   fay-simplejson:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   fay-text:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   fay-uri:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fay-websockets:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   fay:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   fb-persistent:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   fbmessenger-api:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4430,9 +4494,8 @@ dont-distribute-packages:
   festung:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Feval:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   ffeed:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fficxx:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ffmpeg-light:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ffmpeg-tutorials:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fftwRaw:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   fgl-extras-decompositions:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   fibon:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   ficketed:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4448,15 +4511,20 @@ dont-distribute-packages:
   FileManipCompat:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   fileneglect:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   filepath-io-access:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  FilePather:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  filepather:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Files:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   filesystem-conduit:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   filesystem-enumerator:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   filesystem-trees:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   FileSystem:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   fillit:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  filter-logger:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fin:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   final-pretty-printer:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   Finance-Quote-Yahoo:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   Finance-Treasury:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  find-clumpiness:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   find-conduit:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   find-source-files:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   fingertree-psqueue:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4466,7 +4534,6 @@ dont-distribute-packages:
   first-and-last:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   firstify:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   FirstOrderTheory:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fishfood:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   fit:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   fitsio:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   fix-parser-simple:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4476,6 +4543,9 @@ dont-distribute-packages:
   fixed-point:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   fixed-precision:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   fixed-storable-array:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fixed-vector-binary:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fixed-vector-cborg:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fixed-vector-cereal:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   fixed-width:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   fixer:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   fixfile:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4488,13 +4558,10 @@ dont-distribute-packages:
   flamethrower:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   flamingra:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   flat-maybe:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  flat:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   flexible-time:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   flexiwrap-smallcheck:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   flexiwrap:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   flickr:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  flight-igc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  flight-kml:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Flippi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   flite:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   float-binstring:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4508,20 +4575,18 @@ dont-distribute-packages:
   flowlocks-framework:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   flowsim:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   fltkhs-fluid-examples:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fluent-logger-conduit:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   fluent-logger:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fluffy-parser:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   fluidsynth:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   flux-monoid:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   FM-SBLEX:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   fmark:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   FModExRaw:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   fn-extra:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  focuslist:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   foldl-incremental:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   foldl-statistics:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  foldl-transduce-attoparsec:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  foldl-transduce:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   folds-common:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  follow-file:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   follow:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   follower:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   foma:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4545,31 +4610,31 @@ dont-distribute-packages:
   formlets-hsp:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   formlets:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   formura:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  forsyde-deep:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ForSyDe:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   forth-hll:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Fortnite-Hack-Cheats-Free-V-Bucks-Generator:    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fortran-src:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   fortytwo:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   foscam-directory:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   foscam-filename:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   foscam-sort:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Foster:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   fpco-api:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  FpMLv53:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   fpnla-examples:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   FPretty:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   fptest:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fquery:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   Fractaler:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   fractals:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   frag:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   Frames-beam:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Frames-dsv:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Frames:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   franchise:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Frank:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  free-algebras:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fraxl:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  freddy:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  free-category:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   free-concurrent:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  free-functors:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   free-game:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   free-http:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   free-operational:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4585,6 +4650,11 @@ dont-distribute-packages:
   freelude:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   freer-converse:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   freer-effects:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  freer-simple-catching:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  freer-simple-http:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  freer-simple-profiling:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  freer-simple-random:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  freer-simple-time:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   freesect:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   freesound:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   freetype-simple:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4592,11 +4662,15 @@ dont-distribute-packages:
   freq:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   fresh:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   friday-devil:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  friday-juicypixels:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   friday-scale-dct:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  friday:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  friendly:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   frown:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  frp-arduino:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   frpnow-gloss:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  frpnow-gtk3:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   frpnow-gtk:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  frpnow-gtk3:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   frpnow-vty:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   frpnow:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   fs-events:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4604,7 +4678,6 @@ dont-distribute-packages:
   fsmActions:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   fsutils:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   fswait:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fswatcher:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ftdi:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   FTGL-bytestring:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ftp-conduit:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4612,6 +4685,7 @@ dont-distribute-packages:
   ftree:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   ftshell:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   full-sessions:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  full-text-search:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   fullstop:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   funbot-client:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   funbot-git-hook:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4619,45 +4693,45 @@ dont-distribute-packages:
   funcons-lambda-cbv-mp:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   funcons-simple:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   funcons-tools:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  funcons-values:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   function-combine:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   function-instances-algebra:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   functional-arrow:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  functor-combo:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  functor-infix:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   functor:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   functorm:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   funflow-nix:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   funflow:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  FunGEn:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   Fungi:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   funion:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   funpat:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   funsat:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   fusion:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  futhark:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   futun:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   future:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   fuzzy-timings:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fuzzy:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   fwgl-glfw:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   fwgl-javascript:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   fwgl:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   g-npm:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  g4ip-prover:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   g4ip:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   gact:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   game-probability:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   gameclock:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Gamgine:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Ganymede:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   garepinoh:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   gargoyle-postgresql:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   gargoyle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gasp:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gas:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   gbu:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   gc-monitoring-wai:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   gcodehs:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gconf:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   gdax:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   gdiff-ig:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   gdiff-th:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gearbox:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   GeBoP:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   gedcom:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   geek-server:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4681,10 +4755,9 @@ dont-distribute-packages:
   GeneralTicTacToe:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   generators:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   generic-accessors:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  generic-aeson:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   generic-binary:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   generic-church:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  generic-data-surgery:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  generic-data:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   generic-enum:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   generic-lens-labels:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   generic-lens:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4694,7 +4767,7 @@ dont-distribute-packages:
   generic-storable:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   generic-tree:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   generic-xml:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  generics-mrsop:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  generic-xmlpickler:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   genericserialize:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   genesis-test:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   genesis:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4709,13 +4782,28 @@ dont-distribute-packages:
   GenSmsPdu:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   gentlemark:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   GenussFold:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  genvalidity-aeson:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  genvalidity-bytestring:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  genvalidity-containers:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  genvalidity-hspec-aeson:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  genvalidity-hspec-binary:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  genvalidity-hspec-cereal:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  genvalidity-hspec-hashable:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   genvalidity-hspec-optics:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  genvalidity-hspec:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  genvalidity-path:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  genvalidity-scientific:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  genvalidity-text:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  genvalidity-time:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  genvalidity-unordered-containers:               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  genvalidity-uuid:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  genvalidity-vector:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   geo-resolver:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   GeocoderOpenCage:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  geodetic-types:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   geodetic:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  GeoIp:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  geodetics:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   geojson-types:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  geojson:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   geolite-csv:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   geom2d:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   GeomPredicates-SSE:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4723,9 +4811,10 @@ dont-distribute-packages:
   Get:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   getemx:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   getflag:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gf:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   GGg:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   ggtsTC:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gh-labeler:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghc-core-smallstep:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-datasize:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-dump-core:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-dump-tree:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4737,9 +4826,10 @@ dont-distribute-packages:
   ghc-heap-view:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-imported-from:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-instances:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ghc-justdoit:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-man-completion:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-mod:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghc-parmake:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghc-parser:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-pkg-autofix:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-pkg-lib:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-proofs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4748,6 +4838,8 @@ dont-distribute-packages:
   ghc-syb-utils:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-syb:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-time-alloc-prof:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghc-trace-events:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghc-typelits-presburger:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-usage:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-vis:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghci-diagrams:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4755,12 +4847,12 @@ dont-distribute-packages:
   ghci-history-parser:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghci-lib:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghci-ng:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ghcjs-base-stub:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghcjs-dom-jsaddle:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghcjs-dom-jsffi:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghcjs-dom:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghcjs-fetch:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghcjs-hplay:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ghcjs-perch:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghcjs-promise:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghcjs-xhr:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghclive:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4773,8 +4865,8 @@ dont-distribute-packages:
   gi-wnck:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   giak:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   Gifcurry:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ginger:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   ginsu:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gio:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   gipeda:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   giphy-api:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   GiST:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4789,14 +4881,16 @@ dont-distribute-packages:
   git-object:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   git-repair:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   git-sanity:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  git-vogue:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   git:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   gitdo:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  githash:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  github-backup:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   github-data:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  github-tools:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   github-utils:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   github-webhook-handler-snap:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   github-webhook-handler:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  githud:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  github:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   gitignore:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   gitit:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   gitlab-api:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4813,13 +4907,14 @@ dont-distribute-packages:
   glapp:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   glazier-pipes:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   glazier-react-examples:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  glazier-react-widget:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  glazier-react:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   GLFW-b-demo:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   GLFW-OGL:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   gli:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  glib:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   glicko:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   glider-nlp:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  glirc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gll:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   GLMatrix:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   glob-posix:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   global-config:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4828,13 +4923,11 @@ dont-distribute-packages:
   glome-hs:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   GlomeTrace:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   GlomeView:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gloss-algorithms:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gloss-accelerate:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   gloss-banana:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   gloss-devil:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gloss-examples:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   gloss-export:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   gloss-game:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gloss-juicy:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   gloss-sodium:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   glpk-hs:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   glue-common:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -4842,134 +4935,20 @@ dont-distribute-packages:
   glue-ekg:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   glue-example:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   glue:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  GLUtil:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gluturtle:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   gmap:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   gmndl:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   gnome-desktop:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gnome-keyring:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   gnomevfs:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   gnss-converters:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   gnuidn:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  goa:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   goal-core:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   goal-geometry:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   goal-probability:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   goal-simulation:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  goat:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   goatee-gtk:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   goatee:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   gochan:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  godot-haskell:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   gofer-prelude:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-adexchange-buyer:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-adexchange-seller:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-admin-datatransfer:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-admin-directory:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-admin-emailmigration:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-admin-reports:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-adsense-host:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-adsense:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-affiliates:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-analytics:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-android-enterprise:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-android-publisher:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-appengine:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-apps-activity:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-apps-calendar:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-apps-licensing:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-apps-reseller:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-apps-tasks:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-appstate:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-autoscaler:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-bigquery:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-billing:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-blogger:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-books:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-civicinfo:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-classroom:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-cloudmonitoring:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-cloudtrace:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-compute:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-container:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-containerbuilder:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-core:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-customsearch:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-dataflow:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-dataproc:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-datastore:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-debugger:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-deploymentmanager:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-dfareporting:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-discovery:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-dns:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-doubleclick-bids:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-doubleclick-search:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-drive:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-firebase-dynamiclinks:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-firebase-rules:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-fitness:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-fonts:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-freebasesearch:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-fusiontables:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-games-configuration:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-games-management:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-games:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-genomics:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-gmail:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-groups-migration:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-groups-settings:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-iam:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-identity-toolkit:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-kgsearch:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-language:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-latencytest:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-logging:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-manufacturers:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-maps-coordinate:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-maps-engine:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-mirror:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-ml:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-monitoring:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-oauth2:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-pagespeed:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-partners:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-people:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-play-moviespartner:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-plus-domains:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-plus:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-prediction:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-proximitybeacon:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-pubsub:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-qpxexpress:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-replicapool-updater:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-replicapool:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-resourcemanager:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-resourceviews:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-runtimeconfig:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-safebrowsing:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-script:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-servicecontrol:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-servicemanagement:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-sheets:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-shopping-content:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-siteverification:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-slides:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-spectrum:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-sqladmin:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-storage-transfer:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-storage:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-tagmanager:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-taskqueue:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-translate:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-urlshortener:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-useraccounts:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-vision:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-webmaster-tools:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-youtube-analytics:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-youtube-reporting:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol-youtube:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gogol:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   gooey:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   google-cloud:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   google-drive:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5008,8 +4987,8 @@ dont-distribute-packages:
   GPipe-GLFW:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   GPipe-TextureLoad:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   GPipe:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gps2htmlReport:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   gps:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gps2htmlReport:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   gpx-conduit:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   GPX:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   graceful:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5034,10 +5013,10 @@ dont-distribute-packages:
   graph-rewriting-trs:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   graph-rewriting-ww:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   graph-rewriting:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  graph-serialize:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   graph-utils:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   graph-visit:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Graph500:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Graphalyze:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   graphbuilder:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   graphene:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   GraphHammer-examples:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5046,13 +5025,11 @@ dont-distribute-packages:
   graphics-formats-collada:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   graphicsFormats:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   graphicstools:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  graphmod-plugin:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  graphql-w-persistent:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   graphtype:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   graql:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   grasp:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   gray-code:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gray-extended:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  graylog:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   greencard-lib:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   greencard:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   greenclip:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5060,54 +5037,51 @@ dont-distribute-packages:
   gremlin-haskell:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   Grempa:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   grenade:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  greplicate:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  grid:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   gridbounds:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gridfs:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   gridland:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   grm:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   groot:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   gross:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   GroteTrap:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   groundhog-converters:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  groundhog-inspector:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  groundhog-mysql:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  groundhog-postgresql:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  groundhog-sqlite:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  groundhog-th:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  groundhog:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   group-with:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   grouped-list:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Grow:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   growler:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   GrowlNotify:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  grpc-api-etcd:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   grpc-etcd-client:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   gruff-examples:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   gruff:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gsc-weighting:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   gscholar-rss:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   gsl-random-fu:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   gsl-random:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   gstorable:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gstreamer:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   GTALib:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtfs:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gtk-helpers:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gtk-jsinput:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gtk-largeTreeStore:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtk-mac-integration:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtk-serialized-event:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gtk-simple-list-view:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gtk-sni-tray:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gtk-toggle-button-list:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtk-toy:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gtk2hs-cast-glade:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gtk2hs-cast-gnomevfs:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gtk2hs-cast-gtk:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gtk2hs-cast-gtkglext:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gtk2hs-cast-gtksourceview2:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gtk2hs-cast-th:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gtk-traymanager:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gtk:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gtk2hs-buildtools:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtk2hs-hello:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtk2hs-rpn:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Gtk2hsGenerics:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtk3-mac-integration:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gtk3:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtkglext:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   GtkGLTV:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtkimageview:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   gtkrsync:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gtksourceview2:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  gtksourceview3:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   GtkTV:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   guarded-rewriting:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   guess-combinator:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5120,9 +5094,9 @@ dont-distribute-packages:
   h-booru:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   h-gpgme:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   h-reversi:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  H:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   h2048:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   h2c:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  H:                                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   haar:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   habit:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hablog:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5131,7 +5105,6 @@ dont-distribute-packages:
   hack-contrib-press:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   hack-contrib:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hack-frontend-happstack:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hack-frontend-monadcgi:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hack-handler-cgi:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hack-handler-epoll:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   hack-handler-evhttp:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5143,7 +5116,6 @@ dont-distribute-packages:
   hack-middleware-cleanpath:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hack-middleware-clientsession:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hack-middleware-jsonp:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hack2-contrib-extra:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   hack2-handler-happstack-server:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hack2-handler-mongrel2-http:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hack2-handler-snap-server:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5152,14 +5124,16 @@ dont-distribute-packages:
   hackage-mirror:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hackage-processing:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   hackage-proxy:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hackage-repo-tool:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hackage-security-HTTP:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hackage-server:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hackage-whatsnew:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hackage2hwn:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hackage2twitter:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hackager:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hackernews:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   HackMail:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hackmanager:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hackport:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hactor:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hactors:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   haddock-api:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5191,9 +5165,17 @@ dont-distribute-packages:
   hakyll-contrib:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hakyll-convert:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hakyll-dhall:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hakyll-dir-list:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hakyll-favicon:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hakyll-filestore:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hakyll-images:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hakyll-ogmarkup:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hakyll-R:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hakyll-sass:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hakyll-series:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hakyll-shakespeare:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   hakyll-shortcode:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hakyll:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   halberd:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   halfs:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   halipeto:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5201,23 +5183,22 @@ dont-distribute-packages:
   hall-symbols:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   halma-gui:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   halma-telegram-bot:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  halma:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   halves:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hamilton:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   HaMinitel:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hampp:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hamsql:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hamtmap:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hamusic:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   handa-gdata:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  handle-like:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   handsy:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hangman:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hannahci:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hans-pcap:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hans:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   haphviz:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happindicator3:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   happindicator:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  happindicator3:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   happlets-lib-gtk:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   happlets:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   happraise:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5236,7 +5217,6 @@ dont-distribute-packages:
   happstack-data:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   happstack-dlg:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   happstack-facebook:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happstack-fastcgi:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   happstack-fay-ajax:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   happstack-fay:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   happstack-hamlet:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5244,6 +5224,7 @@ dont-distribute-packages:
   happstack-helpers:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   happstack-hstringtemplate:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   happstack-ixset:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  happstack-jmacro:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   happstack-lite:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   happstack-monad-peel:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   happstack-plugins:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5262,10 +5243,10 @@ dont-distribute-packages:
   haquery:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   haquil:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   harchive:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hArduino:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hardware-edsl:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   HaRe:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hark:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HARM:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   harmony:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   HarmTrace:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   haroonga-httpd:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5274,13 +5255,9 @@ dont-distribute-packages:
   harvest-api:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   has-th:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   has:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HasBigDecimal:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hasbolt-extras:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   HasCacBDD:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hascas:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hascat-lib:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hascat-setup:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hascat-system:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hascat:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   Haschoo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   HasGP:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hash:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5290,17 +5267,15 @@ dont-distribute-packages:
   hashabler:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hashed-storage:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hashell:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hashflare:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hashring:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hashtables-plus:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasim:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hask-home:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hask:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskades:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskanoid:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskarrow:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskbot-core:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskdeep:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskdogs:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskeem:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskeline-class:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskelisp:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5310,12 +5285,14 @@ dont-distribute-packages:
   haskell-bitmex-client:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-bitmex-rest:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-brainfuck:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-ci:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-cnc:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-coffee:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-compression:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-conll:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-course-preludes:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-dap:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-disque:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-docs:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-eigen-util:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-formatter:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5324,7 +5301,6 @@ dont-distribute-packages:
   haskell-gettext:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-go-checkers:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-holes-th:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell-igraph:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-in-space:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-kubernetes:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-lsp-client:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5343,17 +5319,27 @@ dont-distribute-packages:
   haskell-read-editor:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-reflect:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-rules:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell-snake:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-src-exts-observe:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-src-exts-prisms:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-src-exts-qq:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-src-exts-sc:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-src-meta-mwotton:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-stack-trace-plugin:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-token-utils:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-tools-ast-fromghc:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-tools-ast-gen:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-tools-ast-trf:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-tools-ast:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-tools-backend-ghc:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-tools-builtin-refactorings:             [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-tools-cli:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-tools-daemon:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-tools-debug:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-tools-demo:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-tools-experimental-refactorings:        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-tools-prettyprint:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-tools-refactor:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskell-tools-rewrite:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-tor:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-type-exts:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskell-typescript:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5395,9 +5381,9 @@ dont-distribute-packages:
   haskgame:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskheap:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskhol-core:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskintex:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskmon:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskoin-bitcoind:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskoin-core:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskoin-crypto:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskoin-node:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskoin-protocol:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5414,7 +5400,6 @@ dont-distribute-packages:
   haskore-synthesizer:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskore:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   HaskRel:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hasktags:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasktorch-ffi-th:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasktorch-ffi-thc:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasktorch-indef:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5425,25 +5410,20 @@ dont-distribute-packages:
   hasktorch:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskus-binary:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskus-system-build:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haskus-utils-data:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskus-utils-variant:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   haskus-utils:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   haslo:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasloGUI:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hasmin:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasparql-client:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasql-backend:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasql-class:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasql-cursor-query:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hasql-cursor-transaction:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasql-generic:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasql-migration:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hasql-optparse-applicative:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hasql-pool:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasql-postgres-options:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasql-postgres:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hasql-simple:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hasql-transaction:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hasql:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hastache-aeson:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hastache:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   haste-app:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5451,13 +5431,14 @@ dont-distribute-packages:
   haste-markup:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   haste-prim:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   haste:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hat:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hate:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hatex-guide:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   HaTeX-meta:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   HaTeX-qq:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HaTeX:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hats:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hatt:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  haven:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   haverer:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   HaVSA:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hawitter:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5465,7 +5446,6 @@ dont-distribute-packages:
   hax:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   haxl-amazonka:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   haxl-facebook:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HaXml:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   haxparse:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   haxr-th:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   haxr:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5489,7 +5469,6 @@ dont-distribute-packages:
   hcg-minus:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hcheat:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hchesslib:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HCL:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   hcltest:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hcoap:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hcom:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5522,28 +5501,24 @@ dont-distribute-packages:
   hdr-histogram:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   HDRUtils:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   headergen:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  heap:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  heartbeat-streams:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   heatitup-complete:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   heatitup:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  heavy-logger-amazon:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  heavy-logger-instances:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  heavy-logger:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hecc:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   heckle:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hedgehog-checkers-lens:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hedgehog-checkers:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hedgehog-gen-json:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hedgehog-quickcheck:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hedi:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hedis-config:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hedis-pile:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hedis-simple:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hedis-tags:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hedn:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hein:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   heist-aeson:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   heist-async:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   heist:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  helf:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   helics-wai:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   helics:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   helisp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5565,7 +5540,6 @@ dont-distribute-packages:
   herbalizer:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   HerbiePlugin:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   heredocs:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  herf-time:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hermes:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hermit-syb:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hermit:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5576,6 +5550,7 @@ dont-distribute-packages:
   hesh:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hesql:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hetero-dict:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  heterogeneous-list-literals:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   heterolist:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hetris:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   heukarya:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5587,6 +5562,7 @@ dont-distribute-packages:
   hexmino:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hexml-lens:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hexpat-iteratee:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hexpat-lens:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hexpat-pickle-generic:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hexpr:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hexpress:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5607,31 +5583,14 @@ dont-distribute-packages:
   hfusion:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hg-buildpackage:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgalib:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HGamer3D-API:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HGamer3D-Audio:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HGamer3D-Bullet-Binding:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HGamer3D-CAudio-Binding:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HGamer3D-CEGUI-Binding:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HGamer3D-Common:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HGamer3D-Data:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HGamer3D-Enet-Binding:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HGamer3D-Graphics3D:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HGamer3D-GUI:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HGamer3D-InputSystem:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HGamer3D-Network:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HGamer3D-Ogre-Binding:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HGamer3D-OIS-Binding:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HGamer3D-SDL2-Binding:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HGamer3D-SFML-Binding:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HGamer3D-WinEvent:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HGamer3D-Wire:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HGamer3D:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgdbmi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   HGE2D:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgearman:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgen:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgeometric:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hgeometry:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgeos:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hgettext:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgis:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgithub:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   HGL:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5639,6 +5598,7 @@ dont-distribute-packages:
   hgopher:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   HGraphStorage:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgrep:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hgrev:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hgrib:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hharp:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   HHDL:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5648,7 +5608,9 @@ dont-distribute-packages:
   hid-examples:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hieraclus:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hierarchical-clustering-diagrams:               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hierarchical-clustering:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hierarchical-exceptions:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hierarchy:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hiernotify:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hieroglyph:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   HiggsSet:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5656,7 +5618,7 @@ dont-distribute-packages:
   highjson-swagger:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   highjson-th:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   highjson:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  highlight:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  highlight-versions:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   highWaterMark:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   himg:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   himpy:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5667,6 +5629,7 @@ dont-distribute-packages:
   hinquire:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hinstaller:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hint-server:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hinter:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hinterface:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hinvaders:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hinze-streams:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5674,11 +5637,11 @@ dont-distribute-packages:
   hipbot:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hipchat-hs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hipe:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HipmunkPlayground:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hircules:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hirt:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hish:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hissmetrics:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hist-pl-dawg:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hist-pl-fusion:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hist-pl-lexicon:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hist-pl-lmf:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5704,8 +5667,8 @@ dont-distribute-packages:
   HLearn-classification:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   HLearn-datastructures:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   HLearn-distributions:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hledger-api:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hledger-chart:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hledger-iadd:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hledger-irr:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hledger-vty:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hlibBladeRF:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5713,8 +5676,11 @@ dont-distribute-packages:
   hlibfam:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   HList:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   HListPP:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HLogger:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hlogger:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HLogger:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hlongurl:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hlrdb-core:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hlrdb:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hls:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   hlwm:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hly:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5725,14 +5691,11 @@ dont-distribute-packages:
   hmatrix-mmap:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-morpheus:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-nipals:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hmatrix-nlopt:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hmatrix-quadprogpp:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-sparse:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-static:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-sundials:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-syntax:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-tests:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hmatrix-vector-sized:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmeap-utils:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmeap:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmenu:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5747,11 +5710,12 @@ dont-distribute-packages:
   hmt:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmumps:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hnetcdf:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hnix:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   HNM:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   hnormalise:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ho-rewriting:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hoauth2:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hoauth:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hoauth2:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hob:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   hobbes:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hobbits:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5759,8 +5723,6 @@ dont-distribute-packages:
   hocker:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hodatime:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   HODE:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Hoed:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hofix-mtl:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hog:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   hogg:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hoggl:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5770,10 +5732,7 @@ dont-distribute-packages:
   hol:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   hold-em:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hole:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Holumbus-Distribution:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Holumbus-MapReduce:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   Holumbus-Searchengine:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Holumbus-Storage:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   holy-project:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   homeomorphic:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hommage:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5783,8 +5742,8 @@ dont-distribute-packages:
   honi:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hoobuddy:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hood-off:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hood2:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hood:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hood2:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hoodie:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hoodle-builder:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hoodle-core:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5800,8 +5759,6 @@ dont-distribute-packages:
   hoovie:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hopencc:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hopencl:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hopenpgp-tools:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hOpenPGP:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hopfield:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hoppy-docs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hoppy-generator:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5809,8 +5766,10 @@ dont-distribute-packages:
   hoppy-std:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hops:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hoq:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hora:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   horizon:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   horname:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hosc-json:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hosts-server:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hothasktags:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hotswap:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5820,7 +5779,6 @@ dont-distribute-packages:
   hp2any-graph:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hp2any-manager:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hpack-convert:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hpack-dhall:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hpaco-lib:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hpaco:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hpage:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5828,18 +5786,19 @@ dont-distribute-packages:
   hpaste:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hpasteit:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   HPath:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hpc-coveralls:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hpc-tracer:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hPDB-examples:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hPDB:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HPDF:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hpdft:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hpg:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HPhone:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   HPi:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hpio:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hplaylist:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   HPlot:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hpodder:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   HPong:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hpp:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   hpqtypes-extras:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hpqtypes:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hprotoc-fork:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5851,7 +5810,6 @@ dont-distribute-packages:
   hpylos:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hpyrg:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hquantlib:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hquery:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hR:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   hranker:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   HRay:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5868,6 +5826,7 @@ dont-distribute-packages:
   hs-blake2:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hs-carbon-examples:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   hs-cdb:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-conllu:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hs-di:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hs-dotnet:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hs-excelx:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5887,14 +5846,13 @@ dont-distribute-packages:
   hs-re:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hs-rs-notify:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hs-scrape:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hs-server-starter:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   hs-snowtify:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hs-twitter:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hs-twitterarchiver:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   hs-vcard:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hs-watchman:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs2ats:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hs2bf:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs2dot:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   Hs2lib:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsaml2:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsay:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5903,16 +5861,17 @@ dont-distribute-packages:
   hsbencher-codespeed:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsbencher-fusion:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsbencher:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsc2hs:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsc3-auditor:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsc3-cairo:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsc3-data:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsc3-db:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsc3-dot:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsc3-forth:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsc3-graphs:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsc3-lang:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsc3-lisp:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsc3-plot:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsc3-process:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsc3-rec:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsc3-rw:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsc3-server:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5927,6 +5886,7 @@ dont-distribute-packages:
   hsclock:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hscope:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hScraper:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hscuid:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsdev:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsdif:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsdip:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5948,6 +5908,7 @@ dont-distribute-packages:
   hsI2C:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsignal:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hSimpleDB:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsimport:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   HsJudy:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hskeleton:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hslackbuilder:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5973,7 +5934,6 @@ dont-distribute-packages:
   hsparql:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   HsParrot:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspear:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hspec-dirstream:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspec-expectations-match:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspec-expectations-pretty:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspec-experimental:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -5986,6 +5946,7 @@ dont-distribute-packages:
   hspec-snap:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspec-structured-formatter:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspec-webdriver:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hspec2:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspecVariant:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   HsPerl5:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hspkcs11:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6024,11 +5985,13 @@ dont-distribute-packages:
   hsubconvert:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsudoku:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hswip:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsx-jmacro:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsx-xhtml:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsx:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsXenCtrl:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsyscall:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hsyslog-tcp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hsyslog-udp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hszephyr:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   HTab:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   hTalos:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6036,13 +5999,13 @@ dont-distribute-packages:
   hTensor:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   htestu:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   HTicTacToe:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  htiled:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   htlset:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   html-charset:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   html-entities:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   html-kure:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   html-rules:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   html-tokenizer:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  htoml-megaparsec:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hts:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   htsn-import:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   htsn:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6053,11 +6016,12 @@ dont-distribute-packages:
   http-client-session:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   http-client-streams:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   http-conduit-browser:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  http-conduit-downloader:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   http-dispatch:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   http-enumerator:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   http-grammar:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  http-io-streams:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   http-kinder:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  http-monad:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   http-pony-serve-wai:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   http-proxy:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   http-querystring:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6069,9 +6033,9 @@ dont-distribute-packages:
   https-everywhere-rules:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   httpspec:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   htune:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  htvm:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   htzaar:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hubigraph:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hubris:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   huck:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   HueAPI:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   huff:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6092,31 +6056,48 @@ dont-distribute-packages:
   hup:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   hurdle:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hurriyet:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  husk-scheme-libs:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  husk-scheme:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   husky:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hutton:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   huttons-razor:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   huzzy:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hVOIDP:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hw-balancedparens:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hw-bits:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hw-dsv:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hw-dump:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hw-eliasfano:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hw-excess:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hw-ip:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hw-json-lens:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hw-prim-bits:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hw-json:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hw-packed-vector:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hw-parser:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hw-prim:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hw-rankselect-base:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hw-rankselect:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   hw-simd:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hw-streams:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hw-succinct:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hw-vector:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hw-xml:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hwall-auth-iitk:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hweblib:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hwhile:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hworker-ses:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hworker:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hwormhole:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hws:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   hwsl2-bytevector:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hwsl2-reducers:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hwsl2:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hXmixer:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   HXMPP:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hxmppc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hxournal:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   HXQ:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hxt-binary:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hxt-cache:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hxt-filter:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hxt-pickle-utils:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hxthelper:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hxweb:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hyahtzee:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6133,29 +6114,27 @@ dont-distribute-packages:
   hydrogen-prelude:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   hydrogen-syntax:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hydrogen-util:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Hydrogen:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hydrogen:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Hydrogen:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hyena:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hylide:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hylolib:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hylotab:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hyloutils:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hyper-extra:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hyper-haskell-server:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hyper:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   hyperdrive:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   hyperfunctions:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   hyperion:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   hyperloglogplus:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   hyperpublic:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   hypher:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hzenity:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hzulip:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   i18n:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   iap-verifier:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ib-api:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   iban:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   ical:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  iCalendar:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   IcoGrid:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   iconv-typed:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ide-backend-common:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6167,9 +6146,9 @@ dont-distribute-packages:
   identifiers:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   idiii:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   idna2008:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  idris:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   IDynamic:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ieee-utils:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  iException:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ifcxt:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   IFS:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   ig:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6197,7 +6176,6 @@ dont-distribute-packages:
   ihaskell:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ihttp:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   illuminate:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  imagemagick:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   imagepaste:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   imap:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   imapget:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6213,7 +6191,6 @@ dont-distribute-packages:
   imperative-edsl-vhdl:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   imperative-edsl:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ImperativeHaskell:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  impl:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   implicit-logging:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   implicit-params:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   importify:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6222,18 +6199,16 @@ dont-distribute-packages:
   impure-containers:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   INblobs:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   inch:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  inchworm:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   include-file:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   incremental-computing:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   incremental-maps:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  incremental-parser:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   increments:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  indentation-trifecta:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  indentation:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   indents:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   indexation:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  indexed-extras:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   IndexedList:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   indextype:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  indian-language-font-converter:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   indices:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   indieweb-algorithms:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   inf-interval:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6246,7 +6221,9 @@ dont-distribute-packages:
   informative:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   inilist:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   inject-function:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  inline-java:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   inline-r:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  insert-ordered-containers:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   inserts:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   inspector-wrecker:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   instant-aeson:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6261,9 +6238,6 @@ dont-distribute-packages:
   integer-pure:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   integreat:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   intel-aes:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  interleavableGen:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  interleavableIO:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  interlude-l:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   internetmarke:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   intero:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   interpol:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6276,18 +6250,19 @@ dont-distribute-packages:
   introduction-test:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   introduction:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   intset:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  invertible-grammar:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   invertible-hlist:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  invertible-hxt:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  invertible:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   io-capture:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   io-reactive:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ion:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   IOR:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   IORefCAS:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   iostring:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   iothread:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   iotransaction:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ip2location:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ip:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ip2location:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ip2proxy:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ipatch:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   ipc:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   ipopt-hs:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6295,22 +6270,25 @@ dont-distribute-packages:
   iptadmin:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   IPv6DB:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   ipython-kernel:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  irc-dcc:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   irc-fun-bot:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   irc-fun-client:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   irc-fun-color:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   irc-fun-messages:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   irc-fun-types:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   Irc:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ircbot:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   iri:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   iridium:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   iron-mq:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   ironforge:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   irt:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  is:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   isdicom:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   isevaluated:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  isiz:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   ismtp:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   IsNull:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  iso8601-duration:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   isobmff-builder:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   isohunt:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   isotope:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6325,7 +6303,16 @@ dont-distribute-packages:
   iterio-server:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   iterIO:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   ivor:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ivory-backend-c:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ivory-bitdata:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ivory-eval:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ivory-examples:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ivory-hw:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ivory-opts:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ivory-quickcheck:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ivory-serialize:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ivory-stdlib:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ivory:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   ivy-web:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   ixdopp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   ixmonad:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6344,16 +6331,15 @@ dont-distribute-packages:
   jarfind:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   jarify:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   jason:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  java-adt:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   java-bridge-extras:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   java-bridge:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   java-character:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   java-reflect:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  javaclass:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  javascript-extras:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   Javasf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   javasf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Javav:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   javav:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Javav:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   jbi:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   jcdecaux-vls:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Jdh:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6362,13 +6348,19 @@ dont-distribute-packages:
   jenkinsPlugins2nix:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   jespresso:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   jinquantities:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  jmacro-rpc-happstack:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  jmacro-rpc-snap:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  jmacro-rpc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  jmacro:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   jml-web-service:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  jmonkey:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  jni:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   jobqueue:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   join-api:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   join:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   joinlist:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   jonathanscard:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  jort:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  jpeg:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   js-good-parts:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   jsaddle-clib:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   jsaddle-dom:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6379,6 +6371,7 @@ dont-distribute-packages:
   JsContracts:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   jsmw:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-api:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  json-ast-json-encoder:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-ast-quickcheck:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-b:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-builder:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6394,11 +6387,10 @@ dont-distribute-packages:
   json-pointer-hasql:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-pointer:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-python:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  json-qq:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  json-rpc:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  json-sop:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  json-schema:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-togo:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   json-tools:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  json-tracer:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   json2-hdbc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   json2:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   JSONb:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6413,6 +6405,7 @@ dont-distribute-packages:
   jsontsv:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   jsonxlsx:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   jspath:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  juandelacosa:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   judge:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   judy:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   juicy-gcode:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6427,7 +6420,9 @@ dont-distribute-packages:
   jvm-binary:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   jvm-parser:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   jvm-streaming:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  jvm:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   JYU-Utils:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  kademlia:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   kafka-client:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   kafka-device-glut:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   kafka-device-joystick:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6439,6 +6434,8 @@ dont-distribute-packages:
   Kalman:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   kalman:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   kangaroo:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  kanji:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  kansas-comet:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   kansas-lava-cores:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   kansas-lava-papilio:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   kansas-lava-shake:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6451,14 +6448,17 @@ dont-distribute-packages:
   katip-syslog:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   katt:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   kawaii:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  kazura-queue:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   kd-tree:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   kdesrc-build-extra:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  kdt:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   keccak:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  keera-hails-i18n:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   keera-hails-mvc-environment-gtk:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   keera-hails-mvc-model-lightmodel:               [ i686-linux, x86_64-linux, x86_64-darwin ]
   keera-hails-mvc-model-protectedmodel:           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  keera-hails-mvc-solutions-config:               [ i686-linux, x86_64-linux, x86_64-darwin ]
   keera-hails-mvc-solutions-gtk:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  keera-hails-mvc-view-gtk:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   keera-hails-reactive-fs:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   keera-hails-reactive-gtk:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   keera-hails-reactive-network:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6467,8 +6467,6 @@ dont-distribute-packages:
   keera-hails-reactive-yampa:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   keera-hails-reactivelenses:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   keera-hails-reactivevalues:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  keera-posture:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  keiretsu:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Ketchup:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   keter:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   kevin:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6476,17 +6474,15 @@ dont-distribute-packages:
   keyring:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   keysafe:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   keystore:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  keyvaluehash:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   keyword-args:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   khph:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   kicad-data:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   kickass-torrents-dump-parser:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  KiCS-debugger:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  KiCS-prophecy:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  KiCS:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  kickchan:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   kif-parser:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  kind-apply:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  kind-generics:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   kit:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  kleene:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   kmeans-par:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   kmeans-vector:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   kmp-dfa:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6494,7 +6490,6 @@ dont-distribute-packages:
   knead:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   knots:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   koellner-phonetic:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Konf:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   korfu:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   kqueue:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   krapsh:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6502,7 +6497,6 @@ dont-distribute-packages:
   krpc:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   KSP:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   ktx:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Kulitta:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   kure-your-boilerplate:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   kure:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   KyotoCabinet:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6519,11 +6513,14 @@ dont-distribute-packages:
   lambda-calculator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambda-canvas:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambda-devs:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lambda-options:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambda-toolbox:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambda2js:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdaBase:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lambdabot-haskell-plugins:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdabot-utils:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdabot-zulip:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lambdabot:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdacms-core:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdacms-media:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   lambdacube-bullet:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6552,7 +6549,6 @@ dont-distribute-packages:
   lame-tester:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   lame:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   lang:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  language-ats:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-bash:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-boogie:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-c-comments:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6563,17 +6559,16 @@ dont-distribute-packages:
   language-dockerfile:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-dot:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-ecmascript-analysis:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  language-ecmascript:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-eiffel:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-elm:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-gcl:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  language-glsl:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-go:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-guess:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-hcl:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-java-classfile:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-kort:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-lua-qq:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  language-lua:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-lua2:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-mixal:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-ninja:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6594,14 +6589,16 @@ dont-distribute-packages:
   language-typescript:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-vhdl:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   language-webidl:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lapack-carray:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lapack-ffi:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   lapack:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  LargeCardinalHierarchy:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   Lastik:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   lat:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   latest-npm-version:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  latex-formulae-hakyll:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  latex-formulae-image:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  latex-formulae-pandoc:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  latex-function-tables:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   LATS:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lattices:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   launchpad-control:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   lawless-concurrent-machines:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   layers-game:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6617,14 +6614,17 @@ dont-distribute-packages:
   lazyset:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   lazysplines:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   LazyVault:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lcs:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   ld-intervals:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lda:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ldap-client:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ldapply:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   ldif:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   leaf:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   leaky:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   leapseconds:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   learn-physics-examples:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  learn-physics:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  learn:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   Learning:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   leetify:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   legion-discovery-client:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6636,10 +6636,9 @@ dont-distribute-packages:
   lens-prelude:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   lens-text-encoding:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   lens-time:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lens-toml-parser:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   lens-tutorial:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lens-typelevel:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   lensref:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lentil:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   level-monad:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Level0:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   levmar-chart:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6665,14 +6664,16 @@ dont-distribute-packages:
   liblinear-enumerator:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   libltdl:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   libmolude:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  libnix:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  libnotify:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   liboath-hs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   liboleg:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   libpafe:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   libpq:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   librandomorg:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   librato:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  libravatar:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   libsystemd-daemon:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  libsystemd-journal:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   libtagc:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   libxls:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   libxml-enumerator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6681,7 +6682,6 @@ dont-distribute-packages:
   life-sync:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   lifted-base-tf:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   lifted-protolude:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lifted-stm:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   lifter:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   ligature:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   lightning-haskell:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6690,24 +6690,27 @@ dont-distribute-packages:
   lilypond:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Limit:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   limp-cbc:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  limp:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   linda:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   linden:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  line:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   linear-algebra-cblas:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   linear-circuit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   linear-code:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   linear-maps:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   linear-opengl:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  linear-socket:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   linear-vect:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   linearmap-category:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   linearscan-hoopl:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   linearscan:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   LinearSplit:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lines-of-action:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  link-relations:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   LinkChecker:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   linkchk:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   linkcore:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  linked-list-with-iterator:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   linkedhashmap:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  linklater:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   linode-v4:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   linux-blkid:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   linux-cgroup:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6734,7 +6737,7 @@ dont-distribute-packages:
   list-t-html-parser:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   list-t-http-client:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   list-t-text:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  list-zip-def:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  list-zipper:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   listenbrainz-client:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   listlike-instances:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   ListT:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6766,28 +6769,28 @@ dont-distribute-packages:
   lmonad:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   load-balancing:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   load-font:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  loc-test:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  loc:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   local-search:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   localize:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   located-monad-logger:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   located:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   loch:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   locked-poll:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lockpool:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   log-effect-syslog:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   log-effect:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  log-elasticsearch:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   log-postgres:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   log-utils:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   log-warper:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  log2json:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   log:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  log2json:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   logentries:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   logger:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   logging-effect-extra-file:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   logging-effect-extra-handler:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   logging-effect-extra:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  logging-facade-journald:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   logic-classes:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  logic-TPTP:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Logic:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   LogicGrowsOnTrees-MPI:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   LogicGrowsOnTrees-network:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6807,6 +6810,7 @@ dont-distribute-packages:
   lol-typing:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   lol:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   loli:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  longboi:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   lookup-tables:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   loop-effin:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   loop-while:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6826,7 +6830,6 @@ dont-distribute-packages:
   LslPlus:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   lsp-test:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   lsystem:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ltext:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   ltk:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   lua-bc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   luachunk:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6852,13 +6855,16 @@ dont-distribute-packages:
   lzma-streams:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   maam:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   macbeth-lib:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  machinecell:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   machines-amazonka:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   machines-process:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   machines-zlib:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  macos-corelibs:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   macosx-make-standalone:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   madlang:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   mage:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   magic-wormhole:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  magicbane:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   MagicHaskeller:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   magico:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   magma:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6869,7 +6875,6 @@ dont-distribute-packages:
   mailchimp:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   MailchimpSimple:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   mailgun:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  main-tester:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   majordomo:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   majority:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   make-hard-links:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6892,15 +6897,19 @@ dont-distribute-packages:
   manatee-terminal:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   manatee-welcome:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   manatee:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mandrill:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   mandulia:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   mangopay:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   manifold-random:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   manifolds-core:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   manifolds:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mapalgebra:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  map-exts:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  map-syntax:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Mapping:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mappy:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   marionetta:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   markdown-kate:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  markdown-pap:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   markdown2svg:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   marked-pretty:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   markov-processes:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6908,6 +6917,7 @@ dont-distribute-packages:
   marmalade-upload:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   marquise:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   mars:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  marvin-interpolate:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   marvin:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   marxup:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   masakazu-bot:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6921,8 +6931,6 @@ dont-distribute-packages:
   matrix-as-xyz:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   matsuri:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   matterhorn:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mattermost-api-qc:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mattermost-api:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   maude:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   maxent-learner-hw-gui:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   maxent-learner-hw:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6933,6 +6941,7 @@ dont-distribute-packages:
   MaybeT-transformers:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   MaybeT:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   MazesOfMonad:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  MBot:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   mbox-tools:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   MC-Fold-DP:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   mcl:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6953,11 +6962,13 @@ dont-distribute-packages:
   Mecha:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   Mechs:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   mechs:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  med-module:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   mediabus-fdk-aac:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   mediabus-rtp:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   mediabus:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mediawiki2latex:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  median-stream:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   mediawiki:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mediawiki2latex:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   medium-sdk-haskell:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   mellon-core:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   mellon-gpio:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6966,7 +6977,7 @@ dont-distribute-packages:
   memcache-conduit:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   memcache-haskell:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   memcached-binary:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  memcached:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  meminfo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   memis:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   memo-ptr:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   memoization-utils:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6975,6 +6986,8 @@ dont-distribute-packages:
   menoh:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   mercury-api:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   merkle-patricia-db:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  messagepack-rpc:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  messagepack:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   messente:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   meta-misc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   meta-par-accelerate:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -6998,7 +7011,9 @@ dont-distribute-packages:
   mi:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   Michelangelo:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   miconix-test:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  micro-recursion-schemes:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   microaeson:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  microformats2-parser:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   microformats2-types:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   microgroove:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   microlens-each:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7006,18 +7021,19 @@ dont-distribute-packages:
   microsoft-translator:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   MicrosoftTranslator:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   mida:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  midair:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  midi-music-box:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   midi-utils:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   midimory:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   midisurface:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   mighttpd:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mighty-metropolis:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   mikmod:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   mikrokosmos:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   miku:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  milena:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   mime-directory:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   minecraft-data:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   minesweeper:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  MiniAgda:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   miniforth:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   minilens:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   minimung:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7030,7 +7046,10 @@ dont-distribute-packages:
   minst-idx:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   mios:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   mirror-tweet:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  miss-porcelain:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  miss:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   missing-py2:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  MissingK:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   MissingPy:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   mixed-strategies:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   mixpanel-client:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7039,9 +7058,6 @@ dont-distribute-packages:
   ml-w:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   mlist:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   mltool:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mmark-cli:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mmark-ext:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mmark:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   mmtf:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   mmtl-base:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   mmtl:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7054,6 +7070,7 @@ dont-distribute-packages:
   modular-arithmetic:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   modular-prelude-classy:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   modular-prelude:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  modular:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   module-management:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   modulespection:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   modulo:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7062,31 +7079,35 @@ dont-distribute-packages:
   MoeDict:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   mohws:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   mole:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mollie-api-haskell:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-atom-simple:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-atom:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monad-dijkstra:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monad-codec:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-exception:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-fork:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-http:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-interleave:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-levels:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-lgbt:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monad-log:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-lrs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monad-memo:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-mersenne-random:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-mock:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-open:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-parallel-progressbar:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monad-persist:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-ran:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monad-recorder:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-resumption:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-state:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monad-statevar:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-ste:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-stlike-io:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-stlike-stm:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monad-supply:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-timing:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-tx:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-unify:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monad-var:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   monad-wrap:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   monadacme:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   MonadCatchIO-mtl-foreign:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7095,13 +7116,12 @@ dont-distribute-packages:
   MonadCatchIO-transformers:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   MonadCompose:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   monadiccp-gecode:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monadIO:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monadiccp:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Monadius:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   MonadLab:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   monadLib-compose:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   monadloc-pp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   monadlog:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monadoid:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   monadplus:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   monads-fd:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   MonadStack:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7121,7 +7141,6 @@ dont-distribute-packages:
   monoid-absorbing:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   monoid-owns:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   monoid-statistics:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monoid-subclasses:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   monoidplus:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   monoids:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   monopati:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7133,15 +7152,12 @@ dont-distribute-packages:
   morfette:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   morfeusz:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   morph:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  morte:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   mosaico-lib:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   moto-postgresql:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   moto:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  motor-diagrams:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  motor-reflection:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  motor:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   mount:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   movie-monad:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mp3decoder:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   mp:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   mpdmate:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   mpi-hs:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7151,6 +7167,7 @@ dont-distribute-packages:
   mprover:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   mps:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   mpvguihs:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mqtt-hs:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   mqtt:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   mrifk:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   mrm:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7166,6 +7183,7 @@ dont-distribute-packages:
   mtgoxapi:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   mtl-evil-instances:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   mtl-extras:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mtl-tf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   mtlx:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   mtp:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   MuCheck-Hspec:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7174,23 +7192,25 @@ dont-distribute-packages:
   MuCheck-SmallCheck:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   MuCheck:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   mud:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mudbath:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   mulang:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   multext-east-msd:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   multi-cabal:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   multi-instance:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   multiaddr:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  multiarg:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   multifile:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   multifocal:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   multihash:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  multilinear-io:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  multilinear:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   multipass:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   multipath:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   multiplate-simplified:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  multipool-persistent-postgresql:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   multirec-alt-deriver:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   multirec-binary:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  multirec:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  multiset-comb:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   multisetrewrite:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  multistate:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   multivariant:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Munkres-simple:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   muon:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7208,8 +7228,8 @@ dont-distribute-packages:
   music-util:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   musicbrainz-email:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   musicxml:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  musicxml2:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   mustache-haskell:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mustache2hs:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   mutable-iter:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   MutationOrder:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   mute-unmute:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7224,32 +7244,28 @@ dont-distribute-packages:
   mxnet:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   my-package-testing:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   my-test-docs:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mybitcoin-sci:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  myanimelist-export:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   myo:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   MyPrimes:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   mysnapsession-example:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   mysnapsession:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   mysql-effect:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mysql-haskell-nem:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   mysql-haskell-openssl:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mysql-haskell:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   mysql-simple-quasi:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   mysql-simple-typed:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   mystem:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   myTestlll:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  mywatch:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   mzv:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   n-ary-functor:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   n-tuple:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   nagios-plugin-ekg:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   nakadi-client:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   named-lock:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  NameGenerator:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   namelist:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   namespace:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nano-cryptr:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   nano-hmac:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   nano-md5:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nanoAgda:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   nanocurses:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   nanomsg-haskell:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   nanomsg:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7258,14 +7274,14 @@ dont-distribute-packages:
   nanovg-simple:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   nanovg:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   nanq:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Naperian:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  naperian:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   naqsha:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   narc:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   nat-sized-numbers:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   nationstates:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   natural-number:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  natural:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   naver-translate:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nc-indicators:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   NearContextAlgebra:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   neat:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   needle:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7285,6 +7301,7 @@ dont-distribute-packages:
   nested-sequence:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   NestedFunctor:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   nestedmap:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  net-spider:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   netclock:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   netcore:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   netease-fm:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7302,12 +7319,9 @@ dont-distribute-packages:
   network-address:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-anonymous-i2p:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-api-support:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  network-arbitrary:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  network-bitcoin:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-builder:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-bytestring:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-connection:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  network-dbus:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-enumerator:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-hans:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-interfacerequest:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7315,7 +7329,6 @@ dont-distribute-packages:
   network-minihttp:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-msgpack-rpc:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-netpacket:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  network-pgi:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-protocol-xmpp:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-rpca:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-server:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7324,9 +7337,10 @@ dont-distribute-packages:
   network-stream:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-topic-models:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-transport-amqp:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  network-transport-inmemory:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  network-transport-tcp:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  network-transport-tests:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-transport-zeromq:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  network-uri-json:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  network-uri-static:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-voicetext:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-wai-router:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   network-websocket:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7335,7 +7349,6 @@ dont-distribute-packages:
   neural-network-hmatrix:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   neural:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   newports:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  newsynth:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   newt:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   newtype-deriving:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   newtype-th:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7353,20 +7366,18 @@ dont-distribute-packages:
   Ninjas:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   nirum:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   nitro:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nix-delegate:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nix-deploy:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   nix-eval:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   nixfromnpm:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nixpkgs-update:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   nkjp:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nlopt-haskell:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   nlp-scores-scripts:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   nlp-scores:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   nm:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   NMap:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nme:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   nntp:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   no-role-annots:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   noether:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nofib-analyse:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   nofib-analyze:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   noise:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   Nomyx-Core:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7374,21 +7385,22 @@ dont-distribute-packages:
   Nomyx-Rules:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Nomyx-Web:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Nomyx:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  non-empty-zipper:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nonempty-containers:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  NonEmpty:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   NonEmptyList:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   nonlinear-optimization-ad:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   nonlinear-optimization:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  noodle:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   normalization-insensitive:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   NoSlow:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   not-gloss-examples:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  not-gloss:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   notcpp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   notmuch-haskell:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   notmuch-web:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   NoTrace:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  np-extras:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   np-linear:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   nptools:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nqe:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   ntrip-client:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   NTRU:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   null-canvas:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7398,22 +7410,29 @@ dont-distribute-packages:
   NumberSieves:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   NumberTheory:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   numerals-base:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  numerals:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   numeric-ode:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   numeric-qq:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   numeric-ranges:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  numerical:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   numhask-array:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   numhask-histogram:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   numhask-prelude:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   numhask-range:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   numhask-test:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  numhask:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Nussinov78:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Nutri:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nvim-hs-contrib:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nvim-hs-ghcid:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  nvim-hs:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   NXT:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   NXTDSL:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   nylas:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   nymphaea:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   o-clock:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   oanda-rest-api:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  oasis-xrd:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   oauth2-jwt-bearer:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   oauthenticated:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   obd:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7423,6 +7442,7 @@ dont-distribute-packages:
   Object:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   objectid:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ObjectIO:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  objective:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ocaml-export:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   octane:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   octohat:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7430,20 +7450,22 @@ dont-distribute-packages:
   Octree:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   oculus:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   odbc:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  OddWord:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   oden-go-packages:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  oeis2:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   off-simple:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   OGL:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ogmarkup:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ohloh-hs:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   oi:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   oidc-client:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ois-input-manager:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  old-version:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   olwrapper:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  om-elm:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   omaketex:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ombra:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   Omega:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   omega:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  omnicodec:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   omnifmt:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   on-a-horse:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   onama:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7455,7 +7477,6 @@ dont-distribute-packages:
   opaleye-classy:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   opaleye-sqlite:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   opaleye-trans:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  opaleye:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   open-haddock:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   open-pandoc:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   open-signals:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7467,19 +7488,10 @@ dont-distribute-packages:
   OpenCL:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   OpenCLRaw:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   OpenCLWrappers:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  opencog-atomspace:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  opencv-extra:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   opencv-raw:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  opencv:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   opendatatable:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  openexchangerates:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  openflow:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   OpenGLCheck:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   opengles:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  OpenGLRaw21:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  openpgp-crypto-api:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  openpgp-Crypto:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  openpgp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   OpenSCAD:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   opensoundcontrol-ht:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   openssh-github-keys:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7494,19 +7506,18 @@ dont-distribute-packages:
   opml-conduit:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   optima:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   optimal-blocks:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  optimization:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   optimusprime:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   optional:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  options-time:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   optparse-applicative-simple:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  optparse-helper:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   orc:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   orchestrate:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   OrchestrateDB:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   orchid-demo:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   orchid:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   order-maintenance:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  order-statistic-tree:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   order-statistics:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ordered:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   orders:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   Ordinary:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ordrea:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7519,6 +7530,7 @@ dont-distribute-packages:
   OrPatterns:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   osc:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   oscpacking:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  osdkeys:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Oslo-Vectize:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   osm-conduit:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   osm-download:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7526,12 +7538,15 @@ dont-distribute-packages:
   oso2pdf:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   ot:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   otp-authenticator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  OTP:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ottparse-pretty:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   overloaded-records:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   overture:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   pack:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   package-description-remote:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   package-o-tron:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   package-vt:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  packdeps:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   packed-dawg:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   packed-multikey-map:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   packedstring:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7542,21 +7557,29 @@ dont-distribute-packages:
   pads-haskell:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pagarme:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   PageIO:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pagerduty:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pagure-hook-receiver:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   Paillier:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  palette:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   pam:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   panda:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pandoc-citeproc:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   pandoc-crossref:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   pandoc-csv2table:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pandoc-filter-graphviz:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   pandoc-include-code:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   pandoc-include:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   pandoc-japanese-filters:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pandoc-lens:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   pandoc-plantuml-diagrams:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pandoc-sidenote:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pandoc-stylefrommeta:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   pandoc-unlit:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   PandocAgda:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   pang-a-lambda:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pango:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   pangraph:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   panpipe:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pansite:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   papa-export:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   papa-implement:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   papa-include:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7566,6 +7589,7 @@ dont-distribute-packages:
   papa-prelude-semigroups:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   papa-prelude:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   paphragen:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  papillon:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   pappy:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   paprika:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   paragon:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7585,26 +7609,26 @@ dont-distribute-packages:
   parse-help:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   parsec-free:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   parsec-parsers:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  parsec-pratt:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   parseerror-eq:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   parsely:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   parser-helper:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   parser241:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   parsergen:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   parsestar:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  parsix:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   partage:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   partial-lens:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   partial-order:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  partial-semigroup-hedgehog:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  partial-semigroup-test:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  partial-semigroup:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   partly:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   passage:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   PasswordGenerator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  passwords:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   pasta:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   pastis:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   pasty:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  patat:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   patches-vector:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  path-text-utf8:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   Pathfinder:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   pathfindingcore:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   PathTree:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7618,6 +7642,7 @@ dont-distribute-packages:
   pbc4hs:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   PBKDF2:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   pcap-enumerator:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pcd-loader:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   pcf:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   PCLT-DB:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   PCLT:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7634,8 +7659,10 @@ dont-distribute-packages:
   peakachu:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   PeanoWitnesses:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   pec:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pedestrian-dag:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   peg:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   peggy:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pell:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   pencil:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   penny-bin:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   penny-lib:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7643,7 +7670,6 @@ dont-distribute-packages:
   penrose:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   peparser:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   perceptron:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  perdure:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   peregrin:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   perf-analysis:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   perf:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7656,19 +7682,22 @@ dont-distribute-packages:
   permute:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   PermuteEffects:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   persist2er:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Persistence:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  persistent-audit:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   persistent-cereal:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   persistent-database-url:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   persistent-equivalence:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   persistent-hssqlppp:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   persistent-map:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   persistent-migration:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  persistent-mysql-haskell:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  persistent-mongoDB:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   persistent-odbc:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   persistent-protobuf:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  persistent-qq:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   persistent-ratelimit:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  persistent-refs:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   persistent-relational-record:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   persistent-template-classy:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  persistent-test:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   persistent-vector:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   persistent-zookeeper:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   persona-idp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7686,9 +7715,7 @@ dont-distribute-packages:
   pgsql-simple:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pgstream:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   phasechange:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  phaser:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   phoityne:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  phone-metadata:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   phone-numbers:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   phone-push:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   phooey:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7706,13 +7733,18 @@ dont-distribute-packages:
   picoparsec:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   picosat:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   pictikz:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pidfile:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   pier-core:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   pier:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   piet:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pig:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pinch:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   pinchot:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ping:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   pinpon:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipe-enumerator:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   Pipe:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pipes-async:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-attoparsec-streaming:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-bgzf:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-cacophony:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7723,14 +7755,15 @@ dont-distribute-packages:
   pipes-courier:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-errors:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-extra:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pipes-files:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pipes-fluid:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-illumina:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pipes-interleave:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-io:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-key-value-csv:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pipes-lzma:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-p2p-examples:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-p2p:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-protolude:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pipes-random:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-rt:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-s3:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   pipes-shell:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7744,7 +7777,6 @@ dont-distribute-packages:
   pitchtrack:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   pivotal-tracker:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   pixelated-avatar-generator:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  piyo:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   pkcs10:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   pkcs7:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   pkggraph:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7759,18 +7791,22 @@ dont-distribute-packages:
   plat:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   platinum-parsing:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   PlayingCards:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  plex:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   plist-buddy:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  plivo:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   plocketed:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   plot-gtk-ui:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  plot-gtk:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  plot-gtk3:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Plot-ho-matic:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   plot-lab:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   plot-light-examples:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  plot:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  plots:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   PlslTools:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   plugins-auto:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   plugins-multistage:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   plugins:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  plur:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  plural:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   png-file:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   pngload-fixed:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   pngload:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7778,6 +7814,7 @@ dont-distribute-packages:
   pocket:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   point-octree:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pointfree-fancy:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pointful:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   pointless-lenses:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   pointless-rewrite:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   pokemon-go-protobuf-types:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7791,31 +7828,34 @@ dont-distribute-packages:
   poly-control:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   polydata-core:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   polydata:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  polynom:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   polynomial:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   polyseq:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  polysoup:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   polytypeable-utils:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   polytypeable:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pomaps:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   pomodoro:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   pomohoro:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ponder:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   pong-server:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pontarius-mediaserver:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   pontarius-xmpp:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pontarius-xpmn:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   pool-conduit:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pool:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   popenhs:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  poppler:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   portager:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   porte:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   porter:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   PortFusion:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ports:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  posix-acl:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  posix-api:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   posix-pty:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   posix-realtime:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   posix-waitpid:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   postcodes:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgres-embedded:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  postgres-tmp:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgres-websockets:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-copy-escape:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-named:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7827,13 +7867,12 @@ dont-distribute-packages:
   postgresql-simple-sop:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-simple-typed:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-simple-url:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  postgresql-syntax:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-typed-lifted:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgresql-typed:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  PostgreSQL:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgrest-ws:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   postgrest:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   postie:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  postmark-streams:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   postmark:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   potato-tool:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   potoki-cereal:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7851,7 +7890,7 @@ dont-distribute-packages:
   pqueue-mtl:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   practice-room:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   praglude:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  precis:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pragmatic-show:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   precursor:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   pred-trie:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   predicate-class:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7868,19 +7907,17 @@ dont-distribute-packages:
   presto-hdbc:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   pretty-ncols:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   pretty-relative-time:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pretty-sop:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   prettyprinter-vty:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   preview:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  prim-array:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   prim-instances:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   primes-type:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   primesieve:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  primitive-checked:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   primitive-containers:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  primitive-extras:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   primitive-indexed:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   primitive-maybe:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   primitive-simd:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  primitive-sort:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  PrimitiveArray-Pretty:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   primula-board:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   primula-bot:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   pringletons:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7890,7 +7927,6 @@ dont-distribute-packages:
   priority-queue:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   priority-sync:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   PriorityChansConverger:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  prizm:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   ProbabilityMonads:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   proc:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   process-conduit:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7901,13 +7937,13 @@ dont-distribute-packages:
   process-qq:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   process-streaming:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   processing:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  procrastinating-structure:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   procrastinating-variable:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   procstat:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   producer:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   product:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   prof2dot:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   prof2pretty:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  profiteur:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   progress-meter:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   progress:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   progressbar:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7920,25 +7956,26 @@ dont-distribute-packages:
   prolog-graph:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   prolog:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   prometheus-effect:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  prometheus-metrics-ghc:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  prometheus:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   promise:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  pronounce:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   proof-combinators:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   propane:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  propellor:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Proper:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   properties:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   property-list:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   proplang:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  prospect:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   prosper:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  proteome:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   proto-lens-combinators:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   proto-lens-descriptors:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  proto-lens-runtime:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  proto-lens-setup:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   protobuf-native:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   protocol-buffers-descriptor-fork:               [ i686-linux, x86_64-linux, x86_64-darwin ]
   protocol-buffers-fork:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   protolude-lifted:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   proton-haskell:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  prototype:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   prove-everywhere-server:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   proxy-kindness:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   proxy-mapping:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7946,7 +7983,9 @@ dont-distribute-packages:
   pseudo-trie:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   PSQueue:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   pthread:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  PTQ:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   ptr:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  publicsuffix:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   publicsuffixlistcreate:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   pubnub:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   pubsub:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7955,7 +7994,6 @@ dont-distribute-packages:
   pugs-compat:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   pugs-DrIFT:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   pugs-hsregex:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pugs-HsSyck:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Pugs:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   PUH-Project:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   punkt:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7976,6 +8014,7 @@ dont-distribute-packages:
   pushme:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   putlenses:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   puzzle-draw-cmdline:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  puzzle-draw:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   pvd:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   PyF:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   pyffi:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -7992,7 +8031,6 @@ dont-distribute-packages:
   QLearn:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   qr-imager:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   qr-repa:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  qt:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   qtah-cpp-qt5:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   qtah-examples:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   qtah-generator:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8011,14 +8049,12 @@ dont-distribute-packages:
   queryparser-presto:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   queryparser-vertica:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   queryparser:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  querystring-pickle:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   questioner:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   queuelike:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   quick-schema:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   QuickAnnotate:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickbooks:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickcheck-arbitrary-template:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  quickcheck-combinators:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickcheck-poly:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickcheck-property-comb:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickcheck-property-monad:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8028,8 +8064,8 @@ dont-distribute-packages:
   quickcheck-report:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickcheck-state-machine-distributed:           [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickcheck-state-machine:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  quickcheck-string-random:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickcheck-webdriver:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  quickcheck-with-counterexamples:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   QuickCheckVariant:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   QuickPlot:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   quickpull:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8052,22 +8088,23 @@ dont-distribute-packages:
   R-pandoc:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   raaz:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   rad:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  radian:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   radium-formula-parser:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   radium:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  radix-tree:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   radix:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   rados-haskell:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   raft:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   rail-compiler-editor:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   rails-session:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   rainbow-tests:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Raincat:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  raketka:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   rakhana:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ralist:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rakuten:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   rallod:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   raml:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   rand-vars:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   randfile:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rando:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   random-access-list:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   random-derive:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   random-eff:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8076,11 +8113,12 @@ dont-distribute-packages:
   random-hypergeometric:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   random-stream:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   RandomDotOrg:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  range-set-list:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   range-space:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Range:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  range:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   Ranged-sets:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   rangemin:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rank1dynamic:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   rank2classes:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   Ranka:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   rapid-term:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8099,7 +8137,7 @@ dont-distribute-packages:
   rasa:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   rascal:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   Rasenschach:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rasterific-svg:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rattletrap:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   raven-haskell-scotty:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   raw-feldspar:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   rawr:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8107,6 +8145,7 @@ dont-distribute-packages:
   razom-text-util:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   rbr:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   rc:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rdf:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   rdf4h:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   rdioh:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   react-flux-servant:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8116,17 +8155,19 @@ dont-distribute-packages:
   reaction-logic:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-bacon:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-balsa:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  reactive-banana-automation:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-banana-bunch:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reactive-banana-sdl2:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  reactive-banana-gi-gtk:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-banana-sdl:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  reactive-banana-sdl2:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-banana-threepenny:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-banana-wx:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  reactive-banana:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-fieldtrip:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-glut:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-jack:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-midyim:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactive-thread:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reactive:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   reactor:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   read-io:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   readline-statevar:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8140,14 +8181,11 @@ dont-distribute-packages:
   record-preprocessor:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   record-syntax:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   record:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  records-sop:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   records-th:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   records:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  recursive-line-count:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   recursors:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   reddit:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  redHandlers:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  redis-io:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  redis-resp:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   redis-simple:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   redis:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   redland:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8155,9 +8193,11 @@ dont-distribute-packages:
   reduce-equations:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   reedsolomon:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   reenact:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ref-fd:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   ref-mtl:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Ref:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ref-tf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   ref:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Ref:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   refcount:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Referees:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   refh:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8174,8 +8214,7 @@ dont-distribute-packages:
   refurb:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   regex-deriv:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   regex-dfa:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  regex-examples:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  regex-genex:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  regex-generator:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   regex-parsec:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   regex-pderiv:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   regex-tdfa-pipes:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8184,11 +8223,7 @@ dont-distribute-packages:
   regex-tdfa-utf8:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   regex-tre:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   regex-type:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  regex-with-pcre:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   regex-xmlschema:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  regex:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  regexchar:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  regexdot:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   regexp-tries:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   regexpr-symbolic:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   regexqq:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8207,6 +8242,7 @@ dont-distribute-packages:
   rei:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   reified-records:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   reify:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  relacion:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   relapse:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   relation:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   relational-postgresql8:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8221,7 +8257,6 @@ dont-distribute-packages:
   remote-monad:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   remote:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   remotion:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reorderable:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   repa-array:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   repa-bytestring:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   repa-convert:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8245,11 +8280,11 @@ dont-distribute-packages:
   reprinter:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   reproject:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   req-conduit:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  reqcatcher:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   request-monad:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rerebase:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  require:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   reserve:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   reservoir:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  resin:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   resistor-cube:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   resolve-trivial-conflicts:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   resolve:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8264,14 +8299,12 @@ dont-distribute-packages:
   rest-gen:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   rest-happstack:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   rest-snap:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rest-stringmap:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   rest-types:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   rest-wai:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   restful-snap:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  restless-git:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  RESTng:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   restricted-workers:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   restyle:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  resumable-exceptions:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   rethinkdb-client-driver:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   rethinkdb-model:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   rethinkdb-wereHamster:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8289,10 +8322,11 @@ dont-distribute-packages:
   rfc-psql:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   rfc-redis:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   rfc-servant:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rfc3339:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   rfc:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   rhine-gloss:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rhine:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   rhythm-game-tutorial:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  ribosome:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   RichConditional:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ridley-extras:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   ridley:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8300,8 +8334,6 @@ dont-distribute-packages:
   riff:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   ring-buffer:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   riot:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ripple-federation:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ripple:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   risc386:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   riscv-isa:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   rivers:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8324,14 +8356,11 @@ dont-distribute-packages:
   rncryptor:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   rob:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   robin:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  robot:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   robots-txt:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   roc-cluster-demo:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   roc-cluster:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  roguestar-engine:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  roguestar-gl:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  roguestar-glut:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   roku-api:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rollbar-hs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   roller:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   RollingDirectory:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   rope:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8347,7 +8376,6 @@ dont-distribute-packages:
   roundtrip-string:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   roundtrip-xml:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   roundtrip:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  route-generator:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   route-planning:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   rowrecord:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   rpc-framework:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8359,11 +8387,9 @@ dont-distribute-packages:
   rsagl:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   rspp:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   rss-conduit:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rss:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  RtMidi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rss2irc:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   rtnetlink:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   rtorrent-rpc:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rtorrent-state:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   rts-loader:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   ruby-marshal:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   ruby-qq:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8384,9 +8410,14 @@ dont-distribute-packages:
   safe-globals:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   safe-lazy-io:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   safe-length:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  safe-money-aeson:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  safe-money-cereal:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  safe-money-serialise:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  safe-money-store:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  safe-money-xmlbf:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  safe-money:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   safe-plugins:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   safe-printf:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  safecopy-migrate:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   safecopy-store:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   safeint:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   safepath:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8419,6 +8450,7 @@ dont-distribute-packages:
   satchmo-funsat:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   satchmo-minisat:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   satchmo-toysat:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  satchmo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   savage:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   sax:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   SBench:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8426,12 +8458,13 @@ dont-distribute-packages:
   sc3-rdu:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   scalable-server:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   scaleimage:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  SCalendar:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  scalendar:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   scalp-webhooks:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   scan-vector-machine:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   scat:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   scc:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   scenegraph:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  scgi:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   schedevr:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   schedule-planner:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   schedyield:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8441,7 +8474,6 @@ dont-distribute-packages:
   scholdoc-types:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   scholdoc:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   science-constants-dimensional:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  science-constants:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   scion-browser:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   scion:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   scons2dot:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8450,13 +8482,18 @@ dont-distribute-packages:
   scottish:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   scotty-binding-play:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   scotty-blaze:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  scotty-cookie:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   scotty-fay:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   scotty-format:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   scotty-hastache:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  scotty-params-parser:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  scotty-path-normalizer:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   scotty-resource:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   scotty-rest:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   scotty-session:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  scotty-tls:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   scotty-view:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  scotty:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   scp-streams:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   scrabble-bot:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   scrape-changes:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8464,7 +8501,6 @@ dont-distribute-packages:
   script-monad:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   SCRIPTWriter:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   scrobble:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  scrz:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   Scurry:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   scythe:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   scyther-proof:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8472,22 +8508,16 @@ dont-distribute-packages:
   sdl2-cairo-image:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   sdl2-cairo:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   sdl2-compositor:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sdl2-fps:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sdl2-gfx:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sdl2-image:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sdl2-mixer:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sdl2-sprite:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sdl2-ttf:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sdl2:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   sdr:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  seacat:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   seakale-postgresql:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   seakale-tests:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   seakale:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  search-algorithms:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   sec:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   secdh:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   seclib:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   second-transfer:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  secp256k1:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   secret-santa:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   secret-sharing:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   secrm:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8501,9 +8531,11 @@ dont-distribute-packages:
   Semantique:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   semdoc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   semi-iso:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  semibounded-lattices:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   Semigroup:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   semigroupoids-syntax:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   semigroups-actions:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  semilattices:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   semiring-num:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   semiring:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   semver-range:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8515,6 +8547,8 @@ dont-distribute-packages:
   sentry:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   seqaid:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   SeqAlign:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  seqid-streams:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  seqid:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   seqloc-datafiles:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   seqloc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   sequent-core:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8526,33 +8560,40 @@ dont-distribute-packages:
   serv:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-aeson-specs:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-auth-cookie:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  servant-auth-docs:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-auth-hmac:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  servant-auth-swagger:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-auth-token-acid:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-auth-token-api:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-auth-token-leveldb:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-auth-token-persistent:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-auth-token-rocksdb:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-auth-token:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  servant-checked-exceptions-core:                [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-checked-exceptions:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-client:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-conduit:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-csharp:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-db-postgresql:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-db:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  servant-dhall:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  servant-docs:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-ekg:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-examples:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  servant-generate:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-generic:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  servant-github-webhook:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-github:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-haxl-client:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-hmac-auth:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-http2-client:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-iCalendar:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-jquery:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  servant-js:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-machines:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-matrix-param:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-multipart:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-nix:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  servant-pandoc:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-pipes:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-pool:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-postgresql:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8567,9 +8608,14 @@ dont-distribute-packages:
   servant-smsc-ru:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-snap:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-streaming-client:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  servant-streaming-docs:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  servant-streaming-server:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-subscriber:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  servant-swagger-ui-core:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-swagger-ui-jensoleg:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-swagger-ui-redoc:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  servant-swagger-ui:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  servant-swagger:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-xml:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-zeppelin-client:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   servant-zeppelin-server:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8585,14 +8631,16 @@ dont-distribute-packages:
   sessions:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   sessiontypes-distributed:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   sessiontypes:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  set-monad:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  set-cover:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  set-of:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   set-with:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  setdown:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   setgame:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   setoid:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   sets:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   setters:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sexp-grammar:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   sexp:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sexpr:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   sext:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   SFML-control:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   SFML:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8603,13 +8651,12 @@ dont-distribute-packages:
   sgd:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   SGdemo:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   sgf:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  SGplus:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   sgrep:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sh2md:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   sha-streams:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   shade:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   shadower:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  shady-gen:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  shady-graphics:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  shake-ats:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   shake-cabal-build:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   shake-extras:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   shake-minify:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8619,16 +8666,11 @@ dont-distribute-packages:
   shaker:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   shakespeare-babel:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   shakespeare-sass:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  shannon-fano:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   shapely-data:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  shapes-demo:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   shared-buffer:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   shared-fields:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  shared-memory:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   she:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   shelduck:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  shell-conduit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  shell-monad:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   shell-pipe:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   Shellac-compatline:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   Shellac-editline:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8638,8 +8680,9 @@ dont-distribute-packages:
   shellish:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   shellmate-extras:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   shellmate:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  shellwords:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   shh:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  shikensu:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  shimmer:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   shivers-cfg:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   shoap:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   shopify:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8653,6 +8696,7 @@ dont-distribute-packages:
   sifflet-lib:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   sifflet:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   sigma-ij:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sign:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   signals:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   signed-multiset:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   silvi:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8669,36 +8713,38 @@ dont-distribute-packages:
   simple-download:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-eval:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-firewire:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simple-form:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-genetic-algorithm:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-index:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-log-syslog:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-logging:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  simple-money:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-neural-networks:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-nix:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-pascal:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  simple-pipe:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-postgresql-orm:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-rope:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-session:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simple-sql-parser:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-tabular:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-tar:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-templates:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  simple-ui:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-vec3:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple-zipper:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   simple:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   simpleargs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   simpleconfig:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   SimpleGL:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  SimpleH:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   simpleirc-lens:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   simpleirc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   SimpleLog:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   simplenote:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   simpleprelude:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   SimpleServer:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  simplest-sqlite:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   simseq:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   singleton-dict:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  singleton-typelits:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   singnal:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   sink:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   siphon:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8709,6 +8755,7 @@ dont-distribute-packages:
   sized-grid:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   sized-types:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   sized-vector:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sized:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   sizes:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   sjsp:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   skeletal-set:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8722,13 +8769,15 @@ dont-distribute-packages:
   skype4hs:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   slack-web:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   slack:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  slave-thread:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  slick:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   slidemews:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Slides:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   slim:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   sloane:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  slope-field:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   slot-lambda:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   sloth:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  slug:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   smallarray:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   smallcaps:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   smallcheck-laws:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8747,12 +8796,11 @@ dont-distribute-packages:
   Smooth:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   smsaero:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   smt-lib:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  SmtLib:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   smtlib2-debug:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   smtlib2-pipe:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   smtlib2-quickcheck:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  SmtLib:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   smtp-mail-ng:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  smtp2mta:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   SMTPClient:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   smtps-gmail:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   smuggler:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8763,9 +8811,10 @@ dont-distribute-packages:
   snap-configuration-utilities:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   snap-error-collector:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   snap-extras:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snap-loader-dynamic:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snap-predicates:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  snap-language:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   snap-routes:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  snap-stream:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  snap-templates:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   snap-testing:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   snap-utils:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   snap-web-routes:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8824,14 +8873,11 @@ dont-distribute-packages:
   snowflake-server:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   snowtify:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Snusmumrik:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  soap-openssl:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   SoccerFun:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   SoccerFunGL:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sock2stream:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  socket-icmp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  socket-io:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   socket-sctp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   socket-unix:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  socket:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   socketed:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   socketio:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   socketson:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8865,13 +8911,15 @@ dont-distribute-packages:
   sparsecheck:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   sparser:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   spata:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  spatial-math:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   spatial-rotations:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  spdx:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   special-functors:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   special-keys:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   specialize-th:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  species:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  speculation-transformers:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  speculation:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   speechmatics:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  speedy-slice:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   spelling-suggest:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   sphero:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   sphinx-cli:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8898,6 +8946,7 @@ dont-distribute-packages:
   Sprig:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   sprinkles:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   spritz:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  sproxy-web:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   spsa:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   spy:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   sql-simple-mysql:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8911,7 +8960,6 @@ dont-distribute-packages:
   sqlvalue-list:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   sqsd-local:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   squeal-postgresql:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  squeeze:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   srcinst:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   sscan:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   sscgi:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8921,7 +8969,6 @@ dont-distribute-packages:
   sssp:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   sstable:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   SSTG:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  st2:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   stable-heap:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   stable-maps:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   stable-marriage:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8931,25 +8978,27 @@ dont-distribute-packages:
   stack-hpc-coveralls:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   stack-lib:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   stack-network:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stack-prism:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   stack-run-auto:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   stack-run:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stack-type:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stack2cabal:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   stack2nix:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   stackage-build-plan:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   stackage-cabal:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   stackage-cli:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   stackage-curator:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   stackage-metadata:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  stackage-query:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   stackage-sandbox:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   stackage-setup:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stackage-to-hackage:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   stackage-types:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   stackage-upload:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  stackage2nix:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   stackage:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stackage2nix:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   standalone-derive-topdown:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   standalone-haddock:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   starling:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  starrover2:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   stash:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   Stasis:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   state-bag:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8958,6 +9007,7 @@ dont-distribute-packages:
   state:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   stateful-mtl:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   stateWriter:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  static-canvas:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   static-closure:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   static-tensor:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   static-text:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -8968,31 +9018,34 @@ dont-distribute-packages:
   statsd-client:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   statsd:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   statsdi:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  status-notifier-item:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  staversion:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   stb-image-redux:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   stb-truetype:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   stdata:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   stdf:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   steambrowser:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  steeloverseer:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   stego-uuid:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   stemmer-german:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   stemmer:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   stepwise:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   stgi:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  stitch:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   STL:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   stm-chunked-queues:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  stm-containers:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   stm-firehose:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  stm-hamt:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stm-io-hooks:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stm-lifted:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   stm-promise:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stm-stats:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   stm-supply:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   stmcontrol:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   stochastic:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  StockholmAlignment:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   Stomp:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   storable-static-array:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   storable:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   storablevector-streamfusion:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stp:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   str:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   Strafunski-ATermLib:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   Strafunski-Sdf2Haskell:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9005,6 +9058,7 @@ dont-distribute-packages:
   stream-fusion:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   stream-monad:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   stream:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  streamdeck:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   streamed:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   streaming-benchmarks:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   streaming-cassava:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9016,22 +9070,21 @@ dont-distribute-packages:
   streaming-png:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   streaming-postgresql-simple:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   streaming-process:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  streaming-sort:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   streaming-utils:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   strelka:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   strict-data:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  strict-types:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   StrictBench:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   StrictCheck:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   strictly:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   string-isos:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  string-random:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   string-typelits:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   stringlike:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   stringtable-atom:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  stripe-core:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   stripe-haskell:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   stripe-http-client:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  stripe-http-streams:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  stripe-tests:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stripe-scotty:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   stripe:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   structural-induction:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   structural-traversal:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9040,6 +9093,7 @@ dont-distribute-packages:
   stt:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   stunts:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   stutter:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  stylish-cabal:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   stylized:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   sub-state:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   subhask:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9047,6 +9101,7 @@ dont-distribute-packages:
   submark:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   subsample:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   substring-parser:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  subwordgraph:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   successors:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   suffix-array:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   suffixarray:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9059,38 +9114,36 @@ dont-distribute-packages:
   sunroof-examples:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   sunroof-server:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   super-user-spark:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  superbubbles:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   superbuffer:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   supercollider-ht:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   supercollider-midi:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   superconstraints:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  superdoc:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   superevent:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   supermonad:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   supero:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   supervisor:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  supervisors:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   supplemented:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   surjective:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sv-cassava:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sv-core:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   sv-svfactor:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   sv:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   SVD2HS:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  svfactor:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   svg-builder-fork:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  svg-tree:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   SVG2Q:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   svg2q:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  svgcairo:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   svgutils:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   svm-light-utils:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   svm-simple:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   svndump:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   swagger-petstore:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   swagger-test:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  swagger2:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   swapper:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   swearjure:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   swf:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   swift-lda:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sws:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   syb-extras:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   syb-with-class-instances-text:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   SybWidget:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9098,7 +9151,10 @@ dont-distribute-packages:
   sylvia:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   sym-plot:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   sym:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  symantic-cli:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  symantic-grammar:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   symantic-lib:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  symantic:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   symengine-hs:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   symengine:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   symmetric-properties:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9131,9 +9187,9 @@ dont-distribute-packages:
   t3-client:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   t3-server:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ta:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  table-layout:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   table-tennis:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   table:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  TableAlgebra:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   tableaux:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Tables:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   tables:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9149,14 +9205,12 @@ dont-distribute-packages:
   tagged-th:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   tagged-timers:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   taglib-api:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tagset-positional:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   tagsoup-ht:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   tagsoup-megaparsec:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   tagsoup-parsec:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   tagsoup-selection:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tai64:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   tai:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tailfile-hinotify:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tai64:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   takahashi:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   takusen-oracle:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   Takusen:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9173,10 +9227,12 @@ dont-distribute-packages:
   tasty-auto:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   tasty-fail-fast:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   tasty-groundhog-converters:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tasty-hedgehog-coverage:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   tasty-integrate:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   tasty-jenkins-xml:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   tasty-laws:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   tasty-lens:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tasty-stats:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   tasty-tap:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   tasty-travis:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   TaxonomyTools:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9190,8 +9246,10 @@ dont-distribute-packages:
   tcp:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   tdd-util:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   tdigest-Chart:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tdigest:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   TeaHS:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   teams:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  teardown:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   teeth:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   telegram-api:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   telegram-bot-simple:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9204,7 +9262,6 @@ dont-distribute-packages:
   template-haskell-compat-v0208:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   template-haskell-util:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   template-hsml:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  template-toolkit:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   template-yj:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   templateify:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   templatepg:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9213,11 +9270,18 @@ dont-distribute-packages:
   temporary-resourcet:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   tempus:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   tensor:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  term-rewriting:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tensorflow-core-ops:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tensorflow-logging:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tensorflow-opgen:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tensorflow-ops:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tensorflow-proto:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tensorflow:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  termbox-banana:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   termbox-bindings:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   termcolor:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   terminal-text:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   termination-combinators:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  termonad:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   termplot:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   terntup:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   terrahs:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9239,21 +9303,15 @@ dont-distribute-packages:
   testloop:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   testpack:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   testpattern:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  testPkg:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   testrunner:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   TeX-my-math:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   tex2txt:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   texbuilder:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-all:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-and-plots:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  text-ansi:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  text-builder:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-containers:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  text-format-heavy:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-generic-pretty:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-icu-normalized:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  text-icu-translit:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  text-json-qq:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-lens:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-locale-encoding:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-markup:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9261,10 +9319,8 @@ dont-distribute-packages:
   text-plus:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-position:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-register-machine:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  text-replace:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  text-show-instances:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-time:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  text-xml-generic:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  text-utf8:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-xml-qq:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   text-zipper-monad:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   textmatetags:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9282,36 +9338,38 @@ dont-distribute-packages:
   th-instance-reification:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   th-instances:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   th-kinds-fork:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  th-nowq:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   th-sccs:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   th-to-exp:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   th-traced:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   th-typegraph:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   thank-you-stars:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  theatre:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   themoviedb:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   thentos-cookie-session:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   Theora:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   theoremquest-client:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   theoremquest:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  these-skinny:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  these:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   thih:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   thimk:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   Thingie:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   thorn:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  threepenny-editors:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  threadmanager:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  threads-supervisor:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  threadscope:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   threepenny-gui-contextmenu:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   threepenny-gui-flexbox:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Thrift:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  thrift:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  thrist:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   throttled-io-loop:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  throwable-exceptions:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  through-text:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   thumbnail-plus:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   tic-tac-toe:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   tickle:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tictactoe3d:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   TicTacToe:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tictactoe3d:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   tidal-midi:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   tidal-serial:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tidal-vis:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   tie-knot:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   tiempo:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   tiger:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9335,16 +9393,19 @@ dont-distribute-packages:
   timeout:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   timeparsers:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   TimePiece:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  timeplot:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   timeprint:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  timerep:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  timers-tick:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   timeseries:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   timespan:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   timezone-unix:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tintin:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   tiny-scheduler:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   TinyLaunchbury:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   tinyMesh:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   tinytemplate:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   TinyURL:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tinyXml:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   tip-haskell-frontend:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   tip-lib:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   titan:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9368,9 +9429,9 @@ dont-distribute-packages:
   tokyocabinet-haskell:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   tokyotyrant-haskell:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   tomato-rubato-openal:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  toml-parser:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   toml:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tomlcheck:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tomland:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  toodles:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Top:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   top:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   topkata:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9384,10 +9445,12 @@ dont-distribute-packages:
   toysolver:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   tpar:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   tpb:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tpdb:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   trace-call:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   trace-function-call:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   trace:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   traced:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  tracetree:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   tracker:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   trackit:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   traction:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9411,6 +9474,7 @@ dont-distribute-packages:
   translate:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   trasa-client:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   trasa-server:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  trasa:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   travis-meta-yaml:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   travis:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   trawl:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9425,6 +9489,7 @@ dont-distribute-packages:
   TrendGraph:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   trhsx:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   triangulation:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  trie-simple:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   TrieMap:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   tries:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   trigger:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9437,19 +9502,16 @@ dont-distribute-packages:
   tsession-happstack:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   tsession:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   tskiplist:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tslib:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   tsp-viz:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   tsparse:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   tsuntsun:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   tsvsql:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   ttask:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   ttn-client:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ttn:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   tttool:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   tuntap:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   tup-functor:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   tuple-gen:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tuple-hlist:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   tuple-lenses:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   tuple-morph:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   tuple-ops:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9457,7 +9519,6 @@ dont-distribute-packages:
   turing-machines:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   turingMachine:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   turtle-options:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  TV:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   tweak:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   twee:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   tweet-hs:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9472,12 +9533,14 @@ dont-distribute-packages:
   twhs:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   twidge:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   twilight-stm:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  twilio:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   twill:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   twine:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  twisty:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  twitch:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  twitter-conduit:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   twitter-enumerator:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   twitter-feed:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  twitter-types-lens:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  twitter-types:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   twitter:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   tx:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   txt:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9495,12 +9558,12 @@ dont-distribute-packages:
   type-eq:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-indexed-queues:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-int:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  type-interpreter:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-level-bst:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-level-natural-number-induction:            [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-level-natural-number-operations:           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  type-level-sets:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-list:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  type-map:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  type-natural:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-ord-spine-cereal:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-ord:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   type-prelude:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9510,24 +9573,23 @@ dont-distribute-packages:
   type-sub-th:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   typeable-th:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   TypeClass:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  TypeCompose:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   typed-spreadsheet:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   typed-streams:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   typed-wire:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  typedflow:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   typedquery:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   typehash:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   TypeIlluminator:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   typelevel-tensor:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   TypeNat:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   typeparams:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  typerep-map:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   types-compat:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   typesafe-precure:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   typescript-docs:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   typograffiti:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  typography-geometry:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   tyro:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   u2f:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  uAgda:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   uber:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   uberlast:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   uconv:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9539,24 +9601,17 @@ dont-distribute-packages:
   ui-command:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   UMM:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   unagi-bloomfilter:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  unagi-streams:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   unamb-custom:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   unbound:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   unbounded-delays-units:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   unboxed-containers:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   unbreak:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  unexceptionalio-trans:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  unfix-binders:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  uni-events:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   uni-graphs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  uni-htk:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  uni-posixutil:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  uni-reactor:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   uni-uDrawGraph:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  uni-util:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   unicode-normalization:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   unicode-show:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   unicode-symbols:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  unicoder:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   uniform-io:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   union-map:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   unique-logic-tf:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9565,19 +9620,25 @@ dont-distribute-packages:
   uniquely-represented-sets:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   units-attoparsec:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   units-defs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  units-parser:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   units:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   unittyped:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   unity-testresult-parser:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   unitym-yesod:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  universe-instances-extended:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   universe-th:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  universe:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  universum:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   unix-fcntl:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   unix-handle:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   unix-process-conduit:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   unm-hip:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   unordered-containers-rematch:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   unordered-graphs:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  unordered-intmap:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   unpack-funcs:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  unpacked-either:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  unpacked-maybe-numeric:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  unpacked-maybe:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   unpacked-these:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   unpacked-validation:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   unroll-ghc-plugin:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9593,6 +9654,8 @@ dont-distribute-packages:
   upskirt:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   ureader:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   urembed:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  uri-bytestring-aeson:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  uri-bytestring:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   uri-conduit:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   uri-enumerator-file:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   uri-enumerator:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9606,6 +9669,7 @@ dont-distribute-packages:
   urldecode:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   urldisp-happstack:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   UrlDisp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  urlencoded:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   urlpath:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   URLT:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   urn-random:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9613,6 +9677,7 @@ dont-distribute-packages:
   urxml:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   usb-enumerator:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   usb-hid:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  usb-id-database:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   usb-iteratee:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   usb-safe:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   users-mysql-haskell:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9636,30 +9701,34 @@ dont-distribute-packages:
   uulib:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   uvector-algorithms:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   uvector:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  uxadt:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   v4l2-examples:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   v4l2:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vabal:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   vacuum-cairo:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   vacuum-graphviz:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   vacuum-opengl:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   vacuum-ubigraph:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   vacuum:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vado:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   valid-names:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   validate-input:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   validated-literals:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   validated-types:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   Validation:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  validation:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   validations:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  validity-path:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   vampire:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   var:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   varan:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   variable-precision:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   variables:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  varying:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  variation:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   vault-tool-server:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   vault-tool:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   vault-trans:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   vaultaire-common:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vaultenv:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   vcard:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   vcatt:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   vcf:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9668,6 +9737,7 @@ dont-distribute-packages:
   Vec-Boolean:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Vec-OpenGLRaw:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   Vec-Transform:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vec:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   vect-floating-accelerate:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   vect-floating:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   vect-opengl:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9680,38 +9750,45 @@ dont-distribute-packages:
   vector-instances-collections:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   vector-random:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   vector-read-instances:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vector-space-map:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   vector-space-opengl:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vector-space-points:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   vector-static:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vectortiles:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   Verba:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   verbalexpressions:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   verdict-json:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   verdict:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  verifiable-expressions:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   verify:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   verilog:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  versioning-servant:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  versioning:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   vfr-waypoints:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   vgrep:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   vhd:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   vhdl:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   vicinity:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   ViennaRNA-extras:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  viewprof:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   views:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   vigilance:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Villefort:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   vimeta:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   vimus:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   vintage-basic:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vinyl-gl:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   vinyl-json:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   vinyl-operational:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   vinyl-plus:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   vinyl-utils:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   vinyl-vectors:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   virthualenv:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  visibility:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   vision:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   visual-graphrewrite:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   visual-prof:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   visualize-cbn:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vivid-supercollider:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vivid:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   vk-aws-route53:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   VKHS:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   voicebase:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9726,20 +9803,19 @@ dont-distribute-packages:
   vty-menu:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   vty-ui-extras:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   vty-ui:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vulkan-api:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  vulkan:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   waargonaut:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   wacom-daemon:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   waddle:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   wahsp:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-devel:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wai-dispatch:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wai-frontend-monadcgi:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-git-http:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-graceful:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-handler-devel:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-handler-scgi:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-handler-snap:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-handler-webkit:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wai-hastache:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-hmac-auth:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-lens:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-lite:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9756,25 +9832,27 @@ dont-distribute-packages:
   wai-middleware-etag:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-headers:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-hmac-client:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wai-middleware-metrics:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-preprocessor:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wai-middleware-prometheus:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-rollbar:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-route:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-middleware-static-caching:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-request-spec:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-responsible:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-router:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wai-routes:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-routing:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-secure-cookies:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-session-alt:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-session-mysql:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-session-postgresql:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wai-session-tokyocabinet:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-static-cache:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-thrift:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   wai-throttler:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  waitfree:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   waitra:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   waldo:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wallpaper:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   warp-dynamic:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   warp-static:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   WashNGo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9816,11 +9894,11 @@ dont-distribute-packages:
   webfinger-client:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   webify:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   webkit-javascriptcore:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  webkit2gtk3-javascriptcore:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   webpage:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Webrexp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   webserver:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   websockets-rpc:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  websockets-simple:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   webwire:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   weighted-regexp:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   weighted:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9838,17 +9916,20 @@ dont-distribute-packages:
   why3:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   WikimediaParser:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   wikipedia4epub:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wild-bind-indicator:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wild-bind-task-x11:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   windns:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   windowslive:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   winerror:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  winery:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   winio:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wire-streams:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Wired:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wires:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   wiring:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  witty:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wkt-geom:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  withdependencies:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   wkt:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   wl-pprint-ansiterm:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wl-pprint-extras:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wl-pprint-terminfo:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   WL500gPControl:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   WL500gPLib:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   wlc-hs:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9859,16 +9940,18 @@ dont-distribute-packages:
   word2vec-model:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   WordAlignment:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   wordchoice:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Wordlint:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   WordNet-ghc74:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   WordNet:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  wordpass:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   wordsearch:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  work-time:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   workdays:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   workflow-extra:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   workflow-osx:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   workflow-pure:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   workflow-types:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   workflow-windows:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Workflow:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   wp-archivebot:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   wraxml:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   wrecker-ui:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9878,7 +9961,6 @@ dont-distribute-packages:
   ws:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   wsdl:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   wsedit:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wsjtx-udp:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   wss-client:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   wtk-gtk:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   wtk:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9888,10 +9970,7 @@ dont-distribute-packages:
   wumpus-microprint:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   wumpus-tree:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   WURFL:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wx:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   wxAsteroids:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wxc:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wxcore:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   WXDiffCtrl:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   wxdirect:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   wxFruit:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9905,10 +9984,8 @@ dont-distribute-packages:
   X11-rm:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   X11-xdamage:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   X11-xfixes:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  x509-util:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   x86-64bit:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   xcb-types:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xcffib:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   xchat-plugin:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   xcp:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   xdcc:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9920,6 +9997,7 @@ dont-distribute-packages:
   xhb-atom-cache:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   xhb-ewmh:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   xhb:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xilinx-lava:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   xine:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   xing-api:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   xkbcommon:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9931,6 +10009,7 @@ dont-distribute-packages:
   xml-conduit-decode:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml-enumerator-combinators:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml-enumerator:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xml-html-conduit-lens:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml-monad:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml-parsec:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml-pipe:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9940,27 +10019,23 @@ dont-distribute-packages:
   xml-query-xml-types:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml-query:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml-tydom-conduit:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xml-tydom-core:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml2json:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml2x:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  XML:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   xmlbf-xeno:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   xmlbf-xmlhtml:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xmlhtml:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   XmlHtmlWriter:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   XMLParser:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   xmltv:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  XMMS:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   xmms2-client-glib:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   xmms2-client:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  XMMS:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   xmonad-bluetilebranch:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   xmonad-contrib-bluetilebranch:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   xmonad-contrib-gpl:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xmonad-entryhelper:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   xmonad-eval:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xmonad-extras:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   xmonad-screenshot:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   xmonad-vanessa:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xmonad-wallpaper:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   xmonad-windownames:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   xmpipe:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   XMPP:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9975,7 +10050,6 @@ dont-distribute-packages:
   xsd:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   xslt:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   xtc:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xturtle:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   xxhash:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   y0l0bot:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   yabi-muno:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -9988,23 +10062,24 @@ dont-distribute-packages:
   yajl-enumerator:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   yajl:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   yak:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yam-job:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   yam-servant:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   yam-transaction-odbc:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   yam-web:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yam:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   yaml-pretty-extras:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   yaml-rpc-scotty:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   yaml-rpc-snap:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   yaml-rpc:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   yaml2owl:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yamlkeysdiff:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   yampa-canvas:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   yampa-glfw:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   yampa-gloss:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   yampa-glut:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   yampa-sdl2:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   yampa-test:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yampa2048:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   Yampa:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yampa2048:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   YampaSynth:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   yandex-translate:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   yaop:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -10026,6 +10101,7 @@ dont-distribute-packages:
   yesod-auth-bcrypt:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-bcryptdb:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-deskcom:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-auth-fb:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-hmac-keccak:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-kerberos:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-ldap-mediocre:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -10037,6 +10113,7 @@ dont-distribute-packages:
   yesod-auth-smbclient:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-auth-zendesk:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-bootstrap:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-colonnade:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-comments:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-content-pdf:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-continuations:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -10055,6 +10132,7 @@ dont-distribute-packages:
   yesod-lucid:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-mangopay:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-markdown:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yesod-media-simple:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-paginate:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-pagination:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-paypal-rest:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -10066,7 +10144,6 @@ dont-distribute-packages:
   yesod-raml-docs:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-raml-mock:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-raml:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-recaptcha2:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-recaptcha:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-routes-flow:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-routes-typescript:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -10080,8 +10157,8 @@ dont-distribute-packages:
   yesod-tls:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-vend:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   yesod-worker:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yet-another-logger:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   YFrob:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yggdrasil:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   yhccore:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   yi-contrib:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   yi-core:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -10104,10 +10181,7 @@ dont-distribute-packages:
   yices:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   yjftp-libs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   yjftp:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yjsvg:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yoctoparsec:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   yoda:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yoga:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   Yogurt-Standalone:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   Yogurt:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   yoko:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -10117,10 +10191,11 @@ dont-distribute-packages:
   yu-core:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   yu-launch:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   yu-tool:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yuiGrid:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   yuuko:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  yx:                                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   yxdb-utils:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   z3-encoding:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  z85:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   zabt:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   zampolit:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   zasni-gerna:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -10145,11 +10220,10 @@ dont-distribute-packages:
   zifter-hlint:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   zifter-stack:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   zifter:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  zigbee-znet25:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   zip-conduit:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   zipedit:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ZipFold:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   zipkin:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  zipper:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   ziptastic-client:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   ziptastic-core:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   zlib-enum:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -10157,7 +10231,6 @@ dont-distribute-packages:
   ZMachine:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   zmcat:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   zmidi-score:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  zmqat:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   zoneinfo:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   zoom-cache-pcm:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   zoom-cache-sndfile:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -10167,6 +10240,7 @@ dont-distribute-packages:
   zre:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   zsh-battery:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   zstd:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
+  zsyntax:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   ztar:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   zuramaru:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   Zwaluw:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]

From 720a857c559d95e9858248240e6f5dbdfa1a3494 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 27 Dec 2018 02:30:40 +0100
Subject: [PATCH 217/274] hackage-packages.nix: automatic Haskell package set
 update

This update was generated by hackage2nix v2.13-1-gda47f40 from Hackage revision
https://github.com/commercialhaskell/all-cabal-hashes/commit/62a980cbfe8208140bc97be4bb4c8ee67681bd8d.
---
 .../haskell-modules/hackage-packages.nix      | 3495 ++++++++++++-----
 1 file changed, 2429 insertions(+), 1066 deletions(-)

diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 574c29f76da3..b48dad3b1cb9 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -274,6 +274,7 @@ self: {
        ];
        description = "Efficient, high-level dynamic programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ADPfusionForest" = callPackage
@@ -325,6 +326,7 @@ self: {
        ];
        description = "Dynamic programming for Set data structures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "AERN-Basics" = callPackage
@@ -1201,7 +1203,6 @@ self: {
        ];
        description = "A compiler front-end generator";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BNFC-meta" = callPackage
@@ -1406,6 +1407,7 @@ self: {
        ];
        description = "Libary for Hidden Markov Models in HMMER3 format";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Biobase" = callPackage
@@ -1481,6 +1483,7 @@ self: {
        ];
        description = "Ensembl related datastructures and functions";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BiobaseFR3D" = callPackage
@@ -1520,7 +1523,6 @@ self: {
        ];
        description = "streaming FASTA parser";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BiobaseHTTP" = callPackage
@@ -1538,6 +1540,7 @@ self: {
        ];
        description = "Libary to interface with the Bioinformatics HTTP services - Entrez Ensembl";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BiobaseHTTPTools" = callPackage
@@ -1556,6 +1559,7 @@ self: {
        ];
        description = "Tools to query Bioinformatics HTTP services e.g. Entrez, Ensembl.";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BiobaseInfernal" = callPackage
@@ -1634,6 +1638,7 @@ self: {
        ];
        description = "Newick file format parser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BiobaseTrainingData" = callPackage
@@ -1699,7 +1704,6 @@ self: {
        ];
        description = "Collection of types for bioinformatics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BiobaseVienna" = callPackage
@@ -2015,6 +2019,7 @@ self: {
        libraryHaskellDepends = [ base bytestring network text ];
        description = "A socker wrapper that makes the IO of sockets much cleaner";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Buster" = callPackage
@@ -2305,6 +2310,7 @@ self: {
        ];
        description = "Firing rules semantic of CSPM";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "CSPM-Frontend" = callPackage
@@ -2566,6 +2572,7 @@ self: {
        libraryHaskellDepends = [ base containers fgl parsec ];
        description = "An implementation and DSL for the Carneades argumentation model";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "CarneadesIntoDung" = callPackage
@@ -2582,6 +2589,7 @@ self: {
        ];
        description = "A translation from the Carneades argumentation model into Dung's AFs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Cartesian" = callPackage
@@ -2672,6 +2680,7 @@ self: {
        ];
        description = "A library for generating 2D Charts and Plots";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Chart-cairo" = callPackage
@@ -2688,6 +2697,7 @@ self: {
        ];
        description = "Cairo backend for Charts";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Chart-diagrams" = callPackage
@@ -2726,6 +2736,7 @@ self: {
        ];
        description = "Utility functions for using the chart library with GTK";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Chart-simple" = callPackage
@@ -2916,6 +2927,7 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Libary for parsing Clustal tools output";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Coadjute" = callPackage
@@ -3992,6 +4004,7 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "A very simple implementation of decision trees for discrete attributes";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DeepArrow" = callPackage
@@ -4003,7 +4016,6 @@ self: {
        libraryHaskellDepends = [ base haskell-src mtl TypeCompose ];
        description = "Arrows for \"deep application\"";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DeepDarkFantasy" = callPackage
@@ -4075,7 +4087,6 @@ self: {
        libraryHaskellDepends = [ base containers xmonad xmonad-contrib ];
        description = "A library for specifying xmonad key bindings with functionality";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Dflow" = callPackage
@@ -4415,6 +4426,7 @@ self: {
        libraryHaskellDepends = [ base cmdargs containers parsec ];
        description = "An implementation of the Dung argumentation frameworks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Dust" = callPackage
@@ -4608,6 +4620,7 @@ self: {
        ];
        description = "Parsing all context-free grammars using Earley's algorithm";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Ebnf2ps" = callPackage
@@ -5413,6 +5426,7 @@ self: {
        ];
        description = "Functions on System.FilePath";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "FileSystem" = callPackage
@@ -5454,8 +5468,8 @@ self: {
      }:
      mkDerivation {
        pname = "Fin";
-       version = "0.2.6.1";
-       sha256 = "15r5cvxwwbp7d6fmkfkzg65kzwf5v4j3rf84a5qsw900i4c05cmx";
+       version = "0.2.7.0";
+       sha256 = "0w29dc2mdy0q3y5v6mkc0m51vp1bmbx8bswvr1khby63vb5zwcf3";
        libraryHaskellDepends = [
          alg base foldable1 natural-induction peano universe-base
        ];
@@ -5622,6 +5636,8 @@ self: {
        pname = "ForSyDe";
        version = "3.1.1";
        sha256 = "0ggwskyxpdrjny0rz61zdp20r5vzig8ggmqxf0qa8gljvvfp6bhp";
+       revision = "2";
+       editedCabalFile = "1aqgir67890wknbrjk1lj3f8kgdvr6abxrhzam1wh7n9jy3i5d68";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          array base containers directory filepath mtl old-time
@@ -5776,7 +5792,6 @@ self: {
        libraryHaskellDepends = [ base HaXml ];
        description = "A binding for the Financial Products Markup Language (v5.3)";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "FractalArt" = callPackage
@@ -5826,8 +5841,8 @@ self: {
      }:
      mkDerivation {
        pname = "Frames";
-       version = "0.6.0";
-       sha256 = "0ri1x80za9gjcv44xk9kgx5w5jczr2p26jlpwhmn1sgmjdyc2m02";
+       version = "0.6.1";
+       sha256 = "07pqy9ljf0ag5yxd62fi3c41pcvysfqccjizfiwz8ycfdj2b6a6l";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -5844,7 +5859,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion pipes transformers ];
        description = "Data frames For working with tabular data files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Frames-beam" = callPackage
@@ -5931,6 +5945,7 @@ self: {
        executableHaskellDepends = [ base GLUT OpenGL random ];
        description = "A lightweight, cross-platform, OpenGL/GLUT-based game engine";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Fungi" = callPackage
@@ -6162,7 +6177,6 @@ self: {
        libraryToolDepends = [ hpp ];
        description = "Miscellaneous OpenGL utilities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GPX" = callPackage
@@ -6294,6 +6308,7 @@ self: {
        ];
        description = "Some kind of game library or set of utilities";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Ganymede" = callPackage
@@ -7231,6 +7246,8 @@ self: {
        pname = "HCL";
        version = "1.7.1";
        sha256 = "1rwg7sqm16rszv7grw2d7cnhllnrifnd9jjxn0p8n5qznv8m8vkp";
+       revision = "1";
+       editedCabalFile = "1gl61kqccd909dif3644qi1whrcbkrfif6d52hrlf2vc3kwpjs0z";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -7243,7 +7260,6 @@ self: {
        ];
        description = "High-level library for building command line interfaces";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HCard" = callPackage
@@ -8191,6 +8207,7 @@ self: {
        testHaskellDepends = [ base HTF ];
        description = "Generation of PDF documents";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HPath" = callPackage
@@ -8905,6 +8922,7 @@ self: {
        ];
        description = "The Haskell LaTeX library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HaTeX-meta" = callPackage
@@ -8978,7 +8996,6 @@ self: {
        executableHaskellDepends = [ base directory polyparse pretty ];
        description = "Utilities for manipulating XML documents";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Hach" = callPackage
@@ -9156,7 +9173,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "A library for arbitrary precision decimal numbers";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HasCacBDD" = callPackage
@@ -9682,7 +9698,6 @@ self: {
        testHaskellDepends = [ base process QuickCheck ];
        description = "Lightweight algorithmic debugging";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HoleyMonoid" = callPackage
@@ -10049,6 +10064,22 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "HsYAML_0_1_1_3" = callPackage
+    ({ mkDerivation, base, bytestring, containers, mtl, parsec, text }:
+     mkDerivation {
+       pname = "HsYAML";
+       version = "0.1.1.3";
+       sha256 = "0awkwmdbdis5cbazrshiskds02kri51i19jbmgmrqbnqqhk3rl2x";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring containers mtl parsec text
+       ];
+       description = "Pure Haskell YAML 1.2 parser";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "Hsed" = callPackage
     ({ mkDerivation, array, base, bytestring, cmdargs, data-accessor
      , data-accessor-template, data-accessor-transformers, directory
@@ -10247,8 +10278,8 @@ self: {
     ({ mkDerivation, base, mtl, QuickCheck, Stream }:
      mkDerivation {
        pname = "IOSpec";
-       version = "0.3.1";
-       sha256 = "1xfhsj8r2gf9wynsihls255qqwqj8vrjyn56rk60xvm27ya4f1d3";
+       version = "0.3.1.1";
+       sha256 = "1w6f7jnjm4n0s4mr18yqv81rsnrh8f6806x523gnqljbyak18p1l";
        libraryHaskellDepends = [ base mtl QuickCheck Stream ];
        description = "A pure specification of the IO monad";
        license = stdenv.lib.licenses.bsd3;
@@ -11105,6 +11136,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) openblasCompat;};
 
+  "LC3" = callPackage
+    ({ mkDerivation, base, bytestring, hspec, lens, mtl, vector }:
+     mkDerivation {
+       pname = "LC3";
+       version = "0.1.0.2";
+       sha256 = "029l4rgdzas0w9c4dpgfxhgbl1ngkvsfd3yf6mx8vwriwgmqbs05";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base bytestring hspec lens mtl vector
+       ];
+       description = "LC-3 virtual machine";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "LDAP" = callPackage
     ({ mkDerivation, base, HUnit, openldap }:
      mkDerivation {
@@ -11122,12 +11168,12 @@ self: {
      }) {inherit (pkgs) openldap;};
 
   "LParse" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, containers }:
      mkDerivation {
        pname = "LParse";
-       version = "0.2.3.0";
-       sha256 = "060jxkdnw1s01sawnlzrm91ycjgpa3kw8n9xrb1hgcrbjkzdw39s";
-       libraryHaskellDepends = [ base ];
+       version = "0.3.0.0";
+       sha256 = "0nl76ycq608p2wm61pqn64wmq5aqmnwc9p8k4mvx8zwqw06jqlmm";
+       libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base ];
        description = "A continuation-based parser library";
        license = stdenv.lib.licenses.mit;
@@ -11881,6 +11927,7 @@ self: {
        libraryHaskellDepends = [ base bytestring hidapi mtl ];
        description = "Haskell interface for controlling the mBot educational robot";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MC-Fold-DP" = callPackage
@@ -12337,6 +12384,7 @@ self: {
        libraryHaskellDepends = [ base glib template-haskell ];
        description = "Useful types and definitions missing from other libraries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MissingM" = callPackage
@@ -12943,7 +12991,6 @@ self: {
        libraryHaskellDepends = [ base containers random ];
        description = "A name generator written in Haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "NanoProlog" = callPackage
@@ -13329,6 +13376,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Library providing a non-empty list datatype, and total functions operating on it";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "NonEmptyList" = callPackage
@@ -13505,6 +13553,7 @@ self: {
        testHaskellDepends = [ base bytestring tasty tasty-hunit time ];
        description = "HMAC-Based and Time-Based One-Time Passwords (HOTP & TOTP)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Object" = callPackage
@@ -13595,6 +13644,7 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Provides a wrapper for deriving word types with fewer bits";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Omega" = callPackage
@@ -14102,6 +14152,7 @@ self: {
        ];
        description = "An implementation of Montague's PTQ";
        license = "LGPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "PUH-Project" = callPackage
@@ -14476,6 +14527,7 @@ self: {
        ];
        description = "Quickly detect clusters and holes in data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Phsu" = callPackage
@@ -14724,6 +14776,7 @@ self: {
        ];
        description = "Pretty-printing for primitive arrays";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Printf-TH" = callPackage
@@ -15422,6 +15475,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "RSA_2_3_1" = callPackage
+    ({ mkDerivation, base, binary, bytestring, crypto-api
+     , crypto-pubkey-types, DRBG, QuickCheck, SHA, tagged
+     , test-framework, test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "RSA";
+       version = "2.3.1";
+       sha256 = "06k7nd7b1rdfb7891gw9bihrd9ripffbgqa14q1ryyj6vqa9r4jw";
+       libraryHaskellDepends = [
+         base binary bytestring crypto-api crypto-pubkey-types SHA
+       ];
+       testHaskellDepends = [
+         base binary bytestring crypto-api crypto-pubkey-types DRBG
+         QuickCheck SHA tagged test-framework test-framework-quickcheck2
+       ];
+       description = "Implementation of RSA, using the padding schemes of PKCS#1 v2.1.";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "RSolve" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
@@ -15450,7 +15524,7 @@ self: {
        ];
        description = "A puzzle game written in Haskell with a cat in lead role";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "Random123" = callPackage
@@ -15790,7 +15864,6 @@ self: {
        sha256 = "09vs2y6zry4xak0gc6pc6xqinr9sv9z53hdiydxpn6ixam9s0g5r";
        libraryHaskellDepends = [ base ];
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "RxHaskell" = callPackage
@@ -15857,6 +15930,7 @@ self: {
        ];
        description = "This is a library for handling calendars and resource availability based on the \"top-nodes algorithm\" and set operations";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SDL" = callPackage
@@ -16037,6 +16111,7 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "(updated) Small geometry library for dealing with vectors and collision detection";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SHA" = callPackage
@@ -17340,6 +17415,7 @@ self: {
        ];
        description = "Libary for Stockholm aligmnent format";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Stomp" = callPackage
@@ -17674,7 +17750,6 @@ self: {
        libraryHaskellDepends = [ base DeepArrow TypeCompose ];
        description = "Tangible Values -- composable interfaces";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "TYB" = callPackage
@@ -17706,7 +17781,6 @@ self: {
        ];
        description = "Ferry Table Algebra";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Tables" = callPackage
@@ -18301,7 +18375,6 @@ self: {
        libraryHaskellDepends = [ base base-orphans ];
        description = "Type composition classes & instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "TypeIlluminator" = callPackage
@@ -19189,6 +19262,7 @@ self: {
        ];
        description = "Wire-aware hardware description";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "WordAlignment" = callPackage
@@ -19291,6 +19365,7 @@ self: {
        ];
        description = "Workflow patterns over a monad for thread state logging & recovery";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "WxGeneric" = callPackage
@@ -19811,7 +19886,6 @@ self: {
        libraryHaskellDepends = [ base TypeCompose ];
        description = "Zipping folds";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ZipperAG" = callPackage
@@ -21313,6 +21387,7 @@ self: {
        libraryHaskellDepends = [ aeson base network-uri text time ];
        description = "ActivityPub Haskell Library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "activitystreams-aeson" = callPackage
@@ -21422,7 +21497,6 @@ self: {
        ];
        description = "Convert adblock config files to privoxy format";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "addLicenseInfo" = callPackage
@@ -21608,6 +21682,7 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Multi-precision ball (interval) arithmetic";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aern2-real" = callPackage
@@ -21631,6 +21706,7 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Exact real numbers via Cauchy sequences and MPFR";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aeson_0_7_0_6" = callPackage
@@ -21819,6 +21895,7 @@ self: {
        ];
        description = "Easy functions for converting from Aeson.Value";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aeson-diff" = callPackage
@@ -22075,6 +22152,7 @@ self: {
        libraryHaskellDepends = [ aeson base ];
        description = "Options to derive FromJSON/ToJSON instances";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aeson-parsec-picky" = callPackage
@@ -22621,6 +22699,7 @@ self: {
        ];
        description = "And-inverter graphs in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aip" = callPackage
@@ -22821,6 +22900,7 @@ self: {
        ];
        description = "Parallel distributed discrete event simulation module for the Aivika library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aivika-experiment" = callPackage
@@ -22853,6 +22933,7 @@ self: {
        ];
        description = "Cairo-based charting backend for the Aivika simulation library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aivika-experiment-chart" = callPackage
@@ -22870,6 +22951,7 @@ self: {
        ];
        description = "Simulation experiments with charting for the Aivika library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aivika-experiment-diagrams" = callPackage
@@ -23194,6 +23276,7 @@ self: {
        ];
        description = "Constructive abstract algebra";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "algebra-dag" = callPackage
@@ -23278,7 +23361,6 @@ self: {
        ];
        description = "A library for algebraic graph construction and transformation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "algebraic-prelude" = callPackage
@@ -26431,7 +26513,6 @@ self: {
        ];
        description = "High level functions for working with message queues";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amrun" = callPackage
@@ -26957,6 +27038,7 @@ self: {
        testHaskellDepends = [ array base hspec linebreak ];
        description = "sdl-like functions for terminal applications, based on ansi-terminal";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ansi-wl-pprint" = callPackage
@@ -27319,6 +27401,7 @@ self: {
        ];
        description = "A Haskell implementation of the ANTLR top-down parser generator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "antlrc" = callPackage
@@ -28372,6 +28455,7 @@ self: {
        ];
        description = "Datadog client for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "arbor-lru-cache" = callPackage
@@ -28388,6 +28472,7 @@ self: {
          stm
        ];
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "arbor-monad-counter" = callPackage
@@ -28406,6 +28491,7 @@ self: {
          mtl resourcet stm transformers
        ];
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "arbor-monad-metric" = callPackage
@@ -28428,6 +28514,7 @@ self: {
        ];
        description = "Core metric library for publishing metrics";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "arbor-monad-metric-datadog" = callPackage
@@ -28452,6 +28539,7 @@ self: {
        ];
        description = "Metric library backend for datadog";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "arbor-postgres" = callPackage
@@ -28901,6 +28989,21 @@ self: {
        ];
        description = "Efficient basic number-theoretic functions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "arity-generic-liftA" = callPackage
+    ({ mkDerivation, base, doctest }:
+     mkDerivation {
+       pname = "arity-generic-liftA";
+       version = "0.1.0.0";
+       sha256 = "08ljx42nwpls02rg9qyzynfs6gwyxbw7v265mrh2cmb2gfb8g6wl";
+       revision = "1";
+       editedCabalFile = "0daxl4ds7bdjf1jjbf20hqqzss7srmzzkhgq2d0si8n2203jj8d9";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base doctest ];
+       description = "Provides an arity-generic version of the liftA2, liftA3... liftAn functions.";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "armada" = callPackage
@@ -29041,6 +29144,7 @@ self: {
        benchmarkHaskellDepends = [ base criterion ghc-prim ];
        description = "Extra foreign primops for primitive arrays";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "array-utils" = callPackage
@@ -29069,7 +29173,6 @@ self: {
        ];
        description = "Memory-efficient ArrayList implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "arrow-extras" = callPackage
@@ -29107,6 +29210,7 @@ self: {
        libraryHaskellDepends = [ base containers mtl ];
        description = "List arrows for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "arrowapply-utils" = callPackage
@@ -29192,6 +29296,7 @@ self: {
        libraryHaskellDepends = [ aeson base bytestring containers text ];
        description = "Basic types and instances for Valve's Artifact Card-set API";
        license = stdenv.lib.licenses.agpl3Plus;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "arx" = callPackage
@@ -29255,7 +29360,6 @@ self: {
        ];
        description = "Type-safe, bytestring-based ASCII values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ascii-art-to-unicode" = callPackage
@@ -29339,7 +29443,6 @@ self: {
        ];
        description = "Compact representation of ASCII strings";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ascii-table" = callPackage
@@ -29430,7 +29533,6 @@ self: {
        ];
        description = "Pretty rendering of Ascii diagram into svg or png";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "asic" = callPackage
@@ -30012,6 +30114,7 @@ self: {
        ];
        description = "A modified version of async that supports worker groups and many-to-many task dependencies";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "async-refresh" = callPackage
@@ -30074,6 +30177,7 @@ self: {
        ];
        description = "Provides API for timer based execution of IO actions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "asynchronous-exceptions" = callPackage
@@ -30187,6 +30291,7 @@ self: {
        ];
        description = "1976 US Standard Atmosphere Model";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "atmos-dimensional" = callPackage
@@ -30198,6 +30303,7 @@ self: {
        libraryHaskellDepends = [ atmos base dimensional ];
        description = "dimensional wrapper on atmos package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "atmos-dimensional-tf" = callPackage
@@ -30264,26 +30370,26 @@ self: {
      }) {};
 
   "atom-conduit" = callPackage
-    ({ mkDerivation, base, blaze-builder, conduit, conduit-combinators
-     , data-default, lens-simple, mono-traversable, parsers
+    ({ mkDerivation, base, blaze-builder, conduit, data-default
+     , filepath, lens-simple, mono-traversable, parsers
      , quickcheck-instances, resourcet, safe-exceptions, tasty
-     , tasty-hunit, tasty-quickcheck, text, time, timerep
+     , tasty-golden, tasty-hunit, tasty-quickcheck, text, time, timerep
      , uri-bytestring, xml-conduit, xml-types
      }:
      mkDerivation {
        pname = "atom-conduit";
-       version = "0.5.0.1";
-       sha256 = "1k9ix1br0vfajjqnprlnhzidvkx9a1pmkyiv2rb3nxb7fp3wb24c";
+       version = "0.5.0.2";
+       sha256 = "14gf11z7zmgczrdshmywrkpzrsy68wgaxx5jsn2m0q6797m9yzzd";
        libraryHaskellDepends = [
-         base blaze-builder conduit conduit-combinators lens-simple
-         mono-traversable parsers safe-exceptions text time timerep
-         uri-bytestring xml-conduit xml-types
+         base blaze-builder conduit lens-simple mono-traversable parsers
+         safe-exceptions text time timerep uri-bytestring xml-conduit
+         xml-types
        ];
        testHaskellDepends = [
-         base blaze-builder conduit conduit-combinators data-default
-         lens-simple mono-traversable parsers quickcheck-instances resourcet
-         safe-exceptions tasty tasty-hunit tasty-quickcheck text time
-         uri-bytestring xml-conduit xml-types
+         base blaze-builder conduit data-default filepath lens-simple
+         mono-traversable parsers quickcheck-instances resourcet
+         safe-exceptions tasty tasty-golden tasty-hunit tasty-quickcheck
+         text time uri-bytestring xml-conduit xml-types
        ];
        description = "Streaming parser/renderer for the Atom 1.0 standard (RFC 4287).";
        license = stdenv.lib.licenses.publicDomain;
@@ -30498,7 +30604,6 @@ self: {
        doHaddock = false;
        description = "A build tool for ATS";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ats-setup" = callPackage
@@ -30590,7 +30695,6 @@ self: {
        ];
        description = "Efficient parsing and serialisation of S-Expressions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "attomail" = callPackage
@@ -31371,7 +31475,6 @@ self: {
        executableHaskellDepends = [ base bytestring dbus text ];
        description = "Minimal DBus bindings for Avahi daemon (http://avahi.org)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "avatar-generator" = callPackage
@@ -31576,6 +31679,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "avro_0_4_1_2" = callPackage
+    ({ mkDerivation, aeson, array, base, base16-bytestring, bifunctors
+     , binary, bytestring, containers, data-binary-ieee754, directory
+     , extra, fail, hashable, hspec, lens, lens-aeson, mtl, pure-zlib
+     , QuickCheck, scientific, semigroups, tagged, template-haskell
+     , text, tf-random, transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "avro";
+       version = "0.4.1.2";
+       sha256 = "07akc3ngfwsmm0fsvli8f4msc99yrx87mqlm96b896as4rwyziv2";
+       libraryHaskellDepends = [
+         aeson array base base16-bytestring bifunctors binary bytestring
+         containers data-binary-ieee754 fail hashable mtl pure-zlib
+         scientific semigroups tagged template-haskell text tf-random
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson array base base16-bytestring bifunctors binary bytestring
+         containers directory extra fail hashable hspec lens lens-aeson mtl
+         pure-zlib QuickCheck scientific semigroups tagged template-haskell
+         text tf-random transformers unordered-containers vector
+       ];
+       description = "Avro serialization support for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "avwx" = callPackage
     ({ mkDerivation, attoparsec, base, HTTP, lens, optparse-applicative
      , parsers, pretty-show, text
@@ -31702,18 +31833,18 @@ self: {
      }:
      mkDerivation {
        pname = "aws";
-       version = "0.20";
-       sha256 = "0pwpabmypi1w8rni9qfwabgn95jks4h8dyw6889mn8xzsrhdhyf0";
+       version = "0.21";
+       sha256 = "0g6sp8wgirinp0kaa73s283mjws6wbihg38jklbj9dx6sxdmdja9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring base64-bytestring
          blaze-builder byteable bytestring case-insensitive cereal conduit
          conduit-extra containers cryptonite data-default directory
-         exceptions filepath http-conduit http-types lifted-base memory
-         monad-control mtl network old-locale resourcet safe scientific
-         tagged text time transformers unordered-containers utf8-string
-         vector xml-conduit
+         exceptions filepath http-client-tls http-conduit http-types
+         lifted-base memory monad-control mtl network old-locale resourcet
+         safe scientific tagged text time transformers unordered-containers
+         utf8-string vector xml-conduit
        ];
        testHaskellDepends = [
          aeson base bytestring conduit errors http-client http-client-tls
@@ -31846,7 +31977,6 @@ self: {
        ];
        description = "Helper function and types for working with amazonka";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aws-ec2" = callPackage
@@ -32360,7 +32490,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "The Axel programming language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "axiom" = callPackage
@@ -32543,7 +32672,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion pipes ];
        description = "Immutable disk-based B* trees";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "b9" = callPackage
@@ -33204,7 +33332,6 @@ self: {
        doHaddock = false;
        description = "\"base\" package sans \"Prelude\" module";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "base-orphans" = callPackage
@@ -33374,6 +33501,7 @@ self: {
        ];
        description = "A newtype around ByteString, for base64 encoding";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "base64-conduit" = callPackage
@@ -33574,7 +33702,6 @@ self: {
        ];
        description = "Basic examples and functions for generics-sop";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "baskell" = callPackage
@@ -34012,6 +34139,7 @@ self: {
        ];
        description = "Type-safe, feature-complete SQL query and manipulation interface for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "beam-migrate" = callPackage
@@ -34034,6 +34162,23 @@ self: {
        ];
        description = "SQL DDL support and migrations support library for Beam";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "beam-newtype-field" = callPackage
+    ({ mkDerivation, base, beam-core, beam-migrate, lens
+     , postgresql-simple
+     }:
+     mkDerivation {
+       pname = "beam-newtype-field";
+       version = "0.2.0.0";
+       sha256 = "1fb78n178jzx4457b0c3kyxc70c4qszq3pplmgrzgsibri8r2xlf";
+       libraryHaskellDepends = [
+         base beam-core beam-migrate lens postgresql-simple
+       ];
+       description = "A newtype for wrapping newtypes into beam schemas";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "beam-postgres" = callPackage
@@ -34055,6 +34200,7 @@ self: {
        ];
        description = "Connection layer between beam and postgres";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "beam-sqlite" = callPackage
@@ -34072,6 +34218,7 @@ self: {
        ];
        description = "Beam driver for SQLite";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "beam-th" = callPackage
@@ -34132,7 +34279,6 @@ self: {
        ];
        description = "A replacement of Yampa based on Monadic Stream Functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "beautifHOL" = callPackage
@@ -34163,7 +34309,6 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Efficient Matrix and Vector operations in 100% Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "beeminder-api" = callPackage
@@ -34319,7 +34464,6 @@ self: {
        executableHaskellDepends = [ base bytestring ];
        description = "Micro-benchmarking with detailed statistics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bencode" = callPackage
@@ -34381,7 +34525,6 @@ self: {
        ];
        description = "A library for encoding and decoding of BEncode data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bento" = callPackage
@@ -34532,6 +34675,7 @@ self: {
        ];
        description = "A horizontal version of tetris for braille users";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "between" = callPackage
@@ -34594,6 +34738,7 @@ self: {
        libraryHaskellDepends = [ attoparsec base bytestring time ];
        description = "Parse BgMax-files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bgzf" = callPackage
@@ -34631,6 +34776,7 @@ self: {
        ];
        description = "Simple terminal GUI for local hoogle";
        license = "(BSD-3-Clause OR Apache-2.0)";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bibdb" = callPackage
@@ -34713,6 +34859,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "bifunctor" = callPackage
+    ({ mkDerivation, base, category }:
+     mkDerivation {
+       pname = "bifunctor";
+       version = "0.1.0.0";
+       sha256 = "056fbcmrbzdagxr37nzq06668r9js8q9h79pnz6hv19lfljgspb1";
+       libraryHaskellDepends = [ base category ];
+       description = "Bifunctors";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "bifunctors" = callPackage
     ({ mkDerivation, base, base-orphans, comonad, containers, hspec
      , hspec-discover, QuickCheck, semigroups, tagged, template-haskell
@@ -35065,6 +35223,7 @@ self: {
        ];
        description = "An alternate with strong-typed errors for `Data.Binary.Get` monad from `binary` package.";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "binary-file" = callPackage
@@ -35174,6 +35333,7 @@ self: {
        ];
        description = "Orphan instances for binary";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "binary-parser" = callPackage
@@ -35226,7 +35386,6 @@ self: {
        ];
        description = "Extends binary with parsec/attoparsec style parsing combinators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "binary-protocol" = callPackage
@@ -35391,6 +35550,7 @@ self: {
        ];
        description = "Tagged binary serialisation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "binary-tree" = callPackage
@@ -35664,7 +35824,6 @@ self: {
        executableHaskellDepends = [ base binary bytestring split ];
        description = "Very low-level FFI bindings for Codec2";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) codec2;};
 
   "bindings-common" = callPackage
@@ -36003,7 +36162,6 @@ self: {
        description = "Direct Haskell bindings to LXC (Linux containers) C API";
        license = stdenv.lib.licenses.bsd3;
        platforms = [ "i686-linux" "x86_64-linux" ];
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) lxc;};
 
   "bindings-mmap" = callPackage
@@ -36260,6 +36418,7 @@ self: {
        libraryHaskellDepends = [ base binary bytestring rank1dynamic ];
        description = "A variation of Data.Dynamic.Dynamic with a Binary instance";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "binembed" = callPackage
@@ -36327,6 +36486,7 @@ self: {
        ];
        description = "Aggregate continuous values into discrete bins";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bio" = callPackage
@@ -36631,7 +36791,6 @@ self: {
        ];
        description = "Plays chess";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bit-array" = callPackage
@@ -36684,6 +36843,7 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Lazy, infinite, compact stream of Bool with O(1) indexing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bit-vector" = callPackage
@@ -37118,25 +37278,6 @@ self: {
      }) {inherit (pkgs) gmp;};
 
   "bitset-word8" = callPackage
-    ({ mkDerivation, base, bytestring, containers, criterion, deepseq
-     , hspec, QuickCheck, template-haskell, th-lift-instances, vector
-     }:
-     mkDerivation {
-       pname = "bitset-word8";
-       version = "0.1.1.0";
-       sha256 = "01lvkz6j925pfbh5ik1imxjpf8idvm7bxpp63jxmslsz7pnyvs8l";
-       libraryHaskellDepends = [
-         base containers template-haskell th-lift-instances
-       ];
-       testHaskellDepends = [ base hspec QuickCheck ];
-       benchmarkHaskellDepends = [
-         base bytestring criterion deepseq vector
-       ];
-       description = "Space efficient set of Word8 and some pre-canned sets useful for parsing HTTP";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "bitset-word8_0_1_1_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, criterion, deepseq
      , hspec, QuickCheck, template-haskell, th-lift-instances, vector
      }:
@@ -37156,7 +37297,6 @@ self: {
        ];
        description = "Space efficient set of Word8 and some pre-canned sets useful for parsing HTTP";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bitspeak" = callPackage
@@ -37342,6 +37482,7 @@ self: {
        libraryHaskellDepends = [ base containers text ];
        description = "A lousy Prelude replacement by a lousy dude";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bk-tree" = callPackage
@@ -37567,6 +37708,7 @@ self: {
        ];
        description = "HTML5 Canvas Graphics Library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "blas" = callPackage
@@ -37856,6 +37998,8 @@ self: {
        pname = "blaze-markup";
        version = "0.8.2.2";
        sha256 = "1qc2mn2zb2sdj3xvv73asibqnb11l7b5l30ff05qrfh7sy7wzw66";
+       revision = "1";
+       editedCabalFile = "0ivspcxz0b2r7kcas5hlw0fh92883r8ghwz9lck7nyqn6wn5i8zx";
        libraryHaskellDepends = [ base blaze-builder bytestring text ];
        testHaskellDepends = [
          base blaze-builder bytestring containers HUnit QuickCheck tasty
@@ -38147,6 +38291,7 @@ self: {
        ];
        description = "Elasticsearch client library for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bloodhound-amazonka-auth" = callPackage
@@ -38169,6 +38314,7 @@ self: {
        ];
        description = "Adds convenient Amazon ElasticSearch Service authentication to Bloodhound";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bloomfilter" = callPackage
@@ -38426,7 +38572,6 @@ self: {
        ];
        description = "Three games for inclusion in a web server";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bogocopy" = callPackage
@@ -38751,7 +38896,6 @@ self: {
        ];
        description = "Boolean normal form: NNF, DNF & CNF";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "boolector" = callPackage
@@ -38848,8 +38992,8 @@ self: {
     ({ mkDerivation, base, mtl, semigroups, template-haskell, text }:
      mkDerivation {
        pname = "boomerang";
-       version = "1.4.5.5";
-       sha256 = "0i2svn3bs57hhwgplkydvvpznl178dlm3byi0j4y2ckd9gqpzz4d";
+       version = "1.4.5.6";
+       sha256 = "0zkr9w9qqrcicdm6r928a1z1svspnx6vh0b9mac4q7cd1h021ph3";
        libraryHaskellDepends = [
          base mtl semigroups template-haskell text
        ];
@@ -38961,6 +39105,7 @@ self: {
        ];
        description = "Boring and Absurd types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "boring-game" = callPackage
@@ -39074,6 +39219,7 @@ self: {
        ];
        description = "ScopeH and ScopeT extras for bound";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bound-gen" = callPackage
@@ -39096,6 +39242,7 @@ self: {
        libraryHaskellDepends = [ array base ];
        description = "Arrays with a value for every index";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bounded-tchan" = callPackage
@@ -39283,7 +39430,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion text ];
        description = "Brainh*ck interpreter in haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "break" = callPackage
@@ -39357,8 +39503,8 @@ self: {
      }:
      mkDerivation {
        pname = "brick";
-       version = "0.45";
-       sha256 = "126h6cidq2rlh0plrgap5rlw9mxm03v3iray7pa95ydzp82imm7i";
+       version = "0.46";
+       sha256 = "1alfv1z0adp74d7vcqp92c73y8rkhv96s3lj4dqjxkqk044zgd9p";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -39390,6 +39536,7 @@ self: {
        ];
        description = "A drop-down menu widget for brick";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "brick-skylighting" = callPackage
@@ -39407,7 +39554,6 @@ self: {
        ];
        description = "Show syntax-highlighted text in your Brick UI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bricks" = callPackage
@@ -39609,6 +39755,7 @@ self: {
        benchmarkHaskellDepends = [ async base criterion deepseq stm ];
        description = "Closable, fair, single-wakeup channel type that avoids 0 reader space leaks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "broadcast-chan-conduit" = callPackage
@@ -39897,7 +40044,6 @@ self: {
        benchmarkHaskellDepends = [ base clock ghc-prim hashable ];
        description = "B-Tree on Unmanaged Heap";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "btree-concurrent" = callPackage
@@ -40112,7 +40258,6 @@ self: {
        ];
        description = "Bugsnag error reporter for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bugzilla" = callPackage
@@ -40273,6 +40418,7 @@ self: {
          tasty-quickcheck text
        ];
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bumper" = callPackage
@@ -40460,6 +40606,7 @@ self: {
        ];
        description = "Chops a command or program invocation into digestable pieces";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "butter" = callPackage
@@ -40481,6 +40628,7 @@ self: {
        ];
        description = "Monad Transformer for Asyncronous Message Passing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "butterflies" = callPackage
@@ -40703,6 +40851,7 @@ self: {
        ];
        description = "Arbitrary instances for ByteStrings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bytestring-builder" = callPackage
@@ -40824,7 +40973,6 @@ self: {
        benchmarkHaskellDepends = [ base bytestring gauge text ];
        description = "checks to see if a given bytestring adheres to a certain encoding";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bytestring-from" = callPackage
@@ -40914,6 +41062,7 @@ self: {
        ];
        description = "Plain byte strings ('ForeignPtr'-less 'ByteString's)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bytestring-progress" = callPackage
@@ -40995,6 +41144,7 @@ self: {
        ];
        description = "Efficient conversion of values into readable byte strings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bytestring-strict-builder" = callPackage
@@ -41256,6 +41406,7 @@ self: {
        executableHaskellDepends = [ base c0parser ];
        description = "Simple C0 Syntax Check";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "c0parser" = callPackage
@@ -41267,6 +41418,7 @@ self: {
        libraryHaskellDepends = [ base parsec ];
        description = "Simple C0 Parser";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "c10k" = callPackage
@@ -41441,8 +41593,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-bounds";
-       version = "2.0.0";
-       sha256 = "039j25av78fg4dg34q0i3h4ahb6j820kja1f2411rsxbrl9li5ca";
+       version = "2.2.1";
+       sha256 = "13pqdmghs92rwkg8fkky30sqimq54yzw2y1z5czdsmlj46r8i6ij";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -41464,8 +41616,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-cargs";
-       version = "1.1.0";
-       sha256 = "0lrhgbzkswjm4abffacyw6zp4s3na3vp0vkprpxcygm6yjs7db2q";
+       version = "1.2.0";
+       sha256 = "10dqy2i2rq4hq81v2gar2bsq3glx5yg5mwp9a0h7drap69407ygs";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -41524,8 +41676,8 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-debian";
-       version = "4.38.2";
-       sha256 = "1hr2y1jymi835pwm17z4fc0r58fkx3h8vxb03qp4fiadily0lg3s";
+       version = "4.38.4";
+       sha256 = "15jgn6wx0w96l2s7xmyp0n9m5sdqfls8kpmfgvykrdpw3mj3bnr0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -41830,10 +41982,10 @@ self: {
      }:
      mkDerivation {
        pname = "cabal-lenses";
-       version = "0.8.0";
-       sha256 = "1xz28mj98qfqra4kb7lwjkwa5ail0pn1fvia916wp6005mgvsh60";
+       version = "0.9.0";
+       sha256 = "0rvkwqzz92p85i9xwcxg3ah4imxh46ficg6yk0l6g9687970gfrg";
        revision = "1";
-       editedCabalFile = "1ij976phgmx7y7v9kbbwqqfkm8vnrggh1qry6wsbbq7f6qb0c0dq";
+       editedCabalFile = "0snzm6qvalyczmdicff5fsradk3h1bm3cqcax6rmwzr7xa1j43p7";
        libraryHaskellDepends = [
          base Cabal lens strict system-fileio system-filepath text
          transformers unordered-containers
@@ -41866,7 +42018,6 @@ self: {
        ];
        description = "Cabal support for creating Mac OSX application bundles";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-meta" = callPackage
@@ -41951,7 +42102,6 @@ self: {
        doHaddock = false;
        description = "Library and utiltity for processing cabal's plan.json file";
        license = "GPL-2.0-or-later AND BSD-3-Clause";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-progdeps" = callPackage
@@ -42576,6 +42726,7 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Servant HTTP API specification for https://cachix.org";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cacophony" = callPackage
@@ -42603,7 +42754,6 @@ self: {
        ];
        description = "A library implementing the Noise protocol";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "caf" = callPackage
@@ -42663,6 +42813,7 @@ self: {
        libraryPkgconfigDepends = [ cairo ];
        description = "Binding to the Cairo library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) cairo;};
 
   "cairo-appbase" = callPackage
@@ -42677,6 +42828,7 @@ self: {
        executableHaskellDepends = [ base cairo glib gtk ];
        description = "A template for building new GUI applications using GTK and Cairo";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cairo-canvas" = callPackage
@@ -42690,6 +42842,7 @@ self: {
        libraryHaskellDepends = [ base cairo linear mtl random time ];
        description = "Simpler drawing API for Cairo";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cake" = callPackage
@@ -42712,6 +42865,7 @@ self: {
        ];
        description = "A build-system library and driver";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cake3" = callPackage
@@ -42762,6 +42916,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "cal-layout" = callPackage
+    ({ mkDerivation, base, containers }:
+     mkDerivation {
+       pname = "cal-layout";
+       version = "0.1.0.2";
+       sha256 = "11i3nn1a84brm5isfqlapwnfwh7n9iyjr6kg1jjv8a9cv5nhbq3l";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base containers ];
+       executableHaskellDepends = [ base ];
+       description = "Calendar Layout Algorithm";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cal3d" = callPackage
     ({ mkDerivation, base, cal3d }:
      mkDerivation {
@@ -43260,6 +43429,7 @@ self: {
        ];
        description = "OTP-like supervision trees in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "capnp" = callPackage
@@ -43388,6 +43558,7 @@ self: {
        ];
        description = "some spaghetti code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "carboncopy" = callPackage
@@ -44195,6 +44366,7 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Exposes a Template Haskell function for generating catamorphisms";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "catch-fd" = callPackage
@@ -44233,12 +44405,12 @@ self: {
      }) {};
 
   "category" = callPackage
-    ({ mkDerivation, alg, base }:
+    ({ mkDerivation, alg, base, transformers }:
      mkDerivation {
        pname = "category";
-       version = "0.2.0.1";
-       sha256 = "0v5b15lgbdjrqpln532kw2d4isl5lf633jbld3clcp7c71vb7l07";
-       libraryHaskellDepends = [ alg base ];
+       version = "0.2.2.0";
+       sha256 = "1a01i1jxvgwcvmg3n4zpsp1f9pfaj3h6kzv3as0l3dyrky7ma8r3";
+       libraryHaskellDepends = [ alg base transformers ];
        description = "Categorical types and classes";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -44358,6 +44530,7 @@ self: {
          hspec QuickCheck
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cayene-lpp" = callPackage
@@ -44374,7 +44547,6 @@ self: {
        testHaskellDepends = [ base base16-bytestring hspec ];
        description = "Cayenne Low Power Payload";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cayley-client" = callPackage
@@ -44876,6 +45048,7 @@ self: {
        ];
        description = "Use cereal to encode/decode io-streams";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cereal-text" = callPackage
@@ -45105,7 +45278,6 @@ self: {
        ];
        description = "A library for writing CGI programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cgi-undecidable" = callPackage
@@ -45117,7 +45289,6 @@ self: {
        libraryHaskellDepends = [ base cgi mtl ];
        description = "Undecidable instances for the cgi package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cgi-utils" = callPackage
@@ -45515,6 +45686,7 @@ self: {
        ];
        description = "The ChatWork API in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cheapskate" = callPackage
@@ -45707,6 +45879,7 @@ self: {
        ];
        description = "A simple and intuitive library for automated testing";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "chell-hunit" = callPackage
@@ -45842,6 +46015,7 @@ self: {
        libraryHaskellDepends = [ base MonadRandom ];
        description = "Choose random elements from a stream";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "choose-exe" = callPackage
@@ -45858,6 +46032,7 @@ self: {
        ];
        description = "Command-line program to choose random element from a stream";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "chorale" = callPackage
@@ -46002,7 +46177,6 @@ self: {
        ];
        description = "Datatypes required for chr library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "chr-lang" = callPackage
@@ -46052,6 +46226,42 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "chromatin" = callPackage
+    ({ mkDerivation, base, bytestring, conduit, containers
+     , data-default-class, deepseq, directory, filepath, Glob, hslogger
+     , HTF, lens, messagepack, nvim-hs, parsec, prettyprinter, resourcet
+     , ribosome, split, stm-chans, stm-conduit, strings, transformers
+     , typed-process, unliftio
+     }:
+     mkDerivation {
+       pname = "chromatin";
+       version = "0.1.1.0";
+       sha256 = "15b4anslh4f4ysmypp10rfp1b1x90nx0q29my7bw9rkdhrxl5i8q";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring conduit containers data-default-class deepseq
+         directory filepath Glob hslogger lens messagepack nvim-hs parsec
+         prettyprinter resourcet ribosome split stm-chans stm-conduit
+         strings transformers typed-process unliftio
+       ];
+       executableHaskellDepends = [
+         base bytestring conduit containers data-default-class deepseq
+         directory filepath Glob hslogger lens messagepack nvim-hs parsec
+         prettyprinter resourcet ribosome split stm-chans stm-conduit
+         strings transformers typed-process unliftio
+       ];
+       testHaskellDepends = [
+         base bytestring conduit containers data-default-class deepseq
+         directory filepath Glob hslogger HTF lens messagepack nvim-hs
+         parsec prettyprinter resourcet ribosome split stm-chans stm-conduit
+         strings transformers typed-process unliftio
+       ];
+       description = "neovim package manager";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "chronograph" = callPackage
     ({ mkDerivation, base, deepseq, ghc-prim, thyme, vector-space }:
      mkDerivation {
@@ -46198,7 +46408,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Automatically convert Generic instances to and from church representations";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "church-list" = callPackage
@@ -46522,34 +46731,6 @@ self: {
      }) {};
 
   "cisco-spark-api" = callPackage
-    ({ mkDerivation, aeson, async, attoparsec, base, bitset-word8
-     , bytestring, conduit, data-default, hspec, http-conduit
-     , http-types, network-uri, optparse-applicative, text, utf8-string
-     , wai, warp
-     }:
-     mkDerivation {
-       pname = "cisco-spark-api";
-       version = "0.1.0.3";
-       sha256 = "1fi8cadjszb92yih5ilagay8c9fj4aiwdx2qx1pwdc756jgjm5ky";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson attoparsec base bitset-word8 bytestring conduit data-default
-         http-conduit network-uri text
-       ];
-       executableHaskellDepends = [
-         aeson base bytestring conduit data-default http-conduit
-         optparse-applicative text utf8-string
-       ];
-       testHaskellDepends = [
-         aeson async attoparsec base bytestring conduit data-default hspec
-         http-conduit http-types network-uri text wai warp
-       ];
-       description = "A Haskell bindings for Webex Teams API";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "cisco-spark-api_0_1_0_4" = callPackage
     ({ mkDerivation, aeson, async, attoparsec, base, bitset-word8
      , bytestring, conduit, data-default, hspec, http-conduit
      , http-types, network-uri, optparse-applicative, text, utf8-string
@@ -46575,7 +46756,6 @@ self: {
        ];
        description = "DEPRECATED in favor of webex-teams-api";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "citation-resolve" = callPackage
@@ -46852,6 +47032,7 @@ self: {
        testHaskellDepends = [ aeson base bytestring ];
        description = "JSON Compilation Database Format encoding and decoding";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clang-pure" = callPackage
@@ -47280,6 +47461,7 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "CSS preprocessor as embedded Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clckwrks" = callPackage
@@ -47296,8 +47478,8 @@ self: {
      }:
      mkDerivation {
        pname = "clckwrks";
-       version = "0.24.0.8";
-       sha256 = "1csiak0i3aaz56f64509w49q4j21cb10zlxdx8lyhbm8aikva0n1";
+       version = "0.24.0.10";
+       sha256 = "1jzbwfiyf0zigxf15c31ibmva7pxqdbkkp3l65s6gkcnq71isz6k";
        enableSeparateDataOutput = true;
        setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [
@@ -47324,8 +47506,8 @@ self: {
      }:
      mkDerivation {
        pname = "clckwrks-cli";
-       version = "0.2.17.1";
-       sha256 = "1si5xn68cq00zh4lg68pq0lnh5rijj1n0l4xbp9bhqy34mj59xfk";
+       version = "0.2.17.2";
+       sha256 = "0anrbigkx4y4fz8bsm1vgypf4s0ypapqh0kjyrcnyrpvn3ar5d45";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -47442,8 +47624,8 @@ self: {
      }:
      mkDerivation {
        pname = "clckwrks-plugin-media";
-       version = "0.6.16.4";
-       sha256 = "19fv38gqslg01ymj3nb838pnhir92gfkyl6kccik39brgcfd915b";
+       version = "0.6.16.5";
+       sha256 = "1k20i500f28pb55618zv80hg94ip4g6vkbn6szp468m4f2z01j9r";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          acid-state attoparsec base blaze-html cereal clckwrks containers
@@ -47468,8 +47650,8 @@ self: {
      }:
      mkDerivation {
        pname = "clckwrks-plugin-page";
-       version = "0.4.3.13";
-       sha256 = "0fkfsi9hv0hv4zbv2znb0v30z5qvifgmz9875868va0830nv3ibh";
+       version = "0.4.3.15";
+       sha256 = "0ks0dr5arc1kvyk1qhin153v77wi0p0hrpnp563g85scgdyl82bw";
        setupHaskellDepends = [ base Cabal ];
        libraryHaskellDepends = [
          acid-state aeson attoparsec base clckwrks containers directory
@@ -47629,6 +47811,8 @@ self: {
        pname = "cli";
        version = "0.1.2";
        sha256 = "1jsavqpjnwmfipvyv4wnxv5qkw295nvvzbnkbaxqv67b4py322jq";
+       revision = "1";
+       editedCabalFile = "19q9vp287yg068ilfjd2qp3nkly31s3jshg7yanv9j0dar5gp17a";
        libraryHaskellDepends = [ base mtl terminfo transformers ];
        testHaskellDepends = [
          base directory QuickCheck tasty tasty-quickcheck transformers
@@ -47778,6 +47962,7 @@ self: {
        ];
        description = "Command Line Interface File Manager";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clingo" = callPackage
@@ -47900,7 +48085,6 @@ self: {
        ];
        description = "Clone and benchmark Haskell cabal projects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clock" = callPackage
@@ -47987,14 +48171,13 @@ self: {
      }:
      mkDerivation {
        pname = "closed";
-       version = "0.2.0";
-       sha256 = "0762acn2dik98hp4bvlyvwfy1jfzb4i6ri9pnxa07risain1qc3s";
+       version = "0.2.0.1";
+       sha256 = "1d74bdjvn7rapakmv1vvf7wws2r12pydlbfym9nw1z6hqvvk8hsn";
        libraryHaskellDepends = [
          aeson base cassava deepseq hashable persistent QuickCheck text
        ];
        testHaskellDepends = [
-         aeson base cassava deepseq hashable hspec markdown-unlit persistent
-         QuickCheck text vector
+         aeson base cassava hspec markdown-unlit persistent text vector
        ];
        testToolDepends = [ markdown-unlit ];
        description = "Integers bounded by a closed interval";
@@ -48096,7 +48279,6 @@ self: {
        ];
        description = "Haskell CloudI API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cloudyfs" = callPackage
@@ -48287,6 +48469,8 @@ self: {
        pname = "clustering";
        version = "0.4.0";
        sha256 = "16zhg2jb4a823gf8pdbm9y9yknpf1w6l3983563vk3wjna3ypfcn";
+       revision = "1";
+       editedCabalFile = "1zyjjzbq8049jgkn8nl8aphfkmgn0912c8nw24r79vfmw8ad7mgq";
        libraryHaskellDepends = [
          base binary containers matrices mwc-random parallel primitive
          unordered-containers vector
@@ -48548,6 +48732,7 @@ self: {
        libraryHaskellDepends = [ base mtl split syb transformers ];
        description = "a library for command line parsing & online help";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cmdtheline" = callPackage
@@ -48709,7 +48894,6 @@ self: {
        executableToolDepends = [ markdown-unlit ];
        description = "Composable Contravariant Comonadic Logging Library";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "co-log-core" = callPackage
@@ -48773,6 +48957,7 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Simple system for generating code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "code-page" = callPackage
@@ -48954,6 +49139,7 @@ self: {
        ];
        description = "Graphics library for CodeWorld";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "codex" = callPackage
@@ -49254,6 +49440,7 @@ self: {
        ];
        description = "Collapse the duplication output into clones and return their frequencies";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "collapse-util" = callPackage
@@ -49277,8 +49464,8 @@ self: {
      }:
      mkDerivation {
        pname = "collection-json";
-       version = "1.1.2.1";
-       sha256 = "1x43b1rmlrsv8jmr2mawy2ykwljbbb4h8cfcfd6gxrkzxwvlxhsl";
+       version = "1.3.0.0";
+       sha256 = "17fb6zralgg6linsjapbqb4l7hycfwwvpr2l8jdksdky6bf65633";
        libraryHaskellDepends = [
          aeson base network-uri network-uri-json text
        ];
@@ -49290,7 +49477,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Collection+JSON—Hypermedia Type Tools";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "collections" = callPackage
@@ -49831,7 +50017,6 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Arrays where the index type is a function of the shape type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "comfort-graph" = callPackage
@@ -49992,7 +50177,6 @@ self: {
        ];
        description = "Commutative binary operations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "comonad" = callPackage
@@ -50185,6 +50369,7 @@ self: {
        ];
        description = "A typeclass for structures which can be catMaybed, filtered, and partitioned";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "compactmap" = callPackage
@@ -50235,7 +50420,6 @@ self: {
        ];
        description = "Compositional Data Types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "compdata-automata" = callPackage
@@ -50251,7 +50435,6 @@ self: {
        ];
        description = "Tree automata on Compositional Data Types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "compdata-dags" = callPackage
@@ -50309,7 +50492,6 @@ self: {
        ];
        description = "Parametric Compositional Data Types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "compensated" = callPackage
@@ -50433,6 +50615,7 @@ self: {
        ];
        description = "Monad for allocation and cleanup of application resources";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "componentm-devel" = callPackage
@@ -50446,6 +50629,7 @@ self: {
        ];
        description = "Easy REPL driven development using ComponentM";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "composable-associations" = callPackage
@@ -50675,6 +50859,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "compositional-data" = callPackage
+    ({ mkDerivation, base, bifunctor, c, category, criterion
+     , smallcheck, tasty, tasty-smallcheck, transformers, util
+     }:
+     mkDerivation {
+       pname = "compositional-data";
+       version = "0.1.0.1";
+       sha256 = "1pw7xqzin7v9xxjkm7xixf5d6r5jmgdgyvyhpsmn8bdqp8rrwgzj";
+       libraryHaskellDepends = [
+         base bifunctor category transformers util
+       ];
+       testHaskellDepends = [ base c smallcheck tasty tasty-smallcheck ];
+       benchmarkHaskellDepends = [ base c criterion ];
+       description = "Compositional Data Types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {c = null;};
+
   "compound-types" = callPackage
     ({ mkDerivation, base, base-prelude }:
      mkDerivation {
@@ -50685,6 +50888,7 @@ self: {
        benchmarkHaskellDepends = [ base-prelude ];
        description = "Sum and Product types and such";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "compressed" = callPackage
@@ -50702,6 +50906,7 @@ self: {
        ];
        description = "Compressed containers and reducers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "compression" = callPackage
@@ -51037,6 +51242,7 @@ self: {
        ];
        description = "A parser driven by a standard RELAX NG schema with concrete syntax extensions";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "concrete-typerep" = callPackage
@@ -51177,7 +51383,6 @@ self: {
        testHaskellDepends = [ async base dns hspec ];
        description = "Concurrent DNS cache";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "concurrent-extra" = callPackage
@@ -51216,6 +51421,7 @@ self: {
        benchmarkHaskellDepends = [ base machines time ];
        description = "Concurrent networked stream transducers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "concurrent-output" = callPackage
@@ -51313,6 +51519,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "More utilities and broad-used datastructures for concurrency";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "concurrentoutput" = callPackage
@@ -51944,7 +52151,6 @@ self: {
          text transformers
        ];
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "confetti" = callPackage
@@ -52113,7 +52319,6 @@ self: {
        libraryHaskellDepends = [ base config-value text ];
        description = "Interface between config-value and System.GetOpt";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "configifier" = callPackage
@@ -52154,6 +52359,7 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Simple data type for application configuration";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "configuration-tools" = callPackage
@@ -52491,6 +52697,23 @@ self: {
        libraryHaskellDepends = [ base semigroups tagged void ];
        description = "Constrained clones of the category-theory type classes, using ConstraintKinds";
        license = stdenv.lib.licenses.gpl3;
+     }) {};
+
+  "constrained-category" = callPackage
+    ({ mkDerivation, alg, base, category, constraint, criterion
+     , smallcheck, tasty, tasty-smallcheck, unconstrained
+     }:
+     mkDerivation {
+       pname = "constrained-category";
+       version = "0.1.0.0";
+       sha256 = "01r5jyydixfh82zynjpacsv5dc0mz28bcm8xaz2pgf2pc4gcfl9h";
+       libraryHaskellDepends = [
+         alg base category constraint unconstrained
+       ];
+       testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ];
+       benchmarkHaskellDepends = [ base criterion ];
+       description = "Constrained Categories";
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -52545,12 +52768,12 @@ self: {
      }) {};
 
   "constraint" = callPackage
-    ({ mkDerivation, base, category }:
+    ({ mkDerivation, base, category, unconstrained }:
      mkDerivation {
        pname = "constraint";
-       version = "0.1.1.1";
-       sha256 = "0iyz3n8qplp892cw2k2z5pp4pv54p5qaqrcjgpiwfm9jkri0v012";
-       libraryHaskellDepends = [ base category ];
+       version = "0.1.3.0";
+       sha256 = "0yp09vg9hx5p7ncyh8h6mhcl14kanhhjldyn892lmp0jmlm7flyy";
+       libraryHaskellDepends = [ base category unconstrained ];
        description = "Reified constraints";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -52636,6 +52859,7 @@ self: {
        libraryHaskellDepends = [ base constraints template-haskell ];
        description = "Utility package for constraints";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "constrictor" = callPackage
@@ -52660,6 +52884,7 @@ self: {
        ];
        description = "Exact computation with constructible real numbers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "constructive-algebra" = callPackage
@@ -52835,6 +53060,7 @@ self: {
        libraryHaskellDepends = [ base base-unicode-symbols containers ];
        description = "Unicode alternatives for common functions and operators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "containers-verified" = callPackage
@@ -52846,7 +53072,6 @@ self: {
        libraryHaskellDepends = [ containers ];
        description = "Formally verified drop-in replacement of containers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "content-store" = callPackage
@@ -52916,23 +53141,22 @@ self: {
     ({ mkDerivation, base, deepseq, primitive }:
      mkDerivation {
        pname = "contiguous";
-       version = "0.3.1.0";
-       sha256 = "1x1rv1r05v725xbax2qig36h03gah7mx8r8vd1dcdcy6lm6lsc4i";
+       version = "0.3.2.0";
+       sha256 = "0mgsha615rzaki7cn6w78ihrni3s9hza23srmxy9rpvybvh6xql7";
        libraryHaskellDepends = [ base deepseq primitive ];
        description = "Unified interface for primitive arrays";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "contiguous-checked" = callPackage
     ({ mkDerivation, base, contiguous, primitive }:
      mkDerivation {
        pname = "contiguous-checked";
-       version = "0.3.0.0";
-       sha256 = "144v6c9w0x9a43z1wpfgrq8k5h3d9nnrdxx87wcrkfcprcghdy7b";
+       version = "0.3.2.0";
+       sha256 = "0jfqxz0v107xw6mjr0wb1abb6v5zd3siy7z0gk9nqcvyacb80z4a";
        libraryHaskellDepends = [ base contiguous primitive ];
+       description = "contiguous with bounds checks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "contiguous-fft" = callPackage
@@ -53095,11 +53319,13 @@ self: {
        pname = "control-dsl";
        version = "0.2.1.3";
        sha256 = "0rv9wpjnr3y957vd6l8vmn87f9gi97nhk07bkgpr8083avi9biz8";
+       revision = "2";
+       editedCabalFile = "18jypzsawq0mp12i35f58px80i3k07ri0g07wcrh6af93vqkhvil";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base containers doctest doctest-discover temporary
        ];
-       description = "An alternative to monads for control flow DSLs";
+       description = "An alternative to monads in do-notation";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -53128,6 +53354,7 @@ self: {
        ];
        description = "A typeclass for type isomorphisms";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "control-monad-attempt" = callPackage
@@ -54012,6 +54239,7 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "An object frequency counter";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "country" = callPackage
@@ -54415,6 +54643,7 @@ self: {
        libraryHaskellDepends = [ base bytestring cql-io tinylog ];
        description = "Tinylog integration for cql-io";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cqrs" = callPackage
@@ -54808,6 +55037,7 @@ self: {
        ];
        description = "Conflict-free replicated data types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "creatur" = callPackage
@@ -54819,8 +55049,8 @@ self: {
      }:
      mkDerivation {
        pname = "creatur";
-       version = "5.9.27";
-       sha256 = "016f5rzn2dvd85mdjcdrc7jmy4v75sa4qf98rqyp8qc8cpcqcx4c";
+       version = "5.9.28";
+       sha256 = "11fscbkzyzajgg6m50s5x4rmxy1mxrgiqflamqxiwsyj9szw16xl";
        libraryHaskellDepends = [
          array base binary bytestring cereal cond directory exceptions
          filepath gray-extended hdaemonize hsyslog MonadRandom mtl random
@@ -55203,6 +55433,7 @@ self: {
        benchmarkHaskellDepends = [ attoparsec base criterion text time ];
        description = "Cron datatypes and Attoparsec parser";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cron-compat" = callPackage
@@ -55445,6 +55676,7 @@ self: {
        testHaskellDepends = [ base bytestring hspec QuickCheck ];
        description = "Multihash library on top of cryptonite crypto library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "crypto-numbers" = callPackage
@@ -56085,6 +56317,7 @@ self: {
        ];
        description = "a gallery of Csound instruments";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "csound-expression" = callPackage
@@ -56326,6 +56559,7 @@ self: {
        ];
        description = "A collection of CSV tools";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "csv-table" = callPackage
@@ -56457,7 +56691,6 @@ self: {
        executableToolDepends = [ alex happy ];
        description = "Implementation of Univalence in Cubical Sets";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cubicbezier" = callPackage
@@ -56672,6 +56905,7 @@ self: {
        testHaskellDepends = [ base directory hspec hspec-expectations ];
        description = "A framework for declaratively writing curl based API tests";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "curlhs" = callPackage
@@ -56878,7 +57112,6 @@ self: {
        ];
        description = "Purely Functional Cursors";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cursor-gen" = callPackage
@@ -57049,6 +57282,7 @@ self: {
        ];
        description = "A subfield of the complex numbers for exact calculation";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cypher" = callPackage
@@ -57254,7 +57488,6 @@ self: {
        executableHaskellDepends = [ base optparse-applicative ];
        description = "Basic Slack bot framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dao" = callPackage
@@ -57348,6 +57581,7 @@ self: {
        '';
        description = "a distributed, interactive, smart revision control system";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) curl;};
 
   "darcs-benchmark" = callPackage
@@ -57878,6 +58112,7 @@ self: {
        sha256 = "000x29a8x2ca7m85z0h7snm0297jf9ndr46dh3arv43fjlvfy3ag";
        description = "Category theory";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-cell" = callPackage
@@ -57901,6 +58136,7 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "Library for checking and normalization of data (e.g. from web forms)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-checked" = callPackage
@@ -57918,8 +58154,8 @@ self: {
     ({ mkDerivation, base, deepseq, QuickCheck }:
      mkDerivation {
        pname = "data-clist";
-       version = "0.1.2.1";
-       sha256 = "05l4gkb9k9p7cykx831n9w8i5yy6qffi4pip2y2l5xg2hvi8464s";
+       version = "0.1.2.2";
+       sha256 = "1aibiml1vs983lbxq18zcn9h11k3zjrxpsx4rxssqdjwni1kg9yi";
        libraryHaskellDepends = [ base deepseq QuickCheck ];
        description = "Simple functional ring type";
        license = stdenv.lib.licenses.bsd3;
@@ -58588,6 +58824,7 @@ self: {
        ];
        description = "Interval datatype, interval arithmetic and interval-based containers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-inttrie" = callPackage
@@ -58680,6 +58917,7 @@ self: {
        ];
        description = "Used to be Haskell 98 Lenses";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-lens-fd" = callPackage
@@ -59005,6 +59243,7 @@ self: {
        libraryHaskellDepends = [ base containers data-reify ];
        description = "Common Sub-Expression Elimination for graphs generated by Data.Reify.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-repr" = callPackage
@@ -59120,6 +59359,7 @@ self: {
        libraryHaskellDepends = [ base hashable unordered-containers ];
        description = "A collection of standards representable by simple data types";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-stm32" = callPackage
@@ -59331,6 +59571,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "utilities for handle data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-variant" = callPackage
@@ -59535,16 +59776,17 @@ self: {
 
   "datasets" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, cassava
-     , directory, file-embed, filepath, hashable, microlens
-     , stringsearch, text, time, vector, wreq
+     , data-default-class, directory, file-embed, filepath, hashable
+     , microlens, req, stringsearch, text, time, vector
      }:
      mkDerivation {
        pname = "datasets";
-       version = "0.2.5";
-       sha256 = "1fpxk5wv12wyb1zr35mhinkbkmczgzny2903lszjn41n149kk4cs";
+       version = "0.3.0";
+       sha256 = "0k09vixdg9dz8a5nc41h1wk8gzs0kn2rfjcki7akpqpvjg766k0i";
        libraryHaskellDepends = [
-         aeson attoparsec base bytestring cassava directory file-embed
-         filepath hashable microlens stringsearch text time vector wreq
+         aeson attoparsec base bytestring cassava data-default-class
+         directory file-embed filepath hashable microlens req stringsearch
+         text time vector
        ];
        description = "Classical data sets for statistics and machine learning";
        license = stdenv.lib.licenses.mit;
@@ -59674,6 +59916,7 @@ self: {
        ];
        description = "Directed acyclic word graphs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dawg-ord" = callPackage
@@ -59694,6 +59937,7 @@ self: {
        ];
        description = "Directed acyclic word graphs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dbcleaner" = callPackage
@@ -60514,7 +60758,6 @@ self: {
        ];
        description = "Simple trace-based debugger";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "debug-diff" = callPackage
@@ -60611,6 +60854,7 @@ self: {
        executableHaskellDepends = [ base ];
        description = "More useful trace functions for investigating bugs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "deburr" = callPackage
@@ -60695,6 +60939,7 @@ self: {
        testHaskellDepends = [ base mwc-probability ];
        description = "DIY Markov Chains";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "decode-utf8" = callPackage
@@ -60873,6 +61118,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Deep evaluation of data structures without NFData";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "deepseq-th" = callPackage
@@ -60932,7 +61178,6 @@ self: {
        ];
        description = "Abstractions over deferred folds";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "definitive-base" = callPackage
@@ -61149,6 +61394,7 @@ self: {
        testHaskellDepends = [ async base dimensional exceptions time ];
        description = "More useful and humain delaying functions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "delicious" = callPackage
@@ -61179,6 +61425,7 @@ self: {
        ];
        description = "Parse character delimited textual data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "delimiter-separated" = callPackage
@@ -61494,6 +61741,7 @@ self: {
        libraryHaskellDepends = [ base containers dlist mtl parsec ];
        description = "DepTrack Core types and model";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "deptrack-devops" = callPackage
@@ -61512,6 +61760,7 @@ self: {
        ];
        description = "DepTrack applied to DevOps";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "deptrack-dot" = callPackage
@@ -61524,6 +61773,7 @@ self: {
        testHaskellDepends = [ base containers deptrack-core dotgen ];
        description = "Facilitate Graphviz representations of DepTrack dependencies";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "deque" = callPackage
@@ -61601,6 +61851,7 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A program and library to derive instances for data types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "derive-IG" = callPackage
@@ -62045,6 +62296,7 @@ self: {
        ];
        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
@@ -62082,6 +62334,7 @@ self: {
        ];
        description = "A generic data integrity layer";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dfrac" = callPackage
@@ -62181,14 +62434,56 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "dhall_1_20_0" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, base
+     , bytestring, case-insensitive, cborg, cborg-json, containers
+     , contravariant, criterion, cryptonite, deepseq, Diff, directory
+     , doctest, dotgen, exceptions, filepath, haskeline, http-client
+     , http-client-tls, http-types, lens-family-core, megaparsec, memory
+     , mockery, mtl, optparse-applicative, parsers, prettyprinter
+     , prettyprinter-ansi-terminal, QuickCheck, quickcheck-instances
+     , repline, scientific, serialise, tasty, tasty-hunit
+     , tasty-quickcheck, template-haskell, text, transformers
+     , unordered-containers, uri-encode, vector
+     }:
+     mkDerivation {
+       pname = "dhall";
+       version = "1.20.0";
+       sha256 = "0hygghwx2dzci56x24md64b12p8mmx1spq012301ipkkbvk64a36";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson aeson-pretty ansi-terminal base bytestring case-insensitive
+         cborg cborg-json containers contravariant cryptonite Diff directory
+         dotgen exceptions filepath haskeline http-client http-client-tls
+         http-types lens-family-core megaparsec memory mtl
+         optparse-applicative parsers prettyprinter
+         prettyprinter-ansi-terminal repline scientific serialise
+         template-haskell text transformers unordered-containers uri-encode
+         vector
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base containers deepseq directory doctest filepath mockery
+         prettyprinter QuickCheck quickcheck-instances serialise tasty
+         tasty-hunit tasty-quickcheck text transformers vector
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring containers criterion directory serialise text
+       ];
+       description = "A configuration language guaranteed to terminate";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "dhall-bash" = callPackage
     ({ mkDerivation, base, bytestring, containers, dhall
      , neat-interpolation, optparse-generic, shell-escape, text
      }:
      mkDerivation {
        pname = "dhall-bash";
-       version = "1.0.17";
-       sha256 = "0z3wp25rj9czsmycs5h2sy76mnh9d8lxabngn2wbf1r6wbp6bpfv";
+       version = "1.0.18";
+       sha256 = "036ccz1kwhavl03q5lh14dxic8gjqb5cw14aws6a53gpk6p4vvff";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -62227,10 +62522,8 @@ self: {
      }:
      mkDerivation {
        pname = "dhall-json";
-       version = "1.2.5";
-       sha256 = "0zdxv43kj8dp2w9hy4px9xf785ybs9jy5pzhzybiagq428k4kcbf";
-       revision = "1";
-       editedCabalFile = "0zgg3wlsvsshgcibn7xchqfw5z2qh3yxkf2lb4bkx220f4m0dvfg";
+       version = "1.2.6";
+       sha256 = "0f18kn15v8pzkdayj2hql28fbba9i75msbi41yscik40lw2sg2cr";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -62264,7 +62557,6 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Lexer for the Dhall language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dhall-nix" = callPackage
@@ -62287,14 +62579,15 @@ self: {
        ];
        description = "Dhall to Nix compiler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dhall-text" = callPackage
     ({ mkDerivation, base, dhall, optparse-applicative, text }:
      mkDerivation {
        pname = "dhall-text";
-       version = "1.0.14";
-       sha256 = "1485p4fazh3qcbb9khj1pk4f2gh6p6927sabh6miswczdn78z6sy";
+       version = "1.0.15";
+       sha256 = "1cijr733xbls3lc5av1hki0za194rxrzd24ryxf1n9kdpc6dv8mg";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -62306,28 +62599,27 @@ self: {
 
   "dhall-to-cabal" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, containers, contravariant
-     , dhall, Diff, directory, filepath, hashable
-     , insert-ordered-containers, microlens, optparse-applicative
-     , prettyprinter, tasty, tasty-golden, text, transformers, vector
+     , dhall, Diff, directory, filepath, hashable, microlens
+     , optparse-applicative, prettyprinter, tasty, tasty-golden
+     , tasty-hunit, text, transformers, vector
      }:
      mkDerivation {
        pname = "dhall-to-cabal";
-       version = "1.3.0.1";
-       sha256 = "0sb7wipngmxwd2mgzggcmg9pkzyqa65gp7j789y5lgp1q8q8gv26";
+       version = "1.3.1.0";
+       sha256 = "0qqzzmkilxnii3p1rlrs20c1k6c5i7zld8cnzwssm2w9v8v7pkwj";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring Cabal containers contravariant dhall hashable
-         insert-ordered-containers text transformers vector
+         base bytestring Cabal containers contravariant dhall hashable text
+         transformers vector
        ];
        executableHaskellDepends = [
-         base bytestring Cabal dhall directory filepath
-         insert-ordered-containers microlens optparse-applicative
-         prettyprinter text transformers
+         base bytestring Cabal dhall directory filepath microlens
+         optparse-applicative prettyprinter text transformers
        ];
        testHaskellDepends = [
          base bytestring Cabal dhall Diff filepath microlens prettyprinter
-         tasty tasty-golden text
+         tasty tasty-golden tasty-hunit text
        ];
        description = "Compile Dhall expressions to Cabal files";
        license = stdenv.lib.licenses.mit;
@@ -62483,6 +62775,7 @@ self: {
        doHaddock = false;
        description = "Embedded domain-specific language for declarative vector graphics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-boolean" = callPackage
@@ -62522,7 +62815,6 @@ self: {
        ];
        description = "Braille diagrams with plain text";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-builder" = callPackage
@@ -62553,6 +62845,7 @@ self: {
        ];
        description = "hint-based build service for the diagrams graphics EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-cairo" = callPackage
@@ -62573,6 +62866,7 @@ self: {
        ];
        description = "Cairo backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-canvas" = callPackage
@@ -62591,6 +62885,7 @@ self: {
        ];
        description = "HTML5 canvas backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-contrib" = callPackage
@@ -62619,6 +62914,7 @@ self: {
        ];
        description = "Collection of user contributions to diagrams EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-core" = callPackage
@@ -62653,6 +62949,7 @@ self: {
        ];
        description = "Graph layout and drawing with GrahpViz and diagrams";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-gtk" = callPackage
@@ -62668,6 +62965,7 @@ self: {
        ];
        description = "Backend for rendering diagrams directly to GTK windows";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-haddock" = callPackage
@@ -62698,6 +62996,7 @@ self: {
        ];
        description = "Preprocessor for embedding diagrams in Haddock documentation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-hsqml" = callPackage
@@ -62733,6 +63032,7 @@ self: {
        ];
        description = "HTML5 canvas backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-lib" = callPackage
@@ -62827,7 +63127,6 @@ self: {
        ];
        description = "PGF backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-postscript" = callPackage
@@ -62847,6 +63146,7 @@ self: {
        ];
        description = "Postscript backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-qrcode" = callPackage
@@ -63162,7 +63462,6 @@ self: {
        ];
        description = "Discrete Interval Encoding Trees";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diff" = callPackage
@@ -63526,6 +63825,7 @@ self: {
        ];
        description = "Scotty backend for the digestive-functors library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "digestive-functors-snap" = callPackage
@@ -63616,30 +63916,32 @@ self: {
 
   "dimensional" = callPackage
     ({ mkDerivation, base, criterion, deepseq, doctest, exact-pi, Glob
-     , hspec, ieee754, numtype-dk, QuickCheck, semigroups
-     , template-haskell, vector
+     , hspec, hspec-discover, ieee754, numtype-dk, QuickCheck
+     , semigroups, template-haskell, vector
      }:
      mkDerivation {
        pname = "dimensional";
-       version = "1.1";
-       sha256 = "05jy0xs1nmxz7x3b589313hqk317838crhd974knm5k73jf8h99s";
+       version = "1.3";
+       sha256 = "0i4k7m134w3pczj8qllc59djdhisj92z78qrzap9v0f4rx8jb8r9";
        libraryHaskellDepends = [
          base deepseq exact-pi ieee754 numtype-dk semigroups vector
        ];
        testHaskellDepends = [
          base doctest Glob hspec QuickCheck template-haskell
        ];
+       testToolDepends = [ hspec-discover ];
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "Statically checked physical dimensions, using Type Families and Data Kinds";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dimensional-codata" = callPackage
     ({ mkDerivation, base, dimensional, numtype-dk }:
      mkDerivation {
        pname = "dimensional-codata";
-       version = "2014.0.0.0";
-       sha256 = "1qyalw1y4ijl293s8qx2xp34716yiq4pfafb5czlk5vrwb4ym925";
+       version = "2014.0.0.1";
+       sha256 = "0jyvy79dfvx624gmi9gbnxhpzdrp6w0l5n6rc3k52m7cm2i085m9";
        libraryHaskellDepends = [ base dimensional numtype-dk ];
        description = "CODATA Recommended Physical Constants with Dimensional Types";
        license = stdenv.lib.licenses.bsd3;
@@ -63920,12 +64222,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "directory_1_3_3_1" = callPackage
+  "directory_1_3_3_2" = callPackage
     ({ mkDerivation, base, filepath, time, unix }:
      mkDerivation {
        pname = "directory";
-       version = "1.3.3.1";
-       sha256 = "0f2nj0cgzdp90rhkqq5cl2v079qi59dm49mjz571zj5d842xn7f4";
+       version = "1.3.3.2";
+       sha256 = "0nr0lwpi20slgqc22br9ldrs57573irqbck8am0pz0gz3yvmqis3";
        libraryHaskellDepends = [ base filepath time unix ];
        testHaskellDepends = [ base filepath time unix ];
        description = "Platform-agnostic library for filesystem operations";
@@ -64356,6 +64658,7 @@ self: {
        libraryHaskellDepends = [ base ghcjs-base-stub stm ];
        description = "Allows storing different resource-releasing actions together";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dist-upload" = callPackage
@@ -64416,6 +64719,7 @@ self: {
        testHaskellDepends = [ base binary hspec QuickCheck ];
        description = "Serializable closures for distributed programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-fork" = callPackage
@@ -64434,6 +64738,7 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit unix ];
        description = "Like 'forkIO', but uses remote machines instead of local threads";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-fork-aws-lambda" = callPackage
@@ -64485,6 +64790,7 @@ self: {
        ];
        description = "Cloud Haskell: Erlang-style concurrency in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-process-async" = callPackage
@@ -64581,6 +64887,7 @@ self: {
        ];
        description = "Collect node stats for EKG";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-process-execution" = callPackage
@@ -64706,6 +65013,7 @@ self: {
        ];
        description = "monad-control style typeclass and transformer instances for Process monad";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-process-monad-control" = callPackage
@@ -64722,6 +65030,7 @@ self: {
        ];
        description = "Orphan instances for MonadBase and MonadBaseControl";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-process-p2p" = callPackage
@@ -64742,6 +65051,7 @@ self: {
        executableHaskellDepends = [ base distributed-process mtl ];
        description = "Peer-to-peer node discovery for Cloud Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-process-platform" = callPackage
@@ -64828,6 +65138,7 @@ self: {
        ];
        description = "Simple zero-configuration backend for Cloud Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-process-supervisor" = callPackage
@@ -64940,6 +65251,7 @@ self: {
        ];
        description = "Tests and test support tools for distributed-process";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-process-zookeeper" = callPackage
@@ -64984,6 +65296,7 @@ self: {
        ];
        description = "Compositional, type-safe, polymorphic static values and closures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distribution" = callPackage
@@ -65162,7 +65475,6 @@ self: {
        ];
        description = "Generate Haskell code from a type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "djinn-ghc" = callPackage
@@ -65294,7 +65606,6 @@ self: {
        ];
        description = "AVAYA DMCC API bindings and WebSockets server for AVAYA";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dmenu" = callPackage
@@ -65571,6 +65882,7 @@ self: {
        ];
        description = "An API client for docker written in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "docker-build-cacher" = callPackage
@@ -65627,6 +65939,7 @@ self: {
        testHaskellDepends = [ base HTF text vector ];
        description = "A build tool for multiple docker image layers";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dockerfile" = callPackage
@@ -65795,6 +66108,7 @@ self: {
        testHaskellDepends = [ base doctest HUnit QuickCheck ];
        description = "Allow QuickCheck-style property testing within doctest";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "docusign-base" = callPackage
@@ -65828,6 +66142,7 @@ self: {
        ];
        description = "Low-level bindings to the DocuSign API (only what is necessary for docusign-client)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "docusign-client" = callPackage
@@ -65944,6 +66259,7 @@ self: {
        libraryHaskellDepends = [ array base containers ];
        description = "The Lengauer-Tarjan graph dominators algorithm";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dom-parser" = callPackage
@@ -66519,6 +66835,7 @@ self: {
        ];
        description = "A generic implementation of dynamic partial-order reduction (DPOR) for testing arbitrary models of concurrency";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "drClickOn" = callPackage
@@ -66551,6 +66868,7 @@ self: {
        ];
        description = "Automatic derivation of optimized QuickCheck random generators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "draw-poker" = callPackage
@@ -66582,6 +66900,7 @@ self: {
        testHaskellDepends = [ base containers hspec QuickCheck ];
        description = "A port of asciimoo's drawille to haskell";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dresdner-verkehrsbetriebe" = callPackage
@@ -66621,6 +66940,7 @@ self: {
        ];
        description = "Simple schema management for arbitrary databases";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "drifter-postgresql" = callPackage
@@ -66661,6 +66981,7 @@ self: {
        ];
        description = "SQLite support for the drifter schema migraiton tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "drinkery" = callPackage
@@ -66897,6 +67218,7 @@ self: {
        executableHaskellDepends = [ base bytestring ];
        description = "Harmonix (Guitar Hero, Rock Band) DTA/DTB metadata library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dtd" = callPackage
@@ -66944,7 +67266,6 @@ self: {
        libraryHaskellDepends = [ base text xml-types ];
        description = "Basic types for representing XML DTDs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dtrace" = callPackage
@@ -67007,6 +67328,7 @@ self: {
        ];
        description = "Network multiplayer 2D shooting game";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dual-tree" = callPackage
@@ -67139,7 +67461,6 @@ self: {
        ];
        description = "A plug-in for rendering GHC core";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dunai" = callPackage
@@ -67759,6 +68080,7 @@ self: {
        libraryHaskellDepends = [ base data-default ];
        description = "Robert Penner's easing equations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "easy-api" = callPackage
@@ -67842,7 +68164,6 @@ self: {
        libraryHaskellDepends = [ base bytestring containers mtl zlib ];
        description = "User-friendly creation of EPS, PostScript, and PDF files";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "easytensor" = callPackage
@@ -67856,6 +68177,7 @@ self: {
        benchmarkHaskellDepends = [ base dimensions time ];
        description = "Pure, type-indexed haskell vector, matrix, and tensor library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "easytensor-vulkan" = callPackage
@@ -67867,6 +68189,7 @@ self: {
        libraryHaskellDepends = [ base dimensions easytensor vulkan-api ];
        description = "Use easytensor with vulkan-api";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "easytest" = callPackage
@@ -67952,7 +68275,6 @@ self: {
        ];
        description = "A handy tool for uploading unikernels to Amazon's EC2";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "eccrypto" = callPackage
@@ -68250,6 +68572,7 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "A monad for rewriting things";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "edit-distance" = callPackage
@@ -68407,7 +68730,6 @@ self: {
        libraryHaskellDepends = [ base type-level-sets ];
        description = "Embeds effect systems and program logics into Haskell using graded monads and parameterised monads";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "effective-aspects" = callPackage
@@ -68752,6 +69074,7 @@ self: {
        ];
        description = "Send ekg metrics to a Bosun instance";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ekg-carbon" = callPackage
@@ -68760,8 +69083,8 @@ self: {
      }:
      mkDerivation {
        pname = "ekg-carbon";
-       version = "1.0.10";
-       sha256 = "0mvx5qpj5fzdb991gb344a5a34fvgys6xy3xxpr65bddlbpv0mk9";
+       version = "1.0.11";
+       sha256 = "02cmwpdbqfi6n9dqk2y6yqvds2i6rmbs6vzkab0l90507c7rdqf8";
        libraryHaskellDepends = [
          base ekg-core network network-carbon text time unordered-containers
          vector
@@ -69069,6 +69392,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "elf_0_30" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, hspec }:
+     mkDerivation {
+       pname = "elf";
+       version = "0.30";
+       sha256 = "16gfpqsqfwlq4qprh0nswa4br1rz7rj7in7v803cqggkxz7s5c4p";
+       libraryHaskellDepends = [ base binary bytestring ];
+       testHaskellDepends = [ base bytestring containers hspec ];
+       description = "An Elf parser";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "eliminators" = callPackage
     ({ mkDerivation, base, extra, hspec, hspec-discover, singleton-nats
      , singletons, template-haskell, th-abstraction, th-desugar
@@ -69447,6 +69783,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "elm2nix" = callPackage
+    ({ mkDerivation, aeson, ansi-wl-pprint, async, base, binary
+     , bytestring, containers, data-default, directory, filepath, here
+     , mtl, optparse-applicative, process, req, text, transformers
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "elm2nix";
+       version = "0.1.0";
+       sha256 = "140qv6zvq4860fd5pglhwgd9pnxv6nha3ah3pmp4d2x3jkvg3hcy";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson async base binary bytestring containers data-default
+         directory filepath here mtl process req text transformers
+         unordered-containers
+       ];
+       executableHaskellDepends = [
+         ansi-wl-pprint base directory here optparse-applicative
+       ];
+       testHaskellDepends = [ base ];
+       description = "Turn your Elm project into buildable Nix project";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "elo" = callPackage
     ({ mkDerivation, base, tasty }:
      mkDerivation {
@@ -69576,6 +69937,7 @@ self: {
        ];
        description = "Parsing and rendering of email and MIME headers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "email-postmark" = callPackage
@@ -69663,7 +70025,6 @@ self: {
        testHaskellDepends = [ base doctest Glob ];
        description = "Wrapper around email-validate library adding instances for common type classes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "emailparse" = callPackage
@@ -69754,6 +70115,7 @@ self: {
        testHaskellDepends = [ base containers HUnit ];
        description = "Empirical Mode Decomposition and Hilbert-Huang Transform";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "emgm" = callPackage
@@ -69824,7 +70186,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Binding to the Enchant library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) enchant;};
 
   "enclosed-exceptions" = callPackage
@@ -69953,7 +70314,6 @@ self: {
        ];
        description = "A Haskell implementation of Engine.IO";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "engine-io-growler" = callPackage
@@ -70155,6 +70515,7 @@ self: {
        executableHaskellDepends = [ base ];
        description = "enumerate all the values in a finite type (automatically)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "enumerate-function" = callPackage
@@ -70276,14 +70637,22 @@ self: {
      }) {};
 
   "enummapset" = callPackage
-    ({ mkDerivation, base, containers, deepseq, semigroups }:
+    ({ mkDerivation, array, base, containers, deepseq, ghc-prim, HUnit
+     , QuickCheck, semigroups, test-framework, test-framework-hunit
+     , test-framework-quickcheck2
+     }:
      mkDerivation {
        pname = "enummapset";
-       version = "0.5.2.2";
-       sha256 = "0x6fihrgvb2y6m0z2gi8n97b54aidydd8fnbmj02bq3x73gxnbvr";
+       version = "0.6.0.1";
+       sha256 = "0nljpb5fxk4piwl5mh1v23ps9bzhxxcybfhd8mmb66k20gxxxf7q";
        libraryHaskellDepends = [ base containers deepseq semigroups ];
+       testHaskellDepends = [
+         array base containers deepseq ghc-prim HUnit QuickCheck semigroups
+         test-framework test-framework-hunit test-framework-quickcheck2
+       ];
        description = "IntMap and IntSet with Enum keys/elements";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "enummapset-th" = callPackage
@@ -70593,8 +70962,8 @@ self: {
      }:
      mkDerivation {
        pname = "equational-reasoning";
-       version = "0.5.1.0";
-       sha256 = "11203rdw4q9s5ramhmr2hdimgwin3zwjas8csxqxxldkv3x9a05l";
+       version = "0.5.1.1";
+       sha256 = "12l0h86y3qxjr04y2908l9l5jh1q2hw5xhchxk7j8c216vlwv5ql";
        libraryHaskellDepends = [
          base containers singletons template-haskell th-desugar th-extras
          void
@@ -70603,6 +70972,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "equeue" = callPackage
+    ({ mkDerivation, base, containers, contravariant, delay, mtl
+     , semigroups, stm, tasty, tasty-hunit, time
+     }:
+     mkDerivation {
+       pname = "equeue";
+       version = "0";
+       sha256 = "14risb13sv4mz5scyhcvg6knb791lx4b9jm3k9189fhxkr5a28cc";
+       libraryHaskellDepends = [
+         base containers contravariant mtl semigroups stm
+       ];
+       testHaskellDepends = [
+         base containers contravariant delay semigroups stm tasty
+         tasty-hunit time
+       ];
+       description = "Application level triggered, and edge triggered event multiqueues";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "equivalence" = callPackage
     ({ mkDerivation, base, containers, mtl, QuickCheck, STMonadTrans
      , template-haskell, test-framework, test-framework-quickcheck2
@@ -70622,6 +71011,7 @@ self: {
        ];
        description = "Maintaining an equivalence relation implemented as union-find using STT";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "erd" = callPackage
@@ -70896,6 +71286,7 @@ self: {
        ];
        description = "`bracket`-like functions for `ExceptT` over `IO` monad";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ersaconcat" = callPackage
@@ -71141,27 +71532,31 @@ self: {
 
   "esqueleto" = callPackage
     ({ mkDerivation, base, blaze-html, bytestring, conduit, containers
-     , hspec, HUnit, monad-control, monad-logger, persistent
-     , persistent-sqlite, persistent-template, QuickCheck, resourcet
-     , tagged, text, transformers, unordered-containers
+     , hspec, monad-logger, mysql, mysql-simple, persistent
+     , persistent-mysql, persistent-postgresql, persistent-sqlite
+     , persistent-template, postgresql-libpq, postgresql-simple
+     , resourcet, tagged, text, time, transformers, unliftio
+     , unordered-containers
      }:
      mkDerivation {
        pname = "esqueleto";
-       version = "2.5.3";
-       sha256 = "10n49rzqmblky7pwjnysalyy6nacmxfms8dqbsdv6hlyzr8pb69x";
-       revision = "1";
-       editedCabalFile = "1rmqqx2p4bad6psg8jbzf6jwan9z4a5yjskdkw51q0f47jhpfcdj";
+       version = "2.6.0";
+       sha256 = "1asbvcjmbyd44rfs8a645cvfqmf95b6hnb3l7lqd56kv32km69nn";
        libraryHaskellDepends = [
          base blaze-html bytestring conduit monad-logger persistent
-         resourcet tagged text transformers unordered-containers
+         resourcet tagged text time transformers unliftio
+         unordered-containers
        ];
        testHaskellDepends = [
-         base conduit containers hspec HUnit monad-control monad-logger
-         persistent persistent-sqlite persistent-template QuickCheck
-         resourcet text transformers
+         base blaze-html bytestring conduit containers hspec monad-logger
+         mysql mysql-simple persistent persistent-mysql
+         persistent-postgresql persistent-sqlite persistent-template
+         postgresql-libpq postgresql-simple resourcet tagged text time
+         transformers unliftio unordered-containers
        ];
        description = "Type-safe EDSL for SQL queries on persistent backends";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ess" = callPackage
@@ -71326,8 +71721,8 @@ self: {
        pname = "ether";
        version = "0.5.1.0";
        sha256 = "1180l4z2cdgc6zj9pcr2c0lj28ka85kbk8sxd42fis65k2ahr61n";
-       revision = "1";
-       editedCabalFile = "01q86w79xswdkq08m375xwfqjgix6bzbc4lpxz4phqvzf38lc8i5";
+       revision = "2";
+       editedCabalFile = "0ax7jq2gpb12zh4v2gcpqpckznpbkc8b743k94fljvks0yq3kl0k";
        libraryHaskellDepends = [
          base exceptions mmorph monad-control mtl reflection tagged
          template-haskell transformers transformers-base transformers-lift
@@ -71342,7 +71737,6 @@ self: {
        ];
        description = "Monad transformers and classes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ethereum-analyzer" = callPackage
@@ -71682,6 +72076,7 @@ self: {
        ];
        description = "Monoidal, monadic and first-class events";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "event-driven" = callPackage
@@ -71924,8 +72319,8 @@ self: {
      }:
      mkDerivation {
        pname = "eventsource-api";
-       version = "1.5.0";
-       sha256 = "0748wrj8amw66cl95cri7g2nw9kwc5h0dsw1419p90xpxgvn4kvr";
+       version = "1.5.1";
+       sha256 = "04sqpzhmsisr93da55dhmprsbks0kkwsb3dg8fkx2w0casyb58f6";
        libraryHaskellDepends = [
          aeson base bytestring containers enclosed-exceptions lifted-async
          lifted-base monad-control monad-loops mtl stm stm-chans streaming
@@ -71943,8 +72338,8 @@ self: {
      }:
      mkDerivation {
        pname = "eventsource-geteventstore-store";
-       version = "1.2.0";
-       sha256 = "0v0k89xb86h8zxrzzpph0bayy47v3gn56vi3v02cvvnwnif3071l";
+       version = "1.2.1";
+       sha256 = "1v024nxs7bdh8q6m1r0wnn877pbc54kg22yg4qlwbsmsibq61c82";
        libraryHaskellDepends = [
          aeson base eventsource-api eventsource-store-specs eventstore
          lifted-async lifted-base mtl streaming string-conversions
@@ -72151,6 +72546,7 @@ self: {
        ];
        description = "Exact rational multiples of pi (and integer powers of pi)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "exact-real" = callPackage
@@ -72196,6 +72592,7 @@ self: {
        libraryHaskellDepends = [ base exceptions transformers ];
        description = "Safely deal with exceptions in ExceptT";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "exception-hierarchy" = callPackage
@@ -72207,6 +72604,7 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "Exception type hierarchy with TemplateHaskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "exception-mailer" = callPackage
@@ -72454,7 +72852,6 @@ self: {
        ];
        description = "Compile time checks that a computation considers producing data through all possible constructors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "exherbo-cabal" = callPackage
@@ -72532,7 +72929,6 @@ self: {
        ];
        description = "Dependent pairs and their instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "exinst-bytes" = callPackage
@@ -72553,7 +72949,6 @@ self: {
        ];
        description = "Dependent pairs and their instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "exinst-cereal" = callPackage
@@ -72573,7 +72968,6 @@ self: {
        ];
        description = "Dependent pairs and their instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "exinst-deepseq" = callPackage
@@ -72618,7 +73012,6 @@ self: {
        ];
        description = "Dependent pairs and their instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "existential" = callPackage
@@ -72817,6 +73210,8 @@ self: {
        pname = "expiring-containers";
        version = "0.2.2.1";
        sha256 = "0zicnfwamm6yx91pb92qjzv0n25cwdz4krymnvpn5vyhh96k3kwh";
+       revision = "1";
+       editedCabalFile = "0wp4p8ax6cx6z8h7kjjajlr3h2155gzr5zffh2ky9w31ax9iggw9";
        libraryHaskellDepends = [
          base containers hashable int-multimap time timestamp
          unordered-containers
@@ -73028,6 +73423,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "expresso" = callPackage
+    ({ mkDerivation, base, containers, directory, filepath, hashable
+     , haskeline, mtl, parsec, tasty, tasty-hunit, text
+     , unordered-containers, wl-pprint
+     }:
+     mkDerivation {
+       pname = "expresso";
+       version = "0.1.0.2";
+       sha256 = "19qg0nwvmh0apn2fmffsmhrwcw9kd5c3fp118shkr12xdab9x23k";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers directory filepath hashable haskeline mtl parsec
+         text unordered-containers wl-pprint
+       ];
+       testHaskellDepends = [
+         base containers directory filepath hashable haskeline mtl parsec
+         tasty tasty-hunit text unordered-containers wl-pprint
+       ];
+       description = "A simple expressions language based on row types";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "extcore" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, directory
      , filepath, mtl, parsec, pretty, syb
@@ -73146,8 +73564,10 @@ self: {
      }:
      mkDerivation {
        pname = "extensible-effects";
-       version = "4.0.0.0";
-       sha256 = "0h83cn0767sk8di6ja5928v65mkcp90pjqhgijrvynssxxsvfsji";
+       version = "5.0.0.1";
+       sha256 = "0ff0h24ff5m5dnfiazh8sfvmby3sdb2dil7zqxg8qwykjdc1dcy3";
+       revision = "1";
+       editedCabalFile = "1ihcxj58a3ca80zfyxgbzjzgps9izy96vnj7h4sk9wwb9khbxl1f";
        libraryHaskellDepends = [ base monad-control transformers-base ];
        testHaskellDepends = [
          base doctest HUnit monad-control mtl QuickCheck silently
@@ -73413,7 +73833,6 @@ self: {
        ];
        description = "Rational arithmetic in an irrational world";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "facts" = callPackage
@@ -73640,6 +74059,7 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "Faktory Worker for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "falling-turnip" = callPackage
@@ -73756,7 +74176,6 @@ self: {
        ];
        description = "Fast ByteString Builder";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fast-combinatorics" = callPackage
@@ -73802,33 +74221,17 @@ self: {
      }:
      mkDerivation {
        pname = "fast-downward";
-       version = "0.1.0.0";
-       sha256 = "187c3mx2vw1d8xj0k8k2wy51nz7bskcmxgbzx4d5pgrn74gr5azb";
+       version = "0.1.0.1";
+       sha256 = "1js78083c6813sm1hcycii95c3yya58r4kfdfvgbzzvvklwcxb3y";
        libraryHaskellDepends = [
          base containers list-t mtl process temporary text transformers
        ];
        description = "Solve classical planning problems (STRIPS/SAS+) using Haskell & Fast Downward";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fast-logger" = callPackage
-    ({ mkDerivation, array, auto-update, base, bytestring, directory
-     , easy-file, filepath, hspec, text, unix-compat, unix-time
-     }:
-     mkDerivation {
-       pname = "fast-logger";
-       version = "2.4.12";
-       sha256 = "1jl9kiiijjpilj4zka8ffb2sil31qmgysan2hkld6mhddlr6pjdy";
-       libraryHaskellDepends = [
-         array auto-update base bytestring directory easy-file filepath text
-         unix-compat unix-time
-       ];
-       testHaskellDepends = [ base bytestring directory hspec ];
-       description = "A fast logging system";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "fast-logger_2_4_13" = callPackage
     ({ mkDerivation, array, auto-update, base, bytestring, directory
      , easy-file, filepath, hspec, text, unix-compat, unix-time
      }:
@@ -73843,7 +74246,6 @@ self: {
        testHaskellDepends = [ base bytestring directory hspec ];
        description = "A fast logging system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fast-math" = callPackage
@@ -73975,7 +74377,6 @@ self: {
        librarySystemDepends = [ fcgi ];
        description = "A Haskell library for writing FastCGI programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) fcgi;};
 
   "fastedit" = callPackage
@@ -74298,6 +74699,7 @@ self: {
        libraryHaskellDepends = [ fay-base ];
        description = "Websockets FFI library for Fay";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fb" = callPackage
@@ -75077,7 +75479,6 @@ self: {
        ];
        description = "automatic C++ binding generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fficxx-runtime" = callPackage
@@ -75111,6 +75512,7 @@ self: {
        ];
        description = "Minimal bindings to the FFmpeg library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) ffmpeg; libavcodec = null; libavdevice = null; 
          libavformat = null; libswscale = null;};
 
@@ -75158,7 +75560,6 @@ self: {
        librarySystemDepends = [ fftw ];
        description = "Low level bindings to FFTW";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) fftw;};
 
   "fgl" = callPackage
@@ -75602,6 +76003,7 @@ self: {
        ];
        description = "Functions on System.FilePath";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fileplow" = callPackage
@@ -75641,6 +76043,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "filesystem-abstractions" = callPackage
+    ({ mkDerivation, base, bytestring, list-tries, posix-paths
+     , semigroups
+     }:
+     mkDerivation {
+       pname = "filesystem-abstractions";
+       version = "0";
+       sha256 = "1qrxc8q10fqd7b0ss84nykz8vmyjwwxw5ywxp11xabad966shl18";
+       libraryHaskellDepends = [
+         base bytestring list-tries posix-paths semigroups
+       ];
+       description = "A shared set of abstractions and types for representing filessytem data";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "filesystem-conduit" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, conduit
      , containers, hspec, QuickCheck, system-fileio, system-filepath
@@ -75732,6 +76149,7 @@ self: {
        testHaskellDepends = [ base bytestring HUnit ];
        description = "Filterable request logging wai middleware. Change how data is logged and when.";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "filtrable" = callPackage
@@ -75759,6 +76177,7 @@ self: {
        testHaskellDepends = [ base inspection-testing tagged ];
        description = "Nat and Fin: peano naturals and finite numbers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "final" = callPackage
@@ -75811,6 +76230,7 @@ self: {
        ];
        description = "Find the clumpiness of labels in a tree";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "find-conduit" = callPackage
@@ -76020,6 +76440,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "first-class-families_0_4_0_0" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "first-class-families";
+       version = "0.4.0.0";
+       sha256 = "1hkvk4vhx8zanx7sc8a7nsz4h38nsfhr1rdn1ky1fim328fi4gx6";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
+       description = "First class type families";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "first-class-patterns" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
@@ -76070,7 +76503,6 @@ self: {
        ];
        description = "Calculates file-size frequency-distribution";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fit" = callPackage
@@ -76292,6 +76724,7 @@ self: {
        ];
        description = "Binary instances for fixed-vector";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fixed-vector-cborg" = callPackage
@@ -76308,6 +76741,7 @@ self: {
        ];
        description = "Binary instances for fixed-vector";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fixed-vector-cereal" = callPackage
@@ -76324,6 +76758,7 @@ self: {
        ];
        description = "Cereal instances for fixed-vector";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fixed-vector-hetero" = callPackage
@@ -76667,7 +77102,6 @@ self: {
        ];
        description = "Principled and efficient bit-oriented binary serialization";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "flat-maybe" = callPackage
@@ -76836,7 +77270,6 @@ self: {
        libraryHaskellDepends = [ base bytestring parsec utf8-string ];
        description = "A parser for IGC files";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "flight-kml" = callPackage
@@ -76860,7 +77293,6 @@ self: {
        ];
        description = "Parsing of pilot tracklogs dumped as KML";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "flip-cmd" = callPackage
@@ -77340,6 +77772,7 @@ self: {
        ];
        description = "The parser for fluffy to parsec the question bank in .docx type";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fluid-idl" = callPackage
@@ -77566,6 +77999,7 @@ self: {
        ];
        description = "Lists with a focused element";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fold-debounce" = callPackage
@@ -77705,7 +78139,6 @@ self: {
        ];
        description = "Transducers for foldl folds";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "foldl-transduce-attoparsec" = callPackage
@@ -77727,7 +78160,6 @@ self: {
        ];
        description = "Attoparsec and foldl-transduce integration";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "folds" = callPackage
@@ -77838,7 +78270,6 @@ self: {
        ];
        description = "Be notified when a file gets appended, solely with what was added. Warning - only works on linux and for files that are strictly appended, like log files.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "follower" = callPackage
@@ -78234,6 +78665,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "formatting_6_3_7" = callPackage
+    ({ mkDerivation, array, base, bytestring, clock, ghc-prim, hspec
+     , integer-gmp, old-locale, scientific, semigroups, text, time
+     , transformers
+     }:
+     mkDerivation {
+       pname = "formatting";
+       version = "6.3.7";
+       sha256 = "06jwb1pmh15f2b9dfplm64y9yszazg26m4h7rl4dn4inqg14znqc";
+       libraryHaskellDepends = [
+         array base bytestring clock ghc-prim integer-gmp old-locale
+         scientific semigroups text time transformers
+       ];
+       testHaskellDepends = [ base hspec semigroups text ];
+       description = "Combinator-based type-safe formatting (like printf() or FORMAT)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "forml" = callPackage
     ({ mkDerivation, ansi-terminal, base, bytestring, cereal
      , containers, directory, file-embed, ghc-prim, GraphSCC, hslogger
@@ -78315,13 +78765,41 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "forsyde-deep" = callPackage
+    ({ mkDerivation, base, Cabal, containers, directory, filepath
+     , HUnit, mtl, parameterized-data, pretty, process, QuickCheck
+     , random, regex-posix, syb, template-haskell, type-level
+     }:
+     mkDerivation {
+       pname = "forsyde-deep";
+       version = "0.2.0";
+       sha256 = "1rznghp5njbs474cr1pmipmflf53rk8al6pb2d16vhj717431vf9";
+       enableSeparateDataOutput = true;
+       setupHaskellDepends = [
+         base Cabal containers directory filepath HUnit mtl
+         parameterized-data pretty process QuickCheck random regex-posix syb
+         template-haskell type-level
+       ];
+       libraryHaskellDepends = [
+         base containers directory filepath mtl parameterized-data pretty
+         process random regex-posix syb template-haskell type-level
+       ];
+       testHaskellDepends = [
+         base directory HUnit parameterized-data QuickCheck random syb
+         type-level
+       ];
+       description = "ForSyDe's Haskell-embedded Domain Specific Language";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "forsyde-shallow" = callPackage
     ({ mkDerivation, base, directory, hspec, old-time, process, random
      }:
      mkDerivation {
        pname = "forsyde-shallow";
-       version = "3.3.2.0";
-       sha256 = "1cfqv2mn1ccbp2j7vnjj123ys2n5s414dqid4ywy1l749pzf7w1j";
+       version = "3.3.3.0";
+       sha256 = "0avpy9h0x30c6zbzfrf248k2il4w0hk5rnkcqaday7rgsf70cfc0";
        libraryHaskellDepends = [ base directory old-time process random ];
        testHaskellDepends = [ base hspec ];
        description = "ForSyDe's Haskell-embedded Domain Specific Language";
@@ -78366,6 +78844,7 @@ self: {
        ];
        description = "Parser and anlyses for Fortran standards 66, 77, 90 and 95";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fortytwo" = callPackage
@@ -78745,6 +79224,7 @@ self: {
        benchmarkHaskellDepends = [ base time ];
        description = "Cached and parallel data fetching";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "freddy" = callPackage
@@ -78764,6 +79244,7 @@ self: {
        ];
        description = "RabbitMQ Messaging API supporting request-response";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "free" = callPackage
@@ -78802,7 +79283,6 @@ self: {
        ];
        description = "Free algebras in Haskell";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "free-category" = callPackage
@@ -78814,6 +79294,7 @@ self: {
        libraryHaskellDepends = [ base free-algebras ];
        description = "Free category";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "free-concurrent" = callPackage
@@ -78856,7 +79337,6 @@ self: {
        ];
        description = "Free functors, adjoint to functors that forget class constraints";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "free-game" = callPackage
@@ -79224,6 +79704,7 @@ self: {
        testHaskellDepends = [ base freer-simple hspec ];
        description = "Checked runtime exceptions with freer-simple";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "freer-simple-http" = callPackage
@@ -79244,6 +79725,7 @@ self: {
        ];
        description = "Make HTTP requests with freer-simple!";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "freer-simple-profiling" = callPackage
@@ -79256,6 +79738,7 @@ self: {
        testHaskellDepends = [ base containers freer-simple hspec time ];
        description = "Automatic profling of freer-simple programs";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "freer-simple-random" = callPackage
@@ -79268,6 +79751,7 @@ self: {
        testHaskellDepends = [ base containers freer-simple hspec random ];
        description = "Random number generators using freer-simple";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "freer-simple-time" = callPackage
@@ -79280,6 +79764,7 @@ self: {
        testHaskellDepends = [ base freer-simple hspec time ];
        description = "freer-simple interface to IO based time functions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "freesect" = callPackage
@@ -79431,6 +79916,7 @@ self: {
        ];
        description = "A functional image processing library for Haskell";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "friday-devil" = callPackage
@@ -79464,6 +79950,7 @@ self: {
        ];
        description = "Converts between the Friday and JuicyPixels image types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "friday-scale-dct" = callPackage
@@ -79495,6 +79982,7 @@ self: {
        ];
        description = "Attempt to pretty-print any input";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "friendly-time" = callPackage
@@ -79587,6 +80075,7 @@ self: {
        libraryHaskellDepends = [ base containers mtl ];
        description = "Arduino programming without the hassle of C";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "frpnow" = callPackage
@@ -79858,7 +80347,6 @@ self: {
        ];
        description = "Watch a file/directory and run a command when it's modified";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ftdi" = callPackage
@@ -80016,6 +80504,7 @@ self: {
        ];
        description = "In-memory full text search engine";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fullstop" = callPackage
@@ -80220,6 +80709,7 @@ self: {
        ];
        description = "Library providing values and operations on values in a fixed universe";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "function-combine" = callPackage
@@ -80325,7 +80815,6 @@ self: {
        ];
        description = "Functor combinators with tries & zippers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "functor-friends" = callPackage
@@ -80350,7 +80839,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "Infix operators for mapping over compositions of functors. Lots of them.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "functor-monadic" = callPackage
@@ -80609,6 +81097,7 @@ self: {
        ];
        description = "An optimising compiler for a functional, array-oriented language";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "futun" = callPackage
@@ -80687,7 +81176,6 @@ self: {
        testHaskellDepends = [ base HUnit ];
        description = "Filters a list based on a fuzzy string search";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fuzzy-dates" = callPackage
@@ -80847,19 +81335,20 @@ self: {
      }) {};
 
   "g4ip-prover" = callPackage
-    ({ mkDerivation, array, base, directory, system-filepath }:
+    ({ mkDerivation, array, base, directory, filepath, happy }:
      mkDerivation {
        pname = "g4ip-prover";
-       version = "0.1.0.1";
-       sha256 = "1r1i8i5vwy02zaccqjlv6w5qlpbp61lc4im9sz2wlkc8yx2yj8bg";
-       isLibrary = false;
+       version = "2.0.0.0";
+       sha256 = "1g79hip95n3nmjhyfvryk7z0fnb46xqy8lg0hq1xanqlsmyx7w4c";
+       isLibrary = true;
        isExecutable = true;
-       executableHaskellDepends = [
-         array base directory system-filepath
-       ];
+       libraryHaskellDepends = [ array base directory filepath ];
+       libraryToolDepends = [ happy ];
+       executableHaskellDepends = [ array base directory filepath ];
+       executableToolDepends = [ happy ];
+       testHaskellDepends = [ base ];
        description = "Theorem prover for intuitionistic propositional logic using G4ip";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gact" = callPackage
@@ -81052,6 +81541,7 @@ self: {
        libraryHaskellDepends = [ base free transformers ];
        description = "Limit how many steps a program may take";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gasp" = callPackage
@@ -81063,7 +81553,6 @@ self: {
        libraryHaskellDepends = [ base binary containers ];
        description = "A framework of algebraic classes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gauge" = callPackage
@@ -81176,6 +81665,7 @@ self: {
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the GNOME configuration database system";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.gnome2) GConf;};
 
   "gd" = callPackage
@@ -81321,7 +81811,6 @@ self: {
        executableHaskellDepends = [ base GLUT OpenGLRaw Vec ];
        description = "zooming rotating fractal gears graphics demo";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gedcom" = callPackage
@@ -81716,6 +82205,7 @@ self: {
        ];
        description = "Derivation of Aeson instances using GHC generics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "generic-arbitrary" = callPackage
@@ -81771,6 +82261,22 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Utilities for GHC.Generics";
        license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "generic-data_0_4_0_0" = callPackage
+    ({ mkDerivation, base, base-orphans, contravariant, generic-lens
+     , show-combinators, tasty, tasty-hunit
+     }:
+     mkDerivation {
+       pname = "generic-data";
+       version = "0.4.0.0";
+       sha256 = "01x5f1xi1yvi2d5pym5jchgrl3ya2cbx6npa7c8rf206n414sq23";
+       libraryHaskellDepends = [
+         base base-orphans contravariant show-combinators
+       ];
+       testHaskellDepends = [ base generic-lens tasty tasty-hunit ];
+       description = "Utilities for GHC.Generics";
+       license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -81780,13 +82286,12 @@ self: {
      }:
      mkDerivation {
        pname = "generic-data-surgery";
-       version = "0.1.0.0";
-       sha256 = "1ady7wkg6bs8iadahz33gn7pas2176wg2fsphxs4nq7fi2c566a4";
+       version = "0.2.0.0";
+       sha256 = "02pnxdhmc5m7i9m269s1pggn6gsqj73flv6d86zfkpnqwwsvd5qs";
        libraryHaskellDepends = [ base first-class-families generic-data ];
        testHaskellDepends = [ base generic-data tasty tasty-hunit ];
        description = "Surgery for generic data types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "generic-deepseq" = callPackage
@@ -82049,6 +82554,7 @@ self: {
        ];
        description = "Generic generation of HXT XmlPickler instances using GHC Generics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "generics-eot" = callPackage
@@ -82078,7 +82584,6 @@ self: {
        libraryHaskellDepends = [ base containers mtl template-haskell ];
        description = "Generic Programming with Mutually Recursive Sums of Products";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "generics-sop" = callPackage
@@ -82376,6 +82881,7 @@ self: {
        ];
        description = "GenValidity support for aeson";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genvalidity-bytestring" = callPackage
@@ -82396,6 +82902,7 @@ self: {
        ];
        description = "GenValidity support for ByteString";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genvalidity-containers" = callPackage
@@ -82414,6 +82921,7 @@ self: {
        ];
        description = "GenValidity support for containers";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genvalidity-hspec" = callPackage
@@ -82434,6 +82942,7 @@ self: {
        ];
        description = "Standard spec's for GenValidity instances";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genvalidity-hspec-aeson" = callPackage
@@ -82456,6 +82965,7 @@ self: {
        ];
        description = "Standard spec's for aeson-related instances";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genvalidity-hspec-binary" = callPackage
@@ -82475,6 +82985,7 @@ self: {
        ];
        description = "Standard spec's for binary-related Instances";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genvalidity-hspec-cereal" = callPackage
@@ -82494,6 +83005,7 @@ self: {
        ];
        description = "Standard spec's for cereal-related instances";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genvalidity-hspec-hashable" = callPackage
@@ -82515,6 +83027,7 @@ self: {
        ];
        description = "Standard spec's for Hashable instances";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genvalidity-hspec-optics" = callPackage
@@ -82578,6 +83091,7 @@ self: {
        ];
        description = "GenValidity support for Path";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genvalidity-property" = callPackage
@@ -82612,6 +83126,7 @@ self: {
        ];
        description = "GenValidity support for Scientific";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genvalidity-text" = callPackage
@@ -82630,6 +83145,7 @@ self: {
        ];
        description = "GenValidity support for Text";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genvalidity-time" = callPackage
@@ -82646,6 +83162,7 @@ self: {
        testHaskellDepends = [ base genvalidity-hspec hspec time ];
        description = "GenValidity support for time";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genvalidity-unordered-containers" = callPackage
@@ -82667,6 +83184,7 @@ self: {
        ];
        description = "GenValidity support for unordered-containers";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genvalidity-uuid" = callPackage
@@ -82685,6 +83203,7 @@ self: {
        ];
        description = "GenValidity support for UUID";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genvalidity-vector" = callPackage
@@ -82703,6 +83222,7 @@ self: {
        ];
        description = "GenValidity support for vector";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "geo-resolver" = callPackage
@@ -82796,6 +83316,7 @@ self: {
        libraryHaskellDepends = [ base dimensional lens semigroups ];
        description = "Types for geodetic operations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "geodetics" = callPackage
@@ -82815,6 +83336,7 @@ self: {
        ];
        description = "Terrestrial coordinate systems and geodetic calculations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "geohash" = callPackage
@@ -82863,7 +83385,6 @@ self: {
        ];
        description = "A thin GeoJSON Layer above the aeson library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "geojson-types" = callPackage
@@ -83053,6 +83574,7 @@ self: {
        ];
        description = "Github Standard Labeler";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gh-pocket-knife" = callPackage
@@ -83193,6 +83715,7 @@ self: {
        testHaskellDepends = [ base ghc ghc-paths ];
        description = "A small-step semantics for Core";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-datasize" = callPackage
@@ -83498,7 +84021,6 @@ self: {
        testHaskellDepends = [ base inspection-testing ];
        description = "A magic typeclass that just does it";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-make" = callPackage
@@ -83638,6 +84160,7 @@ self: {
        ];
        description = "A parallel wrapper for 'ghc --make'";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-parser" = callPackage
@@ -83650,6 +84173,7 @@ self: {
        libraryToolDepends = [ cpphs happy ];
        description = "Haskell source parser from GHC";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-paths" = callPackage
@@ -83940,6 +84464,7 @@ self: {
        benchmarkHaskellDepends = [ base bytestring criterion ];
        description = "Faster replacements for traceEvent and traceMarker";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-typelits-extra" = callPackage
@@ -84016,6 +84541,7 @@ self: {
        ];
        description = "Presburger Arithmetic Solver for GHC Type-level natural numbers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-usage" = callPackage
@@ -84225,6 +84751,7 @@ self: {
        ];
        description = "Allow GHCJS projects to compile under GHC and develop using intero";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghcjs-codemirror" = callPackage
@@ -84359,7 +84886,6 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "GHCJS version of Perch library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghcjs-promise" = callPackage
@@ -84626,19 +85152,41 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) gdk_pixbuf;};
 
-  "gi-gdkx11" = callPackage
-    ({ mkDerivation, base, bytestring, Cabal, containers, gi-gdk
-     , gi-gio, gi-gobject, gi-xlib, gtk3, haskell-gi, haskell-gi-base
+  "gi-gdkpixbuf_2_0_18" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers, gdk_pixbuf
+     , gi-gio, gi-glib, gi-gobject, haskell-gi, haskell-gi-base
      , haskell-gi-overloading, text, transformers
      }:
      mkDerivation {
-       pname = "gi-gdkx11";
-       version = "3.0.2";
-       sha256 = "0s3iry866p6v2hm4d841fcimrhjsk9miskkqf9js8as7mwlk7jac";
+       pname = "gi-gdkpixbuf";
+       version = "2.0.18";
+       sha256 = "1b9ypv07siyr9gry471skc3qlaiwqf055ywz8nib5x39vs6rfcpj";
        setupHaskellDepends = [ base Cabal haskell-gi ];
        libraryHaskellDepends = [
-         base bytestring containers gi-gdk gi-gio gi-gobject gi-xlib
-         haskell-gi haskell-gi-base haskell-gi-overloading text transformers
+         base bytestring containers gi-gio gi-glib gi-gobject haskell-gi
+         haskell-gi-base haskell-gi-overloading text transformers
+       ];
+       libraryPkgconfigDepends = [ gdk_pixbuf ];
+       doHaddock = false;
+       description = "GdkPixbuf bindings";
+       license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) gdk_pixbuf;};
+
+  "gi-gdkx11" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers, gi-cairo
+     , gi-gdk, gi-gio, gi-gobject, gi-xlib, gtk3, haskell-gi
+     , haskell-gi-base, haskell-gi-overloading, text, transformers
+     }:
+     mkDerivation {
+       pname = "gi-gdkx11";
+       version = "3.0.4";
+       sha256 = "0pm1jnmal4vy53icndzzs76vcvxzn3lm31dfwg6nb6fnch5p4036";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
+       libraryHaskellDepends = [
+         base bytestring containers gi-cairo gi-gdk gi-gio gi-gobject
+         gi-xlib haskell-gi haskell-gi-base haskell-gi-overloading text
+         transformers
        ];
        libraryPkgconfigDepends = [ gtk3 ];
        doHaddock = false;
@@ -84889,6 +85437,28 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {gtk3 = pkgs.gnome3.gtk;};
 
+  "gi-gtk_3_0_27" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, containers, gi-atk
+     , gi-cairo, gi-gdk, gi-gdkpixbuf, gi-gio, gi-glib, gi-gobject
+     , gi-pango, gtk3, haskell-gi, haskell-gi-base
+     , haskell-gi-overloading, text, transformers
+     }:
+     mkDerivation {
+       pname = "gi-gtk";
+       version = "3.0.27";
+       sha256 = "1i8xrq56lp8ha87zykr3hgp13yp8amsxal320mknr2s29x6iw1kr";
+       setupHaskellDepends = [ base Cabal haskell-gi ];
+       libraryHaskellDepends = [
+         base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf
+         gi-gio gi-glib gi-gobject gi-pango haskell-gi haskell-gi-base
+         haskell-gi-overloading text transformers
+       ];
+       libraryPkgconfigDepends = [ gtk3 ];
+       description = "Gtk bindings";
+       license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {gtk3 = pkgs.gnome3.gtk;};
+
   "gi-gtk-declarative" = callPackage
     ({ mkDerivation, base, criterion, gi-gdk, gi-glib, gi-gobject
      , gi-gtk, haskell-gi, haskell-gi-base, haskell-gi-overloading, mtl
@@ -84896,14 +85466,14 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gtk-declarative";
-       version = "0.2.0";
-       sha256 = "0spp225x4acrm96gr0i1jqlhmdq52xqin6h0mma2gvjh025dywyh";
+       version = "0.4.1";
+       sha256 = "1hgrmmf2jk9mcrhq7ak95j9wc15lgv1jis8immvsjvhfqdayc212";
        libraryHaskellDepends = [
-         base gi-gobject gi-gtk haskell-gi haskell-gi-base
+         base gi-glib gi-gobject gi-gtk haskell-gi haskell-gi-base
          haskell-gi-overloading mtl text unordered-containers vector
        ];
        benchmarkHaskellDepends = [
-         base criterion gi-gdk gi-glib gi-gtk random text
+         base criterion gi-gdk gi-glib gi-gtk random text vector
        ];
        description = "Declarative GTK+ programming in Haskell";
        license = stdenv.lib.licenses.mpl20;
@@ -84916,8 +85486,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gtk-declarative-app-simple";
-       version = "0.2.0";
-       sha256 = "19br3alfj0ggsbwp0640pdrjz1dm59g2wv8sb38jznsrni5fb8yx";
+       version = "0.4.0";
+       sha256 = "0pa6mjv386cvgvm8zywx3wdm5jwx0sm2rgxmybp9sxvyarbp6wqi";
        libraryHaskellDepends = [
          async base gi-gdk gi-glib gi-gobject gi-gtk gi-gtk-declarative
          haskell-gi haskell-gi-base haskell-gi-overloading pipes
@@ -85353,7 +85923,6 @@ self: {
        ];
        description = "An implementation of the Jinja2 template language in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gingersnap" = callPackage
@@ -85417,6 +85986,7 @@ self: {
        libraryPkgconfigDepends = [ system-glib ];
        description = "Binding to GIO";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {system-glib = pkgs.glib;};
 
   "gipeda" = callPackage
@@ -85890,6 +86460,7 @@ self: {
        testToolDepends = [ git ];
        description = "A framework for pre-commit checks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gitHUD" = callPackage
@@ -85965,7 +86536,6 @@ self: {
        ];
        description = "Compile git revision info into Haskell projects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "github" = callPackage
@@ -85996,6 +86566,7 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Access to the GitHub API, v3";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "github-backup" = callPackage
@@ -86023,6 +86594,7 @@ self: {
        executableToolDepends = [ git ];
        description = "backs up everything github knows about a repository, to the repository";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) git;};
 
   "github-data" = callPackage
@@ -86105,6 +86677,7 @@ self: {
        ];
        description = "Various Github helper utilities";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "github-types" = callPackage
@@ -86211,7 +86784,6 @@ self: {
        ];
        description = "More efficient replacement to the great git-radar";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gitignore" = callPackage
@@ -86240,14 +86812,13 @@ self: {
      , HStringTemplate, HTTP, http-client-tls, http-conduit, json, mtl
      , network, network-uri, old-locale, old-time, pandoc, pandoc-types
      , parsec, pretty, process, random, recaptcha, safe, SHA
-     , skylighting, split, syb, tagsoup, text, time, uri, uri-bytestring
-     , url, utf8-string, uuid, xhtml, xml, xml-conduit, xss-sanitize
-     , zlib
+     , skylighting, split, syb, tagsoup, text, time, uri-bytestring, url
+     , utf8-string, uuid, xhtml, xml, xml-conduit, xss-sanitize, zlib
      }:
      mkDerivation {
        pname = "gitit";
-       version = "0.12.3";
-       sha256 = "0jfi8rvvj2sh0dv19575fr781azsnahs7a828r1z2cql0dslkljl";
+       version = "0.12.3.2";
+       sha256 = "0chsmyqb7cvnvkdj3dg5m6hdg28c987rl7rv3wjb78h6pqhql44l";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -86258,7 +86829,7 @@ self: {
          http-client-tls http-conduit json mtl network network-uri
          old-locale old-time pandoc pandoc-types parsec pretty process
          random recaptcha safe SHA skylighting split syb tagsoup text time
-         uri uri-bytestring url utf8-string uuid xhtml xml xml-conduit
+         uri-bytestring url utf8-string uuid xhtml xml xml-conduit
          xss-sanitize zlib
        ];
        executableHaskellDepends = [
@@ -86768,6 +87339,7 @@ self: {
        ];
        description = "ReactJS binding using Glazier.Command.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "glazier-react-examples" = callPackage
@@ -86812,6 +87384,7 @@ self: {
        ];
        description = "Generic widget library using glazier-react";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gli" = callPackage
@@ -86854,6 +87427,7 @@ self: {
        libraryPkgconfigDepends = [ glib ];
        description = "Binding to the GLIB library for Gtk2Hs";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) glib;};
 
   "glicko" = callPackage
@@ -86928,7 +87502,6 @@ self: {
        testHaskellDepends = [ base HUnit ];
        description = "Console IRC client";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gll" = callPackage
@@ -86945,7 +87518,6 @@ self: {
        ];
        description = "GLL parser with simple combinator interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "glob-posix" = callPackage
@@ -87095,6 +87667,7 @@ self: {
        libraryHaskellDepends = [ accelerate base gloss gloss-rendering ];
        description = "Extras to interface Gloss and Accelerate";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gloss-algorithms" = callPackage
@@ -87108,7 +87681,6 @@ self: {
        libraryHaskellDepends = [ base containers ghc-prim gloss ];
        description = "Data structures and algorithms for working with 2D graphics";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gloss-banana" = callPackage
@@ -87154,7 +87726,6 @@ self: {
        ];
        description = "Examples using the gloss library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gloss-export" = callPackage
@@ -87208,7 +87779,6 @@ self: {
        ];
        description = "Load any image supported by Juicy.Pixels in your gloss application";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gloss-raster" = callPackage
@@ -87418,7 +87988,6 @@ self: {
        ];
        description = "turtle like LOGO with glut";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gmap" = callPackage
@@ -87498,7 +88067,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Bindings for libgnome-keyring";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.gnome3) gnome-keyring; 
          inherit (pkgs) libgnome_keyring;};
 
@@ -87618,7 +88186,6 @@ self: {
        libraryHaskellDepends = [ base directory filepath process ];
        description = "GHCi bindings to lambdabot";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "goal-core" = callPackage
@@ -87798,7 +88365,6 @@ self: {
        doHaddock = false;
        description = "Haskell bindings for the Godot game engine API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gofer-prelude" = callPackage
@@ -89293,13 +89859,13 @@ self: {
      }:
      mkDerivation {
        pname = "google-maps-geocoding";
-       version = "0.4.0.2";
-       sha256 = "0q5zack0lcmn8wsksdlmd0vch1lizia9h4sqax7ydx09is39jzxm";
+       version = "0.5.0.0";
+       sha256 = "07myy4q56lnapjxjfiz8skh2h32k5i132mi9sn68aad03a6rx6k1";
        libraryHaskellDepends = [
          aeson base google-static-maps http-client servant servant-client
          text
        ];
-       description = "Google Maps Geocoding API bindings";
+       description = "Bindings to the Google Geocoding API (formerly Maps Geocoding API)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -89420,14 +89986,14 @@ self: {
      }:
      mkDerivation {
        pname = "google-static-maps";
-       version = "0.5.0.3";
-       sha256 = "18c4s9nvpwv34djf7m2jq5mdpyjplp1hcxrfrp5cdyglk6j0j13b";
+       version = "0.6.0.0";
+       sha256 = "0h2vm6yk076n4xcwlqcl7m786bqrk0vgpcx0h3j04bq2qik88sq5";
        libraryHaskellDepends = [
          aeson base base64-bytestring bytedump bytestring cryptonite
          double-conversion http-client JuicyPixels memory network-uri
          servant servant-client servant-JuicyPixels text utf8-string
        ];
-       description = "Bindings to the Google Static Maps API";
+       description = "Bindings to the Google Maps Static API (formerly Static Maps API)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -89949,12 +90515,13 @@ self: {
   "grammatical-parsers" = callPackage
     ({ mkDerivation, base, checkers, containers, criterion, deepseq
      , doctest, monoid-subclasses, parsers, QuickCheck, rank2classes
-     , tasty, tasty-quickcheck, testing-feat, text, transformers
+     , size-based, tasty, tasty-quickcheck, testing-feat, text
+     , transformers
      }:
      mkDerivation {
        pname = "grammatical-parsers";
-       version = "0.3.1";
-       sha256 = "12lrzzpv48j34y6lwyiq7hg3mahynwj934rsfjmyamy5m5ya0170";
+       version = "0.3.2";
+       sha256 = "1xmxjds8jpg8q3vmmrypcz3gcjwv9sxyxmpkcrlrjm0wziv175x7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -89965,11 +90532,12 @@ self: {
        ];
        testHaskellDepends = [
          base checkers containers doctest monoid-subclasses parsers
-         QuickCheck rank2classes tasty tasty-quickcheck testing-feat
+         QuickCheck rank2classes size-based tasty tasty-quickcheck
+         testing-feat
        ];
        benchmarkHaskellDepends = [
-         base containers criterion deepseq monoid-subclasses rank2classes
-         text
+         base containers criterion deepseq monoid-subclasses parsers
+         rank2classes text
        ];
        description = "parsers that combine into grammars";
        license = stdenv.lib.licenses.bsd3;
@@ -90307,6 +90875,7 @@ self: {
        libraryHaskellDepends = [ array base bytestring containers ];
        description = "Serialization of data structures with references";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graph-utils" = callPackage
@@ -90511,7 +91080,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A reimplementation of graphmod as a source plugin";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graphql" = callPackage
@@ -90561,6 +91129,7 @@ self: {
        libraryHaskellDepends = [ base containers json text ];
        description = "Haskell GraphQL query parser-interpreter-data processor";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graphs" = callPackage
@@ -90617,8 +91186,8 @@ self: {
      }:
      mkDerivation {
        pname = "graphviz";
-       version = "2999.20.0.2";
-       sha256 = "0kj7ap0gnliviq2p8lscw1m06capnsa90vpvcys24nqy5nw2wrp7";
+       version = "2999.20.0.3";
+       sha256 = "04k26zw61nfv1pkd00iaq89pgsaiym0sf4cbzkmm2k2fj5xa587g";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -90626,8 +91195,7 @@ self: {
          polyparse process temporary text wl-pprint-text
        ];
        testHaskellDepends = [
-         base containers fgl fgl-arbitrary filepath hspec hspec-discover
-         QuickCheck text
+         base containers fgl fgl-arbitrary filepath hspec QuickCheck text
        ];
        testSystemDepends = [ graphviz ];
        testToolDepends = [ hspec-discover ];
@@ -90714,15 +91282,14 @@ self: {
      }:
      mkDerivation {
        pname = "gray-extended";
-       version = "1.5.4";
-       sha256 = "106kwrgpiyzndknnn9vn1hlic227q84qjkh6qa47zkjkl6kxwmsk";
+       version = "1.5.6";
+       sha256 = "13a18vri2akfahp8k7s5sg6knn0plcsf6lqdzy05628wymiia2s3";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        description = "Gray encoding schemes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graylog" = callPackage
@@ -90899,6 +91466,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "greskell_0_2_3_0" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, doctest, doctest-discover
+     , exceptions, greskell-core, hint, hspec, semigroups, text
+     , transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "greskell";
+       version = "0.2.3.0";
+       sha256 = "0q15cifn34p0biwwrmkhhgzps2k7d0i8mdb2vazbbf7bshqs2ld8";
+       libraryHaskellDepends = [
+         aeson base exceptions 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
@@ -90948,15 +91537,14 @@ self: {
      }:
      mkDerivation {
        pname = "grid";
-       version = "7.8.11";
-       sha256 = "0kqd04zv1gpz78kdhpd89yhr7xhkzwp3vl7r5hr4ng65zshkdprg";
+       version = "7.8.12";
+       sha256 = "1ax536wr6h8kcnmnnxyd7vcdkqbjlrhrx6jab526b3f2a88n5q6z";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [
          base QuickCheck test-framework test-framework-quickcheck2
        ];
        description = "Tools for working with regular grids (graphs, lattices)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gridbounds" = callPackage
@@ -91153,7 +91741,6 @@ self: {
        ];
        description = "Type-safe datatype-database mapping library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "groundhog-converters" = callPackage
@@ -91196,7 +91783,6 @@ self: {
        ];
        description = "Type-safe datatype-database mapping library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "groundhog-mysql" = callPackage
@@ -91214,7 +91800,6 @@ self: {
        ];
        description = "MySQL backend for the groundhog library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "groundhog-postgresql" = callPackage
@@ -91234,7 +91819,6 @@ self: {
        ];
        description = "PostgreSQL backend for the groundhog library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "groundhog-sqlite" = callPackage
@@ -91252,7 +91836,6 @@ self: {
        ];
        description = "Sqlite3 backend for the groundhog library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "groundhog-th" = callPackage
@@ -91269,7 +91852,6 @@ self: {
        ];
        description = "Type-safe datatype-database mapping library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "group-by-date" = callPackage
@@ -91405,7 +91987,6 @@ self: {
        libraryHaskellDepends = [ base proto-lens proto-lens-runtime ];
        description = "Generated messages and instances for etcd gRPC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "grpc-etcd-client" = callPackage
@@ -91487,6 +92068,7 @@ self: {
        libraryHaskellDepends = [ base hierarchical-clustering ];
        description = "Generic implementation of Gerstein/Sonnhammer/Chothia weighting";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gscholar-rss" = callPackage
@@ -91613,6 +92195,7 @@ self: {
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the GStreamer open source multimedia framework";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) gst-plugins-base; inherit (pkgs) gstreamer;};
 
   "gt-tools" = callPackage
@@ -91680,6 +92263,7 @@ self: {
        libraryPkgconfigDepends = [ gtk2 ];
        description = "Binding to the Gtk+ graphical user interface library";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {gtk2 = pkgs.gnome2.gtk;};
 
   "gtk-helpers" = callPackage
@@ -91695,6 +92279,7 @@ self: {
        ];
        description = "A collection of auxiliary operations and widgets related to Gtk+";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gtk-jsinput" = callPackage
@@ -91706,6 +92291,7 @@ self: {
        libraryHaskellDepends = [ base gtk json transformers ];
        description = "A simple custom form widget for gtk which allows inputing of JSON values";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gtk-largeTreeStore" = callPackage
@@ -91722,6 +92308,7 @@ self: {
        testHaskellDepends = [ base containers gtk3 hspec ];
        description = "Large TreeStore support for gtk2hs";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gtk-mac-integration" = callPackage
@@ -91768,6 +92355,7 @@ self: {
        libraryHaskellDepends = [ base gtk ];
        description = "A simple custom form widget for gtk which allows single LOC creation/updating of list views";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gtk-sni-tray" = callPackage
@@ -91796,6 +92384,7 @@ self: {
        ];
        description = "A standalone StatusNotifierItem/AppIndicator tray";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {gtk3 = pkgs.gnome3.gtk;};
 
   "gtk-strut" = callPackage
@@ -91818,6 +92407,7 @@ self: {
        libraryHaskellDepends = [ base gtk ];
        description = "A simple custom form widget for gtk which allows single LOC creation/updating of toggle button lists";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gtk-toy" = callPackage
@@ -91842,6 +92432,7 @@ self: {
        libraryPkgconfigDepends = [ xlibsWrapper ];
        description = "A wrapper around the eggtraymanager library for Linux system trays";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) xlibsWrapper;};
 
   "gtk2hs-buildtools" = callPackage
@@ -91865,6 +92456,7 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Tools to build the Gtk2Hs suite of User Interface libraries";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gtk2hs-cast-glade" = callPackage
@@ -92016,6 +92608,7 @@ self: {
        libraryPkgconfigDepends = [ gtk3 ];
        description = "Binding to the Gtk+ 3 graphical user interface library";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) gtk3;};
 
   "gtk3-mac-integration" = callPackage
@@ -92112,6 +92705,7 @@ self: {
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the GtkSourceView library";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.gnome2) gtksourceview;};
 
   "gtksourceview3" = callPackage
@@ -92131,6 +92725,7 @@ self: {
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the GtkSourceView library";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {gtksourceview3 = pkgs.gnome3.gtksourceview;};
 
   "guarded-allocation" = callPackage
@@ -92362,6 +92957,7 @@ self: {
        ];
        description = "Control your Arduino board from Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hBDD" = callPackage
@@ -92595,7 +93191,6 @@ self: {
        ];
        description = "native Haskell implementation of OpenPGP (RFC4880)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hPDB" = callPackage
@@ -92794,6 +93389,7 @@ self: {
        ];
        description = "A Gtk mixer GUI application for FreeBSD";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haar" = callPackage
@@ -92959,7 +93555,6 @@ self: {
        libraryHaskellDepends = [ base bytestring cgi containers hack ];
        description = "Allows programs written against MonadCGI to run with any hack handler. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hack-handler-cgi" = callPackage
@@ -93191,7 +93786,6 @@ self: {
        ];
        description = "Hack2 contrib extra";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hack2-handler-happstack-server" = callPackage
@@ -93429,6 +94023,7 @@ self: {
        ];
        description = "Utility to manage secure file-based package repositories";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hackage-security" = callPackage
@@ -93473,6 +94068,7 @@ self: {
        ];
        description = "Hackage security bindings against the HTTP library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hackage-server" = callPackage
@@ -93548,7 +94144,6 @@ self: {
        ];
        description = "Check for differences between working directory and hackage";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hackage2hwn" = callPackage
@@ -93689,6 +94284,7 @@ self: {
        ];
        description = "Hackage and Portage integration tool";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hactor" = callPackage
@@ -94472,6 +95068,7 @@ self: {
        testToolDepends = [ utillinux ];
        description = "A static website compiler library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) utillinux;};
 
   "hakyll-R" = callPackage
@@ -94491,14 +95088,14 @@ self: {
 
   "hakyll-agda" = callPackage
     ({ mkDerivation, Agda, base, containers, directory, filepath
-     , hakyll, mtl, pandoc, transformers, xhtml
+     , hakyll, mtl, pandoc, text, transformers, xhtml
      }:
      mkDerivation {
        pname = "hakyll-agda";
-       version = "0.1.10.1";
-       sha256 = "0k8c38nh12ccg73jfnjwzgbxmvqmfd77bzvk9algi1g4r5f1dyl3";
+       version = "0.1.11";
+       sha256 = "19zgpwmip8fcl9sai6ykhrsp4vkzpjnapkyccbg904qa1xwmlf8k";
        libraryHaskellDepends = [
-         Agda base containers directory filepath hakyll mtl pandoc
+         Agda base containers directory filepath hakyll mtl pandoc text
          transformers xhtml
        ];
        description = "Wrapper to integrate literate Agda files with Hakyll";
@@ -94657,6 +95254,7 @@ self: {
        ];
        description = "Allow Hakyll to create hierarchical menues from directories";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hakyll-elm" = callPackage
@@ -94685,6 +95283,7 @@ self: {
        executableHaskellDepends = [ base hakyll ];
        testHaskellDepends = [ base ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hakyll-filestore" = callPackage
@@ -94699,6 +95298,7 @@ self: {
        ];
        description = "FileStore utilities for Hakyll";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hakyll-images" = callPackage
@@ -94719,6 +95319,7 @@ self: {
        ];
        description = "Hakyll utilities to work with images";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hakyll-ogmarkup" = callPackage
@@ -94746,6 +95347,7 @@ self: {
        ];
        description = "Hakyll SASS compiler over hsass";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hakyll-series" = callPackage
@@ -94757,6 +95359,7 @@ self: {
        libraryHaskellDepends = [ base containers hakyll ];
        description = "Adds series functionality to hakyll";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hakyll-shakespeare" = callPackage
@@ -94774,6 +95377,7 @@ self: {
        ];
        description = "Hakyll Hamlet compiler";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hakyll-shortcode" = callPackage
@@ -94798,6 +95402,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hal" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, envy
+     , exceptions, http-conduit, http-types, mtl, text, time
+     }:
+     mkDerivation {
+       pname = "hal";
+       version = "0.1.0";
+       sha256 = "10n68y9vva9hdvnag48vjnbrdrwv6cirbqgx74cvj4qhlzsvwa7k";
+       libraryHaskellDepends = [
+         aeson base bytestring containers envy exceptions http-conduit
+         http-types mtl text time
+       ];
+       description = "Please see the README.md file for this project.";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "halberd" = callPackage
     ({ mkDerivation, base, Cabal, containers, haskell-names
      , haskell-packages, haskell-src-exts, HUnit, mtl, safe, split, syb
@@ -94928,8 +95548,8 @@ self: {
      }:
      mkDerivation {
        pname = "halma";
-       version = "0.3.0.0";
-       sha256 = "0hnm9ic18fivcf0wjmz6sap8b249g5f0bzq4pranxl822n4gcjnf";
+       version = "0.3.0.1";
+       sha256 = "1bmc7s4vl1k2i66q1ir6mkzn67j5gycshkkwp4d2v1dd86sswf28";
        libraryHaskellDepends = [
          aeson base containers data-default diagrams-lib grid
        ];
@@ -94939,7 +95559,6 @@ self: {
        ];
        description = "Library implementing Halma rules";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "halma-gui" = callPackage
@@ -94948,8 +95567,8 @@ self: {
      }:
      mkDerivation {
        pname = "halma-gui";
-       version = "0.1.1.0";
-       sha256 = "0qc8i75h8xa7nwzpv62bck404f4jji3nmjgyid06r52rb3cr5h18";
+       version = "0.1.1.1";
+       sha256 = "15kp369lvy67mc86f5c6k3x0849vcl4bqmd5l4brymy79d7b2f2p";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -95067,7 +95686,6 @@ self: {
        ];
        description = "Physics on generalized coordinate systems using Hamiltonian Mechanics and AD";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hamlet" = callPackage
@@ -95277,6 +95895,7 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "HandleLike class";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "handsy" = callPackage
@@ -95647,8 +96266,8 @@ self: {
      }:
      mkDerivation {
        pname = "happstack-authenticate";
-       version = "2.3.4.11";
-       sha256 = "1df9yybqzljfilpqgrz8qpa6iy5lfa3f3vmz0ip8qpvzgcxyhpd7";
+       version = "2.3.4.15";
+       sha256 = "1vgyzclziis403d08x4s26ml7ay0icwymixddbm409c99p6l8lif";
        enableSeparateDataOutput = true;
        libraryHaskellDepends = [
          acid-state aeson authenticate base base64-bytestring boomerang
@@ -95782,7 +96401,6 @@ self: {
        ];
        description = "Happstack extension for use with FastCGI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happstack-fay" = callPackage
@@ -95953,6 +96571,7 @@ self: {
        ];
        description = "Support for using JMacro with Happstack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happstack-lite" = callPackage
@@ -96012,8 +96631,8 @@ self: {
      }:
      mkDerivation {
        pname = "happstack-server";
-       version = "7.5.1.1";
-       sha256 = "0qgx142xbig19j5j31b4vcgznzaw9c6fg4009vzp9yhvfbfnajk1";
+       version = "7.5.1.3";
+       sha256 = "0agxmrf2njd3whvgw4in0ixgss1qlmi6cdi9fglhs7nhykpkgllk";
        libraryHaskellDepends = [
          base base64-bytestring blaze-html bytestring containers directory
          exceptions extensible-exceptions filepath hslogger html
@@ -96036,8 +96655,8 @@ self: {
      }:
      mkDerivation {
        pname = "happstack-server-tls";
-       version = "7.1.6.5";
-       sha256 = "0hp13wxaghs6ldqpbpyf8agph7b1y488fc516z1n6bvbpzcbhbvq";
+       version = "7.1.6.7";
+       sha256 = "18jvim1hm1d4ia8ka2kxwzzzpdvs6wy0v2k5qz6bg9lsv4wi9xil";
        libraryHaskellDepends = [
          base bytestring extensible-exceptions happstack-server hslogger
          HsOpenSSL network sendfile time unix
@@ -96445,8 +97064,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "harp";
-       version = "0.4.3.1";
-       sha256 = "0g4ig5s5rawlbq7zj1hkydnkw2s1gn7x0sdimd6j6kr5bynrdnhk";
+       version = "0.4.3.2";
+       sha256 = "1abyfsr0ya7j0s6znixhfhsr9mlmcg16rg5d9909b0xr896bkbn6";
        libraryHaskellDepends = [ base ];
        description = "HaRP allows pattern-matching with regular expressions";
        license = stdenv.lib.licenses.bsd3;
@@ -96525,6 +97144,8 @@ self: {
        pname = "hasbolt";
        version = "0.1.3.2";
        sha256 = "14sq3iqbrfkwyswdka2285cdhwx3c6srfhn5qb7yw1nfjx2bdb1i";
+       revision = "1";
+       editedCabalFile = "127j24130d412ccn9zc71lxjfr6w0srbc8ir67s3zbmzs6g1l9j8";
        libraryHaskellDepends = [
          base binary bytestring connection containers data-binary-ieee754
          data-default network text transformers
@@ -96553,6 +97174,7 @@ self: {
        ];
        description = "Extras for hasbolt library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hascal" = callPackage
@@ -96885,6 +97507,7 @@ self: {
        libraryHaskellDepends = [ base containers simple-money ];
        description = "A library for working with HashFlare.io contracts and hashrates";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hashids" = callPackage
@@ -97210,7 +97833,6 @@ self: {
        ];
        description = "Generate tags file for Haskell project and its nearest deps";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskeem" = callPackage
@@ -97476,6 +98098,7 @@ self: {
        ];
        description = "Cabal package script generator for Travis-CI";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-cnc" = callPackage
@@ -97595,6 +98218,7 @@ self: {
        testHaskellDepends = [ base ];
        description = "Client library for the Disque datastore";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-docs" = callPackage
@@ -97875,7 +98499,6 @@ self: {
        ];
        description = "Haskell interface of the igraph library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) igraph;};
 
   "haskell-import-graph" = callPackage
@@ -98413,7 +99036,6 @@ self: {
        ];
        description = "Snake game implemetation in Haskell using SDL2";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-spacegoo" = callPackage
@@ -98564,6 +99186,7 @@ self: {
        libraryHaskellDepends = [ base haskell-src-exts ];
        description = "Pretty print haskell code with comments";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-src-exts-simple" = callPackage
@@ -98644,6 +99267,7 @@ self: {
        executableHaskellDepends = [ base ];
        description = "haskell-stack-trace-plugin";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-time-range" = callPackage
@@ -98696,6 +99320,7 @@ self: {
        ];
        description = "Haskell AST for efficient tooling";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-tools-ast-fromghc" = callPackage
@@ -98764,6 +99389,7 @@ self: {
        ];
        description = "Creating the Haskell-Tools AST from GHC's representations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-tools-builtin-refactorings" = callPackage
@@ -98795,6 +99421,7 @@ self: {
        ];
        description = "Refactoring Tool for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-tools-cli" = callPackage
@@ -98889,6 +99516,7 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Debugging Tools for Haskell-tools";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-tools-demo" = callPackage
@@ -98919,6 +99547,7 @@ self: {
        ];
        description = "A web-based demo for Haskell-tools Refactor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-tools-experimental-refactorings" = callPackage
@@ -98949,6 +99578,7 @@ self: {
        ];
        description = "Refactoring Tool for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-tools-prettyprint" = callPackage
@@ -98965,6 +99595,7 @@ self: {
        ];
        description = "Pretty printing of Haskell-Tools AST";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-tools-refactor" = callPackage
@@ -98994,6 +99625,7 @@ self: {
        ];
        description = "Refactoring Tool for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-tools-rewrite" = callPackage
@@ -99015,6 +99647,7 @@ self: {
        ];
        description = "Facilities for generating new parts of the Haskell-Tools AST";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-tor" = callPackage
@@ -99137,6 +99770,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "haskell2020" = callPackage
+    ({ mkDerivation, array, base }:
+     mkDerivation {
+       pname = "haskell2020";
+       version = "0.1.0.0";
+       sha256 = "02amj6wza3aaw3i84yjh6zwn7v5g3v1d748ajc7gv6cpd4904pzq";
+       libraryHaskellDepends = [ array base ];
+       description = "Haskell 2020[draft] Standard Library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "haskell98" = callPackage
     ({ mkDerivation, array, base, directory, old-locale, old-time
      , process, time
@@ -99761,6 +100405,7 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Haskell Evaluation inside of LaTeX code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskmon" = callPackage
@@ -99846,7 +100491,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Bitcoin & Bitcoin Cash library for Haskell";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskoin-crypto" = callPackage
@@ -100239,7 +100883,6 @@ self: {
        ];
        description = "Produces ctags \"tags\" and etags \"TAGS\" files for Haskell programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hasktorch" = callPackage
@@ -100588,6 +101231,7 @@ self: {
        ];
        description = "Haskus utility modules";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskus-utils-types" = callPackage
@@ -100693,10 +101337,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasmin";
-       version = "1.0.2.1";
-       sha256 = "0dwamjpqwikl8qh5zcxhrm7x80k35zw29xh83yfnwnsa41incylb";
-       revision = "1";
-       editedCabalFile = "05naxdaglbz8grzz399dkra9y3f1k75661397flbgrwbxkyadz2z";
+       version = "1.0.3";
+       sha256 = "0p9a1q8brymkd4y74gn4iiwihikn55wx2h9zz3mpd6ab53rsz43k";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -100712,7 +101354,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion directory text ];
        description = "CSS Minifier";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hasparql-client" = callPackage
@@ -100767,7 +101408,6 @@ self: {
        benchmarkHaskellDepends = [ bug criterion rerebase ];
        description = "An efficient PostgreSQL driver and a flexible mapping API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hasql-backend" = callPackage
@@ -100848,7 +101488,6 @@ self: {
        ];
        description = "An abstraction for simultaneous fetching from multiple PostgreSQL cursors";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hasql-generic" = callPackage
@@ -100904,7 +101543,6 @@ self: {
        ];
        description = "\"optparse-applicative\" parsers for \"hasql\"";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hasql-pool" = callPackage
@@ -100916,7 +101554,6 @@ self: {
        libraryHaskellDepends = [ base-prelude hasql resource-pool time ];
        description = "A pool of connections for Hasql";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hasql-postgres" = callPackage
@@ -101017,7 +101654,6 @@ self: {
        testHaskellDepends = [ async hasql rebase ];
        description = "A composable abstraction over the retryable transactions for Hasql";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hastache" = callPackage
@@ -101378,6 +102014,7 @@ self: {
        ];
        description = "Recursively retrieve maven dependencies";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haverer" = callPackage
@@ -102592,6 +103229,7 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Heaps in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "heaps" = callPackage
@@ -102633,6 +103271,7 @@ self: {
        libraryHaskellDepends = [ async base io-streams time ];
        description = "Heartbeats for io-streams";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "heatitup" = callPackage
@@ -102726,7 +103365,6 @@ self: {
        ];
        description = "Full-weight logging based on fast-logger";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "heavy-logger-amazon" = callPackage
@@ -102742,7 +103380,6 @@ self: {
        ];
        description = "heavy-logger compatibility with amazonka-core logging";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "heavy-logger-instances" = callPackage
@@ -102763,7 +103400,6 @@ self: {
        ];
        description = "Orphan instances for data types in heavy-logger package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hebrew-time" = callPackage
@@ -102828,8 +103464,8 @@ self: {
        pname = "hedgehog";
        version = "0.6.1";
        sha256 = "0xz10ycdm5vk9nrcym1fi83k19frfwqz18bz8bnpzwvaj0j41yfj";
-       revision = "1";
-       editedCabalFile = "1fj3m5p5nm3dip93a1z7yrrq3fmqk30qgljdspia13y3lyqlcrf1";
+       revision = "2";
+       editedCabalFile = "1l0iw2jqdvxgfysfvp1x0s2pq3kyvpapjdjkx9pi4bkxpjpkvbza";
        libraryHaskellDepends = [
          ansi-terminal async base bytestring concurrent-output containers
          directory exceptions lifted-async mmorph monad-control mtl
@@ -102936,7 +103572,6 @@ self: {
        libraryHaskellDepends = [ base hedgehog QuickCheck transformers ];
        description = "Use QuickCheck generators in Hedgehog and vice versa";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hedis" = callPackage
@@ -103083,7 +103718,21 @@ self: {
        ];
        description = "EDN parsing and encoding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "hedra" = callPackage
+    ({ mkDerivation, base, doctest, haskeline, random }:
+     mkDerivation {
+       pname = "hedra";
+       version = "0.1";
+       sha256 = "17yvqfhxvxrfy7g6s3wv4gp59s2mgikw1dc078jzhb1g00zggwb4";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base random ];
+       executableHaskellDepends = [ base haskeline ];
+       testHaskellDepends = [ base doctest ];
+       description = "A small library and executable for generating dice rolls";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "hein" = callPackage
@@ -103645,7 +104294,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "haskell time manipulation in a 'kerf like' style";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hermit" = callPackage
@@ -103895,8 +104543,8 @@ self: {
      }:
      mkDerivation {
        pname = "heterocephalus";
-       version = "1.0.5.2";
-       sha256 = "08sr2ps3kb2v6pglkls814w6fpvwkysd3k2s15pj9fhmhx82kf2h";
+       version = "1.0.5.3";
+       sha256 = "0kvrv15xm6igd6nkyfij1h982jqpbf61pzinv8jdb4fcjqwf08s7";
        libraryHaskellDepends = [
          base blaze-html blaze-markup containers dlist mtl parsec
          shakespeare template-haskell text transformers
@@ -103916,6 +104564,7 @@ self: {
        testHaskellDepends = [ base ];
        description = "Allows the use of tuples as literals for Heterogeneous collections";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "heterolist" = callPackage
@@ -104212,6 +104861,7 @@ self: {
        ];
        description = "Lenses for Hexpat";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hexpat-pickle" = callPackage
@@ -104730,6 +105380,7 @@ self: {
        ];
        description = "Geometric Algorithms, Data structures, and Data types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hgeos" = callPackage
@@ -104767,6 +105418,7 @@ self: {
        ];
        description = "Bindings to libintl.h (gettext, bindtextdomain)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hgis" = callPackage
@@ -104910,6 +105562,7 @@ self: {
        ];
        description = "Compile Mercurial (hg) version info into Haskell code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hgrib" = callPackage
@@ -105144,6 +105797,7 @@ self: {
        testHaskellDepends = [ base hspec HUnit QuickCheck ];
        description = "Fast algorithms for single, average/UPGMA and complete linkage clustering";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hierarchical-clustering-diagrams" = callPackage
@@ -105198,6 +105852,7 @@ self: {
        ];
        description = "Predicated traversal of generated trees";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hiernotify" = callPackage
@@ -105373,7 +106028,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Command line tool for highlighting parts of files matching a regex";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "highlight-versions" = callPackage
@@ -105390,6 +106044,7 @@ self: {
        ];
        description = "Highlight package versions which differ from the latest version on Hackage";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "highlighter" = callPackage
@@ -105815,6 +106470,7 @@ self: {
        ];
        description = "Runtime Haskell interpreter (GHC API wrapper)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hinterface" = callPackage
@@ -106060,6 +106716,7 @@ self: {
        ];
        description = "A generic, DAWG-based dictionary";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hist-pl-fusion" = callPackage
@@ -106195,6 +106852,8 @@ self: {
        pname = "hit";
        version = "0.6.3";
        sha256 = "0wg44vgd5jzi0r0vg8k5zrvlr7rcrb4nrp862c6y991941qv71nv";
+       revision = "2";
+       editedCabalFile = "1wcc2lywirc6dmhssnbhgv38vf3xz371y99id30bhg1brmiwmii3";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -106577,6 +107236,7 @@ self: {
        ];
        description = "Web API server for the hledger accounting tool";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hledger-chart" = callPackage
@@ -106642,7 +107302,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "A terminal UI as drop-in replacement for hledger add";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hledger-interest" = callPackage
@@ -106932,6 +107591,7 @@ self: {
        ];
        description = "Library and utility interfacing to longurl.org";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hlrdb" = callPackage
@@ -106949,6 +107609,7 @@ self: {
        ];
        description = "High-level Redis Database";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hlrdb-core" = callPackage
@@ -106965,6 +107626,7 @@ self: {
        ];
        description = "High-level Redis Database Core API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hls" = callPackage
@@ -107212,7 +107874,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Interface HMatrix with the NLOPT minimizer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hmatrix-quadprogpp" = callPackage
@@ -107225,7 +107886,6 @@ self: {
        librarySystemDepends = [ QuadProgpp ];
        description = "Bindings to the QuadProg++ quadratic programming library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) QuadProgpp;};
 
   "hmatrix-repa" = callPackage
@@ -107368,7 +108028,6 @@ self: {
        ];
        description = "Conversions between hmatrix and vector-sized types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hmeap" = callPackage
@@ -107703,6 +108362,7 @@ self: {
        ];
        description = "Haskell implementation of the Nix language";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hnn" = callPackage
@@ -108820,7 +109480,6 @@ self: {
        executableToolDepends = [ alex happy ];
        description = "hOpenPGP-based command-line tools";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hopenssl" = callPackage
@@ -109033,6 +109692,7 @@ self: {
        ];
        description = "date time";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "horizon" = callPackage
@@ -109101,6 +109761,7 @@ self: {
        ];
        description = "Haskell Open Sound Control JSON Serialisation";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hosc-utils" = callPackage
@@ -109464,7 +110125,6 @@ self: {
        ];
        description = "hpack's dhalling";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hpaco" = callPackage
@@ -109646,6 +110306,7 @@ self: {
        testHaskellDepends = [ base HUnit ];
        description = "Coveralls.io support for Haskell.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hpc-strobe" = callPackage
@@ -109754,6 +110415,7 @@ self: {
        ];
        description = "Monads for GPIO in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hplayground" = callPackage
@@ -109826,7 +110488,6 @@ self: {
        testHaskellDepends = [ base bytestring transformers ];
        description = "A Haskell pre-processor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hpqtypes" = callPackage
@@ -110097,7 +110758,6 @@ self: {
        ];
        description = "A query language for transforming HTML5";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hranker" = callPackage
@@ -110353,6 +111013,7 @@ self: {
        ];
        description = "Conllu validating parser and utils";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hs-di" = callPackage
@@ -110798,6 +111459,7 @@ self: {
        testHaskellDepends = [ base HUnit network temporary unix ];
        description = "Write a server supporting Server::Starter's protocol in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hs-snowtify" = callPackage
@@ -110927,7 +111589,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Create ATS types from Haskell types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hs2bf" = callPackage
@@ -111232,7 +111893,6 @@ self: {
        testHaskellDepends = [ base tasty tasty-hspec ];
        description = "A preprocessor that helps with writing Haskell bindings to C code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsc3" = callPackage
@@ -111324,6 +111984,7 @@ self: {
        libraryHaskellDepends = [ base directory filepath hsc3 process ];
        description = "haskell supercollider graph drawing";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsc3-forth" = callPackage
@@ -111447,6 +112108,7 @@ self: {
        ];
        description = "Create and control scsynth processes";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsc3-rec" = callPackage
@@ -111825,6 +112487,7 @@ self: {
        testHaskellDepends = [ base containers text ];
        description = "Collision-resistant IDs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hscurses" = callPackage
@@ -112244,6 +112907,7 @@ self: {
        ];
        description = "A command line program for extending the import list of a Haskell source file";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsini" = callPackage
@@ -112863,6 +113527,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hspec_2_6_1" = callPackage
+    ({ mkDerivation, base, hspec-core, hspec-discover
+     , hspec-expectations, QuickCheck
+     }:
+     mkDerivation {
+       pname = "hspec";
+       version = "2.6.1";
+       sha256 = "1jkfqhdymr62rzqmlmc22mpla23p67rnls3v3zs30ggxbgs4dxlb";
+       libraryHaskellDepends = [
+         base hspec-core hspec-discover hspec-expectations QuickCheck
+       ];
+       description = "A Testing Framework for Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hspec-attoparsec" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, hspec
      , hspec-expectations, text
@@ -112963,6 +113643,34 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hspec-core_2_6_1" = callPackage
+    ({ mkDerivation, ansi-terminal, array, base, call-stack, clock
+     , deepseq, directory, filepath, hspec-expectations, hspec-meta
+     , HUnit, process, QuickCheck, quickcheck-io, random, setenv
+     , silently, stm, temporary, tf-random, transformers
+     }:
+     mkDerivation {
+       pname = "hspec-core";
+       version = "2.6.1";
+       sha256 = "0xg43kan7p6ahi5827qwcyiic6bq0bp8n0n8h3j4kh87qhdl4avv";
+       libraryHaskellDepends = [
+         ansi-terminal array base call-stack clock deepseq directory
+         filepath hspec-expectations HUnit QuickCheck quickcheck-io random
+         setenv stm tf-random transformers
+       ];
+       testHaskellDepends = [
+         ansi-terminal array base call-stack clock deepseq directory
+         filepath hspec-expectations hspec-meta HUnit process QuickCheck
+         quickcheck-io random setenv silently stm temporary tf-random
+         transformers
+       ];
+       testToolDepends = [ hspec-meta ];
+       testTarget = "--test-option=--skip --test-option='Test.Hspec.Core.Runner.hspecResult runs specs in parallel'";
+       description = "A Testing Framework for Haskell";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hspec-dirstream" = callPackage
     ({ mkDerivation, base, dirstream, filepath, hspec, hspec-core
      , pipes, pipes-safe, system-filepath, text
@@ -112979,7 +113687,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Helper functions to simplify adding integration tests";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-discover_2_4_8" = callPackage
@@ -113020,6 +113727,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hspec-discover_2_6_1" = callPackage
+    ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck
+     }:
+     mkDerivation {
+       pname = "hspec-discover";
+       version = "2.6.1";
+       sha256 = "189gj8drfzdf3j3xm8gbj9hjc1ha95ajhi47s9r440yjhyarlmlx";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base directory filepath ];
+       executableHaskellDepends = [ base directory filepath ];
+       testHaskellDepends = [
+         base directory filepath hspec-meta QuickCheck
+       ];
+       testToolDepends = [ hspec-meta ];
+       description = "Automatically discover and run Hspec tests";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hspec-expectations" = callPackage
     ({ mkDerivation, base, call-stack, HUnit, nanospec }:
      mkDerivation {
@@ -113236,6 +113963,8 @@ self: {
        pname = "hspec-meta";
        version = "2.6.0";
        sha256 = "1n1a4633wfivylglji8920f67mx7qz8j4q58n8p7dxk6yg4h3mz6";
+       revision = "1";
+       editedCabalFile = "1qh3j6mhlz2bvdk8qc5fa4nqh93q4vqnvxmqqisg4agacnvyp4b2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -113502,8 +114231,8 @@ self: {
      }:
      mkDerivation {
        pname = "hspec-wai";
-       version = "0.9.0";
-       sha256 = "1fnzarsksv8hwawggimvy3qyb8k5vkj3971xkg86lzdpl789xzn8";
+       version = "0.9.2";
+       sha256 = "0gr8j8x8vvzygxyqc0likam63f3427x4p73g95a387aksr5l2ph5";
        libraryHaskellDepends = [
          base base-compat bytestring case-insensitive hspec-core
          hspec-expectations http-types QuickCheck text transformers wai
@@ -113518,38 +114247,14 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hspec-wai_0_9_1" = callPackage
-    ({ mkDerivation, base, base-compat, bytestring, case-insensitive
-     , hspec, hspec-core, hspec-expectations, http-types, QuickCheck
-     , text, transformers, wai, wai-extra
-     }:
-     mkDerivation {
-       pname = "hspec-wai";
-       version = "0.9.1";
-       sha256 = "01fc00dxm717blynx4a0b4rrjdqc6yn5pxpk21m8y3jqbw7pryhk";
-       libraryHaskellDepends = [
-         base base-compat bytestring case-insensitive hspec-core
-         hspec-expectations http-types QuickCheck text transformers wai
-         wai-extra
-       ];
-       testHaskellDepends = [
-         base base-compat bytestring case-insensitive hspec hspec-core
-         hspec-expectations http-types QuickCheck text transformers wai
-         wai-extra
-       ];
-       description = "Experimental Hspec support for testing WAI applications";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "hspec-wai-json" = callPackage
     ({ mkDerivation, aeson, aeson-qq, base, bytestring
      , case-insensitive, hspec, hspec-wai, template-haskell
      }:
      mkDerivation {
        pname = "hspec-wai-json";
-       version = "0.9.0";
-       sha256 = "11c0w9mg4syd532mnbrdiib4a07k1qm70x02jm3gqzzwlwgl1id1";
+       version = "0.9.2";
+       sha256 = "1p6adknahl357cjkfg32aha6v79mwwr55isgl4hj2rh45r429qw2";
        libraryHaskellDepends = [
          aeson aeson-qq base bytestring case-insensitive hspec-wai
          template-haskell
@@ -113559,24 +114264,6 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hspec-wai-json_0_9_1" = callPackage
-    ({ mkDerivation, aeson, aeson-qq, base, bytestring
-     , case-insensitive, hspec, hspec-wai, template-haskell
-     }:
-     mkDerivation {
-       pname = "hspec-wai-json";
-       version = "0.9.1";
-       sha256 = "15llj764lgl0rad6bypkidcz5dbmsdzr182x1vp5sa0wx6xsvlzm";
-       libraryHaskellDepends = [
-         aeson aeson-qq base bytestring case-insensitive hspec-wai
-         template-haskell
-       ];
-       testHaskellDepends = [ base hspec hspec-wai ];
-       description = "Testing JSON APIs with hspec-wai";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "hspec-webdriver" = callPackage
     ({ mkDerivation, aeson, base, data-default, hashable, hspec
      , hspec-core, HUnit, lifted-base, stm, text, transformers
@@ -113606,6 +114293,7 @@ self: {
        libraryHaskellDepends = [ base hspec hspec-discover ];
        description = "Alpha version of Hspec 2.0";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspecVariant" = callPackage
@@ -114361,6 +115049,7 @@ self: {
        ];
        description = "hsp+jmacro support";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsx-xhtml" = callPackage
@@ -114381,8 +115070,8 @@ self: {
      }:
      mkDerivation {
        pname = "hsx2hs";
-       version = "0.14.1.3";
-       sha256 = "15y7mk01cffc1xgsddkqqmi76npbi7mikgia6xa3xk4916kwsl91";
+       version = "0.14.1.5";
+       sha256 = "0cw66j3firzgg5c7689y0kffgfq36yn4y17yprbbgv6kw4g7wid4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -114451,6 +115140,7 @@ self: {
        testHaskellDepends = [ base hspec time ];
        description = "Log to syslog over a network via UDP";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hszephyr" = callPackage
@@ -114557,6 +115247,7 @@ self: {
        ];
        description = "Import from the Tiled map editor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "htime" = callPackage
@@ -114592,8 +115283,8 @@ self: {
     ({ mkDerivation, base, containers }:
      mkDerivation {
        pname = "htlset";
-       version = "0.1.0.0";
-       sha256 = "18wbw6zfb424xq3m05hjxypiiaqc75nd365y9l8035dvi29mfbnf";
+       version = "0.1.0.1";
+       sha256 = "0i7qipq0dbyd9zqjl1n6sxzma066293gpbxwqwd84wiw3vw2gz3w";
        libraryHaskellDepends = [ base containers ];
        description = "Heterogenous Set";
        license = stdenv.lib.licenses.bsd3;
@@ -114972,7 +115663,6 @@ self: {
        doHaddock = false;
        description = "Parser for TOML files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "htrace" = callPackage
@@ -115066,6 +115756,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "htssets" = callPackage
+    ({ mkDerivation, base, containers }:
+     mkDerivation {
+       pname = "htssets";
+       version = "0.2.0.0";
+       sha256 = "15wbafj54yfipp3pfqk0yd5qlzm76457mngv1fs899sp31y2m2cv";
+       libraryHaskellDepends = [ base containers ];
+       description = "Heterogenous Sets";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "http-accept" = callPackage
     ({ mkDerivation, base, bytestring }:
      mkDerivation {
@@ -115449,7 +116150,6 @@ self: {
        ];
        description = "HTTP downloader tailored for web-crawler needs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-date" = callPackage
@@ -115557,6 +116257,7 @@ self: {
        ];
        description = "HTTP client based on io-streams";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-kinder" = callPackage
@@ -115678,6 +116379,7 @@ self: {
        ];
        description = "Monad abstraction for HTTP allowing lazy transfer and non-I/O simulation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-pony" = callPackage
@@ -116184,6 +116886,7 @@ self: {
        testSystemDepends = [ tvm_runtime ];
        description = "Bindings for TVM machine learning framework";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {tvm_runtime = null;};
 
   "htzaar" = callPackage
@@ -116381,8 +117084,8 @@ self: {
     ({ mkDerivation, base, criterion, doctest, Glob }:
      mkDerivation {
        pname = "human-readable-duration";
-       version = "0.2.0.3";
-       sha256 = "1nlrfp4j9i83gym765srndqaa62f22jwqzbmmql8fn4l54dakwwk";
+       version = "0.2.1.2";
+       sha256 = "142ng2395pa9lcllb0sh8n974d58r4ny05nlsj6y3gd04prdwlk5";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base doctest Glob ];
        benchmarkHaskellDepends = [ base criterion ];
@@ -116705,6 +117408,7 @@ self: {
        ];
        description = "R5RS Scheme interpreter, compiler, and library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "husk-scheme-libs" = callPackage
@@ -116720,6 +117424,7 @@ self: {
        ];
        description = "Extra libraries for the husk Scheme platform";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "husky" = callPackage
@@ -116841,6 +117546,7 @@ self: {
        ];
        description = "Balanced parentheses";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-bits" = callPackage
@@ -116862,6 +117568,7 @@ self: {
        benchmarkHaskellDepends = [ base criterion hw-prim vector ];
        description = "Bit manipulation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-conduit" = callPackage
@@ -116979,6 +117686,7 @@ self: {
        ];
        description = "File Dump";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-eliasfano" = callPackage
@@ -116997,6 +117705,7 @@ self: {
        ];
        description = "Elias-Fano";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-excess" = callPackage
@@ -117015,6 +117724,7 @@ self: {
        ];
        description = "Excess";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-fingertree" = callPackage
@@ -117066,6 +117776,20 @@ self: {
      }) {};
 
   "hw-hspec-hedgehog" = callPackage
+    ({ mkDerivation, base, call-stack, hedgehog, hspec, HUnit }:
+     mkDerivation {
+       pname = "hw-hspec-hedgehog";
+       version = "0.1.0.4";
+       sha256 = "1vlrrskalip7a477px7imwy9yifvdx7c03zrgk90rlarivwkggaq";
+       revision = "2";
+       editedCabalFile = "1jh0p4i87c2bn926s0d7qx6ykssjj26fia0d24grlklkd14bnmpq";
+       libraryHaskellDepends = [ base call-stack hedgehog hspec HUnit ];
+       testHaskellDepends = [ base hedgehog hspec ];
+       description = "Interoperability between hspec and hedgehog";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "hw-hspec-hedgehog_0_1_0_5" = callPackage
     ({ mkDerivation, base, call-stack, hedgehog, hspec, HUnit
      , transformers
      }:
@@ -117081,6 +117805,7 @@ self: {
        testHaskellDepends = [ base hedgehog hspec ];
        description = "Interoperability between hspec and hedgehog";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-int" = callPackage
@@ -117111,6 +117836,27 @@ self: {
        ];
        description = "Library for manipulating IP addresses and CIDR blocks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "hw-ip_2_0_1_0" = callPackage
+    ({ mkDerivation, appar, base, containers, generic-lens, hedgehog
+     , hspec, hw-bits, hw-hspec-hedgehog, iproute, text
+     }:
+     mkDerivation {
+       pname = "hw-ip";
+       version = "2.0.1.0";
+       sha256 = "1r1ck890id7x9b1dpp23h656mvh24bacxdbvxhgkdjiryklrjsqr";
+       libraryHaskellDepends = [
+         appar base containers generic-lens hw-bits iproute text
+       ];
+       testHaskellDepends = [
+         appar base generic-lens hedgehog hspec hw-bits hw-hspec-hedgehog
+         text
+       ];
+       description = "Library for manipulating IP addresses and CIDR blocks";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-json" = callPackage
@@ -117146,6 +117892,7 @@ self: {
        ];
        description = "Memory efficient JSON parser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-json-lens" = callPackage
@@ -117239,18 +117986,54 @@ self: {
      }) {};
 
   "hw-mquery" = callPackage
-    ({ mkDerivation, ansi-wl-pprint, base, dlist, hspec, QuickCheck }:
+    ({ mkDerivation, ansi-wl-pprint, base, dlist, hedgehog, hspec
+     , hspec-discover, hw-hspec-hedgehog, lens, QuickCheck, semigroups
+     }:
      mkDerivation {
        pname = "hw-mquery";
-       version = "0.1.0.1";
-       sha256 = "0g8i7vlb0xhmcwdkvakmr6j7hy8gfyil4w0vnygshmqb96qaajkj";
+       version = "0.1.0.3";
+       sha256 = "0i020vl1f2nkk80rd1fmx9ilkrzyggp01ka3bz9n0365mcq5g3s5";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ ansi-wl-pprint base dlist ];
-       executableHaskellDepends = [ base ];
-       testHaskellDepends = [ base hspec QuickCheck ];
-       description = "Conduits for tokenizing streams";
-       license = stdenv.lib.licenses.mit;
+       libraryHaskellDepends = [
+         ansi-wl-pprint base dlist lens semigroups
+       ];
+       executableHaskellDepends = [
+         ansi-wl-pprint base dlist lens semigroups
+       ];
+       testHaskellDepends = [
+         ansi-wl-pprint base dlist hedgehog hspec hw-hspec-hedgehog lens
+         QuickCheck semigroups
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Monadic query DSL";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "hw-mquery_0_2_0_0" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, base, dlist, hedgehog, hspec
+     , hspec-discover, hw-hspec-hedgehog, lens, QuickCheck, semigroups
+     }:
+     mkDerivation {
+       pname = "hw-mquery";
+       version = "0.2.0.0";
+       sha256 = "006p6j77gd68mrdfwghx29wxyyxam3khicgkaadi8b97aza3nz3f";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         ansi-wl-pprint base dlist lens semigroups
+       ];
+       executableHaskellDepends = [
+         ansi-wl-pprint base dlist lens semigroups
+       ];
+       testHaskellDepends = [
+         ansi-wl-pprint base dlist hedgehog hspec hw-hspec-hedgehog lens
+         QuickCheck semigroups
+       ];
+       testToolDepends = [ hspec-discover ];
+       description = "Monadic query DSL";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-packed-vector" = callPackage
@@ -117269,6 +118052,7 @@ self: {
        ];
        description = "Packed Vector";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-parser" = callPackage
@@ -117282,6 +118066,7 @@ self: {
        ];
        description = "Simple parser support";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-prim" = callPackage
@@ -117305,6 +118090,7 @@ self: {
        ];
        description = "Primitive functions and data types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-prim-bits" = callPackage
@@ -117325,7 +118111,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion vector ];
        description = "Primitive support for bit manipulation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-rankselect" = callPackage
@@ -117359,6 +118144,7 @@ self: {
        ];
        description = "Rank-select";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-rankselect-base" = callPackage
@@ -117382,6 +118168,7 @@ self: {
        ];
        description = "Rank-select base";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-simd" = callPackage
@@ -117416,13 +118203,14 @@ self: {
 
   "hw-streams" = callPackage
     ({ mkDerivation, base, bytestring, criterion, directory, exceptions
-     , ghc-prim, hedgehog, hspec, hw-bits, hw-hspec-hedgehog, hw-prim
-     , mmap, primitive, QuickCheck, semigroups, transformers, vector
+     , ghc-prim, hedgehog, hspec, hspec-discover, hw-bits
+     , hw-hspec-hedgehog, hw-prim, mmap, primitive, QuickCheck
+     , semigroups, transformers, vector
      }:
      mkDerivation {
        pname = "hw-streams";
-       version = "0.0.0.8";
-       sha256 = "08pj20r1is6kyinj60xrl0wz7kcjlcc5xivzrhwmjws5qbscimgw";
+       version = "0.0.0.9";
+       sha256 = "05fhixjndgz26gf3kl8nzynzrs93ra61rbnps4bgd3ikg07njrjn";
        libraryHaskellDepends = [
          base bytestring ghc-prim hw-bits hw-prim mmap primitive semigroups
          transformers vector
@@ -117432,12 +118220,43 @@ self: {
          hw-bits hw-hspec-hedgehog hw-prim mmap primitive QuickCheck
          semigroups transformers vector
        ];
+       testToolDepends = [ hspec-discover ];
        benchmarkHaskellDepends = [
          base bytestring criterion ghc-prim hw-bits hw-prim mmap primitive
          semigroups transformers vector
        ];
        description = "Primitive functions and data types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "hw-streams_0_0_0_10" = callPackage
+    ({ mkDerivation, base, bytestring, criterion, directory, exceptions
+     , ghc-prim, hedgehog, hspec, hspec-discover, hw-bits
+     , hw-hspec-hedgehog, hw-prim, mmap, primitive, QuickCheck
+     , semigroups, transformers, vector
+     }:
+     mkDerivation {
+       pname = "hw-streams";
+       version = "0.0.0.10";
+       sha256 = "08ghjvgyd13b1mby213j86p9b8fbk3j3jbj1n9czq4w9sbsbpxxw";
+       libraryHaskellDepends = [
+         base bytestring ghc-prim hw-bits hw-prim mmap primitive semigroups
+         transformers vector
+       ];
+       testHaskellDepends = [
+         base bytestring directory exceptions ghc-prim hedgehog hspec
+         hw-bits hw-hspec-hedgehog hw-prim mmap primitive QuickCheck
+         semigroups transformers vector
+       ];
+       testToolDepends = [ hspec-discover ];
+       benchmarkHaskellDepends = [
+         base bytestring criterion ghc-prim hw-bits hw-prim mmap primitive
+         semigroups transformers vector
+       ];
+       description = "Primitive functions and data types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-string-parse" = callPackage
@@ -117468,6 +118287,7 @@ self: {
        ];
        description = "Succint datastructures";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-vector" = callPackage
@@ -117482,19 +118302,21 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck vector ];
        description = "Vector type with convenient typeclass instances";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hw-xml" = callPackage
     ({ mkDerivation, ansi-wl-pprint, array, attoparsec, base
      , bytestring, cereal, conduit, containers, criterion, deepseq
-     , ghc-prim, hspec, hw-balancedparens, hw-bits, hw-conduit
-     , hw-parser, hw-prim, hw-rankselect, hw-rankselect-base, lens, mmap
-     , mtl, QuickCheck, resourcet, transformers, vector, word8
+     , ghc-prim, hspec, hspec-discover, hw-balancedparens, hw-bits
+     , hw-conduit, hw-parser, hw-prim, hw-rankselect, hw-rankselect-base
+     , lens, mmap, mtl, QuickCheck, resourcet, transformers, vector
+     , word8
      }:
      mkDerivation {
        pname = "hw-xml";
-       version = "0.1.0.3";
-       sha256 = "15vycayfmykds6dka0kw106fjk2wg3qgifk698fwkj1i4chsia97";
+       version = "0.1.0.4";
+       sha256 = "1ay4qz30m1aiych3rypbmpfbsc8wjal5w4l7h1zm44hl9ghiap9d";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -117513,12 +118335,14 @@ self: {
          hw-conduit hw-prim hw-rankselect hw-rankselect-base QuickCheck
          vector
        ];
+       testToolDepends = [ hspec-discover ];
        benchmarkHaskellDepends = [
          base bytestring conduit criterion hw-balancedparens hw-bits
          hw-conduit hw-prim mmap resourcet vector
        ];
        description = "Conduits for tokenizing streams";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hwall-auth-iitk" = callPackage
@@ -117654,6 +118478,7 @@ self: {
        ];
        description = "magic-wormhole client";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hws" = callPackage
@@ -117931,6 +118756,7 @@ self: {
        libraryHaskellDepends = [ base hxt mtl ];
        description = "Utility functions for using HXT picklers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hxt-regex-xmlschema" = callPackage
@@ -118436,7 +119262,6 @@ self: {
        libraryHaskellDepends = [ base blaze-html deepseq text ];
        description = "Display class for the HyperHaskell graphical Haskell interpreter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hyper-extra" = callPackage
@@ -118452,7 +119277,6 @@ self: {
        ];
        description = "Display instances for the HyperHaskell graphical Haskell interpreter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hyper-haskell-server" = callPackage
@@ -118725,7 +119549,6 @@ self: {
        ];
        description = "Haskell interface to Zenity dialogs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hzk" = callPackage
@@ -118808,6 +119631,7 @@ self: {
        ];
        description = "iCalendar data types, parser, and printer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "iException" = callPackage
@@ -119133,10 +119957,8 @@ self: {
      }:
      mkDerivation {
        pname = "identicon-style-squares";
-       version = "0.1.0.0";
-       sha256 = "12iawbazg5dd6n2giyib3ihj42xh9fnp53lgi3a5gd5x8spixwi9";
-       revision = "1";
-       editedCabalFile = "00ry1hxan1kgq46wdq3l5n7aiv9v54kmyc7zh4xczvikn6x0gcg9";
+       version = "0.1.0.1";
+       sha256 = "1x456v7fb211f7ciipp2bfn9fvh5w4i34bl5mjw7bkn7hgsaa3x6";
        libraryHaskellDepends = [
          base identicon JuicyPixels polyvariadic
        ];
@@ -119282,6 +120104,7 @@ self: {
        ];
        description = "Functional Programming Language with Dependent Types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) gmp;};
 
   "ieee" = callPackage
@@ -120243,7 +121066,6 @@ self: {
        doHaddock = false;
        description = "Framework for defaulting superclasses";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "implicit" = callPackage
@@ -120492,11 +121314,12 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "inchworm";
-       version = "1.0.2.4";
-       sha256 = "0r4d3pqpkmfa6ksjzvm8kjzrrkvb0lv76cf6fcrciwm7dj5biz74";
+       version = "1.1.1.2";
+       sha256 = "1dsrx48srmrqcw4y60prgnzxzr7nc7vyzjv0nnr2vaay3j6pxkii";
        libraryHaskellDepends = [ base ];
-       description = "Inchworm Lexer Framework";
+       description = "Simple parser combinators for lexical analysis";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "include-file" = callPackage
@@ -120591,7 +121414,6 @@ self: {
        ];
        description = "Generic parser library capable of providing partial results from partial input";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "incremental-sat-solver" = callPackage
@@ -120639,7 +121461,6 @@ self: {
        ];
        description = "Indentation sensitive parsing combinators for Parsec and Trifecta";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "indentation-core" = callPackage
@@ -120681,7 +121502,6 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit trifecta ];
        description = "Indentation sensitive parsing combinators for Trifecta";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "indentparser" = callPackage
@@ -120779,7 +121599,6 @@ self: {
        libraryHaskellDepends = [ base bifunctors indexed mtl pointed ];
        description = "Indexed functors, monads and comonads that require extensions to Haskell98";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "indexed-free" = callPackage
@@ -120827,6 +121646,7 @@ self: {
        libraryHaskellDepends = [ base gtk HDBC HDBC-sqlite3 ];
        description = "Indian Language Font Converter";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "indices" = callPackage
@@ -121078,6 +121898,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ini_0_4_1" = callPackage
+    ({ mkDerivation, attoparsec, base, hspec, text
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "ini";
+       version = "0.4.1";
+       sha256 = "0mvwii8jbh2ll54qb9dij5m66c6324s2y4vrwz1qr4wz40m3qa8l";
+       libraryHaskellDepends = [
+         attoparsec base text unordered-containers
+       ];
+       testHaskellDepends = [ base hspec unordered-containers ];
+       description = "Quick and easy configuration files in the INI format";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ini-qq" = callPackage
     ({ mkDerivation, base, HUnit, ini, raw-strings-qq, template-haskell
      , text
@@ -121289,6 +122126,7 @@ self: {
        testHaskellDepends = [ base hspec jni jvm text ];
        description = "Java interop via inline Java code in Haskell modules";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "inline-r" = callPackage
@@ -121385,6 +122223,7 @@ self: {
        ];
        description = "Associative containers retaining insertion order for traversals";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "inserts" = callPackage
@@ -121637,6 +122476,8 @@ self: {
        pname = "int-multimap";
        version = "0.3.1";
        sha256 = "0sl3xzlw0mzyq1h28mqklm41q9pknsf1qmd74a5syn24m01dknnv";
+       revision = "1";
+       editedCabalFile = "09lnidjri2z00mfbn73cc9mzbgadmlcym9y1hia0c219dm8zjrh0";
        libraryHaskellDepends = [
          base containers hashable unordered-containers
        ];
@@ -121835,7 +122676,6 @@ self: {
        ];
        description = "Prelude replacement based on protolude";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "intern" = callPackage
@@ -122295,7 +123135,6 @@ self: {
        testHaskellDepends = [ base QuickCheck transformers ];
        description = "bidirectional arrows, bijective functions, and invariant functors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "invertible-grammar" = callPackage
@@ -122313,6 +123152,7 @@ self: {
        ];
        description = "Invertible parsing combinators framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "invertible-hlist" = callPackage
@@ -122338,7 +123178,6 @@ self: {
        ];
        description = "invertible transformer instances for HXT Picklers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "invertible-syntax" = callPackage
@@ -122586,6 +123425,7 @@ self: {
        ];
        description = "EDSL for concurrent, realtime, embedded programming on top of Ivory";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ioref-stable" = callPackage
@@ -122697,6 +123537,7 @@ self: {
        libraryHaskellDepends = [ base binary bytestring iproute ];
        description = "IP2Proxy Haskell package for proxy detection";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ip6addr" = callPackage
@@ -123010,6 +123851,7 @@ self: {
        ];
        description = "A DCC message parsing and helper library for IRC clients";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "irc-fun-bot" = callPackage
@@ -123115,6 +123957,7 @@ self: {
        ];
        description = "A library for writing IRC bots";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ircbouncer" = callPackage
@@ -123249,7 +124092,6 @@ self: {
        testHaskellDepends = [ base template-haskell ];
        description = "Generic pattern predicates";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "isdicom" = callPackage
@@ -123295,6 +124137,7 @@ self: {
        executableHaskellDepends = [ base gtk3 ];
        description = "A program to show the size of image and whether suitable for wallpaper";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "islink" = callPackage
@@ -123382,6 +124225,7 @@ self: {
        ];
        description = "Types and parser for ISO8601 durations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "iso8601-time" = callPackage
@@ -123794,6 +124638,7 @@ self: {
        libraryToolDepends = [ alex happy ];
        description = "Safe embedded C programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ivory-artifact" = callPackage
@@ -123829,6 +124674,7 @@ self: {
        ];
        description = "Ivory C backend";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ivory-bitdata" = callPackage
@@ -123866,6 +124712,7 @@ self: {
        ];
        description = "Simple concrete evaluator for Ivory programs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ivory-examples" = callPackage
@@ -123888,6 +124735,7 @@ self: {
        ];
        description = "Ivory examples";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ivory-hw" = callPackage
@@ -123900,6 +124748,7 @@ self: {
        libraryHaskellDepends = [ base filepath ivory ivory-artifact ];
        description = "Ivory hardware model (STM32F4)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ivory-opts" = callPackage
@@ -123916,6 +124765,7 @@ self: {
        ];
        description = "Ivory compiler optimizations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ivory-quickcheck" = callPackage
@@ -123937,6 +124787,7 @@ self: {
        ];
        description = "QuickCheck driver for Ivory";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ivory-serialize" = callPackage
@@ -123953,6 +124804,7 @@ self: {
        ];
        description = "Serialization library for Ivory";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ivory-stdlib" = callPackage
@@ -123965,6 +124817,7 @@ self: {
        libraryHaskellDepends = [ base filepath ivory ivory-artifact ];
        description = "Ivory standard library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ivy-web" = callPackage
@@ -124533,6 +125386,7 @@ self: {
        executableHaskellDepends = [ base ghcjs-base-stub ];
        description = "Extra javascript functions when using GHCJS";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "javasf" = callPackage
@@ -124739,8 +125593,8 @@ self: {
        pname = "jmacro";
        version = "0.6.15";
        sha256 = "1b3crf16szj11pcgrg3912xq072vnv0myq6mzg0ypaabdzn3zr7s";
-       revision = "1";
-       editedCabalFile = "07jghfxn4m26q8rksxn4v6pcc8mwcjdlz1ypy7dqsvhzc3hs2s4i";
+       revision = "2";
+       editedCabalFile = "0r16y3sk22vgrciaadrdzjd768mnh08s019ffgk5jma782nz9v7d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -124755,6 +125609,7 @@ self: {
        ];
        description = "QuasiQuotation library for programmatic generation of Javascript code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jmacro-rpc" = callPackage
@@ -124773,6 +125628,7 @@ self: {
        ];
        description = "JSON-RPC clients and servers using JMacro, and evented client-server Reactive Programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jmacro-rpc-happstack" = callPackage
@@ -124789,6 +125645,7 @@ self: {
        ];
        description = "Happstack backend for jmacro-rpc";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jmacro-rpc-snap" = callPackage
@@ -124804,6 +125661,7 @@ self: {
        ];
        description = "Snap backend for jmacro-rpc";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jml-web-service" = callPackage
@@ -124837,6 +125695,7 @@ self: {
        testHaskellDepends = [ base casing free jmacro ];
        description = "Jmonkey is very restricted but handy EDSL for JavaScript";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jni" = callPackage
@@ -124855,6 +125714,7 @@ self: {
        libraryToolDepends = [ cpphs ];
        description = "Complete JNI raw bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) jdk;};
 
   "jobqueue" = callPackage
@@ -125052,6 +125912,7 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "A library for decoding JPEG files written in pure Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jps" = callPackage
@@ -125377,6 +126238,7 @@ self: {
        ];
        description = "Encoders of JSON AST";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "json-ast-quickcheck" = callPackage
@@ -125727,7 +126589,6 @@ self: {
        ];
        description = "Fully-featured JSON-RPC 2.0 library";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "json-rpc-client" = callPackage
@@ -125824,6 +126685,7 @@ self: {
        ];
        description = "Types and type classes for defining JSON schemas";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "json-sop" = callPackage
@@ -125842,7 +126704,6 @@ self: {
        ];
        description = "Generics JSON (de)serialization using generics-sop";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "json-state" = callPackage
@@ -125938,6 +126799,7 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "A polymorphic, type-safe, json-structured tracing library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "json-types" = callPackage
@@ -126219,6 +127081,7 @@ self: {
        ];
        description = "Manage users in MariaDB >= 10.1.1";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "judge" = callPackage
@@ -126409,6 +127272,7 @@ self: {
        ];
        description = "Call JVM methods from Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jvm-batching" = callPackage
@@ -126511,27 +127375,25 @@ self: {
 
   "jwt" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, cryptonite
-     , doctest, HsOpenSSL, http-types, HUnit, lens, lens-aeson, memory
-     , network-uri, QuickCheck, RSA, scientific, semigroups, tasty
-     , tasty-hunit, tasty-quickcheck, tasty-th, text, time
-     , unordered-containers, vector
+     , doctest, http-types, HUnit, lens, lens-aeson, memory, network-uri
+     , QuickCheck, scientific, semigroups, tasty, tasty-hunit
+     , tasty-quickcheck, tasty-th, text, time, unordered-containers
+     , vector, x509, x509-store
      }:
      mkDerivation {
        pname = "jwt";
-       version = "0.8.0";
-       sha256 = "0ij921vgm0sqlc2ryymqxz6ipgl2iwm0916ny7g5l47qh2fjhcjg";
-       revision = "1";
-       editedCabalFile = "0b0znxxh6zgbq5xhxds2a1yxaqg5rka3xkhlchrbjabi9m5ndp84";
+       version = "0.9.0";
+       sha256 = "1glkaahp3jq744s61y0ja5fdggwac9p1dwia4c19k1ld6qhd5395";
        libraryHaskellDepends = [
-         aeson base bytestring containers cryptonite HsOpenSSL http-types
-         memory network-uri RSA scientific semigroups text time
-         unordered-containers vector
+         aeson base bytestring containers cryptonite http-types memory
+         network-uri scientific semigroups text time unordered-containers
+         vector x509 x509-store
        ];
        testHaskellDepends = [
-         aeson base bytestring containers cryptonite doctest HsOpenSSL
-         http-types HUnit lens lens-aeson memory network-uri QuickCheck RSA
-         scientific semigroups tasty tasty-hunit tasty-quickcheck tasty-th
-         text time unordered-containers vector
+         aeson base bytestring containers cryptonite doctest http-types
+         HUnit lens lens-aeson memory network-uri QuickCheck scientific
+         semigroups tasty tasty-hunit tasty-quickcheck tasty-th text time
+         unordered-containers vector x509 x509-store
        ];
        description = "JSON Web Token (JWT) decoding and encoding";
        license = stdenv.lib.licenses.mit;
@@ -126556,6 +127418,7 @@ self: {
        ];
        description = "An implementation of the Kademlia DHT Protocol";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "kafka" = callPackage
@@ -126800,6 +127663,7 @@ self: {
        benchmarkHaskellDepends = [ aeson base containers criterion text ];
        description = "Perform 漢字検定 (Japan Kanji Aptitude Test) level analysis on Japanese Kanji";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "kansas-comet" = callPackage
@@ -126819,6 +127683,7 @@ self: {
        ];
        description = "A JavaScript push mechanism based on the comet idiom";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "kansas-lava" = callPackage
@@ -126976,6 +127841,8 @@ self: {
        pname = "katip";
        version = "0.7.0.0";
        sha256 = "1z4533952sal5ma71xpsrwbi9pniy1cciw20w31igrx9rw9kx98b";
+       revision = "1";
+       editedCabalFile = "1lzla1iv5ll9iks5xh8399vs2mjxb33pbdg115kqbq9r5z3h84qp";
        libraryHaskellDepends = [
          aeson async auto-update base bytestring containers either hostname
          microlens microlens-th monad-control mtl old-locale resourcet
@@ -127084,8 +127951,8 @@ self: {
      }:
      mkDerivation {
        pname = "katip-syslog";
-       version = "0.1.0.0";
-       sha256 = "0fj6c0rzs2v5ng3gsc9qlk5ksszh2dpmi378ydxxcrjjzkz3ng6c";
+       version = "0.1.1.0";
+       sha256 = "0q566wxbm8h97zmsayy0s93kjxfbxfxqljacmsz8213pfivxq4aa";
        libraryHaskellDepends = [
          aeson base bytestring hsyslog katip string-conv text
        ];
@@ -127239,7 +128106,6 @@ self: {
        ];
        description = "Fast concurrent queues much inspired by unagi-chan";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "kbq-gu" = callPackage
@@ -127325,6 +128191,7 @@ self: {
        ];
        description = "Fast and flexible k-d trees for various types of point queries";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "keccak" = callPackage
@@ -127406,6 +128273,7 @@ self: {
        ];
        description = "Rapid Gtk Application Development - I18N";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "keera-hails-mvc-controller" = callPackage
@@ -127479,6 +128347,7 @@ self: {
        libraryHaskellDepends = [ base directory filepath MissingK ];
        description = "Haskell on Gtk rails - Easy handling of configuration files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "keera-hails-mvc-solutions-gtk" = callPackage
@@ -127525,6 +128394,7 @@ self: {
        ];
        description = "Haskell on Gtk rails - Gtk-based View for MVC applications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "keera-hails-reactive-fs" = callPackage
@@ -127909,6 +128779,7 @@ self: {
        ];
        description = "Pure Haskell key/value store implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "keyword-args" = callPackage
@@ -128020,6 +128891,7 @@ self: {
        ];
        description = "Kick Channels: bounded channels with non-blocking writes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "kif-parser" = callPackage
@@ -128050,7 +128922,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Utilities to work with lists of types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "kind-generics" = callPackage
@@ -128062,7 +128933,6 @@ self: {
        libraryHaskellDepends = [ base kind-apply ];
        description = "Generic programming in GHC style for arbitrary kinds and GADTs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "kind-generics-th" = callPackage
@@ -128130,6 +129000,7 @@ self: {
        ];
        description = "Kleene algebra";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "kmeans" = callPackage
@@ -128838,6 +129709,7 @@ self: {
        libraryHaskellDepends = [ base containers mtl read-bounded ];
        description = "Declarative command line parser using type-driven pattern matching";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambda-placeholders" = callPackage
@@ -128959,6 +129831,7 @@ self: {
        ];
        description = "Lambdabot is a development tool and advanced IRC bot";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-core" = callPackage
@@ -129010,6 +129883,7 @@ self: {
        ];
        description = "Lambdabot Haskell plugins";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-irc-plugins" = callPackage
@@ -129586,7 +130460,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Parser and pretty-printer for ATS";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-bash" = callPackage
@@ -129858,7 +130731,6 @@ self: {
        ];
        description = "JavaScript parser and pretty-printer library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-ecmascript-analysis" = callPackage
@@ -129958,7 +130830,6 @@ self: {
        ];
        description = "GLSL abstract syntax tree, parser, and pretty-printer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-go" = callPackage
@@ -130138,6 +131009,7 @@ self: {
        ];
        description = "Lua parser and pretty-printer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-lua-qq" = callPackage
@@ -130679,7 +131551,6 @@ self: {
        ];
        description = "Auto-generated interface to Fortran LAPACK via CArrays";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lapack-ffi" = callPackage
@@ -130692,7 +131563,6 @@ self: {
        libraryPkgconfigDepends = [ liblapack ];
        description = "Auto-generated interface to Fortran LAPACK";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) liblapack;};
 
   "lapack-ffi-tools" = callPackage
@@ -130838,6 +131708,7 @@ self: {
        ];
        description = "Use actual LaTeX to render formulae inside Hakyll pages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "latex-formulae-image" = callPackage
@@ -130854,6 +131725,7 @@ self: {
        ];
        description = "A library for rendering LaTeX formulae as images using an actual LaTeX installation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "latex-formulae-pandoc" = callPackage
@@ -130875,6 +131747,7 @@ self: {
        ];
        description = "Render LaTeX formulae in pandoc documents to images with an actual LaTeX installation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "latex-function-tables" = callPackage
@@ -130897,6 +131770,7 @@ self: {
        testHaskellDepends = [ base ];
        description = "Function table specifications in latex";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "latex-live-snippets" = callPackage
@@ -130938,6 +131812,7 @@ self: {
        ];
        description = "Fine-grained library for constructing and manipulating lattices";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "launchpad-control" = callPackage
@@ -131042,8 +131917,8 @@ self: {
      }:
      mkDerivation {
        pname = "layers-game";
-       version = "0.5.3";
-       sha256 = "050l8fd77xhl4fqhl8s1c22gdww3if69mzflgrai9gwq31kiasp3";
+       version = "0.6.0";
+       sha256 = "03a8l2hmirhfnl7s07yq06szmwcr5lz2lapbpp22ryqjr3zpvwf6";
        isLibrary = false;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -131337,6 +132212,7 @@ self: {
        ];
        description = "Online Latent Dirichlet Allocation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ldap-client" = callPackage
@@ -131355,6 +132231,7 @@ self: {
        testHaskellDepends = [ base bytestring hspec process semigroups ];
        description = "Pure Haskell LDAP Client Library";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ldapply" = callPackage
@@ -131520,6 +132397,7 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Learning Algorithms";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "learn-physics" = callPackage
@@ -131540,6 +132418,7 @@ self: {
        ];
        description = "Haskell code for learning physics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "learn-physics-examples" = callPackage
@@ -132094,7 +132973,6 @@ self: {
        ];
        description = "Lenses for toml-parser";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lens-tutorial" = callPackage
@@ -132119,7 +132997,6 @@ self: {
        libraryHaskellDepends = [ base singletons ];
        description = "Type-level lenses using singletons";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lens-utils" = callPackage
@@ -132200,6 +133077,7 @@ self: {
        ];
        description = "frugal issue tracker";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lenz" = callPackage
@@ -132521,6 +133399,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "libarchive" = callPackage
+    ({ mkDerivation, base, bytestring, filepath, libarchive }:
+     mkDerivation {
+       pname = "libarchive";
+       version = "0.2.0.0";
+       sha256 = "14kad23r22bx65h2iq0n0cbxhzzwj56gwpi73vciycjg0i5w04yd";
+       libraryHaskellDepends = [ base bytestring filepath ];
+       libraryPkgconfigDepends = [ libarchive ];
+       description = "Haskell bindings for libarchive";
+       license = stdenv.lib.licenses.bsd3;
+     }) {inherit (pkgs) libarchive;};
+
   "libarchive-conduit" = callPackage
     ({ mkDerivation, archive, base, bytestring, conduit, resourcet
      , transformers
@@ -132864,7 +133754,6 @@ self: {
        ];
        description = "Bindings to the nix package manager";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "libnotify" = callPackage
@@ -132877,6 +133766,7 @@ self: {
        librarySystemDepends = [ libnotify ];
        description = "Bindings to libnotify library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libnotify;};
 
   "libnvvm" = callPackage
@@ -133050,8 +133940,28 @@ self: {
        ];
        description = "Use Libravatar, the decentralized avatar delivery service";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "libretls" = callPackage
+    ({ mkDerivation, base, containers, hspec, HUnit, libressl, libtls
+     , monad-ste, primitive, transformers, vector
+     }:
+     mkDerivation {
+       pname = "libretls";
+       version = "0.0.0.0";
+       sha256 = "11x9hckw0h34w3ynjwfr6lyyv22p7g4dpi5qknpy8in9ffjymmk9";
+       libraryHaskellDepends = [
+         base monad-ste primitive transformers vector
+       ];
+       libraryPkgconfigDepends = [ libtls ];
+       testHaskellDepends = [ base containers hspec HUnit libressl ];
+       description = "libtls bindings";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {libressl = null; libtls = null;};
+
   "libroman" = callPackage
     ({ mkDerivation, base, hspec, QuickCheck, split }:
      mkDerivation {
@@ -133154,6 +134064,7 @@ self: {
        libraryPkgconfigDepends = [ systemd ];
        description = "Haskell bindings to libsystemd-journal";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) systemd;};
 
   "libtagc" = callPackage
@@ -133481,7 +134392,6 @@ self: {
        ];
        description = "STM operations lifted through monad transformer stacks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lifted-threads" = callPackage
@@ -133642,7 +134552,6 @@ self: {
        ];
        description = "representation of Integer Linear Programs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "limp-cbc" = callPackage
@@ -133748,6 +134657,7 @@ self: {
        ];
        description = "Haskell SDK for the LINE API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "line-break" = callPackage
@@ -133957,7 +134867,6 @@ self: {
        testHaskellDepends = [ base hspec network tasty-hspec ];
        description = "Typed sockets";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "linear-vect" = callPackage
@@ -134060,6 +134969,7 @@ self: {
        libraryHaskellDepends = [ base containers mtl safe ];
        description = "Lines of Action, 2-player strategy board game";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "linguistic-ordinals" = callPackage
@@ -134086,6 +134996,7 @@ self: {
        ];
        description = "Use web link relation types (RFC 5988) in Haskell";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "linkchk" = callPackage
@@ -134133,6 +135044,7 @@ self: {
        testHaskellDepends = [ base ];
        description = "A pure linked list which is mutable through iterators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "linkedhashmap" = callPackage
@@ -134178,6 +135090,7 @@ self: {
        ];
        description = "A Haskell library for the Slack API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "linode" = callPackage
@@ -134863,7 +135776,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Provides zips with default values";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "list-zipper" = callPackage
@@ -134886,6 +135798,7 @@ self: {
        ];
        description = "A list zipper";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "listenbrainz-client" = callPackage
@@ -135686,7 +136599,6 @@ self: {
        testHaskellDepends = [ base containers doctest hedgehog ];
        description = "Types representing line and column positions and ranges in text files";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "loc-test" = callPackage
@@ -135698,7 +136610,6 @@ self: {
        libraryHaskellDepends = [ base containers hedgehog loc ];
        description = "Test-related utilities related to the /loc/ package";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "local-address" = callPackage
@@ -135909,7 +136820,6 @@ self: {
        libraryHaskellDepends = [ base clock stm ];
        description = "set a maximum on the number of concurrent actions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "log" = callPackage
@@ -136033,6 +136943,7 @@ self: {
        ];
        description = "Structured logging solution (Elasticsearch back end)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "log-postgres" = callPackage
@@ -136325,6 +137236,7 @@ self: {
        ];
        description = "Journald back-end for logging-facade";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "logging-facade-syslog" = callPackage
@@ -136355,6 +137267,7 @@ self: {
        libraryToolDepends = [ alex happy ];
        description = "Import, export etc. for TPTP, a syntax for first-order logic";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "logic-classes" = callPackage
@@ -136738,6 +137651,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Dependently-typed linked list implementation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lookup-tables" = callPackage
@@ -137172,7 +138086,6 @@ self: {
        ];
        description = "Parameterized file evaluator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ltiv1p1" = callPackage
@@ -137912,6 +138825,7 @@ self: {
        ];
        description = "Arrow based stream transducers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "machines" = callPackage
@@ -138112,6 +139026,7 @@ self: {
        ];
        description = "Haskell bindings to C-based Mac OS SDK frameworks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "macosx-make-standalone" = callPackage
@@ -138252,6 +139167,7 @@ self: {
        ];
        description = "A web framework that integrates Servant, RIO, EKG, fast-logger, wai-cli…";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "magico" = callPackage
@@ -138424,7 +139340,6 @@ self: {
        ];
        description = "Capture stdout/stderr/exit code, and replace stdin of your main function";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mainland-pretty_0_6_2" = callPackage
@@ -139026,6 +139941,7 @@ self: {
        ];
        description = "Library for interfacing with the Mandrill JSON API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mandulia" = callPackage
@@ -139173,6 +140089,7 @@ self: {
        executableHaskellDepends = [ base bytestring cassava containers ];
        description = "Extensions to Data.Map";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "map-syntax" = callPackage
@@ -139191,6 +140108,7 @@ self: {
        ];
        description = "Syntax sugar for defining maps";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mapalgebra" = callPackage
@@ -139200,24 +140118,21 @@ self: {
      }:
      mkDerivation {
        pname = "mapalgebra";
-       version = "0.1.1";
-       sha256 = "1zcba17nj804lbhnlr02bcg8qfaxv3nq8ddiqxpq2qp4mv8n8g4f";
+       version = "0.1.2";
+       sha256 = "191f8ipm12c270nhwa7g4ibadnajj8pys8q0vjc5l7f0s9m4g8ak";
        libraryHaskellDepends = [
          base bytestring containers data-default deepseq hmatrix massiv
          massiv-io vector
        ];
        testHaskellDepends = [
-         base bytestring containers data-default deepseq hmatrix
-         HUnit-approx massiv massiv-io QuickCheck tasty tasty-hunit
-         tasty-quickcheck vector
+         base containers hmatrix HUnit-approx massiv massiv-io QuickCheck
+         tasty tasty-hunit tasty-quickcheck vector
        ];
        benchmarkHaskellDepends = [
-         base bytestring containers criterion data-default deepseq hmatrix
-         massiv massiv-io vector
+         base containers criterion hmatrix massiv massiv-io vector
        ];
        description = "Efficient, polymorphic Map Algebra";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mappy" = callPackage
@@ -139240,6 +140155,7 @@ self: {
        testHaskellDepends = [ base containers hspec parsec QuickCheck ];
        description = "A functional programming language focused around maps";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mapquest-api" = callPackage
@@ -139346,6 +140262,7 @@ self: {
        libraryHaskellDepends = [ base monads-tf papillon ];
        description = "markdown parser with papillon";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "markdown-unlit" = callPackage
@@ -139607,6 +140524,7 @@ self: {
        testHaskellDepends = [ base hspec text ];
        description = "Compile time string interpolation a la Scala and CoffeeScript";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "marxup" = callPackage
@@ -139663,8 +140581,8 @@ self: {
      }:
      mkDerivation {
        pname = "massiv";
-       version = "0.2.5.0";
-       sha256 = "0r7556mxsqzxg1kp4hrbv3c07xzkf08sycaqbfyy2xrzzczgiy9z";
+       version = "0.2.6.0";
+       sha256 = "07mns6fqkvyq9v80jqpqawb37a58irz85hplgq38aqz4gihv642f";
        libraryHaskellDepends = [
          base bytestring data-default-class deepseq ghc-prim primitive
          vector
@@ -139732,20 +140650,17 @@ self: {
      }) {};
 
   "matchable" = callPackage
-    ({ mkDerivation, base, containers, doctest, doctest-discover, Glob
-     , hashable, hspec, tagged, unordered-containers, vector
+    ({ mkDerivation, base, containers, doctest, hashable, hspec, tagged
+     , unordered-containers, vector
      }:
      mkDerivation {
        pname = "matchable";
-       version = "0.1.1.1";
-       sha256 = "0sd661pp54hyg6igkr90cdjlnx8widl2yxkf0ggyqfna6ak5ml53";
+       version = "0.1.2";
+       sha256 = "0wrbq9pqndr9rm8iy3vmz756q77s0ih3y2is0hvv48w89hn5a4r0";
        libraryHaskellDepends = [
          base containers hashable tagged unordered-containers vector
        ];
-       testHaskellDepends = [
-         base containers doctest doctest-discover Glob hashable hspec tagged
-         unordered-containers vector
-       ];
+       testHaskellDepends = [ base containers doctest hspec ];
        description = "A type class for Matchable Functors";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -140170,7 +141085,6 @@ self: {
        ];
        description = "Client API for Mattermost chat system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mattermost-api-qc" = callPackage
@@ -140186,7 +141100,6 @@ self: {
        ];
        description = "QuickCheck instances for the Mattermost client API library";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "maude" = callPackage
@@ -140713,6 +141626,7 @@ self: {
        ];
        description = "Parse song module files from Amiga MED and OctaMED";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mediabus" = callPackage
@@ -140822,6 +141736,7 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Constant-time queries for the median of a stream of numeric data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mediawiki" = callPackage
@@ -141179,6 +142094,7 @@ self: {
        libraryHaskellDepends = [ attoparsec base bytestring containers ];
        description = "Library for reading `/proc/meminfo`";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "memis" = callPackage
@@ -141515,6 +142431,7 @@ self: {
        ];
        description = "Serialize instance for Message Pack Object";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "messagepack-rpc" = callPackage
@@ -141532,6 +142449,7 @@ self: {
        ];
        description = "Message Pack RPC over TCP";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "messente" = callPackage
@@ -141856,6 +142774,7 @@ self: {
        testHaskellDepends = [ base HUnit template-haskell ];
        description = "Simple recursion schemes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "microaeson" = callPackage
@@ -141942,6 +142861,7 @@ self: {
        ];
        description = "A Microformats 2 parser";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "microformats2-types" = callPackage
@@ -142010,6 +142930,30 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "microlens-aeson_2_3_0_1" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, deepseq
+     , hashable, microlens, scientific, tasty, tasty-hunit, text
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "microlens-aeson";
+       version = "2.3.0.1";
+       sha256 = "1ncb0dhhr62yw8808c1h43cl48ib6clifklcrfx7acj5j482ikcs";
+       revision = "1";
+       editedCabalFile = "18490w9yvsn8rx18wb29bg1wj5vxa7il3gsi3cz2myx9iawhnnxq";
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring deepseq hashable microlens
+         scientific text unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring deepseq hashable microlens tasty tasty-hunit
+         text unordered-containers vector
+       ];
+       description = "Law-abiding lenses for Aeson, using microlens";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "microlens-contra" = callPackage
     ({ mkDerivation, base, microlens }:
      mkDerivation {
@@ -142121,8 +143065,8 @@ self: {
      }:
      mkDerivation {
        pname = "microsoft-translator";
-       version = "0.1.1";
-       sha256 = "12f5ki7i7cd8b6dzkg5q8chk1vnlr0izm3r62b371xf8hpmxn0av";
+       version = "0.1.2";
+       sha256 = "0qvf07a0nshbrzgqx5236b5bzc7z7jh49acsx7x7hyj5xsrcp7cw";
        libraryHaskellDepends = [
          base bytestring http-api-data http-client http-client-tls
          http-media mtl safe servant servant-client text time xml
@@ -142217,7 +143161,6 @@ self: {
        libraryHaskellDepends = [ base containers safe stm ];
        description = "Hot-swappable FRP";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "midi" = callPackage
@@ -142273,6 +143216,7 @@ self: {
        ];
        description = "Convert MIDI file to music box punch tape";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "midi-simple" = callPackage
@@ -142435,6 +143379,7 @@ self: {
        testHaskellDepends = [ base containers mwc-probability ];
        description = "The Metropolis algorithm";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mikmod" = callPackage
@@ -142515,6 +143460,7 @@ self: {
        ];
        description = "A Kafka client for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mime" = callPackage
@@ -142598,17 +143544,6 @@ self: {
      }) {};
 
   "mime-types" = callPackage
-    ({ mkDerivation, base, bytestring, containers, text }:
-     mkDerivation {
-       pname = "mime-types";
-       version = "0.1.0.8";
-       sha256 = "14ccl2842ya17zyj0bpc7vzklbyqvvydpbypn69h2fmhgji192x8";
-       libraryHaskellDepends = [ base bytestring containers text ];
-       description = "Basic mime-type handling types and functions";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "mime-types_0_1_0_9" = callPackage
     ({ mkDerivation, base, bytestring, containers, text }:
      mkDerivation {
        pname = "mime-types";
@@ -142617,7 +143552,6 @@ self: {
        libraryHaskellDepends = [ base bytestring containers text ];
        description = "Basic mime-type handling types and functions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "minecraft-data" = callPackage
@@ -143039,8 +143973,8 @@ self: {
      }:
      mkDerivation {
        pname = "mismi-core";
-       version = "0.0.1";
-       sha256 = "1vcj56blmk3g7vbp3d3a4yhla002w1ws5jxzbmgf1wxswc8hywvc";
+       version = "0.0.3";
+       sha256 = "0n0kgh4haqdwiz0s8wln0jvrcjkrzpjckz25pmb3hr4s5fqlprcw";
        libraryHaskellDepends = [
          amazonka amazonka-core base bytestring exceptions http-client
          http-types lens mismi-kernel mismi-p mtl resourcet retry text
@@ -143060,8 +143994,8 @@ self: {
     ({ mkDerivation, base, hedgehog, mismi-p, text }:
      mkDerivation {
        pname = "mismi-kernel";
-       version = "0.0.1";
-       sha256 = "1pqm6xza3ds6z5n32bb12q6z2x9n5jzwyxhy7b7f0ryzijasabg4";
+       version = "0.0.3";
+       sha256 = "15by5x8lvnfsr7ajayy6jz7mcwnrjcavhmgm9mb9v11dyg101lq9";
        libraryHaskellDepends = [ base mismi-p text ];
        testHaskellDepends = [ base hedgehog mismi-p text ];
        description = "AWS Library";
@@ -143072,19 +144006,62 @@ self: {
     ({ mkDerivation, base, text }:
      mkDerivation {
        pname = "mismi-p";
-       version = "0.0.1";
-       sha256 = "1xkrf270rfjig6bkpk4n63kgmjh05x38p99ndan4gr31ghbjyvk5";
+       version = "0.0.3";
+       sha256 = "115wc7gmy76a99p4rcp6fdz0w6c1z5kjn98ffxkkzx760nj5xvy9";
        libraryHaskellDepends = [ base text ];
        description = "A commmon prelude for the mismi project";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "mismi-s3" = callPackage
+    ({ mkDerivation, amazonka, amazonka-core, amazonka-s3, async
+     , attoparsec, base, bifunctors, bytestring, conduit, conduit-extra
+     , containers, criterion, cryptohash, directory, exceptions, extra
+     , filepath, hedgehog, http-client, http-types, lens, lifted-async
+     , lifted-base, mismi-core, mismi-core-test, mismi-p, mismi-s3-core
+     , mismi-s3-core-test, mmorph, monad-loops, mtl, process, random
+     , resourcet, retry, SafeSemaphore, semigroups, stm
+     , template-haskell, temporary, text, time, transformers
+     , transformers-bifunctors, unix, unix-bytestring
+     , unordered-containers, uuid
+     }:
+     mkDerivation {
+       pname = "mismi-s3";
+       version = "0.0.3";
+       sha256 = "1dlknwfvkf7sjifg9xl7gk7kj2yz9jgp3ngi5665jcyc47w39ph8";
+       libraryHaskellDepends = [
+         amazonka amazonka-core amazonka-s3 async attoparsec base bifunctors
+         bytestring conduit conduit-extra directory exceptions extra
+         filepath http-client http-types lens lifted-async lifted-base
+         mismi-core mismi-p mismi-s3-core mmorph monad-loops mtl process
+         resourcet retry SafeSemaphore semigroups stm template-haskell text
+         time transformers transformers-bifunctors unix unix-bytestring
+         unordered-containers uuid
+       ];
+       testHaskellDepends = [
+         amazonka amazonka-core amazonka-s3 base bytestring conduit
+         containers cryptohash directory exceptions filepath hedgehog
+         http-client lens mismi-core mismi-core-test mismi-p mismi-s3-core
+         mismi-s3-core-test mtl resourcet temporary text time transformers
+         transformers-bifunctors unix uuid
+       ];
+       benchmarkHaskellDepends = [
+         base conduit-extra criterion directory exceptions filepath hedgehog
+         mismi-core mismi-core-test mismi-p mtl random resourcet temporary
+         text transformers unix uuid
+       ];
+       description = "AWS Library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       broken = true;
+     }) {mismi-core-test = null; mismi-s3-core-test = null;};
+
   "mismi-s3-core" = callPackage
     ({ mkDerivation, attoparsec, base, hedgehog, mismi-p, text }:
      mkDerivation {
        pname = "mismi-s3-core";
-       version = "0.0.1";
-       sha256 = "06c7sgkhw7iax6z5cqq1a0icpizwmwl8agvi788h5w2d6hn9wgjh";
+       version = "0.0.3";
+       sha256 = "1cigfvspxxxzpw52xn7nb7sqyvxb64fm5w7m2nxakff85jj8skpq";
        libraryHaskellDepends = [ attoparsec base mismi-p text ];
        testHaskellDepends = [ base hedgehog mismi-p text ];
        description = "AWS Library";
@@ -143110,6 +144087,52 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "miss" = callPackage
+    ({ mkDerivation, attoparsec, base, base16-bytestring, bytestring
+     , ChasingBottoms, containers, cryptohash-sha1, deepseq, digest
+     , directory, exceptions, filesystem-abstractions, list-tries, mtl
+     , posix-paths, process, QuickCheck, semigroups, tasty, tasty-hunit
+     , tasty-quickcheck, tasty-test-vector, temporary, text, time
+     , transformers, unix, vector, zlib
+     }:
+     mkDerivation {
+       pname = "miss";
+       version = "0";
+       sha256 = "1xcbjmv2fyjffn1j2xhn0glvxdb2cqd8frvc9yr1pgz6874sv60w";
+       libraryHaskellDepends = [
+         attoparsec base base16-bytestring bytestring containers
+         cryptohash-sha1 deepseq digest exceptions filesystem-abstractions
+         list-tries mtl posix-paths semigroups text time transformers unix
+         vector zlib
+       ];
+       testHaskellDepends = [
+         attoparsec base base16-bytestring bytestring ChasingBottoms
+         containers directory exceptions mtl posix-paths process QuickCheck
+         tasty tasty-hunit tasty-quickcheck tasty-test-vector temporary text
+         unix
+       ];
+       description = "A Haskell git implimentation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "miss-porcelain" = callPackage
+    ({ mkDerivation, base, bytestring, containers
+     , filesystem-abstractions, list-tries, miss, mtl, posix-paths
+     }:
+     mkDerivation {
+       pname = "miss-porcelain";
+       version = "0";
+       sha256 = "192hxmq5j5wl6njvay0192r5gqlbjahgqd8v6ndhb53yrg7ckjmc";
+       libraryHaskellDepends = [
+         base bytestring containers filesystem-abstractions list-tries miss
+         mtl posix-paths
+       ];
+       description = "Useability extras built on top of miss";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "missing-foreign" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -143331,7 +144354,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion text weigh ];
        description = "Strict markdown processor for writers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mmark-cli" = callPackage
@@ -143353,7 +144375,6 @@ self: {
        ];
        description = "Command line interface to the MMark markdown processor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mmark-ext" = callPackage
@@ -143374,7 +144395,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Commonly useful extensions for the MMark markdown processor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mmorph" = callPackage
@@ -143614,6 +144634,7 @@ self: {
        libraryHaskellDepends = [ base ghc-typelits-knownnat ];
        description = "Type-safe modular arithmetic";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "modular-arithmetic" = callPackage
@@ -143751,8 +144772,8 @@ self: {
      }:
      mkDerivation {
        pname = "moesocks";
-       version = "1.0.0.44";
-       sha256 = "1j7181sjj5p6r419z9j8b8ikshhcgm2zwfbl4f1brbpyvwvs4ddz";
+       version = "1.0.1.0";
+       sha256 = "0g4dih837liigd4v2yj0wnqic2hqgc6zy6yqwpy0v22aa47abcqj";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -143835,6 +144856,7 @@ self: {
        testHaskellDepends = [ base ];
        description = "Mollie API client for Haskell http://www.mollie.com";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-abort-fd" = callPackage
@@ -143959,6 +144981,7 @@ self: {
        libraryHaskellDepends = [ base binary containers data-lens mtl ];
        description = "Monadic conversion between complex data structures and unique integers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-connect" = callPackage
@@ -144033,7 +145056,6 @@ self: {
        testHaskellDepends = [ base hlint tasty tasty-hspec ];
        description = "Monad transformer for weighted graph searches using Dijkstra's or A* algorithm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-exception" = callPackage
@@ -144241,7 +145263,6 @@ self: {
        ];
        description = "A simple and fast logging monad";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-logger" = callPackage
@@ -144392,6 +145413,7 @@ self: {
        ];
        description = "Memoization monad transformer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-mersenne-random" = callPackage
@@ -144583,7 +145605,6 @@ self: {
        ];
        description = "An mtl-style typeclass and transformer for persistent";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-primitive" = callPackage
@@ -144634,6 +145655,7 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Record and replay the results of monadic actions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-resumption" = callPackage
@@ -144696,6 +145718,7 @@ self: {
        testHaskellDepends = [ base stm ];
        description = "Concise, overloaded accessors for IORef, STRef, TVar";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-ste" = callPackage
@@ -144762,6 +145785,7 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Stateful supply monad";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-task" = callPackage
@@ -144872,6 +145896,7 @@ self: {
        libraryHaskellDepends = [ base base-compat stm ];
        description = "Generic operations over variables";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-wrap" = callPackage
@@ -144895,15 +145920,16 @@ self: {
        libraryHaskellDepends = [ base mtl stm ];
        description = "Overloading of concurrency variables";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monadLib" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "monadLib";
-       version = "3.7.3";
-       sha256 = "17m9rj6spr5n9jlhwwvk8p40yrpwgz3j9kj3pjq7mpyrc1ssfd0q";
+       version = "3.8";
+       sha256 = "1y414xfaavp63w5za4jby4cnaqwivkvkxxknb488z1k040kiisv1";
+       revision = "1";
+       editedCabalFile = "1mnzhliilvhsynv5h7rqchngvf8by1z33j4lj8zqqzl1xdmy2knx";
        libraryHaskellDepends = [ base ];
        description = "A collection of monad transformers";
        license = stdenv.lib.licenses.bsd3;
@@ -145001,6 +146027,7 @@ self: {
        testHaskellDepends = [ base ];
        description = "Constraint Programming";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monadiccp-gecode" = callPackage
@@ -145105,7 +146132,6 @@ self: {
        ];
        description = "A monoid for monads";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monadplus" = callPackage
@@ -145495,7 +146521,6 @@ self: {
        ];
        description = "Subclasses of Monoid";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monoid-transformer" = callPackage
@@ -145825,13 +146850,24 @@ self: {
     ({ mkDerivation, morphisms }:
      mkDerivation {
        pname = "morphisms-functors";
-       version = "0.1.2";
-       sha256 = "056vy0pmjm5p88kjhzy19nfhdwsjv9qqyvi78ff2czmv88242ala";
+       version = "0.1.5";
+       sha256 = "101irp13zrwpvbdzg891nmf633ssqpff5aaq6ikxmmk18hyy7aiy";
        libraryHaskellDepends = [ morphisms ];
        description = "Functors, theirs compositions and transformations";
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "morphisms-objects" = callPackage
+    ({ mkDerivation, morphisms }:
+     mkDerivation {
+       pname = "morphisms-objects";
+       version = "0.1.2";
+       sha256 = "0r41zjrazdcs4q04b0rik0g1hwskl7hzwklihb8yziybg7v5wqwm";
+       libraryHaskellDepends = [ morphisms ];
+       description = "Algebraic structures";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "morte" = callPackage
     ({ mkDerivation, alex, array, base, binary, code-page, containers
      , criterion, deepseq, Earley, formatting, http-client
@@ -145863,6 +146899,7 @@ self: {
        benchmarkHaskellDepends = [ base criterion system-filepath text ];
        description = "A bare-bones calculus of constructions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mosaico-lib" = callPackage
@@ -145972,7 +147009,6 @@ self: {
        testHaskellDepends = [ base indexed indexed-extras row-types ];
        description = "Type-safe effectful state machines in Haskell";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "motor-diagrams" = callPackage
@@ -145992,7 +147028,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Generate state diagrams from Motor FSM typeclasses";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "motor-reflection" = callPackage
@@ -146010,7 +147045,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Reflect on Motor FSM typeclasses to obtain runtime representations";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mount" = callPackage
@@ -146307,6 +147341,7 @@ self: {
        ];
        description = "A MQTT client library";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mrifk" = callPackage
@@ -146472,12 +147507,12 @@ self: {
      }) {};
 
   "mstate" = callPackage
-    ({ mkDerivation, base, monad-peel, mtl, stm }:
+    ({ mkDerivation, base, fail, monad-peel, mtl, stm }:
      mkDerivation {
        pname = "mstate";
-       version = "0.2.7";
-       sha256 = "05rcpfang0biy16aglf6da44zp9zqy2x0zdsfl75mv1drkky6225";
-       libraryHaskellDepends = [ base monad-peel mtl stm ];
+       version = "0.2.8";
+       sha256 = "13jv04skkb0ysxx9gswynp7fg7yz3nwy5zhzp209fbwr9izxcm05";
+       libraryHaskellDepends = [ base fail monad-peel mtl stm ];
        description = "MState: A consistent State monad for concurrent applications";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -146635,6 +147670,7 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "Monad Transformer Library with Type Families";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mtl-unleashed" = callPackage
@@ -146924,6 +147960,7 @@ self: {
        ];
        description = "Command lines for options that take multiple arguments";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "multifile" = callPackage
@@ -147025,6 +148062,7 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq weigh ];
        description = "Comprehensive and efficient (multi)linear algebra implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "multilinear-io" = callPackage
@@ -147048,6 +148086,7 @@ self: {
        ];
        description = "Conduit-based input/output capability for multilinear package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "multimap" = callPackage
@@ -147220,7 +148259,6 @@ self: {
        ];
        description = "Read and write appropriately from both master and replicated postgresql instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "multirec" = callPackage
@@ -147233,7 +148271,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Generic programming for families of recursive datatypes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "multirec-alt-deriver" = callPackage
@@ -147285,6 +148322,7 @@ self: {
        libraryHaskellDepends = [ base containers transformers ];
        description = "Combinatorial algorithms over multisets";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "multisetrewrite" = callPackage
@@ -147316,6 +148354,7 @@ self: {
        testHaskellDepends = [ base hspec transformers ];
        description = "like mtl's ReaderT / WriterT / StateT, but more than one contained value/type";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "multivariant" = callPackage
@@ -147791,6 +148830,7 @@ self: {
        ];
        description = "A representation of the MusicXML format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mustache" = callPackage
@@ -148243,6 +149283,7 @@ self: {
        ];
        description = "Export from MyAnimeList";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mybitcoin-sci" = callPackage
@@ -148256,7 +149297,6 @@ self: {
        ];
        description = "Binding to mybitcoin.com's Shopping Cart Interface.";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "myo" = callPackage
@@ -148374,7 +149414,6 @@ self: {
        ];
        description = "pure haskell MySQL driver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mysql-haskell-nem" = callPackage
@@ -148390,7 +149429,6 @@ self: {
        ];
        description = "Adds a interface like mysql-simple to mysql-haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mysql-haskell-openssl" = callPackage
@@ -148501,6 +149539,7 @@ self: {
        ];
        description = "Web application to view and kill MySQL queries";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mzv" = callPackage
@@ -148847,7 +149886,6 @@ self: {
        ];
        description = "A threadsafe binding to glibc's crypt_r function";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nano-erl" = callPackage
@@ -149056,7 +150094,6 @@ self: {
        ];
        description = "Efficient representable functors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "naqsha" = callPackage
@@ -149222,6 +150259,7 @@ self: {
        ];
        description = "Natural number";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "natural-induction" = callPackage
@@ -149365,6 +150403,7 @@ self: {
        ];
        description = "CPU load and memory usage indicators for i3bar";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ncurses" = callPackage
@@ -149787,6 +150826,7 @@ self: {
        ];
        description = "A graph database middleware to maintain a time-varying graph";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "netclock" = callPackage
@@ -150333,7 +151373,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Arbitrary Instances for Network Types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-attoparsec" = callPackage
@@ -150378,7 +151417,6 @@ self: {
        ];
        description = "An interface to bitcoind";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-bsd" = callPackage
@@ -150870,6 +151908,8 @@ self: {
        pname = "network-simple";
        version = "0.4.3";
        sha256 = "0a4hag26ry6lg90q4ppchvrm5xaij50jd4633mhfkfq8scgczm8d";
+       revision = "1";
+       editedCabalFile = "1xyz4b24vgnidvd43cfmf0k6090dayhfcp6n8x894ibd2mq3vash";
        libraryHaskellDepends = [
          base bytestring network safe-exceptions socks transformers
        ];
@@ -151030,6 +152070,7 @@ self: {
        ];
        description = "In-memory instantiation of Network.Transport";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-transport-tcp" = callPackage
@@ -151048,6 +152089,7 @@ self: {
        ];
        description = "TCP instantiation of Network.Transport";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-transport-tests" = callPackage
@@ -151064,6 +152106,7 @@ self: {
        ];
        description = "Unit tests for Network.Transport implementations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-transport-zeromq" = callPackage
@@ -151130,21 +152173,19 @@ self: {
 
   "network-uri-json" = callPackage
     ({ mkDerivation, aeson, base, hspec, hspec-discover
-     , network-arbitrary, network-uri, QuickCheck, test-invariant, text
+     , network-arbitrary, network-uri, test-invariant, text
      }:
      mkDerivation {
        pname = "network-uri-json";
-       version = "0.1.2.1";
-       sha256 = "1xnlyghpyrbllzzr8bdmzgm12lsa1sg4miynh6d4awdppai9y433";
+       version = "0.3.0.0";
+       sha256 = "15qw2knzj5b90vb4rhzxiv9wxdv41f5l75hpp4y0ycc60q5xja27";
        libraryHaskellDepends = [ aeson base network-uri text ];
        testHaskellDepends = [
-         aeson base hspec network-arbitrary network-uri QuickCheck
-         test-invariant text
+         aeson base hspec network-arbitrary network-uri test-invariant text
        ];
        testToolDepends = [ hspec-discover ];
        description = "FromJSON and ToJSON Instances for Network.URI";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-uri-lenses" = callPackage
@@ -151168,7 +152209,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "A small utility to declare type-safe static URIs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-voicetext" = callPackage
@@ -151343,7 +152383,6 @@ self: {
        executableHaskellDepends = [ base random time ];
        description = "Exact and approximate synthesis of quantum circuits";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "newt" = callPackage
@@ -151555,8 +152594,8 @@ self: {
      }:
      mkDerivation {
        pname = "ngx-export-tools";
-       version = "0.4.2.2";
-       sha256 = "08ar9qjilx9im2qyxkxf8h6nah9k5c8qdfvbkqxbklg3lq9a54nf";
+       version = "0.4.2.4";
+       sha256 = "0a8w68bzlh7v2b9infvxlscg3mnfi8fngi7z3bap3zwbz86hwb0k";
        libraryHaskellDepends = [
          aeson base binary bytestring ngx-export safe template-haskell
        ];
@@ -151787,7 +152826,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Convenient utility for distributed Nix builds";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nix-deploy" = callPackage
@@ -151806,7 +152844,6 @@ self: {
        ];
        description = "Deploy Nix-built software to a NixOS machine";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nix-derivation" = callPackage
@@ -151838,8 +152875,8 @@ self: {
      }:
      mkDerivation {
        pname = "nix-diff";
-       version = "1.0.5";
-       sha256 = "1gs19y4k4aykm3hzpkygdx5wqblcnqxbh3jq3hl18sm8h4cf9871";
+       version = "1.0.6";
+       sha256 = "0ls3zh769ibba1f5igwxvm49nyp2iljx9msgawi6g01s4469yzxv";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -151939,6 +152976,7 @@ self: {
        ];
        description = "Tool for semi-automatic updating of nixpkgs repository";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nkjp" = callPackage
@@ -151971,7 +153009,6 @@ self: {
        testHaskellDepends = [ base vector ];
        description = "Low-level bindings to the NLOPT optimization library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) nlopt;};
 
   "nlp-scores" = callPackage
@@ -152134,6 +153171,7 @@ self: {
        executableHaskellDepends = [ array base containers regex-compat ];
        description = "Parse and compare nofib runs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nofib-analyze" = callPackage
@@ -152340,8 +153378,8 @@ self: {
     ({ mkDerivation, base, containers, semigroupoids }:
      mkDerivation {
        pname = "non-empty-containers";
-       version = "0.1.2.0";
-       sha256 = "0lqyz0xn34byx8f71klj21ficjpy6c049x3fngs7x765vam2dmii";
+       version = "0.1.4.0";
+       sha256 = "1frjpvx3nzymkwyxz0zc4p11pvxdihx3d3hi31w3d9qanwncbc96";
        libraryHaskellDepends = [ base containers semigroupoids ];
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -152380,6 +153418,7 @@ self: {
        testHaskellDepends = [ base checkers QuickCheck ];
        description = "The Zipper for NonEmpty";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "non-negative" = callPackage
@@ -152450,6 +153489,7 @@ self: {
        ];
        description = "Non-empty variants of containers data types, with full API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nonemptymap" = callPackage
@@ -152605,7 +153645,6 @@ self: {
        ];
        description = "Painless 3D graphics, no affiliation with gloss";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "not-gloss-examples" = callPackage
@@ -152769,6 +153808,7 @@ self: {
        libraryHaskellDepends = [ base containers numeric-prelude primes ];
        description = "NumericPrelude extras";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "np-linear" = callPackage
@@ -152824,7 +153864,6 @@ self: {
        ];
        description = "Concurrency library in the style of Erlang/OTP";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nsis" = callPackage
@@ -153089,6 +154128,7 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "Convert numbers to number words";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "numerals-base" = callPackage
@@ -153240,6 +154280,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "numerical" = callPackage
+    ({ mkDerivation, base, ghc-prim, hspec, hspec-expectations, HUnit
+     , monad-ste, primitive, tagged, transformers, transformers-compat
+     , vector, vector-algorithms
+     }:
+     mkDerivation {
+       pname = "numerical";
+       version = "0.0.0.0";
+       sha256 = "018d1hpyv384fbaa5cz8r5qhl2x6gblhj1jxgf9by8g8kyx11x63";
+       libraryHaskellDepends = [
+         base ghc-prim monad-ste primitive tagged transformers
+         transformers-compat vector vector-algorithms
+       ];
+       testHaskellDepends = [
+         base ghc-prim hspec hspec-expectations HUnit primitive tagged
+         transformers vector
+       ];
+       description = "core package for Numerical Haskell project";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "numericpeano" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -153260,6 +154322,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "numeric classes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "numhask-array" = callPackage
@@ -153474,6 +154537,7 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Haskell plugin backend for neovim";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nvim-hs-contrib" = callPackage
@@ -153497,6 +154561,7 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Haskell plugin backend for neovim";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nvim-hs-ghcid" = callPackage
@@ -153514,6 +154579,7 @@ self: {
        ];
        description = "Neovim plugin that runs ghcid to update the quickfix list";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nvvm" = callPackage
@@ -153653,6 +154719,7 @@ self: {
        ];
        description = "Extensible Resource Descriptor";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "oauth10a" = callPackage
@@ -153847,6 +154914,7 @@ self: {
        ];
        description = "Composable objects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "oblivious-transfer" = callPackage
@@ -154135,6 +155203,7 @@ self: {
        ];
        description = "Interface for Online Encyclopedia of Integer Sequences (OEIS)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "off-simple" = callPackage
@@ -154177,6 +155246,7 @@ self: {
        ];
        description = "A lightweight markup language for story writers";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ohloh-hs" = callPackage
@@ -154336,6 +155406,7 @@ self: {
        ];
        description = "Haskell utilities for building embedded Elm programs";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "omaketex" = callPackage
@@ -154690,7 +155761,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "An SQL-generating DSL targeting PostgreSQL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "opaleye-classy" = callPackage
@@ -155000,7 +156070,6 @@ self: {
        hardeningDisable = [ "bindnow" ];
        description = "Haskell binding to OpenCV-3.x";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) opencv3;};
 
   "opencv-extra" = callPackage
@@ -155025,7 +156094,6 @@ self: {
        ];
        description = "Haskell binding to OpenCV-3.x extra modules";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "opencv-raw" = callPackage
@@ -155187,6 +156255,8 @@ self: {
        pname = "openpgp";
        version = "0.6.1";
        sha256 = "03sdl0nzxnqbg8cnkglxkbz5xh5s57n6qgdjdnd82sdz139ia69s";
+       revision = "1";
+       editedCabalFile = "0m6nf0zmr90p5r47skwrj543wmb8wqbmiii0fycblz5kk8avf1li";
        libraryHaskellDepends = [
          base binary bytestring bzlib utf8-string zlib
        ];
@@ -155815,6 +156885,7 @@ self: {
        ];
        description = "Numerical optimization";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "optimusprime" = callPackage
@@ -155899,6 +156970,7 @@ self: {
        testHaskellDepends = [ base chell options time ];
        description = "Command-line option types for dates and times";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "optparse-applicative" = callPackage
@@ -155972,26 +157044,9 @@ self: {
        libraryHaskellDepends = [ base optparse-applicative ];
        description = "Helper functions for optparse-applicative";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "optparse-simple" = callPackage
-    ({ mkDerivation, base, bytestring, directory, gitrev
-     , optparse-applicative, template-haskell, transformers
-     }:
-     mkDerivation {
-       pname = "optparse-simple";
-       version = "0.1.0";
-       sha256 = "1g2cf4pcf1fa001z77g8gwnx0cxdpqs1iw9xp0kb9qrxm9gpk3c3";
-       libraryHaskellDepends = [
-         base gitrev optparse-applicative template-haskell transformers
-       ];
-       testHaskellDepends = [ base bytestring directory ];
-       description = "Simple interface to optparse-applicative";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "optparse-simple_0_1_1" = callPackage
     ({ mkDerivation, base, bytestring, directory, githash
      , optparse-applicative, template-haskell, transformers
      }:
@@ -156007,7 +157062,6 @@ self: {
        testHaskellDepends = [ base bytestring directory ];
        description = "Simple interface to optparse-applicative";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "optparse-text" = callPackage
@@ -156158,7 +157212,6 @@ self: {
        ];
        description = "Order statistic trees based on weight-balanced trees";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "order-statistics" = callPackage
@@ -156433,6 +157486,7 @@ self: {
        executableHaskellDepends = [ base process ];
        description = "Show keys pressed with an on-screen display (Linux only)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "osm-conduit" = callPackage
@@ -156573,6 +157627,7 @@ self: {
        ];
        description = "Pretty-printer for Ott parse trees";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "overhang" = callPackage
@@ -156736,6 +157791,7 @@ self: {
        ];
        description = "Check your cabal packages for lagging dependencies";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "packed" = callPackage
@@ -157041,6 +158097,7 @@ self: {
        ];
        description = "Receive hooks from pagure and do things with them";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "paint" = callPackage
@@ -157092,6 +158149,7 @@ self: {
        ];
        description = "Utilities for choosing and creating color schemes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "palindromes" = callPackage
@@ -157228,6 +158286,7 @@ self: {
        doCheck = false;
        description = "Supports using pandoc with citeproc";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pandoc-citeproc-preamble" = callPackage
@@ -157341,6 +158400,7 @@ self: {
        ];
        description = "A Pandoc filter to use graphviz";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pandoc-include" = callPackage
@@ -157417,6 +158477,7 @@ self: {
        libraryHaskellDepends = [ base containers lens pandoc-types ];
        description = "Lenses for Pandoc documents";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pandoc-placetable" = callPackage
@@ -157480,6 +158541,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "pandoc-pyplot_1_1_0_0" = callPackage
+    ({ mkDerivation, base, containers, directory, filepath, hspec
+     , hspec-expectations, pandoc-types, tasty, tasty-hspec, tasty-hunit
+     , temporary, typed-process
+     }:
+     mkDerivation {
+       pname = "pandoc-pyplot";
+       version = "1.1.0.0";
+       sha256 = "0c04ayg4rnlycsw16gafiwvixxwc66wxfm4nk25bclbl67zyw8qj";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers directory filepath pandoc-types temporary
+         typed-process
+       ];
+       executableHaskellDepends = [ base pandoc-types ];
+       testHaskellDepends = [
+         base directory filepath hspec hspec-expectations pandoc-types tasty
+         tasty-hspec tasty-hunit temporary
+       ];
+       description = "A Pandoc filter for including figures generated from Matplotlib";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pandoc-sidenote" = callPackage
     ({ mkDerivation, base, monad-gen, pandoc, pandoc-types }:
      mkDerivation {
@@ -157492,6 +158578,7 @@ self: {
        executableHaskellDepends = [ base pandoc-types ];
        description = "Convert Pandoc Markdown-style footnotes into sidenotes";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pandoc-stylefrommeta" = callPackage
@@ -157509,6 +158596,7 @@ self: {
        ];
        description = "Pandoc filter to customize links, images and paragraphs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pandoc-types" = callPackage
@@ -157603,6 +158691,7 @@ self: {
        libraryPkgconfigDepends = [ pango ];
        description = "Binding to the Pango text rendering engine";
        license = stdenv.lib.licenses.lgpl21;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.gnome2) pango;};
 
   "pangraph" = callPackage
@@ -157705,6 +158794,7 @@ self: {
        testHaskellDepends = [ base doctest Glob hspec QuickCheck ];
        description = "Pansite: a simple web site management tool";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "papa" = callPackage
@@ -158086,6 +159176,7 @@ self: {
        ];
        description = "packrat parser";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pappy" = callPackage
@@ -158616,6 +159707,7 @@ self: {
        executableHaskellDepends = [ base containers mtl parsec pretty ];
        description = "Pratt Parser combinator for Parsec";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "parsec-tagsoup" = callPackage
@@ -158752,6 +159844,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "parser-combinators_1_0_1" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "parser-combinators";
+       version = "1.0.1";
+       sha256 = "0cpa1j1r7gpyj1n9b1kam4wq6fjn6qh2a1w7m95k614sls7spxgd";
+       libraryHaskellDepends = [ base ];
+       description = "Lightweight package providing commonly useful parser combinators";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "parser-helper" = callPackage
     ({ mkDerivation, aeson, base, bytestring, haskell-src-exts, text }:
      mkDerivation {
@@ -158894,6 +159998,7 @@ self: {
        ];
        description = "Parser combinators with slicing, error recovery, and syntax highlighting";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "partage" = callPackage
@@ -158992,7 +160097,6 @@ self: {
        testHaskellDepends = [ base doctest hedgehog ];
        description = "A partial binary associative operator";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "partial-semigroup-hedgehog" = callPackage
@@ -159004,7 +160108,6 @@ self: {
        libraryHaskellDepends = [ base hedgehog partial-semigroup ];
        description = "Property testing for partial semigroups using Hedgehog";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "partial-semigroup-test" = callPackage
@@ -159017,7 +160120,6 @@ self: {
        doHaddock = false;
        description = "Testing utilities for the partial-semigroup package";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "partial-uri" = callPackage
@@ -159074,6 +160176,31 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "passman" = callPackage
+    ({ mkDerivation, aeson, base, base16-bytestring, base64-bytestring
+     , bytestring, containers, HCL, HUnit, lens, random, SHA, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "passman";
+       version = "0.2";
+       sha256 = "1rqld0cdk0m5vi1j095rjyyfjl65d2k983i0zqsjgl1w34bz02cb";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base base16-bytestring base64-bytestring bytestring
+         containers lens random SHA text
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring containers HCL lens random transformers
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers HUnit lens random
+       ];
+       description = "a simple password manager";
+       license = stdenv.lib.licenses.lgpl3;
+     }) {};
+
   "passman-cli" = callPackage
     ({ mkDerivation, base, conduit, contravariant, haskeline
      , optparse-applicative, passman-core, resourcet, text, X11, yaml
@@ -159130,6 +160257,7 @@ self: {
        libraryHaskellDepends = [ base containers MonadRandom random ];
        description = "Password generation/validation library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pasta" = callPackage
@@ -159196,6 +160324,7 @@ self: {
        ];
        description = "Terminal-based presentations using Pandoc";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "patch-combinators" = callPackage
@@ -159306,6 +160435,8 @@ self: {
        pname = "path-io";
        version = "1.4.1";
        sha256 = "0v5zwdsy8dd2ljidjm2rr8wfpvjlgk1g7c5xf40ddzjn9ghykk2p";
+       revision = "1";
+       editedCabalFile = "1qb9b3rvzpdm6xp2xljmp2izz0x26bj3zvai22iyl914pzph3181";
        libraryHaskellDepends = [
          base containers directory dlist exceptions filepath path temporary
          time transformers unix-compat
@@ -159343,7 +160474,6 @@ self: {
        ];
        description = "Read and write UTF-8 text files";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pathfinding" = callPackage
@@ -159443,8 +160573,10 @@ self: {
     ({ mkDerivation, base, containers }:
      mkDerivation {
        pname = "patience";
-       version = "0.2.0.0";
-       sha256 = "0jkw6ip6fvmxpjzsfxwx7jbh58asrsq5wnc9i5jq4cv3pgql8a0j";
+       version = "0.2.1.0";
+       sha256 = "0mfkqf5kwxqva6pizj967gv7m8zvjvwnli5ala0qvv7jq8gqnfsf";
+       revision = "1";
+       editedCabalFile = "0zr4w80zx7gw7amj2mlxl0k7lvczxnl0i13mijvxnb0g15sa5clg";
        libraryHaskellDepends = [ base containers ];
        description = "Patience diff and longest increasing subsequence";
        license = stdenv.lib.licenses.bsd3;
@@ -159716,6 +160848,7 @@ self: {
        ];
        description = "PCD file loader";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pcf" = callPackage
@@ -160207,6 +161340,7 @@ self: {
        libraryHaskellDepends = [ array base binary containers ];
        description = "A pedestrian implementation of directed acyclic graphs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "peg" = callPackage
@@ -160261,6 +161395,7 @@ self: {
        ];
        description = "Package to solve the Generalized Pell Equation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pem" = callPackage
@@ -160821,8 +161956,8 @@ self: {
        pname = "persistent";
        version = "2.9.0";
        sha256 = "0qgjfydyhcyfr8mni0qjykn3jsh4r299yy2wqsl3rsd19bmmr1p7";
-       revision = "1";
-       editedCabalFile = "0c58yyqwvasby9gdv2502b8symdr0i9aqsli56wk9wjanb1fskj3";
+       revision = "2";
+       editedCabalFile = "1szx008irw7w2h9qz443mml06sg6w9vazbxxyi67d91hyjlgca2j";
        libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring blaze-html blaze-markup
          bytestring conduit containers fast-logger http-api-data
@@ -160869,6 +162004,7 @@ self: {
        ];
        description = "Parses a Persist Model file and produces Audit Models";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "persistent-cereal" = callPackage
@@ -161018,6 +162154,7 @@ self: {
        ];
        description = "Backend for the persistent library using mongoDB";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "persistent-mysql" = callPackage
@@ -161039,31 +162176,6 @@ self: {
      }) {};
 
   "persistent-mysql-haskell" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, conduit, containers
-     , io-streams, monad-logger, mysql-haskell, network, persistent
-     , persistent-template, resource-pool, resourcet, text, time, tls
-     , transformers, unliftio-core
-     }:
-     mkDerivation {
-       pname = "persistent-mysql-haskell";
-       version = "0.5.0";
-       sha256 = "047mlzrav06pm7fpz2x6v6il1gbbm8g0f5s1lvsa2kzmmbvbl4fg";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring conduit containers io-streams monad-logger
-         mysql-haskell network persistent resource-pool resourcet text time
-         tls transformers unliftio-core
-       ];
-       executableHaskellDepends = [
-         base monad-logger persistent persistent-template transformers
-       ];
-       description = "A pure haskell backend for the persistent library using MySQL database server";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "persistent-mysql-haskell_0_5_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, conduit, containers
      , io-streams, monad-logger, mysql-haskell, network, persistent
      , persistent-template, resource-pool, resourcet, text, time, tls
@@ -161085,7 +162197,6 @@ self: {
        ];
        description = "A pure haskell backend for the persistent library using MySQL database server";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "persistent-odbc" = callPackage
@@ -161176,7 +162287,6 @@ self: {
        ];
        description = "Provides a quasi-quoter for raw SQL for persistent";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "persistent-ratelimit" = callPackage
@@ -161226,6 +162336,7 @@ self: {
        ];
        description = "Haskell references backed by an IntMap for persistence and reversibility";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "persistent-relational-record" = callPackage
@@ -161261,6 +162372,8 @@ self: {
        pname = "persistent-sqlite";
        version = "2.6.4";
        sha256 = "16mc2ra0hbyyc8ckjlxxc11bpskdymbr8c3g6ih6wzik639xprbm";
+       revision = "1";
+       editedCabalFile = "0ddqbj5j2m99a5xrvb31mcav4nh48y0jcazm1jj3z577gqv4lbdq";
        configureFlags = [ "-fsystemlib" ];
        isLibrary = true;
        isExecutable = true;
@@ -161288,8 +162401,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistent-sqlite";
-       version = "2.9.1";
-       sha256 = "1lh55511zw1zrbvfwbyz18zsm7kb2xsym76f1lp4cdjz37c7sh2j";
+       version = "2.9.2";
+       sha256 = "1pmmy1a1zi64c0v9sfawd3mz8qfidrrc3i9ghdhrmfqq1d0kir8g";
        configureFlags = [ "-fsystemlib" ];
        isLibrary = true;
        isExecutable = true;
@@ -161390,6 +162503,7 @@ self: {
        ];
        description = "Tests for Persistent";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "persistent-vector" = callPackage
@@ -161818,7 +162932,6 @@ self: {
        ];
        description = "Incremental multiple pass parser library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "phash" = callPackage
@@ -162310,6 +163423,7 @@ self: {
        libraryHaskellDepends = [ base unix ];
        description = "Run an IO action protected by a pidfile";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pier" = callPackage
@@ -162381,6 +163495,7 @@ self: {
        ];
        description = "dice game";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "piki" = callPackage
@@ -162406,10 +163521,8 @@ self: {
      }:
      mkDerivation {
        pname = "pinboard";
-       version = "0.10.0.2";
-       sha256 = "0yi9xnvy153mrb6ypjx7pnbjapdsh65bxqfp6y0s7s6f8vwzpqff";
-       revision = "1";
-       editedCabalFile = "08khbrpsk9yhd795l2zjfhsp8f0wxxwwycrkhsfkqw295zcbaqbh";
+       version = "0.10.1.2";
+       sha256 = "1ifpp00wqacylmbba88r82rfygwj2c28nc5mxn7l6flxw698afnx";
        libraryHaskellDepends = [
          aeson base bytestring containers http-client http-client-tls
          http-types monad-logger mtl network profunctors random text time
@@ -162443,6 +163556,7 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "An alternative implementation of Thrift for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pinchot" = callPackage
@@ -162464,6 +163578,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "ping" = callPackage
+    ({ mkDerivation, base, cpu, ip, posix-api, primitive
+     , primitive-containers, stm, transformers
+     }:
+     mkDerivation {
+       pname = "ping";
+       version = "0.1.0.0";
+       sha256 = "1vaqpb0p7vqpfl1qdyyaj1hlrmqskcsawsjw9rnmd6q76f67i6n6";
+       libraryHaskellDepends = [
+         base cpu ip posix-api primitive primitive-containers stm
+         transformers
+       ];
+       description = "icmp echo requests";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ping-parser-attoparsec" = callPackage
     ({ mkDerivation, attoparsec, base, hspec, iproute, placeholders
      , QuickCheck, quickcheck-text, text
@@ -162630,6 +163761,7 @@ self: {
        ];
        description = "A higher-level interface to using concurrency with pipes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-attoparsec" = callPackage
@@ -163044,6 +164176,7 @@ self: {
        ];
        description = "Fast traversal of directory trees using pipes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-fluid" = callPackage
@@ -163066,6 +164199,7 @@ self: {
        ];
        description = "Reactively combines Producers so that a value is yielded as soon as possible";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-group" = callPackage
@@ -163124,7 +164258,6 @@ self: {
        libraryHaskellDepends = [ base containers heaps pipes ];
        description = "Interleave and merge streams of elements";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-io" = callPackage
@@ -163218,7 +164351,6 @@ self: {
        ];
        description = "LZMA compressors and decompressors for the Pipes package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-misc" = callPackage
@@ -163386,6 +164518,7 @@ self: {
        libraryHaskellDepends = [ base mwc-random pipes vector ];
        description = "Producers for handling randomness";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-rt" = callPackage
@@ -163758,7 +164891,6 @@ self: {
        ];
        description = "Haskell game engine like fantasy console";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pkcs1" = callPackage
@@ -164116,7 +165248,6 @@ self: {
        ];
        description = "run a subprocess, combining stdout and stderr";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "plist" = callPackage
@@ -164202,6 +165333,7 @@ self: {
        ];
        description = "A plotting library, exportable as eps/pdf/svg/png or renderable with gtk";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "plot-gtk" = callPackage
@@ -164213,6 +165345,7 @@ self: {
        libraryHaskellDepends = [ base glib gtk hmatrix mtl plot process ];
        description = "GTK plots and interaction with GHCi";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "plot-gtk-ui" = callPackage
@@ -164243,6 +165376,7 @@ self: {
        ];
        description = "GTK3 plots and interaction with GHCi";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "plot-lab" = callPackage
@@ -164371,6 +165505,7 @@ self: {
        ];
        description = "Diagrams based plotting library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "plotserver-api" = callPackage
@@ -164457,6 +165592,7 @@ self: {
        libraryHaskellDepends = [ base semigroups ];
        description = "Plurality monad: Zero, one, or at least two";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "plural" = callPackage
@@ -164469,6 +165605,7 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Pluralize";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ply-loader" = callPackage
@@ -164666,8 +165803,8 @@ self: {
      }:
      mkDerivation {
        pname = "pointfree";
-       version = "1.1.1.3";
-       sha256 = "0mnyh32d4fzcq9g1vsj8r04pacxvf8xx62rkkaha37rhp966f4mj";
+       version = "1.1.1.4";
+       sha256 = "03jnhppm39zdfrmg1784p1y5r7r5wd5di2ddq5d71slifq7j5wd1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -164722,6 +165859,7 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Pointful refactoring tool";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pointless-fun" = callPackage
@@ -165091,6 +166229,7 @@ self: {
        ];
        description = "Online XML parsing with polyparse and tagsoup";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "polytypeable" = callPackage
@@ -165152,6 +166291,7 @@ self: {
        ];
        description = "Maps and sets of partial orders";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pomodoro" = callPackage
@@ -165409,6 +166549,7 @@ self: {
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the Poppler";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) gdk_pixbuf; gtk2 = pkgs.gnome2.gtk; 
          inherit (pkgs.gnome2) pango; inherit (pkgs) poppler;};
 
@@ -165587,8 +166728,22 @@ self: {
        librarySystemDepends = [ acl ];
        description = "Support for Posix ACL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) acl;};
 
+  "posix-api" = callPackage
+    ({ mkDerivation, base, primitive, tasty, tasty-hunit }:
+     mkDerivation {
+       pname = "posix-api";
+       version = "0.1.0.0";
+       sha256 = "1f1cbvjak0ywhmrrjqvrjfzicq5jfxifxs6alp692rwnm2cbim07";
+       libraryHaskellDepends = [ base primitive ];
+       testHaskellDepends = [ base primitive tasty tasty-hunit ];
+       description = "posix bindings";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "posix-error-codes" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -165773,6 +166928,7 @@ self: {
        libraryHaskellDepends = [ base bytestring postgresql-simple text ];
        description = "Create a temporary database that is deleted after performing some operation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "postgres-websockets" = callPackage
@@ -166237,7 +167393,6 @@ self: {
        testHaskellDepends = [ rerebase ];
        description = "PostgreSQL SQL syntax utilities";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {pg_query = null;};
 
   "postgresql-transactional" = callPackage
@@ -166429,6 +167584,7 @@ self: {
        ];
        description = "Send email via Postmark using io-streams";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "postmaster" = callPackage
@@ -166814,6 +167970,7 @@ self: {
        ];
        description = "Alternative Show class that gives shorter view if possible";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "preamble" = callPackage
@@ -167427,8 +168584,8 @@ self: {
      }:
      mkDerivation {
        pname = "pretty-show";
-       version = "1.9.4";
-       sha256 = "00gpniygx45yczhkf6ayqik5kraa2c436ragx07mqp3mp383ab5r";
+       version = "1.9.5";
+       sha256 = "0gs2pabi4qa4b0r5vffpf9b1cf5n9y2939a3lljjw7cmg6xvx5dh";
        isLibrary = true;
        isExecutable = true;
        enableSeparateDataOutput = true;
@@ -167487,7 +168644,6 @@ self: {
        libraryHaskellDepends = [ base generics-sop pretty-show ];
        description = "A generic pretty-printer using generics-sop";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pretty-terminal" = callPackage
@@ -167689,6 +168845,7 @@ self: {
        libraryHaskellDepends = [ base ghc-prim primitive semigroups ];
        description = "Primitive byte array with type variable";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "prim-instances" = callPackage
@@ -167823,7 +168980,6 @@ self: {
        libraryHaskellDepends = [ base primitive ];
        description = "primitive functions with bounds-checking";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "primitive-containers" = callPackage
@@ -167834,8 +168990,8 @@ self: {
      }:
      mkDerivation {
        pname = "primitive-containers";
-       version = "0.3.0";
-       sha256 = "0yk7gqngdkm3s3pmmzbvrjd52hiqjn0gg2j60iw7wnaalagcap6x";
+       version = "0.3.1";
+       sha256 = "0ikpnci6lk6nmalyr5kkqwrr12kpclr8ka001hlz0mcy8rrxncq3";
        libraryHaskellDepends = [
          aeson base contiguous deepseq hashable primitive primitive-sort
          quantification text unordered-containers vector
@@ -167872,7 +169028,6 @@ self: {
        ];
        description = "Extras for the \"primitive\" library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "primitive-indexed" = callPackage
@@ -167939,7 +169094,6 @@ self: {
        benchmarkHaskellDepends = [ base gauge ghc-prim primitive random ];
        description = "Sort primitive arrays";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "primula-board" = callPackage
@@ -168163,7 +169317,6 @@ self: {
        ];
        description = "Convert colors to different color spaces, interpolate colors, and transform colors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "probability" = callPackage
@@ -168647,6 +169800,7 @@ self: {
        ];
        description = "Treemap visualiser for GHC prof files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "profunctor-extras" = callPackage
@@ -168873,6 +170027,8 @@ self: {
        pname = "project-template";
        version = "0.2.0.1";
        sha256 = "1p69ww4rhah2qxragl615wl4a6mk4x9w09am8knmz3s4lxpljlpb";
+       revision = "1";
+       editedCabalFile = "0lq3sqnq0nr0gbvgzp0lqdl3j3mqdmdlf8xsw0j3pjh581xj3k0a";
        libraryHaskellDepends = [
          base base64-bytestring bytestring conduit conduit-extra containers
          directory filepath mtl resourcet text transformers
@@ -169017,6 +170173,7 @@ self: {
        ];
        description = "Prometheus Haskell Client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "prometheus-client" = callPackage
@@ -169087,7 +170244,6 @@ self: {
        testHaskellDepends = [ base doctest prometheus-client ];
        description = "Metrics exposing GHC runtime information for use with prometheus-client";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "promise" = callPackage
@@ -169142,6 +170298,7 @@ self: {
        ];
        description = "A library for interfacing with the CMU Pronouncing Dictionary";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "proof-combinators" = callPackage
@@ -169192,6 +170349,7 @@ self: {
        executableHaskellDepends = [ base ];
        description = "property-based host configuration management in haskell";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "properties" = callPackage
@@ -169266,7 +170424,6 @@ self: {
        ];
        description = "Explore continuations with trepidation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "prosper" = callPackage
@@ -169306,38 +170463,40 @@ self: {
     ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers
      , data-default-class, deepseq, directory, either, filepath
      , hslogger, HTF, lens, messagepack, MissingH, mtl, nvim-hs
-     , pretty-terminal, prettyprinter, process, resourcet, safe, split
-     , stm, strings, text, time, transformers, unliftio, utf8-string
+     , pretty-terminal, prettyprinter, process, resourcet, ribosome
+     , safe, split, stm, strings, text, time, transformers, unliftio
+     , utf8-string
      }:
      mkDerivation {
        pname = "proteome";
-       version = "0.3.16.0";
-       sha256 = "1lnvc34xvxf10b41bv3c2gkpzhmckbd12199nfky8sk8z60sqpsh";
+       version = "0.3.17.0";
+       sha256 = "1v0pk4mh8r56lmpxmc91h93rwm81d488qy5k648v1qfmj0qmgl25";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson ansi-terminal base bytestring containers data-default-class
          deepseq directory either filepath hslogger lens messagepack
          MissingH mtl nvim-hs pretty-terminal prettyprinter process
-         resourcet safe split stm strings text time transformers unliftio
-         utf8-string
+         resourcet ribosome safe split stm strings text time transformers
+         unliftio utf8-string
        ];
        executableHaskellDepends = [
          aeson ansi-terminal base bytestring containers data-default-class
          deepseq directory either filepath hslogger lens messagepack
          MissingH mtl nvim-hs pretty-terminal prettyprinter process
-         resourcet safe split stm strings text time transformers unliftio
-         utf8-string
+         resourcet ribosome safe split stm strings text time transformers
+         unliftio utf8-string
        ];
        testHaskellDepends = [
          aeson ansi-terminal base bytestring containers data-default-class
          deepseq directory either filepath hslogger HTF lens messagepack
          MissingH mtl nvim-hs pretty-terminal prettyprinter process
-         resourcet safe split stm strings text time transformers unliftio
-         utf8-string
+         resourcet ribosome safe split stm strings text time transformers
+         unliftio utf8-string
        ];
        description = "neovim project manager";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "proto-lens_0_2_2_0" = callPackage
@@ -169541,7 +170700,6 @@ self: {
        ];
        doHaddock = false;
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "proto-lens-setup" = callPackage
@@ -169558,7 +170716,6 @@ self: {
        ];
        description = "Cabal support for codegen with proto-lens";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "protobuf" = callPackage
@@ -169789,6 +170946,7 @@ self: {
        libraryHaskellDepends = [ base monads-tf ];
        description = "prototype-based programming on Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "prove-everywhere-server" = callPackage
@@ -170064,6 +171222,7 @@ self: {
        benchmarkHaskellDepends = [ base criterion random ];
        description = "The publicsuffix list exposed as proper Haskell types";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "publicsuffixlist" = callPackage
@@ -170103,6 +171262,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "publish" = callPackage
+    ({ mkDerivation, base, bytestring, chronologique, directory
+     , filepath, hinotify, pandoc, pandoc-types, template-haskell, text
+     , typed-process, unbeliever, unix, unordered-containers
+     }:
+     mkDerivation {
+       pname = "publish";
+       version = "0.3.2";
+       sha256 = "1jkmp5wsd8ffrxvj965z9pch5g8vxkfwv70hxa3lipdh46k6ll7l";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base bytestring chronologique directory filepath hinotify pandoc
+         pandoc-types template-haskell text typed-process unbeliever unix
+         unordered-containers
+       ];
+       description = "Publishing tools for papers, books, and presentations";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "pubnub" = callPackage
     ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring
      , Cabal, cipher-aes, conduit, conduit-extra, crypto-api
@@ -170964,6 +172143,7 @@ self: {
        ];
        description = "Creating graphics for pencil puzzles";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "puzzle-draw-cmdline" = callPackage
@@ -171338,7 +172518,7 @@ self: {
 
   "qr-imager" = callPackage
     ({ mkDerivation, base, binary, bytestring, cryptonite, directory
-     , haskell-qrencode, hspec, jose-jwt, JuicyPixels, qrencode
+     , haskell-qrencode, hspec, jose-jwt, JuicyPixels, libqrencode
      , microlens, process, split, vector
      }:
      mkDerivation {
@@ -171349,12 +172529,12 @@ self: {
          base binary bytestring cryptonite directory haskell-qrencode
          jose-jwt JuicyPixels microlens process split vector
        ];
-       libraryPkgconfigDepends = [ qrencode ];
+       libraryPkgconfigDepends = [ libqrencode ];
        testHaskellDepends = [ base hspec ];
        description = "Library to generate images";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {inherit (pkgs) qrencode;};
+     }) {inherit (pkgs) libqrencode;};
 
   "qr-repa" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cryptonite, directory
@@ -171981,7 +173161,6 @@ self: {
        sha256 = "0qdjls949kmcv8wj3a27p4dz8nb1dq4i99zizkw7qyqn47r9ccxd";
        libraryHaskellDepends = [ base QuickCheck unfoldable-restricted ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quickcheck-enum-instances" = callPackage
@@ -172248,6 +173427,7 @@ self: {
        ];
        description = "Helper to build generators with Text.StringRandom";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quickcheck-text" = callPackage
@@ -172294,7 +173474,6 @@ self: {
        libraryHaskellDepends = [ base QuickCheck template-haskell ];
        description = "Get counterexamples from QuickCheck as Haskell values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quicklz" = callPackage
@@ -172759,6 +173938,7 @@ self: {
        testHaskellDepends = [ base HUnit lens ];
        description = "Isomorphisms for measurements that use radians";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "radium" = callPackage
@@ -172845,7 +174025,6 @@ self: {
        ];
        description = "Radix tree data structive over short byte-strings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "radixtree" = callPackage
@@ -173051,6 +174230,7 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "distributed-process node";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rakhana" = callPackage
@@ -173092,6 +174272,7 @@ self: {
        ];
        description = "The Rakuten API in Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ralist" = callPackage
@@ -173105,7 +174286,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion deepseq ];
        description = "Random access list with a list compatible interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rallod" = callPackage
@@ -173194,6 +174374,7 @@ self: {
        ];
        description = "Easy-to-use randomness for livecoding";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "random" = callPackage
@@ -173527,7 +174708,6 @@ self: {
        ];
        description = "An efficient and versatile range library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "range-set-list" = callPackage
@@ -173546,6 +174726,7 @@ self: {
        ];
        description = "Memory efficient sets with ranges of elements";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "range-space" = callPackage
@@ -173626,6 +174807,7 @@ self: {
        ];
        description = "Like Data.Dynamic/Data.Typeable but with support for rank-1 polymorphic types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rank2classes" = callPackage
@@ -173926,7 +175108,6 @@ self: {
        ];
        description = "SVG renderer based on Rasterific";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rate-limit" = callPackage
@@ -174029,6 +175210,7 @@ self: {
        ];
        description = "Parse and generate Rocket League replays";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "raven-haskell" = callPackage
@@ -174300,6 +175482,7 @@ self: {
        ];
        description = "Representation and Incremental Processing of RDF Data";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rdf4h" = callPackage
@@ -174543,6 +175726,7 @@ self: {
        ];
        description = "Library for functional reactive programming (FRP)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reactive-banana-automation" = callPackage
@@ -174559,6 +175743,7 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "home (etc) automation using reactive-banana";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reactive-banana-bunch" = callPackage
@@ -174591,6 +175776,7 @@ self: {
        testHaskellDepends = [ base ];
        description = "Simple reactive programming with GTK GObject Introspection";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reactive-banana-sdl" = callPackage
@@ -175209,7 +176395,6 @@ self: {
        ];
        description = "Record subtyping and record utilities with generics-sop";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "records-th" = callPackage
@@ -175291,6 +176476,7 @@ self: {
        ];
        description = "Count lines in files and display them hierarchically";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "recursors" = callPackage
@@ -175414,7 +176600,6 @@ self: {
        ];
        description = "Yet another redis client";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "redis-job-queue" = callPackage
@@ -175443,7 +176628,6 @@ self: {
        ];
        description = "REdis Serialization Protocol (RESP) implementation";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "redis-simple" = callPackage
@@ -175604,6 +176788,7 @@ self: {
        libraryHaskellDepends = [ base stm transformers ];
        description = "A type class for monads with references using functional dependencies";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ref-mtl" = callPackage
@@ -175627,6 +176812,7 @@ self: {
        libraryHaskellDepends = [ base stm transformers ];
        description = "A type class for monads with references using type families";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "refact" = callPackage
@@ -176026,8 +177212,8 @@ self: {
     ({ mkDerivation, base, containers, mtl, semigroups, text }:
      mkDerivation {
        pname = "reform";
-       version = "0.2.7.2";
-       sha256 = "14as5chpwfrrqdfxk5g03f4zia0dx10npb802cphfq2j598mjczv";
+       version = "0.2.7.3";
+       sha256 = "18aqpbssm2cxjry567qc7ccvs0wy18gm292gjf5vgzl7gjk7k2n2";
        libraryHaskellDepends = [ base containers mtl semigroups text ];
        description = "reform is a type-safe HTML form generation and validation library";
        license = stdenv.lib.licenses.bsd3;
@@ -176171,7 +177357,6 @@ self: {
        ];
        description = "Toolkit for regex-base";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "regex-applicative" = callPackage
@@ -176335,7 +177520,6 @@ self: {
        ];
        description = "Tutorial, tests and example programs for regex";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "regex-generator" = callPackage
@@ -176354,6 +177538,7 @@ self: {
        ];
        description = "Generate a random string from a PCRE";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "regex-genex" = callPackage
@@ -176627,7 +177812,6 @@ self: {
        ];
        description = "Toolkit for regex-base";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "regex-xmlschema" = callPackage
@@ -176665,7 +177849,6 @@ self: {
        testHaskellDepends = [ base QuickCheck regexdot toolshed ];
        description = "A POSIX, extended regex-engine";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "regexdot" = callPackage
@@ -176681,7 +177864,6 @@ self: {
        ];
        description = "A polymorphic, POSIX, extended regex-engine";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "regexp-tries" = callPackage
@@ -177015,6 +178197,7 @@ self: {
        libraryHaskellDepends = [ array base containers ];
        description = "A relation data structure";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "relapse" = callPackage
@@ -178114,6 +179297,7 @@ self: {
        ];
        description = "A local http server to catch the HTTP redirect";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "request-monad" = callPackage
@@ -178156,6 +179340,7 @@ self: {
        ];
        description = "Scrap your qualified import clutter";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rerebase" = callPackage
@@ -178167,7 +179352,6 @@ self: {
        libraryHaskellDepends = [ rebase ];
        description = "Reexports from \"base\" with a bunch of other standard libraries";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reroute" = callPackage
@@ -178234,12 +179418,11 @@ self: {
     ({ mkDerivation, base, ghc-prim, ralist, semigroupoids }:
      mkDerivation {
        pname = "resin";
-       version = "0.2.0.2";
-       sha256 = "01cllvyxiyqd0a8kg2whwrgmhgfb4akxmb2nx88l2z8lxa5nfz2j";
+       version = "0.2.0.3";
+       sha256 = "1arv9mcbg5xa6vzv6k85mcxdz38x26ipwhk8613qdd94a2hhf8nx";
        libraryHaskellDepends = [ base ghc-prim ralist semigroupoids ];
        description = "High performance variable binders";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "resistor-cube" = callPackage
@@ -178628,6 +179811,7 @@ self: {
        ];
        description = "Maps with stringy keys that can be transcoded to JSON and XML";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rest-types" = callPackage
@@ -178706,7 +179890,6 @@ self: {
        ];
        description = "Easy Git repository serialization";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "restricted-workers" = callPackage
@@ -179187,6 +180370,8 @@ self: {
        pname = "rfc1413-types";
        version = "0.0.0.0";
        sha256 = "1lyf0wpjyzj43przl6k7mv1484aciizy03ch6ygbzkm0b0f70ha5";
+       revision = "1";
+       editedCabalFile = "1v55q9z4k4c4qb30hmavf3hvwi1i9a351i12ycwzmlj0vv382byk";
        libraryHaskellDepends = [ base bytestring ];
        description = "An rfc1413 parser and response renderer";
        license = stdenv.lib.licenses.bsd3;
@@ -179218,7 +180403,6 @@ self: {
        doHaddock = false;
        description = "Parse and display time according to RFC3339 (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rfc5051" = callPackage
@@ -179258,6 +180442,7 @@ self: {
        ];
        description = "Functional Reactive Programming with type-level clocks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rhine-gloss" = callPackage
@@ -179365,6 +180550,36 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "ribosome" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, base, bytestring, containers
+     , data-default-class, deepseq, directory, either, filepath
+     , hslogger, HTF, lens, messagepack, MissingH, mtl, nvim-hs
+     , pretty-terminal, prettyprinter, process, resourcet, safe, split
+     , stm, strings, text, time, transformers, unliftio, utf8-string
+     }:
+     mkDerivation {
+       pname = "ribosome";
+       version = "0.1.2.0";
+       sha256 = "0sx4c7inv7dgy68wjnl13wmx6ybfjwl6flf2x9wz5aw1v5ssaw8z";
+       libraryHaskellDepends = [
+         aeson ansi-terminal base bytestring containers data-default-class
+         deepseq directory either filepath hslogger lens messagepack
+         MissingH mtl nvim-hs pretty-terminal prettyprinter process
+         resourcet safe split stm strings text time transformers unliftio
+         utf8-string
+       ];
+       testHaskellDepends = [
+         aeson ansi-terminal base bytestring containers data-default-class
+         deepseq directory either filepath hslogger HTF lens messagepack
+         MissingH mtl nvim-hs pretty-terminal prettyprinter process
+         resourcet safe split stm strings text time transformers unliftio
+         utf8-string
+       ];
+       description = "api extensions for nvim-hs";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "richreports" = callPackage
     ({ mkDerivation, ascetic, base, MissingH }:
      mkDerivation {
@@ -179495,8 +180710,8 @@ self: {
      }:
      mkDerivation {
        pname = "rio";
-       version = "0.1.6.0";
-       sha256 = "0fwrzlh36rrv42qmavspr1km1yawhh54hw51bnklnr5bhf8vrpl2";
+       version = "0.1.8.0";
+       sha256 = "1qgmvfc8whhg0qd6zh4jaqqbx5c4p11r8dskybanj6hs482ds4x0";
        libraryHaskellDepends = [
          base bytestring containers deepseq directory exceptions filepath
          hashable microlens mtl primitive process text time typed-process
@@ -180192,6 +181407,7 @@ self: {
        ];
        description = "Core Rollbar data types and APIs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "roller" = callPackage
@@ -180924,7 +182140,6 @@ self: {
        libraryHaskellDepends = [ base HaXml network network-uri time ];
        description = "A library for generating RSS 2.0 feeds.";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rss-conduit" = callPackage
@@ -180979,6 +182194,7 @@ self: {
        ];
        description = "watches an RSS/Atom feed and writes it to an IRC channel";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rstream" = callPackage
@@ -181101,7 +182317,6 @@ self: {
        ];
        description = "Parsing and manipulation of rtorrent state file contents";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rts-loader" = callPackage
@@ -181641,6 +182856,7 @@ self: {
        ];
        description = "Type-safe and lossless encoding and manipulation of money, fiat currencies, crypto currencies and precious metals";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "safe-money-aeson" = callPackage
@@ -181658,6 +182874,7 @@ self: {
        ];
        description = "Instances from the aeson library for the safe-money library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "safe-money-cereal" = callPackage
@@ -181675,6 +182892,7 @@ self: {
        ];
        description = "Instances from the cereal library for the safe-money library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "safe-money-serialise" = callPackage
@@ -181692,6 +182910,7 @@ self: {
        ];
        description = "Instances from the serialise library for the safe-money library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "safe-money-store" = callPackage
@@ -181709,6 +182928,7 @@ self: {
        ];
        description = "Instances from the store library for the safe-money library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "safe-money-xmlbf" = callPackage
@@ -181726,6 +182946,7 @@ self: {
        ];
        description = "Instances from the xmlbf library for the safe-money library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "safe-plugins" = callPackage
@@ -181771,8 +182992,8 @@ self: {
      }:
      mkDerivation {
        pname = "safecopy";
-       version = "0.9.4.2";
-       sha256 = "08glsr8mwxkz3hw68d6j7v285nay2a6xkyqpyc1b6wc9iw2g82r7";
+       version = "0.9.4.3";
+       sha256 = "020z2cdarpy8crz6b871lprgacwi6zsmmwml35ban93hdfjv2zbq";
        libraryHaskellDepends = [
          array base bytestring cereal containers old-time template-haskell
          text time vector
@@ -181801,7 +183022,6 @@ self: {
        ];
        description = "Making SafeCopy migrations easier";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "safecopy-store" = callPackage
@@ -182478,6 +183698,7 @@ self: {
        testHaskellDepends = [ array base ];
        description = "SAT encoding monad";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "satchmo-backends" = callPackage
@@ -182641,6 +183862,33 @@ self: {
        license = stdenv.lib.licenses.lgpl3;
      }) {};
 
+  "sbp_2_4_6" = 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
+     }:
+     mkDerivation {
+       pname = "sbp";
+       version = "2.4.6";
+       sha256 = "1f0smglnxblywzf553xhmzd2jyg67w14ylyc05hj6dx3fr3xls4m";
+       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
+       ];
+       executableHaskellDepends = [
+         aeson base basic-prelude binary-conduit bytestring conduit
+         conduit-extra resourcet time yaml
+       ];
+       testHaskellDepends = [ base basic-prelude tasty tasty-hunit ];
+       description = "SwiftNav's SBP Library";
+       license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "sbp2udp" = callPackage
     ({ mkDerivation, base, basic-prelude, binary, binary-conduit
      , bytestring, conduit, conduit-extra, network, optparse-generic
@@ -182767,6 +184015,7 @@ self: {
        ];
        description = "This is a library for handling calendars and resource availability based on the \"top-nodes algorithm\" and set operations";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scalp-webhooks" = callPackage
@@ -182984,7 +184233,6 @@ self: {
        ];
        description = "A Haskell library for writing SCGI programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "schedevr" = callPackage
@@ -183430,6 +184678,7 @@ self: {
        testToolDepends = [ hpc-coveralls hspec-discover ];
        description = "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scotty-binding-play" = callPackage
@@ -183482,6 +184731,7 @@ self: {
        ];
        description = "Cookie management helper functions for Scotty framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scotty-fay" = callPackage
@@ -183555,6 +184805,7 @@ self: {
        ];
        description = "HTTP-request's query parameters parser abstraction for \"scotty\"";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scotty-path-normalizer" = callPackage
@@ -183567,6 +184818,7 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "Redirect to a normalized path";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scotty-resource" = callPackage
@@ -183641,6 +184893,7 @@ self: {
        ];
        description = "TLS for Scotty";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scotty-view" = callPackage
@@ -183732,25 +184985,26 @@ self: {
   "script-monad" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, http-client
      , http-types, lens, lens-aeson, QuickCheck, tasty, tasty-hunit
-     , tasty-quickcheck, tasty-quickcheck-laws, text, time
+     , tasty-quickcheck, tasty-quickcheck-laws, text, time, transformers
      , unordered-containers, vector, wreq
      }:
      mkDerivation {
        pname = "script-monad";
-       version = "0.0.2.1";
-       sha256 = "1lmla9jwb46d4ffm4igd23v0v2pr45sfbizgg7n29kkv8i2czhkz";
+       version = "0.0.3";
+       sha256 = "18gwf2d8hzpgmkyjzr7p6f33qjcgr9lbj267s4bjf8476kk40ifg";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson aeson-pretty base bytestring http-client http-types lens
-         lens-aeson QuickCheck text time unordered-containers vector wreq
+         lens-aeson QuickCheck text time transformers unordered-containers
+         vector wreq
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [
          base bytestring tasty tasty-hunit tasty-quickcheck
-         tasty-quickcheck-laws
+         tasty-quickcheck-laws transformers
        ];
-       description = "Transformer stack of error, reader, writer, state, and prompt monads";
+       description = "Stack of error, reader, writer, state, and prompt monad transformers";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -183952,7 +185206,6 @@ self: {
        testHaskellDepends = [ base deepseq linear vector weigh ];
        description = "Both high- and low-level bindings to the SDL library (version 2.0.4+).";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) SDL2;};
 
   "sdl2-cairo" = callPackage
@@ -184014,7 +185267,6 @@ self: {
        libraryHaskellDepends = [ base sdl2 ];
        description = "Run of the mill, frames per second timer implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sdl2-gfx" = callPackage
@@ -184036,7 +185288,6 @@ self: {
        executableHaskellDepends = [ base linear sdl2 vector ];
        description = "Bindings to SDL2_gfx";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_gfx;};
 
   "sdl2-image" = callPackage
@@ -184056,7 +185307,6 @@ self: {
        executableHaskellDepends = [ base sdl2 text ];
        description = "Bindings to SDL2_image";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_image;};
 
   "sdl2-mixer" = callPackage
@@ -184077,7 +185327,7 @@ self: {
        libraryPkgconfigDepends = [ SDL2_mixer ];
        description = "Bindings to SDL2_mixer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) SDL2_mixer;};
 
   "sdl2-sprite" = callPackage
@@ -184096,7 +185346,6 @@ self: {
        ];
        description = "Sprite previewer/animator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sdl2-ttf" = callPackage
@@ -184115,7 +185364,7 @@ self: {
        libraryPkgconfigDepends = [ SDL2 SDL2_ttf ];
        description = "Bindings to SDL2_ttf";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_ttf;};
 
   "sdnv" = callPackage
@@ -184269,6 +185518,7 @@ self: {
        testHaskellDepends = [ base containers doctest hspec ];
        description = "Common graph search algorithms";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sec" = callPackage
@@ -184375,6 +185625,7 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Bindings for secp256k1 library from Bitcoin Core";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) secp256k1;};
 
   "secp256k1-haskell" = callPackage
@@ -184638,8 +185889,8 @@ self: {
      }:
      mkDerivation {
        pname = "self-extract";
-       version = "0.4.0";
-       sha256 = "1zv84rdf5nzszy4qhp74jdzam613z9p86sjh8ag6kb5fxaxk91dh";
+       version = "0.4.1";
+       sha256 = "1jhwarhab9mwgiv1rahn4spkpfqdnwfa31pwgjy1k9mw2xdxslgs";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -184734,6 +185985,7 @@ self: {
        testHaskellDepends = [ base ];
        description = "A Haskell implementation of semibounded lattices";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "semigroupoid-extras" = callPackage
@@ -184757,6 +186009,8 @@ self: {
        pname = "semigroupoids";
        version = "5.3.1";
        sha256 = "13iqjckq3jzp6rxldrf3bcvk3061ssvsr6y0g5y9jq32z1hyr2fd";
+       revision = "1";
+       editedCabalFile = "1is9nr55fwlas87az2rl9fjwp8108q2zybff8scg9qw3mqc60qh2";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base base-orphans bifunctors comonad containers contravariant
@@ -184828,6 +186082,7 @@ self: {
        ];
        description = "Semilattices";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "semiring" = callPackage
@@ -184898,6 +186153,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "semirings_0_3_0_0" = callPackage
+    ({ mkDerivation, base, containers, hashable, integer-gmp
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "semirings";
+       version = "0.3.0.0";
+       sha256 = "0jy0imzwr1xz02q77518gfgx7q5vr1bs45kqs7qrdfvsz2aamsjd";
+       libraryHaskellDepends = [
+         base containers hashable integer-gmp unordered-containers vector
+       ];
+       description = "two monoids as one, in holy haskimony";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "semver" = callPackage
     ({ mkDerivation, attoparsec, base, criterion, deepseq, tasty
      , tasty-hunit, text
@@ -185185,6 +186456,7 @@ self: {
        libraryHaskellDepends = [ base mtl transformers ];
        description = "Sequence ID production and consumption";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "seqid-streams_0_1_0" = callPackage
@@ -185208,6 +186480,7 @@ self: {
        libraryHaskellDepends = [ base io-streams seqid ];
        description = "Sequence ID IO-Streams";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "seqloc" = callPackage
@@ -185691,6 +186964,7 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "servant-docs/servant-auth compatibility";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-auth-hmac" = callPackage
@@ -185781,6 +187055,7 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "servant-swagger/servant-auth compatibility";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-auth-token" = callPackage
@@ -186005,6 +187280,7 @@ self: {
        testHaskellDepends = [ base doctest Glob ];
        description = "Checked exceptions for Servant APIs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-client" = callPackage
@@ -186160,6 +187436,7 @@ self: {
        ];
        description = "Servant Dhall content-type";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-docs" = callPackage
@@ -186189,6 +187466,7 @@ self: {
        ];
        description = "generate API docs for your servant webservice";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-ede" = callPackage
@@ -186342,6 +187620,7 @@ self: {
        libraryHaskellDepends = [ base servant servant-server ];
        description = "Utilities for generating mock server implementations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-generic" = callPackage
@@ -186405,6 +187684,7 @@ self: {
        ];
        description = "Servant combinators to facilitate writing GitHub webhooks";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-haxl-client" = callPackage
@@ -186544,7 +187824,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Automatically derive javascript functions to query servant webservices";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-kotlin" = callPackage
@@ -186784,6 +188063,7 @@ self: {
        ];
        description = "Use Pandoc to render servant API documentation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-pipes" = callPackage
@@ -187256,6 +188536,7 @@ self: {
        ];
        description = "Client instances for the 'servant-docs' package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-streaming-server" = callPackage
@@ -187282,6 +188563,7 @@ self: {
        ];
        description = "Server instances for the 'servant-streaming' package";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-subscriber" = callPackage
@@ -187335,6 +188617,7 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Generate Swagger specification for your servant API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-swagger-ui" = callPackage
@@ -187353,6 +188636,7 @@ self: {
        ];
        description = "Servant swagger ui";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-swagger-ui-core" = callPackage
@@ -187373,6 +188657,7 @@ self: {
        ];
        description = "Servant swagger ui core components";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-swagger-ui-jensoleg" = callPackage
@@ -187599,34 +188884,6 @@ self: {
      }) {};
 
   "serverless-haskell" = callPackage
-    ({ mkDerivation, aeson, aeson-casing, aeson-extra, amazonka-core
-     , amazonka-kinesis, amazonka-s3, base, bytestring, case-insensitive
-     , hspec, hspec-discover, http-types, iproute, lens, network
-     , network-simple, raw-strings-qq, text, time, unix
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "serverless-haskell";
-       version = "0.8.4";
-       sha256 = "0hbva555n2xypq7sby6frkrwhn6xxx1hdq7hgdi07cx60vs8b6l4";
-       libraryHaskellDepends = [
-         aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis
-         amazonka-s3 base bytestring case-insensitive http-types iproute
-         lens network network-simple text time unix unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson aeson-casing aeson-extra amazonka-core amazonka-kinesis
-         amazonka-s3 base bytestring case-insensitive hspec hspec-discover
-         http-types iproute lens network network-simple raw-strings-qq text
-         time unix unordered-containers
-       ];
-       testToolDepends = [ hspec-discover ];
-       description = "Deploying Haskell code onto AWS Lambda using Serverless";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "serverless-haskell_0_8_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, network
@@ -187958,6 +189215,7 @@ self: {
        ];
        description = "Solve exact set cover problems like Sudoku, 8 Queens, Soma Cube, Tetris Cube";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "set-extra" = callPackage
@@ -187980,7 +189238,6 @@ self: {
        libraryHaskellDepends = [ base containers deepseq ];
        description = "Set monad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "set-of" = callPackage
@@ -187992,6 +189249,7 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Sets of fixed size, with typelits";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "set-with" = callPackage
@@ -188029,6 +189287,7 @@ self: {
        executableToolDepends = [ alex happy ];
        description = "Treating files as sets to perform rapid set manipulation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "setenv" = callPackage
@@ -188232,6 +189491,7 @@ self: {
        ];
        description = "Invertible grammar combinators for S-expressions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sexp-show" = callPackage
@@ -188262,7 +189522,6 @@ self: {
        ];
        description = "S-expression printer and parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sext" = callPackage
@@ -188403,6 +189662,7 @@ self: {
        ];
        description = "Record your shell session and print in the markdown format";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sha-streams" = callPackage
@@ -188569,7 +189829,6 @@ self: {
        ];
        description = "Utilities for building ATS projects with shake";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shake-c" = callPackage
@@ -188932,7 +190191,6 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Shannon-fano compression algorithm implementation in Haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shapefile" = callPackage
@@ -189013,7 +190271,6 @@ self: {
        ];
        description = "demos for the 'shapes' package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shapes-math" = callPackage
@@ -189092,7 +190349,6 @@ self: {
        testHaskellDepends = [ base bytestring unix ];
        description = "POSIX shared memory";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sharedio" = callPackage
@@ -189175,7 +190431,6 @@ self: {
        ];
        description = "Write shell scripts with Conduit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shell-escape" = callPackage
@@ -189200,7 +190455,6 @@ self: {
        libraryHaskellDepends = [ base containers text unix ];
        description = "shell monad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shell-pipe" = callPackage
@@ -189316,6 +190570,7 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Parse strings into words, like a shell would";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shelly" = callPackage
@@ -189444,7 +190699,6 @@ self: {
        ];
        description = "Run a sequence of functions on in-memory representations of files";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shimmer" = callPackage
@@ -189465,6 +190719,7 @@ self: {
        ];
        description = "The Reflective Lambda Machine";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shine" = callPackage
@@ -189935,6 +191190,7 @@ self: {
        ];
        description = "Arithmetic over signs and sets of signs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "signal" = callPackage
@@ -190450,6 +191706,7 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Simple library to handle and interexchange money";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simple-neural-networks" = callPackage
@@ -190539,6 +191796,7 @@ self: {
        ];
        description = "simple pipeline library like conduit";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simple-postgresql-orm" = callPackage
@@ -190671,7 +191929,6 @@ self: {
        ];
        description = "A parser for SQL queries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simple-src-utils" = callPackage
@@ -190784,6 +192041,7 @@ self: {
        ];
        description = "UI library for terminal";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simple-vec3" = callPackage
@@ -190962,6 +192220,7 @@ self: {
        librarySystemDepends = [ sqlite ];
        description = "Simplest SQLite3 binding";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) sqlite;};
 
   "simplex" = callPackage
@@ -191111,6 +192370,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Singletons and induction over GHC TypeLits";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "singletons" = callPackage
@@ -191203,24 +192463,23 @@ self: {
      }) {};
 
   "siren-json" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, case-insensitive
-     , containers, hspec, hspec-discover, http-media, http-types
-     , network-arbitrary, network-uri, network-uri-json, QuickCheck
-     , quickcheck-instances, test-invariant, text, unordered-containers
+    ({ mkDerivation, aeson, base, bytestring, containers, hspec
+     , hspec-discover, http-media, http-types, network-arbitrary
+     , network-uri, network-uri-json, QuickCheck, quickcheck-instances
+     , test-invariant, text, unordered-containers
      }:
      mkDerivation {
        pname = "siren-json";
-       version = "0.1.3.1";
-       sha256 = "1chwf9kldwf039qad55la4yh13wjax64g0pi99hw2b46x7dx4qm1";
+       version = "0.3.0.0";
+       sha256 = "096a4ls4kqpslqsh499ykh7mkvnz3q7n00w1par69kmj4x3g9v0j";
        libraryHaskellDepends = [
          aeson base bytestring containers http-media http-types network-uri
          network-uri-json text unordered-containers
        ];
        testHaskellDepends = [
-         aeson base bytestring case-insensitive containers hspec http-media
-         http-types network-arbitrary network-uri network-uri-json
-         QuickCheck quickcheck-instances test-invariant text
-         unordered-containers
+         aeson base bytestring containers hspec http-media http-types
+         network-arbitrary network-uri network-uri-json QuickCheck
+         quickcheck-instances test-invariant text unordered-containers
        ];
        testToolDepends = [ hspec-discover ];
        description = "Siren Tools for Haskell";
@@ -191337,6 +192596,7 @@ self: {
        ];
        description = "Sized sequence data-types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sized-grid" = callPackage
@@ -191585,17 +192845,6 @@ self: {
      }) {};
 
   "skip-var" = callPackage
-    ({ mkDerivation, base }:
-     mkDerivation {
-       pname = "skip-var";
-       version = "0.1.0.0";
-       sha256 = "1xwbr25nsjkjvwjh62inr3ja7lp7carmc4nd68ybkyxmcfp1ivmc";
-       libraryHaskellDepends = [ base ];
-       description = "Skip variables";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "skip-var_0_1_1_0" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "skip-var";
@@ -191604,7 +192853,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Skip variables";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "skulk" = callPackage
@@ -191883,7 +193131,6 @@ self: {
        ];
        description = "A fundamental solution to ghost threads and silent exceptions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sleep" = callPackage
@@ -191935,6 +193182,7 @@ self: {
          pandoc shake text time
        ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "slidemews" = callPackage
@@ -192010,6 +193258,7 @@ self: {
        ];
        description = "Visualize mathematical function's slope fields";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "slot-lambda" = callPackage
@@ -192072,6 +193321,7 @@ self: {
        ];
        description = "Type-safe slugs for Yesod ecosystem";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "smallarray" = callPackage
@@ -192842,6 +194092,7 @@ self: {
        ];
        description = "Language handling for Snap";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snap-loader-dynamic" = callPackage
@@ -192860,7 +194111,6 @@ self: {
        ];
        description = "Snap dynamic loader";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snap-loader-static" = callPackage
@@ -192975,6 +194225,7 @@ self: {
        ];
        description = "Streaming Snap handlers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snap-templates" = callPackage
@@ -192994,6 +194245,7 @@ self: {
        ];
        description = "Scaffolding CLI for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snap-testing" = callPackage
@@ -194191,6 +195443,7 @@ self: {
        ];
        description = "TLS-enabled SOAP transport (using openssl bindings)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "soap-tls" = callPackage
@@ -194253,7 +195506,6 @@ self: {
        ];
        description = "An extensible socket library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "socket-activation" = callPackage
@@ -194276,7 +195528,6 @@ self: {
        libraryHaskellDepends = [ base socket ];
        description = "Definitions for ICMP with the `socket` library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "socket-io" = callPackage
@@ -194292,7 +195543,6 @@ self: {
          transformers unordered-containers vector
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "socket-sctp" = callPackage
@@ -195154,7 +196404,6 @@ self: {
        ];
        description = "3d math including quaternions/euler angles/dcms and utility functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "spatial-rotations" = callPackage
@@ -195208,7 +196457,6 @@ self: {
        ];
        description = "SPDX license expression language, Extras";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "spe" = callPackage
@@ -195309,6 +196557,7 @@ self: {
        ];
        description = "Computational combinatorial species";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "speculate" = callPackage
@@ -195333,6 +196582,7 @@ self: {
        libraryHaskellDepends = [ base ghc-prim stm transformers ];
        description = "A framework for safe, programmable, speculative parallelism";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "speculation-transformers" = callPackage
@@ -195345,6 +196595,7 @@ self: {
        doHaddock = false;
        description = "Merged into 'speculation'. Use that instead.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "speechmatics" = callPackage
@@ -195393,6 +196644,7 @@ self: {
        testHaskellDepends = [ base containers mwc-probability ];
        description = "Speedy slice sampling";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "spelling-suggest" = callPackage
@@ -195963,6 +197215,7 @@ self: {
        ];
        description = "Web interface to sproxy database";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sproxy2" = callPackage
@@ -196325,7 +197578,6 @@ self: {
        ];
        description = "A file-packing application";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sr-extra" = callPackage
@@ -196616,7 +197868,6 @@ self: {
        libraryHaskellDepends = [ base gdp ghc-prim primitive ];
        description = "shared heap regions between local mutable state threads";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stable-heap" = callPackage
@@ -196948,6 +198199,7 @@ self: {
        testHaskellDepends = [ base template-haskell ];
        description = "Stack prisms";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stack-run" = callPackage
@@ -197028,6 +198280,7 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "The basic stack type";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stack-yaml" = callPackage
@@ -197062,6 +198315,7 @@ self: {
        ];
        description = "Convert stack projects to cabal.project + cabal.project.freeze";
        license = stdenv.lib.licenses.gpl3Plus;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stack2nix" = callPackage
@@ -197290,7 +198544,6 @@ self: {
        ];
        description = "Stackage package query";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stackage-sandbox" = callPackage
@@ -197359,6 +198612,7 @@ self: {
        ];
        description = "Convert stack.yaml to cabal.project + cabal.project.freeze";
        license = stdenv.lib.licenses.gpl3Plus;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stackage-types" = callPackage
@@ -197807,6 +199061,7 @@ self: {
        libraryHaskellDepends = [ base double-conversion free mtl text ];
        description = "DSL to generate HTML5 Canvas javascript";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "static-closure" = callPackage
@@ -198108,6 +199363,7 @@ self: {
        ];
        description = "A wrapper over the StatusNotifierItem/libappindicator dbus specification";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "statvfs" = callPackage
@@ -198147,6 +199403,7 @@ self: {
        ];
        description = "What version is the package X in stackage lts-Y.ZZ?";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stb-image" = callPackage
@@ -198242,8 +199499,8 @@ self: {
      }:
      mkDerivation {
        pname = "steeloverseer";
-       version = "2.0.2.0";
-       sha256 = "1jj8akshhns3azi9vgfclg9xhbl40nyr1lmf12pisw3mzbd7ld28";
+       version = "2.1.0.0";
+       sha256 = "1l2pfk6fdnc2ssmcjmwj8w5wfk6ra4n880nbxr670kzrlnr2vqg1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -198262,7 +199519,6 @@ self: {
        ];
        description = "A file watcher and development tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stego-uuid" = callPackage
@@ -198387,7 +199643,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion ];
        description = "lightweight CSS DSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stm_2_5_0_0" = callPackage
@@ -198483,7 +199738,6 @@ self: {
        ];
        description = "Containers for STM";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stm-delay" = callPackage
@@ -198552,7 +199806,6 @@ self: {
        ];
        description = "STM-specialised Hash Array Mapped Trie";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stm-io-hooks" = callPackage
@@ -198566,6 +199819,7 @@ self: {
        libraryHaskellDepends = [ array base containers mtl stm ];
        description = "STM with IO hooks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stm-lifted" = callPackage
@@ -198579,6 +199833,7 @@ self: {
        libraryHaskellDepends = [ base stm transformers ];
        description = "Software Transactional Memory lifted to MonadIO";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stm-linkedlist" = callPackage
@@ -198660,6 +199915,7 @@ self: {
        ];
        description = "retry statistics for STM transactions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stm-supply" = callPackage
@@ -199034,6 +200290,7 @@ self: {
        executableHaskellDepends = [ base regex-compat ];
        description = "Simple Theorem Prover";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "str" = callPackage
@@ -199239,6 +200496,7 @@ self: {
        libraryHaskellDepends = [ base bytestring hidapi mtl ];
        description = "Control library for the Elgato Stream Deck";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "streamed" = callPackage
@@ -199670,6 +200928,7 @@ self: {
        ];
        description = "Sorting streams";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "streaming-utils" = callPackage
@@ -199753,6 +201012,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "streamly_0_6_0" = callPackage
+    ({ mkDerivation, atomic-primops, base, clock, containers, deepseq
+     , exceptions, gauge, ghc-prim, heaps, hspec, lockfree-queue
+     , monad-control, mtl, QuickCheck, random, transformers
+     , transformers-base
+     }:
+     mkDerivation {
+       pname = "streamly";
+       version = "0.6.0";
+       sha256 = "05gwyzp03lz2gv5civg5dkqx1vab261iasrvfvr7sqi4xyj0kzns";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         atomic-primops base clock containers deepseq exceptions ghc-prim
+         heaps lockfree-queue monad-control mtl transformers
+         transformers-base
+       ];
+       testHaskellDepends = [
+         base containers exceptions hspec mtl QuickCheck random transformers
+       ];
+       benchmarkHaskellDepends = [ base deepseq gauge random ];
+       description = "Beautiful Streaming, Concurrent and Reactive Composition";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "streamproc" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -199971,7 +201256,6 @@ self: {
        ];
        description = "A type level predicate ranging over strict types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "strict-writer" = callPackage
@@ -200154,6 +201438,7 @@ self: {
        ];
        description = "A library for generating random string from a regular experession";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "string-similarity" = callPackage
@@ -200354,7 +201639,6 @@ self: {
        ];
        description = "Stripe API for Haskell - Pure Core";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stripe-haskell" = callPackage
@@ -200407,7 +201691,6 @@ self: {
        doCheck = false;
        description = "Stripe API for Haskell - http-streams backend";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stripe-scotty" = callPackage
@@ -200426,6 +201709,7 @@ self: {
        ];
        description = "Listen for Stripe webhook events with Scotty";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stripe-signature" = callPackage
@@ -200459,7 +201743,6 @@ self: {
        ];
        description = "Tests for Stripe API bindings for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stripe-wreq" = callPackage
@@ -200784,6 +202067,7 @@ self: {
        doHaddock = false;
        description = "Format Cabal files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stylish-haskell" = callPackage
@@ -200794,8 +202078,8 @@ self: {
      }:
      mkDerivation {
        pname = "stylish-haskell";
-       version = "0.9.2.0";
-       sha256 = "16r2nm1y0s5ybrq2pzsq00nfq7k0i70nyg7ynmhx76lld82i17yv";
+       version = "0.9.2.1";
+       sha256 = "1ls11fdx6snvfx8yykpidz142zzxwi5bazl49hgfqlwx50rqcp7w";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -201017,6 +202301,7 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Subword graph implementation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "subzero" = callPackage
@@ -201319,6 +202604,7 @@ self: {
        testHaskellDepends = [ base containers hspec ];
        description = "Find \"superbubbles\", as described in https://arxiv.org/abs/1307.7925";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "superbuffer" = callPackage
@@ -201409,7 +202695,6 @@ self: {
        ];
        description = "Additional documentation markup and Unicode support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "superevent" = callPackage
@@ -201521,7 +202806,6 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Monitor groups of threads with non-hierarchical lifetimes";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "supplemented" = callPackage
@@ -201614,7 +202898,6 @@ self: {
        ];
        description = "Integration to use sv with cassava's parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sv-core" = callPackage
@@ -201642,7 +202925,6 @@ self: {
        ];
        description = "Encode and decode separated values (CSV, PSV, ...)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sv-svfactor" = callPackage
@@ -201682,6 +202964,7 @@ self: {
        ];
        description = "Syntax-preserving CSV manipulation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "svg-builder" = callPackage
@@ -201732,7 +203015,6 @@ self: {
        ];
        description = "SVG file loader and serializer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "svg2q" = callPackage
@@ -201768,6 +203050,7 @@ self: {
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "Binding to the libsvg-cairo library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.gnome3) librsvg;};
 
   "svgutils" = callPackage
@@ -201951,6 +203234,7 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Swagger 2.0 data model";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "swapper" = callPackage
@@ -202062,7 +203346,6 @@ self: {
        ];
        description = "A simple web server for serving directories";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sxml" = callPackage
@@ -202217,6 +203500,7 @@ self: {
        ];
        description = "Library for Typed Tagless-Final Higher-Order Composable DSL";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "symantic-cli" = callPackage
@@ -202232,6 +203516,7 @@ self: {
        ];
        description = "Library for Command Line Interface (CLI)";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "symantic-document" = callPackage
@@ -202264,6 +203549,7 @@ self: {
        ];
        description = "Library for symantic grammars";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "symantic-lib" = callPackage
@@ -203400,6 +204686,7 @@ self: {
        ];
        description = "Layout text as grid or table";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "table-tennis" = callPackage
@@ -203847,7 +205134,6 @@ self: {
        ];
        description = "Positional tags and tagsets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tagshare" = callPackage
@@ -204018,7 +205304,6 @@ self: {
        ];
        description = "Tail files in Unix, using hinotify";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tak" = callPackage
@@ -204640,6 +205925,7 @@ self: {
        ];
        description = "Coverage tracking for Hedgehog Property-Based Testing via Tasty";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tasty-hspec" = callPackage
@@ -204867,8 +206153,8 @@ self: {
      }:
      mkDerivation {
        pname = "tasty-rerun";
-       version = "1.1.13";
-       sha256 = "1lf7i3ifszvghy0v1ahgif08bb1pgf7hhf147yr43d0r0hb2vrgp";
+       version = "1.1.14";
+       sha256 = "0s0zj8ds4g1w2cjzm2lh25ivg962jigqdrbj08v3dbz64lx4mlzr";
        libraryHaskellDepends = [
          base containers mtl optparse-applicative reducers split stm tagged
          tasty transformers
@@ -204924,6 +206210,7 @@ self: {
        ];
        description = "Collect statistics of your Tasty testsuite";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tasty-tap" = callPackage
@@ -205241,6 +206528,7 @@ self: {
        ];
        description = "On-line accumulation of rank-based statistics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tdigest-Chart" = callPackage
@@ -205309,6 +206597,7 @@ self: {
        ];
        description = "Build safe and composable teardown sub-routines for resources";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "teeth" = callPackage
@@ -205604,7 +206893,6 @@ self: {
        ];
        description = "Template Toolkit implementation for Haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "template-yj" = callPackage
@@ -205901,6 +207189,7 @@ self: {
        ];
        description = "TensorFlow bindings";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libtensorflow;};
 
   "tensorflow-core-ops" = callPackage
@@ -205921,6 +207210,7 @@ self: {
        ];
        description = "Haskell wrappers for Core Tensorflow Ops";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tensorflow-logging" = callPackage
@@ -205949,6 +207239,7 @@ self: {
        ];
        description = "TensorBoard related functionality";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tensorflow-mnist" = callPackage
@@ -206001,6 +207292,7 @@ self: {
        ];
        description = "Code generation for TensorFlow operations";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tensorflow-ops" = callPackage
@@ -206030,6 +207322,7 @@ self: {
        ];
        description = "Friendly layer around TensorFlow bindings";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tensorflow-proto" = callPackage
@@ -206047,6 +207340,7 @@ self: {
        libraryToolDepends = [ protobuf ];
        description = "TensorFlow protocol buffers";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) protobuf;};
 
   "tensorflow-records" = callPackage
@@ -206093,13 +207387,17 @@ self: {
      }) {};
 
   "tensors" = callPackage
-    ({ mkDerivation, base, hspec, QuickCheck, singletons, vector }:
+    ({ mkDerivation, base, hspec, QuickCheck, reflection, singletons
+     , vector
+     }:
      mkDerivation {
        pname = "tensors";
-       version = "0.1.0";
-       sha256 = "1kwj1ii70cazw64yhhhkcby4kqjm21zzncdr4av0majr07kcbaz5";
-       libraryHaskellDepends = [ base singletons vector ];
-       testHaskellDepends = [ base hspec QuickCheck singletons vector ];
+       version = "0.1.1";
+       sha256 = "1pqn4vmkdi4r3s2p0rycv8yyarphifl067wdw7bj41dsv65qk8j3";
+       libraryHaskellDepends = [ base reflection singletons vector ];
+       testHaskellDepends = [
+         base hspec QuickCheck reflection singletons vector
+       ];
        description = "Tensor in Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -206119,7 +207417,6 @@ self: {
        testHaskellDepends = [ base containers HUnit QuickCheck ];
        description = "Term Rewriting Library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "termbox" = callPackage
@@ -206148,6 +207445,7 @@ self: {
        libraryHaskellDepends = [ base reactive-banana stm termbox ];
        description = "reactive-banana + termbox";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "termbox-bindings" = callPackage
@@ -206300,6 +207598,7 @@ self: {
        ];
        description = "Terminal emulator configurable in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {gtk3 = pkgs.gnome3.gtk; vte_291 = pkgs.gnome3.vte;};
 
   "termplot" = callPackage
@@ -207113,7 +208412,6 @@ self: {
        libraryHaskellDepends = [ base text text-builder ];
        description = "Text styling for ANSI terminals";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-binary" = callPackage
@@ -207148,7 +208446,6 @@ self: {
        benchmarkHaskellDepends = [ criterion rerebase ];
        description = "An efficient strict text builder";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-containers" = callPackage
@@ -207238,7 +208535,6 @@ self: {
        ];
        description = "Full-weight string formatting library, analog of Python's string.format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-format-simple" = callPackage
@@ -207337,7 +208633,6 @@ self: {
        ];
        description = "ICU transliteration";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) icu;};
 
   "text-json-qq" = callPackage
@@ -207648,7 +208943,6 @@ self: {
        testHaskellDepends = [ base hedgehog neat-interpolation text ];
        description = "Simple text replacements from a list of search/replace pairs";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-short" = callPackage
@@ -207738,7 +209032,6 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Additional instances for text-show";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-stream-decode" = callPackage
@@ -207813,6 +209106,7 @@ self: {
        ];
        description = "An efficient packed UTF-8 backed Unicode text type";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-utils" = callPackage
@@ -208376,6 +209670,7 @@ self: {
        testToolDepends = [ markdown-unlit ];
        description = "Template Haskell splice that expands to current time";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "th-orphans" = callPackage
@@ -208585,7 +209880,6 @@ self: {
        ];
        description = "Minimalistic actor library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "themoviedb" = callPackage
@@ -208710,6 +210004,7 @@ self: {
        ];
        description = "An either-or-both data type & a generalized 'zip with padding' typeclass";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "these-skinny" = callPackage
@@ -208721,6 +210016,7 @@ self: {
        libraryHaskellDepends = [ base deepseq ];
        description = "A fork of the 'these' package without the dependency bloat";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "thespian" = callPackage
@@ -208799,18 +210095,6 @@ self: {
      }) {};
 
   "thread-hierarchy" = callPackage
-    ({ mkDerivation, base, containers, hspec, stm }:
-     mkDerivation {
-       pname = "thread-hierarchy";
-       version = "0.3.0.0";
-       sha256 = "064s46pg3l015lp4zvz9kj0yki48hvwqccfjxqs52jz5pd9rd1z8";
-       libraryHaskellDepends = [ base containers stm ];
-       testHaskellDepends = [ base containers hspec stm ];
-       description = "Simple Haskel thread management in hierarchical manner";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "thread-hierarchy_0_3_0_1" = callPackage
     ({ mkDerivation, base, containers, hspec, stm }:
      mkDerivation {
        pname = "thread-hierarchy";
@@ -208820,7 +210104,6 @@ self: {
        testHaskellDepends = [ base containers hspec stm ];
        description = "Simple Haskel thread management in hierarchical manner";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "thread-local-storage" = callPackage
@@ -208858,6 +210141,7 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "(deprecated in favor of 'threads') Simple thread management";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "threads" = callPackage
@@ -208881,8 +210165,8 @@ self: {
     ({ mkDerivation, base, stm, threads }:
      mkDerivation {
        pname = "threads-extras";
-       version = "0.1.0.2";
-       sha256 = "0x95vsgsizkbidpkprbijqbgclryhbk31m8k0icbjrx7p2capvsd";
+       version = "0.1.0.3";
+       sha256 = "1dfbh04nb4zm96yzx7520lixks5v2y4w5ykcdcqm7w5s196pq858";
        libraryHaskellDepends = [ base stm threads ];
        testHaskellDepends = [ base ];
        description = "Extends the threads package with a bounded thread group";
@@ -208921,6 +210205,7 @@ self: {
        ];
        description = "Simple, IO-based library for Erlang-style thread supervision";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "threadscope" = callPackage
@@ -208942,6 +210227,7 @@ self: {
        ];
        description = "A graphical tool for profiling parallel Haskell programs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "threefish" = callPackage
@@ -208976,7 +210262,6 @@ self: {
        ];
        description = "Composable algebraic editors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "threepenny-gui" = callPackage
@@ -209065,7 +210350,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Type-threaded list";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "throttle" = callPackage
@@ -209131,6 +210415,7 @@ self: {
        libraryHaskellDepends = [ base bytestring case-insensitive text ];
        description = "Convert textual types through Text without needing O(n^2) instances";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "throwable-exceptions" = callPackage
@@ -209149,7 +210434,6 @@ self: {
        testToolDepends = [ tasty-discover ];
        description = "throwable-exceptions gives the easy way to throw exceptions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "thumbnail" = callPackage
@@ -209396,6 +210680,7 @@ self: {
        libraryHaskellDepends = [ base cairo colour tidal ];
        description = "Visual rendering for Tidal patterns";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tie-knot" = callPackage
@@ -210104,6 +211389,7 @@ self: {
        ];
        description = "A tool for visualizing time series from log files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "timeprint" = callPackage
@@ -210151,7 +211437,6 @@ self: {
        ];
        description = "Parse and display time according to some RFCs (RFC3339, RFC2822, RFC822)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "timers" = callPackage
@@ -210179,6 +211464,7 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "tick based timers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "timers-updatable" = callPackage
@@ -210365,6 +211651,7 @@ self: {
        testHaskellDepends = [ base require ];
        description = "A softer alternative to Haddock";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tiny-scheduler" = callPackage
@@ -210417,6 +211704,7 @@ self: {
        ];
        description = "A fast DOM parser for a subset of XML";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tinyfiledialogs" = callPackage
@@ -211108,7 +212396,6 @@ self: {
        libraryToolDepends = [ alex happy ];
        description = "Parser for the TOML configuration language";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tomland" = callPackage
@@ -211139,6 +212426,7 @@ self: {
        ];
        description = "Bidirectional TOML parser";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tomlcheck" = callPackage
@@ -211156,7 +212444,6 @@ self: {
        ];
        description = "Command-line tool to check syntax of TOML files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "toodles" = callPackage
@@ -211188,6 +212475,7 @@ self: {
        ];
        description = "Manage the TODO entries in your code";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "toolshed" = callPackage
@@ -211562,6 +212850,7 @@ self: {
        testHaskellDepends = [ base pretty text ];
        description = "Data Type for Rewriting Systems";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "trace" = callPackage
@@ -211644,6 +212933,7 @@ self: {
        ];
        description = "Visualize Haskell data structures as edge-labeled trees";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tracker" = callPackage
@@ -212207,6 +213497,7 @@ self: {
        ];
        description = "Type Safe Web Routing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "trasa-client" = callPackage
@@ -212616,6 +213907,7 @@ self: {
        ];
        description = "Simple Map-based Trie";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tries" = callPackage
@@ -213084,7 +214376,6 @@ self: {
        ];
        description = "Things Tracker Network JSON Types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ttn-client" = callPackage
@@ -213823,6 +215114,7 @@ self: {
        doCheck = false;
        description = "Twilio REST API library for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "twill" = callPackage
@@ -213911,7 +215203,6 @@ self: {
        ];
        description = "A high level file watcher DSL";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "twitter" = callPackage
@@ -213963,6 +215254,7 @@ self: {
        testToolDepends = [ hspec-discover ];
        description = "Twitter API package with conduit interface and Streaming API support";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "twitter-enumerator" = callPackage
@@ -214027,6 +215319,7 @@ self: {
        ];
        description = "Twitter JSON parser and types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "twitter-types-lens" = callPackage
@@ -214044,6 +215337,7 @@ self: {
        ];
        description = "Twitter JSON types (lens powered)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tx" = callPackage
@@ -214400,6 +215694,7 @@ self: {
        testHaskellDepends = [ base template-haskell ];
        description = "Interpreter for Template Haskell types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "type-iso" = callPackage
@@ -214522,7 +215817,6 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Type-level sets and finite maps (with value-level counterparts)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "type-level-tf" = callPackage
@@ -214554,15 +215848,14 @@ self: {
      }:
      mkDerivation {
        pname = "type-map";
-       version = "0.1.5.0";
-       sha256 = "12kamygfjaja0bk9fbc658hrr5zh4iadq3m1hwxfkk0gkr98pw0b";
+       version = "0.1.6.0";
+       sha256 = "0zakl5bdzwng1r0x384w066zhwgwcf24s6jsm6d4zsx7xmngzmr5";
        libraryHaskellDepends = [ base containers ghc-prim vector ];
        testHaskellDepends = [
          base HUnit test-framework test-framework-hunit
        ];
        description = "Type-indexed maps";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "type-natural" = callPackage
@@ -214580,6 +215873,7 @@ self: {
        ];
        description = "Type-level natural and proofs of their properties";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "type-of-html" = callPackage
@@ -214935,6 +216229,7 @@ self: {
        ];
        description = "Typed frontend to TensorFlow and higher-order deep learning";
        license = stdenv.lib.licenses.lgpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "typedquery" = callPackage
@@ -215080,7 +216375,6 @@ self: {
        doHaddock = false;
        description = "Efficient implementation of a dependent map with types as keys";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "types-compat" = callPackage
@@ -215199,6 +216493,7 @@ self: {
        ];
        description = "Drawings for printed text documents";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tyro" = callPackage
@@ -215745,6 +217040,7 @@ self: {
        libraryHaskellDepends = [ base io-streams unagi-chan ];
        description = "Unagi Chan IO-Streams";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unamb" = callPackage
@@ -215876,6 +217172,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "unboxed" = callPackage
+    ({ mkDerivation, base, ghc-prim }:
+     mkDerivation {
+       pname = "unboxed";
+       version = "0.1.0.0";
+       sha256 = "1xk9x1viprvswjp62xrg2mvm34b0qamflb1phpyfh9bspy8f1qqd";
+       libraryHaskellDepends = [ base ghc-prim ];
+       description = "All the standard sum types but strict and unboxed as possible";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "unboxed-containers" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
@@ -215993,7 +217300,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Unfixing and recursion schemes for data types with binders";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unfoldable" = callPackage
@@ -216049,7 +217355,6 @@ self: {
        libraryHaskellDepends = [ base containers uni-util ];
        description = "Event handling for the uniform workbench";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uni-graphs" = callPackage
@@ -216082,7 +217387,6 @@ self: {
        ];
        description = "Graphical User Interface for Haskell Programs";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uni-posixutil" = callPackage
@@ -216098,7 +217402,6 @@ self: {
        ];
        description = "Posix utilities for the uniform workbench";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uni-reactor" = callPackage
@@ -216113,7 +217416,6 @@ self: {
        ];
        description = "Reactors for the uniform workbench";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uni-uDrawGraph" = callPackage
@@ -216147,7 +217449,6 @@ self: {
        ];
        description = "Utilities for the uniform workbench";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unicode" = callPackage
@@ -216284,7 +217585,6 @@ self: {
        testHaskellDepends = [ base text ];
        description = "Make writing in unicode easy";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unidecode" = callPackage
@@ -216612,7 +217912,6 @@ self: {
        ];
        description = "A parser for units of measure";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unittyped" = callPackage
@@ -216732,6 +218031,7 @@ self: {
        ];
        description = "Classes for types where we know all the values";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "universe-base" = callPackage
@@ -216773,6 +218073,7 @@ self: {
        ];
        description = "Universe instances for types from select extra packages";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "universe-instances-trans" = callPackage
@@ -216854,6 +218155,7 @@ self: {
        ];
        description = "Custom prelude used in Serokell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unix_2_7_2_2" = callPackage
@@ -216980,23 +218282,6 @@ self: {
      }) {};
 
   "unix-time" = callPackage
-    ({ mkDerivation, base, binary, bytestring, Cabal, cabal-doctest
-     , doctest, hspec, old-locale, old-time, QuickCheck, time
-     }:
-     mkDerivation {
-       pname = "unix-time";
-       version = "0.4.3";
-       sha256 = "0h95vmsk7qyk9nbgjm5vi32ikdw07p1z0l7k6b5hbsv3wavivm53";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [ base binary bytestring old-time ];
-       testHaskellDepends = [
-         base bytestring doctest hspec old-locale old-time QuickCheck time
-       ];
-       description = "Unix time parser/formatter and utilities";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "unix-time_0_4_4" = callPackage
     ({ mkDerivation, base, binary, bytestring, Cabal, cabal-doctest
      , doctest, hspec, old-locale, old-time, QuickCheck, time
      }:
@@ -217011,7 +218296,6 @@ self: {
        ];
        description = "Unix time parser/formatter and utilities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unjson" = callPackage
@@ -217063,21 +218347,21 @@ self: {
      }) {};
 
   "unliftio" = callPackage
-    ({ mkDerivation, async, base, deepseq, directory, filepath, gauge
-     , hspec, process, QuickCheck, stm, time, transformers, unix
-     , unliftio-core
+    ({ mkDerivation, async, base, containers, deepseq, directory
+     , filepath, gauge, hspec, process, QuickCheck, stm, time
+     , transformers, unix, unliftio-core
      }:
      mkDerivation {
        pname = "unliftio";
-       version = "0.2.9.0";
-       sha256 = "1f1rrmajnz5j2ljryi9gqx64hjr30yy7pz9rjx02pdfi6alrcrgz";
+       version = "0.2.10";
+       sha256 = "0p0vrw8yxfc5d31zybx08mp302fafs0a6lwq3n40qd1wiy2nw78l";
        libraryHaskellDepends = [
          async base deepseq directory filepath process stm time transformers
          unix unliftio-core
        ];
        testHaskellDepends = [
-         async base deepseq directory filepath hspec process QuickCheck stm
-         time transformers unix unliftio-core
+         async base containers deepseq directory filepath hspec process
+         QuickCheck stm time transformers unix unliftio-core
        ];
        benchmarkHaskellDepends = [
          async base deepseq directory filepath gauge process stm time
@@ -217244,6 +218528,7 @@ self: {
        ];
        description = "A specialization of `HashMap Int v`";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unpack-funcs" = callPackage
@@ -217289,6 +218574,7 @@ self: {
        testHaskellDepends = [ base QuickCheck quickcheck-classes ];
        description = "An unpacked either data type";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unpacked-maybe" = callPackage
@@ -217301,6 +218587,7 @@ self: {
        testHaskellDepends = [ base QuickCheck quickcheck-classes ];
        description = "An unpacked maybe data type";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unpacked-maybe-numeric" = callPackage
@@ -217313,6 +218600,7 @@ self: {
        testHaskellDepends = [ base QuickCheck quickcheck-classes ];
        description = "maybes of numeric values with fewer indirections";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unpacked-these" = callPackage
@@ -217749,6 +219037,7 @@ self: {
        ];
        description = "Haskell URI parsing as ByteStrings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uri-bytestring-aeson" = callPackage
@@ -217762,6 +219051,7 @@ self: {
        ];
        description = "Aeson instances for URI Bytestring";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uri-conduit" = callPackage
@@ -217988,12 +219278,13 @@ self: {
        pname = "urlencoded";
        version = "0.4.2.0";
        sha256 = "1i88qf5dq52ra7hl29ka1i0bhyfic3sg7ksm1n6bpb2hj38hr139";
-       revision = "1";
-       editedCabalFile = "1bglhr4dsfw0yzm5kb6jwrx2dpz7zjyvg5341idncvmlc0f6wx7w";
+       revision = "2";
+       editedCabalFile = "1ylbxfd7p8kdlmsfbqsnisgdxk9livncin1bckp8m5a1mrw5ywk3";
        libraryHaskellDepends = [ base mtl network network-uri split ];
        testHaskellDepends = [ base network network-uri QuickCheck ];
        description = "Generate or process x-www-urlencoded data";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "urlpath" = callPackage
@@ -218127,6 +219418,7 @@ self: {
        ];
        description = "A database of USB identifiers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "usb-iteratee" = callPackage
@@ -218169,8 +219461,8 @@ self: {
      }:
      mkDerivation {
        pname = "userid";
-       version = "0.1.3.2";
-       sha256 = "0ym8r3jg7waypc74liv1v32sc1rv419axgbz97xznssb9wshcv3a";
+       version = "0.1.3.3";
+       sha256 = "1p1dfbr68bkn09zpy50i1xazvfblds46bs60vra2sqn4hv8vj0s9";
        libraryHaskellDepends = [
          aeson base boomerang cereal safecopy web-routes web-routes-th
        ];
@@ -218800,6 +220092,7 @@ self: {
        libraryHaskellDepends = [ base json MissingH mtl ];
        description = "Cross-language extensible representation for algebraic data type instances";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uzbl-with-source" = callPackage
@@ -218851,9 +220144,9 @@ self: {
      }:
      mkDerivation {
        pname = "vabal";
-       version = "1.0.0";
-       sha256 = "01sfg1rwh1qrawqpzn2b9fg415ha029lgfsrxy4xqkpdpxpkajrk";
-       isLibrary = false;
+       version = "1.2.0";
+       sha256 = "1l63yxiwp7l5s5m9dc9y6vjdv88rflvwxj063dcw6vn08n929mxf";
+       isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base bytestring Cabal cassava directory filepath http-client
@@ -218866,9 +220159,9 @@ self: {
        testHaskellDepends = [
          base bytestring Cabal deepseq directory filepath process tar unix
        ];
-       doHaddock = false;
        description = "the cabal companion";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vacuum" = callPackage
@@ -218965,6 +220258,7 @@ self: {
        ];
        description = "Runs commands on remote machines using ssh";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "valid-names" = callPackage
@@ -219057,7 +220351,6 @@ self: {
        testHaskellDepends = [ base hedgehog HUnit lens semigroups ];
        description = "A data-type like Either but with an accumulating Applicative";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "validations" = callPackage
@@ -219163,6 +220456,7 @@ self: {
        ];
        description = "Validity instances for Path";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "validity-primitive" = callPackage
@@ -219380,6 +220674,7 @@ self: {
        ];
        description = "nominal value with possible variations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "varying" = callPackage
@@ -219398,7 +220693,6 @@ self: {
        benchmarkHaskellDepends = [ base criterion time transformers ];
        description = "FRP through value streams and monadic splines";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vault" = callPackage
@@ -219671,6 +220965,7 @@ self: {
        benchmarkHaskellDepends = [ base criterion fin vector ];
        description = "Vec: length-indexed (sized) list";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vect" = callPackage
@@ -220073,7 +221368,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "vector-space operations for finite maps using Data.Map";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vector-space-opengl" = callPackage
@@ -220105,6 +221399,7 @@ self: {
        libraryHaskellDepends = [ base vector-space ];
        description = "A type for points, as distinct from vectors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vector-split" = callPackage
@@ -220202,6 +221497,7 @@ self: {
        ];
        description = "GIS Vector Tiles, as defined by Mapbox";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "verbalexpressions" = callPackage
@@ -220279,6 +221575,7 @@ self: {
        ];
        description = "An intermediate language for Hoare logic style verification";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "verify" = callPackage
@@ -220327,6 +221624,7 @@ self: {
        testHaskellDepends = [ aeson base bytestring hspec ];
        description = "Type-safe data versioning";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "versioning-servant" = callPackage
@@ -220347,6 +221645,7 @@ self: {
        ];
        description = "Servant combinators for the versioning library";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "versions" = callPackage
@@ -220491,6 +221790,7 @@ self: {
        ];
        description = "Text-based interactive GHC .prof viewer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "views" = callPackage
@@ -220644,6 +221944,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "vinyl_0_11_0" = callPackage
+    ({ mkDerivation, aeson, array, base, criterion, doctest, ghc-prim
+     , hspec, lens, lens-aeson, linear, microlens, mtl, mwc-random
+     , primitive, should-not-typecheck, singletons, tagged, text
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "vinyl";
+       version = "0.11.0";
+       sha256 = "0sqa4x8cwg6hdx3lrnq9pbggsh5vv6rhng2az4grl60c4kw6zr08";
+       libraryHaskellDepends = [ array base ghc-prim ];
+       testHaskellDepends = [
+         aeson base doctest hspec lens lens-aeson microlens mtl
+         should-not-typecheck singletons text unordered-containers vector
+       ];
+       benchmarkHaskellDepends = [
+         base criterion linear microlens mwc-random primitive tagged vector
+       ];
+       description = "Extensible Records";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "vinyl-gl" = callPackage
     ({ mkDerivation, base, containers, GLUtil, HUnit, linear, OpenGL
      , tagged, test-framework, test-framework-hunit, transformers
@@ -220663,7 +221986,6 @@ self: {
        ];
        description = "Utilities for working with OpenGL's GLSL shading language and vinyl records";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vinyl-json" = callPackage
@@ -220778,6 +222100,7 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Simple computation of visibility polygons";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vision" = callPackage
@@ -220886,6 +222209,7 @@ self: {
        ];
        description = "Sound synthesis with SuperCollider";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vivid-osc" = callPackage
@@ -220917,6 +222241,7 @@ self: {
        ];
        description = "Implementation of SuperCollider server specifications";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vk-aws-route53" = callPackage
@@ -221242,6 +222567,7 @@ self: {
        librarySystemDepends = [ vulkan ];
        description = "Bindings to the Vulkan graphics API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {vulkan = null;};
 
   "vulkan-api" = callPackage
@@ -221253,6 +222579,7 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Low-level low-overhead vulkan api bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "waargonaut" = callPackage
@@ -221268,8 +222595,8 @@ self: {
      }:
      mkDerivation {
        pname = "waargonaut";
-       version = "0.5.0.0";
-       sha256 = "0xa9ql4583z9cwkn76sf41igk0ny8yp8fcgs6lwbk7kfbb54kk4b";
+       version = "0.5.1.0";
+       sha256 = "1gknfbnpngn23picpyva3mk9hb80hc0ymjx3xl27sxy72zys2cd4";
        setupHaskellDepends = [ base Cabal cabal-doctest ];
        libraryHaskellDepends = [
          base bifunctors bytestring containers contravariant digit
@@ -221626,7 +222953,6 @@ self: {
        ];
        description = "Run CGI apps on WAI";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-git-http" = callPackage
@@ -221844,23 +223170,6 @@ self: {
      }) {};
 
   "wai-logger" = callPackage
-    ({ mkDerivation, base, byteorder, bytestring, Cabal, cabal-doctest
-     , doctest, fast-logger, http-types, network, wai
-     }:
-     mkDerivation {
-       pname = "wai-logger";
-       version = "2.3.3";
-       sha256 = "1i200kn3cnd1b3hf53982y6rddwrf3z1acbclf1xc15632df73wx";
-       setupHaskellDepends = [ base Cabal cabal-doctest ];
-       libraryHaskellDepends = [
-         base byteorder bytestring fast-logger http-types network wai
-       ];
-       testHaskellDepends = [ base doctest ];
-       description = "A logging system for WAI";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "wai-logger_2_3_4" = callPackage
     ({ mkDerivation, base, byteorder, bytestring, Cabal, cabal-doctest
      , doctest, fast-logger, http-types, network, wai
      }:
@@ -221875,7 +223184,6 @@ self: {
        testHaskellDepends = [ base doctest ];
        description = "A logging system for WAI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-logger-buffered" = callPackage
@@ -222351,6 +223659,7 @@ self: {
        ];
        description = "A WAI middleware to collect EKG request metrics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-middleware-preprocessor" = callPackage
@@ -222387,7 +223696,6 @@ self: {
        testHaskellDepends = [ base doctest prometheus-client ];
        description = "WAI middlware for exposing http://prometheus.io metrics.";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-middleware-rollbar" = callPackage
@@ -222676,6 +223984,7 @@ self: {
        ];
        description = "Typesafe URLs for Wai applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-routing" = callPackage
@@ -222706,13 +224015,14 @@ self: {
      }) {};
 
   "wai-secure-cookies" = callPackage
-    ({ mkDerivation, base, bytestring, cryptonite, http-types, memory
-     , protolude, random, split, wai
+    ({ mkDerivation, base, bytestring, cryptonite, hspec
+     , hspec-expectations, hspec-wai, http-types, memory, protolude
+     , random, split, wai, wai-extra
      }:
      mkDerivation {
        pname = "wai-secure-cookies";
-       version = "0.1.0.2";
-       sha256 = "0lp8g8v122kqp2ps1w13hhcxm0p0xjkqjsdk9hm7xyc4k78x5lvb";
+       version = "0.1.0.3";
+       sha256 = "01jqwl9z7p3vkh7jvlxzvqcq2bgkcfx559pnc87qgp7ldh018z7f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -222720,6 +224030,10 @@ self: {
          wai
        ];
        executableHaskellDepends = [ base bytestring cryptonite memory ];
+       testHaskellDepends = [
+         base bytestring hspec hspec-expectations hspec-wai http-types wai
+         wai-extra
+       ];
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -223005,6 +224319,7 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "A wrapping library for waitfree computation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "waitra" = callPackage
@@ -223084,6 +224399,7 @@ self: {
        testHaskellDepends = [ base ];
        description = "A library and executable for creating wallpaper, frieze, and rosette patterns";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "warc" = callPackage
@@ -223633,8 +224949,8 @@ self: {
     ({ mkDerivation, base, containers, mtl, stm, text }:
      mkDerivation {
        pname = "web-plugins";
-       version = "0.2.9";
-       sha256 = "0l3s98l69yg8gvx4bxqa95f4mvsvvij0q1rajvzwfh3bcrzzsfz6";
+       version = "0.2.9.1";
+       sha256 = "13wbfl8v5milx2s4lyiw4b44gk5syqbaaqwdxz5sclpxs2ilxvq2";
        libraryHaskellDepends = [ base containers mtl stm text ];
        description = "dynamic plugin system for web applications";
        license = stdenv.lib.licenses.bsd3;
@@ -223763,8 +225079,8 @@ self: {
      }:
      mkDerivation {
        pname = "web-routes-th";
-       version = "0.22.6.3";
-       sha256 = "1zamjbvjxryc43wac95cdavbq4czjlfx5kgxykadx8sw63vfnk4x";
+       version = "0.22.6.4";
+       sha256 = "0r0z39hdxm3ggqq9n71wy0k44gb27zpka4pnmp07855czc4l61ca";
        libraryHaskellDepends = [
          base parsec split template-haskell text web-routes
        ];
@@ -224060,28 +225376,30 @@ self: {
      , http-types, JuicyPixels, lens, lens-aeson, network-uri, parsec
      , QuickCheck, random, scientific, script-monad, SHA, stm, tasty
      , tasty-expected-failure, tasty-hunit, tasty-quickcheck, text, time
-     , unordered-containers, uri-encode, vector, wreq
+     , transformers, unordered-containers, uri-encode, vector, wreq
      }:
      mkDerivation {
        pname = "webdriver-w3c";
-       version = "0.0.1";
-       sha256 = "0ynidfwhyarbfhiq8m284l6489ribmakx8p8gx6cz7kvh44qa1cv";
+       version = "0.0.2";
+       sha256 = "04ca4j880dpivlascckp386r0jj8cwsw9mfq4jala0b59pkz8z6y";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson aeson-pretty base base64-bytestring bytestring containers
          directory exceptions http-client http-types JuicyPixels lens
          lens-aeson network-uri QuickCheck random scientific script-monad
-         SHA stm tasty tasty-expected-failure text time unordered-containers
-         uri-encode vector wreq
+         SHA stm tasty tasty-expected-failure text time transformers
+         unordered-containers uri-encode vector wreq
+       ];
+       executableHaskellDepends = [
+         base tasty tasty-expected-failure transformers
        ];
-       executableHaskellDepends = [ base tasty tasty-expected-failure ];
        testHaskellDepends = [
          aeson base base64-bytestring bytestring containers directory
          exceptions http-client http-types JuicyPixels lens lens-aeson
          parsec QuickCheck random scientific script-monad tasty
          tasty-expected-failure tasty-hunit tasty-quickcheck text time
-         unordered-containers vector wreq
+         transformers unordered-containers vector wreq
        ];
        description = "Bindings to the WebDriver API";
        license = stdenv.lib.licenses.gpl3;
@@ -224272,6 +225590,7 @@ self: {
        libraryPkgconfigDepends = [ webkitgtk ];
        description = "JavaScriptCore FFI from webkitgtk";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.gnome3) webkitgtk;};
 
   "webkitgtk3" = callPackage
@@ -224451,7 +225770,6 @@ self: {
        ];
        description = "Composable websockets clients";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "websockets-snap" = callPackage
@@ -224557,6 +225875,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "weigh_0_0_13" = callPackage
+    ({ mkDerivation, base, deepseq, mtl, process, split, temporary }:
+     mkDerivation {
+       pname = "weigh";
+       version = "0.0.13";
+       sha256 = "1ylfx0y9m8h3c2lwdil5l9mvngad419zd8qk7kw85s4hvnss9fp4";
+       libraryHaskellDepends = [
+         base deepseq mtl process split temporary
+       ];
+       testHaskellDepends = [ base deepseq ];
+       description = "Measure allocations of a Haskell functions/values";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "weighted" = callPackage
     ({ mkDerivation, base, mtl, semiring-num, transformers }:
      mkDerivation {
@@ -224914,6 +226247,7 @@ self: {
        ];
        description = "Graphical indicator for WildBind";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wild-bind-task-x11" = callPackage
@@ -224930,6 +226264,7 @@ self: {
        testHaskellDepends = [ base ];
        description = "Task to install and export everything you need to use WildBind in X11";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wild-bind-x11" = callPackage
@@ -225055,7 +226390,6 @@ self: {
        ];
        description = "Sustainable serialisation library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "winio" = callPackage
@@ -225098,7 +226432,6 @@ self: {
        ];
        description = "Fast binary io-streams adapter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wires" = callPackage
@@ -225116,6 +226449,7 @@ self: {
        ];
        description = "Functional reactive programming library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wiring" = callPackage
@@ -225196,6 +226530,7 @@ self: {
        testHaskellDepends = [ base conduit hspec HUnit mtl ];
        description = "Run computations that depend on one or more elements in a stream";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "witherable" = callPackage
@@ -225238,7 +226573,6 @@ self: {
        executableHaskellDepends = [ base bytestring network unix ];
        description = "A network server to show bottlenecks of GHC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wizard" = callPackage
@@ -225305,7 +226639,6 @@ self: {
        ];
        description = "A parser of WKT, WKB and eWKB";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wl-pprint" = callPackage
@@ -225384,6 +226717,7 @@ self: {
        ];
        description = "A free monad based on the Wadler/Leijen pretty printer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wl-pprint-terminfo" = callPackage
@@ -225401,6 +226735,7 @@ self: {
        ];
        description = "A color pretty printer with terminfo support";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wl-pprint-text" = callPackage
@@ -225718,6 +227053,7 @@ self: {
        ];
        description = "Dictionary-based password generator";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wordpress-auth" = callPackage
@@ -225795,6 +227131,7 @@ self: {
        executableHaskellDepends = [ base text ];
        description = "A library for parsing a chat-based work hour reporting scheme";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "workdays" = callPackage
@@ -226400,7 +227737,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "WSJT-X UDP protocol";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wss-client" = callPackage
@@ -226809,6 +228145,8 @@ self: {
        pname = "x509-store";
        version = "1.6.7";
        sha256 = "1y8yyr1i95jkllg8k0z54k5v4vachp848clc07m33xpxidn3b1lp";
+       revision = "1";
+       editedCabalFile = "04h2h8kdzhd2fp3w4a834xc1n88b1jgrxlgcsynfn0iwpbsb41x7";
        libraryHaskellDepends = [
          asn1-encoding asn1-types base bytestring containers cryptonite
          directory filepath mtl pem x509
@@ -226851,7 +228189,6 @@ self: {
        ];
        description = "Utility for X509 certificate and chain";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "x509-validation" = callPackage
@@ -227263,6 +228600,7 @@ self: {
        executableHaskellDepends = [ base directory process ];
        description = "The Lava system for Xilinx FPGA design with layout combinators";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xine" = callPackage
@@ -227737,6 +229075,7 @@ self: {
        ];
        description = "Optics for xml-conduit and html-conduit";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xml-html-qq" = callPackage
@@ -228031,6 +229370,7 @@ self: {
        libraryHaskellDepends = [ base containers mtl QuickCheck text ];
        description = "Typed XML encoding (core library)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xml-types" = callPackage
@@ -228210,7 +229550,6 @@ self: {
        ];
        description = "XML parser and renderer with HTML 5 quirks mode";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xmltv" = callPackage
@@ -228424,7 +229763,6 @@ self: {
        ];
        description = "XMonad config entry point wrapper";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xmonad-eval" = callPackage
@@ -228461,7 +229799,6 @@ self: {
        ];
        description = "Third party extensions for xmonad with wacky dependencies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xmonad-screenshot" = callPackage
@@ -228507,15 +229844,16 @@ self: {
      }:
      mkDerivation {
        pname = "xmonad-vanessa";
-       version = "2.1.0.0";
-       sha256 = "1np1rq4rn7xm1wqj3bvb279xab7vv95vxhnnbrn6xjygzd7iblxx";
+       version = "2.1.0.1";
+       sha256 = "15ym244y33bg842y9bajbnfvqhbrj49472aij136h7dy92kn2lxg";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          alsa-mixer base composition-prelude containers process X11 xmonad
        ];
        executableHaskellDepends = [
-         base containers xmonad xmonad-contrib xmonad-spotify xmonad-volume
+         base composition-prelude containers xmonad xmonad-contrib
+         xmonad-spotify xmonad-volume
        ];
        testHaskellDepends = [ base hspec xmonad ];
        description = "Custom xmonad, which builds with stack or cabal";
@@ -228549,7 +229887,6 @@ self: {
        libraryHaskellDepends = [ base magic mtl random unix xmonad ];
        description = "xmonad wallpaper extension";
        license = stdenv.lib.licenses.lgpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xmonad-windownames" = callPackage
@@ -228837,7 +230174,6 @@ self: {
        ];
        description = "turtle like LOGO";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xxhash" = callPackage
@@ -229092,6 +230428,7 @@ self: {
        ];
        description = "Yam Web";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yam-app" = callPackage
@@ -229141,6 +230478,7 @@ self: {
        sha256 = "0c6frqjf3xhd5bksaz6rvd6qbqbj15y441476dgj2asm2yd64895";
        libraryHaskellDepends = [ base cron yam-app ];
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yam-logger" = callPackage
@@ -230213,6 +231551,7 @@ self: {
        ];
        description = "Authentication backend for Yesod using Facebook";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-auth-hashdb" = callPackage
@@ -230499,6 +231838,7 @@ self: {
        ];
        description = "Helper functions for using yesod with colonnade";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-comments" = callPackage
@@ -231167,6 +232507,7 @@ self: {
        ];
        description = "Simple display of media types, served by yesod";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-newsfeed" = callPackage
@@ -231537,7 +232878,6 @@ self: {
        ];
        description = "yesod recaptcha2";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-routes" = callPackage
@@ -232025,7 +233365,6 @@ self: {
        ];
        description = "Yet Another Logger";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yggdrasil" = callPackage
@@ -232042,6 +233381,7 @@ self: {
        testHaskellDepends = [ base cryptonite hspec QuickCheck ];
        description = "Executable specifications of composable cryptographic protocols";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yhccore" = callPackage
@@ -232559,7 +233899,6 @@ self: {
        libraryHaskellDepends = [ base HaXml ];
        description = "make SVG string from Haskell data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yjtools" = callPackage
@@ -232600,7 +233939,6 @@ self: {
        libraryHaskellDepends = [ base free mtl ];
        description = "A truly tiny monadic parsing library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yoda" = callPackage
@@ -232626,7 +233964,6 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ieee754 ];
        description = "Bindings to Facebook's Yoga layout library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yoko" = callPackage
@@ -232855,6 +234192,7 @@ self: {
        testHaskellDepends = [ array base bytestring hspec ];
        description = "Row-major coordinates";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yxdb-utils" = callPackage
@@ -232925,6 +234263,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "z85" = callPackage
+    ({ mkDerivation, attoparsec, attoparsec-binary, base, bytestring
+     , pipes, pipes-bytestring, pipes-text, QuickCheck
+     , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck, text
+     , vector-sized
+     }:
+     mkDerivation {
+       pname = "z85";
+       version = "0.0.2";
+       sha256 = "0wy58m3l027saz5v4x76g63cpbm1n1cxx1bsdy4z71fdiscfi4hm";
+       libraryHaskellDepends = [
+         attoparsec attoparsec-binary base bytestring pipes pipes-bytestring
+         pipes-text QuickCheck text vector-sized
+       ];
+       testHaskellDepends = [
+         attoparsec attoparsec-binary base bytestring pipes pipes-bytestring
+         pipes-text QuickCheck quickcheck-instances tasty tasty-hunit
+         tasty-quickcheck text vector-sized
+       ];
+       description = "Implementation of the z85 binary codec";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "zabt" = callPackage
     ({ mkDerivation, base, containers, tasty, tasty-hspec }:
      mkDerivation {
@@ -233439,6 +234801,7 @@ self: {
        testHaskellDepends = [ base bytestring mtl QuickCheck random ];
        description = "XBee ZNet 2.5 (ZigBee) wireless modem communications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zim-parser" = callPackage
@@ -233607,7 +234970,6 @@ self: {
        libraryHaskellDepends = [ base multirec ];
        description = "Generic zipper for families of recursive datatypes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zippers" = callPackage
@@ -234044,6 +235406,7 @@ self: {
        testHaskellDepends = [ base containers mtl multiset ];
        description = "Automated theorem prover for the Zsyntax biochemical calculus";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ztail" = callPackage
@@ -234073,8 +235436,8 @@ self: {
      }:
      mkDerivation {
        pname = "ztar";
-       version = "1.0.0";
-       sha256 = "03a1amca24xpcjsx795pr1dqd78i8ickjqclbr5xcv74zzkhixp2";
+       version = "1.0.1";
+       sha256 = "13nqbl1bakyw0nn7nihs49qfqz3lx78h3nvq8d9pxm2jvp9x32j9";
        libraryHaskellDepends = [
          base bytestring deepseq directory filepath path process text
          unix-compat zip zlib

From 71bc082871bd2a1f3189e28b1ace2e55886be8f5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Jan 2019 11:51:08 +0100
Subject: [PATCH 218/274] all-cabal-hashes: update to Hackage at
 2019-01-04T08:47:36Z

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

diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix
index d141dba0795f..1542078b2b48 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/7882a52a634fbc2da03adc9616aa83b27b06d7a2.tar.gz";
-  sha256 = "1gw480w1d1117l8hbp7rh1jmjjqx11pzb3995m5wi2q9mvi645x2";
+  url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/62720a1288846aabc4e42d4404a85ea771d24a11.tar.gz";
+  sha256 = "1qr07s0l7ip28639fbhwi8nhcyzs3mmhzqd0zny5an0dwxlx14qb";
 }

From c792202b99f9cd03f56d1b3e3248d8a2a11bed27 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Jan 2019 11:35:02 +0100
Subject: [PATCH 219/274] configuration-ghc-8.6.x.nix: cosmetic

---
 .../configuration-ghc-8.6.x.nix               | 36 +------------------
 1 file changed, 1 insertion(+), 35 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
index c780564d8017..fc6c8b43fa3e 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -41,40 +41,6 @@ self: super: {
   unix = null;
   xhtml = null;
 
-  # LTS-12.x versions do not compile.
-  # base-orphans = self.base-orphans_0_8;
-  # brick = self.brick_0_45;
-  # cassava-megaparsec = doJailbreak super.cassava-megaparsec;
-  # config-ini = doJailbreak super.config-ini;   # https://github.com/aisamanra/config-ini/issues/18
-  # contravariant = self.contravariant_1_5;
-  # fgl = self.fgl_5_7_0_1;
-  # free = self.free_5_1;
-  # haddock-library = dontCheck super.haddock-library_1_7_0;
-  # HaTeX = doJailbreak super.HaTeX;
-  # hpack = self.hpack_0_31_1;
-  # hslua = self.hslua_1_0_1;
-  # hslua-module-text = self.hslua-module-text_0_2_0;
-  # hspec = self.hspec_2_6_0;
-  # hspec-contrib = self.hspec-contrib_0_5_1;
-  # hspec-core = self.hspec-core_2_6_0;
-  # hspec-discover = self.hspec-discover_2_6_0;
-  # hspec-megaparsec = doJailbreak super.hspec-megaparsec;  # newer versions need megaparsec 7.x
-  # hspec-meta = self.hspec-meta_2_6_0;
-  # JuicyPixels = self.JuicyPixels_3_3_3;
-  # lens = self.lens_4_17;
-  # megaparsec = dontCheck (doJailbreak super.megaparsec);
-  # pandoc = self.pandoc_2_5;
-  # pandoc-citeproc = self.pandoc-citeproc_0_15;
-  # pandoc-citeproc_0_15 = doJailbreak super.pandoc-citeproc_0_15;
-  # patience = markBrokenVersion "0.1.1" super.patience;
-  # polyparse = self.polyparse_1_12_1;
-  # semigroupoids = self.semigroupoids_5_3_1;
-  # tagged = self.tagged_0_8_6;
-  # vty = self.vty_5_25_1;
-  # wizards = doJailbreak super.wizards;
-  # wl-pprint-extras = doJailbreak super.wl-pprint-extras;
-  # yaml = self.yaml_0_11_0_0;
-
   # https://github.com/tibbe/unordered-containers/issues/214
   unordered-containers = dontCheck super.unordered-containers;
 
@@ -87,7 +53,7 @@ self: super: {
   psqueues = dontCheck super.psqueues;    # won't cope with QuickCheck 2.12.x
   system-fileio = dontCheck super.system-fileio;  # avoid dependency on broken "patience"
   unicode-transforms = dontCheck super.unicode-transforms;
-  RSA = dontCheck super.RSA; # https://github.com/GaloisInc/RSA/issues/14 
+  RSA = dontCheck super.RSA; # https://github.com/GaloisInc/RSA/issues/14
   monad-par = dontCheck super.monad-par;  # https://github.com/simonmar/monad-par/issues/66
 
   # https://github.com/jgm/skylighting/issues/55

From 22c495bb28f148e3d4fb682d6ef349bfff639d59 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Jan 2019 11:35:26 +0100
Subject: [PATCH 220/274] haskell-esqueleto: lo and behold, the package is no
 longer broken

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 7bd540c8578e..a779122bfd4f 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -93,9 +93,6 @@ self: super: {
     hinotify = if pkgs.stdenv.isLinux then self.hinotify else self.fsnotify;
   };
 
-  # https://github.com/bitemyapp/esqueleto/issues/105
-  esqueleto = markBrokenVersion "2.5.3" super.esqueleto;
-
   # Fix test trying to access /home directory
   shell-conduit = overrideCabal super.shell-conduit (drv: {
     postPatch = "sed -i s/home/tmp/ test/Spec.hs";

From cce612a649059302ce6667dcd9a53629f6948218 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Jan 2019 12:55:09 +0100
Subject: [PATCH 221/274] haskell-pandoc: jailbreak to fix the build

---
 pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
index fc6c8b43fa3e..0ca617bc6be6 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
@@ -59,7 +59,10 @@ self: super: {
   # https://github.com/jgm/skylighting/issues/55
   skylighting-core = dontCheck super.skylighting-core;
 
-  # Break out of "yaml >=0.10.4.0 && <0.11".
+  # Break out of "yaml >=0.10.4.0 && <0.11": https://github.com/commercialhaskell/stack/issues/4485
   stack = doJailbreak super.stack;
 
+  # Break out of "tasty >= 0.11 && < 1.2": https://github.com/jgm/pandoc/issues/5200
+  pandoc = doJailbreak super.pandoc;
+
 }

From 224cd007c1c82ce5f7ad97d657dbfd983be29576 Mon Sep 17 00:00:00 2001
From: Clemens Fruhwirth <clemens@endorphin.org>
Date: Tue, 25 Dec 2018 17:45:43 +0100
Subject: [PATCH 222/274] fakeroot: Add sed dependency.

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

diff --git a/pkgs/tools/system/fakeroot/default.nix b/pkgs/tools/system/fakeroot/default.nix
index 8796de4e9e07..1a16a8a34c7f 100644
--- a/pkgs/tools/system/fakeroot/default.nix
+++ b/pkgs/tools/system/fakeroot/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, getopt, libcap }:
+{ stdenv, fetchurl, fetchpatch, getopt, libcap, gnused }:
 
 stdenv.mkDerivation rec {
   version = "1.23";
@@ -29,14 +29,12 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  buildInputs = [ getopt ]
+  buildInputs = [ getopt gnused ]
     ++ stdenv.lib.optional (!stdenv.isDarwin) libcap
     ;
 
   postUnpack = ''
-    for prog in getopt; do
-      sed -i "s@getopt@$(type -p getopt)@g" ${name}/scripts/fakeroot.in
-    done
+    sed -i -e "s@getopt@$(type -p getopt)@g" -e "s@sed@$(type -p sed)@g" ${name}/scripts/fakeroot.in
   '';
 
   meta = {

From e0bcc7f0829fd112cd809f0b3784ca554066f6ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakob=20Br=C3=BCnker?= <jakob.bruenker@gmail.com>
Date: Fri, 4 Jan 2019 13:44:37 +0100
Subject: [PATCH 223/274] idris-modules/curses.nix: delete

The repository is currently unmaintained and cannot be guaranteed to
work.
---
 pkgs/development/idris-modules/curses.nix  | 33 ----------------------
 pkgs/development/idris-modules/default.nix |  2 --
 2 files changed, 35 deletions(-)
 delete mode 100644 pkgs/development/idris-modules/curses.nix

diff --git a/pkgs/development/idris-modules/curses.nix b/pkgs/development/idris-modules/curses.nix
deleted file mode 100644
index 98b42f827b9c..000000000000
--- a/pkgs/development/idris-modules/curses.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ build-idris-package
-, fetchFromGitHub
-, effects
-, lib
-, ncurses
-}:
-build-idris-package  {
-  name = "curses";
-  version = "2017-10-12";
-
-  idrisDeps = [ effects ];
-
-  extraBuildInputs = [ ncurses ];
-
-  postUnpack = ''
-    sed -i 's/^libs = curses$/libs = ncurses/g' source/curses.ipkg
-    sed -i 's/\#include <curses.h>/#include \<ncurses.h\>/g' source/src/cursesrun.h
-  '';
-
-  src = fetchFromGitHub {
-    owner = "JakobBruenker";
-    repo = "curses-idris";
-    rev = "ea4bbcfcf691f0dc731f2dfa676011809db084cb";
-    sha256 = "17q8hg5f61lk2kh3j4cwrwja282sihlcjdrx233z4237alp9w4g1";
-  };
-
-  meta = {
-    description = "libusb binding for idris and Effectful curses programming";
-    homepage = https://github.com/JakobBruenker/curses-idris;
-    license = lib.licenses.mit;
-    maintainers = [ lib.maintainers.brainrape ];
-  };
-}
diff --git a/pkgs/development/idris-modules/default.nix b/pkgs/development/idris-modules/default.nix
index 0368c00d1238..47c6998a587d 100644
--- a/pkgs/development/idris-modules/default.nix
+++ b/pkgs/development/idris-modules/default.nix
@@ -75,8 +75,6 @@
 
     cube = callPackage ./cube.nix {};
 
-    curses = callPackage ./curses.nix {};
-
     data = callPackage ./data.nix {};
 
     derive = callPackage ./derive.nix {};

From 3569ff78f6b17adaa9524c94165f79c7bcc5b489 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hans-J=C3=B6rg=20Schurr?=
 <hansjoergschurr@users.noreply.github.com>
Date: Fri, 4 Jan 2019 13:46:57 +0100
Subject: [PATCH 224/274] trx: init at 2018-01-23 (#53324)

---
 maintainers/maintainer-list.nix  |  5 +++++
 pkgs/tools/audio/trx/default.nix | 23 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix  |  2 ++
 3 files changed, 30 insertions(+)
 create mode 100644 pkgs/tools/audio/trx/default.nix

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index d3d81504dc02..f72d02bcbfde 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1750,6 +1750,11 @@
     github = "hamhut1066";
     name = "Hamish Hutchings";
   };
+  hansjoergschurr = {
+    email = "commits@schurr.at";
+    github = "hansjoergschurr";
+    name = "Hans-Jörg Schurr";
+  };
   haslersn = {
     email = "haslersn@fius.informatik.uni-stuttgart.de";
     github = "haslersn";
diff --git a/pkgs/tools/audio/trx/default.nix b/pkgs/tools/audio/trx/default.nix
new file mode 100644
index 000000000000..a4dd7197be0f
--- /dev/null
+++ b/pkgs/tools/audio/trx/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchgit, alsaLib, libopus, ortp, bctoolbox }:
+
+stdenv.mkDerivation rec {
+  name = "trx-unstable-${version}";
+  version = "2018-01-23";
+
+  src = fetchgit {
+    url = "http://www.pogo.org.uk/~mark/trx.git";
+    rev = "66b4707a24172751a131e24d2a800496c699137f";
+    sha256 = "0w0960p25944b30lkc8n4lj14xgsf0fjpmxqwlz2r8wl642bqnfm";
+  };
+
+  buildInputs = [ alsaLib libopus ortp bctoolbox ];
+  makeFlags = [ "PREFIX=$(out)" ];
+
+  meta = with stdenv.lib; {
+    description = "A simple toolset for broadcasting live audio using RTP/UDP and Opus";
+    homepage = http://www.pogo.org.uk/~mark/trx/;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.hansjoergschurr ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b61e1cc2ef3b..6eb6c9c8ad3a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5881,6 +5881,8 @@ in
 
   trousers = callPackage ../tools/security/trousers { };
 
+  trx = callPackage ../tools/audio/trx { };
+
   tryton = callPackage ../applications/office/tryton { };
 
   trytond = callPackage ../applications/office/trytond { };

From fb0e49a9a7af13fd52edba4c51bda191604d10ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 4 Jan 2019 13:03:24 +0000
Subject: [PATCH 225/274] elm: get to compile on GHC 8.6.3

---
 pkgs/development/compilers/elm/default.nix        | 15 +++++----------
 .../compilers/elm/packages/tasty-quickcheck.nix   | 14 --------------
 2 files changed, 5 insertions(+), 24 deletions(-)
 delete mode 100644 pkgs/development/compilers/elm/packages/tasty-quickcheck.nix

diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix
index 3c8ae70981e6..ba35e093f6af 100644
--- a/pkgs/development/compilers/elm/default.nix
+++ b/pkgs/development/compilers/elm/default.nix
@@ -4,7 +4,7 @@
 
 let
   fetchElmDeps = import ./fetchElmDeps.nix { inherit stdenv lib fetchurl; };
-  hsPkgs = haskell.packages.ghc822.override {
+  hsPkgs = haskell.packages.ghc863.override {
     overrides = self: super: with haskell.lib;
       let elmPkgs = {
             elm = overrideCabal (self.callPackage ./packages/elm.nix { }) (drv: {
@@ -15,12 +15,7 @@ let
                 versionsDat = ./versions.dat;
               };
               buildTools = drv.buildTools or [] ++ [ makeWrapper ];
-              patches = [
-                (fetchpatch {
-                  url = "https://github.com/elm/compiler/pull/1784/commits/78d2d8eab310552b1b877a3e90e1e57e7a09ddec.patch";
-                  sha256 = "0vdhk16xqm2hxw12s1b91a0bmi8w4wsxc086qlzglgnjxrl5b3w4";
-                })
-              ];
+              jailbreak = true;
               postInstall = ''
                 wrapProgram $out/bin/elm \
                   --prefix PATH ':' ${lib.makeBinPath [ nodejs ]}
@@ -31,16 +26,16 @@ let
             The elm-format expression is updated via a script in the https://github.com/avh4/elm-format repo:
             `pacakge/nix/build.sh`
             */
-            elm-format = self.callPackage ./packages/elm-format.nix {};
+            elm-format = doJailbreak (self.callPackage ./packages/elm-format.nix {});
+
             inherit fetchElmDeps;
+            elmVersion = elmPkgs.elm.version;
           };
       in elmPkgs // {
         inherit elmPkgs;
-        elmVersion = elmPkgs.elm.version;
 
         # Needed for elm-format
         indents = self.callPackage ./packages/indents.nix {};
-        tasty-quickcheck = self.callPackage ./packages/tasty-quickcheck.nix {};
       };
   };
 in hsPkgs.elmPkgs
diff --git a/pkgs/development/compilers/elm/packages/tasty-quickcheck.nix b/pkgs/development/compilers/elm/packages/tasty-quickcheck.nix
deleted file mode 100644
index 54235489edfa..000000000000
--- a/pkgs/development/compilers/elm/packages/tasty-quickcheck.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ mkDerivation, base, pcre-light, QuickCheck, random, stdenv
-, tagged, tasty, tasty-hunit
-}:
-mkDerivation {
-  pname = "tasty-quickcheck";
-  version = "0.9.2";
-  sha256 = "c5920adeab6e283d5e3ab45f3c80a1b011bedfbe4a3246a52606da2e1da95873";
-  libraryHaskellDepends = [ base QuickCheck random tagged tasty ];
-  testHaskellDepends = [ base pcre-light tasty tasty-hunit ];
-  doCheck = false;
-  homepage = "https://github.com/feuerbach/tasty";
-  description = "QuickCheck support for the Tasty test framework";
-  license = stdenv.lib.licenses.mit;
-}

From 89c433fbf1847df041aa5c1e18db53648836ac66 Mon Sep 17 00:00:00 2001
From: geistesk <github.jyf300hj@0x21.biz>
Date: Fri, 4 Jan 2019 13:51:51 +0100
Subject: [PATCH 226/274] cbor: init at 1.0.0

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

diff --git a/pkgs/development/python-modules/cbor/default.nix b/pkgs/development/python-modules/cbor/default.nix
new file mode 100644
index 000000000000..360872c0f896
--- /dev/null
+++ b/pkgs/development/python-modules/cbor/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, buildPythonPackage, fetchPypi }:
+
+buildPythonPackage rec {
+  pname = "cbor";
+  version = "1.0.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1dmv163cnslyqccrybkxn0c9s1jk1mmafmgxv75iamnz5lk5l8hk";
+  };
+
+  # Tests are excluded from PyPI and four unit tests are also broken:
+  # https://github.com/brianolson/cbor_py/issues/6
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = https://bitbucket.org/bodhisnarkva/cbor;
+    description = "Concise Binary Object Representation (CBOR) library";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ geistesk ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f00e2b4cb0fa..36bd7904ff19 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1170,6 +1170,8 @@ in {
 
   case = callPackage ../development/python-modules/case {};
 
+  cbor = callPackage ../development/python-modules/cbor {};
+
   cassandra-driver = callPackage ../development/python-modules/cassandra-driver { };
 
   cccolutils = callPackage ../development/python-modules/cccolutils {};

From 46adbcde4875779d18acd752fed1cb25bf03bb84 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 4 Jan 2019 13:52:47 +0100
Subject: [PATCH 227/274] cutelyst: fix build

Cutelyst misses `pcre.h` to compile, adding `pkgs.pcre` as build input
fixes the compilation.

This unbreaks `virtlyst` and the corresponding module as well.

See also https://hydra.nixos.org/build/86293236
---
 pkgs/development/libraries/cutelyst/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/cutelyst/default.nix b/pkgs/development/libraries/cutelyst/default.nix
index 6cb003720bb1..f4a10452eef8 100644
--- a/pkgs/development/libraries/cutelyst/default.nix
+++ b/pkgs/development/libraries/cutelyst/default.nix
@@ -1,5 +1,6 @@
 { stdenv, lib, fetchFromGitHub, cmake, pkgconfig, makeWrapper
-, qtbase, libuuid, libcap, uwsgi, grantlee }:
+, qtbase, libuuid, libcap, uwsgi, grantlee, pcre
+}:
 
 stdenv.mkDerivation rec {
   name = "cutelyst-${version}";
@@ -13,7 +14,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ cmake pkgconfig makeWrapper ];
-  buildInputs = [ qtbase libuuid libcap uwsgi grantlee ];
+  buildInputs = [ qtbase libuuid libcap uwsgi grantlee pcre ];
 
   cmakeFlags = [
     "-DPLUGIN_UWSGI=ON"

From 560a7add3d099c4c27a8a3ce9542c3a4a2bf0d0c Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Fri, 28 Dec 2018 13:52:38 +0100
Subject: [PATCH 228/274] obs-studio: apply fix for fdk-aac v2.0.0

---
 pkgs/applications/video/obs-studio/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index 3bb8f31b9872..a6c9519cd89b 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -1,5 +1,6 @@
 { stdenv
 , fetchFromGitHub
+, fetchpatch
 , cmake
 , fdk_aac
 , ffmpeg
@@ -39,6 +40,13 @@ in stdenv.mkDerivation rec {
     sha256 = "0ri9qkqk3h71b1a5bwpjzqdr21bbmfqbykg48l779d20zln23n1i";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://patch-diff.githubusercontent.com/raw/obsproject/obs-studio/pull/1557.diff";
+      sha256 = "0xq3sh1g8j58mpa4ryi9agqqpr41prrzagxmqafkbgfv6fjv3h0c";
+    })
+  ];
+
   nativeBuildInputs = [ cmake
                         pkgconfig
                       ];

From b245c0cd52822277c54132983d6e0409de56b691 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Fri, 4 Jan 2019 11:39:26 +0100
Subject: [PATCH 229/274] obs-studio: fix wrong patch hash

---
 pkgs/applications/video/obs-studio/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index a6c9519cd89b..9fc9c5871086 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -43,7 +43,7 @@ in stdenv.mkDerivation rec {
   patches = [
     (fetchpatch {
       url = "https://patch-diff.githubusercontent.com/raw/obsproject/obs-studio/pull/1557.diff";
-      sha256 = "0xq3sh1g8j58mpa4ryi9agqqpr41prrzagxmqafkbgfv6fjv3h0c";
+      sha256 = "162fnkxh2wyn6wrrm1kzv7c2mn96kx35vlmk2qwn1nqlifbpsfyq";
     })
   ];
 

From 4a7c9e5af23ca8c0116c73ff89583f7be8e01dcf Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 4 Jan 2019 14:22:03 +0100
Subject: [PATCH 230/274] python36.pkgs.rsa: fix build

---
 pkgs/development/python-modules/rsa/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/python-modules/rsa/default.nix b/pkgs/development/python-modules/rsa/default.nix
index c062aad4c4be..1b3d339b0785 100644
--- a/pkgs/development/python-modules/rsa/default.nix
+++ b/pkgs/development/python-modules/rsa/default.nix
@@ -4,6 +4,8 @@
 , unittest2
 , pyasn1
 , mock
+, isPy3k
+, pythonOlder
 }:
 
 buildPythonPackage rec {
@@ -18,6 +20,10 @@ buildPythonPackage rec {
   checkInputs = [ unittest2 mock ];
   propagatedBuildInputs = [ pyasn1 ];
 
+  preConfigure = stdenv.lib.optionalString (isPy3k && pythonOlder "3.7") ''
+    substituteInPlace setup.py --replace "open('README.md')" "open('README.md',encoding='utf-8')"
+  '';
+
   meta = with stdenv.lib; {
     homepage = https://stuvel.eu/rsa;
     license = licenses.asl20;

From 0173194e4f28dcce269a39eb216877eba77f834c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 4 Jan 2019 14:22:13 +0100
Subject: [PATCH 231/274] Revert "pythonPackages.python-jose: fix build for
 python 3.6""

This reverts commit d65a3efc3f680f6229883778f1e77c1ae3f15709.

This change should have been applied to the `rsa` package instead.
---
 pkgs/development/python-modules/python-jose/default.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/development/python-modules/python-jose/default.nix b/pkgs/development/python-modules/python-jose/default.nix
index 14daecab4db8..4eb2daaf26dc 100644
--- a/pkgs/development/python-modules/python-jose/default.nix
+++ b/pkgs/development/python-modules/python-jose/default.nix
@@ -25,11 +25,6 @@ buildPythonPackage rec {
     py.test
   '';
 
-  postPatch = ''
-    # File says it's utf-8 so instead of relying on the environment, fix the decoding when reading.
-    substituteInPlace setup.py --replace "open('README.md')" "open('README.md',encoding='utf-8')"
-  '';
-
   propagatedBuildInputs = [ future six ecdsa rsa ];
 
   meta = with stdenv.lib; {

From c0e6fbba701004cfdf6277b13c3036e77f802215 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 4 Jan 2019 14:30:38 +0100
Subject: [PATCH 232/274] python: pylint: 1.9.3 -> 1.9.4

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

diff --git a/pkgs/development/python-modules/pylint/1.9.nix b/pkgs/development/python-modules/pylint/1.9.nix
index 778775ae786f..a88b5ba7356c 100644
--- a/pkgs/development/python-modules/pylint/1.9.nix
+++ b/pkgs/development/python-modules/pylint/1.9.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "pylint";
-  version = "1.9.3";
+  version = "1.9.4";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "09bc539f85706f2cca720a7ddf28f5c6cf8185708d6cb5bbf7a90a32c3b3b0aa";
+    sha256 = "ee1e85575587c5b58ddafa25e1c1b01691ef172e139fc25585e5d3f02451da93";
   };
 
   checkInputs = [ pytest pytestrunner pyenchant ];

From b7967e9dc4cfd6539611f81d801eeaa86eb69c2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Xaver=20H=C3=B6rl?= <hoe.dom@gmx.de>
Date: Thu, 3 Jan 2019 11:10:42 +0100
Subject: [PATCH 233/274] dbus-broker: 13 -> 17

---
 pkgs/os-specific/linux/dbus-broker/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/dbus-broker/default.nix b/pkgs/os-specific/linux/dbus-broker/default.nix
index 6582825d6f24..880b620d87cf 100644
--- a/pkgs/os-specific/linux/dbus-broker/default.nix
+++ b/pkgs/os-specific/linux/dbus-broker/default.nix
@@ -1,27 +1,27 @@
 { stdenv, fetchFromGitHub, docutils, meson, ninja, pkgconfig
-, dbus, glib, linuxHeaders, systemd }:
+, dbus, linuxHeaders, systemd }:
 
 stdenv.mkDerivation rec {
   name = "dbus-broker-${version}";
-  version = "13";
+  version = "17";
 
   src = fetchFromGitHub {
     owner  = "bus1";
     repo   = "dbus-broker";
     rev    = "v${version}";
-    sha256 = "1yjkxpnl54pky6ha3y8dsds57lnk10lmriyzpzy0ha2npng2614x";
+    sha256 = "19q5f1c658jdxvr2k2rb2xsnspybqjii4rifnlkzi1qzh0r152md";
     fetchSubmodules = true;
   };
 
   nativeBuildInputs = [ docutils meson ninja pkgconfig ];
 
-  buildInputs = [ dbus glib linuxHeaders systemd ];
+  buildInputs = [ dbus linuxHeaders systemd ];
 
   PKG_CONFIG_SYSTEMD_SYSTEMDSYSTEMUNITDIR = "${placeholder "out"}/lib/systemd/system";
   PKG_CONFIG_SYSTEMD_SYSTEMDUSERUNITDIR = "${placeholder "out"}/lib/systemd/user";
 
   postInstall = ''
-    install -Dm644 ../README $out/share/doc/dbus-broker/README
+    install -Dm644 $src/README.md $out/share/doc/dbus-broker/README
 
     sed -i $out/lib/systemd/{system,user}/dbus-broker.service \
       -e 's,^ExecReload.*busctl,ExecReload=${systemd}/bin/busctl,'

From 28293fb169ac78df15360c6d98da5022bda8f25a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 4 Jan 2019 13:55:06 +0000
Subject: [PATCH 234/274] fix #52118

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

diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix
index ba35e093f6af..aa8d9da9faaf 100644
--- a/pkgs/development/compilers/elm/default.nix
+++ b/pkgs/development/compilers/elm/default.nix
@@ -26,7 +26,7 @@ let
             The elm-format expression is updated via a script in the https://github.com/avh4/elm-format repo:
             `pacakge/nix/build.sh`
             */
-            elm-format = doJailbreak (self.callPackage ./packages/elm-format.nix {});
+            elm-format = justStaticExecutables (doJailbreak (self.callPackage ./packages/elm-format.nix {}));
 
             inherit fetchElmDeps;
             elmVersion = elmPkgs.elm.version;

From 7ff3ccfa74a42b072fe50d3fda1c14904f96a6ef Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Fri, 4 Jan 2019 07:25:54 -0800
Subject: [PATCH 235/274] google-compute-engine: 20181023 -> 20181206 (#52894)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/google-compute-engine/versions
---
 pkgs/tools/virtualization/google-compute-engine/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/virtualization/google-compute-engine/default.nix b/pkgs/tools/virtualization/google-compute-engine/default.nix
index 73a8f5184778..8f50b1d38a2c 100644
--- a/pkgs/tools/virtualization/google-compute-engine/default.nix
+++ b/pkgs/tools/virtualization/google-compute-engine/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonApplication rec {
   name = "google-compute-engine-${version}";
-  version = "20181023";
+  version = "20181206";
   namePrefix = "";
 
   src = fetchFromGitHub {
     owner = "GoogleCloudPlatform";
     repo = "compute-image-packages";
     rev = version;
-    sha256 = "0bhh62f4kx4d7k673fvyzgr9h771lzk7dxhq3ld7zzcz0pmxlx3a";
+    sha256 = "090gbkfk3jh403jzs133isxk8263i16vnj5021l7pxbjgj1zzzwf";
   };
 
   postPatch = ''

From 6acde263185d4e057495aceb7d5e839ce5b093d0 Mon Sep 17 00:00:00 2001
From: Frank Lanitz <frank@frank.uvena.de>
Date: Fri, 4 Jan 2019 16:58:22 +0100
Subject: [PATCH 236/274] Geany: 1.34 -> 1.34.1

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

diff --git a/pkgs/applications/editors/geany/default.nix b/pkgs/applications/editors/geany/default.nix
index caead872eb27..9f33bd084890 100644
--- a/pkgs/applications/editors/geany/default.nix
+++ b/pkgs/applications/editors/geany/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 let
-  version = "1.34";
+  version = "1.34.1";
 in
 
 stdenv.mkDerivation rec {
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://download.geany.org/${name}.tar.bz2";
-    sha256 = "63b93d25d037eaffa77895ae6dd29c91bca570e4053eff5cc8490f87e6021f8e";
+    sha256 = "e765efd89e759defe3fd797d8a2052afbb4b23522efbcc72e3a72b7f1093ec11";
   };
 
   nativeBuildInputs = [ pkgconfig intltool libintl ];

From 3bf0e4efc751b4f8d647c5521f317c44b5f9c4a3 Mon Sep 17 00:00:00 2001
From: John Ericson <git@JohnEricson.me>
Date: Sat, 29 Dec 2018 03:25:20 -0500
Subject: [PATCH 237/274] lib: Fix Mingw on 32-bit ARM

---
 lib/systems/parse.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix
index 7db09fc550e2..6947d41419e3 100644
--- a/lib/systems/parse.nix
+++ b/lib/systems/parse.nix
@@ -279,8 +279,14 @@ rec {
     "2" = # We only do 2-part hacks for things Nix already supports
       if elemAt l 1 == "cygwin"
         then { cpu = elemAt l 0;                      kernel = "windows";  abi = "cygnus";   }
+      # MSVC ought to be the default ABI so this case isn't needed. But then it
+      # becomes difficult to handle the gnu* variants for Aarch32 correctly for
+      # minGW. So it's easier to make gnu* the default for the MinGW, but
+      # hack-in MSVC for the non-MinGW case right here.
+      else if elemAt l 1 == "windows"
+        then { cpu = elemAt l 0;                      kernel = "windows";  abi = "msvc";     }
       else if (elemAt l 1) == "elf"
-      then { cpu = elemAt l 0; vendor = "unknown";    kernel = "none";     abi = elemAt l 1; }
+        then { cpu = elemAt l 0; vendor = "unknown";  kernel = "none";     abi = elemAt l 1; }
       else   { cpu = elemAt l 0;                      kernel = elemAt l 1;                   };
     "3" = # Awkwards hacks, beware!
       if elemAt l 1 == "apple"
@@ -288,7 +294,7 @@ rec {
       else if (elemAt l 1 == "linux") || (elemAt l 2 == "gnu")
         then { cpu = elemAt l 0;                      kernel = elemAt l 1; abi = elemAt l 2; }
       else if (elemAt l 2 == "mingw32") # autotools breaks on -gnu for window
-        then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = "windows";  abi = "gnu"; }
+        then { cpu = elemAt l 0; vendor = elemAt l 1; kernel = "windows";                    }
       else if hasPrefix "netbsd" (elemAt l 2)
         then { cpu = elemAt l 0; vendor = elemAt l 1;    kernel = elemAt l 2;                }
       else if (elem (elemAt l 2) ["eabi" "eabihf" "elf"])
@@ -324,13 +330,12 @@ rec {
                else                                   getKernel args.kernel;
       abi =
         /**/ if args ? abi       then getAbi args.abi
-        else if isLinux   parsed then
+        else if isLinux parsed || isWindows parsed then
           if isAarch32 parsed then
             if lib.versionAtLeast (parsed.cpu.version or "0") "6"
             then abis.gnueabihf
             else abis.gnueabi
           else abis.gnu
-        else if isWindows parsed then abis.gnu
         else                     abis.unknown;
     };
 

From c789f642f02d8bab42bca6c1bf920e2d916389c7 Mon Sep 17 00:00:00 2001
From: Pierre Bourdon <delroth@gmail.com>
Date: Fri, 4 Jan 2019 02:07:17 +0100
Subject: [PATCH 238/274] kernel/generic.nix: provide required dependencies for
 GCC plugins builds

---
 pkgs/os-specific/linux/kernel/generic.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index e424dff596d3..3f6479c572b8 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -4,6 +4,9 @@
 , perl
 , bison ? null
 , flex ? null
+, gmp ? null
+, libmpc ? null
+, mpfr ? null
 , stdenv
 
 , # The kernel source tarball.
@@ -89,7 +92,7 @@ let
     passAsFile = [ "kernelConfig" ];
 
     depsBuildBuild = [ buildPackages.stdenv.cc ];
-    nativeBuildInputs = [ perl ]
+    nativeBuildInputs = [ perl gmp libmpc mpfr ]
       ++ lib.optionals (stdenv.lib.versionAtLeast version "4.16") [ bison flex ];
 
     platformName = stdenv.hostPlatform.platform.name;
@@ -112,7 +115,10 @@ let
       export buildRoot="''${buildRoot:-build}"
 
       # Get a basic config file for later refinement with $generateConfig.
-      make HOSTCC=${buildPackages.stdenv.cc.targetPrefix}gcc -C . O="$buildRoot" $kernelBaseConfig ARCH=$kernelArch
+      make -C .  O="$buildRoot" $kernelBaseConfig \
+          ARCH=$kernelArch \
+          HOSTCC=${buildPackages.stdenv.cc.targetPrefix}gcc \
+          HOSTCXX=${buildPackages.stdenv.cc.targetPrefix}g++
 
       # Create the config file.
       echo "generating kernel configuration..."

From 9dc0d948965ecfa8bae20de5699f7d32cc6707a6 Mon Sep 17 00:00:00 2001
From: Pierre Bourdon <delroth@gmail.com>
Date: Fri, 4 Jan 2019 02:07:53 +0100
Subject: [PATCH 239/274] kernel/hardened-config.nix: re-enable GCC plugins

---
 .../linux/kernel/hardened-config.nix           | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix
index 84d1dd8a378e..2454ecd0b05c 100644
--- a/pkgs/os-specific/linux/kernel/hardened-config.nix
+++ b/pkgs/os-specific/linux/kernel/hardened-config.nix
@@ -103,17 +103,15 @@ PAGE_POISONING_ZERO y
 PANIC_ON_OOPS y
 PANIC_TIMEOUT -1
 
-${optionalString (versionOlder version "4.18") ''
-  GCC_PLUGINS y # Enable gcc plugin options
-  # Gather additional entropy at boot time for systems that may not have appropriate entropy sources.
-  GCC_PLUGIN_LATENT_ENTROPY y
+GCC_PLUGINS y # Enable gcc plugin options
+# Gather additional entropy at boot time for systems that may not have appropriate entropy sources.
+GCC_PLUGIN_LATENT_ENTROPY y
 
-  ${optionalString (versionAtLeast version "4.11") ''
-    GCC_PLUGIN_STRUCTLEAK y # A port of the PaX structleak plugin
-  ''}
-  ${optionalString (versionAtLeast version "4.14") ''
-    GCC_PLUGIN_STRUCTLEAK_BYREF_ALL y # Also cover structs passed by address
-  ''}
+${optionalString (versionAtLeast version "4.11") ''
+  GCC_PLUGIN_STRUCTLEAK y # A port of the PaX structleak plugin
+''}
+${optionalString (versionAtLeast version "4.14") ''
+  GCC_PLUGIN_STRUCTLEAK_BYREF_ALL y # Also cover structs passed by address
 ''}
 
 # Disable various dangerous settings

From 0f7ca26a48389bf9133573f5eaf2d7b30cf51625 Mon Sep 17 00:00:00 2001
From: Pierre Bourdon <delroth@gmail.com>
Date: Fri, 4 Jan 2019 02:08:49 +0100
Subject: [PATCH 240/274] kernel/hardened-config.nix: add STACKLEAK plugin on
 4.20+

---
 pkgs/os-specific/linux/kernel/hardened-config.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix
index 2454ecd0b05c..9d28b3edf855 100644
--- a/pkgs/os-specific/linux/kernel/hardened-config.nix
+++ b/pkgs/os-specific/linux/kernel/hardened-config.nix
@@ -113,6 +113,9 @@ ${optionalString (versionAtLeast version "4.11") ''
 ${optionalString (versionAtLeast version "4.14") ''
   GCC_PLUGIN_STRUCTLEAK_BYREF_ALL y # Also cover structs passed by address
 ''}
+${optionalString (versionAtLeast version "4.20") ''
+  GCC_PLUGIN_STACKLEAK y # A port of the PaX stackleak plugin
+''}
 
 # Disable various dangerous settings
 ACPI_CUSTOM_METHOD n # Allows writing directly to physical memory

From bb5ebed17f3a6ec2534b2c6666b7d1810e543c88 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 2 Jan 2019 11:36:14 -0800
Subject: [PATCH 241/274] python37Packages.faker: 0.9.3 -> 1.0.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-faker/versions
---
 pkgs/development/python-modules/faker/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/faker/default.nix b/pkgs/development/python-modules/faker/default.nix
index 515bd9e99bb5..9a46d9611e08 100644
--- a/pkgs/development/python-modules/faker/default.nix
+++ b/pkgs/development/python-modules/faker/default.nix
@@ -8,11 +8,11 @@ assert pythonOlder "3.3" -> ipaddress != null;
 
 buildPythonPackage rec {
   pname = "Faker";
-  version = "0.9.3";
+  version = "1.0.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "8c6df7903c7b4a51f4ac273bc5fec79a249e3220c47b35d1ac1175b41982d772";
+    sha256 = "067mdy9p1vbkypr3vazmrb0sga6maqbk542hr7hmzcb5lp3dr8sj";
   };
 
   buildInputs = [ pytestrunner ];

From e65eb19da524aa3c9a055f7def3a7bac5ca2a297 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 2 Jan 2019 14:28:15 -0800
Subject: [PATCH 242/274] plantuml: 1.2018.13 -> 1.2018.14

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/plantuml/versions
---
 pkgs/tools/misc/plantuml/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix
index c3d3f916d979..19cc8805b1cc 100644
--- a/pkgs/tools/misc/plantuml/default.nix
+++ b/pkgs/tools/misc/plantuml/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, makeWrapper, jre, graphviz }:
 
 stdenv.mkDerivation rec {
-  version = "1.2018.13";
+  version = "1.2018.14";
   name = "plantuml-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar";
-    sha256 = "181wm05gp4hs4g0z345pp1x9w1g5bx1vpipkhnwvmy4vdj17b4bg";
+    sha256 = "0alsrip25w3hy7h9rryrm7isl6jyk1spdm6bqgbmbscla7vq960y";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From b69d3fae737c811be77b7ca743262e12233e5a87 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 2 Jan 2019 06:55:02 -0800
Subject: [PATCH 243/274] python37Packages.django_redis: 4.9.1 -> 4.10.0

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-django-redis/versions
---
 pkgs/development/python-modules/django_redis/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django_redis/default.nix b/pkgs/development/python-modules/django_redis/default.nix
index e50b1e1cb65d..85761be9ba5f 100644
--- a/pkgs/development/python-modules/django_redis/default.nix
+++ b/pkgs/development/python-modules/django_redis/default.nix
@@ -2,11 +2,11 @@
   mock, django, redis, msgpack }:
 buildPythonPackage rec {
   pname = "django-redis";
-  version = "4.9.1";
+  version = "4.10.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "93fc0f73b0c1736546a979a4996826b2c430f56f7e4176df40ef53b9cb0e4f36";
+    sha256 = "1rxcwnv9ik0swkwvfqdi9i9baw6n8if5pj6q63fjh4p9chw3j2xg";
   };
 
   doCheck = false;

From 487cbfc5634e1f89eb4a72df9ce8e425a0c999f6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Wed, 2 Jan 2019 06:17:39 -0800
Subject: [PATCH 244/274] python37Packages.node-semver: 0.5.1 -> 0.6.1

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/python3.7-node-semver/versions
---
 pkgs/development/python-modules/node-semver/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/node-semver/default.nix b/pkgs/development/python-modules/node-semver/default.nix
index 004ec42718e5..34a81a66ec9d 100644
--- a/pkgs/development/python-modules/node-semver/default.nix
+++ b/pkgs/development/python-modules/node-semver/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchPypi, buildPythonPackage, pytest }:
 
 buildPythonPackage rec {
-  version = "0.5.1";
+  version = "0.6.1";
   pname = "node-semver";
 
   checkInputs = [ pytest ];
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "b87e335179d874a3dd58041198b2715ae70fd20eba81683acde3553c51b28f8e";
+    sha256 = "1dv6mjsm67l1razcgmq66riqmsb36wns17mnipqr610v0z0zf5j0";
   };
 
   meta = with stdenv.lib; {

From eeb35be95dd6cd5d35946a6191e9b9b48703dd00 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Fri, 4 Jan 2019 22:38:14 +0100
Subject: [PATCH 245/274] gitea: 1.6.2 -> 1.6.3

Changelog: https://github.com/go-gitea/gitea/releases/tag/v1.6.3
---
 pkgs/applications/version-management/gitea/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/gitea/default.nix b/pkgs/applications/version-management/gitea/default.nix
index eca07b81bacc..4579c9a83b58 100644
--- a/pkgs/applications/version-management/gitea/default.nix
+++ b/pkgs/applications/version-management/gitea/default.nix
@@ -7,13 +7,13 @@ with stdenv.lib;
 
 buildGoPackage rec {
   name = "gitea-${version}";
-  version = "1.6.2";
+  version = "1.6.3";
 
   src = fetchFromGitHub {
     owner = "go-gitea";
     repo = "gitea";
     rev = "v${version}";
-    sha256 = "1ijxpihdg8k6gs1xpim0iviqakvjadjzp0a5ki2czykilnyg8y85";
+    sha256 = "02d37mh1qxsq9lc9ylk5sgdlc1cgwh6fri077crk43mnyb5lhj3j";
     # Required to generate the same checksum on MacOS due to unicode encoding differences
     # More information: https://github.com/NixOS/nixpkgs/pull/48128
     extraPostFetch = ''

From fc2a65308f751da93a085626a2e188b9bdc9a007 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Fri, 4 Jan 2019 19:43:23 -0500
Subject: [PATCH 246/274] musescore: switch to QtWebEngine

Since version 3.0 it builds with QtWebEngine by default.
---
 pkgs/applications/audio/musescore/default.nix |  8 ++++--
 .../remove_qtwebengine_install_hack.patch     | 25 +++++++++++++++++++
 2 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/applications/audio/musescore/remove_qtwebengine_install_hack.patch

diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix
index 32e121547cbe..340978c81830 100644
--- a/pkgs/applications/audio/musescore/default.nix
+++ b/pkgs/applications/audio/musescore/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, fetchFromGitHub, cmake, pkgconfig
 , alsaLib, freetype, libjack2, lame, libogg, libpulseaudio, libsndfile, libvorbis
 , portaudio, portmidi, qtbase, qtdeclarative, qtscript, qtsvg, qttools
-, qtwebkit, qtxmlpatterns
+, qtwebengine, qtxmlpatterns
 }:
 
 stdenv.mkDerivation rec {
@@ -15,6 +15,10 @@ stdenv.mkDerivation rec {
     sha256 = "0g8n8xpw5d6wh8bwbvy12sinl9i0ir009sr28i4izr28lr4x8v50";
   };
 
+  patches = [
+    ./remove_qtwebengine_install_hack.patch
+  ];
+
   cmakeFlags = [
   ] ++ lib.optional (lib.versionAtLeast freetype.version "2.5.2") "-DUSE_SYSTEM_FREETYPE=ON";
 
@@ -23,7 +27,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     alsaLib libjack2 freetype lame libogg libpulseaudio libsndfile libvorbis
     portaudio portmidi # tesseract
-    qtbase qtdeclarative qtscript qtsvg qttools qtwebkit qtxmlpatterns
+    qtbase qtdeclarative qtscript qtsvg qttools qtwebengine qtxmlpatterns
   ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/audio/musescore/remove_qtwebengine_install_hack.patch b/pkgs/applications/audio/musescore/remove_qtwebengine_install_hack.patch
new file mode 100644
index 000000000000..53a0c90ce46e
--- /dev/null
+++ b/pkgs/applications/audio/musescore/remove_qtwebengine_install_hack.patch
@@ -0,0 +1,25 @@
+--- a/mscore/CMakeLists.txt
++++ b/mscore/CMakeLists.txt
+@@ -660,22 +660,6 @@ if (MINGW)
+ else (MINGW)
+
+    if ( NOT MSVC )
+-## install qwebengine core
+-      if (NOT APPLE AND USE_WEBENGINE)
+-         install(FILES
+-            ${QT_INSTALL_LIBEXECS}/QtWebEngineProcess
+-            DESTINATION bin
+-            )
+-         install(DIRECTORY
+-            ${QT_INSTALL_DATA}/resources
+-            DESTINATION lib/qt5
+-            )
+-         install(DIRECTORY
+-            ${QT_INSTALL_TRANSLATIONS}/qtwebengine_locales
+-            DESTINATION lib/qt5/translations
+-            )
+-      endif(NOT APPLE AND USE_WEBENGINE)
+-
+       target_link_libraries(mscore
+          ${ALSA_LIB}
+          ${QT_LIBRARIES}

From d2114571887bc4fc4d35c63534a303c867927fa6 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Thu, 3 Jan 2019 03:22:12 -0800
Subject: [PATCH 247/274] libcdr: 0.1.4 -> 0.1.5

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/libcdr/versions
---
 pkgs/development/libraries/libcdr/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libcdr/default.nix b/pkgs/development/libraries/libcdr/default.nix
index 5e46f4dc699d..456bd4c67038 100644
--- a/pkgs/development/libraries/libcdr/default.nix
+++ b/pkgs/development/libraries/libcdr/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libwpg, libwpd, lcms, pkgconfig, librevenge, icu, boost, cppunit }:
 
 stdenv.mkDerivation rec {
-  name = "libcdr-0.1.4";
+  name = "libcdr-0.1.5";
 
   src = fetchurl {
     url = "https://dev-www.libreoffice.org/src/${name}.tar.xz";
-    sha256 = "0vd6likgk51j46llybkx4wq3674xzrhp0k82220pkx9x1aqfi9z7";
+    sha256 = "0j1skr11jwvafn0l6p37v3i4lqc8wcn489g8f7c4mqwbk94mrkka";
   };
 
   buildInputs = [ libwpg libwpd lcms librevenge icu boost cppunit ];

From 2764297cc5a3a8023bce499d7c37a9dcaffa9d6b Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Thu, 3 Jan 2019 17:29:36 -0500
Subject: [PATCH 248/274] libcdr: disable werror is default

So this optional configure flag is uneeded.

See: https://github.com/LibreOffice/libcdr/blob/10211e95bb95d05c2261819c88b7f48d9db20b32/NEWS#L5
---
 pkgs/development/libraries/libcdr/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/libraries/libcdr/default.nix b/pkgs/development/libraries/libcdr/default.nix
index 456bd4c67038..4c9877cd5977 100644
--- a/pkgs/development/libraries/libcdr/default.nix
+++ b/pkgs/development/libraries/libcdr/default.nix
@@ -18,8 +18,6 @@ stdenv.mkDerivation rec {
     sed -i 's,^CPPFLAGS.*,\0 -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED,' src/lib/Makefile.in
   '';
 
-  configureFlags = stdenv.lib.optional stdenv.cc.isClang "--disable-werror";
-
   CXXFLAGS="--std=gnu++0x"; # For c++11 constants in lcms2.h
 
   meta = {

From 678dda92a5d8a9d90fa5cff24d4afaf6c6072633 Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Fri, 4 Jan 2019 17:05:22 -0500
Subject: [PATCH 249/274] libcdr: drop boost159 compat fix

---
 pkgs/development/libraries/libcdr/default.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/development/libraries/libcdr/default.nix b/pkgs/development/libraries/libcdr/default.nix
index 4c9877cd5977..f7276d39b14a 100644
--- a/pkgs/development/libraries/libcdr/default.nix
+++ b/pkgs/development/libraries/libcdr/default.nix
@@ -12,12 +12,6 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
 
-  # Boost 1.59 compatability fix
-  # Attempt removing when updating
-  postPatch = ''
-    sed -i 's,^CPPFLAGS.*,\0 -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED,' src/lib/Makefile.in
-  '';
-
   CXXFLAGS="--std=gnu++0x"; # For c++11 constants in lcms2.h
 
   meta = {

From e7e18206dd59c78b54b006ef94afe772cc97bbfa Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Fri, 4 Jan 2019 18:35:40 +0100
Subject: [PATCH 250/274] fuse: 2.9.8 -> 2.9.9

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

diff --git a/pkgs/os-specific/linux/fuse/default.nix b/pkgs/os-specific/linux/fuse/default.nix
index d712ea995784..e8d272622ce9 100644
--- a/pkgs/os-specific/linux/fuse/default.nix
+++ b/pkgs/os-specific/linux/fuse/default.nix
@@ -6,8 +6,8 @@ let
   };
 in {
   fuse_2 = mkFuse {
-    version = "2.9.8";
-    sha256Hash = "0s04ln4k9zvvbjih8ybaa19fxg8xv7dcsz2yrlbk35psnf3l67af";
+    version = "2.9.9";
+    sha256Hash = "1yxxvm58c30pc022nl1wlg8fljqpmwnchkywic3r74zirvlcq23n";
   };
 
   fuse_3 = mkFuse {

From 2d9d6337f87fec9b46a5fbc01a226b175b770e0a Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty <tom@logand.com>
Date: Sat, 5 Jan 2019 05:19:42 +0100
Subject: [PATCH 251/274] sbcl: 1.4.13 -> 1.4.15

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

diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index 1ef6dd065705..3283555cd6ee 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation rec {
   name    = "sbcl-${version}";
-  version = "1.4.13";
+  version = "1.4.15";
 
   src = fetchurl {
     url    = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
-    sha256 = "120rnnz8367lk7ljqlf8xidm4b0d738xqsib4kq0q5ms5r7fzgvm";
+    sha256 = "0bipl4gsvpcifi6vkqm5636i3219mk1bl99px4xh5l1q2g7knv28";
   };
 
   buildInputs = [texinfo];

From 21327795ceecd247493782a8cddcdaefb9624cfa Mon Sep 17 00:00:00 2001
From: worldofpeace <worldofpeace@users.noreply.github.com>
Date: Sat, 5 Jan 2019 00:03:39 -0500
Subject: [PATCH 252/274] nixos/version: add LOGO to /etc/os-release

---
 nixos/modules/misc/version.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix
index fd77f6372720..001505320c00 100644
--- a/nixos/modules/misc/version.nix
+++ b/nixos/modules/misc/version.nix
@@ -93,6 +93,7 @@ in
         VERSION_CODENAME=${toLower cfg.codeName}
         VERSION_ID="${cfg.version}"
         PRETTY_NAME="NixOS ${cfg.version} (${cfg.codeName})"
+        LOGO="nix-snowflake"
         HOME_URL="https://nixos.org/"
         SUPPORT_URL="https://nixos.org/nixos/support.html"
         BUG_REPORT_URL="https://github.com/NixOS/nixpkgs/issues"

From f24d62c1e90a896a9a5840cf4112b03d7bef01ca Mon Sep 17 00:00:00 2001
From: Vladyslav Mykhailichenko <dywedir@pm.me>
Date: Sat, 5 Jan 2019 11:44:07 +0200
Subject: [PATCH 253/274] gpxsee: 6.3 -> 7.1

---
 pkgs/applications/misc/gpxsee/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix
index 50a81890789a..5ef64b2b801c 100644
--- a/pkgs/applications/misc/gpxsee/default.nix
+++ b/pkgs/applications/misc/gpxsee/default.nix
@@ -2,20 +2,20 @@
 
 stdenv.mkDerivation rec {
   name = "gpxsee-${version}";
-  version = "6.3";
+  version = "7.1";
 
   src = fetchFromGitHub {
     owner = "tumic0";
     repo = "GPXSee";
     rev = version;
-    sha256 = "0kbnmcis04kjqkd0msfjd8rdmdf23c71dpzx9wcpf2yadc9rv4c9";
+    sha256 = "1dgag8j3566qwiz1pschfq2wqdp7y1pr4cm9na4zwrdjhn3ci6v5";
   };
 
   nativeBuildInputs = [ qmake ];
   buildInputs = [ qttools ];
 
   preConfigure = ''
-    substituteInPlace src/config.h --replace /usr/share/gpxsee $out/share/gpxsee
+    substituteInPlace src/common/programpaths.cpp --replace /usr/share/ $out/share/
     lrelease lang/*.ts
   '';
 
@@ -31,11 +31,11 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    homepage = http://www.gpxsee.org/;
+    homepage = https://www.gpxsee.org/;
     description = "GPX viewer and analyzer";
     longDescription = ''
       GPXSee is a Qt-based GPS log file viewer and analyzer that supports GPX,
-      TCX, KML, FIT, IGC and NMEA files.
+      TCX, KML, FIT, IGC, NMEA, SLF, LOC and OziExplorer files.
     '';
     license = licenses.gpl3;
     maintainers = [ maintainers.womfoo ];

From f94016eb84d10ec0594bfad82017c58ad5c6218f Mon Sep 17 00:00:00 2001
From: Tobias Happ <tobias.happ@gmx.de>
Date: Thu, 27 Dec 2018 03:31:42 +0100
Subject: [PATCH 254/274] pythonPackages.pdf2image: 1.0.0 -> 1.3.1

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

diff --git a/pkgs/development/python-modules/pdf2image/default.nix b/pkgs/development/python-modules/pdf2image/default.nix
index 1af93531daa5..32a4581676bc 100644
--- a/pkgs/development/python-modules/pdf2image/default.nix
+++ b/pkgs/development/python-modules/pdf2image/default.nix
@@ -2,13 +2,13 @@
 
 buildPythonPackage rec {
   pname = "pdf2image";
-  version = "1.0.0";
+  version = "1.3.1";
 
-  buildInputs = [ pillow poppler_utils ];
+  propagatedBuildInputs = [ pillow poppler_utils ];
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "74607efb48a9e95289148d70af05a53dbef192010a44ac868437fb044842697d";
+    sha256 = "0igkzl12582iq6bh6dycw9bcz2459rs6gybq9mranj54yfgjl2ky";
   };
 
   meta = with stdenv.lib; {

From 8dddd6d4a1a276e00501595f19d6eaaede41c1b1 Mon Sep 17 00:00:00 2001
From: Orivej Desh <orivej@gmx.fr>
Date: Sat, 5 Jan 2019 11:19:37 +0000
Subject: [PATCH 255/274] clang-tools: override llvm version in all-packages

---
 pkgs/development/tools/clang-tools/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/clang-tools/default.nix b/pkgs/development/tools/clang-tools/default.nix
index 2ababe85d0c1..42bcf7fd055f 100644
--- a/pkgs/development/tools/clang-tools/default.nix
+++ b/pkgs/development/tools/clang-tools/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, writeScript, llvmPackages_latest }:
+{ stdenv, writeScript, llvmPackages }:
 
 let
-  clang = llvmPackages_latest.clang-unwrapped;
+  clang = llvmPackages.clang-unwrapped;
   version = stdenv.lib.getVersion clang;
 in
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8c8b53ffc84f..c54b53903508 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6668,7 +6668,9 @@ in
   clang_37 = llvmPackages_37.clang;
   clang_35 = wrapCC llvmPackages_35.clang;
 
-  clang-tools = callPackage ../development/tools/clang-tools { };
+  clang-tools = callPackage ../development/tools/clang-tools {
+    llvmPackages = llvmPackages_latest;
+  };
 
   clang-analyzer = callPackage ../development/tools/analysis/clang-analyzer { };
 

From 5cefef0d12428771e5fd84c35fe505b1a3e81ac9 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Cugnet <jean-philippe@cugnet.eu>
Date: Sat, 5 Jan 2019 12:34:35 +0100
Subject: [PATCH 256/274] elixir_1_3: Remove since it is not supported anymore

---
 pkgs/development/beam-modules/default.nix    | 5 -----
 pkgs/development/interpreters/elixir/1.3.nix | 7 -------
 pkgs/top-level/all-packages.nix              | 2 +-
 pkgs/top-level/beam-packages.nix             | 3 +--
 4 files changed, 2 insertions(+), 15 deletions(-)
 delete mode 100644 pkgs/development/interpreters/elixir/1.3.nix

diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix
index 94ffa32a678d..dd374bcccb4c 100644
--- a/pkgs/development/beam-modules/default.nix
+++ b/pkgs/development/beam-modules/default.nix
@@ -69,11 +69,6 @@ let
           debugInfo = true;
         };
 
-        elixir_1_3 = lib.callElixir ../interpreters/elixir/1.3.nix {
-          inherit rebar erlang;
-          debugInfo = true;
-        };
-
         lfe = lfe_1_2;
         lfe_1_2 = lib.callLFE ../interpreters/lfe/1.2.nix { inherit erlang buildRebar3 buildHex; };
 
diff --git a/pkgs/development/interpreters/elixir/1.3.nix b/pkgs/development/interpreters/elixir/1.3.nix
deleted file mode 100644
index 43d48e2cf7cd..000000000000
--- a/pkgs/development/interpreters/elixir/1.3.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ mkDerivation }:
-
-mkDerivation rec {
-  version = "1.3.4";
-  sha256 = "01qqv1ghvfadcwcr5p88w8j217cgaf094pmpqllij3l0q1yg104l";
-  minimumOTPVersion = "18";
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7917ccffd13e..46bf24b5a2df 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7697,7 +7697,7 @@ in
   inherit (beam.interpreters)
     erlang erlangR18 erlangR19 erlangR20 erlangR21
     erlang_odbc erlang_javac erlang_odbc_javac erlang_nox erlang_basho_R16B02
-    elixir elixir_1_8 elixir_1_7 elixir_1_6 elixir_1_5 elixir_1_4 elixir_1_3
+    elixir elixir_1_8 elixir_1_7 elixir_1_6 elixir_1_5 elixir_1_4
     lfe lfe_1_2;
 
   inherit (beam.packages.erlang)
diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix
index 8255a2223f96..f05cf3d9290e 100644
--- a/pkgs/top-level/beam-packages.nix
+++ b/pkgs/top-level/beam-packages.nix
@@ -61,8 +61,7 @@ rec {
     # Other Beam languages. These are built with `beam.interpreters.erlang`. To
     # access for example elixir built with different version of Erlang, use
     # `beam.packages.erlangR19.elixir`.
-    inherit (packages.erlang)
-      elixir elixir_1_8 elixir_1_7 elixir_1_6 elixir_1_5 elixir_1_4 elixir_1_3;
+    inherit (packages.erlang) elixir elixir_1_8 elixir_1_7 elixir_1_6 elixir_1_5 elixir_1_4;
 
     inherit (packages.erlang) lfe lfe_1_2;
   };

From 69d3eb6b6f28856db99d1ced1d5ec5218bbe1fc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 5 Jan 2019 12:38:20 +0100
Subject: [PATCH 257/274] elixir: link to compatibility table

---
 pkgs/development/beam-modules/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix
index dd374bcccb4c..f71379459dcb 100644
--- a/pkgs/development/beam-modules/default.nix
+++ b/pkgs/development/beam-modules/default.nix
@@ -69,6 +69,9 @@ let
           debugInfo = true;
         };
 
+        # Remove old versions of elixir, when the supports fades out:
+        #   https://hexdocs.pm/elixir/compatibility-and-deprecations.html
+
         lfe = lfe_1_2;
         lfe_1_2 = lib.callLFE ../interpreters/lfe/1.2.nix { inherit erlang buildRebar3 buildHex; };
 

From 4a4d1d64979e3ad80aaa03a2b2a526e50cead3a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 4 Jan 2019 11:40:39 +0100
Subject: [PATCH 258/274] cryptominisat: 5.0.1 -> 5.6.6

---
 .../science/logic/cryptominisat/default.nix      | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/science/logic/cryptominisat/default.nix b/pkgs/applications/science/logic/cryptominisat/default.nix
index 4d96339149af..25027841ab8b 100644
--- a/pkgs/applications/science/logic/cryptominisat/default.nix
+++ b/pkgs/applications/science/logic/cryptominisat/default.nix
@@ -1,24 +1,18 @@
-{ stdenv, fetchFromGitHub, fetchpatch, cmake, python, xxd }:
+{ stdenv, fetchFromGitHub, fetchpatch, cmake, python, xxd, boost }:
 
 stdenv.mkDerivation rec {
   name = "cryptominisat-${version}";
-  version = "5.0.1";
+  version = "5.6.6";
 
   src = fetchFromGitHub {
     owner  = "msoos";
     repo   = "cryptominisat";
     rev    = version;
-    sha256 = "0cpw5d9vplxvv3aaplhnga55gz1hy29p7s4pkw1306knkbhlzvkb";
+    sha256 = "1a1494gj4j73yij0hjbzsn2hglk9zy5c5wfwgig3j67cis28saf5";
   };
 
-  buildInputs = [ python xxd ];
-  nativeBuildInputs = [ cmake ];
-
-  patches = [(fetchpatch rec {
-    name = "fix-exported-library-name.patch";
-    url = "https://github.com/msoos/cryptominisat/commit/7a47795cbe5ad5a899731102d297f234bcade077.patch";
-    sha256 = "11hf3cfqs4cykn7rlgjglq29lzqfxvlm0f20qasi0kdrz01cr30f";
-  })];
+  buildInputs = [ python boost ];
+  nativeBuildInputs = [ cmake xxd ];
 
   meta = with stdenv.lib; {
     description = "An advanced SAT Solver";

From 17f4d415a2270441dd19f7abcc2fe7b5a1c6900b Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Sat, 5 Jan 2019 15:02:39 +0900
Subject: [PATCH 259/274] thunderbird: 60.3.3 -> 60.4.0

Picked from PR #53437.  It runs fine for me.
---
 .../networking/mailreaders/thunderbird/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index c048c2938a92..038e24de0313 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -24,11 +24,11 @@ let
   gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc;
 in stdenv.mkDerivation rec {
   name = "thunderbird-${version}";
-  version = "60.3.3";
+  version = "60.4.0";
 
   src = fetchurl {
     url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";
-    sha512 = "04m6mgm4nfnq3nfkv0d1al5b7bw95kfcjpyd7aschqi6wnn21g8qacx42ynj89i5l9vc1jx8nz0wy266sy6x5iv9q585c6l6j9gvkrh";
+    sha512 = "0flg3j0bvgpyk4wbb8d17yl8rddww7q9m9n5brqx1jlj0vjk8lrf8awvxxhn5ssyhy2ys2sklnw75y35hnws3hijs8l9l8ahznfqjq8";
   };
 
   # from firefox, but without sound libraries

From 3b152247eadbf3257e684525d49549b55f26c87d Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 5 Jan 2019 13:17:50 +0100
Subject: [PATCH 260/274] weechatScripts.weechat-matrix-bridge: 2018-05-29 ->
 2018-11-19 (HTTP/2 support fix)

---
 .../irc/weechat/scripts/weechat-matrix-bridge/default.nix   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix
index d2960ae93a99..137a32f9364f 100644
--- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix
+++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix
@@ -1,12 +1,12 @@
 { stdenv, curl, fetchFromGitHub, cjson, olm, luaffi }:
 
 stdenv.mkDerivation {
-  name = "weechat-matrix-bridge-2018-05-29";
+  name = "weechat-matrix-bridge-2018-11-19";
   src = fetchFromGitHub {
     owner = "torhve";
     repo = "weechat-matrix-protocol-script";
-    rev = "ace3fefc0e35a627f8a528032df2e3111e41eb1b";
-    sha256 = "1snf8vn5n9wzrnqnvdrcli4199s5p114jbjlgrj5c27i53173wqw";
+    rev = "8d32e90d864a8f3f09ecc2857cd5dd6e39a8c3f7";
+    sha256 = "0qqd6qmkrdc0r3rnl53c3yp93fbcz7d3mdw3vq5gmdqxyym4s9lj";
   };
 
   patches = [

From 9b2f0fbcdd4cbb4acac3f894cb93d0efdd5fcd26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 5 Jan 2019 13:22:39 +0100
Subject: [PATCH 261/274] nixos/lirc: expose socket path via passthru

---
 nixos/modules/services/hardware/lirc.nix | 12 +++---------
 nixos/modules/services/hardware/vdr.nix  |  2 +-
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/services/hardware/lirc.nix b/nixos/modules/services/hardware/lirc.nix
index ece38bd1e1cd..826e512c75d1 100644
--- a/nixos/modules/services/hardware/lirc.nix
+++ b/nixos/modules/services/hardware/lirc.nix
@@ -32,14 +32,6 @@ in {
         default = [];
         description = "Extra arguments to lircd.";
       };
-
-      socket = mkOption {
-        type = types.path;
-        # default search path of many applications
-        default = "/run/lirc/lircd";
-        description = "Socket path";
-      };
-
     };
   };
 
@@ -50,13 +42,15 @@ in {
     # Note: LIRC executables raises a warning, if lirc_options.conf do not exists
     environment.etc."lirc/lirc_options.conf".text = cfg.options;
 
+    passthru.lirc.socket = "/run/lirc/lircd";
+
     environment.systemPackages = [ pkgs.lirc ];
 
     systemd.sockets.lircd = {
       description = "LIRC daemon socket";
       wantedBy = [ "sockets.target" ];
       socketConfig = {
-        ListenStream = cfg.socket;
+        ListenStream = config.passthru.lirc.socket;
         SocketUser = "lirc";
         SocketMode = "0660";
       };
diff --git a/nixos/modules/services/hardware/vdr.nix b/nixos/modules/services/hardware/vdr.nix
index 695f0cbab1fc..4822506a899b 100644
--- a/nixos/modules/services/hardware/vdr.nix
+++ b/nixos/modules/services/hardware/vdr.nix
@@ -75,7 +75,7 @@ in {
     services.lirc.enable = true;
     users.users.vdr.extraGroups = [ "lirc" ];
     services.vdr.extraArguments = [
-      "--lirc=${config.services.lirc.socket}"
+      "--lirc=${config.passthru.lirc.socket}"
     ];
   })]);
 }

From c68e8b05f005381ac1caf51bb28282b70242b77b Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 5 Jan 2019 13:10:05 +0100
Subject: [PATCH 262/274] Revert "linux-hardened: Disable
 GCC_PLUGIN_RANDSTRUCT"

This reverts commit 5dda1324be421c1a2afd5a559a87f97691287003.

Presumably this was done to work around build errors or something but it
works fine now.
---
 pkgs/os-specific/linux/kernel/hardened-config.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix
index 9d28b3edf855..a6a835c1fe9f 100644
--- a/pkgs/os-specific/linux/kernel/hardened-config.nix
+++ b/pkgs/os-specific/linux/kernel/hardened-config.nix
@@ -117,6 +117,11 @@ ${optionalString (versionAtLeast version "4.20") ''
   GCC_PLUGIN_STACKLEAK y # A port of the PaX stackleak plugin
 ''}
 
+${optionalString (versionAtLeast version "4.13") ''
+  GCC_PLUGIN_RANDSTRUCT y # A port of the PaX randstruct plugin
+  GCC_PLUGIN_RANDSTRUCT_PERFORMANCE y
+''}
+
 # Disable various dangerous settings
 ACPI_CUSTOM_METHOD n # Allows writing directly to physical memory
 PROC_KCORE n # Exposes kernel text image layout

From abc8ed3fcae60ad2586307c854bdb21f993592f0 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 5 Jan 2019 13:20:09 +0100
Subject: [PATCH 263/274] hardened-config: clarify readonly LSM hooks config

SECURITY_WRITABLE_HOOKS is implicitly controlled by SECURITY_SELINUX_DISABLE;
explicitly unsetting results in an error because the configfile builder fails
to detect that it has in fact been unset (reporting it as an unused option).
For now, leave WRITABLE_HOOKS as an "optional" config for documentation
purposes.
---
 .../os-specific/linux/kernel/hardened-config.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix
index a6a835c1fe9f..13db3873e628 100644
--- a/pkgs/os-specific/linux/kernel/hardened-config.nix
+++ b/pkgs/os-specific/linux/kernel/hardened-config.nix
@@ -52,15 +52,17 @@ ${optionalString (versionOlder version "4.11") ''
   DEBUG_SET_MODULE_RONX y
 ''}
 
-# Mark LSM hooks read-only after init.  Conflicts with SECURITY_SELINUX_DISABLE
-# (disabling SELinux at runtime); hence, SELinux can only be disabled at boot
-# via the selinux=0 boot parameter.
+# Mark LSM hooks read-only after init.  SECURITY_WRITABLE_HOOKS n
+# conflicts with SECURITY_SELINUX_DISABLE y; disabling the latter
+# implicitly marks LSM hooks read-only after init.
+#
+# SELinux can only be disabled at boot via selinux=0
+#
+# We set SECURITY_WRITABLE_HOOKS n primarily for documentation purposes; the
+# config builder fails to detect that it has indeed been unset.
 ${optionalString (versionAtLeast version "4.12") ''
   SECURITY_SELINUX_DISABLE n
-''}
-
-${optionalString ((versionAtLeast version "4.12") && (versionOlder version "4.17")) ''
-  SECURITY_WRITABLE_HOOKS n
+  SECURITY_WRITABLE_HOOKS? n
 ''}
 
 DEBUG_WX y # boot-time warning on RWX mappings

From 1801aad7b889e1acd3b2f41046852ae78f61a32d Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 5 Jan 2019 13:24:54 +0100
Subject: [PATCH 264/274] hardened-config: clarify MODIFY_LDT_SYSCALL

This likely never worked; MODIFY_LDT_SYSCALL depends on EXPERT; enabling
EXPERT however seems to introduce quite a few changes that would need to be
properly vetted.

The version guard is unnecessary, however, as this config has been supported
since 4.3.
---
 pkgs/os-specific/linux/kernel/hardened-config.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix
index 13db3873e628..6ae0108b3f0f 100644
--- a/pkgs/os-specific/linux/kernel/hardened-config.nix
+++ b/pkgs/os-specific/linux/kernel/hardened-config.nix
@@ -28,9 +28,9 @@ ${optionalString (stdenv.hostPlatform.platform.kernelArch == "x86_64") ''
   # Reduce attack surface by disabling various emulations
   IA32_EMULATION n
   X86_X32 n
-  ${optionalString (versionOlder version "4.17") ''
-    MODIFY_LDT_SYSCALL? n
-  ''}
+  # Note: this config depends on EXPERT y and so will not take effect, hence
+  # it is left "optional" for now.
+  MODIFY_LDT_SYSCALL? n
 
   VMAP_STACK y # Catch kernel stack overflows
 

From dfd77a046de192d8dfa5f9534552c299c3da26ac Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 5 Jan 2019 13:43:42 +0100
Subject: [PATCH 265/274] hardened-config: ensure STRICT_KERNEL_RWX

This is y in the default config, but enable it explicitly here to catch
situations where it has been disabled (explicitly or implicitly).
---
 pkgs/os-specific/linux/kernel/hardened-config.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix
index 6ae0108b3f0f..90856d593dd9 100644
--- a/pkgs/os-specific/linux/kernel/hardened-config.nix
+++ b/pkgs/os-specific/linux/kernel/hardened-config.nix
@@ -66,6 +66,9 @@ ${optionalString (versionAtLeast version "4.12") ''
 ''}
 
 DEBUG_WX y # boot-time warning on RWX mappings
+${optionalString (versionAtLeast version "4.11") ''
+  STRICT_KERNEL_RWX y
+''}
 
 # Stricter /dev/mem
 STRICT_DEVMEM? y

From 11840f5c7071d1d687dc69a2585844a8c97b01a3 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 5 Jan 2019 13:44:33 +0100
Subject: [PATCH 266/274] hardened-config: explain HARDENED_USERCOPY_FALLBACK n

---
 pkgs/os-specific/linux/kernel/hardened-config.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix
index 90856d593dd9..62bd4945a665 100644
--- a/pkgs/os-specific/linux/kernel/hardened-config.nix
+++ b/pkgs/os-specific/linux/kernel/hardened-config.nix
@@ -89,7 +89,7 @@ ${optionalString (versionAtLeast version "4.13") ''
 # Perform usercopy bounds checking.
 HARDENED_USERCOPY y
 ${optionalString (versionAtLeast version "4.16") ''
-  HARDENED_USERCOPY_FALLBACK n
+  HARDENED_USERCOPY_FALLBACK n  # for full whitelist enforcement
 ''}
 
 # Randomize allocator freelists.

From d62086e6fc2fdf8d5f5d45e697edac418e6bad0f Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 5 Jan 2019 13:44:54 +0100
Subject: [PATCH 267/274] hardened-config: allow slub/slab free poisoning

---
 pkgs/os-specific/linux/kernel/hardened-config.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/hardened-config.nix b/pkgs/os-specific/linux/kernel/hardened-config.nix
index 62bd4945a665..ed540a9e7518 100644
--- a/pkgs/os-specific/linux/kernel/hardened-config.nix
+++ b/pkgs/os-specific/linux/kernel/hardened-config.nix
@@ -99,6 +99,9 @@ ${optionalString (versionAtLeast version "4.14") ''
   SLAB_FREELIST_HARDENED y
 ''}
 
+# Allow enabling slub/slab free poisoning with slub_debug=P
+SLUB_DEBUG y
+
 # Wipe higher-level memory allocations on free() with page_poison=1
 PAGE_POISONING y
 PAGE_POISONING_NO_SANITY y

From 3f1f44312536ef93b3591cabe141166cac23b8db Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 5 Jan 2019 13:47:25 +0100
Subject: [PATCH 268/274] nixos/hardened profile: slab/slub hardening

slab_nomerge may reduce surface somewhat

slub_debug is used to enable additional sanity checks and "red zones" around
allocations to detect read/writes beyond the allocated area, as well as
poisoning to overwrite free'd data.

The cost is yet more memory fragmentation ...
---
 nixos/modules/profiles/hardened.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/nixos/modules/profiles/hardened.nix b/nixos/modules/profiles/hardened.nix
index a588943fe710..aa9ea2c9a357 100644
--- a/nixos/modules/profiles/hardened.nix
+++ b/nixos/modules/profiles/hardened.nix
@@ -29,6 +29,12 @@ with lib;
   security.apparmor.enable = mkDefault true;
 
   boot.kernelParams = [
+    # Slab/slub sanity checks, redzoning, and poisoning
+    "slub_debug=FZP"
+
+    # Disable slab merging to make certain heap overflow attacks harder
+    "slab_nomerge"
+
     # Overwrite free'd memory
     "page_poison=1"
 

From 167578163a5031e8d7519b010824499db73fa62f Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 5 Jan 2019 13:50:36 +0100
Subject: [PATCH 269/274] nixos/hardened profile: always enable pti

---
 nixos/modules/profiles/hardened.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/profiles/hardened.nix b/nixos/modules/profiles/hardened.nix
index aa9ea2c9a357..9ab2ee87a19e 100644
--- a/nixos/modules/profiles/hardened.nix
+++ b/nixos/modules/profiles/hardened.nix
@@ -40,6 +40,9 @@ with lib;
 
     # Disable legacy virtual syscalls
     "vsyscall=none"
+
+    # Enable PTI even if CPU claims to be safe from meltdown
+    "pti=on"
   ];
 
   boot.blacklistedKernelModules = [

From df834ee56d8c2ba5f75eae872e4dedc037874a61 Mon Sep 17 00:00:00 2001
From: "R. RyanTM" <ryantm-bot@ryantm.com>
Date: Sat, 5 Jan 2019 05:47:25 -0800
Subject: [PATCH 270/274] sysstat: 12.1.1 -> 12.1.2 (#52675)

Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/sysstat/versions
---
 pkgs/os-specific/linux/sysstat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/os-specific/linux/sysstat/default.nix
index d3a9d7834cdc..27b27ebffdd8 100644
--- a/pkgs/os-specific/linux/sysstat/default.nix
+++ b/pkgs/os-specific/linux/sysstat/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, gettext, bzip2 }:
 
 stdenv.mkDerivation rec {
-  name = "sysstat-12.1.1";
+  name = "sysstat-12.1.2";
 
   src = fetchurl {
     url = "http://perso.orange.fr/sebastien.godard/${name}.tar.xz";
-    sha256 = "0drrlv2fr64g5zf0a2bkla2rql4nmq4n192wvcr9r4zppg58d8k4";
+    sha256 = "0xiv70x4n24fcycvlq95lqgb3jwjxfzq61bnyqai57x54hhn46yp";
   };
 
   buildInputs = [ gettext ];

From 37fe593d486f006173e91df2cfc1429db7fb06e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 5 Jan 2019 16:38:10 +0100
Subject: [PATCH 271/274] cryptominisat: switch to python3

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

diff --git a/pkgs/applications/science/logic/cryptominisat/default.nix b/pkgs/applications/science/logic/cryptominisat/default.nix
index 25027841ab8b..18af6f0a618b 100644
--- a/pkgs/applications/science/logic/cryptominisat/default.nix
+++ b/pkgs/applications/science/logic/cryptominisat/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, cmake, python, xxd, boost }:
+{ stdenv, fetchFromGitHub, fetchpatch, cmake, python3, xxd, boost }:
 
 stdenv.mkDerivation rec {
   name = "cryptominisat-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "1a1494gj4j73yij0hjbzsn2hglk9zy5c5wfwgig3j67cis28saf5";
   };
 
-  buildInputs = [ python boost ];
+  buildInputs = [ python3 boost ];
   nativeBuildInputs = [ cmake xxd ];
 
   meta = with stdenv.lib; {

From 2614c8a6c564d7eb5b693975b3c1ff9771f5753f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Fri, 4 Jan 2019 15:41:51 +0100
Subject: [PATCH 272/274] nixos/xss-lock: specify a default locker

Having a default locker is less error-prone and more convenient.
Incorrect values might leave the machine vulnerable since there is no
fallback.
---
 nixos/modules/programs/xss-lock.nix | 3 ++-
 nixos/tests/xss-lock.nix            | 3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/programs/xss-lock.nix b/nixos/modules/programs/xss-lock.nix
index 49d522c604f5..c290df01b960 100644
--- a/nixos/modules/programs/xss-lock.nix
+++ b/nixos/modules/programs/xss-lock.nix
@@ -9,7 +9,8 @@ in
   options.programs.xss-lock = {
     enable = mkEnableOption "xss-lock";
     lockerCommand = mkOption {
-      example = "xlock";
+      default = "${pkgs.i3lock}/bin/i3lock";
+      example = literalExample ''''${pkgs.i3lock-fancy}/bin/i3lock-fancy'';
       type = types.string;
       description = "Locker to be used with xsslock";
     };
diff --git a/nixos/tests/xss-lock.nix b/nixos/tests/xss-lock.nix
index 045667bdcdec..b46bb1a8f6e9 100644
--- a/nixos/tests/xss-lock.nix
+++ b/nixos/tests/xss-lock.nix
@@ -9,7 +9,6 @@ with lib;
   machine = {
     imports = [ ./common/x11.nix ./common/user-account.nix ];
     programs.xss-lock.enable = true;
-    programs.xss-lock.lockerCommand = "${pkgs.xlockmore}/bin/xlock";
     services.xserver.displayManager.auto.user = "alice";
   };
 
@@ -20,6 +19,6 @@ with lib;
 
     $machine->fail("pgrep xlock");
     $machine->succeed("su -l alice -c 'xset dpms force standby'");
-    $machine->waitUntilSucceeds("pgrep xlock");
+    $machine->waitUntilSucceeds("pgrep i3lock");
   '';
 })

From 8a7d9e6dd09d6db119ccfb34b8cb52157e61e7bc Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Sat, 5 Jan 2019 11:38:10 -0500
Subject: [PATCH 273/274] offlineimap: provide "OS-DEFAULT" CA certificates
 (#53268)

---
 pkgs/tools/networking/offlineimap/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix
index 50ed107bc20d..5ac64d36eaf9 100644
--- a/pkgs/tools/networking/offlineimap/default.nix
+++ b/pkgs/tools/networking/offlineimap/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, python2Packages,
-  asciidoc, libxml2, libxslt, docbook_xsl }:
+  asciidoc, cacert, libxml2, libxslt, docbook_xsl }:
 
 python2Packages.buildPythonApplication rec {
   version = "7.2.2";
@@ -15,6 +15,9 @@ python2Packages.buildPythonApplication rec {
   postPatch = ''
     # Skip xmllint to stop failures due to no network access
     sed -i docs/Makefile -e "s|a2x -v -d |a2x -L -v -d |"
+
+    # Provide CA certificates (Used when "sslcacertfile = OS-DEFAULT" is configured")
+    sed -i offlineimap/utils/distro.py -e '/def get_os_sslcertfile():/a\ \ \ \ return "${cacert}/etc/ssl/certs/ca-bundle.crt"'
   '';
 
   doCheck = false;

From 0d99389a6d7335daea2443fe5b7949acb0aa052d Mon Sep 17 00:00:00 2001
From: Tadeo Kondrak <me@tadeo.ca>
Date: Sat, 5 Jan 2019 10:10:27 -0700
Subject: [PATCH 274/274] wine: add perl to buildInputs to fix winemaker

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

diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix
index 94cf4a774569..2b9d048f77e6 100644
--- a/pkgs/misc/emulators/wine/base.nix
+++ b/pkgs/misc/emulators/wine/base.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) {
   ++ lib.optionals stdenv.isLinux  (with pkgs.xorg; [
      libXi libXcursor libXrandr libXrender libXxf86vm libXcomposite libXext
   ])
-  ++ [ pkgs.xorg.libX11 ]));
+  ++ [ pkgs.xorg.libX11 pkgs.perl ]));
 
   # Wine locates a lot of libraries dynamically through dlopen().  Add
   # them to the RPATH so that the user doesn't have to set them in